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

app/service/authService/auth.go

@@ -153,7 +153,6 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 		Password:                 string(hashedPassword),
 		FirstName:                req.FirstName,
 		LastName:                 req.LastName,
-		Role:                     model.Role{},
 		Provider:                 model.ProviderLocal,
 		IsActive:                 false,
 		EmailVerified:            false,

app/service/authService/google_oauth.go

@@ -150,7 +150,6 @@ func (s *AuthService) findOrCreateGoogleUser(info *view.GoogleUserInfo) (*model.
 		Provider:      model.ProviderGoogle,
 		ProviderID:    info.ID,
 		AvatarURL:     info.Picture,
-		Role:          model.Role{},
 		IsActive:      true,
 		EmailVerified: true,
 		LangID:        2, // default is english

app/service/customerService/customerService.go

@@ -3,6 +3,8 @@ package customerService
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/customerRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 )
 
 type CustomerService struct {
@@ -18,3 +20,7 @@ func New() *CustomerService {
 func (s *CustomerService) GetById(id uint) (*model.Customer, error) {
 	return s.repo.Get(id)
 }
+
+func (s *CustomerService) Find(langId uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.UserInList], error) {
+	return s.repo.Find(langId, p, filt)
+}

app/service/listService/listService.go

@@ -1,26 +0,0 @@
-package listService
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/listRepo"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
-)
-
-type ListService struct {
-	listRepo listRepo.UIListRepo
-}
-
-func New() *ListService {
-	return &ListService{
-		listRepo: listRepo.New(),
-	}
-}
-
-func (s *ListService) ListProducts(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
-	return s.listRepo.ListProducts(id_lang, p, filters)
-}
-
-func (s *ListService) ListUsers(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.UserInList], error) {
-	return s.listRepo.ListUsers(id_lang, p, filters)
-}

app/service/productService/productService.go

@@ -3,8 +3,11 @@ package productService
 import (
 	"encoding/json"
 
+	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 )
 
 type ProductService struct {
@@ -25,3 +28,7 @@ func (s *ProductService) GetJSON(p_id_product, p_id_lang, p_id_customer, b2b_id_
 
 	return products, nil
 }
+
+func (s *ProductService) Find(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
+	return s.productsRepo.Find(id_lang, p, filters)
+}