Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into product-procedures

app/utils/const_data/consts.go

@@ -5,3 +5,6 @@ const PASSWORD_VALIDATION_REGEX = `^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$`
 const SHOP_ID = 1
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
+
+const USER_LOCALES_NAME = "user"
+const USER_LOCALES_ID = "userID"

app/utils/genModels/genModels.go

@@ -11,8 +11,8 @@ import (
 	"gorm.io/gorm"
 )
 
-const GENERATED_FILES_FOLDER = "./app/model/prestadb"
-const GENERATED_MODEL_PKG = "prestadb"
+const GENERATED_FILES_FOLDER = "./app/model/dbmodel"
+const GENERATED_MODEL_PKG = "dbmodel"
 
 type GormGenModels struct {
 	db *gorm.DB
@@ -115,7 +115,7 @@ func (m *GormGenModels) cleanupGeneratedFiles() error {
 				return err
 			}
 
-			// Remove package prestadb imports that reference generated DO
+			// Remove package dbmodel imports that reference generated DO
 			// and clean up the code
 			content = m.cleanModelContent(content)
 

app/utils/query/query_params/params_query.go

@@ -37,7 +37,6 @@ func ParseFilters[T any](c fiber.Ctx, formColumnMappimg ...map[string]string) (f
 func ParseFieldFilters[T any](c fiber.Ctx, formColumnMapping ...map[string]string) (*filters.FiltersList, error) {
 	// var model T
 	list := filters.NewFiltersList()
-
 	whereScopefilters := ParseWhereScopes[T](c, []string{}, formColumnMapping...)
 	list.Append(whereScopefilters...)
 

app/utils/query/query_params/parse_sort.go

@@ -22,7 +22,7 @@ func ParseOrdering[T any](c fiber.Ctx, columnMapping ...map[string]string) ([]Or
 	for _, r := range rules {
 		ord, err := parseOrderingRule[T](r, columnMapping...)
 		if err != nil {
-			return orderings, err
+			continue
 		}
 		orderings = append(orderings, ord)
 	}

app/utils/query/query_params/where_scope_from_query.go

@@ -16,7 +16,6 @@ func ParseWhereScopes[T any](c fiber.Ctx, ignoredKeys []string, formColumnMappin
 	for key, value := range c.Request().URI().QueryArgs().All() {
 		keyStr := string(key)
 		valStr := string(value)
-
 		isIgnored := false
 		for _, ignoredKey := range ignoredKeys {
 			if keyStr == ignoredKey {