[FIX/BE-US] feat adjustment location and area

internal/middleware/role_scope.go

@@ -82,6 +82,18 @@ func ResolveLocationScope(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, error) {
 	return ScopeFilter{IDs: locationIDs, Restrict: true}, nil
 }
 
+func ResolveLocationAreaScopes(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, ScopeFilter, error) {
+	locationScope, err := ResolveLocationScope(c, db)
+	if err != nil {
+		return ScopeFilter{}, ScopeFilter{}, err
+	}
+	areaScope, err := ResolveAreaScope(c, db)
+	if err != nil {
+		return ScopeFilter{}, ScopeFilter{}, err
+	}
+	return locationScope, areaScope, nil
+}
+
 func collectRoleScope(c *fiber.Ctx) (roleScope, error) {
 	ctx, ok := AuthDetails(c)
 	if !ok || ctx == nil {
@@ -212,6 +224,31 @@ func ApplyAreaScope(c *fiber.Ctx, db *gorm.DB, column string) (*gorm.DB, error)
 	return ApplyScopeFilter(db, scope, column), nil
 }
 
+func ApplyLocationAreaScope(c *fiber.Ctx, db *gorm.DB, locationColumn, areaColumn string) (*gorm.DB, error) {
+	scopeDB := db
+	if db != nil {
+		scopeDB = db.Session(&gorm.Session{NewDB: true})
+	}
+
+	if locationColumn != "" {
+		locationScope, err := ResolveLocationScope(c, scopeDB)
+		if err != nil {
+			return db, err
+		}
+		db = ApplyScopeFilter(db, locationScope, locationColumn)
+	}
+
+	if areaColumn != "" {
+		areaScope, err := ResolveAreaScope(c, scopeDB)
+		if err != nil {
+			return db, err
+		}
+		db = ApplyScopeFilter(db, areaScope, areaColumn)
+	}
+
+	return db, nil
+}
+
 func EnsureWarehouseAccess(c *fiber.Ctx, db *gorm.DB, warehouseID uint) error {
 	if warehouseID == 0 {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid warehouse id")
@@ -486,7 +523,7 @@ func EnsureUniformityAccess(c *fiber.Ctx, db *gorm.DB, uniformityID uint) error
 
 	var count int64
 	q := db.WithContext(c.Context()).
-		Table("project_flock_kandang_uniformities u").
+		Table("project_flock_kandang_uniformity u").
 		Joins("JOIN project_flock_kandangs pfk ON pfk.id = u.project_flock_kandang_id").
 		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
 		Where("u.id = ?", uniformityID)