[FIX/BE-US] adjustment purchase,closing hpp expedition,supplier filter flags

internal/modules/master/suppliers/controllers/supplier.controller.go

@@ -28,6 +28,7 @@ func (u *SupplierController) GetAll(c *fiber.Ctx) error {
 		Limit:    c.QueryInt("limit", 10),
 		Search:   c.Query("search", ""),
 		Category: c.Query("category", ""),
+		Flag:     c.Query("flag", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/master/suppliers/services/supplier.service.go

@@ -47,6 +47,10 @@ func (s supplierService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("NonstockSuppliers.Nonstock.Flags")
 }
 
+func (s supplierService) withListRelations(db *gorm.DB) *gorm.DB {
+	return db.Preload("CreatedUser")
+}
+
 func (s supplierService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Supplier, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -63,7 +67,7 @@ func (s supplierService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 	offset := (params.Page - 1) * params.Limit
 
 	suppliers, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = s.withRelations(db)
+		db = s.withListRelations(db)
 		if params.Search != "" {
 			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -72,7 +76,23 @@ func (s supplierService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 			db = db.Where("category ILIKE ?", "%"+params.Category+"%")
 		}
 
-		return db.Order("created_at DESC").Order("updated_at DESC")
+		if params.Flag != "" {
+			flag := strings.ToUpper(params.Flag)
+			db = db.Where(`
+				EXISTS (
+					SELECT 1
+					FROM nonstock_suppliers nsup
+					JOIN nonstocks n ON n.id = nsup.nonstock_id
+					JOIN flags f ON f.flagable_id = n.id AND f.flagable_type = ?
+					WHERE nsup.supplier_id = suppliers.id
+					  AND UPPER(f.name) = ?
+				)`,
+				entity.FlagableTypeNonstock,
+				flag,
+			)
+		}
+
+		return db.Order("suppliers.created_at DESC").Order("suppliers.updated_at DESC")
 	})
 
 	if err != nil {

internal/modules/master/suppliers/validations/supplier.validation.go

@@ -32,7 +32,8 @@ type Update struct {
 
 type Query struct {
 	Page     int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit    int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	Limit    int    `query:"limit" validate:"omitempty,number,min=1"`
+	Flag	 string `query:"flag" validate:"omitempty"`
 	Search   string `query:"search" validate:"omitempty,max=50"`
 	Category string `query:"category" validate:"omitempty,max=50"`
 }