Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into routing-per-role
This commit is contained in:
@@ -3,31 +3,45 @@ package menuService
|
||||
import (
|
||||
"slices"
|
||||
"sort"
|
||||
"strconv"
|
||||
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/repos/categoriesRepo"
|
||||
categoryrepo "git.ma-al.com/goc_daniel/b2b/app/repos/categoryRepo"
|
||||
routesRepo "git.ma-al.com/goc_daniel/b2b/app/repos/routesRepo"
|
||||
constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
|
||||
)
|
||||
|
||||
type MenuService struct {
|
||||
categoriesRepo categoriesRepo.UICategoriesRepo
|
||||
routesRepo routesRepo.UIRoutesRepo
|
||||
categoryRepo categoryrepo.UICategoryRepo
|
||||
routesRepo routesRepo.UIRoutesRepo
|
||||
}
|
||||
|
||||
func New() *MenuService {
|
||||
return &MenuService{
|
||||
categoriesRepo: categoriesRepo.New(),
|
||||
routesRepo: routesRepo.New(),
|
||||
categoryRepo: categoryrepo.New(),
|
||||
routesRepo: routesRepo.New(),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *MenuService) GetCategoryTree(root_category_id uint, id_lang uint) (*model.Category, error) {
|
||||
all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
|
||||
all_categories, err := s.categoryRepo.RetrieveMenuCategories(id_lang)
|
||||
if err != nil {
|
||||
return &model.Category{}, err
|
||||
}
|
||||
|
||||
// remove blacklisted categories
|
||||
// to do so, we detach them from the main tree
|
||||
for i := 0; i < len(all_categories); i++ {
|
||||
if slices.Contains(constdata.CATEGORY_BLACKLIST, all_categories[i].CategoryID) {
|
||||
all_categories[i].ParentID = all_categories[i].CategoryID
|
||||
}
|
||||
}
|
||||
|
||||
iso_code := all_categories[0].IsoCode
|
||||
s.appendAdditional(&all_categories, id_lang, iso_code)
|
||||
|
||||
// find the root
|
||||
root_index := 0
|
||||
root_found := false
|
||||
@@ -98,7 +112,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.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
|
||||
normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode, Filter: scanned.Filter}
|
||||
normal.Children = []model.Category{}
|
||||
return normal
|
||||
}
|
||||
@@ -114,11 +128,14 @@ func (a ByPosition) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
|
||||
func (a ByPosition) Less(i, j int) bool { return a[i].Position < a[j].Position }
|
||||
|
||||
func (s *MenuService) GetBreadcrumb(root_category_id uint, start_category_id uint, id_lang uint) ([]model.CategoryInBreadcrumb, error) {
|
||||
all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
|
||||
all_categories, err := s.categoryRepo.RetrieveMenuCategories(id_lang)
|
||||
if err != nil {
|
||||
return []model.CategoryInBreadcrumb{}, err
|
||||
}
|
||||
|
||||
iso_code := all_categories[0].IsoCode
|
||||
s.appendAdditional(&all_categories, id_lang, iso_code)
|
||||
|
||||
breadcrumb := []model.CategoryInBreadcrumb{}
|
||||
|
||||
start_index := 0
|
||||
@@ -211,3 +228,24 @@ func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopM
|
||||
|
||||
return roots, nil
|
||||
}
|
||||
|
||||
func (s *MenuService) appendAdditional(all_categories *[]model.ScannedCategory, id_lang uint, iso_code string) {
|
||||
for i := 0; i < len(*all_categories); i++ {
|
||||
(*all_categories)[i].Filter = "category_id_in=" + strconv.Itoa(int((*all_categories)[i].CategoryID))
|
||||
}
|
||||
|
||||
var additional model.ScannedCategory
|
||||
additional.CategoryID = 10001
|
||||
additional.Name = "New Products"
|
||||
additional.Active = 1
|
||||
additional.Position = 10
|
||||
additional.ParentID = 2
|
||||
additional.IsRoot = 0
|
||||
additional.LinkRewrite = i18n.T___(id_lang, "category.new_products")
|
||||
additional.IsoCode = iso_code
|
||||
|
||||
additional.Visited = false
|
||||
additional.Filter = "is_new_in=true"
|
||||
|
||||
*all_categories = append(*all_categories, additional)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user