FEAT[BE] :update price calculation in sales order service for accurate rounding, add new conversion unit for quantity

Back Merge Production

See merge request mbugroup/lti-api!292

ci/production.yml

@@ -1,6 +1,6 @@
 stages:
   - build
-#  - migrate
+  - migrate
   - deploy
   - seed
 
@@ -49,41 +49,80 @@ build_production:
 
 
 # =========================
-# MIGRATE (PRODUCTION - MANUAL)
+# MIGRATE (PRODUCTION)
 # =========================
-#migrate_production:
-#  stage: migrate
-#  rules:
-#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-#      when: manual
-#      allow_failure: false
-#  needs:
-#    - job: build_production
-#      artifacts: false
-#  script: |
-#    set -e
-#    cd /opt/deploy/lti
-#    test -f .env || (echo "❌ .env not found" && exit 1)
+migrate_production:
+  stage: migrate
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+  needs:
+    - job: build_production
+      artifacts: false
+  script: |
+    set -e
+    echo "✅ Running migrations (production) ..."
 
-#   set -a
-#    . ./.env
-#    set +a
+    cd "$DEPLOY_DIR"
+    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
+    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
 
-    # Validasi env wajib
-#    : "${DB_HOST:?DB_HOST not set}"
-#    : "${DB_PORT:?DB_PORT not set}"
-#    : "${DB_USER:?DB_USER not set}"
-#    : "${DB_PASSWORD:?DB_PASSWORD not set}"
-#    : "${DB_NAME:?DB_NAME not set}"
+    # ✅ load env dari server
+    set -a
+    . ./.env
+    set +a
 
-#    DB_SSLMODE="${DB_SSLMODE:-require}"
-#    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE}"
+    # ✅ validasi
+    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
+    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
+    test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
+    test -n "$DB_PASSWORD" || (echo "❌ DB_PASSWORD empty" && exit 1)
+    test -n "$DB_NAME" || (echo "❌ DB_NAME empty" && exit 1)
 
-#   echo "✅ Running migrations (production)..."
-#    docker run --rm \
-#      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
-#      migrate/migrate:v4.15.2 \
-#      -path=/migrations -database "$DATABASE_URL" up
+    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
+    echo "✅ DATABASE_URL=$DATABASE_URL"
+
+    # ✅ Pastikan postgres & redis ON (sesuaikan nama service compose kamu!)
+    echo "✅ Ensuring postgres & redis running ..."
+    docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
+
+    # ✅ Ambil network key dari compose
+    COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
+    echo "✅ Compose network key: $COMPOSE_NETWORK_KEY"
+
+    # ✅ Cari network name yang dipakai docker
+    NETWORK_NAME="$(docker network ls --format '{{.Name}}' | grep "_${COMPOSE_NETWORK_KEY}$" | head -n 1)"
+    test -n "$NETWORK_NAME" || (echo "❌ Cannot find docker network for compose ($COMPOSE_NETWORK_KEY)" && exit 1)
+
+    echo "✅ Docker network detected: $NETWORK_NAME"
+
+    # ✅ Migrations dari repo (CI workspace)
+    echo "✅ Checking migrations from repo..."
+    ls -lah "$CI_PROJECT_DIR/internal/database/migrations"
+
+    echo "✅ Running migrations via migrate/migrate container"
+    set +e
+    out=$(docker run --rm \
+      --network "$NETWORK_NAME" \
+      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
+      migrate/migrate:v4.15.2 \
+      -path=/migrations -database "$DATABASE_URL" up 2>&1)
+    code=$?
+    set -e
+
+    echo "$out"
+
+    # ✅ Handle no change dengan benar (tidak false-success)
+    if echo "$out" | grep -qi "no change"; then
+      echo "✅ No change (already up to date)"
+      exit 0
+    fi
+
+    if [ $code -ne 0 ]; then
+      echo "❌ Migration failed with exit code $code"
+      exit $code
+    fi
+
+    echo "✅ Migration applied successfully"
 
 
 # =========================

cmd/api/main.go

@@ -14,8 +14,8 @@ import (
 	"gitlab.com/mbugroup/lti-api.git/internal/database"
 	"gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
+	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
 	"gitlab.com/mbugroup/lti-api.git/internal/route"
-	"gitlab.com/mbugroup/lti-api.git/internal/sso"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"

internal/common/repository/common.hpp.repository.go

@@ -20,7 +20,7 @@ type HppCostRepository interface {
 	GetTotalPopulation(ctx context.Context, projectFlockKandangIDs []uint) (float64, error)
 	GetPulletCost(ctx context.Context, projectFlockKandangId uint) (float64, error)
 	GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error)
-	GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error)
+	GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, startDate *time.Time, endDate *time.Time) (float64, float64, error)
 	GetProjectFlockIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangId uint) (uint, error)
 	GetTransferSourceSummary(ctx context.Context, projectFlockKandangId uint) (uint, float64, error)
 }
@@ -219,25 +219,55 @@ func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandang
 	return totals.TotalPieces, totals.TotalWeightKg, nil
 }
 
-func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error) {
-	if date == nil {
+func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(
+	ctx context.Context,
+	projectFlockKandangIDs []uint,
+	startDate *time.Time,
+	endDate *time.Time,
+) (float64, float64, error) {
+
+	if endDate == nil {
 		now := time.Now()
-		date = &now
+		endDate = &now
 	}
 
+	type subResult struct {
+		UsableID    uint
+		MdpUsageQty float64
+		MdpWeight   float64
+	}
+
+	subQuery := r.db.WithContext(ctx).
+		Table("recordings AS r").
+		Select(`
+			DISTINCT sa.usable_id,
+			mdp.usage_qty  AS mdp_usage_qty,
+			mdp.total_weight AS mdp_weight
+		`).
+		Joins("JOIN recording_eggs re ON re.recording_id = r.id").
+		Joins(
+			"JOIN stock_allocations sa ON sa.stockable_type = ? AND sa.stockable_id = re.id AND sa.usable_type = ?",
+			fifo.StockableKeyRecordingEgg.String(),
+			fifo.UsableKeyMarketingDelivery.String(),
+		).
+		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id").
+		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
+		Where("r.record_datetime <= ?", *endDate).
+		Where("mdp.delivery_date <= ?", *startDate)
+
 	var totals struct {
 		TotalPieces float64
 		TotalWeight float64
 	}
+
 	err := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		Select("COALESCE(SUM(mdp.usage_qty), 0) AS total_pieces, COALESCE(SUM(mdp.total_weight), 0) AS total_weight").
-		Joins("JOIN recording_eggs AS re ON re.recording_id = r.id").
-		Joins("JOIN stock_allocations AS sa ON sa.stockable_type = ? AND sa.stockable_id = re.id AND sa.usable_type = ?", fifo.StockableKeyRecordingEgg.String(), fifo.UsableKeyMarketingDelivery.String()).
-		Joins("JOIN marketing_delivery_products AS mdp ON mdp.id = sa.usable_id").
-		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
-		Where("r.record_datetime <= ?", *date).
+		Table("(?) AS x", subQuery).
+		Select(`
+			COALESCE(SUM(x.mdp_usage_qty), 0)  AS total_pieces,
+			COALESCE(SUM(x.mdp_weight), 0)     AS total_weight
+		`).
 		Scan(&totals).Error
+
 	if err != nil {
 		return 0, 0, err
 	}

internal/common/service/common.approval.service.go

@@ -15,7 +15,7 @@ type ApprovalService interface {
 	WorkflowSteps(workflow approvalutils.ApprovalWorkflowKey) map[approvalutils.ApprovalStep]string
 	WorkflowStepName(workflow approvalutils.ApprovalWorkflowKey, step approvalutils.ApprovalStep) (string, bool)
 	CreateApproval(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, step approvalutils.ApprovalStep, action *entity.ApprovalAction, actorID uint, note *string) (*entity.Approval, error)
-	List(ctx context.Context, module string, approvableID *uint, page, limit int, search string) ([]entity.Approval, int64, error)
+	List(ctx context.Context, module string, approvableID *uint, page, limit int, search string, orderByDate string) ([]entity.Approval, int64, error)
 	ListByTarget(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, modifier func(*gorm.DB) *gorm.DB) ([]entity.Approval, error)
 	LatestByTarget(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, modifier func(*gorm.DB) *gorm.DB) (*entity.Approval, error)
 	LatestByTargets(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableIDs []uint, modifier func(*gorm.DB) *gorm.DB) (map[uint]*entity.Approval, error)
@@ -70,9 +70,14 @@ func (s *approvalService) List(
 	approvableID *uint,
 	page, limit int,
 	search string,
+	orderByDate string,
 ) ([]entity.Approval, int64, error) {
 	module = strings.TrimSpace(strings.ToUpper(module))
 	search = strings.TrimSpace(search)
+	orderByDate = strings.TrimSpace(strings.ToUpper(orderByDate))
+	if orderByDate != "ASC" && orderByDate != "DESC" {
+		orderByDate = "DESC"
+	}
 
 	if limit <= 0 {
 		limit = 10
@@ -90,7 +95,7 @@ func (s *approvalService) List(
 		func(db *gorm.DB) *gorm.DB {
 			query := db.
 				Where("approvable_type = ?", module).
-				Order("action_at DESC").
+				Order("action_at " + orderByDate).
 				Preload("ActionUser")
 
 			if approvableID != nil {

internal/common/service/common.document.service.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	defaultDocumentPathLimit = 50
+	defaultDocumentPathLimit = 255
 	defaultDocumentKeyPrefix = "docs"
 	maxDocumentNameLength    = 50
 )
@@ -363,13 +363,19 @@ func (s *documentService) generateObjectKey(ext string) (string, error) {
 	}
 
 	u := uuid.New().String()
-	key := fmt.Sprintf("%s/%s%s", strings.Trim(s.keyPrefix, "/"), u, normalizedExt)
-	if s.keyPrefix == "" {
-		key = fmt.Sprintf("%s%s", u, normalizedExt)
+	keyPrefix := strings.Trim(s.keyPrefix, "/")
+	key := fmt.Sprintf("%s%s", u, normalizedExt)
+	if keyPrefix != "" {
+		key = fmt.Sprintf("%s/%s%s", keyPrefix, u, normalizedExt)
 	}
 
 	if len(key) > s.maxPathLength {
-		key = fmt.Sprintf("%s%s", u, normalizedExt)
+		compact := strings.ReplaceAll(u, "-", "")
+		if keyPrefix != "" {
+			key = fmt.Sprintf("%s/%s%s", keyPrefix, compact, normalizedExt)
+		} else {
+			key = fmt.Sprintf("%s%s", compact, normalizedExt)
+		}
 	}
 
 	if len(key) > s.maxPathLength {

internal/common/service/common.hpp.service.go

@@ -11,10 +11,10 @@ import (
 type HppService interface {
 	CalculateHppCost(projectFlockKandangId uint, date *time.Time) (*HppCostResponse, error)
 	GetTotalDepresiasiFlockGrowing(sourceProjectFlockID uint, date *time.Time) (float64, error)
-	GetTotalProductionCost(projectFlockKandangId uint, date *time.Time, totalDepresiasiGrowing float64) (float64, error)
-	GetBudgetKandangLaying(projectFlockKandangId uint, date *time.Time) (float64, error)
+	GetTotalProductionCost(projectFlockKandangId uint, endDate *time.Time, depresiasiTransfer float64) (float64, error)
+	GetBudgetKandangLaying(projectFlockKandangId uint, endDate *time.Time) (float64, error)
 	GetDepresiasiTransfer(projectFlockKandangId uint, date *time.Time) (float64, error)
-	GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, date *time.Time) (*HppCostResponse, error)
+	GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, startDate *time.Time, endDate *time.Time) (*HppCostResponse, error)
 }
 
 type HppCostResponse struct {
@@ -44,17 +44,25 @@ func (s *hppService) CalculateHppCost(projectFlockKandangId uint, date *time.Tim
 		date = &now
 	}
 
-	depresiasiTransfer, err := s.GetDepresiasiTransfer(projectFlockKandangId, date)
+	location, err := time.LoadLocation("Asia/Jakarta")
 	if err != nil {
 		return nil, err
 	}
 
-	totalProductionCost, err := s.GetTotalProductionCost(projectFlockKandangId, date, depresiasiTransfer)
+	startOfDay := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, location)
+	endOfDay := startOfDay.Add(24 * time.Hour)
+
+	depresiasiTransfer, err := s.GetDepresiasiTransfer(projectFlockKandangId, &endOfDay)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.GetHppEstimationDanRealisasi(totalProductionCost, projectFlockKandangId, date)
+	totalProductionCost, err := s.GetTotalProductionCost(projectFlockKandangId, &endOfDay, depresiasiTransfer)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.GetHppEstimationDanRealisasi(totalProductionCost, projectFlockKandangId, &startOfDay, &endOfDay)
 
 }
 
@@ -101,23 +109,23 @@ func (s *hppService) GetTotalDepresiasiFlockGrowing(sourceProjectFlockID uint, d
 	return docCost + budgetCost + expedisionCost + feedCost + ovkCost, nil
 }
 
-func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, date *time.Time, depresiasiTransfer float64) (float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
+func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, endDate *time.Time, depresiasiTransfer float64) (float64, error) {
+	// if date == nil {
+	// 	now := time.Now()
+	// 	date = &now
+	// }
 
 	costPullet, err := s.hppRepo.GetPulletCost(context.Background(), projectFlockKandangId)
 	if err != nil {
 		return 0, err
 	}
 
-	costFeed, err := s.hppRepo.GetFeedUsageCost(context.Background(), []uint{projectFlockKandangId}, date)
+	costFeed, err := s.hppRepo.GetFeedUsageCost(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
 		return 0, err
 	}
 
-	costOvk, err := s.hppRepo.GetOvkUsageCost(context.Background(), []uint{projectFlockKandangId}, date)
+	costOvk, err := s.hppRepo.GetOvkUsageCost(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
 		return 0, err
 	}
@@ -127,7 +135,7 @@ func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, date *ti
 		return 0, err
 	}
 
-	costBudget, err := s.GetBudgetKandangLaying(projectFlockKandangId, date)
+	costBudget, err := s.GetBudgetKandangLaying(projectFlockKandangId, endDate)
 	if err != nil {
 		return 0, err
 	}
@@ -135,11 +143,11 @@ func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, date *ti
 	return depresiasiTransfer + costPullet + costFeed + costOvk + costExpedision + costBudget, nil
 }
 
-func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, date *time.Time) (float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
+func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, endDate *time.Time) (float64, error) {
+	// if date == nil {
+	// 	now := time.Now()
+	// 	date = &now
+	// }
 
 	if s.hppRepo == nil {
 		return 0, nil
@@ -155,12 +163,12 @@ func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, date *ti
 		return 0, err
 	}
 
-	eggProduksiPiecesFlock, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), projectFlockKandangIds, date)
+	eggProduksiPiecesFlock, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), projectFlockKandangIds, endDate)
 	if err != nil {
 		return 0, err
 	}
 
-	eggProduksiPiecesKandang, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, date)
+	eggProduksiPiecesKandang, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
 		return 0, err
 	}
@@ -177,11 +185,11 @@ func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, date *ti
 	return (totalBudgetCost * eggProduksiPiecesKandang) / eggProduksiPiecesFlock, nil
 }
 
-func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, date *time.Time) (float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
+func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, endDate *time.Time) (float64, error) {
+	// if endDate == nil {
+	// 	now := time.Now()
+	// 	endDate = &now
+	// }
 
 	if s.hppRepo == nil {
 		return 0, nil
@@ -205,7 +213,7 @@ func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, date *tim
 		return 0, nil
 	}
 
-	totalDepresiasiFlockGrowing, err := s.GetTotalDepresiasiFlockGrowing(sourceProjectFlockID, date)
+	totalDepresiasiFlockGrowing, err := s.GetTotalDepresiasiFlockGrowing(sourceProjectFlockID, endDate)
 	if err != nil {
 		return 0, err
 	}
@@ -213,22 +221,18 @@ func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, date *tim
 	return (totalDepresiasiFlockGrowing * transferTotalQty) / totalPopulationFlockGrowing, nil
 }
 
-func (s *hppService) GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, date *time.Time) (*HppCostResponse, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
+func (s *hppService) GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, startDate *time.Time, endDate *time.Time) (*HppCostResponse, error) {
 
 	if s.hppRepo == nil {
 		return &HppCostResponse{}, nil
 	}
 
-	estimPieces, estimWeightKg, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, date)
+	estimPieces, estimWeightKg, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
 		return nil, err
 	}
 
-	realPieces, realWeightKg, err := s.hppRepo.GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, date)
+	realPieces, realWeightKg, err := s.hppRepo.GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, startDate, endDate)
 	if err != nil {
 		return nil, err
 	}

internal/config/config.go

@@ -61,6 +61,7 @@ var (
 	SSOCookieDomain         string
 	SSOCookieSecure         bool
 	SSOCookieSameSite       string
+	SSOAccessTokenMaxBytes  int
 	SSOTokenBlacklistPrefix string
 	SSOPKCETTL              time.Duration
 	SSOUserSyncDrift        time.Duration
@@ -73,6 +74,7 @@ var (
 	S3SecretKey             string
 	S3ForcePathStyle        bool
 	S3PublicBaseURL         string
+	S3EnvPrefix             string
 	S3DocumentKeyPrefix     string
 )
 
@@ -123,7 +125,12 @@ func init() {
 	S3SecretKey = strings.TrimSpace(viper.GetString("S3_SECRET_KEY"))
 	S3ForcePathStyle = viper.GetBool("S3_FORCE_PATH_STYLE")
 	S3PublicBaseURL = strings.TrimSuffix(strings.TrimSpace(viper.GetString("S3_PUBLIC_BASE_URL")), "/")
-	S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
+	S3EnvPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_ENV_PREFIX")), "/"), "local")
+	docPrefix := strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/")
+	if docPrefix == "" {
+		docPrefix = "docs"
+	}
+	S3DocumentKeyPrefix = joinPath(S3EnvPrefix, docPrefix)
 
 	// SSO integration
 	SSOIssuer = viper.GetString("SSO_ISSUER")
@@ -138,6 +145,10 @@ func init() {
 	SSOCookieDomain = viper.GetString("SSO_COOKIE_DOMAIN")
 	SSOCookieSecure = viper.GetBool("SSO_COOKIE_SECURE")
 	SSOCookieSameSite = defaultString(viper.GetString("SSO_COOKIE_SAMESITE"), "Lax")
+	SSOAccessTokenMaxBytes = viper.GetInt("SSO_ACCESS_TOKEN_MAX_BYTES")
+	if SSOAccessTokenMaxBytes <= 0 {
+		SSOAccessTokenMaxBytes = 4096
+	}
 	SSOTokenBlacklistPrefix = defaultString(viper.GetString("SSO_TOKEN_BLACKLIST_PREFIX"), "sso:blacklist")
 	if ttl := viper.GetInt("SSO_PKCE_TTL_SECONDS"); ttl > 0 {
 		SSOPKCETTL = time.Duration(ttl) * time.Second
@@ -242,6 +253,17 @@ func defaultString(v, def string) string {
 	return v
 }
 
+func joinPath(parts ...string) string {
+	out := make([]string, 0, len(parts))
+	for _, part := range parts {
+		part = strings.Trim(part, "/")
+		if part != "" {
+			out = append(out, part)
+		}
+	}
+	return strings.Join(out, "/")
+}
+
 func ensureProdConfig() {
 	if SSOAuthorizeURL == "" || !strings.HasPrefix(SSOAuthorizeURL, "https://") {
 		panic("SSO_AUTHORIZE_URL must be https in production")

internal/database/migrations/20260124050853_alter_payments_bank_id_nullable.down.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE payments
+    ALTER COLUMN bank_id SET NOT NULL;
+
+COMMIT;

internal/database/migrations/20260124050853_alter_payments_bank_id_nullable.up.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE payments
+    ALTER COLUMN bank_id DROP NOT NULL;
+
+COMMIT;

internal/database/migrations/20260126075643_remove_stock_log_id_from_adjustment_stocks.down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE adjustment_stocks ADD COLUMN stock_log_id INTEGER;
+
+CREATE INDEX idx_adjustment_stocks_stock_log_id ON adjustment_stocks (stock_log_id);

internal/database/migrations/20260126075643_remove_stock_log_id_from_adjustment_stocks.up.sql

@@ -0,0 +1 @@
+ALTER TABLE adjustment_stocks DROP COLUMN IF EXISTS stock_log_id;

internal/database/migrations/20260127114036_change_type_data_column_id_daily_checklist.down.sql

@@ -0,0 +1,56 @@
+BEGIN;
+
+DO $$
+DECLARE
+  t text;
+  seq_name text;
+BEGIN
+  FOREACH t IN ARRAY ARRAY[
+    'daily_checklist_activity_task_assignments',
+    'daily_checklist_activity_tasks',
+    'daily_checklist_phases',
+    'daily_checklist_tasks',
+    'daily_checklists',
+    'employee_kandangs',
+    'employees',
+    'phase_activities',
+    'phases'
+  ]
+  LOOP
+    -- Sequence name convention
+    seq_name := format('public.%I_id_seq', t);
+
+    -- 1) Drop default nextval (bigserial behavior)
+    EXECUTE format(
+      'ALTER TABLE public.%I ALTER COLUMN id DROP DEFAULT',
+      t
+    );
+
+    -- 2) Add IDENTITY back (BY DEFAULT is safer for rollback)
+    EXECUTE format(
+      'ALTER TABLE public.%I ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY',
+      t
+    );
+
+    -- 3) Detach & optionally drop sequence (safe)
+    IF EXISTS (
+      SELECT 1 FROM pg_class
+      WHERE relkind = 'S'
+        AND relname = t || '_id_seq'
+    ) THEN
+      EXECUTE format(
+        'ALTER SEQUENCE %s OWNED BY NONE',
+        seq_name
+      );
+
+      -- Optional: drop sequence (comment if you want to keep it)
+      EXECUTE format(
+        'DROP SEQUENCE IF EXISTS %s',
+        seq_name
+      );
+    END IF;
+
+  END LOOP;
+END $$;
+
+COMMIT;

internal/database/migrations/20260127114036_change_type_data_column_id_daily_checklist.up.sql

@@ -0,0 +1,59 @@
+BEGIN;
+
+DO $$
+DECLARE
+  t text;
+  seq_name text;
+  max_id bigint;
+BEGIN
+  FOREACH t IN ARRAY ARRAY[
+    'daily_checklist_activity_task_assignments',
+    'daily_checklist_activity_tasks',
+    'daily_checklist_phases',
+    'daily_checklist_tasks',
+    'daily_checklists',
+    'employee_kandangs',
+    'employees',
+    'phase_activities',
+    'phases'
+  ]
+  LOOP
+    -- Sequence name convention: public.<table>_id_seq
+    seq_name := format('public.%I_id_seq', t);
+
+    -- Drop IDENTITY only if the column is identity (safe to re-run)
+    IF EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+        AND table_name   = t
+        AND column_name  = 'id'
+        AND is_identity  = 'YES'
+    ) THEN
+      EXECUTE format('ALTER TABLE public.%I ALTER COLUMN id DROP IDENTITY', t);
+    END IF;
+
+    -- Ensure sequence exists
+    EXECUTE format('CREATE SEQUENCE IF NOT EXISTS %s', seq_name);
+
+    -- Set default like bigserial
+    EXECUTE format(
+      'ALTER TABLE public.%I ALTER COLUMN id SET DEFAULT nextval(''%s'')',
+      t, seq_name
+    );
+
+    -- Own the sequence by the column
+    EXECUTE format(
+      'ALTER SEQUENCE %s OWNED BY public.%I.id',
+      seq_name, t
+    );
+
+    -- Sync sequence to MAX(id) + 1 to avoid duplicate key
+    EXECUTE format('SELECT COALESCE(MAX(id), 0) FROM public.%I', t) INTO max_id;
+
+    EXECUTE format('SELECT setval(''%s'', $1, false)', seq_name)
+      USING (max_id + 1);
+  END LOOP;
+END $$;
+
+COMMIT;

internal/database/migrations/20260128034158_create_field_stock.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE stock_logs
+DROP COLUMN stock;

internal/database/migrations/20260128034158_create_field_stock.up.sql

@@ -0,0 +1,18 @@
+ALTER TABLE stock_logs
+ADD COLUMN stock NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+WITH calc AS (
+  SELECT
+    id,
+    SUM(COALESCE(increase, 0) - COALESCE(decrease, 0))
+      OVER (
+        PARTITION BY product_warehouse_id
+        ORDER BY id
+        ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
+      ) AS running_stock
+  FROM stock_logs
+)
+UPDATE stock_logs t
+SET stock = c.running_stock
+FROM calc c
+WHERE t.id = c.id;

internal/database/migrations/20260128035908_alter_documents_path_length.down.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+-- Migration: revert documents.path length
+ALTER TABLE documents
+    ALTER COLUMN path TYPE VARCHAR(50);
+
+COMMIT;

internal/database/migrations/20260128035908_alter_documents_path_length.up.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+-- Migration: extend documents.path length for environment prefixes
+ALTER TABLE documents
+    ALTER COLUMN path TYPE VARCHAR(255);
+
+COMMIT;

internal/database/migrations/20260129083458_create_transfer_laying_sequence.down.sql

@@ -0,0 +1,2 @@
+-- Drop transfer laying sequence
+DROP SEQUENCE IF EXISTS transfer_laying_seq;

internal/database/migrations/20260129083458_create_transfer_laying_sequence.up.sql

@@ -0,0 +1,33 @@
+-- Create sequence for transfer laying movement number
+CREATE SEQUENCE IF NOT EXISTS transfer_laying_seq START
+WITH
+    1 INCREMENT BY 1 MINVALUE 1 MAXVALUE 99999 NO CYCLE;
+
+-- Set sequence starting value based on existing data (if any)
+-- This prevents duplicate movement numbers if there's already data
+DO $$ DECLARE max_existing INTEGER;
+
+BEGIN
+-- Check if table exists and has data
+IF EXISTS (
+    SELECT 1
+    FROM information_schema.tables
+    WHERE
+        table_schema = 'public'
+        AND table_name = 'transfer_to_layings'
+) THEN
+-- Get max ID from existing records
+SELECT COALESCE(MAX(id), 0) INTO max_existing
+FROM transfer_to_layings;
+
+-- Set sequence to start after the highest existing ID
+IF max_existing > 0 THEN PERFORM setval (
+    'transfer_laying_seq',
+    max_existing
+);
+
+END IF;
+
+END IF;
+
+END $$;

internal/database/migrations/20260203054206_update_marketing_tables.down.sql

@@ -0,0 +1,8 @@
+-- Remove columns from marketing_products
+ALTER TABLE marketing_products
+DROP COLUMN IF EXISTS week,
+DROP COLUMN IF EXISTS weight_per_convertion,
+DROP COLUMN IF EXISTS convertion_unit;
+
+-- Remove column from marketings
+ALTER TABLE marketings DROP COLUMN IF EXISTS marketing_type;

internal/database/migrations/20260203054206_update_marketing_tables.up.sql

@@ -0,0 +1,9 @@
+-- Add marketing_type to marketings table
+ALTER TABLE marketings
+ADD COLUMN IF NOT EXISTS marketing_type VARCHAR(50);
+
+-- Add convertion fields to marketing_products table
+ALTER TABLE marketing_products
+ADD COLUMN IF NOT EXISTS convertion_unit VARCHAR(20),
+ADD COLUMN IF NOT EXISTS weight_per_convertion NUMERIC(15, 3),
+ADD COLUMN IF NOT EXISTS week INTEGER;

internal/entities/adjustment_stock.go

@@ -4,7 +4,6 @@ import "time"
 
 type AdjustmentStock struct {
 	Id                 uint      `gorm:"primaryKey"`
-	StockLogId         uint      `gorm:"column:stock_log_id;not null;index"`
 	ProductWarehouseId uint      `gorm:"column:product_warehouse_id;not null"`
 	TotalQty           float64   `gorm:"column:total_qty;default:0"`
 	TotalUsed          float64   `gorm:"column:total_used;default:0"`
@@ -13,6 +12,6 @@ type AdjustmentStock struct {
 	CreatedAt          time.Time `gorm:"column:created_at;autoCreateTime"`
 	UpdatedAt          time.Time `gorm:"column:updated_at;autoUpdateTime"`
 
-	StockLog         *StockLog         `gorm:"foreignKey:StockLogId;references:Id"`
 	ProductWarehouse *ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	StockLog         *StockLog         `gorm:"polymorphic:Loggable;polymorphicType:LoggableType;polymorphicId:LoggableId;polymorphicValue:ADJUSTMENT"`
 }

internal/entities/document.go

@@ -7,7 +7,7 @@ type Document struct {
 	DocumentableType string    `gorm:"size:50;not null;index:documents_documentable_polymorphic,priority:1"`
 	DocumentableId   uint64    `gorm:"not null;index:documents_documentable_polymorphic,priority:2"`
 	Type             string    `gorm:"size:50;not null"`
-	Path             string    `gorm:"size:50;not null"`
+	Path             string    `gorm:"size:255;not null"`
 	Name             string    `gorm:"size:50;not null"`
 	Ext              string    `gorm:"size:50;not null"`
 	Size             float64   `gorm:"type:numeric(15,3);not null"`

internal/entities/marketing.go

@@ -14,6 +14,7 @@ type Marketing struct {
 	SoDate        time.Time      `gorm:"type:date;not null"`
 	SalesPersonId uint           `gorm:"not null"`
 	Notes         string         `gorm:"type:text"`
+	MarketingType string         `gorm:"type:varchar(50)"`
 	CreatedBy     uint           `gorm:"not null"`
 	CreatedAt     time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt     time.Time      `gorm:"autoUpdateTime"`

internal/entities/marketing_product.go

@@ -1,14 +1,17 @@
 package entities
 
 type MarketingProduct struct {
-	Id                 uint    `gorm:"primaryKey;autoIncrement"`
-	MarketingId        uint    `gorm:"not null"`
-	ProductWarehouseId uint    `gorm:"not null"`
-	Qty                float64 `gorm:"type:numeric(15,3);not null"`
-	UnitPrice          float64 `gorm:"type:numeric(15,3);not null"`
-	AvgWeight          float64 `gorm:"type:numeric(15,3);not null"`
-	TotalWeight        float64 `gorm:"type:numeric(15,3);not null"`
-	TotalPrice         float64 `gorm:"type:numeric(15,3);not null"`
+	Id                  uint     `gorm:"primaryKey;autoIncrement"`
+	MarketingId         uint     `gorm:"not null"`
+	ProductWarehouseId  uint     `gorm:"not null"`
+	Qty                 float64  `gorm:"type:numeric(15,3);not null"`
+	ConvertionUnit      *string  `gorm:"type:varchar(20)"`
+	WeightPerConvertion *float64 `gorm:"type:numeric(15,3)"`
+	Week                *int     `gorm:"type:integer"`
+	UnitPrice           float64  `gorm:"type:numeric(15,3);not null"`
+	AvgWeight           float64  `gorm:"type:numeric(15,3);not null"`
+	TotalWeight         float64  `gorm:"type:numeric(15,3);not null"`
+	TotalPrice          float64  `gorm:"type:numeric(15,3);not null"`
 
 	Marketing        Marketing                 `gorm:"foreignKey:MarketingId;references:Id"`
 	ProductWarehouse ProductWarehouse          `gorm:"foreignKey:ProductWarehouseId;references:Id"`

internal/entities/stock_log.go

@@ -9,6 +9,7 @@ type StockLog struct {
 
 	Increase float64 `gorm:"column:increase;type:numeric(15,3);default:0"`
 	Decrease float64 `gorm:"column:decrease;type:numeric(15,3);default:0"`
+	Stock    float64 `gorm:"column:stock;type:numeric(15,3);not null;default:0"`
 
 	LoggableType string `gorm:"column:loggable_type;type:varchar(50);not null"`
 	LoggableId   uint   `gorm:"column:loggable_id;not null"`

internal/entities/stock_transfer_delivery.go

@@ -6,7 +6,7 @@ import "time"
 type StockTransferDelivery struct {
 	Id                uint64 `gorm:"primaryKey;autoIncrement"`
 	StockTransferId   uint64
-	SupplierId        uint64
+	SupplierId        *uint64
 	VehiclePlate      string
 	DriverName        string
 	DocumentNumber    string

internal/middleware/auth.go

@@ -7,8 +7,8 @@ import (
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
+	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
-	"gitlab.com/mbugroup/lti-api.git/internal/sso"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
@@ -24,6 +24,10 @@ type AuthContext struct {
 	User         *entity.User
 	Roles        []sso.Role
 	Permissions  map[string]struct{}
+	UserAreaIDs     []uint
+	UserLocationIDs []uint
+	UserAllArea     bool
+	UserAllLocation bool
 }
 
 // Auth validates the incoming request against the central SSO access token and
@@ -67,15 +71,19 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 
 		var roles []sso.Role
 		permissions := make(map[string]struct{})
+		var profile *sso.UserProfile
 		if verification.UserID != 0 {
-			if profile, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
+			if p, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
 				utils.Log.WithError(err).Warn("auth: failed to fetch sso profile")
-			} else if profile != nil {
-				roles = profile.Roles
-				for _, perm := range profile.PermissionNames() {
-					if perm != "" {
-						permissions[perm] = struct{}{}
-					}
+			} else {
+				profile = p
+			}
+		}
+		if profile != nil {
+			roles = profile.Roles
+			for _, perm := range profile.PermissionNames() {
+				if perm != "" {
+					permissions[perm] = struct{}{}
 				}
 			}
 		}
@@ -86,6 +94,16 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 			User:         user,
 			Roles:        roles,
 			Permissions:  permissions,
+			UserAreaIDs:     nil,
+			UserLocationIDs: nil,
+			UserAllArea:     false,
+			UserAllLocation: false,
+		}
+		if profile != nil {
+			ctx.UserAreaIDs = profile.AreaIDs
+			ctx.UserLocationIDs = profile.LocationIDs
+			ctx.UserAllArea = profile.AllArea
+			ctx.UserAllLocation = profile.AllLocation
 		}
 
 		c.Locals(authContextLocalsKey, ctx)

internal/middleware/role_scope.go

@@ -0,0 +1,636 @@
+package middleware
+
+import (
+	"errors"
+
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+)
+
+type ScopeFilter struct {
+	IDs      []uint
+	Restrict bool
+}
+
+type roleScope struct {
+	allArea      bool
+	allLocation  bool
+	areaIDs      []uint
+	locationIDs  []uint
+	hasAnyScopes bool
+}
+
+func ResolveAreaScope(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, error) {
+	scope, err := collectRoleScope(c)
+	if err != nil || !scope.hasAnyScopes {
+		return ScopeFilter{}, err
+	}
+
+	if scope.allArea || scope.allLocation {
+		return ScopeFilter{}, nil
+	}
+
+	allowed := uniqueUint(scope.areaIDs)
+	if len(scope.locationIDs) > 0 {
+		derived, err := areaIDsByLocationIDs(db, scope.locationIDs)
+		if err != nil {
+			return ScopeFilter{}, err
+		}
+		allowed = uniqueUint(append(allowed, derived...))
+	}
+
+	if len(allowed) == 0 {
+		return ScopeFilter{Restrict: true}, nil
+	}
+	return ScopeFilter{IDs: allowed, Restrict: true}, nil
+}
+
+func ResolveLocationScope(c *fiber.Ctx, db *gorm.DB) (ScopeFilter, error) {
+	scope, err := collectRoleScope(c)
+	if err != nil || !scope.hasAnyScopes {
+		return ScopeFilter{}, err
+	}
+
+	if scope.allLocation || scope.allArea {
+		return ScopeFilter{}, nil
+	}
+
+	areaIDs := uniqueUint(scope.areaIDs)
+	locationIDs := uniqueUint(scope.locationIDs)
+
+	switch {
+	case len(locationIDs) > 0 && len(areaIDs) > 0:
+		filtered, err := filterLocationIDsByAreaIDs(db, locationIDs, areaIDs)
+		if err != nil {
+			return ScopeFilter{}, err
+		}
+		locationIDs = filtered
+	case len(locationIDs) == 0 && len(areaIDs) > 0:
+		derived, err := locationIDsByAreaIDs(db, areaIDs)
+		if err != nil {
+			return ScopeFilter{}, err
+		}
+		locationIDs = derived
+	}
+
+	locationIDs = uniqueUint(locationIDs)
+	if len(locationIDs) == 0 {
+		return ScopeFilter{Restrict: true}, nil
+	}
+	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 {
+		return roleScope{}, nil
+	}
+
+	userAreaIDs := uniqueUint(ctx.UserAreaIDs)
+	userLocationIDs := uniqueUint(ctx.UserLocationIDs)
+	userScope := roleScope{
+		allArea:      ctx.UserAllArea,
+		allLocation:  ctx.UserAllLocation,
+		areaIDs:      userAreaIDs,
+		locationIDs:  userLocationIDs,
+		hasAnyScopes: ctx.UserAllArea || ctx.UserAllLocation || len(userAreaIDs) > 0 || len(userLocationIDs) > 0,
+	}
+	if userScope.hasAnyScopes {
+		return userScope, nil
+	}
+
+	return roleScope{}, nil
+}
+
+func areaIDsByLocationIDs(db *gorm.DB, locationIDs []uint) ([]uint, error) {
+	if db == nil {
+		return nil, errors.New("database not configured")
+	}
+	if len(locationIDs) == 0 {
+		return nil, nil
+	}
+	var areaIDs []uint
+	if err := db.Model(&entity.Location{}).
+		Where("deleted_at IS NULL").
+		Where("id IN ?", locationIDs).
+		Distinct("area_id").
+		Pluck("area_id", &areaIDs).Error; err != nil {
+		return nil, err
+	}
+	return areaIDs, nil
+}
+
+func locationIDsByAreaIDs(db *gorm.DB, areaIDs []uint) ([]uint, error) {
+	if db == nil {
+		return nil, errors.New("database not configured")
+	}
+	if len(areaIDs) == 0 {
+		return nil, nil
+	}
+	var locationIDs []uint
+	if err := db.Model(&entity.Location{}).
+		Where("deleted_at IS NULL").
+		Where("area_id IN ?", areaIDs).
+		Distinct("id").
+		Pluck("id", &locationIDs).Error; err != nil {
+		return nil, err
+	}
+	return locationIDs, nil
+}
+
+func filterLocationIDsByAreaIDs(db *gorm.DB, locationIDs, areaIDs []uint) ([]uint, error) {
+	if db == nil {
+		return nil, errors.New("database not configured")
+	}
+	if len(locationIDs) == 0 || len(areaIDs) == 0 {
+		return nil, nil
+	}
+	var filtered []uint
+	if err := db.Model(&entity.Location{}).
+		Where("deleted_at IS NULL").
+		Where("id IN ?", locationIDs).
+		Where("area_id IN ?", areaIDs).
+		Distinct("id").
+		Pluck("id", &filtered).Error; err != nil {
+		return nil, err
+	}
+	return filtered, nil
+}
+
+func uniqueUint(ids []uint) []uint {
+	if len(ids) == 0 {
+		return nil
+	}
+	seen := make(map[uint]struct{}, len(ids))
+	result := make([]uint, 0, len(ids))
+	for _, id := range ids {
+		if id == 0 {
+			continue
+		}
+		if _, ok := seen[id]; ok {
+			continue
+		}
+		seen[id] = struct{}{}
+		result = append(result, id)
+	}
+	return result
+}
+
+func ApplyScopeFilter(db *gorm.DB, scope ScopeFilter, column string) *gorm.DB {
+	if db == nil || !scope.Restrict {
+		return db
+	}
+	if len(scope.IDs) == 0 {
+		return db.Where("1 = 0")
+	}
+	return db.Where(column+" IN ?", scope.IDs)
+}
+
+func ApplyLocationScope(c *fiber.Ctx, db *gorm.DB, column string) (*gorm.DB, error) {
+	scopeDB := db
+	if db != nil {
+		scopeDB = db.Session(&gorm.Session{NewDB: true})
+	}
+	scope, err := ResolveLocationScope(c, scopeDB)
+	if err != nil {
+		return db, err
+	}
+	return ApplyScopeFilter(db, scope, column), nil
+}
+
+func ApplyAreaScope(c *fiber.Ctx, db *gorm.DB, column string) (*gorm.DB, error) {
+	scopeDB := db
+	if db != nil {
+		scopeDB = db.Session(&gorm.Session{NewDB: true})
+	}
+	scope, err := ResolveAreaScope(c, scopeDB)
+	if err != nil {
+		return db, err
+	}
+	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")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Warehouse{}).
+			Where("id = ?", warehouseID),
+		scope,
+		"warehouses.location_id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+	}
+	return nil
+}
+
+func EnsureAreaAccess(c *fiber.Ctx, db *gorm.DB, areaID uint) error {
+	if areaID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid area id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveAreaScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Area not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Area{}).
+			Where("id = ?", areaID),
+		scope,
+		"areas.id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Area not found")
+	}
+	return nil
+}
+
+func EnsureLocationAccess(c *fiber.Ctx, db *gorm.DB, locationID uint) error {
+	if locationID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid location id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Location not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Location{}).
+			Where("id = ?", locationID),
+		scope,
+		"locations.id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Location not found")
+	}
+	return nil
+}
+
+func EnsureKandangAccess(c *fiber.Ctx, db *gorm.DB, kandangID uint) error {
+	if kandangID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.Kandang{}).
+			Where("id = ?", kandangID),
+		scope,
+		"kandangs.location_id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+	return nil
+}
+
+func EnsureProductWarehouseAccess(c *fiber.Ctx, db *gorm.DB, productWarehouseID uint) error {
+	if productWarehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid product warehouse id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Product warehouse not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("product_warehouses pw").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Where("pw.id = ?", productWarehouseID)
+	q = ApplyScopeFilter(q, scope, "w.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Product warehouse not found")
+	}
+	return nil
+}
+
+func EnsureStockLogAccess(c *fiber.Ctx, db *gorm.DB, stockLogID uint) error {
+	if stockLogID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid stock log id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Stock log not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("stock_logs sl").
+		Joins("JOIN product_warehouses pw ON pw.id = sl.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Where("sl.id = ?", stockLogID)
+	q = ApplyScopeFilter(q, scope, "w.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Stock log not found")
+	}
+	return nil
+}
+
+func EnsureMarketingAccess(c *fiber.Ctx, db *gorm.DB, marketingID uint) error {
+	if marketingID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid marketing id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Marketing not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("marketings m").
+		Joins("JOIN marketing_products mp ON mp.marketing_id = m.id").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+		Where("m.id = ?", marketingID)
+	q = ApplyScopeFilter(q, scope, "w.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Marketing not found")
+	}
+	return nil
+}
+
+func EnsureRecordingAccess(c *fiber.Ctx, db *gorm.DB, recordingID uint) error {
+	if recordingID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid recording id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Recording not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("recordings r").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.id = r.project_flock_kandangs_id").
+		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
+		Where("r.id = ?", recordingID)
+	q = ApplyScopeFilter(q, scope, "pf.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Recording not found")
+	}
+	return nil
+}
+
+func EnsureUniformityAccess(c *fiber.Ctx, db *gorm.DB, uniformityID uint) error {
+	if uniformityID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid uniformity id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Uniformity not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		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)
+	q = ApplyScopeFilter(q, scope, "pf.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Uniformity not found")
+	}
+	return nil
+}
+
+func EnsureLayingTransferAccess(c *fiber.Ctx, db *gorm.DB, transferID uint) error {
+	if transferID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid transfer id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("laying_transfers lt").
+		Joins("JOIN project_flocks pf_from ON pf_from.id = lt.from_project_flock_id").
+		Joins("JOIN project_flocks pf_to ON pf_to.id = lt.to_project_flock_id").
+		Where("lt.id = ?", transferID).
+		Where("(pf_from.location_id IN ? OR pf_to.location_id IN ?)", scope.IDs, scope.IDs)
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+	}
+	return nil
+}
+
+func EnsureProjectFlockAccess(c *fiber.Ctx, db *gorm.DB, projectFlockID uint) error {
+	if projectFlockID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
+	}
+
+	var count int64
+	if err := ApplyScopeFilter(
+		db.WithContext(c.Context()).
+			Model(&entity.ProjectFlock{}).
+			Where("id = ?", projectFlockID),
+		scope,
+		"project_flocks.location_id",
+	).Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
+	}
+	return nil
+}
+
+func EnsureProjectFlockKandangAccess(c *fiber.Ctx, db *gorm.DB, projectFlockID, projectFlockKandangID uint) error {
+	if projectFlockKandangID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project flock kandang id")
+	}
+	if db == nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Database not configured")
+	}
+
+	scope, err := ResolveLocationScope(c, db)
+	if err != nil || !scope.Restrict {
+		return err
+	}
+	if len(scope.IDs) == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock Kandang not found")
+	}
+
+	var count int64
+	q := db.WithContext(c.Context()).
+		Table("project_flock_kandangs").
+		Joins("JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id").
+		Where("project_flock_kandangs.id = ?", projectFlockKandangID)
+	if projectFlockID > 0 {
+		q = q.Where("project_flock_kandangs.project_flock_id = ?", projectFlockID)
+	}
+	q = ApplyScopeFilter(q, scope, "project_flocks.location_id")
+	if err := q.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Project Flock Kandang not found")
+	}
+	return nil
+}

internal/modules/approvals/controllers/approval.controller.go

@@ -44,6 +44,15 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 	page := c.QueryInt("page", 1)
 	limit := c.QueryInt("limit", 10)
 	search := strings.TrimSpace(c.Query("search", ""))
+	orderByDate := strings.TrimSpace(c.Query("order_by_date", ""))
+	if orderByDate == "" {
+		orderByDate = "DESC"
+	} else {
+		orderByDate = strings.ToUpper(orderByDate)
+		if orderByDate != "ASC" && orderByDate != "DESC" {
+			return fiber.NewError(fiber.StatusBadRequest, "order_by_date must be either ASC or DESC")
+		}
+	}
 
 	query := &validation.Query{
 		ModuleName:  moduleName,
@@ -52,6 +61,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 		Page:        page,
 		Limit:       limit,
 		Search:      search,
+		OrderByDate: orderByDate,
 	}
 
 	records, totalResults, err := u.ApprovalService.List(
@@ -61,6 +71,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 		query.Page,
 		query.Limit,
 		query.Search,
+		query.OrderByDate,
 	)
 	if err != nil {
 		return err

internal/modules/approvals/validations/approval.validation.go

@@ -7,4 +7,5 @@ type Query struct {
 	Page        int    `query:"page" validate:"omitempty,number,min=1"`
 	Limit       int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
 	Search      string `query:"search" validate:"omitempty,max=50"`
+	OrderByDate string `query:"order_by_date" validate:"omitempty,oneof=ASC DESC"`
 }

internal/modules/closings/dto/closingKeuangan.dto.go

@@ -1,8 +1,12 @@
 package dto
 
-// === CLOSING KEUANGAN CODES ===
+import (
+	"strings"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
 
-// Closing HPP Codes
 type ClosingHPPCode string
 
 const (
@@ -14,36 +18,30 @@ const (
 	HPPCodeEkspedisi  ClosingHPPCode = "EKSPEDISI"
 )
 
-// Closing Profit Loss Codes
 type ClosingProfitLossCode string
 
 const (
-	PLCodeSales    ClosingProfitLossCode = "SALES"
-	PLCodeSapronak ClosingProfitLossCode = "SAPRONAK"
-	PLCodeOverhead ClosingProfitLossCode = "OVERHEAD"
+	PLCodeSales     ClosingProfitLossCode = "SALES"
+	PLCodeSapronak  ClosingProfitLossCode = "SAPRONAK"
+	PLCodeOverhead  ClosingProfitLossCode = "OVERHEAD"
 	PLCodeEkspedisi ClosingProfitLossCode = "EKSPEDISI"
 )
 
-// === NEW CLOSING KEUANGAN DTO ===
-
-// FinancialMetrics represents financial metrics with per unit and total amounts
 type FinancialMetrics struct {
 	RpPerBird float64 `json:"rp_per_bird"`
 	RpPerKg   float64 `json:"rp_per_kg"`
 	Amount    float64 `json:"amount"`
 }
 
-// HPPItem represents an item in HPP section
 type HPPItem struct {
 	ID          uint             `json:"id"`
-	Category    string           `json:"category"` // "purchase" or "overhead"
-	Code        string           `json:"code"`     // "PAKAN", "OVK", "DOC", "EKSPEDISI"
+	Category    string           `json:"category"`
+	Code        string           `json:"code"`
 	Label       string           `json:"label"`
 	Budgeting   FinancialMetrics `json:"budgeting"`
 	Realization FinancialMetrics `json:"realization"`
 }
 
-// HPPSummary represents summary for HPP section
 type HPPSummary struct {
 	Label          string            `json:"label"`
 	Budgeting      FinancialMetrics  `json:"budgeting"`
@@ -52,52 +50,41 @@ type HPPSummary struct {
 	EggRealization *FinancialMetrics `json:"egg_realization,omitempty"`
 }
 
-// HPPSection represents HPP data section
 type HPPSection struct {
-	Items   []HPPItem   `json:"items"`
+	Items   []HPPItem  `json:"items"`
 	Summary HPPSummary `json:"summary"`
 }
 
-// ProfitLossItem represents an item in Profit & Loss section
 type ProfitLossItem struct {
-	Code      string  `json:"code"` // "SALES", "PURCHASE_DOC", "OVERHEAD", "EKSPEDISI"
+	Code      string  `json:"code"`
 	Label     string  `json:"label"`
-	Type      string  `json:"type"` // "income", "purchase", "overhead"
+	Type      string  `json:"type"`
 	RpPerBird float64 `json:"rp_per_bird"`
 	RpPerKg   float64 `json:"rp_per_kg"`
 	Amount    float64 `json:"amount"`
 }
 
-// ProfitLossSummary represents summary for Profit & Loss section
 type ProfitLossSummary struct {
 	GrossProfit FinancialMetrics `json:"gross_profit"`
 	SubTotal    FinancialMetrics `json:"sub_total"`
 	NetProfit   FinancialMetrics `json:"net_profit"`
 }
 
-// ProfitLossSection represents Profit & Loss data section
 type ProfitLossSection struct {
-	Items   []ProfitLossItem    `json:"items"`
-	Summary ProfitLossSummary   `json:"summary"`
+	Items   []ProfitLossItem  `json:"items"`
+	Summary ProfitLossSummary `json:"summary"`
 }
 
-// ClosingKeuanganData represents the main data structure
 type ClosingKeuanganData struct {
-	HPP        HPPSection      `json:"hpp"`
+	HPP        HPPSection        `json:"hpp"`
 	ProfitLoss ProfitLossSection `json:"profit_loss"`
 }
-
-// ClosingKeuanganResponse represents the full API response
-type ClosingKeuanganResponse struct {
-	Code    int                  `json:"code"`
-	Status  string               `json:"status"`
-	Message string               `json:"message"`
-	Data    ClosingKeuanganData  `json:"data"`
+type MetricsCalculator struct {
+	TotalPopulation     float64
+	ActualPopulation    float64
+	TotalWeightProduced float64
 }
 
-// === MAPPER FUNCTIONS ===
-
-// ToFinancialMetrics creates FinancialMetrics from values
 func ToFinancialMetrics(rpPerBird, rpPerKg, amount float64) FinancialMetrics {
 	return FinancialMetrics{
 		RpPerBird: rpPerBird,
@@ -106,7 +93,6 @@ func ToFinancialMetrics(rpPerBird, rpPerKg, amount float64) FinancialMetrics {
 	}
 }
 
-// ToHPPItem creates HPP item
 func ToHPPItem(id uint, category, code, label string, budgeting, realization FinancialMetrics) HPPItem {
 	return HPPItem{
 		ID:          id,
@@ -118,7 +104,6 @@ func ToHPPItem(id uint, category, code, label string, budgeting, realization Fin
 	}
 }
 
-// ToHPPSummary creates HPP summary
 func ToHPPSummary(label string, budgeting, realization FinancialMetrics, eggBudgeting, eggRealization *FinancialMetrics) HPPSummary {
 	return HPPSummary{
 		Label:          label,
@@ -129,7 +114,6 @@ func ToHPPSummary(label string, budgeting, realization FinancialMetrics, eggBudg
 	}
 }
 
-// ToHPPSection creates HPP section
 func ToHPPSection(items []HPPItem, summary HPPSummary) HPPSection {
 	return HPPSection{
 		Items:   items,
@@ -137,7 +121,6 @@ func ToHPPSection(items []HPPItem, summary HPPSummary) HPPSection {
 	}
 }
 
-// ToProfitLossItem creates Profit & Loss item
 func ToProfitLossItem(code, label, itemType string, rpPerBird, rpPerKg, amount float64) ProfitLossItem {
 	return ProfitLossItem{
 		Code:      code,
@@ -149,7 +132,6 @@ func ToProfitLossItem(code, label, itemType string, rpPerBird, rpPerKg, amount f
 	}
 }
 
-// ToProfitLossSummary creates Profit & Loss summary
 func ToProfitLossSummary(grossProfit, subTotal, netProfit FinancialMetrics) ProfitLossSummary {
 	return ProfitLossSummary{
 		GrossProfit: grossProfit,
@@ -158,7 +140,6 @@ func ToProfitLossSummary(grossProfit, subTotal, netProfit FinancialMetrics) Prof
 	}
 }
 
-// ToProfitLossSection creates Profit & Loss section
 func ToProfitLossSection(items []ProfitLossItem, summary ProfitLossSummary) ProfitLossSection {
 	return ProfitLossSection{
 		Items:   items,
@@ -166,7 +147,6 @@ func ToProfitLossSection(items []ProfitLossItem, summary ProfitLossSummary) Prof
 	}
 }
 
-// ToClosingKeuanganData creates complete closing keuangan data
 func ToClosingKeuanganData(hpp HPPSection, profitLoss ProfitLossSection) ClosingKeuanganData {
 	return ClosingKeuanganData{
 		HPP:        hpp,
@@ -174,12 +154,72 @@ func ToClosingKeuanganData(hpp HPPSection, profitLoss ProfitLossSection) Closing
 	}
 }
 
-// ToSuccessClosingKeuanganResponse creates success response
-func ToSuccessClosingKeuanganResponse(data ClosingKeuanganData) ClosingKeuanganResponse {
-	return ClosingKeuanganResponse{
-		Code:    200,
-		Status:  "success",
-		Message: "Get closing keuangan successfully",
-		Data:    data,
+func (mc *MetricsCalculator) CalculateMetrics(amount float64) (rpPerBird, rpPerKg float64) {
+	if mc.ActualPopulation > 0 {
+		rpPerBird = amount / mc.ActualPopulation
 	}
+	if mc.TotalWeightProduced > 0 {
+		rpPerKg = amount / mc.TotalWeightProduced
+	}
+	return
+}
+
+func (mc *MetricsCalculator) CalculateProfitLossMetrics(amount float64) (rpPerBird, rpPerKg float64) {
+	if mc.TotalPopulation > 0 {
+		rpPerBird = amount / mc.TotalPopulation
+	}
+	if mc.TotalWeightProduced > 0 {
+		rpPerKg = amount / mc.TotalWeightProduced
+	}
+	return
+}
+
+type ProductFilter struct {
+	ProjectFlockCategory string
+}
+
+func (pf *ProductFilter) IsEggProduct(product entity.Product) bool {
+	for _, flag := range product.Flags {
+		flagName := strings.ToUpper(flag.Name)
+		if flagName == string(utils.FlagTelur) ||
+			flagName == string(utils.FlagTelurUtuh) ||
+			flagName == string(utils.FlagTelurPecah) ||
+			flagName == string(utils.FlagTelurPutih) ||
+			flagName == string(utils.FlagTelurRetak) {
+			return true
+		}
+	}
+	return false
+}
+
+func (pf *ProductFilter) IsChickenProduct(product entity.Product) bool {
+	for _, flag := range product.Flags {
+		flagName := strings.ToUpper(flag.Name)
+		if flagName == string(utils.FlagAyamAfkir) ||
+			flagName == string(utils.FlagAyamCulling) ||
+			flagName == string(utils.FlagAyamMati) {
+			return true
+		}
+	}
+	return false
+}
+
+func (pf *ProductFilter) ShouldIncludeProduct(product entity.Product) bool {
+	if pf.ProjectFlockCategory == string(utils.ProjectFlockCategoryLaying) {
+		return pf.IsEggProduct(product)
+	}
+	return pf.IsChickenProduct(product) || (!pf.IsEggProduct(product) && !pf.IsChickenProduct(product))
+}
+
+func (pf *ProductFilter) FilterDeliveryProducts(deliveries []entity.MarketingDeliveryProduct) []entity.MarketingDeliveryProduct {
+	filtered := make([]entity.MarketingDeliveryProduct, 0)
+	for _, delivery := range deliveries {
+		if delivery.MarketingProduct.ProductWarehouse.Product.Id == 0 {
+			continue
+		}
+		if pf.ShouldIncludeProduct(delivery.MarketingProduct.ProductWarehouse.Product) {
+			filtered = append(filtered, delivery)
+		}
+	}
+	return filtered
 }

internal/modules/closings/dto/closingMarketing.dto.go

@@ -8,6 +8,7 @@ import (
 	customerDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 // === Response DTO ===
@@ -44,7 +45,17 @@ type PenjualanRealisasiResponseDTO struct {
 
 func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 
-	ageInDay, ageInWeeks := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate)
+	productFlags := make([]string, len(e.MarketingProduct.ProductWarehouse.Product.Flags))
+	for i, f := range e.MarketingProduct.ProductWarehouse.Product.Flags {
+		productFlags[i] = f.Name
+	}
+
+	var category string
+	if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil {
+		category = e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.ProjectFlock.Category
+	}
+
+	ageInDay, ageInWeeks := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate, productFlags, category)
 
 	var product *productDTO.ProductRelationDTO
 	if e.MarketingProduct.ProductWarehouse.Product.Id != 0 {
@@ -90,17 +101,44 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	}
 }
 
-func ToSummaryDto(e []entity.MarketingDeliveryProduct) SummaryDTO {
+func ToSalesAgeDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 
+	productFlags := make([]string, len(e.MarketingProduct.ProductWarehouse.Product.Flags))
+	for i, f := range e.MarketingProduct.ProductWarehouse.Product.Flags {
+		productFlags[i] = f.Name
+	}
+
+	var category string
+	if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil {
+		category = e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.ProjectFlock.Category
+	}
+
+	ageInDay, _ := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate, productFlags, category)
+
+	return SalesDTO{
+		Age: ageInDay,
+		Qty: e.UsageQty,
+	}
+}
+
+func ToSummaryDto(e []entity.MarketingDeliveryProduct) SummaryDTO {
 	var totalSalesPrice, totalActualPrice, sumSales, sumActual float64
 	count := len(e)
 
+	if count == 0 {
+		return SummaryDTO{
+			TotalSalesPrice:  0,
+			TotalActualPrice: 0,
+			AvgSalesPrice:    0,
+			AvgActualPrice:   0,
+		}
+	}
+
 	for _, item := range e {
 		totalSalesPrice += item.MarketingProduct.TotalPrice
 		totalActualPrice += item.TotalPrice
 		sumSales += item.MarketingProduct.UnitPrice
 		sumActual += item.UnitPrice
-
 	}
 
 	return SummaryDTO{
@@ -126,11 +164,30 @@ func ToPenjualanRealisasiResponseDTO(e []entity.MarketingDeliveryProduct) Penjua
 	}
 }
 
-func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, deliveryDate *time.Time) (int, int) {
+func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, deliveryDate *time.Time, productFlags []string, category string) (int, int) {
 	if projectFlockKandang == nil || deliveryDate == nil || len(projectFlockKandang.Chickins) == 0 {
 		return 0, 0
 	}
 
+	for _, flag := range productFlags {
+		if flag == string(utils.FlagOVK) ||
+			flag == string(utils.FlagPakan) ||
+			flag == string(utils.FlagPreStarter) ||
+			flag == string(utils.FlagStarter) ||
+			flag == string(utils.FlagFinisher) ||
+			flag == string(utils.FlagObat) ||
+			flag == string(utils.FlagVitamin) ||
+			flag == string(utils.FlagKimia) ||
+			flag == string(utils.FlagEkspedisi) ||
+			flag == string(utils.FlagTelur) ||
+			flag == string(utils.FlagTelurUtuh) ||
+			flag == string(utils.FlagTelurPecah) ||
+			flag == string(utils.FlagTelurPutih) ||
+			flag == string(utils.FlagTelurRetak) {
+			return 0, 0
+		}
+	}
+
 	earliestChickinDate := projectFlockKandang.Chickins[0].ChickInDate
 	for _, chickin := range projectFlockKandang.Chickins {
 		if chickin.ChickInDate.Before(earliestChickinDate) {
@@ -145,8 +202,12 @@ func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, de
 	if ageInDays <= 0 {
 		ageInWeeks = 0
 	} else {
-
-		ageInWeeks = ((ageInDays - 1) / 7) + 1
+		if category == string(utils.ProjectFlockCategoryLaying) {
+			ageInDays = ageInDays + 119
+			ageInWeeks = ((ageInDays - 1) / 7) + 1
+		} else {
+			ageInWeeks = ((ageInDays - 1) / 7) + 1
+		}
 	}
 
 	return ageInDays, ageInWeeks

internal/modules/closings/dto/closingSapronak.dto.go

@@ -196,7 +196,11 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 		}
 
 		for idx, item := range group.Items {
-			productKey := strings.ToUpper(flagKey + "|" + item.ProductName)
+			refKey := strings.TrimSpace(item.NoReferensi)
+			productKey := strings.ToUpper(flagKey + "|" + item.ProductName + "|" + refKey)
+			if refKey == "" {
+				productKey = strings.ToUpper(flagKey + "|" + item.ProductName + "|" + formatDate(item.Tanggal))
+			}
 			baseRow := SapronakCategoryRowDTO{
 				ID:              idx + 1,
 				Date:            formatDate(item.Tanggal),
@@ -212,6 +216,9 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 			switch strings.ToLower(item.JenisTransaksi) {
 			case "pembelian", "adjustment masuk", "mutasi masuk":
 				row.QtyIn += item.QtyMasuk
+				if item.Tanggal != nil {
+					row.Date = formatDate(item.Tanggal)
+				}
 				if row.UnitPrice == 0 {
 					if item.QtyMasuk > 0 && item.Nilai > 0 {
 						row.UnitPrice = item.Nilai / item.QtyMasuk

internal/modules/closings/module.go

@@ -25,7 +25,6 @@ type ClosingModule struct{}
 
 func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	closingRepo := rClosing.NewClosingRepository(db)
-	closingKeuanganRepo := rClosing.NewClosingKeuanganRepository(db)
 	userRepo := rUser.NewUserRepository(db)
 	projectFlockRepo := rProjectFlock.NewProjectflockRepository(db)
 	projectFlockKandangRepo := rProjectFlock.NewProjectFlockKandangRepository(db)
@@ -40,9 +39,11 @@ func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	purchaseRepo := rPurchase.NewPurchaseRepository(db)
 	approvalRepo := commonRepo.NewApprovalRepository(db)
 	approvalService := commonSvc.NewApprovalService(approvalRepo)
+	hppCostRepo := commonRepo.NewHppCostRepository(db)
+	hppService := commonSvc.NewHppService(hppCostRepo)
 
 	closingService := sClosing.NewClosingService(closingRepo, projectFlockRepo, projectFlockKandangRepo, marketingRepo, marketingDeliveryProductRepo, approvalService, expenseRealizationRepo, projectBudgetRepo, chickinRepo, purchaseRepo, recordingRepo, standardGrowthDetailRepo, productionStandardDetailRepo, validate)
-	closingKeuanganService := sClosing.NewClosingKeuanganService(closingKeuanganRepo, projectFlockRepo, projectFlockKandangRepo, marketingDeliveryProductRepo, expenseRealizationRepo, projectBudgetRepo, chickinRepo, recordingRepo)
+	closingKeuanganService := sClosing.NewClosingKeuanganService(projectFlockRepo, projectFlockKandangRepo, marketingDeliveryProductRepo, expenseRealizationRepo, projectBudgetRepo, chickinRepo, recordingRepo, hppService, hppCostRepo)
 	sapronakService := sClosing.NewSapronakService(closingRepo, projectFlockKandangRepo, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 

internal/modules/closings/repositories/closing.repository.go

@@ -32,9 +32,10 @@ type ClosingRepository interface {
 	FetchSapronakUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakChickinUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error)
 	FetchSapronakChickinUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
 	FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
-	FetchSapronakSales(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakSales(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
 	GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error)
 }
 
@@ -354,9 +355,10 @@ func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDs
 		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
+		Joins("JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
 		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name IN ?", flagNames).
-		Select("COALESCE(SUM(mp.total_weight), 0) AS total_weight, COALESCE(SUM(mp.qty), 0) AS total_qty, COALESCE(SUM(mp.total_price), 0) AS total_price").
+		Select("COALESCE(SUM(mdp.total_weight), 0) AS total_weight, COALESCE(SUM(mdp.usage_qty), 0) AS total_qty, COALESCE(SUM(mdp.total_price), 0) AS total_price").
 		Scan(&agg).Error
 	if err != nil {
 		return 0, 0, 0, err
@@ -708,6 +710,23 @@ var (
 	sapronakFlagsChickin = sapronakFlags(utils.FlagDOC, utils.FlagPullet)
 )
 
+func (r *ClosingRepositoryImpl) joinSapronakProductFlag(db *gorm.DB, productAlias string) *gorm.DB {
+	subquery := r.DB().
+		Table("flags").
+		Select("DISTINCT ON (flagable_id) flagable_id, name").
+		Where("flagable_type = ?", entity.FlagableTypeProduct).
+		Where("name IN ?", sapronakFlagsAll).
+		Order(fmt.Sprintf(
+			"flagable_id, CASE WHEN name = '%s' THEN 1 WHEN name = '%s' THEN 2 WHEN name = '%s' THEN 3 WHEN name = '%s' THEN 4 ELSE 5 END",
+			utils.FlagDOC,
+			utils.FlagPullet,
+			utils.FlagPakan,
+			utils.FlagOVK,
+		))
+
+	return db.Joins("JOIN (?) f ON f.flagable_id = "+productAlias+".id", subquery)
+}
+
 func groupSapronakDetails(rows []SapronakDetailRow) map[uint][]SapronakDetailRow {
 	m := make(map[uint][]SapronakDetailRow)
 	for _, row := range rows {
@@ -744,11 +763,12 @@ func (r *ClosingRepositoryImpl) usageQuery(
 		COALESCE(p.product_price, 0) AS default_price
 	`)
 	db = applyJoins(db, joins...)
-	return db.
+	db = db.
 		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where(where, args...)
+	db = r.joinSapronakProductFlag(db, "p")
+	return db
 }
 
 func (r *ClosingRepositoryImpl) fetchSapronakUsage(
@@ -778,11 +798,11 @@ func (r *ClosingRepositoryImpl) detailQuery(
 ) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table(table).
-		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct)
+		Joins("JOIN product_warehouses pw ON " + pwJoinCond).
+		Joins("JOIN products p ON p.id = pw.product_id")
 
 	db = applyJoins(db, joins...)
+	db = r.joinSapronakProductFlag(db, "p")
 	return db.Select(selectSQL).Where(where, args...)
 }
 
@@ -872,16 +892,83 @@ func (r *ClosingRepositoryImpl) FetchSapronakChickinUsageDetails(ctx context.Con
 	)
 }
 
+func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
+	if projectFlockKandangID == 0 {
+		return map[uint][]SapronakDetailRow{}, nil
+	}
+
+	query := r.withCtx(ctx).
+		Table("stock_allocations AS sa").
+		Select(`
+			pw.product_id AS product_id,
+			p.name AS product_name,
+			f.name AS flag,
+			COALESCE(
+				pi.received_date,
+				st.transfer_date,
+				lt.transfer_date,
+				ast.created_at,
+				pc.chick_in_date,
+				r.record_datetime
+			) AS date,
+			COALESCE(
+				po.po_number,
+				st.movement_number,
+				lt.transfer_number,
+				CONCAT('ADJ-', ast.id),
+				CONCAT('CHICKIN-', pc.id),
+				CAST(r.id AS TEXT),
+				''
+			) AS reference,
+			0 AS qty_in,
+			COALESCE(SUM(sa.qty), 0) AS qty_out,
+			COALESCE(pi.price, p.product_price, 0) AS price
+		`).
+		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("LEFT JOIN recording_stocks rs ON rs.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyRecordingStock.String()).
+		Joins("LEFT JOIN recordings r ON r.id = rs.recording_id").
+		Joins("LEFT JOIN project_chickins pc_used ON pc_used.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyProjectChickin.String()).
+		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
+		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
+		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
+		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
+		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
+		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
+		Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
+		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
+		Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
+		Where("sa.status = ?", entity.StockAllocationStatusActive).
+		Where("f.name IN ?", sapronakFlagsAll).
+		Where(`
+			(sa.usable_type = ? AND r.project_flock_kandangs_id = ?)
+			OR
+			(sa.usable_type = ? AND pc_used.project_flock_kandang_id = ?)
+		`,
+			fifo.UsableKeyRecordingStock.String(), projectFlockKandangID,
+			fifo.UsableKeyProjectChickin.String(), projectFlockKandangID,
+		)
+	query = r.joinSapronakProductFlag(query, "p").
+		Group(`
+			pw.product_id, p.name, f.name,
+			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at, pc.chick_in_date, r.record_datetime,
+			po.po_number, st.movement_number, lt.transfer_number, ast.id, pc.id, r.id,
+			pi.price, p.product_price
+		`)
+
+	return scanAndGroupDetails(query)
+}
+
 func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandangID uint) *gorm.DB {
-	return r.withCtx(ctx).
+	db := r.withCtx(ctx).
 		Table("purchase_items AS pi").
 		Joins("JOIN purchases po ON po.id = pi.purchase_id AND po.deleted_at IS NULL").
 		Joins("JOIN products p ON p.id = pi.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("JOIN warehouses w ON w.id = pi.warehouse_id").
 		Where("w.kandang_id = ?", kandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where("pi.received_date IS NOT NULL")
+	return r.joinSapronakProductFlag(db, "p")
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error) {
@@ -948,14 +1035,14 @@ func (r *ClosingRepositoryImpl) fetchStockLogs(ctx context.Context, kandangID ui
 			COALESCE(sl.increase,0) AS increase,
 			COALESCE(sl.decrease,0) AS decrease,
 			COALESCE(p.product_price,0) AS price,
-			`+movementSelect+`
+			` + movementSelect + `
 		`).
 		Joins("JOIN product_warehouses pw ON pw.id = sl.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id")
 
 	db = applyJoins(db, joins...)
+	db = r.joinSapronakProductFlag(db, "p")
 
 	if err := db.
 		Where("sl.loggable_type = ?", logType).
@@ -1024,10 +1111,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("JOIN product_warehouses pw ON pw.id = std.dest_product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = std.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(fw.kandang_id IS NULL OR fw.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll)
+	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
 	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1052,10 +1139,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("JOIN product_warehouses pw ON pw.id = ltt.product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_source.kandang_id IS NULL OR w_source.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll)
+	incomingLayingQuery = r.joinSapronakProductFlag(incomingLayingQuery, "p")
 	incomingLaying, err := scanAndGroupDetails(incomingLayingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1083,12 +1170,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("LEFT JOIN product_warehouses pw_dest ON pw_dest.id = std.dest_product_warehouse_id").
 		Joins("LEFT JOIN warehouses w_dest ON w_dest.id = pw_dest.warehouse_id").
 		Joins("JOIN products p ON p.id = std.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_dest.kandang_id IS NULL OR w_dest.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("std.id, std.product_id, p.name, f.name, st.transfer_date, st.movement_number, p.product_price")
+	outgoingQuery = r.joinSapronakProductFlag(outgoingQuery, "p")
 	outgoing, err := scanAndGroupDetails(outgoingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1114,12 +1201,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_dest.kandang_id IS NULL OR w_dest.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("lts.id, pw.product_id, p.name, f.name, lt.transfer_date, lt.transfer_number, p.product_price")
+	outgoingLayingQuery = r.joinSapronakProductFlag(outgoingLayingQuery, "p")
 	outgoingLaying, err := scanAndGroupDetails(outgoingLayingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1131,7 +1218,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 	return incoming, outgoing, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
@@ -1148,15 +1235,55 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, kandangI
 		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
 		Joins("JOIN marketings m ON m.id = mp.marketing_id").
 		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
-		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("w.kandang_id = ?", kandangID).
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
 
-	return scanAndGroupDetails(query)
+	query = r.joinSapronakProductFlag(query, "p")
+	sales, err := scanAndGroupDetails(query)
+	if err != nil {
+		return nil, err
+	}
+
+	nonFifoQuery := r.withCtx(ctx).
+		Table("marketing_delivery_products AS mdp").
+		Select(`
+			pw.product_id AS product_id,
+			p.name AS product_name,
+			f.name AS flag,
+			COALESCE(mdp.delivery_date, mdp.created_at) AS date,
+			COALESCE(m.so_number, '') AS reference,
+			0 AS qty_in,
+			COALESCE(mdp.usage_qty, 0) AS qty_out,
+			COALESCE(mdp.unit_price, mp.unit_price, 0) AS price
+		`).
+		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
+		Joins("JOIN marketings m ON m.id = mp.marketing_id").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("LEFT JOIN stock_allocations sa ON sa.usable_id = mdp.id AND sa.usable_type = ? AND sa.status = ?",
+			fifo.UsableKeyMarketingDelivery.String(),
+			entity.StockAllocationStatusActive,
+		).
+		Where("mdp.usage_qty > 0").
+		Where("sa.id IS NULL").
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("f.name IN ?", sapronakFlagsAll).
+		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
+
+	nonFifoQuery = r.joinSapronakProductFlag(nonFifoQuery, "p")
+	nonFifoSales, err := scanAndGroupDetails(nonFifoQuery)
+	if err != nil {
+		return nil, err
+	}
+
+	for pid, rows := range nonFifoSales {
+		sales[pid] = append(sales[pid], rows...)
+	}
+
+	return sales, nil
 }
 
 func (r *ClosingRepositoryImpl) GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error) {

internal/modules/closings/repositories/closingKeuangan.repository.go

@@ -1,365 +0,0 @@
-package repository
-
-import (
-	"context"
-	"fmt"
-	"sort"
-	"strings"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	"gorm.io/gorm"
-)
-
-// ClosingKeuanganRepository handles database operations for closing keuangan
-type ClosingKeuanganRepository interface {
-	repository.BaseRepository[interface{}]
-
-	// All Product Usage
-	GetAllProductUsageByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint, flagFilters []string) ([]ProductUsageRow, error)
-
-	// Depletion per kandang
-	GetTotalDepletionByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
-
-	// Weight produced from uniformity per kandang
-	GetTotalWeightProducedFromUniformityByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
-
-	// DB returns the underlying GORM DB instance
-	DB() *gorm.DB
-}
-
-type ClosingKeuanganRepositoryImpl struct {
-	*repository.BaseRepositoryImpl[interface{}]
-}
-
-func NewClosingKeuanganRepository(db *gorm.DB) ClosingKeuanganRepository {
-	return &ClosingKeuanganRepositoryImpl{
-		BaseRepositoryImpl: repository.NewBaseRepository[interface{}](db),
-	}
-}
-
-// Result Rows
-
-type ProductUsageRow struct {
-	ProductID         uint    `gorm:"column:product_id"`
-	ProductName       string  `gorm:"column:product_name"`
-	FlagNames         string  `gorm:"column:flag_names"`
-	TotalQty          float64 `gorm:"column:total_qty"`
-	Price             float64 `gorm:"column:price"`
-	TotalPengeluaran  float64 `gorm:"column:total_pengeluaran"`
-}
-
-// GetAllProductUsageByProjectFlockKandangID gets all product usage for a project flock kandang
-// Combines data from all usable types: recordings, chickins, marketing, transfers, adjustments
-// flagFilters: optional filter to get only specific flags (e.g., ["PAKAN", "OVK"]), empty means get all
-func (r *ClosingKeuanganRepositoryImpl) GetAllProductUsageByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint, flagFilters []string) ([]ProductUsageRow, error) {
-	if projectFlockKandangID == 0 {
-		return []ProductUsageRow{}, nil
-	}
-
-	type SubQueryResult struct {
-		ProductID   uint    `gorm:"column:product_id"`
-		ProductName string  `gorm:"column:product_name"`
-		TotalQty    float64 `gorm:"column:total_qty"`
-		Price       float64 `gorm:"column:price"`
-	}
-
-	type AggregatedResult struct {
-		ProductID   uint    `gorm:"column:product_id"`
-		ProductName string  `gorm:"column:product_name"`
-		TotalQty    float64 `gorm:"column:total_qty"`
-		Price       float64 `gorm:"column:price"`
-		PriceCount  int     `gorm:"-"` // For calculating average price
-	}
-
-	type FlagResult struct {
-		ProductID uint   `gorm:"column:product_id"`
-		FlagNames string `gorm:"column:flag_names"`
-	}
-
-	var allResults []SubQueryResult
-
-	// Subquery 1: Recordings
-	var recordingsResults []SubQueryResult
-	err := r.DB().WithContext(ctx).
-		Table("recordings r").
-		Select("pw.product_id, p.name as product_name, "+
-			"COALESCE(SUM(CASE "+
-			"WHEN sa.stockable_type = 'PURCHASE_ITEMS' THEN COALESCE(sa.qty, 0) "+
-			"WHEN sa.stockable_type = 'STOCK_TRANSFER_IN' THEN COALESCE(std.usage_qty, 0) "+
-			"WHEN sa.stockable_type = 'TRANSFERTOLAYING_IN' THEN COALESCE(ltt.total_used, 0) "+
-			"WHEN sa.stockable_type = 'ADJUSTMENT_IN' THEN COALESCE(adjs.total_used, 0) "+
-			"WHEN sa.stockable_type = 'PROJECT_FLOCK_POPULATION' THEN COALESCE(pfp.total_used_qty, 0) "+
-			"ELSE 0 END), 0) as total_qty, "+
-			"COALESCE(AVG(CASE WHEN sa.stockable_type = 'PURCHASE_ITEMS' THEN COALESCE(pi.price, 0) END), 0) as price").
-		Joins("JOIN recording_stocks rs ON rs.recording_id = r.id").
-		Joins("JOIN product_warehouses pw ON pw.id = rs.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN stock_allocations sa ON sa.usable_type = 'RECORDING_STOCK' AND sa.usable_id = rs.id AND sa.status = 'ACTIVE'").
-		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = 'PURCHASE_ITEMS'").
-		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = 'STOCK_TRANSFER_IN'").
-		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = 'TRANSFERTOLAYING_IN'").
-		Joins("LEFT JOIN adjustment_stocks adjs ON adjs.id = sa.stockable_id AND sa.stockable_type = 'ADJUSTMENT_IN'").
-		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = 'PROJECT_FLOCK_POPULATION'").
-		Where("r.project_flock_kandangs_id = ?", projectFlockKandangID).
-		Where("r.deleted_at IS NULL").
-		Group("pw.product_id, p.name").
-		Scan(&recordingsResults).Error
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to get recordings product usage: %w", err)
-	}
-	fmt.Printf("[REPO] Recordings query: %d results for projectFlockKandangID=%d\n", len(recordingsResults), projectFlockKandangID)
-	allResults = append(allResults, recordingsResults...)
-
-	// Subquery 2: Chickins
-	var chickinsResults []SubQueryResult
-	err = r.DB().WithContext(ctx).
-		Table("project_chickins pc").
-		Select("pw.product_id, p.name as product_name, "+
-			"COALESCE(SUM(pc.usage_qty), 0) as total_qty, "+
-			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
-		Joins("JOIN product_warehouses pw ON pw.id = pc.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("pc.project_flock_kandang_id = ?", projectFlockKandangID).
-		Where("pc.usage_qty > 0").
-		Group("pw.product_id, p.name").
-		Scan(&chickinsResults).Error
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to get chickins product usage: %w", err)
-	}
-	fmt.Printf("[REPO] Chickins query: %d results for projectFlockKandangID=%d\n", len(chickinsResults), projectFlockKandangID)
-	allResults = append(allResults, chickinsResults...)
-
-	// Subquery 3: Marketing Delivery
-	var marketingResults []SubQueryResult
-	err = r.DB().WithContext(ctx).
-		Table("marketing_delivery_products mdp").
-		Select("pw.product_id, p.name as product_name, "+
-			"COALESCE(SUM(mdp.usage_qty), 0) as total_qty, "+
-			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
-		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
-		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Group("pw.product_id, p.name").
-		Scan(&marketingResults).Error
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to get marketing product usage: %w", err)
-	}
-	fmt.Printf("[REPO] Marketing query: %d results for projectFlockKandangID=%d\n", len(marketingResults), projectFlockKandangID)
-	allResults = append(allResults, marketingResults...)
-
-	// Subquery 4: Laying Transfer Sources
-	var layingTransferResults []SubQueryResult
-	err = r.DB().WithContext(ctx).
-		Table("laying_transfer_sources lts").
-		Select("pw.product_id, p.name as product_name, "+
-			"COALESCE(SUM(lts.usage_qty), 0) as total_qty, "+
-			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
-		Joins("JOIN laying_transfers lt ON lt.id = lts.laying_transfer_id").
-		Joins("JOIN product_warehouses pw ON pw.id = lts.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Group("pw.product_id, p.name").
-		Scan(&layingTransferResults).Error
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to get laying transfer product usage: %w", err)
-	}
-	fmt.Printf("[REPO] Laying Transfer query: %d results for projectFlockKandangID=%d\n", len(layingTransferResults), projectFlockKandangID)
-	allResults = append(allResults, layingTransferResults...)
-
-	// Subquery 5: Stock Transfer Details
-	var stockTransferResults []SubQueryResult
-	err = r.DB().WithContext(ctx).
-		Table("stock_transfer_details std").
-		Select("pw.product_id, p.name as product_name, "+
-			"COALESCE(SUM(std.usage_qty), 0) as total_qty, "+
-			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
-		Joins("JOIN product_warehouses pw ON pw.id = std.source_product_warehouse_id").
-		Joins("JOIN products p ON p.id = std.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Group("pw.product_id, p.name").
-		Scan(&stockTransferResults).Error
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to get stock transfer product usage: %w", err)
-	}
-	fmt.Printf("[REPO] Stock Transfer query: %d results for projectFlockKandangID=%d\n", len(stockTransferResults), projectFlockKandangID)
-	allResults = append(allResults, stockTransferResults...)
-
-	// Subquery 6: Adjustment Stocks
-	var adjustmentResults []SubQueryResult
-	err = r.DB().WithContext(ctx).
-		Table("adjustment_stocks ads").
-		Select("pw.product_id, p.name as product_name, "+
-			"COALESCE(SUM(ads.usage_qty), 0) as total_qty, "+
-			"COALESCE(AVG(COALESCE(pi.price, 0)), 0) as price").
-		Joins("JOIN product_warehouses pw ON pw.id = ads.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Where("ads.usage_qty > 0").
-		Group("pw.product_id, p.name").
-		Scan(&adjustmentResults).Error
-
-	if err != nil {
-		return nil, fmt.Errorf("failed to get adjustment product usage: %w", err)
-	}
-	fmt.Printf("[REPO] Adjustment query: %d results for projectFlockKandangID=%d\n", len(adjustmentResults), projectFlockKandangID)
-	allResults = append(allResults, adjustmentResults...)
-
-	fmt.Printf("[REPO] Total raw results before aggregation: %d items\n", len(allResults))
-
-	// Aggregate results by product_id
-	aggregatedMap := make(map[uint]*AggregatedResult)
-	for _, result := range allResults {
-		key := result.ProductID
-		if existing, exists := aggregatedMap[key]; exists {
-			existing.TotalQty += result.TotalQty
-			existing.Price += result.Price
-			existing.PriceCount++
-		} else {
-			aggregatedMap[key] = &AggregatedResult{
-				ProductID:   result.ProductID,
-				ProductName: result.ProductName,
-				TotalQty:    result.TotalQty,
-				Price:       result.Price,
-				PriceCount:  1,
-			}
-		}
-	}
-
-	fmt.Printf("[REPO] Aggregated to %d unique products\n", len(aggregatedMap))
-
-	// Get flags for all products
-	productIDs := make([]uint, 0, len(aggregatedMap))
-	for id := range aggregatedMap {
-		productIDs = append(productIDs, id)
-	}
-
-	var flagResults []FlagResult
-	if len(productIDs) > 0 {
-		err = r.DB().WithContext(ctx).
-			Table("products p").
-			Select("p.id as product_id, STRING_AGG(DISTINCT f.name, ', ') as flag_names").
-			Joins("LEFT JOIN flags f ON f.flagable_type = 'products' AND f.flagable_id = p.id").
-			Where("p.id IN ?", productIDs).
-			Group("p.id").
-			Scan(&flagResults).Error
-
-		if err != nil {
-			return nil, fmt.Errorf("failed to get product flags: %w", err)
-		}
-	}
-	fmt.Printf("[REPO] Fetched flags for %d products\n", len(flagResults))
-
-	// Build flag map
-	flagMap := make(map[uint]string)
-	for _, flag := range flagResults {
-		flagMap[flag.ProductID] = flag.FlagNames
-	}
-
-	// Combine results and calculate average price
-	results := make([]ProductUsageRow, 0, len(aggregatedMap))
-	for _, agg := range aggregatedMap {
-		avgPrice := float64(0)
-		if agg.PriceCount > 0 {
-			avgPrice = agg.Price / float64(agg.PriceCount)
-		}
-
-		flagNames := flagMap[agg.ProductID]
-
-		// Apply flag filters if provided
-		if len(flagFilters) > 0 {
-			// Check if any of the flagFilters exist in flagNames
-			matched := false
-			for _, filter := range flagFilters {
-				if containsIgnoreCase(flagNames, filter) {
-					matched = true
-					break
-				}
-			}
-			if !matched {
-				continue // Skip this product if no flag matches
-			}
-		}
-
-		results = append(results, ProductUsageRow{
-			ProductID:        agg.ProductID,
-			ProductName:      agg.ProductName,
-			FlagNames:        flagNames,
-			TotalQty:         agg.TotalQty,
-			Price:            avgPrice,
-			TotalPengeluaran: agg.TotalQty * avgPrice,
-		})
-	}
-
-	fmt.Printf("[REPO] After filtering with flagFilters=%v: %d results\n", flagFilters, len(results))
-	for i, r := range results {
-		fmt.Printf("[REPO]   Result[%d]: ProductID=%d, ProductName=%s, FlagNames=%s, TotalQty=%.2f, Price=%.2f, TotalPengeluaran=%.2f\n",
-			i, r.ProductID, r.ProductName, r.FlagNames, r.TotalQty, r.Price, r.TotalPengeluaran)
-	}
-
-	// Sort by product name
-	sort.Slice(results, func(i, j int) bool {
-		return results[i].ProductName < results[j].ProductName
-	})
-
-	fmt.Printf("[REPO] Final sorted results: %d items\n", len(results))
-	return results, nil
-}
-
-// GetTotalDepletionByProjectFlockKandangID gets total depletion for a specific kandang
-func (r *ClosingKeuanganRepositoryImpl) GetTotalDepletionByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error) {
-	var result float64
-	err := r.DB().WithContext(ctx).
-		Table("recording_depletions").
-		Select("COALESCE(SUM(recording_depletions.qty), 0)").
-		Joins("JOIN recordings ON recordings.id = recording_depletions.recording_id").
-		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = recordings.project_flock_kandangs_id").
-		Where("project_flock_kandangs.id = ?", projectFlockKandangID).
-		Scan(&result).Error
-	return result, err
-}
-
-// GetTotalWeightProducedFromUniformityByProjectFlockKandangID calculates total weight produced from uniformity data for a specific kandang
-// Formula: (mean_up / 1.10) * chick_qty_of_weight / 1000
-func (r *ClosingKeuanganRepositoryImpl) GetTotalWeightProducedFromUniformityByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error) {
-	if projectFlockKandangID == 0 {
-		return 0, nil
-	}
-
-	var uniformity struct {
-		MeanUp           float64
-		ChickQtyOfWeight float64
-	}
-
-	err := r.DB().WithContext(ctx).
-		Table("project_flock_kandang_uniformity").
-		Select("mean_up, chick_qty_of_weight").
-		Where("project_flock_kandang_id = ?", projectFlockKandangID).
-		Order("id DESC").
-		Limit(1).
-		Scan(&uniformity).Error
-
-	if err != nil {
-		return 0, err
-	}
-
-	// Calculate weight: (mean_up / 1.10) * chick_qty_of_weight / 1000
-	totalWeight := (uniformity.MeanUp / 1.10) * uniformity.ChickQtyOfWeight / 1000
-
-	return totalWeight, nil
-}
-
-// containsIgnoreCase checks if a string contains a substring (case-insensitive)
-func containsIgnoreCase(str, substr string) bool {
-	return strings.Contains(strings.ToUpper(str), strings.ToUpper(substr))
-}

internal/modules/closings/services/closing.service.go

@@ -12,6 +12,7 @@ import (
 
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
@@ -98,6 +99,11 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 	statusFilter := ""
 	if params.ProjectStatus != nil {
@@ -111,6 +117,12 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 
 	closings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withClosingRelations(db)
+		if scope.Restrict {
+			if len(scope.IDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = m.ApplyScopeFilter(db, scope, "project_flocks.location_id")
+		}
 		if params.LocationID != nil {
 			db = db.Where("location_id = ?", *params.LocationID)
 		}
@@ -150,6 +162,10 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 }
 
 func (s closingService) GetProjectFlockByID(c *fiber.Ctx, id uint) (*entity.ProjectFlock, error) {
+	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), id); err != nil {
+		return nil, err
+	}
+
 	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
@@ -161,6 +177,13 @@ func (s closingService) GetProjectFlockByID(c *fiber.Ctx, id uint) (*entity.Proj
 }
 
 func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
+	if projectFlockKandangID != nil {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+			return nil, err
+		}
+	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
+	}
 
 	realisasi, err := s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlockID, projectFlockKandangID)
 	if err != nil {
@@ -174,8 +197,8 @@ func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint, projectF
 }
 
 func (s closingService) GetClosingSummary(c *fiber.Ctx, projectFlockID uint, kandangID *uint) (any, error) {
-	if projectFlockID == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
 	}
 
 	if kandangID != nil {
@@ -259,7 +282,7 @@ func (s closingService) getClosingSummaryByKandang(ctx context.Context, projectF
 	statusProject := "Belum Selesai"
 	var approvalDate string
 	if s.ApprovalSvc != nil {
-		records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlockKandang.String(), &kandang.Id, 1, 1000, "")
+		records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlockKandang.String(), &kandang.Id, 1, 1000, "", "")
 		if err != nil {
 			s.Log.Errorf("Failed to fetch approvals for project flock kandang %d: %+v", kandang.Id, err)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch approval data")
@@ -321,8 +344,8 @@ func (s closingService) getClosingSummaryByKandang(ctx context.Context, projectF
 }
 
 func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakItemDTO, int64, error) {
-	if projectFlockID == 0 {
-		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, 0, err
 	}
 
 	if params == nil {
@@ -344,15 +367,7 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
 	}
 
-	if _, err := s.Repository.GetByID(c.Context(), projectFlockID, nil); err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Project flock tidak ditemukan")
-		}
-		s.Log.Errorf("Failed get project flock %d for sapronak closing: %+v", projectFlockID, err)
-		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
-	}
-
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -436,7 +451,7 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -479,13 +494,16 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 	return items, nil
 }
 
-func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint) ([]uint, error) {
+func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
 	var kandangIDs []uint
 	db := s.Repository.DB().WithContext(ctx)
 
-	if err := db.Model(&entity.ProjectFlockKandang{}).
-		Where("project_flock_id = ?", projectFlockID).
-		Pluck("kandang_id", &kandangIDs).Error; err != nil {
+	query := db.Model(&entity.ProjectFlockKandang{}).
+		Where("project_flock_id = ?", projectFlockID)
+	if kandangID != nil && *kandangID > 0 {
+		query = query.Where("id = ?", *kandangID)
+	}
+	if err := query.Pluck("kandang_id", &kandangIDs).Error; err != nil {
 		return nil, err
 	}
 
@@ -537,7 +555,7 @@ func (s closingService) getApprovalStatuses(ctx context.Context, projectFlockID
 		return "", "Belum Selesai", nil
 	}
 
-	records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlock.String(), &projectFlockID, 1, 1000, "")
+	records, _, err := s.ApprovalSvc.List(ctx, utils.ApprovalWorkflowProjectFlock.String(), &projectFlockID, 1, 1000, "", "")
 	if err != nil {
 		return "", "", err
 	}
@@ -580,6 +598,14 @@ func (s closingService) getApprovalStatuses(ctx context.Context, projectFlockID
 }
 
 func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.OverheadListDTO, error) {
+	if projectFlockKandangID != nil {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+			return nil, err
+		}
+	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
+	}
+
 	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
 	if err != nil {
 		return nil, err
@@ -668,8 +694,12 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 }
 
 func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
-	if projectFlockID == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	if projectFlockKandangID != nil {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+			return nil, err
+		}
+	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+		return nil, err
 	}
 
 	rows, err := s.Repository.GetExpeditionHPP(c.Context(), projectFlockID, projectFlockKandangID)
@@ -743,6 +773,10 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to determine production week")
 	}
 
+	if !isGrowing && currentWeek != 0 {
+		currentWeek = currentWeek + 17
+	}
+
 	targetAverages, err := s.RecordingRepo.GetAverageTargetMetricsByProjectFlockKandangID(c.Context(), projectFlockKandangIDs[0], !isGrowing)
 	if err != nil {
 		s.Log.Errorf("Failed to calculate target metrics for project flock %d: %+v", projectFlockID, err)
@@ -810,7 +844,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch FCR standard data")
 		}
 	}
-	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID)
+	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID, kandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to calculate sales age for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch sales age data")
@@ -830,7 +864,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		// FeedUsedPerHead:   feedUsedPerHead,
 	}
 
-	chickenFlagNames := []string{string(utils.FlagPullet)}
+	chickenFlagNames := []string{string(utils.FlagPullet), string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagLayer)}
 	chickenSalesWeight, chickenSalesQty, chickenSalesPrice, err := s.Repository.SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, chickenFlagNames)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch chicken sales data for project flock %d: %+v", projectFlockID, err)
@@ -997,38 +1031,24 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 	return &result, nil
 }
 
-func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint) (float64, error) {
-	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(ctx, projectFlockID, func(db *gorm.DB) *gorm.DB {
-		return db.
-			Preload("MarketingProduct").
-			Preload("MarketingProduct.ProductWarehouse").
-			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
-			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins")
-	})
+func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) (float64, error) {
+	penjualan, err := s.MarketingDeliveryProductRepo.GetClosingPenjualanForAgeChickDataProduction(ctx, projectFlockID, projectFlockKandangID)
 	if err != nil {
 		return 0, err
 	}
-
-	var (
-		totalQty      float64
-		totalAgeWeeks float64
-	)
-
-	for _, product := range deliveryProducts {
-		if product.UsageQty == 0 {
-			continue
-		}
-		projectFlockKandang := product.MarketingProduct.ProductWarehouse.ProjectFlockKandang
-		ageWeeks := dto.CalculateAgeFromChickinDataProduksi(projectFlockKandang, product.DeliveryDate)
-		totalAgeWeeks += float64(ageWeeks) * product.UsageQty
-		totalQty += product.UsageQty
+	acumulateAgeQty := 0.0
+	totalQty := 0.0
+	for _, v := range penjualan {
+		sale := dto.ToSalesAgeDTO(v)
+		acumulateAgeQty += float64(sale.Age) * sale.Qty
+		totalQty += sale.Qty
+	}
+	if totalQty > 0 {
+		averageAge := acumulateAgeQty / totalQty
+		return averageAge, nil
 	}
 
-	if totalQty == 0 {
-		return 0, nil
-	}
-
-	return totalAgeWeeks / totalQty, nil
+	return 0, err
 }
 
 func (s closingService) determineProductionWeek(ctx context.Context, projectFlockKandangIDs []uint) (int, error) {

internal/modules/closings/services/closingKeuangan.service.go

@@ -2,20 +2,19 @@ package service
 
 import (
 	"errors"
-	"strings"
 
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
-	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
 	expenseRealizationRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
 	marketingDeliveryProductRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
 	chickinRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
 	projectflockRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 	recordingRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"github.com/gofiber/fiber/v2"
-	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
 
@@ -25,9 +24,29 @@ type ClosingKeuanganService interface {
 	GetClosingKeuanganByKandang(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID uint) (*dto.ClosingKeuanganData, error)
 }
 
+// CostData holds all cost-related information
+type CostData struct {
+	FeedCost               float64
+	OvkCost                float64
+	ChickenCost            float64
+	ExpeditionCost         float64
+	BudgetOperational      float64
+	RealizationOperational float64
+}
+
+// ProductionData holds all production and sales related information
+type ProductionData struct {
+	TotalPopulationIn   float64
+	TotalDepletion      float64
+	TotalWeightProduced float64
+	TotalEggWeightKg    float64
+	TotalWeightSold     float64
+	TotalBirdSold       float64
+	TotalSalesAmount    float64
+}
+
 type closingKeuanganService struct {
 	Log                          *logrus.Logger
-	ClosingKeuanganRepo          repository.ClosingKeuanganRepository
 	ProjectFlockRepo             projectflockRepository.ProjectflockRepository
 	ProjectFlockKandangRepo      projectflockRepository.ProjectFlockKandangRepository
 	MarketingDeliveryProductRepo marketingDeliveryProductRepository.MarketingDeliveryProductRepository
@@ -35,10 +54,11 @@ type closingKeuanganService struct {
 	ProjectBudgetRepo            projectflockRepository.ProjectBudgetRepository
 	ChickinRepo                  chickinRepository.ProjectChickinRepository
 	RecordingRepo                recordingRepository.RecordingRepository
+	HppSvc                       commonSvc.HppService
+	HppRepo                      commonRepo.HppCostRepository
 }
 
 func NewClosingKeuanganService(
-	closingKeuanganRepo repository.ClosingKeuanganRepository,
 	projectFlockRepo projectflockRepository.ProjectflockRepository,
 	projectFlockKandangRepo projectflockRepository.ProjectFlockKandangRepository,
 	marketingDeliveryProductRepo marketingDeliveryProductRepository.MarketingDeliveryProductRepository,
@@ -46,10 +66,11 @@ func NewClosingKeuanganService(
 	projectBudgetRepo projectflockRepository.ProjectBudgetRepository,
 	chickinRepo chickinRepository.ProjectChickinRepository,
 	recordingRepo recordingRepository.RecordingRepository,
+	hppSvc commonSvc.HppService,
+	hppRepo commonRepo.HppCostRepository,
 ) ClosingKeuanganService {
 	return &closingKeuanganService{
 		Log:                          utils.Log,
-		ClosingKeuanganRepo:          closingKeuanganRepo,
 		ProjectFlockRepo:             projectFlockRepo,
 		ProjectFlockKandangRepo:      projectFlockKandangRepo,
 		MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
@@ -57,6 +78,8 @@ func NewClosingKeuanganService(
 		ProjectBudgetRepo:            projectBudgetRepo,
 		ChickinRepo:                  chickinRepo,
 		RecordingRepo:                recordingRepo,
+		HppSvc:                       hppSvc,
+		HppRepo:                      hppRepo,
 	}
 }
 
@@ -73,30 +96,12 @@ func (s closingKeuanganService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
-	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
-	}
-
-	// Preload Nonstock.Flags manually
-	var budgetIDs []uint
-	for _, b := range budgets {
-		budgetIDs = append(budgetIDs, b.Id)
-	}
-	if len(budgetIDs) > 0 {
-		err = s.ProjectBudgetRepo.DB().WithContext(c.Context()).
-			Preload("Nonstock.Flags").
-			Where("id IN ?", budgetIDs).
-			Find(&budgets).Error
-	}
-
-	// Get all kandang for this project flock
-	kandangs, err := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	projectFlockKandangs, err := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlockID)
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch kandangs")
 	}
 
-	return s.calculateClosingKeuangan(c, projectFlock, budgets, kandangs, projectFlockID)
+	return s.calculateClosingKeuangan(c, projectFlock, projectFlockKandangs)
 }
 
 func (s closingKeuanganService) GetClosingKeuanganByKandang(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID uint) (*dto.ClosingKeuanganData, error) {
@@ -107,12 +112,11 @@ func (s closingKeuanganService) GetClosingKeuanganByKandang(c *fiber.Ctx, projec
 		return nil, err
 	}
 
-	// Validate and fetch project flock kandang
-	kandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), projectFlockKandangID)
+	projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), projectFlockKandangID)
 	if err != nil {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Project flock kandang not found")
 	}
-	if kandang.ProjectFlockId != projectFlockID {
+	if projectFlockKandang.ProjectFlockId != projectFlockID {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Project flock kandang does not belong to this project flock")
 	}
 
@@ -121,417 +125,250 @@ func (s closingKeuanganService) GetClosingKeuanganByKandang(c *fiber.Ctx, projec
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
-	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
-	}
+	projectFlockKandangs := []entity.ProjectFlockKandang{*projectFlockKandang}
 
-	// Preload Nonstock.Flags manually
-	var budgetIDs []uint
-	for _, b := range budgets {
-		budgetIDs = append(budgetIDs, b.Id)
-	}
-	if len(budgetIDs) > 0 {
-		err = s.ProjectBudgetRepo.DB().WithContext(c.Context()).
-			Preload("Nonstock.Flags").
-			Where("id IN ?", budgetIDs).
-			Find(&budgets).Error
-	}
-
-	kandangs := []entity.ProjectFlockKandang{*kandang}
-
-	return s.calculateClosingKeuangan(c, projectFlock, budgets, kandangs, projectFlockID)
+	return s.calculateClosingKeuangan(c, projectFlock, projectFlockKandangs)
 }
 
-func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFlock *entity.ProjectFlock, budgets []entity.ProjectBudget, kandangs []entity.ProjectFlockKandang, scopeID uint) (*dto.ClosingKeuanganData, error) {
-	// Define flag filters using constants
-	pakanFilters := []string{string(utils.FlagPakan), string(utils.FlagPreStarter), string(utils.FlagStarter), string(utils.FlagFinisher)}
-	ovkFilters := []string{string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia)}
-	ayamFilters := []string{string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer)}
-	allFilters := append(pakanFilters, ovkFilters...)
-	allFilters = append(allFilters, ayamFilters...)
+func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangs []entity.ProjectFlockKandang) (*dto.ClosingKeuanganData, error) {
 
-	var allProductUsageRows []repository.ProductUsageRow
-
-	// Get ALL product usage
-	for _, kandang := range kandangs {
-		rows, err := s.ClosingKeuanganRepo.GetAllProductUsageByProjectFlockKandangID(c.Context(), kandang.Id, allFilters)
-		if err == nil {
-			allProductUsageRows = append(allProductUsageRows, rows...)
-		}
+	var projectFlockKandangIDs []uint
+	for _, projectFlockKandang := range projectFlockKandangs {
+		projectFlockKandangIDs = append(projectFlockKandangIDs, projectFlockKandang.Id)
 	}
 
-	// Classify into categories based on flag priority
-	var pakanProductUsageRows []repository.ProductUsageRow
-	var ovkProductUsageRows []repository.ProductUsageRow
-	var ayamProductUsageRows []repository.ProductUsageRow
-
-	for _, row := range allProductUsageRows {
-		// Parse flag names from comma-separated string
-		flagNames := strings.Split(row.FlagNames, ",")
-
-		hasPakanFlag := false
-		hasOvkFlag := false
-		hasAyamFlag := false
-
-		for _, flag := range flagNames {
-			flag = strings.TrimSpace(flag)
-			if containsItem(pakanFilters, flag) {
-				hasPakanFlag = true
-			}
-			if containsItem(ovkFilters, flag) {
-				hasOvkFlag = true
-			}
-			if containsItem(ayamFilters, flag) {
-				hasAyamFlag = true
-			}
-		}
-
-		// Priority: PAKAN > OVK > AYAM
-		if hasPakanFlag {
-			pakanProductUsageRows = append(pakanProductUsageRows, row)
-		} else if hasOvkFlag {
-			ovkProductUsageRows = append(ovkProductUsageRows, row)
-		} else if hasAyamFlag {
-			ayamProductUsageRows = append(ayamProductUsageRows, row)
-		} else {
-			continue
-		}
-	}
-
-
-	// Calculate total price for each category
-	var totalPakanPrice, totalOvkPrice, totalAyamPrice float64
-	for _, row := range pakanProductUsageRows {
-		totalPakanPrice += row.TotalPengeluaran
-	}
-	for _, row := range ovkProductUsageRows {
-		totalOvkPrice += row.TotalPengeluaran
-	}
-	for _, row := range ayamProductUsageRows {
-		totalAyamPrice += row.TotalPengeluaran
-	}
-
-	// Determine if this is per-kandang or per-project-flock scope
-	isPerKandang := len(kandangs) == 1
+	isPerKandang := len(projectFlockKandangs) == 1
 	var projectFlockKandangID *uint
 	if isPerKandang {
-		kandangID := kandangs[0].Id
+		kandangID := projectFlockKandangs[0].Id
 		projectFlockKandangID = &kandangID
 	}
 
+	costs, err := s.calculateCosts(c, projectFlock, projectFlockKandangs, projectFlockKandangIDs, projectFlockKandangID)
+	if err != nil {
+		return nil, err
+	}
+
+	productionData, err := s.calculateProductionData(c, projectFlock, projectFlockKandangIDs, projectFlockKandangID)
+	if err != nil {
+		return nil, err
+	}
+
+	hppSection := s.buildHPPSection(c, projectFlock, projectFlockKandangs, costs, productionData)
+
+	profitLossSection := s.buildProfitLossSection(projectFlock, costs, productionData)
+
+	data := dto.ToClosingKeuanganData(hppSection, profitLossSection)
+	return &data, nil
+}
+
+func (s closingKeuanganService) calculateCosts(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangs []entity.ProjectFlockKandang, projectFlockKandangIDs []uint, projectFlockKandangID *uint) (*CostData, error) {
+	costs := &CostData{}
 	var err error
 
-	// Fetch realizations
-	var realizations []entity.ExpenseRealization
-	if isPerKandang && projectFlockKandangID != nil {
-		realizations, err = s.ExpenseRealizationRepo.GetClosingOverhead(c.Context(), projectFlock.Id, projectFlockKandangID)
-	} else {
-		realizations, err = s.ExpenseRealizationRepo.GetClosingOverhead(c.Context(), projectFlock.Id, nil)
-	}
+	costs.FeedCost, err = s.HppRepo.GetFeedUsageCost(c.Context(), projectFlockKandangIDs, nil)
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch realizations")
+		costs.FeedCost = 0
 	}
 
-	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(c.Context(), projectFlock.Id, func(db *gorm.DB) *gorm.DB {
-		db = db.Preload("MarketingProduct").
-			Preload("MarketingProduct.ProductWarehouse").
-			Preload("MarketingProduct.ProductWarehouse.Product")
-		return db
-	})
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery products")
-	}
-
-	// Filter by kandang if scope is per-kandang (manual filtering after fetch)
-	if isPerKandang && projectFlockKandangID != nil {
-		filteredProducts := make([]entity.MarketingDeliveryProduct, 0)
-		for _, dp := range deliveryProducts {
-			pfKandangID := dp.MarketingProduct.ProductWarehouse.ProjectFlockKandangId
-			if pfKandangID != nil && *pfKandangID == *projectFlockKandangID {
-				filteredProducts = append(filteredProducts, dp)
-			}
-		}
-		deliveryProducts = filteredProducts
-	}
-
-	// Fetch chickins
-	var chickins []entity.ProjectChickin
-	if isPerKandang && projectFlockKandangID != nil {
-		chickins, err = s.ChickinRepo.GetByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
-	} else {
-		chickins, err = s.ChickinRepo.GetByProjectFlockID(c.Context(), projectFlock.Id)
-	}
+	costs.OvkCost, err = s.HppRepo.GetOvkUsageCost(c.Context(), projectFlockKandangIDs, nil)
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch chickins")
+		costs.OvkCost = 0
 	}
 
-	// Get total depletion
-	var totalDepletion float64
-	if isPerKandang && projectFlockKandangID != nil {
-		totalDepletion, err = s.ClosingKeuanganRepo.GetTotalDepletionByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
-	} else {
-		totalDepletion, err = s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlock.Id)
-	}
-	if err != nil {
-		totalDepletion = 0
-	}
-
-	totalWeightProduced, _, err := s.RecordingRepo.GetProductionWeightAndQtyByProjectFlockID(c.Context(), projectFlock.Id)
-	if err != nil {
-	}
-
-	// Try to get actual weight from uniformity data
-	var totalWeightFromUniformity float64
-	if isPerKandang && projectFlockKandangID != nil {
-		totalWeightFromUniformity, err = s.ClosingKeuanganRepo.GetTotalWeightProducedFromUniformityByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
-	} else {
-		totalWeightFromUniformity, err = s.RecordingRepo.GetTotalWeightProducedFromUniformityByProjectFlockID(c.Context(), projectFlock.Id)
-	}
-	if err != nil {
-	} else if totalWeightFromUniformity > 0 {
-		totalWeightProduced = totalWeightFromUniformity
-	}
-
-	// Fetch egg data only for Laying category
-	var totalEggWeightKg float64
 	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		// TODO: Replace with actual method to get egg weight from RecordingRepo
-		// totalEggWeightKg, err = s.RecordingRepo.GetEggWeightByProjectFlockID(c.Context(), projectFlock.Id)
-		// For now, set to 0 as placeholder
-		totalEggWeightKg = 0
+		for _, projectFlockKandang := range projectFlockKandangs {
+			depresiasiCost, err := s.HppSvc.GetDepresiasiTransfer(projectFlockKandang.Id, nil)
+			if err == nil {
+				costs.ChickenCost += depresiasiCost
+			}
+			pulletCost, err := s.HppRepo.GetPulletCost(c.Context(), projectFlockKandang.Id)
+			if err == nil {
+				costs.ChickenCost += pulletCost
+			}
+		}
 	} else {
-		totalEggWeightKg = 0
+		for _, projectFlockKandang := range projectFlockKandangs {
+			pulletCost, err := s.HppRepo.GetPulletCost(c.Context(), projectFlockKandang.Id)
+			if err == nil {
+				costs.ChickenCost += pulletCost
+			}
+		}
 	}
 
-	// Build new DTO structure
-
-	// Calculate totals
-	var totalPopulation float64
-	for _, chickin := range chickins {
-		totalPopulation += chickin.UsageQty
+	costs.ExpeditionCost, err = s.HppRepo.GetExpedisionCost(c.Context(), projectFlockKandangIDs)
+	if err != nil {
+		costs.ExpeditionCost = 0
 	}
 
-	// Calculate actual population (total population - depletion)
-	actualPopulation := totalPopulation - totalDepletion
-
-	// Calculate budget totals by category
-	calculateBudgetByFlag := func(flags []string) float64 {
-		var total float64
+	if budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlock.Id); err == nil {
+		totalBudget := 0.0
 		for _, budget := range budgets {
-			if budget.Nonstock != nil {
-				for _, nonstockFlag := range budget.Nonstock.Flags {
-					flagName := strings.ToUpper(nonstockFlag.Name)
-					for _, targetFlag := range flags {
-						if flagName == strings.ToUpper(targetFlag) {
-							total += budget.Price * budget.Qty
-							break
-						}
-					}
-				}
+			totalBudget += budget.Price * budget.Qty
+		}
+		if projectFlockKandangID != nil {
+			allKandangs, errKandang := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlock.Id)
+			if errKandang == nil && len(allKandangs) > 0 {
+				costs.BudgetOperational = totalBudget / float64(len(allKandangs))
+			}
+		} else {
+			costs.BudgetOperational = totalBudget
+		}
+	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
+		s.Log.Errorf("Failed to fetch budgets for project_flock_id=%d: %+v", projectFlock.Id, err)
+	}
+
+	if realizations, err := s.ExpenseRealizationRepo.GetClosingOverhead(c.Context(), projectFlock.Id, projectFlockKandangID); err == nil {
+		for _, realization := range realizations {
+			amount := realization.Price * realization.Qty
+			isEkspedisi := realization.ExpenseNonstock != nil &&
+				realization.ExpenseNonstock.Nonstock != nil &&
+				containsFlag(realization.ExpenseNonstock.Nonstock.Flags, "EKSPEDISI")
+			if !isEkspedisi {
+				costs.RealizationOperational += amount
 			}
 		}
-		return total
+	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
+		s.Log.Errorf("Failed to fetch realizations for project_flock_id=%d: %+v", projectFlock.Id, err)
 	}
 
-	// Budget per category
-	budgetPakan := calculateBudgetByFlag([]string{"PAKAN", "PRE-STARTER", "STARTER", "FINISHER"})
-	budgetOvk := calculateBudgetByFlag([]string{"OVK", "OBAT", "VITAMIN", "KIMIA"})
-	budgetAyam := calculateBudgetByFlag([]string{"DOC", "PULLET", "LAYER"})
-	budgetEkspedisi := calculateBudgetByFlag([]string{"EKSPEDISI"})
+	return costs, nil
+}
 
-	// Operational budget = total budget - pakan - ovk - ayam - ekspedisi
-	totalBudgetAmount := 0.0
-	for _, budget := range budgets {
-		totalBudgetAmount += budget.Price * budget.Qty
+func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangIDs []uint, projectFlockKandangID *uint) (*ProductionData, error) {
+	data := &ProductionData{}
+	var err error
+
+	data.TotalPopulationIn, err = s.HppRepo.GetTotalPopulation(c.Context(), projectFlockKandangIDs)
+	if err != nil {
+		data.TotalPopulationIn = 0
 	}
-	budgetOperational := totalBudgetAmount - budgetPakan - budgetOvk - budgetAyam - budgetEkspedisi
 
+	if projectFlockKandangID != nil {
+		data.TotalDepletion, err = s.RecordingRepo.GetTotalDepletionByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
+	} else {
+		data.TotalDepletion, err = s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlock.Id)
+	}
+	if err != nil {
+		data.TotalDepletion = 0
+	}
 
-	// Calculate realization totals
-	var totalRealizationAmount float64
-	var totalEkspedisiRealization float64
-	for _, realization := range realizations {
-		amount := realization.Price * realization.Qty
-		totalRealizationAmount += amount
+	if projectFlockKandangID != nil {
+		data.TotalWeightProduced, err = s.RecordingRepo.GetTotalWeightProducedFromUniformityByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
+	} else {
+		data.TotalWeightProduced, err = s.RecordingRepo.GetTotalWeightProducedFromUniformityByProjectFlockID(c.Context(), projectFlock.Id)
+	}
+	if err != nil {
+		data.TotalWeightProduced = 0
+	}
 
-		// Check if this is ekspedisi (need to check nonstock flags)
-		if realization.ExpenseNonstock != nil && realization.ExpenseNonstock.Nonstock != nil {
-			for _, flag := range realization.ExpenseNonstock.Nonstock.Flags {
-				if flag.Name == "EKSPEDISI" {
-					totalEkspedisiRealization += amount
-					break
-				}
-			}
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		_, data.TotalEggWeightKg, err = s.HppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(c.Context(), projectFlockKandangIDs, nil)
+		if err != nil {
+			data.TotalEggWeightKg = 0
 		}
 	}
 
-	totalOperationalRealization := totalRealizationAmount - totalEkspedisiRealization
+	var deliveryProducts []entity.MarketingDeliveryProduct
+	if projectFlockKandangID != nil {
+		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, projectFlockKandangID, projectFlock.Category)
+	} else {
+		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, nil, projectFlock.Category)
+	}
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data penjualan")
+	}
 
-	// Filter delivery products based on category
-	var filteredDeliveryProducts []entity.MarketingDeliveryProduct
 	for _, delivery := range deliveryProducts {
-		// Get product from delivery
 		if delivery.MarketingProduct.ProductWarehouse.Product.Id == 0 {
 			continue
 		}
-
-		product := delivery.MarketingProduct.ProductWarehouse.Product
-		isEggProduct := false
-		isChickenProduct := false
-
-		// Check product flags
-		for _, flag := range product.Flags {
-			flagName := strings.ToUpper(flag.Name)
-
-			// Egg product flags
-			if flagName == "TELUR" || flagName == "TELURUTUH" || flagName == "TELURPECAH" ||
-				flagName == "TELURPUTIH" || flagName == "TELURRETAK" {
-				isEggProduct = true
-			}
-
-			// Chicken product flags
-			if flagName == "AYAMAFKIR" || flagName == "AYAMCULLING" || flagName == "AYAMMATI" {
-				isChickenProduct = true
-			}
-		}
-
-		// Filter based on project flock category
-		if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-			// Laying: only egg products
-			if isEggProduct {
-				filteredDeliveryProducts = append(filteredDeliveryProducts, delivery)
-			}
-		} else {
-			// Growing/Contract Growing: only chicken products
-			if isChickenProduct || (!isEggProduct && !isChickenProduct) {
-				// Include if chicken product or if no specific flags (default to chicken)
-				filteredDeliveryProducts = append(filteredDeliveryProducts, delivery)
-			}
-		}
+		data.TotalWeightSold += delivery.TotalWeight
+		data.TotalBirdSold += delivery.UsageQty
+		data.TotalSalesAmount += delivery.TotalPrice
 	}
 
+	return data, nil
+}
 
-	// Calculate total weight sold and sales amount from filtered products
-	var totalWeightSold float64
-	var totalSalesAmount float64
-	for _, delivery := range filteredDeliveryProducts {
-		totalWeightSold += delivery.TotalWeight
-		totalSalesAmount += delivery.TotalPrice
+func (s closingKeuanganService) buildHPPSection(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangs []entity.ProjectFlockKandang, costs *CostData, production *ProductionData) dto.HPPSection {
+
+	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
+	totalWeightProduced := production.TotalWeightProduced
+	totalEggWeightKg := production.TotalEggWeightKg
+
+	weightForCalculation := totalWeightProduced
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		weightForCalculation = totalEggWeightKg
 	}
 
-
-	// Calculate metrics - always use kg ayam for rp_per_kg
 	calculateMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
 		if actualPopulation > 0 {
-			rpPerBird = amount / actualPopulation  // Use actual population
+			rpPerBird = amount / actualPopulation
 		}
-		if totalWeightProduced > 0 {
-			rpPerKg = amount / totalWeightProduced
+		if weightForCalculation > 0 {
+			rpPerKg = amount / weightForCalculation
 		}
 		return
 	}
 
-	// Calculate metrics for profit loss (use total population and total weight produced)
-	calculateProfitLossMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-		if totalPopulation > 0 {
-			rpPerBird = amount / totalPopulation
-		}
-		if totalWeightProduced > 0 {
-			rpPerKg = amount / totalWeightProduced
-		}
-		return
+	createHPPItem := func(id uint, category, code, label string, budgetAmount, realizationAmount float64) dto.HPPItem {
+		budgetRpPerBird, budgetRpPerKg := calculateMetrics(budgetAmount)
+		realizationRpPerBird, realizationRpPerKg := calculateMetrics(realizationAmount)
+		return dto.ToHPPItem(
+			id,
+			category,
+			code,
+			label,
+			dto.ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, budgetAmount),
+			dto.ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, realizationAmount),
+		)
 	}
 
-	// Build HPP Items using constants
 	hppItems := []dto.HPPItem{}
 
-	// PAKAN item
-	pakanBudgetRpPerBird, pakanBudgetRpPerKg := calculateMetrics(budgetPakan)
-	pakanRealizationRpPerBird, pakanRealizationRpPerKg := calculateMetrics(totalPakanPrice)
-	hppItems = append(hppItems, dto.ToHPPItem(
-		1,
-		"purchase",
-		string(dto.HPPCodePakan),
-		"Pembelian Pakan",
-		dto.ToFinancialMetrics(pakanBudgetRpPerBird, pakanBudgetRpPerKg, budgetPakan),
-		dto.ToFinancialMetrics(pakanRealizationRpPerBird, pakanRealizationRpPerKg, totalPakanPrice),
-	))
+	hppItems = append(hppItems, createHPPItem(1, "purchase", string(dto.HPPCodePakan), "Pembelian Pakan", costs.FeedCost, costs.FeedCost))
+	hppItems = append(hppItems, createHPPItem(2, "purchase", string(dto.HPPCodeOVK), "Pembelian OVK", costs.OvkCost, costs.OvkCost))
 
-	// OVK item
-	ovkBudgetRpPerBird, ovkBudgetRpPerKg := calculateMetrics(budgetOvk)
-	ovkRealizationRpPerBird, ovkRealizationRpPerKg := calculateMetrics(totalOvkPrice)
-	hppItems = append(hppItems, dto.ToHPPItem(
-		2,
-		"purchase",
-		string(dto.HPPCodeOVK),
-		"Pembelian OVK",
-		dto.ToFinancialMetrics(ovkBudgetRpPerBird, ovkBudgetRpPerKg, budgetOvk),
-		dto.ToFinancialMetrics(ovkRealizationRpPerBird, ovkRealizationRpPerKg, totalOvkPrice),
-	))
-
-	// DOC/DEPRESIASI item
 	docCode := string(dto.HPPCodeDOC)
 	docLabel := "Pembelian DOC"
 	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
 		docCode = string(dto.HPPCodeDepresiasi)
 		docLabel = "Depresiasi"
 	}
-	docBudgetRpPerBird, docBudgetRpPerKg := calculateMetrics(budgetAyam)
-	docRealizationRpPerBird, docRealizationRpPerKg := calculateMetrics(totalAyamPrice)
-	hppItems = append(hppItems, dto.ToHPPItem(
-		3,
-		"purchase",
-		docCode,
-		docLabel,
-		dto.ToFinancialMetrics(docBudgetRpPerBird, docBudgetRpPerKg, budgetAyam),
-		dto.ToFinancialMetrics(docRealizationRpPerBird, docRealizationRpPerKg, totalAyamPrice),
-	))
+	hppItems = append(hppItems, createHPPItem(3, "purchase", docCode, docLabel, costs.ChickenCost, costs.ChickenCost))
+	hppItems = append(hppItems, createHPPItem(4, "overhead", string(dto.HPPCodeOverhead), "Pengeluaran Overhead", costs.BudgetOperational, costs.RealizationOperational))
+	hppItems = append(hppItems, createHPPItem(5, "overhead", string(dto.HPPCodeEkspedisi), "Beban Ekspedisi", costs.ExpeditionCost, costs.ExpeditionCost))
 
-	// OVERHEAD item
-	overheadBudgetRpPerBird, overheadBudgetRpPerKg := calculateMetrics(budgetOperational)
-	overheadRealizationRpPerBird, overheadRealizationRpPerKg := calculateMetrics(totalOperationalRealization)
-	hppItems = append(hppItems, dto.ToHPPItem(
-		4,
-		"overhead",
-		string(dto.HPPCodeOverhead),
-		"Pengeluaran Overhead",
-		dto.ToFinancialMetrics(overheadBudgetRpPerBird, overheadBudgetRpPerKg, budgetOperational),
-		dto.ToFinancialMetrics(overheadRealizationRpPerBird, overheadRealizationRpPerKg, totalOperationalRealization),
-	))
-
-	// EKSPEDISI item
-	ekspedisiBudgetRpPerBird, ekspedisiBudgetRpPerKg := calculateMetrics(budgetEkspedisi)
-	ekspedisiRealizationRpPerBird, ekspedisiRealizationRpPerKg := calculateMetrics(totalEkspedisiRealization)
-	hppItems = append(hppItems, dto.ToHPPItem(
-		5,
-		"overhead",
-		string(dto.HPPCodeEkspedisi),
-		"Beban Ekspedisi",
-		dto.ToFinancialMetrics(ekspedisiBudgetRpPerBird, ekspedisiBudgetRpPerKg, budgetEkspedisi),
-		dto.ToFinancialMetrics(ekspedisiRealizationRpPerBird, ekspedisiRealizationRpPerKg, totalEkspedisiRealization),
-	))
-
-	// HPP Summary
-	totalBudgetHpp := budgetPakan + budgetOvk + budgetAyam + budgetOperational + budgetEkspedisi
-	totalRealizationHpp := totalPakanPrice + totalOvkPrice + totalAyamPrice + totalOperationalRealization + totalEkspedisiRealization
+	totalBudgetHpp := costs.FeedCost + costs.OvkCost + costs.ChickenCost + costs.BudgetOperational + costs.ExpeditionCost
+	totalRealizationHpp := costs.FeedCost + costs.OvkCost + costs.ChickenCost + costs.RealizationOperational + costs.ExpeditionCost
 
 	hppBudgetRpPerBird, hppBudgetRpPerKg := calculateMetrics(totalBudgetHpp)
 	hppRealizationRpPerBird, hppRealizationRpPerKg := calculateMetrics(totalRealizationHpp)
 
 	var eggBudgeting, eggRealization *dto.FinancialMetrics
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) && totalEggWeightKg > 0 {
-		eggBudgetRpPerKg := totalBudgetHpp / totalEggWeightKg
-		eggRealizationRpPerKg := totalRealizationHpp / totalEggWeightKg
-		eggBudgeting = &dto.FinancialMetrics{
-			RpPerBird: 0,
-			RpPerKg:   eggBudgetRpPerKg,
-			Amount:    totalBudgetHpp,
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		accumulateEggMetrics := func(metrics **dto.FinancialMetrics, amount, rpPerKg float64) {
+			if *metrics == nil {
+				*metrics = &dto.FinancialMetrics{
+					RpPerBird: 0,
+					RpPerKg:   rpPerKg,
+					Amount:    amount,
+				}
+			} else {
+				(*metrics).Amount += amount
+				if totalEggWeightKg > 0 {
+					(*metrics).RpPerKg = (*metrics).Amount / totalEggWeightKg
+				}
+			}
 		}
-		eggRealization = &dto.FinancialMetrics{
-			RpPerBird: 0,
-			RpPerKg:   eggRealizationRpPerKg,
-			Amount:    totalRealizationHpp,
+
+		for _, projectFlockKandang := range projectFlockKandangs {
+			hppResponse, err := s.HppSvc.CalculateHppCost(projectFlockKandang.Id, nil)
+			if err == nil {
+				accumulateEggMetrics(&eggBudgeting, hppResponse.Estimation.Total, hppResponse.Estimation.HargaKg)
+				accumulateEggMetrics(&eggRealization, hppResponse.Real.Total, hppResponse.Real.HargaKg)
+			}
 		}
 	}
 
@@ -543,15 +380,82 @@ func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFl
 		eggRealization,
 	)
 
-	hppSection := dto.ToHPPSection(hppItems, hppSummary)
+	return dto.ToHPPSection(hppItems, hppSummary)
+}
+
+func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.ProjectFlock, costs *CostData, production *ProductionData) dto.ProfitLossSection {
+
+	totalWeightProduced := production.TotalWeightProduced
+	totalEggWeightKg := production.TotalEggWeightKg
+	totalSalesAmount := production.TotalSalesAmount
+	totalWeightSold := production.TotalWeightSold
+	totalBirdSold := production.TotalBirdSold
+	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
+
+	isLaying := projectFlock.Category == string(utils.ProjectFlockCategoryLaying)
+
+	// Fungsi untuk sales: LAYING = populasi aktual, GROWING = ekor terjual
+	calculateSalesMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if isLaying {
+			if actualPopulation > 0 {
+				rpPerBird = amount / actualPopulation
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
+		} else {
+			if totalBirdSold > 0 {
+				rpPerBird = amount / totalBirdSold
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
+		}
+		return
+	}
+
+	// Fungsi untuk cost: per ekor = populasi aktual, per kg = LAYING telur produksi / GROWING ayam produksi
+	calculateCostMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if actualPopulation > 0 {
+			rpPerBird = amount / actualPopulation
+		}
+		if isLaying {
+			if totalEggWeightKg > 0 {
+				rpPerKg = amount / totalEggWeightKg
+			}
+		} else {
+			if totalWeightProduced > 0 {
+				rpPerKg = amount / totalWeightProduced
+			}
+		}
+		return
+	}
+
+	// Fungsi untuk overhead/ekspedisi: LAYING = populasi aktual, GROWING = ekor terjual
+	calculateOverheadMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if isLaying {
+			if actualPopulation > 0 {
+				rpPerBird = amount / actualPopulation
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
+		} else {
+			if totalBirdSold > 0 {
+				rpPerBird = amount / totalBirdSold
+			}
+			if totalWeightSold > 0 {
+				rpPerKg = amount / totalWeightSold
+			}
+		}
+		return
+	}
 
-	// Build Profit Loss Items using constants
 	plItems := []dto.ProfitLossItem{}
 
-	// SALES item
-	salesRpPerBird, salesRpPerKg := calculateProfitLossMetrics(totalSalesAmount)
+	salesRpPerBird, salesRpPerKg := calculateSalesMetrics(totalSalesAmount)
 	salesLabel := "Penjualan Ayam"
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+	if isLaying {
 		salesLabel = "Penjualan Telur"
 	}
 	plItems = append(plItems, dto.ToProfitLossItem(
@@ -563,76 +467,71 @@ func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFl
 		totalSalesAmount,
 	))
 
-	// SAPRONAK item - combines DOC/Depresiasi + PAKAN + OVK
-	totalSapronakAmount := totalAyamPrice + totalPakanPrice + totalOvkPrice
-	sapronakRpPerBird := docRealizationRpPerBird + pakanRealizationRpPerBird + ovkRealizationRpPerBird
-	sapronakRpPerKg := docRealizationRpPerKg + pakanRealizationRpPerKg + ovkRealizationRpPerKg
-	sapronakLabel := "Pengeluaran Sapronak"
+	totalSapronakAmount := costs.ChickenCost + costs.FeedCost + costs.OvkCost
+	sapronakRpPerBird := 0.0
+	sapronakRpPerKg := 0.0
+	for _, amount := range []float64{costs.ChickenCost, costs.FeedCost, costs.OvkCost} {
+		rpPerBird, rpPerKg := calculateCostMetrics(amount)
+		sapronakRpPerBird += rpPerBird
+		sapronakRpPerKg += rpPerKg
+	}
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeSapronak),
-		sapronakLabel,
+		"Pengeluaran Sapronak",
 		"purchase",
 		sapronakRpPerBird,
 		sapronakRpPerKg,
 		totalSapronakAmount,
 	))
 
-	// OVERHEAD item
-	overheadRpPerBird, overheadRpPerKg := calculateMetrics(totalOperationalRealization)
+	overheadRpPerBird, overheadRpPerKg := calculateOverheadMetrics(costs.RealizationOperational)
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeOverhead),
 		"Overhead",
 		"overhead",
 		overheadRpPerBird,
 		overheadRpPerKg,
-		totalOperationalRealization,
+		costs.RealizationOperational,
 	))
 
-	// EKSPEDISI item
+	ekspedisiRpPerBird, ekspedisiRpPerKg := calculateOverheadMetrics(costs.ExpeditionCost)
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeEkspedisi),
 		"Ekspedisi",
 		"overhead",
-		ekspedisiRealizationRpPerBird,
-		ekspedisiRealizationRpPerKg,
-		totalEkspedisiRealization,
+		ekspedisiRpPerBird,
+		ekspedisiRpPerKg,
+		costs.ExpeditionCost,
 	))
 
-	// Profit Loss Summary
-	// Gross Profit = Sales - (DOC + PAKAN + OVK) only
-	// Gross Profit should NOT include overhead and ekspedisi
-	costOfGoodsSold := totalAyamPrice + totalPakanPrice + totalOvkPrice
+	costOfGoodsSold := costs.ChickenCost + costs.FeedCost + costs.OvkCost
 	costOfGoodsSoldRpPerBird := sapronakRpPerBird
+	costOfGoodsSoldRpPerKg := sapronakRpPerKg
 
 	grossProfit := totalSalesAmount - costOfGoodsSold
 	grossProfitRpPerBird := salesRpPerBird - costOfGoodsSoldRpPerBird
+	grossProfitRpPerKg := salesRpPerKg - costOfGoodsSoldRpPerKg
 
-	// Operating Expenses (Overhead + Ekspedisi)
-	totalOperatingExpenses := totalOperationalRealization + totalEkspedisiRealization
-	totalOperatingExpensesRpPerBird := overheadRpPerBird + ekspedisiRealizationRpPerBird
+	totalOperatingExpenses := costs.RealizationOperational + costs.ExpeditionCost
+	totalOperatingExpensesRpPerBird := overheadRpPerBird + ekspedisiRpPerBird
+	totalOperatingExpensesRpPerKg := overheadRpPerKg + ekspedisiRpPerKg
 
-	// Net Profit = Gross Profit - Operating Expenses
 	netProfit := grossProfit - totalOperatingExpenses
 	netProfitRpPerBird := grossProfitRpPerBird - totalOperatingExpensesRpPerBird
+	netProfitRpPerKg := grossProfitRpPerKg - totalOperatingExpensesRpPerKg
 
 	plSummary := dto.ToProfitLossSummary(
-		dto.ToFinancialMetrics(grossProfitRpPerBird, 0, grossProfit),
-		dto.ToFinancialMetrics(totalOperatingExpensesRpPerBird, 0, totalOperatingExpenses),
-		dto.ToFinancialMetrics(netProfitRpPerBird, 0, netProfit),
+		dto.ToFinancialMetrics(grossProfitRpPerBird, grossProfitRpPerKg, grossProfit),
+		dto.ToFinancialMetrics(totalOperatingExpensesRpPerBird, totalOperatingExpensesRpPerKg, totalOperatingExpenses),
+		dto.ToFinancialMetrics(netProfitRpPerBird, netProfitRpPerKg, netProfit),
 	)
 
-	profitLossSection := dto.ToProfitLossSection(plItems, plSummary)
-
-	// Build complete response
-	data := dto.ToClosingKeuanganData(hppSection, profitLossSection)
-
-	return &data, nil
+	return dto.ToProfitLossSection(plItems, plSummary)
 }
 
-// containsItem checks if a string exists in a slice
-func containsItem(slice []string, item string) bool {
-	for _, s := range slice {
-		if strings.EqualFold(s, item) {
+func containsFlag(flags []entity.Flag, name string) bool {
+	for _, flag := range flags {
+		if flag.Name == name {
 			return true
 		}
 	}

internal/modules/closings/services/sapronak.service.go

@@ -347,6 +347,14 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
+	usageAllocatedDetails, err := s.Repository.FetchSapronakUsageAllocatedDetails(ctx, pfk.Id)
+	if err != nil {
+		return nil, nil, 0, 0, err
+	}
+	if len(usageAllocatedDetails) > 0 {
+		usageDetailsRows = usageAllocatedDetails
+		chickinUsageDetailsRows = map[uint][]repository.SapronakDetailRow{}
+	}
 	adjIncomingRows, adjOutgoingRows, err := s.Repository.FetchSapronakAdjustments(ctx, pfk.KandangId)
 	if err != nil {
 		return nil, nil, 0, 0, err
@@ -355,7 +363,7 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	salesOutRows, err := s.Repository.FetchSapronakSales(ctx, pfk.KandangId)
+	salesOutRows, err := s.Repository.FetchSapronakSales(ctx, pfk.Id)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}

internal/modules/daily-checklists/controllers/daily-checklist.controller.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"math"
+	"mime/multipart"
 	"strconv"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/dto"
@@ -362,6 +363,9 @@ func (u *DailyChecklistController) UpdateOne(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid multipart form")
 	}
 	req.Documents = form.File["documents"]
+	if err := validateDailyChecklistDocumentSizes(req.Documents); err != nil {
+		return err
+	}
 
 	if err := c.BodyParser(req); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
@@ -381,6 +385,16 @@ func (u *DailyChecklistController) UpdateOne(c *fiber.Ctx) error {
 		})
 }
 
+func validateDailyChecklistDocumentSizes(files []*multipart.FileHeader) error {
+	const maxDailyChecklistDocumentBytes = 5 * 1024 * 1024 // 5MB
+	for _, file := range files {
+		if file != nil && file.Size > maxDailyChecklistDocumentBytes {
+			return fiber.NewError(fiber.StatusRequestEntityTooLarge, "Document size must be <= 5MB")
+		}
+	}
+	return nil
+}
+
 func (u *DailyChecklistController) DeleteOne(c *fiber.Ctx) error {
 	param := c.Params("idDailyChecklist")
 

internal/modules/daily-checklists/services/daily-checklist.service.go

@@ -3,13 +3,14 @@ package service
 import (
 	"errors"
 	"math"
+	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	middleware "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/validations"
 	phaseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/phasess/repositories"
@@ -134,6 +135,87 @@ func (s dailyChecklistService) withRelations(db *gorm.DB) *gorm.DB {
 	return db.Preload("Kandang")
 }
 
+func (s dailyChecklistService) ensureChecklistAccess(c *fiber.Ctx, checklistID uint) error {
+	if checklistID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid checklist id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("daily_checklists dc").
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("dc.id = ?", checklistID)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
+	}
+	return nil
+}
+
+func (s dailyChecklistService) ensureKandangAccess(c *fiber.Ctx, kandangID uint) error {
+	if kandangID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("kandangs k").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("k.id = ?", kandangID)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+	return nil
+}
+
+func (s dailyChecklistService) ensureTaskAccess(c *fiber.Ctx, taskID uint) error {
+	if taskID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid task id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("daily_checklist_activity_tasks t").
+		Joins("JOIN daily_checklists dc ON dc.id = t.checklist_id").
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("t.id = ?", taskID)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Task not found")
+	}
+	return nil
+}
+
 func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([]DailyChecklistListItem, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -143,7 +225,15 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 
 	db := s.Repository.DB().WithContext(c.Context()).
 		Table("daily_checklists dc").
-		Joins("JOIN kandangs k ON k.id = dc.kandang_id")
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id")
+
+	var scopeErr error
+	db, scopeErr = m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 
 	if params.DateFrom != "" {
 		dateFrom, err := time.Parse("2006-01-02", params.DateFrom)
@@ -170,8 +260,9 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 	}
 
 	if params.Search != "" {
-		like := "%" + params.Search + "%"
-		db = db.Where("(k.name ILIKE ? OR dc.category::text ILIKE ?)", like, like)
+		re := regexp.MustCompile("[^a-zA-Z0-9]")
+		like := re.ReplaceAll([]byte("%"+params.Search+"%"), []byte(""))
+		db = db.Where("(regexp_replace(k.name, '[^a-zA-Z0-9]', '', 'g') ILIKE ? OR regexp_replace(dc.category::text, '[^a-zA-Z0-9]', '', 'g') ILIKE ?)", string(like), string(like))
 	}
 
 	countDB := db.Session(&gorm.Session{})
@@ -294,6 +385,9 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 }
 
 func (s dailyChecklistService) GetOne(c *fiber.Ctx, id uint) (*entity.DailyChecklist, error) {
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return nil, err
+	}
 	dailyChecklist, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
@@ -399,6 +493,9 @@ func (s *dailyChecklistService) CreateOne(c *fiber.Ctx, req *validation.Create)
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := s.ensureKandangAccess(c, req.KandangId); err != nil {
+		return nil, err
+	}
 
 	date, err := time.Parse("2006-01-02", req.Date)
 	if err != nil {
@@ -431,6 +528,9 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return nil, err
+	}
 
 	deletedIDs := make([]uint, 0)
 	if req.DeletedDocumentIDs != nil {
@@ -456,7 +556,7 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 		updateBody["reject_reason"] = *req.RejectReason
 	}
 
-	actorID, err := middleware.ActorIDFromContext(c)
+	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return &entity.DailyChecklist{}, fiber.NewError(fiber.StatusUnauthorized, "Failed to get actor ID from context")
 	}
@@ -502,6 +602,9 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 }
 
 func (s dailyChecklistService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
@@ -516,6 +619,9 @@ func (s dailyChecklistService) AssignPhases(c *fiber.Ctx, id uint, req *validati
 	if err := s.Validate.Struct(req); err != nil {
 		return err
 	}
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 
 	if _, err := s.Repository.GetByID(c.Context(), id, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -597,6 +703,9 @@ func (s dailyChecklistService) AssignPhases(c *fiber.Ctx, id uint, req *validati
 }
 
 func (s dailyChecklistService) RemoveAssignment(c *fiber.Ctx, id uint, employeeID uint) error {
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 	if _, err := s.Repository.GetByID(c.Context(), id, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "DailyChecklist not found")
@@ -634,6 +743,9 @@ func (s dailyChecklistService) GetTasks(c *fiber.Ctx, checklistID uint) ([]entit
 	if checklistID == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "checklist_id is required")
 	}
+	if err := s.ensureChecklistAccess(c, checklistID); err != nil {
+		return nil, err
+	}
 
 	if _, err := s.Repository.GetByID(c.Context(), checklistID, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -658,6 +770,9 @@ func (s dailyChecklistService) GetChecklistPhaseIDs(c *fiber.Ctx, checklistID ui
 	if checklistID == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "checklist_id is required")
 	}
+	if err := s.ensureChecklistAccess(c, checklistID); err != nil {
+		return nil, err
+	}
 
 	if _, err := s.Repository.GetByID(c.Context(), checklistID, nil); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -687,6 +802,9 @@ func (s dailyChecklistService) UpdateAssignment(c *fiber.Ctx, req *validation.Up
 	if err := s.Validate.Struct(req); err != nil {
 		return err
 	}
+	if err := s.ensureTaskAccess(c, req.TaskID); err != nil {
+		return err
+	}
 
 	task := new(entity.DailyChecklistActivityTask)
 	if err := s.Repository.DB().WithContext(c.Context()).First(task, req.TaskID).Error; err != nil {
@@ -808,6 +926,9 @@ func (s dailyChecklistService) AssignTasks(c *fiber.Ctx, id uint, req *validatio
 	if err := s.Validate.Struct(req); err != nil {
 		return err
 	}
+	if err := s.ensureChecklistAccess(c, id); err != nil {
+		return err
+	}
 
 	employeeIDs, err := parseIDs(req.EmployeeIDs)
 	if err != nil {
@@ -900,8 +1021,16 @@ func (s dailyChecklistService) GetSummary(c *fiber.Ctx, params *validation.Summa
 		Joins("JOIN daily_checklists d ON d.id = t.checklist_id").
 		Joins("JOIN kandangs k ON k.id = d.kandang_id").
 		Joins("JOIN employees e ON e.id = a.employee_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas ar ON ar.id = loc.area_id").
 		Where("d.date BETWEEN ? AND ? AND d.status = ?", dateFrom, dateTo, "APPROVED")
 
+	var scopeErr error
+	db, scopeErr = m.ApplyLocationAreaScope(c, db, "loc.id", "ar.id")
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
+
 	if params.Category != "" {
 		db = db.Where("d.category = ?", params.Category)
 	}
@@ -946,6 +1075,15 @@ func (s dailyChecklistService) GetReport(c *fiber.Ctx, params *validation.Report
 		return nil, 0, err
 	}
 
+	locationScope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+	areaScope, err := m.ResolveAreaScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	buildBase := func() *gorm.DB {
@@ -962,6 +1100,9 @@ func (s dailyChecklistService) GetReport(c *fiber.Ctx, params *validation.Report
 			Where("EXTRACT(YEAR FROM dc.date) = ?", params.Year).
 			Where("dc.status = ?", "APPROVED")
 
+		db = m.ApplyScopeFilter(db, locationScope, "loc.id")
+		db = m.ApplyScopeFilter(db, areaScope, "a.id")
+
 		if params.AreaID != nil {
 			db = db.Where("a.id = ?", *params.AreaID)
 		}

internal/modules/daily-checklists/validations/daily-checklist.validation.go

@@ -29,7 +29,7 @@ type Query struct {
 }
 
 type AssignPhases struct {
-	PhaseIDs string `json:"phase_ids" validate:"required"`
+	PhaseIDs string `json:"phase_ids" validate:"omitempty"`
 }
 
 type AssignTask struct {

internal/modules/dashboards/controllers/dashboard.controller.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/validations"
@@ -81,6 +82,20 @@ func (u *DashboardController) GetAll(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid include")
 	}
 
+	scope, err := m.ResolveLocationScope(c, u.DashboardService.DB())
+	if err != nil {
+		return err
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			lokasiIds = []uint{}
+		} else if len(lokasiIds) > 0 {
+			lokasiIds = intersectUint(lokasiIds, scope.IDs)
+		} else {
+			lokasiIds = scope.IDs
+		}
+	}
+
 	analysisMode := strings.ToUpper(strings.TrimSpace(c.Query("analysis_mode", validation.AnalysisModeOverview)))
 	metric := strings.ToLower(strings.TrimSpace(c.Query("metric", "")))
 
@@ -176,6 +191,23 @@ func defaultUintSlice(values []uint) []uint {
 	return values
 }
 
+func intersectUint(a, b []uint) []uint {
+	if len(a) == 0 || len(b) == 0 {
+		return nil
+	}
+	set := make(map[uint]struct{}, len(b))
+	for _, id := range b {
+		set[id] = struct{}{}
+	}
+	out := make([]uint, 0, len(a))
+	for _, id := range a {
+		if _, ok := set[id]; ok {
+			out = append(out, id)
+		}
+	}
+	return out
+}
+
 func parsePeriodDates(startDateRaw, endDateRaw string, location *time.Location) (time.Time, time.Time, time.Time, error) {
 	now := time.Now().In(location)
 	startDate := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, location)

internal/modules/dashboards/module.go

@@ -5,6 +5,8 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
 
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonService "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	rDashboard "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/repositories"
 	sDashboard "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/services"
 
@@ -16,11 +18,12 @@ type DashboardModule struct{}
 
 func (DashboardModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	dashboardRepo := rDashboard.NewDashboardRepository(db)
+	hppCostRepo := commonRepo.NewHppCostRepository(db)
 	userRepo := rUser.NewUserRepository(db)
 
-	dashboardService := sDashboard.NewDashboardService(dashboardRepo, validate)
+	hppSvc := commonService.NewHppService(hppCostRepo)
+	dashboardService := sDashboard.NewDashboardService(dashboardRepo, validate, hppSvc)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	DashboardRoutes(router, userService, dashboardService)
 }
-

internal/modules/dashboards/repositories/dashboard.repository.go

@@ -21,6 +21,7 @@ type DashboardRepository interface {
 	SumSellingPrice(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) (SellingPriceAggregate, error)
 	SumEggProductionWeightGrams(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) (float64, error)
 	SumEggProductionWeightKg(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) (float64, error)
+	ListProjectFlockKandangIDsByEggProduction(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]uint, error)
 	GetRecordingWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]RecordingWeeklyMetric, error)
 	GetUniformityWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]UniformityWeeklyMetric, error)
 	GetStandardWeeklyMetrics(ctx context.Context, weeks []int, filters *validation.DashboardFilter) ([]StandardWeeklyMetric, error)

internal/modules/dashboards/repositories/dashboard_stats.repository.go

@@ -309,6 +309,27 @@ func (r *DashboardRepositoryImpl) SumEggProductionWeightKg(ctx context.Context,
 	return grams / 1000, nil
 }
 
+func (r *DashboardRepositoryImpl) ListProjectFlockKandangIDsByEggProduction(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]uint, error) {
+	var ids []uint
+
+	db := r.DB().WithContext(ctx).
+		Table("recording_eggs AS re").
+		Select("DISTINCT r.project_flock_kandangs_id").
+		Joins("JOIN recordings AS r ON r.id = re.recording_id").
+		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
+		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.deleted_at IS NULL")
+
+	db = applyDashboardFilters(db, filters)
+
+	if err := db.Scan(&ids).Error; err != nil {
+		return nil, err
+	}
+
+	return ids, nil
+}
+
 func (r *DashboardRepositoryImpl) GetFeedUsageByUom(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]FeedUsageByUom, error) {
 	var rows []FeedUsageByUom
 
@@ -551,18 +572,23 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyMetrics(ctx context.Context
 	}
 
 	var rows []ComparisonWeeklyMetric
+	weekExpr := `CASE
+		WHEN r.day IS NULL OR r.day <= 0 THEN 1
+		WHEN UPPER(pf.category) = 'LAYING' THEN ((r.day - 1) / 7 + 1) + 17
+		ELSE ((r.day - 1) / 7 + 1)
+	END`
+
 	db := r.DB().WithContext(ctx).
 		Table("recordings AS r").
-		Select(fmt.Sprintf(`((r.day - 1) / 7 + 1) AS week,
+		Select(fmt.Sprintf(`%s AS week,
 			%s AS series_id,
-			COALESCE(AVG(%s), 0) AS value`, seriesExpr, metricExpr)).
+			COALESCE(AVG(%s), 0) AS value`, weekExpr, seriesExpr, metricExpr)).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
 		Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
-		Where("r.deleted_at IS NULL").
-		Where("r.day IS NOT NULL AND r.day > 0")
+		Where("r.deleted_at IS NULL")
 
 	db = applyDashboardFilters(db, filters)
 

internal/modules/dashboards/services/dashboard.service.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	commonService "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/dto"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/validations"
@@ -17,26 +18,34 @@ import (
 
 	"github.com/go-playground/validator/v10"
 	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
 )
 
 type DashboardService interface {
 	GetAll(ctx context.Context, params *validation.Query) (dto.DashboardPerformanceOverviewDTO, int64, error)
+	DB() *gorm.DB
 }
 
 type dashboardService struct {
 	Log        *logrus.Logger
 	Validate   *validator.Validate
 	Repository repository.DashboardRepository
+	HppSvc     commonService.HppService
 }
 
-func NewDashboardService(repo repository.DashboardRepository, validate *validator.Validate) DashboardService {
+func NewDashboardService(repo repository.DashboardRepository, validate *validator.Validate, hppSvc commonService.HppService) DashboardService {
 	return &dashboardService{
 		Log:        utils.Log,
 		Validate:   validate,
 		Repository: repo,
+		HppSvc:     hppSvc,
 	}
 }
 
+func (s dashboardService) DB() *gorm.DB {
+	return s.Repository.DB()
+}
+
 func (s dashboardService) GetAll(ctx context.Context, params *validation.Query) (dto.DashboardPerformanceOverviewDTO, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return dto.DashboardPerformanceOverviewDTO{}, 0, err
@@ -592,13 +601,13 @@ func buildAggregateComparisonPercent(weeks []int, seriesRows []repository.Compar
 				count++
 			}
 
-			if count == 0 {
-				continue
-			}
-
 			if result[week] == nil {
 				result[week] = map[uint]float64{}
 			}
+			if count == 0 {
+				result[week][series.Id] = 0
+				continue
+			}
 			result[week][series.Id] = sum / count
 		}
 	}
@@ -846,6 +855,21 @@ func percentDelta(current, last float64) float64 {
 }
 
 func (s dashboardService) calculateHppGlobal(ctx context.Context, startDate, endExclusive, endDate time.Time, location *time.Location) (float64, float64, error) {
+	if s.HppSvc != nil {
+		currentHpp, err := s.hppGlobalForPeriod(ctx, startDate, endExclusive)
+		if err != nil {
+			return 0, 0, err
+		}
+
+		lastMonthStart, lastMonthEndExclusive := monthRange(endDate.AddDate(0, -1, 0), location)
+		lastHpp, err := s.hppGlobalForPeriod(ctx, lastMonthStart, lastMonthEndExclusive)
+		if err != nil {
+			return 0, 0, err
+		}
+
+		return currentHpp, lastHpp, nil
+	}
+
 	totalEggKg, err := s.Repository.SumEggProductionWeightKg(ctx, startDate, endExclusive, nil)
 	if err != nil {
 		return 0, 0, err
@@ -878,6 +902,37 @@ func (s dashboardService) calculateHppGlobal(ctx context.Context, startDate, end
 	return hppCurrent, hppLast, nil
 }
 
+func (s dashboardService) hppGlobalForPeriod(ctx context.Context, startDate, endExclusive time.Time) (float64, error) {
+	kandangIDs, err := s.Repository.ListProjectFlockKandangIDsByEggProduction(ctx, startDate, endExclusive, nil)
+	if err != nil {
+		return 0, err
+	}
+	if len(kandangIDs) == 0 {
+		return 0, nil
+	}
+
+	endOfPeriod := endExclusive.Add(-time.Nanosecond)
+	totalCost := 0.0
+	totalWeightKg := 0.0
+	for _, kandangID := range kandangIDs {
+		hppCost, err := s.HppSvc.CalculateHppCost(kandangID, &endOfPeriod)
+		if err != nil {
+			return 0, err
+		}
+		if hppCost == nil {
+			continue
+		}
+		totalCost += hppCost.Estimation.Total
+		totalWeightKg += hppCost.Estimation.Kg
+	}
+
+	if totalWeightKg <= 0 {
+		return 0, nil
+	}
+
+	return totalCost / totalWeightKg, nil
+}
+
 func (s dashboardService) calculateSellingPrice(ctx context.Context, endDate time.Time, location *time.Location) (float64, float64, error) {
 	startPrevMonth, endPrevMonthExclusive := monthRange(endDate.AddDate(0, -1, 0), location)
 	currentEndExclusive := endDate.AddDate(0, 0, 1)

internal/modules/expenses/dto/expense.dto.go

@@ -328,6 +328,7 @@ func ToKandangGroupDTO(pengajuans []ExpenseNonstockDTO, realisasi []ExpenseReali
 			}
 			kandangMap[kandangId].Realisasi = append(kandangMap[kandangId].Realisasi, r)
 		} else {
+			directRealisasi = append(directRealisasi, r)
 		}
 	}
 

internal/modules/expenses/repositories/expense_realization.repository.go

@@ -139,9 +139,28 @@ func (r *ExpenseRealizationRepositoryImpl) GetAllWithFilters(ctx context.Context
 	locationID := filters.LocationId
 	areaID := filters.AreaId
 
-	if locationID > 0 || areaID > 0 {
+	if filters.AllowedLocationIDs != nil || filters.AllowedAreaIDs != nil || locationID > 0 || areaID > 0 {
 		db = db.Joins("JOIN kandangs ON kandangs.id = expense_nonstocks.kandang_id")
+	}
 
+	if filters.AllowedLocationIDs != nil {
+		if len(filters.AllowedLocationIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Where("kandangs.location_id IN ?", filters.AllowedLocationIDs)
+		}
+	}
+
+	if filters.AllowedAreaIDs != nil {
+		if len(filters.AllowedAreaIDs) == 0 {
+			db = db.Where("1 = 0")
+		} else {
+			db = db.Joins("JOIN locations ON locations.id = kandangs.location_id").
+				Where("locations.area_id IN ?", filters.AllowedAreaIDs)
+		}
+	}
+
+	if locationID > 0 || areaID > 0 {
 		if locationID > 0 {
 			db = db.Where("kandangs.location_id = ?", uint(locationID))
 		}

internal/modules/expenses/services/expense.service.go

@@ -87,16 +87,22 @@ func (s expenseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]expens
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	expenses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = middleware.ApplyLocationScope(c, db, "expenses.location_id")
 		if params.Search != "" {
 			return db.Where("category ILIKE ?", "%"+params.Search+"%")
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 
 		return nil, 0, err
@@ -117,7 +123,16 @@ func (s expenseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]expens
 }
 
 func (s expenseService) GetOne(c *fiber.Ctx, id uint) (*expenseDto.ExpenseDetailDTO, error) {
-	expense, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	expense, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = middleware.ApplyLocationScope(c, db, "expenses.location_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 

internal/modules/finance/initials/dto/initial.dto.go

@@ -20,7 +20,7 @@ type InitialRelationDTO struct {
 	InitialBalanceType      string                  `json:"initial_balance_type"`
 	InitialBalanceTypeLabel string                  `json:"initial_balance_type_label"`
 	Party                   Party                   `json:"party"`
-	Bank                    bankDTO.BankRelationDTO `json:"bank,omitempty"`
+	Bank                    *bankDTO.BankRelationDTO `json:"bank"`
 	Direction               string                  `json:"direction"`
 	Nominal                 float64                 `json:"nominal"`
 	Notes                   string                  `json:"notes"`
@@ -128,11 +128,12 @@ func partyFromInitial(e entity.Payment) Party {
 	return party
 }
 
-func bankFromInitial(e entity.Payment) bankDTO.BankRelationDTO {
+func bankFromInitial(e entity.Payment) *bankDTO.BankRelationDTO {
 	if e.BankWarehouse.Id == 0 {
-		return bankDTO.BankRelationDTO{}
+		return nil
 	}
-	return bankDTO.ToBankRelationDTO(e.BankWarehouse)
+	bank := bankDTO.ToBankRelationDTO(e.BankWarehouse)
+	return &bank
 }
 
 func userFromInitial(e entity.Payment) userDTO.UserRelationDTO {
@@ -161,7 +162,7 @@ func initialBalanceLabel(balanceType string) string {
 }
 
 func initialBalanceTypeFromPayment(e entity.Payment) string {
-	if strings.EqualFold(e.Direction, "OUT") || e.Nominal < 0 {
+	if e.Nominal < 0 {
 		return "NEGATIVE"
 	}
 	return "POSITIVE"

internal/modules/finance/initials/services/initial.service.go

@@ -82,6 +82,7 @@ func (s initialService) GetOne(c *fiber.Ctx, id uint) (*entity.Payment, error) {
 }
 
 func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entity.Payment, error) {
+	normalizeOptionalBankId(&req.BankId)
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
@@ -124,7 +125,7 @@ func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 		PaymentDate:     time.Now(),
 		PaymentMethod:   string(utils.PaymentMethodSaldo),
 		BankId:          req.BankId,
-		Direction:       directionForInitialType(balanceType),
+		Direction:       directionForInitialType(party, balanceType),
 		Nominal:         signedNominal(balanceType, req.Nominal),
 		Notes:           req.Note,
 		CreatedBy:       actorID,
@@ -164,6 +165,7 @@ func (s *initialService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 }
 
 func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.Payment, error) {
+	normalizeOptionalBankId(&req.BankId)
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
@@ -186,6 +188,8 @@ func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	requiresExisting := req.PartyType != nil || req.PartyId != nil || req.InitialBalanceType != nil || req.Nominal != nil
 	requiresVerification := requiresExisting || req.ReferenceNumber != nil || req.Note != nil || req.BankId != nil
 	var existing *entity.Payment
+	var resolvedPartyType string
+	var resolvedPartyId uint
 	if requiresVerification {
 		current, err := s.Repository.GetByID(c.Context(), id, nil)
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -199,26 +203,25 @@ func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 			return nil, fiber.NewError(fiber.StatusNotFound, "Initial not found")
 		}
 		existing = current
+		resolvedPartyType = existing.PartyType
+		resolvedPartyId = existing.PartyId
 	}
 
 	if req.PartyType != nil || req.PartyId != nil {
-		partyType := existing.PartyType
-		partyId := existing.PartyId
-
 		if req.PartyType != nil {
 			normalized, err := normalizePartyType(*req.PartyType)
 			if err != nil {
 				return nil, err
 			}
-			partyType = normalized
-			updateBody["party_type"] = partyType
+			resolvedPartyType = normalized
+			updateBody["party_type"] = resolvedPartyType
 		}
 		if req.PartyId != nil {
-			partyId = *req.PartyId
-			updateBody["party_id"] = partyId
+			resolvedPartyId = *req.PartyId
+			updateBody["party_id"] = resolvedPartyId
 		}
 
-		if err := s.ensurePartyExists(c.Context(), partyType, partyId); err != nil {
+		if err := s.ensurePartyExists(c.Context(), resolvedPartyType, resolvedPartyId); err != nil {
 			return nil, err
 		}
 	}
@@ -238,8 +241,11 @@ func (s initialService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 			nominal = *req.Nominal
 		}
 
-		updateBody["direction"] = directionForInitialType(balanceType)
+		updateBody["direction"] = directionForInitialType(resolvedPartyType, balanceType)
 		updateBody["nominal"] = signedNominal(balanceType, nominal)
+	} else if req.PartyType != nil {
+		balanceType := balanceTypeFromPayment(existing)
+		updateBody["direction"] = directionForInitialType(resolvedPartyType, balanceType)
 	}
 
 	if len(updateBody) == 0 {
@@ -262,7 +268,7 @@ func isInitialTransaction(transactionType string) bool {
 }
 
 func balanceTypeFromPayment(payment *entity.Payment) string {
-	if strings.EqualFold(payment.Direction, "OUT") || payment.Nominal < 0 {
+	if payment.Nominal < 0 {
 		return "NEGATIVE"
 	}
 	return "POSITIVE"
@@ -286,11 +292,24 @@ func normalizeInitialBalanceType(balanceType string) (string, error) {
 	}
 }
 
-func directionForInitialType(balanceType string) string {
-	if strings.EqualFold(balanceType, "NEGATIVE") {
-		return "OUT"
+func directionForInitialType(partyType string, balanceType string) string {
+	switch utils.PaymentParty(strings.ToUpper(strings.TrimSpace(partyType))) {
+	case utils.PaymentPartySupplier:
+		if strings.EqualFold(balanceType, "POSITIVE") {
+			return "OUT"
+		}
+		return "IN"
+	case utils.PaymentPartyCustomer:
+		if strings.EqualFold(balanceType, "NEGATIVE") {
+			return "OUT"
+		}
+		return "IN"
+	default:
+		if strings.EqualFold(balanceType, "NEGATIVE") {
+			return "OUT"
+		}
+		return "IN"
 	}
-	return "IN"
 }
 
 func signedNominal(balanceType string, nominal float64) float64 {
@@ -335,3 +354,12 @@ func (s initialService) ensureBankExists(ctx context.Context, bankId *uint) erro
 		commonSvc.RelationCheck{Name: "Bank", ID: bankId, Exists: s.Repository.BankExists},
 	)
 }
+
+func normalizeOptionalBankId(bankId **uint) {
+	if bankId == nil || *bankId == nil {
+		return
+	}
+	if **bankId == 0 {
+		*bankId = nil
+	}
+}

internal/modules/finance/initials/validations/initial.validation.go

@@ -3,7 +3,7 @@ package validation
 type Create struct {
 	PartyType          string  `json:"party_type" validate:"required_strict,max=50"`
 	PartyId            uint    `json:"party_id" validate:"required_strict,number,gt=0"`
-	BankId             *uint   `json:"bank_id" validate:"required_strict,number,gt=0"`
+	BankId             *uint   `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"`
 	ReferenceNumber    string  `json:"reference_number" validate:"required_strict,max=100"`
 	InitialBalanceType string  `json:"initial_balance_type" validate:"required_strict,oneof=NEGATIVE POSITIVE"`
 	Nominal            float64 `json:"nominal" validate:"required_strict,gt=0"`

internal/modules/finance/injections/services/injection.service.go

@@ -110,7 +110,7 @@ func (s *injectionService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 		PaymentDate:     adjustmentDate,
 		PaymentMethod:   string(utils.PaymentMethodSaldo),
 		BankId:          req.BankId,
-		Direction:       "IN",
+		Direction:       directionForInjectionNominal(req.Nominal),
 		Nominal:         req.Nominal,
 		Notes:           req.Notes,
 		CreatedBy:       actorID,
@@ -186,6 +186,7 @@ func (s injectionService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	}
 	if req.Nominal != nil {
 		updateBody["nominal"] = *req.Nominal
+		updateBody["direction"] = directionForInjectionNominal(*req.Nominal)
 	}
 	if req.Notes != nil {
 		updateBody["notes"] = *req.Notes
@@ -210,6 +211,13 @@ func isInjectionTransaction(transactionType string) bool {
 	return strings.EqualFold(transactionType, string(utils.TransactionTypeInjection))
 }
 
+func directionForInjectionNominal(nominal float64) string {
+	if nominal < 0 {
+		return "OUT"
+	}
+	return "IN"
+}
+
 func (s injectionService) generateInjectionCode(ctx context.Context) (string, error) {
 	sequence, err := s.Repository.NextPaymentSequence(ctx)
 	if err != nil {

internal/modules/finance/injections/validations/injection.validation.go

@@ -3,14 +3,14 @@ package validation
 type Create struct {
 	BankId             *uint  `json:"bank_id" validate:"required_strict,number,gt=0"`
 	AdjustmentDate     string `json:"adjustment_date" validate:"required_strict"`
-	Nominal            float64 `json:"nominal" validate:"required_strict,gt=0"`
+	Nominal            float64 `json:"nominal" validate:"required_strict"`
 	Notes              string  `json:"notes" validate:"required_strict,max=500"`
 }
 
 type Update struct {
 	BankId             *uint    `json:"bank_id,omitempty" validate:"omitempty,number,gt=0"`
 	AdjustmentDate     *string  `json:"adjustment_date,omitempty" validate:"omitempty"`
-	Nominal            *float64 `json:"nominal,omitempty" validate:"omitempty,gt=0"`
+	Nominal            *float64 `json:"nominal,omitempty"`
 	Notes              *string  `json:"notes,omitempty" validate:"omitempty,max=500"`
 }
 

internal/modules/finance/transactions/controllers/transaction.controller.go

@@ -3,6 +3,7 @@ package controller
 import (
 	"math"
 	"strconv"
+	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/services"
@@ -23,10 +24,46 @@ func NewTransactionController(transactionService service.TransactionService) *Tr
 }
 
 func (u *TransactionController) GetAll(c *fiber.Ctx) error {
+	parseOptionalUint := func(key string) (*uint, error) {
+		raw := strings.TrimSpace(c.Query(key, ""))
+		if raw == "" {
+			return nil, nil
+		}
+		parsed, err := strconv.ParseUint(raw, 10, 64)
+		if err != nil {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid "+key)
+		}
+		if parsed == 0 {
+			return nil, nil
+		}
+		value := uint(parsed)
+		return &value, nil
+	}
+
+	bankId, err := parseOptionalUint("bank_id")
+	if err != nil {
+		return err
+	}
+	customerId, err := parseOptionalUint("customer_id")
+	if err != nil {
+		return err
+	}
+	supplierId, err := parseOptionalUint("supplier_id")
+	if err != nil {
+		return err
+	}
+
 	query := &validation.Query{
-		Page:   c.QueryInt("page", 1),
-		Limit:  c.QueryInt("limit", 10),
-		Search: c.Query("search", ""),
+		Page:            c.QueryInt("page", 1),
+		Limit:           c.QueryInt("limit", 10),
+		Search:          c.Query("search", ""),
+		TransactionType: c.Query("transaction_type", ""),
+		BankId:          bankId,
+		CustomerId:      customerId,
+		SupplierId:      supplierId,
+		SortDate:        c.Query("sort_date", ""),
+		StartDate:       c.Query("start_date", ""),
+		EndDate:         c.Query("end_date", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/finance/transactions/dto/transaction.dto.go

@@ -21,7 +21,7 @@ type TransactionRelationDTO struct {
 	Party           Party                   `json:"party"`
 	PaymentDate     time.Time               `json:"payment_date"`
 	PaymentMethod   string                  `json:"payment_method"`
-	Bank            bankDTO.BankRelationDTO `json:"bank,omitempty"`
+	Bank            *bankDTO.BankRelationDTO `json:"bank"`
 	ExpenseAmount   float64                 `json:"expense_amount"`
 	IncomeAmount    float64                 `json:"income_amount"`
 	Nominal         float64                 `json:"nominal"`
@@ -37,7 +37,7 @@ type TransactionListDTO struct {
 	Party           Party                           `json:"party"`
 	PaymentDate     time.Time                       `json:"payment_date"`
 	PaymentMethod   string                          `json:"payment_method"`
-	Bank            bankDTO.BankRelationDTO         `json:"bank"`
+	Bank            *bankDTO.BankRelationDTO        `json:"bank"`
 	ExpenseAmount   float64                         `json:"expense_amount"`
 	IncomeAmount    float64                         `json:"income_amount"`
 	Nominal         float64                         `json:"nominal"`
@@ -151,11 +151,12 @@ func partyFromPayment(e entity.Payment) Party {
 	return party
 }
 
-func bankFromPayment(e entity.Payment) bankDTO.BankRelationDTO {
+func bankFromPayment(e entity.Payment) *bankDTO.BankRelationDTO {
 	if e.BankWarehouse.Id == 0 {
-		return bankDTO.BankRelationDTO{}
+		return nil
 	}
-	return bankDTO.ToBankRelationDTO(e.BankWarehouse)
+	bank := bankDTO.ToBankRelationDTO(e.BankWarehouse)
+	return &bank
 }
 
 func userFromPayment(e entity.Payment) userDTO.UserRelationDTO {

internal/modules/finance/transactions/services/transaction.service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"strings"
+	"time"
 
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -61,13 +62,19 @@ func (s transactionService) GetAll(c *fiber.Ctx, params *validation.Query) ([]en
 		return nil, 0, err
 	}
 
+	startDate, endDate, err := parseTransactionDateRange(params.StartDate, params.EndDate)
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	transactions, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+
 		if params.Search != "" {
 			like := "%" + strings.ToLower(strings.TrimSpace(params.Search)) + "%"
-			return db.Where(
+			db = db.Where(
 				`LOWER(payment_code) LIKE ? OR
 				LOWER(COALESCE(reference_number, '')) LIKE ? OR
 				LOWER(COALESCE(transaction_type, '')) LIKE ? OR
@@ -75,7 +82,35 @@ func (s transactionService) GetAll(c *fiber.Ctx, params *validation.Query) ([]en
 				like, like, like, like,
 			)
 		}
-		return db.Order("payment_date DESC").Order("created_at DESC")
+
+		if strings.TrimSpace(params.TransactionType) != "" {
+			db = db.Where("transaction_type = ?", strings.ToUpper(strings.TrimSpace(params.TransactionType)))
+		}
+
+		if params.BankId != nil {
+			db = db.Where("bank_id = ?", *params.BankId)
+		}
+
+		if params.CustomerId != nil && params.SupplierId != nil {
+			db = db.Where(
+				"(party_type = ? AND party_id = ?) OR (party_type = ? AND party_id = ?)",
+				string(utils.PaymentPartyCustomer), *params.CustomerId,
+				string(utils.PaymentPartySupplier), *params.SupplierId,
+			)
+		} else if params.CustomerId != nil {
+			db = db.Where("party_type = ? AND party_id = ?", string(utils.PaymentPartyCustomer), *params.CustomerId)
+		} else if params.SupplierId != nil {
+			db = db.Where("party_type = ? AND party_id = ?", string(utils.PaymentPartySupplier), *params.SupplierId)
+		}
+
+		if startDate != nil {
+			db = db.Where("payment_date >= ?", *startDate)
+		}
+		if endDate != nil {
+			db = db.Where("payment_date < ?", *endDate)
+		}
+
+		return applyTransactionSort(db, params.SortDate)
 	})
 
 	if err != nil {
@@ -173,3 +208,47 @@ func (s transactionService) approvalQueryModifier() func(*gorm.DB) *gorm.DB {
 		return db.Preload("ActionUser")
 	}
 }
+
+func parseTransactionDateRange(startDate, endDate string) (*time.Time, *time.Time, error) {
+	start := strings.TrimSpace(startDate)
+	end := strings.TrimSpace(endDate)
+
+	var startPtr *time.Time
+	var endPtr *time.Time
+	var endValue *time.Time
+
+	if start != "" {
+		parsed, err := utils.ParseDateString(start)
+		if err != nil {
+			return nil, nil, utils.BadRequest("start_date must use format YYYY-MM-DD")
+		}
+		startPtr = &parsed
+	}
+
+	if end != "" {
+		parsed, err := utils.ParseDateString(end)
+		if err != nil {
+			return nil, nil, utils.BadRequest("end_date must use format YYYY-MM-DD")
+		}
+		endValue = &parsed
+		nextDay := parsed.AddDate(0, 0, 1)
+		endPtr = &nextDay
+	}
+
+	if startPtr != nil && endValue != nil && startPtr.After(*endValue) {
+		return nil, nil, utils.BadRequest("start_date must be earlier than end_date")
+	}
+
+	return startPtr, endPtr, nil
+}
+
+func applyTransactionSort(db *gorm.DB, sortDate string) *gorm.DB {
+	switch strings.ToLower(strings.TrimSpace(sortDate)) {
+	case "created_at":
+		return db.Order("created_at DESC").Order("payment_date DESC")
+	case "payment_date":
+		return db.Order("payment_date DESC").Order("created_at DESC")
+	default:
+		return db.Order("payment_date DESC").Order("created_at DESC")
+	}
+}

internal/modules/finance/transactions/validations/transaction.validation.go

@@ -9,7 +9,14 @@ type Update struct {
 }
 
 type Query struct {
-	Page   int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search string `query:"search" validate:"omitempty,max=50"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search          string `query:"search" validate:"omitempty,max=50"`
+	TransactionType string `query:"transaction_type" validate:"omitempty,max=50"`
+	BankId          *uint  `query:"bank_id" validate:"omitempty,number,gt=0"`
+	CustomerId      *uint  `query:"customer_id" validate:"omitempty,number,gt=0"`
+	SupplierId      *uint  `query:"supplier_id" validate:"omitempty,number,gt=0"`
+	SortDate        string `query:"sort_date" validate:"omitempty,oneof=created_at payment_date"`
+	StartDate       string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
+	EndDate         string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
 }

internal/modules/inventory/adjustments/dto/adjustment.dto.go

@@ -103,7 +103,7 @@ func ToProductWarehouseDTO(e *entity.ProductWarehouse) *ProductWarehouseDTO {
 func ToAdjustmentRelationDTO(e *entity.AdjustmentStock) AdjustmentRelationDTO {
 	return AdjustmentRelationDTO{
 		Id:                 e.Id,
-		Note:               e.StockLog.Notes,
+		Note:               "",
 		Increase:           e.TotalQty,
 		Decrease:           e.UsageQty,
 		ProductWarehouseId: e.ProductWarehouseId,
@@ -113,24 +113,17 @@ func ToAdjustmentRelationDTO(e *entity.AdjustmentStock) AdjustmentRelationDTO {
 
 func ToAdjustmentListDTO(e *entity.AdjustmentStock) AdjustmentListDTO {
 	var createdUser *userDTO.UserRelationDTO
-	if e.StockLog != nil && e.StockLog.CreatedUser != nil {
-		createdUser = &userDTO.UserRelationDTO{
-			Id:     e.StockLog.CreatedUser.Id,
-			IdUser: e.StockLog.CreatedUser.IdUser,
-			Email:  e.StockLog.CreatedUser.Email,
-			Name:   e.StockLog.CreatedUser.Name,
-		}
-	}
 
-	createdAt := time.Time{}
-	if e.StockLog != nil {
-		createdAt = e.StockLog.CreatedAt
+	// Get created user from StockLog
+	if e.StockLog != nil && e.StockLog.CreatedUser != nil {
+		mapped := userDTO.ToUserRelationDTO(*e.StockLog.CreatedUser)
+		createdUser = &mapped
 	}
 
 	return AdjustmentListDTO{
 		AdjustmentRelationDTO: ToAdjustmentRelationDTO(e),
 		CreatedUser:           createdUser,
-		CreatedAt:             createdAt,
+		CreatedAt:             e.CreatedAt,
 	}
 }
 

internal/modules/inventory/adjustments/repositories/adjustment_stock.repository.go

@@ -9,7 +9,7 @@ import (
 
 type AdjustmentStockRepository interface {
 	CreateOne(ctx context.Context, data *entity.AdjustmentStock, modifier func(*gorm.DB) *gorm.DB) error
-	GetByStockLogID(ctx context.Context, stockLogID uint) (*entity.AdjustmentStock, error)
+	GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error)
 	WithTx(tx *gorm.DB) AdjustmentStockRepository
 	DB() *gorm.DB
 }
@@ -30,19 +30,13 @@ func (r *adjustmentStockRepositoryImpl) CreateOne(ctx context.Context, data *ent
 	return q.Create(data).Error
 }
 
-func (r *adjustmentStockRepositoryImpl) GetByStockLogID(ctx context.Context, stockLogID uint) (*entity.AdjustmentStock, error) {
+func (r *adjustmentStockRepositoryImpl) GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error) {
 	var record entity.AdjustmentStock
-	err := r.db.WithContext(ctx).
-		Preload("StockLog").
-		Preload("StockLog.ProductWarehouse").
-		Preload("StockLog.ProductWarehouse.Product").
-		Preload("StockLog.ProductWarehouse.Warehouse").
-		Preload("StockLog.CreatedUser").
-		Preload("ProductWarehouse").
-		Preload("ProductWarehouse.Product").
-		Preload("ProductWarehouse.Warehouse").
-		Where("stock_log_id = ?", stockLogID).
-		First(&record).Error
+	q := r.db.WithContext(ctx)
+	if modifier != nil {
+		q = modifier(q)
+	}
+	err := q.First(&record, id).Error
 	if err != nil {
 		return nil, err
 	}

internal/modules/inventory/adjustments/services/adjustment.service.go

@@ -70,11 +70,15 @@ func (s *adjustmentService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("ProductWarehouse").
 		Preload("ProductWarehouse.Product").
 		Preload("ProductWarehouse.Warehouse").
-		Preload("CreatedUser")
+		Preload("StockLog.CreatedUser")
 }
 
 func (s *adjustmentService) GetOne(c *fiber.Ctx, id uint) (*entity.AdjustmentStock, error) {
-	adjustmentStock, err := s.AdjustmentStockRepository.GetByStockLogID(c.Context(), id)
+	if err := m.EnsureStockLogAccess(c, s.StockLogsRepository.DB(), id); err != nil {
+		return nil, err
+	}
+
+	adjustmentStock, err := s.AdjustmentStockRepository.GetByID(c.Context(), id, s.withRelations)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fiber.NewError(fiber.StatusNotFound, "Adjustment not found")
@@ -95,6 +99,9 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 	if err != nil {
 		return nil, err
 	}
+	if err := m.EnsureWarehouseAccess(c, s.WarehouseRepo.DB(), uint(req.WarehouseID)); err != nil {
+		return nil, err
+	}
 	if err := common.EnsureRelations(c.Context(),
 		common.RelationCheck{Name: "Product", ID: &req.ProductID, Exists: s.ProductRepo.IdExists},
 		common.RelationCheck{Name: "Warehouse", ID: &req.WarehouseID, Exists: s.WarehouseRepo.IdExists},
@@ -153,7 +160,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get product warehouse")
 		}
 
-		afterQuantity := productWarehouse.Quantity
 		newLog := &entity.StockLog{
 			LoggableType:       string(utils.StockLogTypeAdjustment),
 			LoggableId:         0,
@@ -162,15 +168,28 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			CreatedBy:          actorID,
 		}
 
+		stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(ctx, productWarehouse.Id, 1)
+		if err != nil {
+			s.Log.Errorf("Failed to get stock logs: %+v", err)
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			newLog.Stock = latestStockLog.Stock
+		} else {
+			newLog.Stock = 0
+		}
+
 		if transactionType == string(utils.StockLogTransactionTypeIncrease) {
-			afterQuantity += req.Quantity
-			newLog.Increase = afterQuantity
+			newLog.Increase = req.Quantity
+			newLog.Stock += newLog.Increase
 		} else {
 			if productWarehouse.Quantity < req.Quantity {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock. Current: %.2f, Requested: %.2f", productWarehouse.Quantity, req.Quantity))
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk pengurangan. Stok saat ini: %.2f, Jumlah yang akan dikurangi: %.2f", productWarehouse.Quantity, req.Quantity))
 			}
-			afterQuantity -= req.Quantity
-			newLog.Decrease = afterQuantity
+			newLog.Decrease = req.Quantity
+			newLog.Stock -= newLog.Decrease
 		}
 
 		if err := s.StockLogsRepository.WithTx(tx).CreateOne(ctx, newLog, nil); err != nil {
@@ -179,7 +198,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		}
 
 		adjustmentStock := &entity.AdjustmentStock{
-			StockLogId:         newLog.Id,
 			ProductWarehouseId: productWarehouse.Id,
 		}
 		if err := s.AdjustmentStockRepository.WithTx(tx).CreateOne(ctx, adjustmentStock, nil); err != nil {
@@ -187,6 +205,12 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create adjustment stock record")
 		}
 
+		newLog.LoggableType = string(utils.StockLogTypeAdjustment)
+		newLog.LoggableId = adjustmentStock.Id
+		if err := s.StockLogsRepository.WithTx(tx).UpdateOne(ctx, newLog.Id, newLog, nil); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to link stock log")
+		}
+
 		if transactionType == string(utils.StockLogTransactionTypeIncrease) {
 
 			note := fmt.Sprintf("Stock Adjustment IN #%d", newLog.Id)
@@ -216,13 +240,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			}
 		}
 
-		// LEGACY: Update ProductWarehouse quantity (for backward compatibility/reporting)
-		productWarehouse.Quantity = afterQuantity
-		if err := s.ProductWarehouseRepo.WithTx(tx).UpdateOne(ctx, productWarehouse.Id, productWarehouse, nil); err != nil {
-			s.Log.Errorf("Failed to update product warehouse quantity: %+v", err)
-			return err
-		}
-
 		createdAdjustmentStockId = adjustmentStock.Id
 		return nil
 	})
@@ -295,29 +312,36 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 	var total int64
 
 	q := s.AdjustmentStockRepository.DB().WithContext(c.Context()).Model(&entity.AdjustmentStock{}).
-		Preload("StockLog").
-		Preload("StockLog.ProductWarehouse").
-		Preload("StockLog.ProductWarehouse.Product").
-		Preload("StockLog.ProductWarehouse.Warehouse").
-		Preload("StockLog.CreatedUser").
 		Preload("ProductWarehouse").
 		Preload("ProductWarehouse.Product").
-		Preload("ProductWarehouse.Warehouse")
+		Preload("ProductWarehouse.Warehouse").
+		Preload("StockLog.CreatedUser")
+
+	scope, scopeErr := m.ResolveLocationScope(c, s.AdjustmentStockRepository.DB())
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			return []*entity.AdjustmentStock{}, 0, nil
+		}
+		q = q.Joins("JOIN product_warehouses pw_scope ON pw_scope.id = adjustment_stocks.product_warehouse_id").
+			Joins("JOIN warehouses w_scope ON w_scope.id = pw_scope.warehouse_id")
+		q = m.ApplyScopeFilter(q, scope, "w_scope.location_id")
+	}
 
 	if query.ProductID > 0 {
-		q = q.Joins("JOIN stock_logs ON stock_logs.id = adjustment_stocks.stock_log_id").
-			Joins("JOIN product_warehouses ON product_warehouses.id = stock_logs.product_warehouse_id").
+		q = q.Joins("JOIN product_warehouses ON product_warehouses.id = adjustment_stocks.product_warehouse_id").
 			Where("product_warehouses.product_id = ?", query.ProductID)
 	}
 
 	if query.WarehouseID > 0 {
-		q = q.Joins("JOIN stock_logs ON stock_logs.id = adjustment_stocks.stock_log_id").
-			Joins("JOIN product_warehouses ON product_warehouses.id = stock_logs.product_warehouse_id").
+		q = q.Joins("JOIN product_warehouses ON product_warehouses.id = adjustment_stocks.product_warehouse_id").
 			Where("product_warehouses.warehouse_id = ?", query.WarehouseID)
 	}
 
 	if query.TransactionType != "" {
-		q = q.Joins("JOIN stock_logs ON stock_logs.id = adjustment_stocks.stock_log_id").
+		q = q.Joins("JOIN stock_logs ON stock_logs.loggable_type = ? AND stock_logs.loggable_id = adjustment_stocks.id", "ADJUSTMENT").
 			Where("stock_logs.transaction_type = ?", strings.ToUpper(query.TransactionType))
 	}
 

internal/modules/inventory/product-stocks/services/product-stock.service.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/validations"
 	productRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -36,19 +37,49 @@ func NewProductStockService(
 	}
 }
 
-func (s productStockService) withRelations(db *gorm.DB) *gorm.DB {
+func (s productStockService) withRelations(db *gorm.DB, locationScope, areaScope m.ScopeFilter) *gorm.DB {
+	warehouseScope := func(db *gorm.DB) *gorm.DB {
+		if locationScope.Restrict {
+			db = db.Where("warehouses.location_id IN ?", locationScope.IDs)
+		}
+		if areaScope.Restrict {
+			db = db.Where("warehouses.area_id IN ?", areaScope.IDs)
+		}
+		return db
+	}
+	productWarehouseScope := func(db *gorm.DB) *gorm.DB {
+		db = db.Joins("JOIN warehouses w ON w.id = product_warehouses.warehouse_id")
+		if locationScope.Restrict {
+			db = db.Where("w.location_id IN ?", locationScope.IDs)
+		}
+		if areaScope.Restrict {
+			db = db.Where("w.area_id IN ?", areaScope.IDs)
+		}
+		return db
+	}
+	stockLogScope := func(db *gorm.DB) *gorm.DB {
+		db = db.
+			Joins("JOIN product_warehouses pw ON pw.id = stock_logs.product_warehouse_id").
+			Joins("JOIN warehouses w ON w.id = pw.warehouse_id")
+		if locationScope.Restrict {
+			db = db.Where("w.location_id IN ?", locationScope.IDs)
+		}
+		if areaScope.Restrict {
+			db = db.Where("w.area_id IN ?", areaScope.IDs)
+		}
+		return db.Order("stock_logs.created_at ASC")
+	}
+
 	return db.
 		Preload("CreatedUser").
 		Preload("Uom").
 		Preload("ProductCategory").
 		Preload("Flags").
-		Preload("ProductWarehouses").
-		Preload("ProductWarehouses.Warehouse").
+		Preload("ProductWarehouses", productWarehouseScope).
+		Preload("ProductWarehouses.Warehouse", warehouseScope).
 		Preload("ProductWarehouses.Warehouse.Location").
 		Preload("ProductWarehouses.Warehouse.Location.Area").
-		Preload("ProductWarehouses.StockLogs", func(db *gorm.DB) *gorm.DB {
-			return db.Order("created_at ASC")
-		}).
+		Preload("ProductWarehouses.StockLogs", stockLogScope).
 		Preload("ProductWarehouses.StockLogs.CreatedUser").
 		Preload("ProductSuppliers").
 		Preload("ProductSuppliers.Supplier", func(db *gorm.DB) *gorm.DB {
@@ -61,17 +92,40 @@ func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 		return nil, 0, err
 	}
 
+	locationScope, areaScope, err := m.ResolveLocationAreaScopes(c, s.ProductRepository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	productStocks, total, err := s.ProductRepository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = db.Where(`EXISTS (
-			SELECT 1
-			FROM product_warehouses pw
-			WHERE pw.product_id = products.id
-				AND pw.qty > 0
-		)`)
+		if locationScope.Restrict || areaScope.Restrict {
+			if (locationScope.Restrict && len(locationScope.IDs) == 0) || (areaScope.Restrict && len(areaScope.IDs) == 0) {
+				return db.Where("1 = 0")
+			}
+			db = db.Where(`EXISTS (
+				SELECT 1
+				FROM product_warehouses pw
+				JOIN warehouses w ON w.id = pw.warehouse_id
+				WHERE pw.product_id = products.id
+					AND pw.qty > 0
+					AND (? OR w.location_id IN ?)
+					AND (? OR w.area_id IN ?)
+			)`,
+				!locationScope.Restrict, locationScope.IDs,
+				!areaScope.Restrict, areaScope.IDs,
+			)
+		} else {
+			db = db.Where(`EXISTS (
+				SELECT 1
+				FROM product_warehouses pw
+				WHERE pw.product_id = products.id
+					AND pw.qty > 0
+			)`)
+		}
 
-		db = s.withRelations(db)
+		db = s.withRelations(db, locationScope, areaScope)
 		if params.Search != "" {
 			db = db.Where("products.name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -86,7 +140,34 @@ func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 }
 
 func (s productStockService) GetOne(c *fiber.Ctx, id uint) (*entity.Product, error) {
-	product, err := s.ProductRepository.GetByID(c.Context(), id, s.withRelations)
+	locationScope, areaScope, err := m.ResolveLocationAreaScopes(c, s.ProductRepository.DB())
+	if err != nil {
+		return nil, err
+	}
+
+	if locationScope.Restrict || areaScope.Restrict {
+		if (locationScope.Restrict && len(locationScope.IDs) == 0) || (areaScope.Restrict && len(areaScope.IDs) == 0) {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
+		}
+		var count int64
+		if err := s.ProductRepository.DB().WithContext(c.Context()).
+			Table("product_warehouses pw").
+			Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
+			Where("pw.product_id = ?", id).
+			Where("pw.qty > 0").
+			Where("(? OR w.location_id IN ?)", !locationScope.Restrict, locationScope.IDs).
+			Where("(? OR w.area_id IN ?)", !areaScope.Restrict, areaScope.IDs).
+			Count(&count).Error; err != nil {
+			return nil, err
+		}
+		if count == 0 {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
+		}
+	}
+
+	product, err := s.ProductRepository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		return s.withRelations(db, locationScope, areaScope)
+	})
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Product not found")
 	}

internal/modules/inventory/product-warehouses/controllers/product_warehouse.controller.go

@@ -8,6 +8,7 @@ import (
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -24,12 +25,14 @@ func NewProductWarehouseController(productWarehouseService service.ProductWareho
 
 func (u *ProductWarehouseController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
-		Page:        c.QueryInt("page", 1),
-		Limit:       c.QueryInt("limit", 10),
-		ProductId:   uint(c.QueryInt("product_id", 0)),
-		WarehouseId: uint(c.QueryInt("warehouse_id", 0)),
-		Flags:       c.Query("flags", ""),
-		KandangId:   uint(c.QueryInt("kandang_id", 0)),
+		Page:            c.QueryInt("page", 1),
+		Limit:           c.QueryInt("limit", 10),
+		ProductId:       uint(c.QueryInt("product_id", 0)),
+		WarehouseId:     uint(c.QueryInt("warehouse_id", 0)),
+		Flags:           c.Query("flags", ""),
+		KandangId:       uint(c.QueryInt("kandang_id", 0)),
+		TransferContext: c.Query(utils.TransferContextKey, ""),
+		Type:            c.Query("type", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go

@@ -6,6 +6,7 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
 	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 // === DTO Structs ===
@@ -22,6 +23,7 @@ type ProductWarehouseListDTO struct {
 	Product             *productDTO.ProductRelationDTO     `json:"product,omitempty"`
 	Warehouse           *warehouseDTO.WarehouseRelationDTO `json:"warehouse,omitempty"`
 	ProjectFlockKandang *ProjectFlockKandangRelationDTO    `json:"project_flock_kandang,omitempty"`
+	Week                int                                `json:"week"`
 	CreatedUser         *UserRelationDTO                   `json:"created_user,omitempty"`
 	CreatedAt           time.Time                          `json:"created_at"`
 	UpdatedAt           time.Time                          `json:"updated_at"`
@@ -109,6 +111,22 @@ func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDT
 		}
 
 		dto.ProjectFlockKandang = pfkDTO
+
+		// Calculate week for AYAM_PULLET/AYAM products
+		productFlags := make([]string, len(e.Product.Flags))
+		for i, f := range e.Product.Flags {
+			productFlags[i] = f.Name
+		}
+
+		var category string
+		if e.ProjectFlockKandang.ProjectFlock.Id != 0 {
+			category = e.ProjectFlockKandang.ProjectFlock.Category
+		}
+
+		now := time.Now()
+		_, ageInWeeks := calculateAgeFromChickin(e.ProjectFlockKandang, &now, productFlags, category)
+
+		dto.Week = ageInWeeks
 	}
 
 	return dto
@@ -138,3 +156,58 @@ func ToProductWarehouseNestedDTO(e entity.ProductWarehouse) ProductWarehousNeste
 		Warehouse: &warehouse,
 	}
 }
+
+// Helper function to calculate age from chickin (same logic as closingMarketing.dto.go)
+func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, currentDate *time.Time, productFlags []string, category string) (int, int) {
+	if projectFlockKandang == nil || currentDate == nil || len(projectFlockKandang.Chickins) == 0 {
+		return 0, 0
+	}
+
+	// Return 0 for TRADING, TELUR, and AYAM flags (only AYAM_PULLET should have week)
+	for _, flag := range productFlags {
+		if flag == string(utils.FlagOVK) ||
+			flag == string(utils.FlagPakan) ||
+			flag == string(utils.FlagPreStarter) ||
+			flag == string(utils.FlagStarter) ||
+			flag == string(utils.FlagFinisher) ||
+			flag == string(utils.FlagObat) ||
+			flag == string(utils.FlagVitamin) ||
+			flag == string(utils.FlagKimia) ||
+			flag == string(utils.FlagEkspedisi) ||
+			flag == string(utils.FlagTelur) ||
+			flag == string(utils.FlagTelurUtuh) ||
+			flag == string(utils.FlagTelurPecah) ||
+			flag == string(utils.FlagTelurPutih) ||
+			flag == string(utils.FlagTelurRetak) ||
+			flag == string(utils.FlagAyamAfkir) ||
+			flag == string(utils.FlagAyamCulling) ||
+			flag == string(utils.FlagAyamMati) {
+			return 0, 0
+		}
+	}
+
+	// Find earliest chickin date
+	earliestChickinDate := projectFlockKandang.Chickins[0].ChickInDate
+	for _, chickin := range projectFlockKandang.Chickins {
+		if chickin.ChickInDate.Before(earliestChickinDate) {
+			earliestChickinDate = chickin.ChickInDate
+		}
+	}
+
+	diff := currentDate.Sub(earliestChickinDate)
+	ageInDays := int(diff.Hours() / 24)
+
+	var ageInWeeks int
+	if ageInDays <= 0 {
+		ageInWeeks = 0
+	} else {
+		if category == string(utils.ProjectFlockCategoryLaying) {
+			ageInDays = ageInDays + 119
+			ageInWeeks = ((ageInDays - 1) / 7) + 1
+		} else {
+			ageInWeeks = ((ageInDays - 1) / 7) + 1
+		}
+	}
+
+	return ageInDays, ageInWeeks
+}

internal/modules/inventory/product-warehouses/repositories/product_warehouse.repository.go

@@ -86,14 +86,24 @@ func (r *ProductWarehouseRepositoryImpl) ProductWarehouseExistByProductAndWareho
 func (r *ProductWarehouseRepositoryImpl) GetProductWarehouseByProductAndWarehouseID(ctx context.Context, productId, warehouseId uint) (*entity.ProductWarehouse, error) {
 	var productWarehouse entity.ProductWarehouse
 
-	// Cari product warehouse dengan project_flock_kandang yang masih aktif (belum closed)
 	err := r.DB().WithContext(ctx).
-		Joins("LEFT JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
-		Where("product_id = ? AND warehouse_id = ? AND (project_flock_kandang_id IS NULL OR project_flock_kandangs.closed_at IS NULL)", productId, warehouseId).
+		Where("product_id = ? AND warehouse_id = ? AND project_flock_kandang_id IS NOT NULL", productId, warehouseId).
 		Order("id DESC").
 		Preload("ProjectFlockKandang").
 		First(&productWarehouse).Error
 
+	if err == nil {
+
+		if productWarehouse.ProjectFlockKandang.ClosedAt == nil {
+			return &productWarehouse, nil
+		}
+
+	}
+
+	err = r.DB().WithContext(ctx).
+		Where("product_id = ? AND warehouse_id = ? AND project_flock_kandang_id IS NULL", productId, warehouseId).
+		First(&productWarehouse).Error
+
 	if err != nil {
 		return nil, err
 	}
@@ -158,9 +168,10 @@ func (r *ProductWarehouseRepositoryImpl) ApplyFlagsFilter(db *gorm.DB, flags []s
 	}
 
 	return db.
-		Joins("JOIN products ON products.id = product_warehouses.product_id").
-		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
-		Where("flags.name IN ?", flags)
+		Joins("JOIN products p_flag ON p_flag.id = product_warehouses.product_id").
+		Joins("JOIN flags f_flag ON f_flag.flagable_id = p_flag.id AND f_flag.flagable_type = ?", "products").
+		Where("f_flag.name IN ?", flags).
+		Distinct()
 }
 
 func (r *ProductWarehouseRepositoryImpl) AdjustQuantities(ctx context.Context, deltas map[uint]float64, modifier func(*gorm.DB) *gorm.DB) error {

internal/modules/inventory/product-warehouses/services/product_warehouse.service.go

@@ -7,6 +7,7 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/sirupsen/logrus"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/validations"
 	kandangrepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
@@ -45,7 +46,8 @@ func (s productWarehouseService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Warehouse.Area").
 		Preload("Warehouse.Kandang").
 		Preload("ProjectFlockKandang").
-		Preload("ProjectFlockKandang.ProjectFlock")
+		Preload("ProjectFlockKandang.ProjectFlock").
+		Preload("ProjectFlockKandang.Chickins")
 }
 
 func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProductWarehouse, int64, error) {
@@ -53,6 +55,19 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 		return nil, 0, err
 	}
 
+	applyScope := true
+	if params.TransferContext == utils.TransferContextInventoryTransfer {
+		applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
+	}
+	var scope m.ScopeFilter
+	var err error
+	if applyScope {
+		scope, err = m.ResolveLocationScope(c, s.Repository.DB())
+		if err != nil {
+			return nil, 0, err
+		}
+	}
+
 	if params.ProductId > 0 {
 		isProductExist, err := s.Repository.IsProductExist(c.Context(), params.ProductId)
 		if err != nil {
@@ -85,11 +100,28 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 
 	offset := (params.Page - 1) * params.Limit
 
+	if params.Type != "" {
+		if !utils.IsValidMarketingType(params.Type) {
+			return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid marketing type")
+		}
+	}
+
 	cleanFlags := utils.ParseFlags(params.Flags)
 
 	productWarehouses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
 
+		db = db.Joins("JOIN warehouses w_scope ON product_warehouses.warehouse_id = w_scope.id").
+			Where("w_scope.deleted_at IS NULL")
+		if applyScope {
+			if scope.Restrict {
+				if len(scope.IDs) == 0 {
+					return db.Where("1 = 0")
+				}
+				db = db.Where("w_scope.location_id IN ?", scope.IDs)
+			}
+		}
+
 		if params.ProductId != 0 {
 			db = db.Where("product_id = ?", params.ProductId)
 		}
@@ -103,7 +135,22 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 			db = db.Where("warehouse_id = ?", params.WarehouseId)
 		}
 
-		db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
+		if params.Type != "" {
+			switch params.Type {
+			case string(utils.MarketingTypeAyamPullet):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer)})
+			case string(utils.MarketingTypeAyam):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagAyamMati)})
+			case string(utils.MarketingTypeTelur):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagTelur), string(utils.FlagTelurUtuh), string(utils.FlagTelurPecah), string(utils.FlagTelurPutih), string(utils.FlagTelurRetak)})
+			case string(utils.MarketingTypeTrading):
+				db = s.Repository.ApplyFlagsFilter(db, []string{string(utils.FlagPakan), string(utils.FlagPreStarter), string(utils.FlagStarter), string(utils.FlagFinisher), string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia), string(utils.FlagEkspedisi)})
+			}
+		}
+
+		if len(cleanFlags) > 0 {
+			db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
+		}
 
 		return db.Order("product_warehouses.id DESC")
 	})
@@ -116,7 +163,33 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 }
 
 func (s productWarehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.ProductWarehouse, error) {
-	productWarehouse, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	applyScope := true
+	if c.Query(utils.TransferContextKey, "") == utils.TransferContextInventoryTransfer {
+		applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
+	}
+	var scope m.ScopeFilter
+	var err error
+	if applyScope {
+		scope, err = m.ResolveLocationScope(c, s.Repository.DB())
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	productWarehouse, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db = db.Joins("JOIN warehouses w_scope ON product_warehouses.warehouse_id = w_scope.id").
+			Where("w_scope.deleted_at IS NULL")
+		if applyScope {
+			if scope.Restrict {
+				if len(scope.IDs) == 0 {
+					return db.Where("1 = 0")
+				}
+				db = db.Where("w_scope.location_id IN ?", scope.IDs)
+			}
+		}
+		return db
+	})
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "ProductWarehouse not found")
 	}

internal/modules/inventory/product-warehouses/validations/product_warehouse.validation.go

@@ -13,10 +13,12 @@ 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"`
-	ProductId   uint   `query:"product_id" validate:"omitempty,number,min=1"`
-	WarehouseId uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
-	Flags       string `query:"flags" validate:"omitempty"`
-	KandangId   uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	ProductId       uint   `query:"product_id" validate:"omitempty,number,min=1"`
+	WarehouseId     uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
+	Flags           string `query:"flags" validate:"omitempty"`
+	KandangId       uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
+	TransferContext string `query:"transfer_context" validate:"omitempty,oneof=inventory_transfer"`
+	Type            string `query:"type" validate:"omitempty,oneof=AYAM TELUR TRADING AYAM_PULLET"`
 }

internal/modules/inventory/transfers/dto/transfer.dto.go

@@ -9,12 +9,12 @@ import (
 )
 
 type TransferRelationDTO struct {
-	Id                   uint64                                `json:"id"`
-	MovementNumber       string                                `json:"movement_number"`
-	TransferReason       string                                `json:"transfer_reason"`
-	TransferDate         string                                `json:"transfer_date"`
-	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO    `json:"source_warehouse,omitempty"`
-	DestinationWarehouse *warehouseDTO.WarehouseRelationDTO    `json:"destination_warehouse,omitempty"`
+	Id                   uint64                             `json:"id"`
+	MovementNumber       string                             `json:"movement_number"`
+	TransferReason       string                             `json:"transfer_reason"`
+	TransferDate         string                             `json:"transfer_date"`
+	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO `json:"source_warehouse,omitempty"`
+	DestinationWarehouse *warehouseDTO.WarehouseRelationDTO `json:"destination_warehouse,omitempty"`
 }
 
 type ProductSimpleDTO struct {
@@ -51,16 +51,16 @@ type TransferDetailDTO struct {
 }
 
 type TransferDetailItemDTO struct {
-	Id                uint64           `json:"id"`
-	Product           ProductSimpleDTO `json:"product"`
-	Quantity          float64          `json:"quantity"`
-	TransportPerItem  *float64         `json:"transport_per_item,omitempty"`  // Biaya ekspedisi per item
-	ExpeditionVendor  *SupplierSimpleDTO `json:"expedition_vendor,omitempty"` // Vendor ekspedisi
+	Id               uint64             `json:"id"`
+	Product          ProductSimpleDTO   `json:"product"`
+	Quantity         float64            `json:"quantity"`
+	TransportPerItem *float64           `json:"transport_per_item,omitempty"` // Biaya ekspedisi per item
+	ExpeditionVendor *SupplierSimpleDTO `json:"expedition_vendor,omitempty"`  // Vendor ekspedisi
 }
 
 type TransferDeliveryDTO struct {
 	Id                uint64                    `json:"id"`
-	Supplier          SupplierSimpleDTO         `json:"supplier"`
+	Supplier          *SupplierSimpleDTO        `json:"supplier,omitempty"`
 	VehiclePlate      string                    `json:"vehicle_plate"`
 	DriverName        string                    `json:"driver_name"`
 	DocumentNumber    string                    `json:"document_number"`
@@ -115,7 +115,6 @@ func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 			Quantity: d.UsageQty + d.PendingQty, // Total actual quantity allocated
 		}
 
-		
 		if d.ExpenseNonstock != nil {
 			priceCopy := d.ExpenseNonstock.Price
 			detailDTO.TransportPerItem = &priceCopy
@@ -155,12 +154,17 @@ func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 			}
 		}
 
-		deliveries = append(deliveries, TransferDeliveryDTO{
-			Id: del.Id,
-			Supplier: SupplierSimpleDTO{
+		var supplier *SupplierSimpleDTO
+		if del.Supplier != nil {
+			supplier = &SupplierSimpleDTO{
 				Id:   del.Supplier.Id,
 				Name: del.Supplier.Name,
-			},
+			}
+		}
+
+		deliveries = append(deliveries, TransferDeliveryDTO{
+			Id:                del.Id,
+			Supplier:          supplier,
 			VehiclePlate:      del.VehiclePlate,
 			DriverName:        del.DriverName,
 			DocumentNumber:    del.DocumentNumber,
@@ -201,7 +205,6 @@ func ToTransferDetailDTO(e entity.StockTransfer) TransferDetailDTO {
 			Quantity: d.UsageQty + d.PendingQty, // Total actual quantity allocated
 		}
 
-		
 		if d.ExpenseNonstock != nil {
 			priceCopy := d.ExpenseNonstock.Price
 			detailDTO.TransportPerItem = &priceCopy
@@ -241,12 +244,17 @@ func ToTransferDetailDTO(e entity.StockTransfer) TransferDetailDTO {
 			}
 		}
 
-		deliveries = append(deliveries, TransferDeliveryDTO{
-			Id: del.Id,
-			Supplier: SupplierSimpleDTO{
+		var supplier *SupplierSimpleDTO
+		if del.Supplier != nil {
+			supplier = &SupplierSimpleDTO{
 				Id:   del.Supplier.Id,
 				Name: del.Supplier.Name,
-			},
+			}
+		}
+
+		deliveries = append(deliveries, TransferDeliveryDTO{
+			Id:                del.Id,
+			Supplier:          supplier,
 			VehiclePlate:      del.VehiclePlate,
 			DriverName:        del.DriverName,
 			DocumentNumber:    del.DocumentNumber,

internal/modules/inventory/transfers/services/transfer.service.go

@@ -94,10 +94,24 @@ func (s transferService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.StockTransferRepo.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	transfers, total, err := s.StockTransferRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		if scope.Restrict {
+			if len(scope.IDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = db.
+				Joins("JOIN warehouses w_from ON w_from.id = stock_transfers.from_warehouse_id").
+				Joins("JOIN warehouses w_to ON w_to.id = stock_transfers.to_warehouse_id").
+				Where("w_from.location_id IN ? OR w_to.location_id IN ?", scope.IDs, scope.IDs)
+		}
 		if params.Search != "" {
 			searchTerm := "%" + strings.TrimSpace(params.Search) + "%"
 			db = db.Joins("LEFT JOIN warehouses AS from_warehouses ON from_warehouses.id = stock_transfers.from_warehouse_id").
@@ -116,6 +130,28 @@ func (s transferService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 }
 
 func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, error) {
+	scope, err := m.ResolveLocationScope(c, s.StockTransferRepo.DB())
+	if err != nil {
+		return nil, err
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+		}
+		var count int64
+		if err := s.StockTransferRepo.DB().WithContext(c.Context()).
+			Table("stock_transfers").
+			Joins("JOIN warehouses w_from ON w_from.id = stock_transfers.from_warehouse_id").
+			Joins("JOIN warehouses w_to ON w_to.id = stock_transfers.to_warehouse_id").
+			Where("stock_transfers.id = ?", id).
+			Where("w_from.location_id IN ? OR w_to.location_id IN ?", scope.IDs, scope.IDs).
+			Count(&count).Error; err != nil {
+			return nil, err
+		}
+		if count == 0 {
+			return nil, fiber.NewError(fiber.StatusNotFound, "Transfer not found")
+		}
+	}
 
 	transferPtr, err := s.StockTransferRepo.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
 		return s.withRelations(db)
@@ -124,7 +160,8 @@ func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, e
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Transfer dengan ID %d tidak ditemukan", id))
 		}
-		return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data transfer dengan ID %d", id))
+		s.Log.Errorf("Failed to fetch transfer by ID %d: %+v", id, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data transfer")
 	}
 
 	return transferPtr, nil
@@ -142,7 +179,8 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk dengan ID %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
 			}
-			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengecek stok produk %d di gudang asal", product.ProductID))
+			s.Log.Errorf("Failed to fetch product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengecek stok produk")
 		}
 		if sourcePW.Quantity < product.ProductQty {
 			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak mencukupi. Tersedia: %.2f, Diminta: %.2f", product.ProductID, sourcePW.Quantity, product.ProductQty))
@@ -163,12 +201,15 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		return nil, err
 	}
 
-	projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), destPfkID)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock untuk gudang tujuan")
-	}
-	if projectFlockKandang.ClosedAt != nil {
-		return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Project flock untuk gudang tujuan sudah ditutup (closing) pada %s", projectFlockKandang.ClosedAt.Format("2006-01-02")))
+	if destPfkID > 0 {
+		projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), destPfkID)
+		if err != nil {
+			s.Log.Errorf("Failed to fetch project flock kandang by ID %d: %+v", destPfkID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock")
+		}
+		if projectFlockKandang.ClosedAt != nil {
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Project flock untuk gudang tujuan sudah ditutup (closing) pada %s", projectFlockKandang.ClosedAt.Format("2006-01-02")))
+		}
 	}
 
 	actorID, err := m.ActorIDFromContext(c)
@@ -191,12 +232,31 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	}
 
 	for _, delivery := range req.Deliveries {
+
+		if delivery.SupplierID == 0 {
+			continue
+		}
+
+		if delivery.VehiclePlate == "" {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Vehicle plate wajib diisi ketika supplier dipilih")
+		}
+		if delivery.DriverName == "" {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Driver name wajib diisi ketika supplier dipilih")
+		}
+		if delivery.DeliveryCost <= 0 {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery cost harus lebih dari 0 ketika supplier dipilih")
+		}
+		if delivery.DeliveryCostPerItem <= 0 {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery cost per item harus lebih dari 0 ketika supplier dipilih")
+		}
+
 		supplier, err := s.SupplierRepo.GetByID(c.Context(), uint(delivery.SupplierID), nil)
 		if err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Supplier dengan ID %d tidak ditemukan", delivery.SupplierID))
 			}
-			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data supplier dengan ID %d", delivery.SupplierID))
+			s.Log.Errorf("Failed to fetch supplier by ID %d: %+v", delivery.SupplierID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data supplier")
 		}
 		if supplier.Category != string(utils.SupplierCategoryBOP) {
 			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Supplier '%s' (ID: %d) bukan kategori BOP. Kategori saat ini: %s", supplier.Name, delivery.SupplierID, supplier.Category))
@@ -205,7 +265,8 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 	movementNumber, err := s.StockTransferRepo.GenerateMovementNumber(c.Context())
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat nomor movement transfer")
+		s.Log.Errorf("Failed to generate movement number: %+v", err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat nomor transfer")
 	}
 
 	transferDate, _ := utils.ParseDateString(req.TransferDate)
@@ -228,6 +289,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		stockTransferDeliveryRepoTX := s.StockTransferDeliveryRepo.WithTx(tx)
 		stockTransferDeliveryItemRepoTX := s.StockTransferDeliveryItemRepo.WithTx(tx)
 		productWarehouseRepoTX := rProductWarehouse.NewProductWarehouseRepository(tx)
+		stocklogsRepoTx := s.StockLogsRepository.WithTx(tx)
 
 		if err := stockTransferRepoTX.CreateOne(c.Context(), entityTransfer, nil); err != nil {
 			return err
@@ -245,14 +307,16 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				if errors.Is(err, gorm.ErrRecordNotFound) {
 					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
 				}
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data product warehouse untuk produk %d di gudang asal", product.ProductID))
+				s.Log.Errorf("Failed to fetch source product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang asal")
 			}
 
 			destPW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
 				c.Context(), uint(product.ProductID), uint(req.DestinationWarehouseID),
 			)
 			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data product warehouse untuk produk %d di gudang tujuan", product.ProductID))
+				s.Log.Errorf("Failed to fetch dest product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang tujuan")
 			}
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				ctx := c.Context()
@@ -261,7 +325,6 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					return err
 				}
 
-				// Set ProjectFlockKandangId hanya jika ada kandang
 				var pfkID *uint
 				if projectFlockKandangID > 0 {
 					pfkID = &projectFlockKandangID
@@ -274,7 +337,8 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					ProjectFlockKandangId: pfkID,
 				}
 				if err := productWarehouseRepoTX.CreateOne(c.Context(), destPW, nil); err != nil {
-					return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal membuat product warehouse untuk produk %d di gudang tujuan", product.ProductID))
+					s.Log.Errorf("Failed to create product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
+					return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat data stok gudang tujuan")
 				}
 			}
 
@@ -300,9 +364,16 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 		var deliveries []*entity.StockTransferDelivery
 		for _, delivery := range req.Deliveries {
+			supplierId := func() *uint64 {
+				if delivery.SupplierID > 0 {
+					id := uint64(delivery.SupplierID)
+					return &id
+				}
+				return nil
+			}()
 			deliveries = append(deliveries, &entity.StockTransferDelivery{
 				StockTransferId:   entityTransfer.Id,
-				SupplierId:        uint64(delivery.SupplierID),
+				SupplierId:        supplierId,
 				VehiclePlate:      delivery.VehiclePlate,
 				DriverName:        delivery.DriverName,
 				ShippingCostItem:  delivery.DeliveryCostPerItem,
@@ -364,9 +435,9 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					Files:            documentFiles,
 				})
 				if err != nil {
-					s.Log.WithError(err).Errorf("Failed to upload document for delivery %d (delivery_id: %d, filename: %s)",
-						deliveryIdx+1, delivery.Id, file.Filename)
-					return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to upload document for delivery %d: %v", deliveryIdx+1, err))
+					s.Log.Errorf("Failed to upload document for delivery %d (delivery_id=%d, filename=%s): %+v",
+						deliveryIdx+1, delivery.Id, file.Filename, err)
+					return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengunggah dokumen")
 				}
 			}
 		}
@@ -392,7 +463,33 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					"usage_qty":   consumeResult.UsageQuantity,
 					"pending_qty": consumeResult.PendingQuantity,
 				}).Error; err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengupdate tracking usage untuk produk %d", product.ProductID))
+				s.Log.Errorf("Failed to update tracking usage for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
+			}
+
+			stockLogDecrease := &entity.StockLog{
+				ProductWarehouseId: uint(*detail.SourceProductWarehouseID),
+				CreatedBy:          uint(actorID),
+				Increase:           0,
+				Decrease:           product.ProductQty,
+				LoggableType:       string(utils.StockLogTypeTransfer),
+				LoggableId:         uint(detail.Id),
+				Notes:              "",
+			}
+			stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.SourceProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogDecrease.Stock -= latestStockLog.Stock - stockLogDecrease.Decrease
+			} else {
+				stockLogDecrease.Stock -= stockLogDecrease.Decrease
+			}
+
+			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogDecrease, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
 			}
 
 			note := fmt.Sprintf("Transfer #%s", entityTransfer.MovementNumber)
@@ -405,7 +502,8 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				Tx:                 tx,
 			})
 			if err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal menambah stok untuk produk %d di gudang tujuan. Error: %v", product.ProductID, err))
+				s.Log.Errorf("Failed to replenish stock for product_id=%d, pw_id=%d, qty=%.2f: %+v", product.ProductID, *detail.DestProductWarehouseID, product.ProductQty, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal menambah stok gudang tujuan")
 			}
 
 			if err := tx.Model(&entity.StockTransferDetail{}).
@@ -413,12 +511,42 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				Updates(map[string]interface{}{
 					"total_qty": replenishResult.AddedQuantity,
 				}).Error; err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengupdate tracking total untuk produk %d", product.ProductID))
+				s.Log.Errorf("Failed to update tracking total for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
+			}
+
+			stockLogIncrease := &entity.StockLog{
+				ProductWarehouseId: uint(*detail.DestProductWarehouseID),
+				CreatedBy:          uint(actorID),
+				Increase:           product.ProductQty,
+				Decrease:           0,
+				LoggableType:       string(utils.StockLogTypeTransfer),
+				LoggableId:         uint(detail.Id),
+				Notes:              "",
+			}
+			stockLogs, err = s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.DestProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
+			} else {
+				stockLogIncrease.Stock += stockLogIncrease.Increase
+			}
+			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogIncrease, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
 			}
 		}
 
 		if len(req.Deliveries) > 0 {
 			for _, delivery := range req.Deliveries {
+				// Skip adding to expensePayloads if SupplierID is 0 (optional)
+				if delivery.SupplierID == 0 {
+					continue
+				}
+
 				for _, prod := range delivery.Products {
 					detail := detailMap[uint64(prod.ProductID)]
 					if detail == nil {
@@ -447,7 +575,10 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	})
 
 	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal memproses transfer. Error: %v", err))
+		if fiberErr, ok := err.(*fiber.Error); ok {
+			return nil, fiberErr
+		}
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Internal server error")
 	}
 
 	result, err := s.GetOne(c, uint(entityTransfer.Id))
@@ -457,7 +588,8 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 	if len(expensePayloads) > 0 {
 		if err := s.notifyExpenseItemsDelivered(c, entityTransfer.Id, expensePayloads); err != nil {
-			return nil, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal sinkronisasi data expense untuk transfer %s. Silakan cek manual di module expense", entityTransfer.MovementNumber))
+			s.Log.Errorf("Failed to sync expense for transfer_id=%d, movement_number=%s: %+v", entityTransfer.Id, entityTransfer.MovementNumber, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal sinkronisasi data expense. Silakan cek manual di module expense")
 		}
 	}
 
@@ -477,10 +609,10 @@ func (s *transferService) getActiveProjectFlockKandangID(ctx context.Context, wa
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return 0, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Gudang dengan ID %d tidak ditemukan", warehouseID))
 		}
-		return 0, fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Gagal mengambil data gudang dengan ID %d", warehouseID))
+		s.Log.Errorf("Failed to fetch warehouse by ID %d: %+v", warehouseID, err)
+		return 0, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data gudang")
 	}
 
-	// Jika warehouse tidak punya kandang_id, return 0 tanpa error
 	if warehouse.KandangId == nil || *warehouse.KandangId == 0 {
 		return 0, nil
 	}
@@ -490,7 +622,8 @@ func (s *transferService) getActiveProjectFlockKandangID(ctx context.Context, wa
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return 0, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tidak ada project flock aktif untuk kandang %d", *warehouse.KandangId))
 		}
-		return 0, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock kandang yang aktif")
+		s.Log.Errorf("Failed to fetch active project flock kandang for kandang_id=%d: %+v", *warehouse.KandangId, err)
+		return 0, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock")
 	}
 
 	return uint(projectFlockKandang.Id), nil

internal/modules/inventory/transfers/validations/transfer.validation.go

@@ -21,12 +21,12 @@ type TransferDeliveryProduct struct {
 }
 
 type TransferDelivery struct {
-	DeliveryCost        float64                   `json:"delivery_cost" validate:"required"`
-	DeliveryCostPerItem float64                   `json:"delivery_cost_per_item" validate:"required"`
+	DeliveryCost        float64                   `json:"delivery_cost"`
+	DeliveryCostPerItem float64                   `json:"delivery_cost_per_item"`
 	DocumentIndex       int                       `json:"document_index" validate:"omitempty,min=-1" default:"-1"`
-	DriverName          string                    `json:"driver_name" validate:"required"`
-	VehiclePlate        string                    `json:"vehicle_plate" validate:"required"`
-	SupplierID          uint                      `json:"supplier_id" validate:"required"`
+	DriverName          string                    `json:"driver_name"`
+	VehiclePlate        string                    `json:"vehicle_plate"`
+	SupplierID          uint                      `json:"supplier_id" `
 	Products            []TransferDeliveryProduct `json:"products" validate:"required,dive"`
 }
 

internal/modules/marketing/dto/deliveryorder.dto.go

@@ -2,6 +2,7 @@ package dto
 
 import (
 	"fmt"
+	"math"
 	"sort"
 	"time"
 
@@ -76,16 +77,21 @@ type DeliveryGroupDTO struct {
 }
 
 type DeliveryMarketingProductDTO struct {
-	Id                 uint                                          `json:"id"`
-	MarketingId        uint                                          `json:"marketing_id"`
-	ProductWarehouseId uint                                          `json:"product_warehouse_id"`
-	Qty                float64                                       `json:"qty"`
-	UnitPrice          float64                                       `json:"unit_price"`
-	AvgWeight          float64                                       `json:"avg_weight"`
-	TotalWeight        float64                                       `json:"total_weight"`
-	TotalPrice         float64                                       `json:"total_price"`
-	ProductWarehouse   *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
-	VehicleNumber      string                                        `json:"vehicle_number,omitempty"`
+	Id                  uint                                          `json:"id"`
+	MarketingId         uint                                          `json:"marketing_id"`
+	ProductWarehouseId  uint                                          `json:"product_warehouse_id"`
+	MarketingType       string                                        `json:"marketing_type"`
+	Qty                 float64                                       `json:"qty"`
+	UnitPrice           float64                                       `json:"unit_price"`
+	AvgWeight           float64                                       `json:"avg_weight"`
+	TotalWeight         float64                                       `json:"total_weight"`
+	TotalPrice          float64                                       `json:"total_price"`
+	ConvertionUnit      *string                                       `json:"convertion_unit,omitempty"`
+	WeightPerConvertion *float64                                      `json:"weight_per_convertion,omitempty"`
+	TotalPeti           *float64                                      `json:"total_peti,omitempty"`
+	Week                *int                                          `json:"week,omitempty"`
+	ProductWarehouse    *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+	VehicleNumber       string                                        `json:"vehicle_number,omitempty"`
 }
 
 func ToMarketingRelationDTO(marketing *entity.Marketing) MarketingRelationDTO {
@@ -97,24 +103,36 @@ func ToMarketingRelationDTO(marketing *entity.Marketing) MarketingRelationDTO {
 	}
 }
 
-func ToDeliveryMarketingProductDTO(e entity.MarketingProduct) DeliveryMarketingProductDTO {
+func ToDeliveryMarketingProductDTO(e entity.MarketingProduct, marketingType string) DeliveryMarketingProductDTO {
 	var productWarehouse *productwarehouseDTO.ProductWarehousNestedDTO
 	if e.ProductWarehouse.Id != 0 {
 		mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(e.ProductWarehouse)
 		productWarehouse = &mapped
 	}
 
+	// Calculate total_peti only for TELUR marketing type
+	var totalPeti *float64
+	if marketingType == "TELUR" && e.ConvertionUnit != nil && *e.ConvertionUnit == "PETI" && e.WeightPerConvertion != nil && *e.WeightPerConvertion > 0 {
+		calculated := math.Floor(e.TotalWeight / *e.WeightPerConvertion)
+		totalPeti = &calculated
+	}
+
 	return DeliveryMarketingProductDTO{
-		Id:                 e.Id,
-		MarketingId:        e.MarketingId,
-		ProductWarehouseId: e.ProductWarehouseId,
-		Qty:                e.Qty,
-		UnitPrice:          e.UnitPrice,
-		AvgWeight:          e.AvgWeight,
-		TotalWeight:        e.TotalWeight,
-		TotalPrice:         e.TotalPrice,
-		ProductWarehouse:   productWarehouse,
-		VehicleNumber:      getVehicleNumber(e),
+		Id:                  e.Id,
+		MarketingId:         e.MarketingId,
+		ProductWarehouseId:  e.ProductWarehouseId,
+		MarketingType:       marketingType,
+		Qty:                 e.Qty,
+		UnitPrice:           e.UnitPrice,
+		AvgWeight:           e.AvgWeight,
+		TotalWeight:         e.TotalWeight,
+		TotalPrice:          e.TotalPrice,
+		ConvertionUnit:      e.ConvertionUnit,
+		WeightPerConvertion: e.WeightPerConvertion,
+		TotalPeti:           totalPeti,
+		Week:                e.Week,
+		ProductWarehouse:    productWarehouse,
+		VehicleNumber:       getVehicleNumber(e),
 	}
 }
 
@@ -161,7 +179,7 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
 	if len(marketing.Products) > 0 {
 		salesOrderProducts = make([]DeliveryMarketingProductDTO, len(marketing.Products))
 		for i, product := range marketing.Products {
-			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product)
+			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType)
 		}
 	}
 
@@ -201,7 +219,7 @@ func ToMarketingDetailDTO(marketing *entity.Marketing, deliveryProducts []entity
 	if len(marketing.Products) > 0 {
 		salesOrderProducts = make([]DeliveryMarketingProductDTO, len(marketing.Products))
 		for i, product := range marketing.Products {
-			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product)
+			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType)
 		}
 	}
 

internal/modules/marketing/dto/salesorder.dto.go

@@ -1,6 +1,7 @@
 package dto
 
 import (
+	"math"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -10,13 +11,18 @@ import (
 // === DTO Structs ===
 
 type MarketingProductDTO struct {
-	Id               uint                                          `json:"id"`
-	Qty              float64                                       `json:"qty"`
-	UnitPrice        float64                                       `json:"unit_price"`
-	AvgWeight        float64                                       `json:"avg_weight"`
-	TotalWeight      float64                                       `json:"total_weight"`
-	TotalPrice       float64                                       `json:"total_price"`
-	ProductWarehouse *productWarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+	Id                  uint                                          `json:"id"`
+	MarketingType       string                                        `json:"marketing_type"`
+	Qty                 float64                                       `json:"qty"`
+	UnitPrice           float64                                       `json:"unit_price"`
+	AvgWeight           float64                                       `json:"avg_weight"`
+	TotalWeight         float64                                       `json:"total_weight"`
+	TotalPrice          float64                                       `json:"total_price"`
+	ConvertionUnit      *string                                       `json:"convertion_unit,omitempty"`
+	WeightPerConvertion *float64                                      `json:"weight_per_convertion,omitempty"`
+	TotalPeti           *float64                                      `json:"total_peti,omitempty"`
+	Week                *int                                          `json:"week,omitempty"`
+	ProductWarehouse    *productWarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
 }
 
 type SalesOrdersListDTO struct {
@@ -29,7 +35,7 @@ type SalesOrdersListDTO struct {
 
 // === Mapper Functions ===
 
-func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
+func ToMarketingProductDTO(e entity.MarketingProduct, marketingType string) MarketingProductDTO {
 	var productWarehouse *productWarehouseDTO.ProductWarehousNestedDTO
 
 	if e.ProductWarehouse.Id != 0 {
@@ -37,21 +43,33 @@ func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
 		productWarehouse = &mapped
 	}
 
+	// Calculate total_peti only for TELUR marketing type
+	var totalPeti *float64
+	if marketingType == "TELUR" && e.ConvertionUnit != nil && *e.ConvertionUnit == "PETI" && e.WeightPerConvertion != nil && *e.WeightPerConvertion > 0 {
+		calculated := math.Floor(e.TotalWeight / *e.WeightPerConvertion)
+		totalPeti = &calculated
+	}
+
 	return MarketingProductDTO{
-		Id:               e.Id,
-		Qty:              e.Qty,
-		UnitPrice:        e.UnitPrice,
-		AvgWeight:        e.AvgWeight,
-		TotalWeight:      e.TotalWeight,
-		TotalPrice:       e.TotalPrice,
-		ProductWarehouse: productWarehouse,
+		Id:                  e.Id,
+		MarketingType:       marketingType,
+		Qty:                 e.Qty,
+		UnitPrice:           e.UnitPrice,
+		AvgWeight:           e.AvgWeight,
+		TotalWeight:         e.TotalWeight,
+		TotalPrice:          e.TotalPrice,
+		ConvertionUnit:      e.ConvertionUnit,
+		WeightPerConvertion: e.WeightPerConvertion,
+		TotalPeti:           totalPeti,
+		Week:                e.Week,
+		ProductWarehouse:    productWarehouse,
 	}
 }
 
 func ToSalesOrdersListDTO(e entity.Marketing) SalesOrdersListDTO {
 	products := make([]MarketingProductDTO, len(e.Products))
 	for i, p := range e.Products {
-		products[i] = ToMarketingProductDTO(p)
+		products[i] = ToMarketingProductDTO(p, e.MarketingType)
 	}
 
 	return SalesOrdersListDTO{
@@ -68,7 +86,7 @@ func ToSalesOrdersListDTOFromMarketing(e entity.Marketing) SalesOrdersListDTO {
 	if len(e.Products) > 0 {
 		salesOrder = make([]MarketingProductDTO, len(e.Products))
 		for i, product := range e.Products {
-			salesOrder[i] = ToMarketingProductDTO(product)
+			salesOrder[i] = ToMarketingProductDTO(product, e.MarketingType)
 		}
 	}
 

internal/modules/marketing/module.go

@@ -16,6 +16,7 @@ import (
 	rCustomer "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
 	rWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/repositories"
 	rProjectFlockKandang "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
+	rShared "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -32,6 +33,7 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	userRepo := rUser.NewUserRepository(db)
 	customerRepo := rCustomer.NewCustomerRepository(db)
 	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
+	stockLogRepo := rShared.NewStockLogRepository(db)
 
 	stockAllocationRepo := commonRepo.NewStockAllocationRepository(db)
 	fifoService := commonSvc.NewFifoService(db, stockAllocationRepo, productWarehouseRepo, utils.Log)
@@ -62,8 +64,8 @@ func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	warehouseRepo := rWarehouse.NewWarehouseRepository(db)
 	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
 
-	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, warehouseRepo, projectFlockKandangRepo, validate)
-	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, approvalSvc, fifoService, validate)
+	salesOrdersService := service.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, fifoService, warehouseRepo, projectFlockKandangRepo, validate)
+	deliveryOrdersService := service.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, stockLogRepo, approvalSvc, fifoService, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	RegisterRoutes(router, userService, salesOrdersService, deliveryOrdersService)

internal/modules/marketing/repositories/salesorder_delivery_product.repository.go

@@ -15,12 +15,14 @@ type MarketingDeliveryProductRepository interface {
 	repository.BaseRepository[entity.MarketingDeliveryProduct]
 	GetDeliveryProductsByProjectFlockID(ctx context.Context, projectFlockID uint, callback func(*gorm.DB) *gorm.DB) ([]entity.MarketingDeliveryProduct, error)
 	GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
+	GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error)
 	GetByMarketingId(ctx context.Context, marketingId uint) ([]entity.MarketingDeliveryProduct, error)
 	GetByMarketingProductID(ctx context.Context, marketingProductID uint) (*entity.MarketingDeliveryProduct, error)
 	GetAllWithFilters(ctx context.Context, offset, limit int, filters *validation.MarketingQuery) ([]entity.MarketingDeliveryProduct, int64, error)
 	UpdateFifoFields(ctx context.Context, id uint, usageQty, pendingQty float64) error
 	GetUsageQty(ctx context.Context, id uint) (float64, error)
 	ResetFifoFields(ctx context.Context, id uint) error
+	GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
 }
 
 type MarketingDeliveryProductRepositoryImpl struct {
@@ -60,6 +62,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualan(ctx context
 	db := r.DB().WithContext(ctx).
 		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
 		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
 		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
 		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
 		Where("marketing_delivery_products.delivery_date IS NOT NULL").
@@ -91,6 +94,104 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualan(ctx context
 	return deliveryProducts, nil
 }
 
+func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
+	var deliveryProducts []entity.MarketingDeliveryProduct
+
+	db := r.DB().WithContext(ctx).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("flags.name IN (?)", []string{
+			string(utils.FlagAyamAfkir),
+			string(utils.FlagAyamCulling),
+			string(utils.FlagPullet),
+			string(utils.FlagLayer),
+		}).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
+		return nil, err
+	}
+
+	return deliveryProducts, nil
+}
+
+func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error) {
+	var deliveryProducts []entity.MarketingDeliveryProduct
+
+	db := r.DB().WithContext(ctx).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	if category == string(utils.ProjectFlockCategoryLaying) {
+		db = db.Where("flags.name IN (?)", []string{
+			string(utils.FlagTelur),
+			string(utils.FlagTelurUtuh),
+			string(utils.FlagTelurPecah),
+			string(utils.FlagTelurPutih),
+			string(utils.FlagTelurRetak),
+		})
+	} else {
+		db = db.Where("flags.name IN (?)", []string{
+			string(utils.FlagDOC),
+			string(utils.FlagPullet),
+			string(utils.FlagLayer),
+			string(utils.FlagAyamAfkir),
+			string(utils.FlagAyamCulling),
+			string(utils.FlagAyamMati),
+		})
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Uom").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.Warehouse").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Preload("MarketingProduct.Marketing").
+		Preload("MarketingProduct.Marketing.Customer").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
+		return nil, err
+	}
+
+	return deliveryProducts, nil
+}
+
 func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingId(ctx context.Context, marketingId uint) ([]entity.MarketingDeliveryProduct, error) {
 	var deliveryProducts []entity.MarketingDeliveryProduct
 
@@ -140,7 +241,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		Joins("JOIN marketings ON marketings.id = marketing_products.marketing_id").
 		Where("marketing_delivery_products.delivery_date IS NOT NULL")
 
-	if filters.ProductId > 0 || filters.WarehouseId > 0 || filters.AreaId > 0 || filters.LocationId > 0 || filters.Search != "" || filters.MarketingType != "" {
+	if filters.ProductId > 0 || filters.WarehouseId > 0 || filters.AreaId > 0 || filters.LocationId > 0 || filters.AllowedAreaIDs != nil || filters.AllowedLocationIDs != nil || filters.Search != "" || filters.MarketingType != "" {
 		db = db.Joins("LEFT JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id")
 	}
 
@@ -190,7 +291,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		db = db.Where("product_warehouses.warehouse_id = ?", filters.WarehouseId)
 	}
 
-	if filters.AreaId > 0 || filters.LocationId > 0 {
+	if filters.AreaId > 0 || filters.LocationId > 0 || filters.AllowedAreaIDs != nil || filters.AllowedLocationIDs != nil {
 		db = db.Joins("LEFT JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
 			Joins("LEFT JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id")
 
@@ -201,6 +302,22 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		if filters.LocationId > 0 {
 			db = db.Where("project_flocks.location_id = ?", filters.LocationId)
 		}
+
+		if filters.AllowedAreaIDs != nil {
+			if len(filters.AllowedAreaIDs) == 0 {
+				db = db.Where("1 = 0")
+			} else {
+				db = db.Where("project_flocks.area_id IN ?", filters.AllowedAreaIDs)
+			}
+		}
+
+		if filters.AllowedLocationIDs != nil {
+			if len(filters.AllowedLocationIDs) == 0 {
+				db = db.Where("1 = 0")
+			} else {
+				db = db.Where("project_flocks.location_id IN ?", filters.AllowedLocationIDs)
+			}
+		}
 	}
 
 	if filters.MarketingType != "" {

internal/modules/marketing/services/deliveryorder.service.go

@@ -10,10 +10,10 @@ import (
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
-	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
 	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/validations"
+	rShared "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 
@@ -34,6 +34,7 @@ type deliveryOrdersService struct {
 	MarketingRepo                marketingRepo.MarketingRepository
 	MarketingProductRepo         marketingRepo.MarketingProductRepository
 	MarketingDeliveryProductRepo marketingRepo.MarketingDeliveryProductRepository
+	StockLogRepo                 rShared.StockLogRepository
 	ApprovalSvc                  commonSvc.ApprovalService
 	FifoSvc                      commonSvc.FifoService
 }
@@ -42,6 +43,7 @@ func NewDeliveryOrdersService(
 	marketingRepo marketingRepo.MarketingRepository,
 	marketingProductRepo marketingRepo.MarketingProductRepository,
 	marketingDeliveryProductRepo marketingRepo.MarketingDeliveryProductRepository,
+	stockLogRepo rShared.StockLogRepository,
 	approvalSvc commonSvc.ApprovalService,
 	fifoSvc commonSvc.FifoService,
 	validate *validator.Validate,
@@ -51,6 +53,7 @@ func NewDeliveryOrdersService(
 		MarketingRepo:                marketingRepo,
 		MarketingProductRepo:         marketingProductRepo,
 		MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
+		StockLogRepo:                 stockLogRepo,
 		ApprovalSvc:                  approvalSvc,
 		FifoSvc:                      fifoSvc,
 	}
@@ -62,11 +65,16 @@ func (s deliveryOrdersService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Customer").
 		Preload("SalesPerson").
 		Preload("Products.ProductWarehouse.Product").
+		Preload("Products.ProductWarehouse.Product.Uom").
 		Preload("Products.ProductWarehouse.Warehouse").
 		Preload("Products.DeliveryProduct")
 }
 
 func (s deliveryOrdersService) getMarketingWithDeliveries(c *fiber.Ctx, marketingId uint) (*dto.MarketingDetailDTO, error) {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), marketingId); err != nil {
+		return nil, err
+	}
+
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), marketingId, s.withRelations)
 	if err != nil {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
@@ -91,6 +99,11 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.MarketingRepo.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	marketings, total, err := s.MarketingRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
@@ -99,9 +112,27 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 			Preload("Customer").
 			Preload("SalesPerson").
 			Preload("Products.ProductWarehouse.Product").
+			Preload("Products.ProductWarehouse.Product.Uom").
 			Preload("Products.ProductWarehouse.Warehouse").
 			Preload("Products.DeliveryProduct")
 
+		if scope.Restrict {
+			if len(scope.IDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = db.Where(
+				`EXISTS (
+					SELECT 1
+					FROM marketing_products mp
+					JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
+					JOIN warehouses w ON w.id = pw.warehouse_id
+					WHERE mp.marketing_id = marketings.id
+						AND w.location_id IN ?
+				)`,
+				scope.IDs,
+			)
+		}
+
 		if params.MarketingId != 0 {
 			return db.Where("id = ?", params.MarketingId)
 		}
@@ -130,6 +161,9 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 }
 
 func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.MarketingDetailDTO, error) {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
 
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -169,6 +203,10 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		return nil, err
 	}
 
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), req.MarketingId); err != nil {
+		return nil, err
+	}
+
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Marketing", ID: &req.MarketingId, Exists: s.MarketingRepo.IdExists},
 	); err != nil {
@@ -201,6 +239,12 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
 		approvalSvcTx := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(dbTransaction))
+		marketingRepoTx := marketingRepo.NewMarketingRepository(dbTransaction)
+
+		marketing, err := marketingRepoTx.GetByID(c.Context(), req.MarketingId, nil)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
+		}
 
 		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), req.MarketingId)
 		if err != nil {
@@ -247,27 +291,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 				itemDeliveryDate = &parsedDate
 			}
 
-			// Cek apakah product punya flag PAKAN atau OVK
-			isPakanOrOVK := false
-			if foundMarketingProduct.ProductWarehouse.Product.Id != 0 && len(foundMarketingProduct.ProductWarehouse.Product.Flags) > 0 {
-				for _, flag := range foundMarketingProduct.ProductWarehouse.Product.Flags {
-					if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-						isPakanOrOVK = true
-						break
-					}
-				}
-			}
-
-			// Hitung total_weight dan total_price berdasarkan flag
-			totalWeight := requestedProduct.Qty * requestedProduct.AvgWeight
-			var totalPrice float64
-			if isPakanOrOVK {
-				// PAKAN atau OVK: qty × unit_price
-				totalPrice = requestedProduct.Qty * requestedProduct.UnitPrice
-			} else {
-				// Produk lain: total_weight × unit_price
-				totalPrice = totalWeight * requestedProduct.UnitPrice
-			}
+			totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
 
 			deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 			deliveryProduct.UnitPrice = requestedProduct.UnitPrice
@@ -279,7 +303,7 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 
 			if requestedProduct.Qty > 0 {
 
-				if err := s.consumeDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct, requestedProduct.Qty); err != nil {
+				if err := s.consumeDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct, requestedProduct.Qty, actorID); err != nil {
 					return err
 				}
 			}
@@ -321,16 +345,31 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 		return nil, err
 	}
 
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
+
 	if err := commonSvc.EnsureRelations(c.Context(),
 		commonSvc.RelationCheck{Name: "Marketing", ID: &id, Exists: s.MarketingRepo.IdExists},
 	); err != nil {
 		return nil, err
 	}
 
-	err := s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
+	actorID, err := m.ActorIDFromContext(c)
+	if err != nil {
+		return nil, err
+	}
+
+	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 
 		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
 		marketingDeliveryProductRepositoryTx := marketingRepo.NewMarketingDeliveryProductRepository(dbTransaction)
+		marketingRepoTx := marketingRepo.NewMarketingRepository(dbTransaction)
+
+		marketing, err := marketingRepoTx.GetByID(c.Context(), id, nil)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
+		}
 
 		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), id)
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -366,6 +405,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
 				}
 
+				oldRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty
 				var itemDeliveryDate *time.Time
 				if requestedProduct.DeliveryDate != "" {
 					parsedDate, err := utils.ParseDateString(requestedProduct.DeliveryDate)
@@ -377,29 +417,7 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					itemDeliveryDate = deliveryProduct.DeliveryDate
 				}
 
-				oldRequestedQty := deliveryProduct.UsageQty + deliveryProduct.PendingQty
-
-				// Cek apakah product punya flag PAKAN atau OVK
-				isPakanOrOVK := false
-				if foundMarketingProduct.ProductWarehouse.Product.Id != 0 && len(foundMarketingProduct.ProductWarehouse.Product.Flags) > 0 {
-					for _, flag := range foundMarketingProduct.ProductWarehouse.Product.Flags {
-						if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-							isPakanOrOVK = true
-							break
-						}
-					}
-				}
-
-				// Hitung total_weight dan total_price berdasarkan flag
-				totalWeight := requestedProduct.Qty * requestedProduct.AvgWeight
-				var totalPrice float64
-				if isPakanOrOVK {
-					// PAKAN atau OVK: qty × unit_price
-					totalPrice = requestedProduct.Qty * requestedProduct.UnitPrice
-				} else {
-					// Produk lain: total_weight × unit_price
-					totalPrice = totalWeight * requestedProduct.UnitPrice
-				}
+				totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
 
 				deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 				deliveryProduct.UnitPrice = requestedProduct.UnitPrice
@@ -412,13 +430,13 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 				if requestedProduct.Qty != oldRequestedQty {
 
 					if oldRequestedQty > 0 {
-						if err := s.releaseDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct); err != nil {
+						if err := s.releaseDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct, actorID); err != nil {
 							return err
 						}
 					}
 
 					if requestedProduct.Qty > 0 {
-						if err := s.consumeDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct, requestedProduct.Qty); err != nil {
+						if err := s.consumeDeliveryStock(c.Context(), dbTransaction, deliveryProduct, foundMarketingProduct, requestedProduct.Qty, actorID); err != nil {
 							return err
 						}
 					}
@@ -443,7 +461,21 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 	return s.getMarketingWithDeliveries(c, id)
 }
 
-func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gorm.DB, deliveryProduct *entity.MarketingDeliveryProduct, marketingProduct *entity.MarketingProduct, requestedQty float64) error {
+func (s *deliveryOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
+	if marketingType == string(utils.MarketingTypeTrading) {
+		totalWeight = 0
+		totalPrice = qty * unitPrice
+	} else if marketingType == string(utils.MarketingTypeAyamPullet) && week != nil && *week > 0 {
+		totalWeight = qty * avgWeight
+		totalPrice = unitPrice * float64(*week) * qty
+	} else {
+		totalWeight = qty * avgWeight
+		totalPrice = totalWeight * unitPrice
+	}
+	return totalWeight, totalPrice
+}
+
+func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gorm.DB, deliveryProduct *entity.MarketingDeliveryProduct, marketingProduct *entity.MarketingProduct, requestedQty float64, actorID uint) error {
 	if marketingProduct == nil || marketingProduct.ProductWarehouseId == 0 {
 		return fiber.NewError(fiber.StatusInternalServerError, "Product warehouse not found")
 	}
@@ -461,39 +493,43 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor
 		Tx:                 tx,
 	})
 
-	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
-
 	if err != nil {
-		pwRepo := productWarehouseRepo.NewProductWarehouseRepository(tx)
-		pw, err2 := pwRepo.GetByID(ctx, marketingProduct.ProductWarehouseId, nil)
-		if err2 != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to check product warehouse stock")
-		}
-
-		if pw == nil || pw.Quantity < requestedQty {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock. Available: %.2f, Requested: %.2f", func() float64 {
-				if pw != nil {
-					return pw.Quantity
-				} else {
-					return 0
-				}
-			}(), requestedQty))
-		}
-
-		if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, requestedQty, 0); err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
-		}
-		return nil
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock for product warehouse %d: %v", marketingProduct.ProductWarehouseId, err))
 	}
 
-	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, result.UsageQuantity, result.PendingQuantity); err != nil {
+	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
+
+	if err := deliveryProductRepo.UpdateFifoFields(ctx, deliveryProduct.Id, result.UsageQuantity, 0); err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
 	}
 
+	if actorID > 0 && result.UsageQuantity > 0 {
+		decreaseLog := &entity.StockLog{
+			Decrease:           result.UsageQuantity,
+			LoggableType:       string(utils.StockLogTypeMarketing),
+			LoggableId:         deliveryProduct.Id,
+			ProductWarehouseId: marketingProduct.ProductWarehouseId,
+			CreatedBy:          actorID,
+			Notes:              fmt.Sprintf("FIFO consume (%.2f)", result.UsageQuantity),
+		}
+
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			decreaseLog.Stock = latestStockLog.Stock - decreaseLog.Decrease
+		} else {
+			decreaseLog.Stock -= decreaseLog.Decrease
+		}
+		s.StockLogRepo.WithTx(tx).CreateOne(ctx, decreaseLog, nil)
+	}
+
 	return nil
 }
 
-func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gorm.DB, deliveryProduct *entity.MarketingDeliveryProduct, marketingProduct *entity.MarketingProduct) error {
+func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gorm.DB, deliveryProduct *entity.MarketingDeliveryProduct, marketingProduct *entity.MarketingProduct, actorID uint) error {
 	if deliveryProduct == nil || deliveryProduct.Id == 0 {
 		return nil
 	}
@@ -524,5 +560,28 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 		return err
 	}
 
+	if actorID > 0 && currentUsage > 0 {
+		increaseLog := &entity.StockLog{
+			Increase:           currentUsage,
+			LoggableType:       string(utils.StockLogTypeMarketing),
+			LoggableId:         deliveryProduct.Id,
+			ProductWarehouseId: marketingProduct.ProductWarehouseId,
+			CreatedBy:          actorID,
+			Notes:              fmt.Sprintf("Release delivery stock (%.2f)", currentUsage),
+		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, marketingProduct.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			increaseLog.Stock = latestStockLog.Stock + increaseLog.Increase
+		} else {
+			increaseLog.Stock += increaseLog.Increase
+		}
+
+		s.StockLogRepo.WithTx(tx).CreateOne(ctx, increaseLog, nil)
+	}
+
 	return nil
 }

internal/modules/marketing/services/salesorder.service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"strings"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
@@ -19,6 +20,7 @@ import (
 	userRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -41,11 +43,12 @@ type salesOrdersService struct {
 	ProductWarehouseRepo    productWarehouseRepo.ProductWarehouseRepository
 	UserRepo                userRepo.UserRepository
 	ApprovalSvc             commonSvc.ApprovalService
+	FifoSvc                 commonSvc.FifoService
 	WarehouseRepo           warehouseRepo.WarehouseRepository
 	ProjectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository
 }
 
-func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, warehouseRepo warehouseRepo.WarehouseRepository,
+func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, fifoSvc commonSvc.FifoService, warehouseRepo warehouseRepo.WarehouseRepository,
 	projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, validate *validator.Validate) SalesOrdersService {
 	return &salesOrdersService{
 		Log:                     utils.Log,
@@ -55,6 +58,7 @@ func NewSalesOrdersService(marketingRepo repository.MarketingRepository, custome
 		ProductWarehouseRepo:    productWarehouseRepo,
 		UserRepo:                userRepo,
 		ApprovalSvc:             approvalSvc,
+		FifoSvc:                 fifoSvc,
 		WarehouseRepo:           warehouseRepo,
 		ProjectFlockKandangRepo: projectFlockKandangRepo,
 	}
@@ -66,10 +70,15 @@ func (s salesOrdersService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Customer").
 		Preload("SalesPerson").
 		Preload("Products.ProductWarehouse.Product.Flags").
+		Preload("Products.ProductWarehouse.Product.Uom").
 		Preload("Products.ProductWarehouse.Warehouse")
 }
 
 func (s salesOrdersService) getOne(c *fiber.Ctx, id uint) (*entity.Marketing, error) {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
+
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "SalesOrders not found")
@@ -96,6 +105,25 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 
+	// Validasi semua product harus punya marketing_type yang sama
+	if len(req.MarketingProducts) == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "marketing_products is required")
+	}
+
+	firstMarketingType := req.MarketingProducts[0].MarketingType
+	if !utils.IsValidMarketingType(firstMarketingType) {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Tipe penjualan tidak valid")
+	}
+
+	for i, item := range req.MarketingProducts {
+		if !utils.IsValidMarketingType(item.MarketingType) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tipe penjualan tidak valid pada produk ke-%d", i+1))
+		}
+		if item.MarketingType != firstMarketingType {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Semua produk harus memiliki tipe penjualan yang sama")
+		}
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -108,6 +136,15 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 	}
 
 	for _, item := range req.MarketingProducts {
+		if item.MarketingType != string(utils.MarketingTypeTrading) && item.AvgWeight == 0 {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Berat rata-rata harus diisi")
+		}
+		if item.ConvertionUnit != nil && !utils.IsValidConvertionUnit(*item.ConvertionUnit) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Unit konversi tidak valid")
+		}
+		if err := m.EnsureProductWarehouseAccess(c, s.MarketingRepo.DB(), item.ProductWarehouseId); err != nil {
+			return nil, err
+		}
 		if err := commonSvc.EnsureRelations(c.Context(),
 			commonSvc.RelationCheck{Name: "ProductWarehouse", ID: &item.ProductWarehouseId, Exists: s.ProductWarehouseRepo.IdExists},
 		); err != nil {
@@ -139,6 +176,7 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 			SoDate:        soDate,
 			SalesPersonId: req.SalesPersonId,
 			Notes:         req.Notes,
+			MarketingType: firstMarketingType,
 			CreatedBy:     actorID,
 		}
 		if err := marketingRepoTx.CreateOne(c.Context(), marketing, nil); err != nil {
@@ -151,10 +189,9 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 				if product.ProductWarehouseId != 0 {
 					pwIDs = append(pwIDs, product.ProductWarehouseId)
 				}
-				if err := s.createMarketingProductWithDelivery(c.Context(), marketing.Id, product, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
+				if err := s.createMarketingProductWithDelivery(c.Context(), marketing.Id, product.MarketingType, product, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
 					return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing product")
 				}
-
 			}
 			if err := commonSvc.EnsureProjectFlockNotClosedForProductWarehouses(c.Context(), s.MarketingRepo.DB(), pwIDs); err != nil {
 				return err
@@ -197,6 +234,27 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 		return nil, err
 	}
 
+	// Validasi semua product harus punya marketing_type yang sama
+	if len(req.MarketingProducts) > 0 {
+		firstMarketingType := req.MarketingProducts[0].MarketingType
+		if !utils.IsValidMarketingType(firstMarketingType) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Tipe penjualan tidak valid")
+		}
+
+		for i, item := range req.MarketingProducts {
+			if !utils.IsValidMarketingType(item.MarketingType) {
+				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tipe penjualan tidak valid pada produk ke-%d", i+1))
+			}
+			if item.MarketingType != firstMarketingType {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "Semua produk harus memiliki tipe penjualan yang sama")
+			}
+		}
+	}
+
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return nil, err
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -220,6 +278,15 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 
 	if len(req.MarketingProducts) > 0 {
 		for _, item := range req.MarketingProducts {
+			if item.MarketingType != string(utils.MarketingTypeTrading) && item.AvgWeight == 0 {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "Berat rata-rata harus diisi")
+			}
+			if item.ConvertionUnit != nil && !utils.IsValidConvertionUnit(*item.ConvertionUnit) {
+				return nil, fiber.NewError(fiber.StatusBadRequest, "Unit konversi tidak valid")
+			}
+			if err := m.EnsureProductWarehouseAccess(c, s.MarketingRepo.DB(), item.ProductWarehouseId); err != nil {
+				return nil, err
+			}
 			if err := commonSvc.EnsureRelations(c.Context(),
 				commonSvc.RelationCheck{Name: "ProductWarehouse", ID: &item.ProductWarehouseId, Exists: s.ProductWarehouseRepo.IdExists},
 			); err != nil {
@@ -264,6 +331,9 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 		if req.Notes != "" {
 			updateBody["notes"] = req.Notes
 		}
+		if len(req.MarketingProducts) > 0 {
+			updateBody["marketing_type"] = req.MarketingProducts[0].MarketingType
+		}
 
 		if len(updateBody) > 0 {
 			if err := marketingRepoTx.PatchOne(c.Context(), id, updateBody, nil); err != nil {
@@ -292,71 +362,66 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 			for _, rp := range req.MarketingProducts {
 				if old, ok := oldByPW[rp.ProductWarehouseId]; ok {
 
-					// Get product untuk cek flag PAKAN atau OVK
-					productWarehouse, err := s.ProductWarehouseRepo.GetByID(c.Context(), rp.ProductWarehouseId, func(db *gorm.DB) *gorm.DB {
-						return db.Preload("Product.Flags")
-					})
-					if err != nil {
-						return err
-					}
+					totalWeight, totalPrice := s.calculatePriceByMarketingType(rp.MarketingType, rp.Qty, rp.AvgWeight, rp.UnitPrice, rp.Week)
 
-					// Cek apakah product punya flag PAKAN atau OVK
-					isPakanOrOVK := false
-					if productWarehouse.Product.Id != 0 && len(productWarehouse.Product.Flags) > 0 {
-						for _, flag := range productWarehouse.Product.Flags {
-							if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-								isPakanOrOVK = true
-								break
+					deliveryProduct, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id)
+					if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+						return fiber.NewError(fiber.StatusInternalServerError, "Failed to check delivery product")
+					}
+					if err == nil && deliveryProduct.Id != 0 {
+						oldQty := old.Qty
+						newQty := rp.Qty
+						qtyDiff := newQty - oldQty
+
+						if qtyDiff < 0 {
+							return fiber.NewError(fiber.StatusBadRequest, "Cannot decrease quantity after stock has been allocated. Please delete and create new product.")
+						} else if qtyDiff > 0 {
+							_, err := s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
+								UsableKey:          fifo.UsableKeyMarketingDelivery,
+								UsableID:           deliveryProduct.Id,
+								ProductWarehouseID: rp.ProductWarehouseId,
+								Quantity:           qtyDiff,
+								Tx:                 dbTransaction,
+							})
+							if err != nil {
+								return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Insufficient stock for additional quantity: %v", err))
 							}
 						}
 					}
 
-					// Hitung total_weight dan total_price berdasarkan flag
-					totalWeight := rp.Qty * rp.AvgWeight
-					var totalPrice float64
-					if isPakanOrOVK {
-						// PAKAN atau OVK: qty × unit_price
-						totalPrice = rp.Qty * rp.UnitPrice
-					} else {
-						// Produk lain: total_weight × unit_price
-						totalPrice = totalWeight * rp.UnitPrice
-					}
-
 					updateBody := map[string]any{
-						"product_warehouse_id": rp.ProductWarehouseId,
-						"qty":                  rp.Qty,
-						"unit_price":           rp.UnitPrice,
-						"avg_weight":           rp.AvgWeight,
-						"total_weight":         totalWeight,
-						"total_price":          totalPrice,
+						"product_warehouse_id":  rp.ProductWarehouseId,
+						"qty":                   rp.Qty,
+						"unit_price":            rp.UnitPrice,
+						"avg_weight":            rp.AvgWeight,
+						"total_weight":          totalWeight,
+						"total_price":           totalPrice,
+						"convertion_unit":       rp.ConvertionUnit,
+						"weight_per_convertion": rp.WeightPerConvertion,
+						"week":                  rp.Week,
 					}
 					if err := marketingProductRepoTx.PatchOne(c.Context(), old.Id, updateBody, nil); err != nil {
 						return fiber.NewError(fiber.StatusInternalServerError, "Failed to update marketing product")
 					}
 
-					if _, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id); err != nil {
-						if errors.Is(err, gorm.ErrRecordNotFound) {
-
-							mdp := &entity.MarketingDeliveryProduct{
-								MarketingProductId: old.Id,
-								UnitPrice:          0,
-								TotalWeight:        0,
-								AvgWeight:          0,
-								TotalPrice:         0,
-								DeliveryDate:       nil,
-								VehicleNumber:      rp.VehicleNumber,
-								UsageQty:           0,
-								PendingQty:         0,
-							}
-							if err := invDeliveryRepoTx.CreateOne(c.Context(), mdp, nil); err != nil {
-								return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing delivery product")
-							}
-						} else {
-							return fiber.NewError(fiber.StatusInternalServerError, "Failed to check delivery product")
+					if deliveryProduct.Id == 0 {
+						mdp := &entity.MarketingDeliveryProduct{
+							MarketingProductId: old.Id,
+							UnitPrice:          0,
+							TotalWeight:        0,
+							AvgWeight:          0,
+							TotalPrice:         0,
+							DeliveryDate:       nil,
+							VehicleNumber:      rp.VehicleNumber,
+							UsageQty:           0,
+							PendingQty:         0,
+						}
+						if err := invDeliveryRepoTx.CreateOne(c.Context(), mdp, nil); err != nil {
+							return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing delivery product")
 						}
 					}
 				} else {
-					if err := s.createMarketingProductWithDelivery(c.Context(), id, rp, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
+					if err := s.createMarketingProductWithDelivery(c.Context(), id, rp.MarketingType, rp, marketingProductRepoTx, invDeliveryRepoTx); err != nil {
 						return fiber.NewError(fiber.StatusInternalServerError, "Failed to create marketing product")
 					}
 				}
@@ -364,15 +429,22 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 
 			for _, old := range oldProducts {
 				if _, ok := reqByPW[old.ProductWarehouseId]; !ok {
-
 					deliveryProduct, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id)
 					if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 						return fiber.NewError(fiber.StatusInternalServerError, "Failed to check existing delivery product")
 					}
-					if err == nil {
+					if err == nil && deliveryProduct.Id != 0 {
 
-						if deliveryProduct.DeliveryDate != nil || deliveryProduct.UsageQty > 0 || deliveryProduct.PendingQty > 0 {
-							return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Cannot delete marketing product %d because it has delivery records", old.Id))
+						if deliveryProduct.DeliveryDate != nil {
+							return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Cannot delete marketing product %d because it has been delivered", old.Id))
+						}
+
+						if err := s.FifoSvc.ReleaseUsage(c.Context(), commonSvc.StockReleaseRequest{
+							UsableKey: fifo.UsableKeyMarketingDelivery,
+							UsableID:  deliveryProduct.Id,
+							Tx:        dbTransaction,
+						}); err != nil {
+							return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to release stock: %v", err))
 						}
 
 						if err := invDeliveryRepoTx.DeleteOne(c.Context(), deliveryProduct.Id); err != nil {
@@ -417,6 +489,10 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 }
 
 func (s salesOrdersService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+		return err
+	}
+
 	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
 
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -444,6 +520,19 @@ func (s salesOrdersService) DeleteOne(c *fiber.Ctx, id uint) error {
 		marketingRepoTx := repository.NewMarketingRepository(dbTransaction)
 
 		if len(marketing.Products) > 0 {
+			deliveryProducts, err := marketingDeliveryProductRepoTx.GetByMarketingId(c.Context(), marketing.Id)
+			if err == nil && len(deliveryProducts) > 0 {
+				for _, dp := range deliveryProducts {
+					if err := s.FifoSvc.ReleaseUsage(c.Context(), commonSvc.StockReleaseRequest{
+						UsableKey: fifo.UsableKeyMarketingDelivery,
+						UsableID:  dp.Id,
+						Tx:        dbTransaction,
+					}); err != nil {
+						return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to release stock for delivery product %d: %v", dp.Id, err))
+					}
+				}
+			}
+
 			for _, product := range marketing.Products {
 				if err := marketingDeliveryProductRepoTx.DeleteMany(c.Context(), func(db *gorm.DB) *gorm.DB {
 					return db.Where("marketing_product_id = ?", product.Id).Unscoped()
@@ -481,6 +570,12 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 		return nil, err
 	}
 
+	for _, id := range req.ApprovableIds {
+		if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
+			return nil, err
+		}
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -616,45 +711,21 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 	return updated, nil
 }
 
-func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Context, marketingId uint, rp validation.CreateMarketingProduct, marketingProductRepo repository.MarketingProductRepository, invDeliveryRepo repository.MarketingDeliveryProductRepository) error {
+func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Context, marketingId uint, marketingType string, rp validation.CreateMarketingProduct, marketingProductRepo repository.MarketingProductRepository, invDeliveryRepo repository.MarketingDeliveryProductRepository) error {
 
-	// Get product untuk cek flag PAKAN atau OVK
-	productWarehouse, err := s.ProductWarehouseRepo.GetByID(ctx, rp.ProductWarehouseId, func(db *gorm.DB) *gorm.DB {
-		return db.Preload("Product.Flags")
-	})
-	if err != nil {
-		return err
-	}
-
-	// Cek apakah product punya flag PAKAN atau OVK
-	isPakanOrOVK := false
-	if productWarehouse.Product.Id != 0 && len(productWarehouse.Product.Flags) > 0 {
-		for _, flag := range productWarehouse.Product.Flags {
-			if flag.Name == string(utils.FlagPakan) || flag.Name == string(utils.FlagOVK) {
-				isPakanOrOVK = true
-				break
-			}
-		}
-	}
-
-	totalWeight := rp.Qty * rp.AvgWeight
-	var totalPrice float64
-	if isPakanOrOVK {
-		// PAKAN atau OVK: qty × unit_price
-		totalPrice = rp.Qty * rp.UnitPrice
-	} else {
-		// Produk lain: total_weight × unit_price
-		totalPrice = totalWeight * rp.UnitPrice
-	}
+	totalWeight, totalPrice := s.calculatePriceByMarketingType(marketingType, rp.Qty, rp.AvgWeight, rp.UnitPrice, rp.Week)
 
 	marketingProduct := &entity.MarketingProduct{
-		MarketingId:        marketingId,
-		ProductWarehouseId: rp.ProductWarehouseId,
-		Qty:                rp.Qty,
-		UnitPrice:          rp.UnitPrice,
-		AvgWeight:          rp.AvgWeight,
-		TotalWeight:        totalWeight,
-		TotalPrice:         totalPrice,
+		MarketingId:         marketingId,
+		ProductWarehouseId:  rp.ProductWarehouseId,
+		Qty:                 rp.Qty,
+		UnitPrice:           rp.UnitPrice,
+		AvgWeight:           rp.AvgWeight,
+		TotalWeight:         totalWeight,
+		TotalPrice:          totalPrice,
+		ConvertionUnit:      rp.ConvertionUnit,
+		WeightPerConvertion: rp.WeightPerConvertion,
+		Week:                rp.Week,
 	}
 	if err := marketingProductRepo.CreateOne(ctx, marketingProduct, nil); err != nil {
 		return err
@@ -678,3 +749,17 @@ func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Cont
 
 	return nil
 }
+
+func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
+	if marketingType == string(utils.MarketingTypeTrading) {
+		totalWeight = 0
+		totalPrice = math.Round(qty*unitPrice*100) / 100
+	} else if marketingType == string(utils.MarketingTypeAyamPullet) && week != nil && *week > 0 {
+		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalPrice = math.Round(unitPrice*float64(*week)*qty*100) / 100
+	} else {
+		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalPrice = math.Round(totalWeight*unitPrice*100) / 100
+	}
+	return totalWeight, totalPrice
+}

internal/modules/marketing/validations/salesorder.validation.go

@@ -9,11 +9,15 @@ type Create struct {
 }
 
 type CreateMarketingProduct struct {
-	VehicleNumber      string  `json:"vehicle_number" validate:"required,min=1,max=50"`
-	ProductWarehouseId uint    `json:"product_warehouse_id" validate:"required,gt=0"`
-	UnitPrice          float64 `json:"unit_price" validate:"required,gt=0"`
-	Qty                float64 `json:"qty" validate:"required,gt=0"`
-	AvgWeight          float64 `json:"avg_weight" validate:"required,gt=0"`
+	MarketingType       string   `json:"marketing_type" validate:"required,min=1,max=50"`
+	VehicleNumber       string   `json:"vehicle_number" validate:"required,min=1,max=50"`
+	ConvertionUnit      *string  `json:"convertion_unit" validate:"omitempty,min=1,max=20"`
+	WeightPerConvertion *float64 `json:"weight_per_convertion" validate:"omitempty,gt=0"`
+	Week                *int     `json:"week" validate:"omitempty,gt=0"`
+	ProductWarehouseId  uint     `json:"product_warehouse_id" validate:"required,gt=0"`
+	UnitPrice           float64  `json:"unit_price" validate:"required,gt=0"`
+	Qty                 float64  `json:"qty" validate:"required,gt=0"`
+	AvgWeight           float64  `json:"avg_weight" validate:"omitempty,gt=0"`
 }
 
 type Update struct {

internal/modules/master/areas/services/area.service.go

@@ -47,16 +47,22 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	areas, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = m.ApplyAreaScope(c, db, "id")
 		if params.Search != "" {
 			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get areas: %+v", err)
 		return nil, 0, err
@@ -65,7 +71,16 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
 }
 
 func (s areaService) GetOne(c *fiber.Ctx, id uint) (*entity.Area, error) {
-	area, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	area, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyAreaScope(c, db, "id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Area not found")
 	}

internal/modules/master/customers/services/customer.service.go

@@ -156,6 +156,22 @@ func (s customerService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint
 		updateBody["type"] = typ
 	}
 
+	if req.Address != nil {
+		updateBody["address"] = *req.Address
+	}
+
+	if req.Phone != nil {
+		updateBody["phone"] = *req.Phone
+	}
+
+	if req.Email != nil {
+		updateBody["email"] = *req.Email
+	}
+
+	if req.AccountNumber != nil {
+		updateBody["account_number"] = *req.AccountNumber
+	}
+
 	if len(updateBody) == 0 {
 		return s.GetOne(c, id)
 	}

internal/modules/master/employees/services/employees.service.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/employees/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/employees/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -43,6 +44,61 @@ func (s employeesService) withRelations(db *gorm.DB) *gorm.DB {
 		Where("employees.deleted_at IS NULL")
 }
 
+func (s employeesService) ensureEmployeeAccess(c *fiber.Ctx, employeeID uint) error {
+	if employeeID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid employee id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("employees e").
+		Joins("JOIN employee_kandangs ek ON ek.employee_id = e.id").
+		Joins("JOIN kandangs k ON k.id = ek.kandang_id").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("e.id = ?", employeeID).
+		Where("e.deleted_at IS NULL")
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count == 0 {
+		return fiber.NewError(fiber.StatusNotFound, "Employees not found")
+	}
+	return nil
+}
+
+func (s employeesService) ensureKandangIDsAccess(c *fiber.Ctx, kandangIDs []uint) error {
+	if len(kandangIDs) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "kandang_ids must contain at least one valid id")
+	}
+
+	db := s.Repository.DB().WithContext(c.Context()).
+		Table("kandangs k").
+		Joins("JOIN locations loc ON loc.id = k.location_id").
+		Joins("JOIN areas a ON a.id = loc.area_id").
+		Where("k.id IN ?", kandangIDs)
+
+	scopedDB, err := m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+	if err != nil {
+		return err
+	}
+
+	var count int64
+	if err := scopedDB.Count(&count).Error; err != nil {
+		return err
+	}
+	if count != int64(len(kandangIDs)) {
+		return fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+	}
+	return nil
+}
+
 func (s employeesService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Employees, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -52,17 +108,29 @@ func (s employeesService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 
 	employeess, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db = db.Joins("JOIN employee_kandangs ek ON ek.employee_id = employees.id").
+			Joins("JOIN kandangs k ON k.id = ek.kandang_id").
+			Joins("JOIN locations loc ON loc.id = k.location_id").
+			Joins("JOIN areas a ON a.id = loc.area_id")
+		var scopeErr error
+		db, scopeErr = m.ApplyLocationAreaScope(c, db, "loc.id", "a.id")
+		if scopeErr != nil {
+			return db.Where("1 = 0")
+		}
 		if params.Search != "" {
 			db = db.Where("employees.name ILIKE ?", "%"+params.Search+"%")
 		}
 		if params.KandangId != nil {
-			db = db.Joins("JOIN employee_kandangs ek ON ek.employee_id = employees.id").
-				Where("ek.kandang_id = ?", *params.KandangId)
+			db = db.Where("ek.kandang_id = ?", *params.KandangId)
 		}
 		if params.IsActive != nil {
 			db = db.Where("employees.is_active = ?", *params.IsActive)
 		}
-		return db.Order("employees.created_at DESC").Order("employees.updated_at DESC")
+		return db.
+			Select("employees.id, employees.name, employees.is_active, employees.created_at, employees.updated_at").
+			Group("employees.id, employees.name, employees.is_active, employees.created_at, employees.updated_at").
+			Order("employees.created_at DESC").
+			Order("employees.updated_at DESC")
 	})
 
 	if err != nil {
@@ -73,6 +141,9 @@ func (s employeesService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 }
 
 func (s employeesService) GetOne(c *fiber.Ctx, id uint) (*entity.Employees, error) {
+	if err := s.ensureEmployeeAccess(c, id); err != nil {
+		return nil, err
+	}
 	employees, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Employees not found")
@@ -98,6 +169,9 @@ func (s *employeesService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 	if len(kandangIDs) == 0 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "kandang_ids must contain at least one valid id")
 	}
+	if err := s.ensureKandangIDsAccess(c, kandangIDs); err != nil {
+		return nil, err
+	}
 
 	if _, err := s.Repository.First(c.Context(), func(db *gorm.DB) *gorm.DB {
 		return db.Where("LOWER(name) = ?", strings.ToLower(name))
@@ -147,6 +221,9 @@ func (s employeesService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := s.ensureEmployeeAccess(c, id); err != nil {
+		return nil, err
+	}
 
 	updateBody := make(map[string]any)
 	var (
@@ -181,6 +258,9 @@ func (s employeesService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 		if len(ids) == 0 {
 			return nil, fiber.NewError(fiber.StatusBadRequest, "kandang_ids must contain at least one valid id")
 		}
+		if err := s.ensureKandangIDsAccess(c, ids); err != nil {
+			return nil, err
+		}
 
 		kandangIDs = ids
 		needKandangUpdate = true
@@ -234,6 +314,9 @@ func (s employeesService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 }
 
 func (s employeesService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := s.ensureEmployeeAccess(c, id); err != nil {
+		return err
+	}
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Employees not found")

internal/modules/master/kandangs/services/kandang.service.go

@@ -49,10 +49,13 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	kandangs, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "kandangs.location_id")
 		if params.Search != "" {
 			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -65,6 +68,9 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get kandangs: %+v", err)
 		return nil, 0, err
@@ -73,7 +79,16 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 }
 
 func (s kandangService) GetOne(c *fiber.Ctx, id uint) (*entity.Kandang, error) {
-	kandang, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	kandang, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "kandangs.location_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Kandang not found")
 	}
@@ -88,6 +103,9 @@ func (s *kandangService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entit
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureLocationAccess(c, s.Repository.DB(), req.LocationId); err != nil {
+		return nil, err
+	}
 
 	if exists, err := s.Repository.NameExists(c.Context(), req.Name, nil); err != nil {
 		s.Log.Errorf("Failed to check kandang name: %+v", err)
@@ -162,6 +180,14 @@ func (s kandangService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureKandangAccess(c, s.Repository.DB(), id); err != nil {
+		return nil, err
+	}
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
 
 	existing, err := s.Repository.GetByID(c.Context(), id, nil)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -253,6 +279,10 @@ func (s kandangService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 }
 
 func (s kandangService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureKandangAccess(c, s.Repository.DB(), id); err != nil {
+		return err
+	}
+
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Kandang not found")

internal/modules/master/locations/services/location.service.go

@@ -47,10 +47,13 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	locations, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "locations.id")
 		if params.Search != "" {
 			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -60,6 +63,9 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get locations: %+v", err)
 		return nil, 0, err
@@ -68,7 +74,16 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 }
 
 func (s locationService) GetOne(c *fiber.Ctx, id uint) (*entity.Location, error) {
-	location, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	location, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationScope(c, db, "locations.id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Location not found")
 	}

internal/modules/master/production-standards/services/production-standard.service.go

@@ -152,6 +152,23 @@ func (s *productionStandardService) CreateOne(c *fiber.Ctx, req *validation.Crea
 				if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
 					return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
 				}
+			} else if req.ProjectCategory == string(utils.ProjectFlockCategoryGrowing) {
+				if detailReq.ProductionStandardDetails != nil && detailReq.ProductionStandardDetails.StandardFCR != nil {
+					var zero float64 = 0
+					productionStandardDetail := &entity.ProductionStandardDetail{
+						ProductionStandardId:     newStandard.Id,
+						Week:                     detailReq.Week,
+						TargetHenDayProduction:   &zero,
+						TargetHenHouseProduction: &zero,
+						TargetEggWeight:          &zero,
+						TargetEggMass:            &zero,
+						StandardFCR:              detailReq.ProductionStandardDetails.StandardFCR,
+					}
+
+					if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
+						return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
+					}
+				}
 			}
 
 			standardGrowthDetail := &entity.StandardGrowthDetail{
@@ -265,6 +282,23 @@ func (s productionStandardService) UpdateOne(c *fiber.Ctx, req *validation.Updat
 					if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
 						return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
 					}
+				} else if projectCategory == "GROWING" {
+					if detailReq.ProductionStandardDetails != nil && detailReq.ProductionStandardDetails.StandardFCR != nil {
+						var zero float64 = 0
+						productionStandardDetail := &entity.ProductionStandardDetail{
+							ProductionStandardId:     id,
+							Week:                     detailReq.Week,
+							TargetHenDayProduction:   &zero,
+							TargetHenHouseProduction: &zero,
+							TargetEggWeight:          &zero,
+							TargetEggMass:            &zero,
+							StandardFCR:              detailReq.ProductionStandardDetails.StandardFCR,
+						}
+
+						if err := productionStandardDetailRepoTx.CreateOne(c.Context(), productionStandardDetail, nil); err != nil {
+							return fmt.Errorf("failed to create production standard detail for week %d: %w", detailReq.Week, err)
+						}
+					}
 				}
 
 				standardGrowthDetail := &entity.StandardGrowthDetail{

internal/modules/master/warehouses/controllers/warehouse.controller.go

@@ -3,11 +3,13 @@ package controller
 import (
 	"math"
 	"strconv"
+	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -23,12 +25,20 @@ func NewWarehouseController(warehouseService service.WarehouseService) *Warehous
 }
 
 func (u *WarehouseController) GetAll(c *fiber.Ctx) error {
+	excludeIDs, err := parseCommaSeparatedUint(c.Query("exclude_id", ""))
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, err.Error())
+	}
+
 	query := &validation.Query{
 		Page:                   c.QueryInt("page", 1),
 		Limit:                  c.QueryInt("limit", 10),
 		Search:                 c.Query("search", ""),
 		AreaId:                 c.QueryInt("area_id", 0),
+		LocationId:             c.QueryInt("location_id", 0),
 		ActiveProjectFlockOnly: c.QueryBool("active_project_flock", false),
+		TransferContext:        c.Query(utils.TransferContextKey, ""),
+		ExcludeIDs:             excludeIDs,
 	}
 
 	if query.Page < 1 || query.Limit < 1 {
@@ -55,6 +65,28 @@ func (u *WarehouseController) GetAll(c *fiber.Ctx) error {
 		})
 }
 
+func parseCommaSeparatedUint(raw string) ([]uint, error) {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return nil, nil
+	}
+
+	parts := strings.Split(raw, ",")
+	out := make([]uint, 0, len(parts))
+	for _, part := range parts {
+		part = strings.TrimSpace(part)
+		if part == "" {
+			continue
+		}
+		value, err := strconv.ParseUint(part, 10, 64)
+		if err != nil {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "invalid exclude_id")
+		}
+		out = append(out, uint(value))
+	}
+	return out, nil
+}
+
 func (u *WarehouseController) GetOne(c *fiber.Ctx) error {
 	param := c.Params("id")
 

internal/modules/master/warehouses/services/warehouse.service.go

@@ -48,16 +48,29 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 		return nil, 0, err
 	}
 
+	var scopeErr error
+
 	offset := (params.Page - 1) * params.Limit
 
 	warehouses, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
+		applyScope := true
+		if params.TransferContext == utils.TransferContextInventoryTransfer {
+			applyScope = !m.HasPermission(c, m.P_TransferCreateOne)
+		}
+
+		if applyScope {
+			db, scopeErr = m.ApplyLocationAreaScope(c, db, "warehouses.location_id", "warehouses.area_id")
+		}
 		if params.Search != "" {
 			db = db.Where("warehouses.name ILIKE ?", "%"+params.Search+"%")
 		}
 		if params.AreaId != 0 {
 			db = db.Where("area_id = ?", params.AreaId)
 		}
+		if params.LocationId != 0 {
+			db = db.Where("location_id = ?", params.LocationId)
+		}
 		if params.ActiveProjectFlockOnly {
 			db = db.Where(`
 				EXISTS (
@@ -75,9 +88,15 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 				)
 			`, "Aktif")
 		}
+		if len(params.ExcludeIDs) > 0 {
+			db = db.Where("warehouses.id NOT IN ?", params.ExcludeIDs)
+		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get warehouses: %+v", err)
 		return nil, 0, err
@@ -86,7 +105,16 @@ func (s warehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 }
 
 func (s warehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.Warehouse, error) {
-	warehouse, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	var scopeErr error
+
+	warehouse, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		db, scopeErr = m.ApplyLocationAreaScope(c, db, "warehouses.location_id", "warehouses.area_id")
+		return db
+	})
+	if scopeErr != nil {
+		return nil, scopeErr
+	}
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
 	}
@@ -117,6 +145,19 @@ func (s *warehouseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 	if err := validateWarehouseTypeRequirements(typ, &req.AreaId, &req.LocationId, &req.KandangId, createValidationOpts); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureAreaAccess(c, s.Repository.DB(), req.AreaId); err != nil {
+		return nil, err
+	}
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
+	if req.KandangId != nil {
+		if err := m.EnsureKandangAccess(c, s.Repository.DB(), *req.KandangId); err != nil {
+			return nil, err
+		}
+	}
 
 	//? Check relation area, location, and kandang
 	if err := common.EnsureRelations(c.Context(),
@@ -155,6 +196,21 @@ func (s warehouseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if req.AreaId != nil {
+		if err := m.EnsureAreaAccess(c, s.Repository.DB(), *req.AreaId); err != nil {
+			return nil, err
+		}
+	}
+	if req.LocationId != nil {
+		if err := m.EnsureLocationAccess(c, s.Repository.DB(), *req.LocationId); err != nil {
+			return nil, err
+		}
+	}
+	if req.KandangId != nil {
+		if err := m.EnsureKandangAccess(c, s.Repository.DB(), *req.KandangId); err != nil {
+			return nil, err
+		}
+	}
 
 	existing, err := s.GetOne(c, id)
 	if err != nil {
@@ -245,6 +301,10 @@ func (s warehouseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 }
 
 func (s warehouseService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureWarehouseAccess(c, s.Repository.DB(), id); err != nil {
+		return err
+	}
+
 	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Warehouse not found")

internal/modules/master/warehouses/validations/warehouse.validation.go

@@ -21,5 +21,8 @@ type Query struct {
 	Limit                  int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
 	Search                 string `query:"search" validate:"omitempty,max=50"`
 	AreaId                 int    `query:"area_id" validate:"omitempty,number,gt=0"`
+	LocationId             int    `query:"location_id" validate:"omitempty,number,gt=0"`
 	ActiveProjectFlockOnly bool   `query:"active_project_flock"`
+	ExcludeIDs             []uint `query:"-" validate:"omitempty,dive,gt=0"`
+	TransferContext        string `query:"transfer_context" validate:"omitempty,oneof=inventory_transfer"`
 }

internal/modules/production/chickins/services/chickin.service.go

@@ -645,6 +645,18 @@ func (s *chickinService) ConsumeChickinStocks(ctx context.Context, tx *gorm.DB,
 			CreatedBy:          actorID,
 			Notes:              fmt.Sprintf("Chickin #%d", chickin.Id),
 		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, chickin.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			decreaseLog.Stock = latestStockLog.Stock
+			decreaseLog.Stock -= decreaseLog.Decrease
+		} else {
+			decreaseLog.Stock -= decreaseLog.Decrease
+		}
+
 		s.StockLogRepo.CreateOne(ctx, decreaseLog, nil)
 	}
 
@@ -701,6 +713,18 @@ func (s *chickinService) ReleaseChickinStocks(ctx context.Context, tx *gorm.DB,
 			CreatedBy:          actorID,
 			Notes:              fmt.Sprintf("Chickin #%d - Stock released", chickin.Id),
 		}
+		stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, chickin.ProductWarehouseId, 1)
+		if err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+		}
+		if len(stockLogs) > 0 {
+			latestStockLog := stockLogs[0]
+			increaseLog.Stock = latestStockLog.Stock
+			increaseLog.Stock += increaseLog.Increase
+		} else {
+			increaseLog.Stock += increaseLog.Increase
+		}
+
 		s.StockLogRepo.CreateOne(ctx, increaseLog, nil)
 	}
 

internal/modules/production/project-flock-kandangs/services/project_flock_kandang.service.go

@@ -88,9 +88,14 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 		return nil, 0, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
-	projectFlockKandangs, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, params)
+	projectFlockKandangs, total, err := s.Repository.GetAllWithFiltersScoped(c.Context(), offset, params.Limit, params, scope.IDs, scope.Restrict)
 
 	if err != nil {
 		s.Log.Errorf("Failed to get projectFlockKandangs: %+v", err)
@@ -106,6 +111,28 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 }
 
 func (s projectFlockKandangService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlockKandang, map[uint]float64, []entity.ProductWarehouse, error) {
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, nil, nil, err
+	}
+	if scope.Restrict {
+		if len(scope.IDs) == 0 {
+			return nil, nil, nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
+		}
+		var count int64
+		if err := s.Repository.DB().WithContext(c.Context()).
+			Table("project_flock_kandangs").
+			Joins("JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id").
+			Where("project_flock_kandangs.id = ?", id).
+			Where("project_flocks.location_id IN ?", scope.IDs).
+			Count(&count).Error; err != nil {
+			return nil, nil, nil, err
+		}
+		if count == 0 {
+			return nil, nil, nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
+		}
+	}
+
 	projectFlockKandang, err := s.Repository.GetByID(c.Context(), id)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, nil, nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")

internal/modules/production/project_flocks/controllers/projectflock.controller.go

@@ -12,6 +12,7 @@ import (
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/response"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -76,6 +77,7 @@ func (u *ProjectflockController) GetAll(c *fiber.Ctx) error {
 		query.Category = category
 
 	}
+	query.TransferContext = c.Query(utils.TransferContextKey, "")
 
 	if kandangRaw := c.Query("kandang_id", c.Query("kandang_ids", "")); kandangRaw != "" {
 		ids, err := parseUintList(kandangRaw)
@@ -287,6 +289,11 @@ func (u *ProjectflockController) LookupProjectFlockKandang(c *fiber.Ctx) error {
 	} else {
 		dtoResult.AvailableQuantity = population
 	}
+	if chickinDate, err := u.ProjectflockService.GetProjectFlockKandangChickinDate(c, result.Id); err != nil {
+		return err
+	} else if chickinDate != nil {
+		dtoResult.ChickInDate = chickinDate
+	}
 	if warehouse, werr := u.ProjectflockService.GetWarehouseByKandangID(c, result.KandangId); werr != nil {
 		return werr
 	} else if warehouse != nil {

internal/modules/production/project_flocks/dto/projectflock_kandang.dto.go

@@ -1,6 +1,8 @@
 package dto
 
 import (
+	"time"
+
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	areaDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
 	fcrDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/fcrs/dto"
@@ -38,6 +40,7 @@ type ProjectFlockKandangDTO struct {
 	ProjectFlock          *ProjectFlockWithPivotDTO          `json:"project_flock,omitempty"`
 	AvailableQuantity     float64                            `json:"available_quantity"`
 	Population            *float64                           `json:"population,omitempty"`
+	ChickInDate           *time.Time                         `json:"chick_in_date,omitempty"`
 }
 
 func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangDTO {

internal/modules/production/project_flocks/repositories/project_budget.repository.go

@@ -31,6 +31,7 @@ func (r *ProjectBudgetRepositoryImpl) GetByProjectFlockID(ctx context.Context, p
 		Where("project_flock_id = ?", projectFlockID).
 		Preload("Nonstock").
 		Preload("Nonstock.Uom").
+		Preload("Nonstock.Flags").
 		Find(&budgets).Error
 	return budgets, err
 }

internal/modules/production/project_flocks/repositories/projectflock.repository.go

@@ -14,6 +14,7 @@ import (
 type ProjectflockRepository interface {
 	repository.BaseRepository[entity.ProjectFlock]
 	GetAllWithFilters(ctx context.Context, offset, limit int, params *validation.Query) ([]entity.ProjectFlock, int64, error)
+	GetAllWithFiltersScoped(ctx context.Context, offset, limit int, params *validation.Query, locationIDs []uint, restrict bool) ([]entity.ProjectFlock, int64, error)
 	WithDefaultRelations() func(*gorm.DB) *gorm.DB
 	ExistsByFlockName(ctx context.Context, flockName string, excludeID *uint) (bool, error)
 	GetNextPeriodsForKandangs(ctx context.Context, kandangIDs []uint) (map[uint]int, error)
@@ -48,6 +49,19 @@ func (r *ProjectflockRepositoryImpl) GetAllWithFilters(ctx context.Context, offs
 	})
 }
 
+func (r *ProjectflockRepositoryImpl) GetAllWithFiltersScoped(ctx context.Context, offset, limit int, params *validation.Query, locationIDs []uint, restrict bool) ([]entity.ProjectFlock, int64, error) {
+	return r.GetAll(ctx, offset, limit, func(db *gorm.DB) *gorm.DB {
+		db = r.applyQueryFilters(r.WithDefaultRelations()(db), params)
+		if restrict {
+			if len(locationIDs) == 0 {
+				return db.Where("1 = 0")
+			}
+			db = db.Where("project_flocks.location_id IN ?", locationIDs)
+		}
+		return db
+	})
+}
+
 func (r *ProjectflockRepositoryImpl) WithDefaultRelations() func(*gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {
 		return db.

internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go

@@ -20,6 +20,7 @@ type ProjectFlockKandangRepository interface {
 	DeleteMany(ctx context.Context, projectFlockID uint, kandangIDs []uint) error
 	GetAll(ctx context.Context, offset int, limit int, modifier func(*gorm.DB) *gorm.DB) ([]entity.ProjectFlockKandang, int64, error)
 	GetAllWithFilters(ctx context.Context, offset int, limit int, params interface{}) ([]entity.ProjectFlockKandang, int64, error)
+	GetAllWithFiltersScoped(ctx context.Context, offset int, limit int, params interface{}, locationIDs []uint, restrict bool) ([]entity.ProjectFlockKandang, int64, error)
 	GetByProjectFlockID(ctx context.Context, projectFlockID uint) ([]entity.ProjectFlockKandang, error)
 	ListExistingKandangIDs(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]uint, error)
 	HasKandangsLinkedToOtherProject(ctx context.Context, kandangIDs []uint, exceptProjectID *uint) (bool, error)
@@ -85,6 +86,7 @@ func (r *projectFlockKandangRepositoryImpl) GetByProjectFlockID(ctx context.Cont
 	var records []entity.ProjectFlockKandang
 	if err := r.db.WithContext(ctx).
 		Where("project_flock_id = ?", projectFlockID).
+		Preload("Kandang").
 		Find(&records).Error; err != nil {
 		return nil, err
 	}
@@ -196,6 +198,104 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFilters(ctx context.Contex
 	return records, total, nil
 }
 
+func (r *projectFlockKandangRepositoryImpl) GetAllWithFiltersScoped(ctx context.Context, offset int, limit int, params interface{}, locationIDs []uint, restrict bool) ([]entity.ProjectFlockKandang, int64, error) {
+	var records []entity.ProjectFlockKandang
+	var total int64
+
+	query, ok := params.(*validation.Query)
+
+	q := r.db.WithContext(ctx).
+		Joins("JOIN \"kandangs\" ON \"project_flock_kandangs\".\"kandang_id\" = \"kandangs\".\"id\"").
+		Joins("JOIN \"project_flocks\" ON \"project_flock_kandangs\".\"project_flock_id\" = \"project_flocks\".\"id\"").
+		Preload("ProjectFlock").
+		Preload("ProjectFlock.Fcr").
+		Preload("ProjectFlock.Area").
+		Preload("ProjectFlock.Location").
+		Preload("ProjectFlock.CreatedUser").
+		Preload("ProjectFlock.Kandangs").
+		Preload("ProjectFlock.KandangHistory").
+		Preload("Kandang").
+		Preload("Chickins").
+		Preload("Chickins.CreatedUser").
+		Preload("Chickins.ProductWarehouse")
+
+	if restrict {
+		if len(locationIDs) == 0 {
+			return []entity.ProjectFlockKandang{}, 0, nil
+		}
+		q = q.Where("\"project_flocks\".\"location_id\" IN ?", locationIDs)
+	}
+
+	if ok && query != nil && query.StepName != "" {
+		q = q.Where(`
+			EXISTS (
+				SELECT 1 FROM "approvals"
+				WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+				AND "approvals"."approvable_type" = ?
+				AND LOWER("approvals"."step_name") = LOWER(?)
+				AND "approvals"."id" IN (
+					SELECT "approvals"."id" FROM "approvals"
+					WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+					AND "approvals"."approvable_type" = ?
+					ORDER BY "approvals"."id" DESC
+					LIMIT 1
+				)
+			)
+		`, "PROJECT_FLOCK_KANDANGS", query.StepName, "PROJECT_FLOCK_KANDANGS")
+	}
+
+	if ok && query != nil {
+		if query.Search != "" {
+			escapedSearch := strings.NewReplacer("\\", "\\\\", "%", "\\%", "_", "\\_").Replace(query.Search)
+			q = q.Where(
+				r.db.Where("LOWER(\"kandangs\".\"name\") LIKE LOWER(?) ESCAPE '\\'", "%"+escapedSearch+"%").
+					Or("LOWER(\"project_flocks\".\"flock_name\") LIKE LOWER(?) ESCAPE '\\'", "%"+escapedSearch+"%"),
+			)
+		}
+
+		if query.ProjectFlockId > 0 {
+			q = q.Where("\"project_flock_kandangs\".\"project_flock_id\" = ?", query.ProjectFlockId)
+		}
+
+		if query.KandangId > 0 {
+			q = q.Where("\"project_flock_kandangs\".\"kandang_id\" = ?", query.KandangId)
+		}
+
+		if query.Category != "" {
+			q = q.Where("\"project_flocks\".\"category\" = ?", query.Category)
+		}
+
+		if query.AreaId > 0 {
+			q = q.Where("\"project_flocks\".\"area_id\" = ?", query.AreaId)
+		}
+	}
+
+	if err := q.Model(&entity.ProjectFlockKandang{}).Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	sortBy := "\"project_flock_kandangs\".\"created_at\" DESC"
+	if ok && query != nil && query.SortBy != "" {
+		sortOrder := "DESC"
+		if query.SortOrder == "ASC" {
+			sortOrder = "ASC"
+		}
+
+		switch query.SortBy {
+		case "created_at":
+			sortBy = "\"project_flock_kandangs\".\"created_at\" " + sortOrder
+		case "period":
+			sortBy = "\"project_flocks\".\"period\" " + sortOrder
+		}
+	}
+
+	if err := q.Order(sortBy).Offset(offset).Limit(limit).Find(&records).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return records, total, nil
+}
+
 func (r *projectFlockKandangRepositoryImpl) WithTx(tx *gorm.DB) ProjectFlockKandangRepository {
 	return &projectFlockKandangRepositoryImpl{db: tx}
 }

internal/modules/production/project_flocks/services/projectflock.service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
+	"time"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
@@ -42,6 +43,7 @@ type ProjectflockService interface {
 	DeleteOne(ctx *fiber.Ctx, id uint) error
 	GetProjectFlockKandangByProjectAndKandang(ctx *fiber.Ctx, projectFlockID uint, kandangID uint) (*entity.ProjectFlockKandang, float64, error)
 	GetProjectFlockKandangPopulation(ctx *fiber.Ctx, projectFlockKandangID uint) (float64, error)
+	GetProjectFlockKandangChickinDate(ctx *fiber.Ctx, projectFlockKandangID uint) (*time.Time, error)
 	GetPeriodSummary(ctx *fiber.Ctx, locationID uint) ([]KandangPeriodSummary, error)
 	GetProjectPeriods(ctx *fiber.Ctx, projectIDs []uint) (map[uint]int, error)
 	Approval(ctx *fiber.Ctx, req *validation.Approve) ([]entity.ProjectFlock, error)
@@ -115,9 +117,20 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 		return nil, 0, nil, err
 	}
 
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, nil, err
+	}
+	if params.TransferContext == utils.TransferContextTransferToLaying {
+		if m.HasPermission(c, m.P_TransferToLaying_CreateOne) || m.HasPermission(c, m.P_TransferToLaying_UpdateOne) {
+			scope.Restrict = false
+			scope.IDs = nil
+		}
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
-	projectflocks, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, params)
+	projectflocks, total, err := s.Repository.GetAllWithFiltersScoped(c.Context(), offset, params.Limit, params, scope.IDs, scope.Restrict)
 
 	if err != nil {
 		s.Log.Errorf("Failed to get projectflocks: %+v", err)
@@ -191,7 +204,16 @@ func (s projectflockService) getOneEntityOnly(c *fiber.Ctx, id uint) (*entity.Pr
 }
 
 func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockRelationDTO, error) {
-	projectflock, err := s.Repository.GetByID(c.Context(), id, s.Repository.WithDefaultRelations())
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, nil, err
+	}
+
+	projectflock, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+		db = s.Repository.WithDefaultRelations()(db)
+		db = m.ApplyScopeFilter(db, scope, "project_flocks.location_id")
+		return db
+	})
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 	}
@@ -459,6 +481,35 @@ func (s projectflockService) GetProjectFlockKandangPopulation(ctx *fiber.Ctx, pr
 	return total, nil
 }
 
+func (s projectflockService) GetProjectFlockKandangChickinDate(ctx *fiber.Ctx, projectFlockKandangID uint) (*time.Time, error) {
+	if s.PopulationRepo == nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Project flock population repository is not configured")
+	}
+	if projectFlockKandangID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
+	}
+
+	populations, err := s.PopulationRepo.GetByProjectFlockKandangID(ctx.Context(), projectFlockKandangID)
+	if err != nil {
+		s.Log.Errorf("Failed to fetch populations for project flock kandang %d: %+v", projectFlockKandangID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang chick in date")
+	}
+
+	var earliest *time.Time
+	for _, pop := range populations {
+		if pop.ProjectChickin == nil || pop.ProjectChickin.ChickInDate.IsZero() {
+			continue
+		}
+		chickinDate := pop.ProjectChickin.ChickInDate
+		if earliest == nil || chickinDate.Before(*earliest) {
+			copy := chickinDate
+			earliest = &copy
+		}
+	}
+
+	return earliest, nil
+}
+
 func (s projectflockService) GetProjectFlockKandangByParams(ctx *fiber.Ctx, idStr string, projectFlockIdStr string, kandangIdStr string) (*entity.ProjectFlockKandang, float64, error) {
 	idStr = strings.TrimSpace(idStr)
 	projectFlockIdStr = strings.TrimSpace(projectFlockIdStr)

internal/modules/production/project_flocks/validations/projectflock.validation.go

@@ -12,16 +12,17 @@ type Create struct {
 }
 
 type Query struct {
-	Page       int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit      int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	Search     string `query:"search" validate:"omitempty,max=50"`
-	SortBy     string `query:"sort_by" validate:"omitempty"`
-	SortOrder  string `query:"sort_order" validate:"omitempty,oneof=asc desc"`
-	AreaId     uint   `query:"area_id" validate:"omitempty,number,gt=0"`
-	LocationId uint   `query:"location_id" validate:"omitempty,number,gt=0"`
-	Period     int    `query:"period" validate:"omitempty,number,gt=0"`
-	Category   string `query:"category" validate:"omitempty"`
-	KandangIds []uint `query:"kandang_id" validate:"omitempty,dive,gt=0"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	Search          string `query:"search" validate:"omitempty,max=50"`
+	SortBy          string `query:"sort_by" validate:"omitempty"`
+	SortOrder       string `query:"sort_order" validate:"omitempty,oneof=asc desc"`
+	AreaId          uint   `query:"area_id" validate:"omitempty,number,gt=0"`
+	LocationId      uint   `query:"location_id" validate:"omitempty,number,gt=0"`
+	Period          int    `query:"period" validate:"omitempty,number,gt=0"`
+	Category        string `query:"category" validate:"omitempty"`
+	KandangIds      []uint `query:"kandang_id" validate:"omitempty,dive,gt=0"`
+	TransferContext string `query:"transfer_context" validate:"omitempty,oneof=transfer_to_laying"`
 }
 
 type Approve struct {

internal/modules/production/recordings/controllers/recording.controller.go

@@ -3,6 +3,8 @@ package controller
 import (
 	"math"
 	"strconv"
+	"strings"
+	"time"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/services"
@@ -82,7 +84,16 @@ func (u *RecordingController) GetNextDay(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
 	}
 
-	nextDay, err := u.RecordingService.GetNextDay(c, uint(projectFlockID))
+	recordTime := time.Now().UTC()
+	if recordDate := strings.TrimSpace(c.Query("record_date")); recordDate != "" {
+		parsed, err := time.Parse("2006-01-02", recordDate)
+		if err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, "record_date must be in YYYY-MM-DD format")
+		}
+		recordTime = parsed.UTC()
+	}
+
+	nextDay, err := u.RecordingService.GetNextDay(c, uint(projectFlockID), recordTime)
 	if err != nil {
 		return err
 	}

internal/modules/production/recordings/repositories/recording.repository.go

@@ -47,8 +47,10 @@ type RecordingRepository interface {
 	GetCumulativeEggQtyByProjectFlockKandang(tx *gorm.DB, projectFlockKandangId uint, recordTime time.Time) (float64, error)
 	GetFcrStandardNumber(tx *gorm.DB, fcrId uint, currentWeightKg float64) (float64, bool, error)
 	GetTotalWeightProducedFromUniformityByProjectFlockID(ctx context.Context, projectFlockID uint) (float64, error)
+	GetTotalWeightProducedFromUniformityByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error)
 	GetProductionWeightAndQtyByProjectFlockID(ctx context.Context, projectFlockID uint) (totalWeight float64, totalQty float64, err error)
 	GetTotalDepletionByProjectFlockID(ctx context.Context, projectFlockID uint) (totalDepletion float64, err error)
+	GetTotalDepletionByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (totalDepletion float64, err error)
 	GetLatestAvgWeightByProjectFlockID(ctx context.Context, projectFlockID uint) (avgWeight float64, err error)
 	GetTotalEggProductionWeightByProjectFlockID(ctx context.Context, projectFlockID uint) (totalWeightKg float64, err error)
 	GetAverageTargetMetricsByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint, includeTargets bool) (RecordingTargetAverages, error)
@@ -473,6 +475,17 @@ func (r *RecordingRepositoryImpl) GetTotalDepletionByProjectFlockID(ctx context.
 	return result, err
 }
 
+func (r *RecordingRepositoryImpl) GetTotalDepletionByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error) {
+	var result float64
+	err := r.DB().WithContext(ctx).
+		Table("recording_depletions").
+		Select("COALESCE(SUM(recording_depletions.qty), 0)").
+		Joins("JOIN recordings ON recordings.id = recording_depletions.recording_id").
+		Where("recordings.project_flock_kandangs_id = ?", projectFlockKandangID).
+		Scan(&result).Error
+	return result, err
+}
+
 func (r *RecordingRepositoryImpl) GetLatestAvgWeightByProjectFlockID(ctx context.Context, projectFlockID uint) (float64, error) {
 	// Body-weight tracking is removed; keep stub for report compatibility.
 	return 0, nil
@@ -609,3 +622,23 @@ func (r *RecordingRepositoryImpl) GetTotalWeightProducedFromUniformityByProjectF
 
 	return result.TotalWeight, err
 }
+
+func (r *RecordingRepositoryImpl) GetTotalWeightProducedFromUniformityByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (float64, error) {
+	if projectFlockKandangID == 0 {
+		return 0, nil
+	}
+
+	var result struct {
+		TotalWeight float64
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("project_flock_kandang_uniformity").
+		Select("COALESCE((mean_up / 1.10) * chick_qty_of_weight / 1000, 0) as total_weight").
+		Where("project_flock_kandang_id = ?", projectFlockKandangID).
+		Order("id DESC").
+		Limit(1).
+		Scan(&result).Error
+
+	return result.TotalWeight, err
+}

internal/modules/production/recordings/services/recording.service.go

@@ -4,6 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
+	"strings"
+	"time"
+
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -13,15 +17,12 @@ import (
 	sProductionStandard "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/services"
 	rProjectFlock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
-	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/validations"
+	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 	recordingutil "gitlab.com/mbugroup/lti-api.git/internal/utils/recording"
-	"math"
-	"strings"
-	"time"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -32,7 +33,7 @@ import (
 type RecordingService interface {
 	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.Recording, int64, error)
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.Recording, error)
-	GetNextDay(ctx *fiber.Ctx, projectFlockKandangId uint) (int, error)
+	GetNextDay(ctx *fiber.Ctx, projectFlockKandangId uint, recordTime time.Time) (int, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.Recording, error)
 	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.Recording, error)
 	DeleteOne(ctx *fiber.Ctx, id uint) error
@@ -108,6 +109,13 @@ func (s recordingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 		return nil, 0, err
 	}
 
+	var scopeErr error
+	if params.ProjectFlockKandangId != 0 {
+		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), 0, params.ProjectFlockKandangId); err != nil {
+			return nil, 0, err
+		}
+	}
+
 	limit := params.Limit
 	if limit == 0 {
 		limit = 10
@@ -120,6 +128,10 @@ func (s recordingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 
 	recordings, total, err := s.Repository.GetAll(c.Context(), offset, limit, func(db *gorm.DB) *gorm.DB {
 		db = s.Repository.WithRelations(db)
+		db = db.
+			Joins("JOIN project_flock_kandangs pfk ON pfk.id = recordings.project_flock_kandangs_id").
+			Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id")
+		db, scopeErr = m.ApplyLocationScope(c, db, "pf.location_id")
 		if params.ProjectFlockKandangId != 0 {
 			db = db.Where("project_flock_kandangs_id = ?", params.ProjectFlockKandangId)
 		}
@@ -127,6 +139,9 @@ func (s recordingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 		return db.Order("recordings.record_datetime DESC").Order("recordings.created_at DESC")
 	})
 
+	if scopeErr != nil {
+		return nil, 0, scopeErr
+	}
 	if err != nil {
 		s.Log.Errorf("Failed to get recordings: %+v", err)
 		return nil, 0, err
@@ -141,6 +156,10 @@ func (s recordingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 }
 
 func (s recordingService) GetOne(c *fiber.Ctx, id uint) (*entity.Recording, error) {
+	if err := m.EnsureRecordingAccess(c, s.Repository.DB(), id); err != nil {
+		return nil, err
+	}
+
 	recording, err := s.Repository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
 		return s.Repository.WithRelations(db)
 	})
@@ -160,12 +179,18 @@ func (s recordingService) GetOne(c *fiber.Ctx, id uint) (*entity.Recording, erro
 	return recording, nil
 }
 
-func (s recordingService) GetNextDay(c *fiber.Ctx, projectFlockKandangId uint) (int, error) {
+func (s recordingService) GetNextDay(c *fiber.Ctx, projectFlockKandangId uint, recordTime time.Time) (int, error) {
 	if projectFlockKandangId == 0 {
 		return 0, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
 	}
+	if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), 0, projectFlockKandangId); err != nil {
+		return 0, err
+	}
 
-	day, err := s.computeRecordingDay(c.Context(), projectFlockKandangId, time.Now().UTC())
+	if recordTime.IsZero() {
+		recordTime = time.Now().UTC()
+	}
+	day, err := s.computeRecordingDay(c.Context(), projectFlockKandangId, recordTime)
 	if err != nil {
 		s.Log.Errorf("Failed to compute recording day for project_flock_kandang_id=%d: %+v", projectFlockKandangId, err)
 		return 0, err
@@ -178,6 +203,9 @@ func (s *recordingService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), 0, req.ProjectFlockKandangId); err != nil {
+		return nil, err
+	}
 
 	ctx := c.Context()
 	recordTime := time.Now().UTC()
@@ -284,6 +312,7 @@ func (s *recordingService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 		}
 
 		mappedDepletions := recordingutil.MapDepletions(createdRecording.Id, req.Depletions)
+		depletionDesired := resetDepletionQuantitiesForFIFO(mappedDepletions, s.FifoSvc != nil)
 		if s.FifoSvc != nil && len(mappedDepletions) > 0 {
 			sourceWarehouseID, err := s.resolvePopulationWarehouseID(ctx, req.ProjectFlockKandangId)
 			if err != nil {
@@ -298,6 +327,7 @@ func (s *recordingService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 			return err
 		}
 		if s.FifoSvc != nil {
+			applyDepletionDesiredQuantities(mappedDepletions, depletionDesired, true)
 			note := fmt.Sprintf("Recording-Create#%d", createdRecording.Id)
 			if err := s.consumeRecordingDepletions(ctx, tx, mappedDepletions, note, actorID); err != nil {
 				return err
@@ -347,6 +377,9 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	if err := m.EnsureRecordingAccess(c, s.Repository.DB(), id); err != nil {
+		return nil, err
+	}
 
 	if req.Stocks == nil && req.Depletions == nil && req.Eggs == nil {
 		return s.GetOne(c, id)
@@ -462,6 +495,7 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 			}
 
 			mappedDepletions := recordingutil.MapDepletions(recordingEntity.Id, req.Depletions)
+			depletionDesired := resetDepletionQuantitiesForFIFO(mappedDepletions, s.FifoSvc != nil)
 			if s.FifoSvc != nil && len(mappedDepletions) > 0 {
 				sourceWarehouseID, err := s.resolvePopulationWarehouseID(ctx, recordingEntity.ProjectFlockKandangId)
 				if err != nil {
@@ -477,6 +511,7 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 			}
 
 			if s.FifoSvc != nil {
+				applyDepletionDesiredQuantities(mappedDepletions, depletionDesired, true)
 				note := fmt.Sprintf("Recording-Edit#%d", recordingEntity.Id)
 				if err := s.consumeRecordingDepletions(ctx, tx, mappedDepletions, note, actorID); err != nil {
 					return err
@@ -501,6 +536,17 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 						if egg.ProductWarehouseId == 0 || egg.Qty <= 0 {
 							continue
 						}
+						stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, egg.ProductWarehouseId, 1)
+						if err != nil {
+							s.Log.Errorf("Failed to get stock logs: %+v", err)
+							return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+						}
+						latestStockLog := &entity.StockLog{}
+						if len(stockLogs) > 0 {
+							latestStockLog = stockLogs[0]
+						} else {
+							latestStockLog.Stock = 0
+						}
 						logs = append(logs, &entity.StockLog{
 							ProductWarehouseId: egg.ProductWarehouseId,
 							CreatedBy:          actorID,
@@ -508,6 +554,7 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 							LoggableType:       string(utils.StockLogTypeRecording),
 							LoggableId:         recordingEntity.Id,
 							Notes:              note,
+							Stock:              latestStockLog.Stock - float64(egg.Qty),
 						})
 					}
 					if len(logs) > 0 {
@@ -626,6 +673,11 @@ func (s recordingService) Approval(c *fiber.Ctx, req *validation.Approve) ([]ent
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
+	for _, id := range req.ApprovableIds {
+		if err := m.EnsureRecordingAccess(c, s.Repository.DB(), id); err != nil {
+			return nil, err
+		}
+	}
 
 	actionValue := strings.ToUpper(strings.TrimSpace(req.Action))
 	var action entity.ApprovalAction
@@ -703,7 +755,15 @@ func (s recordingService) Approval(c *fiber.Ctx, req *validation.Approve) ([]ent
 }
 
 func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
+	if err := m.EnsureRecordingAccess(c, s.Repository.DB(), id); err != nil {
+		return err
+	}
 	ctx := c.Context()
+	actorID, err := m.ActorIDFromContext(c)
+	if err != nil {
+		return err
+	}
+	note := fmt.Sprintf("Recording-Delete#%d", id)
 
 	return s.Repository.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		oldDepletions, err := s.Repository.ListDepletions(tx, id)
@@ -712,7 +772,7 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 			return err
 		}
 		if s.FifoSvc != nil {
-			if err := s.releaseRecordingDepletions(ctx, tx, oldDepletions, "", 0); err != nil {
+			if err := s.releaseRecordingDepletions(ctx, tx, oldDepletions, note, actorID); err != nil {
 				return err
 			}
 		}
@@ -734,7 +794,7 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 			return err
 		}
 
-		if err := s.releaseRecordingStocks(ctx, tx, oldStocks, "", 0); err != nil {
+		if err := s.releaseRecordingStocks(ctx, tx, oldStocks, note, actorID); err != nil {
 			return err
 		}
 
@@ -742,6 +802,10 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 			return err
 		}
 
+		if err := s.logRecordingEggRollback(ctx, tx, oldEggs, note, actorID); err != nil {
+			return err
+		}
+
 		if err := s.Repository.WithTx(tx).DeleteOne(ctx, id); err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				return fiber.NewError(fiber.StatusNotFound, "Recording not found")
@@ -754,6 +818,40 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 	})
 }
 
+func (s *recordingService) logRecordingEggRollback(
+	ctx context.Context,
+	tx *gorm.DB,
+	eggs []entity.RecordingEgg,
+	note string,
+	actorID uint,
+) error {
+	if len(eggs) == 0 || s.StockLogRepo == nil {
+		return nil
+	}
+	if strings.TrimSpace(note) == "" || actorID == 0 {
+		return nil
+	}
+
+	for _, egg := range eggs {
+		if egg.ProductWarehouseId == 0 || egg.Qty <= 0 {
+			continue
+		}
+		log := &entity.StockLog{
+			ProductWarehouseId: egg.ProductWarehouseId,
+			CreatedBy:          actorID,
+			Decrease:           float64(egg.Qty),
+			LoggableType:       string(utils.StockLogTypeRecording),
+			LoggableId:         egg.RecordingId,
+			Notes:              note,
+		}
+		if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 // === Persistence Helpers ===
 
 func (s *recordingService) ensureProductWarehousesExist(c *fiber.Ctx, stocks []validation.Stock, depletions []validation.Depletion, eggs []validation.Egg) error {
@@ -852,6 +950,18 @@ func (s *recordingService) consumeRecordingStocks(
 				LoggableId:         stock.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, stock.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock -= log.Decrease
+			} else {
+				log.Stock -= log.Decrease
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -919,6 +1029,18 @@ func (s *recordingService) consumeRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, sourceWarehouseID, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock -= log.Decrease
+			} else {
+				log.Stock -= log.Decrease
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -926,6 +1048,9 @@ func (s *recordingService) consumeRecordingDepletions(
 
 		destDelta := depletion.Qty + depletion.PendingQty
 		if depletion.ProductWarehouseId != 0 && destDelta > 0 && strings.TrimSpace(note) != "" && actorID != 0 {
+			if depletion.ProductWarehouseId == sourceWarehouseID {
+				continue
+			}
 			log := &entity.StockLog{
 				ProductWarehouseId: depletion.ProductWarehouseId,
 				CreatedBy:          actorID,
@@ -934,6 +1059,18 @@ func (s *recordingService) consumeRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, depletion.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -994,6 +1131,18 @@ func (s *recordingService) releaseRecordingStocks(
 				LoggableId:         stock.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, stock.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1056,6 +1205,18 @@ func (s *recordingService) releaseRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, sourceWarehouseID, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1063,6 +1224,9 @@ func (s *recordingService) releaseRecordingDepletions(
 
 		destDelta := depletion.Qty + depletion.PendingQty
 		if depletion.ProductWarehouseId != 0 && destDelta > 0 && strings.TrimSpace(note) != "" && actorID != 0 {
+			if depletion.ProductWarehouseId == sourceWarehouseID {
+				continue
+			}
 			log := &entity.StockLog{
 				ProductWarehouseId: depletion.ProductWarehouseId,
 				CreatedBy:          actorID,
@@ -1071,6 +1235,18 @@ func (s *recordingService) releaseRecordingDepletions(
 				LoggableId:         depletion.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, depletion.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock -= log.Decrease
+			} else {
+				log.Stock -= log.Decrease
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1218,6 +1394,18 @@ func (s *recordingService) replenishRecordingEggs(
 				LoggableId:         egg.RecordingId,
 				Notes:              note,
 			}
+			stockLogs, err := s.StockLogRepo.GetByProductWarehouse(ctx, egg.ProductWarehouseId, 1)
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				log.Stock = latestStockLog.Stock
+				log.Stock += log.Increase
+			} else {
+				log.Stock += log.Increase
+			}
+
 			if err := s.StockLogRepo.WithTx(tx).CreateOne(ctx, log, nil); err != nil {
 				return err
 			}
@@ -1232,6 +1420,11 @@ type desiredStock struct {
 	Pending float64
 }
 
+type desiredDepletion struct {
+	Qty     float64
+	Pending float64
+}
+
 func resetStockQuantitiesForFIFO(stocks []entity.RecordingStock, enabled bool) []desiredStock {
 	desired := make([]desiredStock, len(stocks))
 	for i := range stocks {
@@ -1266,6 +1459,33 @@ func applyStockDesiredQuantities(stocks []entity.RecordingStock, desired []desir
 	}
 }
 
+func resetDepletionQuantitiesForFIFO(depletions []entity.RecordingDepletion, enabled bool) []desiredDepletion {
+	desired := make([]desiredDepletion, len(depletions))
+	for i := range depletions {
+		desired[i].Qty = depletions[i].Qty
+		desired[i].Pending = depletions[i].PendingQty
+		if !enabled {
+			continue
+		}
+		depletions[i].Qty = 0
+		depletions[i].PendingQty = 0
+	}
+	return desired
+}
+
+func applyDepletionDesiredQuantities(depletions []entity.RecordingDepletion, desired []desiredDepletion, enabled bool) {
+	if !enabled {
+		return
+	}
+	for i := range depletions {
+		if i >= len(desired) {
+			break
+		}
+		depletions[i].Qty = desired[i].Qty
+		depletions[i].PendingQty = desired[i].Pending
+	}
+}
+
 func (s *recordingService) syncRecordingStocks(
 	ctx context.Context,
 	tx *gorm.DB,
@@ -1357,6 +1577,7 @@ func ensureRecordingEggsUnused(eggs []entity.RecordingEgg) error {
 }
 
 func stocksMatch(existing []entity.RecordingStock, incoming []validation.Stock) bool {
+
 	existingUsage := make(map[uint]float64)
 	for _, stock := range existing {
 		var usage float64
@@ -1568,7 +1789,8 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 
 	var eggMass float64
 	if remainingChick > 0 && totalEggWeightGrams > 0 {
-		eggMass = (totalEggWeightGrams / remainingChick) / 1000
+		// totalEggWeightGrams is in grams; egg mass is grams per hen.
+		eggMass = totalEggWeightGrams / remainingChick
 		updates["egg_mass"] = eggMass
 		recording.EggMass = &eggMass
 	} else {