goc_daniel/b2b
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

added new category error, and some fixes

Browse Source
This commit is contained in:
Daniel Goc
2026-03-31 10:52:36 +02:00
parent ec5ff123ac
commit 8665c566ee
9 changed files with 134 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/service/menuService/menuService.go
View File

@@ -21,7 +21,7 @@ func New() *MenuService {
}
}
func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
func (s *MenuService) GetCategoryTree(root_category_id uint, id_lang uint) (*model.Category, error) {
all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
if err != nil {
return &model.Category{}, err
@@ -31,7 +31,7 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
root_index := 0
root_found := false
for i := 0; i < len(all_categories); i++ {
if all_categories[i].IsRoot == 1 {
if all_categories[i].CategoryID == root_category_id {
root_index = i
root_found = true
break
@@ -44,6 +44,7 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
// now create the children and reorder them according to position
id_to_index := make(map[uint]int)
for i := 0; i < len(all_categories); i++ {
all_categories[i].Visited = false
id_to_index[all_categories[i].CategoryID] = i
}
@@ -58,19 +59,32 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
}
// finally, create the tree
tree := s.createTree(root_index, &all_categories, &children_indices)
tree, success := s.createTree(root_index, &all_categories, &children_indices)
if !success {
return &tree, responseErrors.ErrCircularDependency
}
return &tree, nil
}
func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCategory), children_indices *(map[int][]ChildWithPosition)) model.Category {
func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCategory), children_indices *(map[int][]ChildWithPosition)) (model.Category, bool) {
node := s.scannedToNormalCategory((*all_categories)[index])
if (*all_categories)[index].Visited {
return node, false
}
(*all_categories)[index].Visited = true
for i := 0; i < len((*children_indices)[index]); i++ {
node.Children = append(node.Children, s.createTree((*children_indices)[index][i].Index, all_categories, children_indices))
next_child, success := s.createTree((*children_indices)[index][i].Index, all_categories, children_indices)
if !success {
return node, false
}
node.Children = append(node.Children, next_child)
}
return node
(*all_categories)[index].Visited = false // just in case we have a "diamond" diagram
return node, true
}
func (s *MenuService) GetRoutes(id_lang uint) ([]model.Route, error) {
@@ -83,7 +97,7 @@ func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) mod
normal.CategoryID = scanned.CategoryID
normal.Label = scanned.Name
// normal.Active = scanned.Active == 1
normal.Params = model.CategpryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
normal.Children = []model.Category{}
return normal
}