first commit

.gitlab-ci.yml

@@ -1,29 +1,15 @@
 workflow:
   rules:
-    # MR pipeline
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: always
-
-    # Push pipeline hanya untuk env branch
     - if: '$CI_COMMIT_BRANCH == "development"'
-      when: always
     - if: '$CI_COMMIT_BRANCH == "staging"'
-      when: always
     - if: '$CI_COMMIT_BRANCH == "production"'
-      when: always
-
-    # Selain itu jangan buat pipeline
     - when: never
 
 include:
-  # khusus MR (notif)
-  - local: "ci/merge_request.yml"
-    rules:
-      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-
-  # khusus push ke branch env
   - local: "ci/development.yml"
     rules:
+      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       - if: '$CI_COMMIT_BRANCH == "development"'
 
   - local: "ci/staging.yml"

ci/development.yml

@@ -4,14 +4,9 @@ stages:
 deploy-dev:
   stage: deploy
   image: alpine:3.20
-
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "development"'
-      when: on_success
-    - when: never
-
   variables:
     DEPLOY_APP: "LTI-MBUGROUP"
+    # Opsional: kalau pakai submodule, ini bikin clone submodule pakai SSH juga
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_DEPTH: "1"
 
@@ -32,6 +27,7 @@ deploy-dev:
 
   script:
     - echo "🚀 Deploying latest code to $SERVER_USER@$SERVER_IP"
+
     - >
       if ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
         set -e
@@ -87,5 +83,8 @@ deploy-dev:
       curl -sS -H "Content-Type: application/json" \
         -d @payload.json "$DISCORD_WEBHOOK_URL";
 
+  only:
+    - development
+
   environment:
     name: development

ci/merge_request.yml

@@ -1,48 +0,0 @@
-stages:
-  - notify
-
-notify_discord_on_mr_request_main_dev:
-  stage: notify
-  image: alpine:3.20
-  rules:
-    # hanya MR yang target ke main atau development
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "development")'
-      when: on_success
-    - when: never
-
-  script:
-    - apk add --no-cache curl jq coreutils
-    - |
-      TIME_HUMAN="$(date '+%d/%m/%y, %H.%M')"
-      TIME_ISO="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
-
-      TITLE="${CI_MERGE_REQUEST_TITLE}"
-      IID="!${CI_MERGE_REQUEST_IID}"
-      USER_LINE="${GITLAB_USER_NAME} (${GITLAB_USER_LOGIN})"
-      PROJECT_PATH="${CI_PROJECT_PATH}"
-      USERNAME="${GITLAB_USER_LOGIN}"
-      MR_URL="${CI_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}"
-
-      DESC="$(printf "**%s**\n\n%s opened merge request %s %s\n%s" \
-        "$USERNAME" "$USER_LINE" "$IID" "$TITLE" "$TIME_HUMAN")"
-
-      payload=$(jq -n \
-        --arg desc "$DESC" \
-        --arg project "$PROJECT_PATH" \
-        --arg timeiso "$TIME_ISO" \
-        --arg mrurl "$MR_URL" \
-        '{
-          "username": "Mock-api - Merge Requests",
-          "embeds": [
-            {
-              "description": ($desc + "\n" + $mrurl),
-              "color": 15105570,
-              "footer": { "text": $project },
-              "timestamp": $timeiso
-            }
-          ]
-        }')
-
-      curl -sS -H "Content-Type: application/json" \
-        -d "$payload" \
-        "$DISCORD_WEBHOOK_URL"

ci/production.yml

@@ -1,6 +1,6 @@
 stages:
   - build
-  - migrate
+#  - migrate
   - deploy
   - seed
 
@@ -8,6 +8,12 @@ default:
   tags:
     - self-hosted-prod
 
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+      when: always
+    - when: never
+
 variables:
   DOCKER_BUILDKIT: "1"
 
@@ -24,9 +30,7 @@ variables:
 build_production:
   stage: build
   rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
   script: |
     set -e
     docker info
@@ -43,72 +47,44 @@ build_production:
     docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
     docker push "$IMAGE_LATEST"
 
+
 # =========================
-# MIGRATE (PRODUCTION)
+# MIGRATE (PRODUCTION - MANUAL)
 # =========================
-migrate_production:
+#migrate_production:
-  stage: migrate
+#  stage: migrate
-  rules:
+#  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
+#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: on_success
+#      when: manual
-    - when: never
+#      allow_failure: false
-  needs:
+#  needs:
-    - job: build_production
+#    - job: build_production
-      artifacts: false
+#      artifacts: false
-  script: |
+#  script: |
-    set -e
+#    set -e
-    echo "✅ Running migrations (production) ..."
+#    cd /opt/deploy/lti
+#    test -f .env || (echo "❌ .env not found" && exit 1)
 
-    cd "$DEPLOY_DIR"
+#   set -a
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
+#    . ./.env
-    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
+#    set +a
 
-    set -a
+    # Validasi env wajib
-    . ./.env
+#    : "${DB_HOST:?DB_HOST not set}"
-    set +a
+#    : "${DB_PORT:?DB_PORT not set}"
+#    : "${DB_USER:?DB_USER not set}"
+#    : "${DB_PASSWORD:?DB_PASSWORD not set}"
+#    : "${DB_NAME:?DB_NAME not set}"
 
-    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
+#    DB_SSLMODE="${DB_SSLMODE:-require}"
-    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
+#    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE}"
-    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)
 
-    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
+#   echo "✅ Running migrations (production)..."
-    echo "✅ DATABASE_URL=$DATABASE_URL"
+#    docker run --rm \
+#      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
+#      migrate/migrate:v4.15.2 \
+#      -path=/migrations -database "$DATABASE_URL" up
 
-    # NOTE: pastikan nama servicenya benar untuk production (ini sebelumnya masih stg-*)
-    docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
-
-    COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
-    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 "✅ 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"
-
-    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"
 
 # =========================
 # DEPLOY (AUTO)
@@ -116,10 +92,10 @@ migrate_production:
 deploy_production:
   stage: deploy
   rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
   needs:
+#    - job: migrate_production
+#      artifacts: false
     - job: build_production
       artifacts: false
   script: |
@@ -135,6 +111,7 @@ deploy_production:
     docker compose -f "$COMPOSE_FILE" up -d --force-recreate
     docker image prune -f
 
+
 # =========================
 # SEED (MANUAL)
 # =========================
@@ -143,10 +120,9 @@ seed_production:
   rules:
     - if: '$CI_COMMIT_BRANCH == "production"'
       when: manual
-    - when: never
   script: |
     set -e
-    cd "$DEPLOY_DIR"
+    cd /opt/deploy/lti
     test -f .env || (echo "❌ .env not found" && exit 1)
 
     echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"

ci/staging.yml

@@ -8,6 +8,12 @@ default:
   tags:
     - self-hosted-stg
 
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
+      when: always
+    - when: never
+
 variables:
   DOCKER_BUILDKIT: "1"
 
@@ -24,9 +30,7 @@ variables:
 build_staging:
   stage: build
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
   script: |
     set -e
     docker info
@@ -43,15 +47,14 @@ build_staging:
     docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
     docker push "$IMAGE_LATEST"
 
+
 # =========================
 # MIGRATE (AUTO)
 # =========================
 migrate_staging:
   stage: migrate
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
   needs:
     - job: build_staging
       artifacts: false
@@ -63,10 +66,12 @@ migrate_staging:
     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)
 
+    # ✅ load env dari server
     set -a
     . ./.env
     set +a
 
+    # ✅ 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)
@@ -76,17 +81,21 @@ migrate_staging:
     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"
 
@@ -102,6 +111,7 @@ migrate_staging:
 
     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
@@ -114,15 +124,14 @@ migrate_staging:
 
     echo "✅ Migration applied successfully"
 
+
 # =========================
 # DEPLOY (AUTO)
 # =========================
 deploy_staging:
   stage: deploy
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
   needs:
     - job: migrate_staging
       artifacts: false
@@ -141,18 +150,18 @@ deploy_staging:
     docker compose -f "$COMPOSE_FILE" up -d --force-recreate
     docker image prune -f
 
+
 # =========================
 # SEED (MANUAL)
 # =========================
 seed_staging:
   stage: seed
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: manual
-    - when: never
   needs:
     - job: deploy_staging
       artifacts: false
+  when: manual
   allow_failure: false
   script: |
     set -e
@@ -161,4 +170,4 @@ seed_staging:
     test -f .env || (echo "❌ .env not found" && exit 1)
 
     docker compose -f "$COMPOSE_FILE" pull seed || true
-    docker compose -f "$COMPOSE_FILE" run --rm seed
+    docker compose -f "$COMPOSE_FILE" run --rm seed%

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"

cmd/delete-adjustments/main.go

@@ -1,442 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-type adjustmentRow struct {
-	ID                 uint      `gorm:"column:id"`
-	ProductWarehouseID uint      `gorm:"column:product_warehouse_id"`
-	ProductID          uint      `gorm:"column:product_id"`
-	FunctionCode       string    `gorm:"column:function_code"`
-	TotalQty           float64   `gorm:"column:total_qty"`
-	UsageQty           float64   `gorm:"column:usage_qty"`
-	PendingQty         float64   `gorm:"column:pending_qty"`
-	StockLogIncrease   float64   `gorm:"column:stock_log_increase"`
-	StockLogDecrease   float64   `gorm:"column:stock_log_decrease"`
-	CreatedAt          time.Time `gorm:"column:created_at"`
-}
-
-type routeResolution struct {
-	FlagGroupCode string `gorm:"column:flag_group_code"`
-	Lane          string `gorm:"column:lane"`
-	FunctionCode  string `gorm:"column:function_code"`
-}
-
-func main() {
-	var (
-		idsRaw string
-		apply  bool
-	)
-
-	flag.StringVar(&idsRaw, "ids", "", "Comma-separated adjustment IDs (required), example: 1,2")
-	flag.BoolVar(&apply, "apply", false, "Apply delete. If false, run as dry-run")
-	flag.Parse()
-
-	ids, err := parseIDs(idsRaw)
-	if err != nil {
-		log.Fatalf("invalid --ids: %v", err)
-	}
-	if len(ids) == 0 {
-		log.Fatal("--ids is required")
-	}
-
-	ctx := context.Background()
-	db := database.Connect(config.DBHost, config.DBName)
-
-	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
-	stockAllocRepo := commonRepo.NewStockAllocationRepository(db)
-	fifoSvc := commonSvc.NewFifoService(db, stockAllocRepo, productWarehouseRepo, nil)
-	fifoStockV2Svc := commonSvc.NewFifoStockV2Service(db, nil)
-	if err := registerAdjustmentFIFO(fifoSvc); err != nil {
-		log.Fatalf("failed to register adjustment fifo config: %v", err)
-	}
-
-	adjustments, err := loadAdjustments(ctx, db, ids)
-	if err != nil {
-		log.Fatalf("failed to load adjustments: %v", err)
-	}
-	if len(adjustments) == 0 {
-		log.Fatal("no adjustments found for provided IDs")
-	}
-
-	sort.Slice(adjustments, func(i, j int) bool {
-		return adjustments[i].ID < adjustments[j].ID
-	})
-
-	fmt.Printf("Mode: %s\n", modeLabel(apply))
-	fmt.Printf("Adjustments loaded: %d\n\n", len(adjustments))
-
-	success := 0
-	failed := 0
-	skipped := 0
-
-	for _, adj := range adjustments {
-		if strings.TrimSpace(adj.FunctionCode) == "" {
-			fmt.Printf("SKIP adj=%d reason=function_code empty\n", adj.ID)
-			skipped++
-			continue
-		}
-
-		route, err := resolveRouteByFunctionCode(ctx, db, adj.ProductID, strings.ToUpper(strings.TrimSpace(adj.FunctionCode)))
-		if err != nil {
-			fmt.Printf("FAIL adj=%d error=resolve route: %v\n", adj.ID, err)
-			failed++
-			continue
-		}
-
-		switch route.Lane {
-		case "USABLE":
-			desiredQty := adj.UsageQty + adj.PendingQty
-			if desiredQty <= 0 && adj.StockLogDecrease > 0 {
-				desiredQty = adj.StockLogDecrease
-			}
-
-			activeAlloc, err := countActiveUsableAllocations(ctx, db, fifo.UsableKeyAdjustmentOut.String(), adj.ID)
-			if err != nil {
-				fmt.Printf("FAIL adj=%d error=count usable allocations: %v\n", adj.ID, err)
-				failed++
-				continue
-			}
-
-			fmt.Printf(
-				"PLAN adj=%d lane=USABLE function=%s usage=%.3f pending=%.3f active_alloc=%d action=reflow_to_zero+delete\n",
-				adj.ID,
-				route.FunctionCode,
-				adj.UsageQty,
-				adj.PendingQty,
-				activeAlloc,
-			)
-
-			if !apply {
-				skipped++
-				continue
-			}
-
-			err = db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-				reflowReq := commonSvc.FifoStockV2ReflowRequest{
-					FlagGroupCode:      route.FlagGroupCode,
-					ProductWarehouseID: adj.ProductWarehouseID,
-					Usable: commonSvc.FifoStockV2Ref{
-						ID:            adj.ID,
-						LegacyTypeKey: fifo.UsableKeyAdjustmentOut.String(),
-						FunctionCode:  route.FunctionCode,
-					},
-					DesiredQty:     0,
-					IdempotencyKey: fmt.Sprintf("delete-adjustment-usable-%d-%d", adj.ID, time.Now().UnixNano()),
-					Tx:             tx,
-				}
-				if _, err := fifoStockV2Svc.Reflow(ctx, reflowReq); err != nil {
-					return fmt.Errorf("reflow usable to zero: %w", err)
-				}
-
-				if err := hardDeleteUsableAllocations(ctx, tx, fifo.UsableKeyAdjustmentOut.String(), adj.ID); err != nil {
-					return err
-				}
-				if err := hardDeleteAdjustmentStockLogs(ctx, tx, adj.ID); err != nil {
-					return err
-				}
-				if err := hardDeleteAdjustment(ctx, tx, adj.ID); err != nil {
-					return err
-				}
-				return nil
-			})
-			if err != nil {
-				fmt.Printf("FAIL adj=%d error=%v\n", adj.ID, err)
-				failed++
-				continue
-			}
-
-			fmt.Printf("DONE adj=%d deleted\n", adj.ID)
-			success++
-
-		case "STOCKABLE":
-			removeQty := adj.TotalQty
-			if removeQty <= 0 && adj.StockLogIncrease > 0 {
-				removeQty = adj.StockLogIncrease
-			}
-
-			activeAlloc, err := countActiveStockableAllocations(ctx, db, fifo.StockableKeyAdjustmentIn.String(), adj.ID)
-			if err != nil {
-				fmt.Printf("FAIL adj=%d error=count stockable allocations: %v\n", adj.ID, err)
-				failed++
-				continue
-			}
-			if activeAlloc > 0 {
-				fmt.Printf(
-					"FAIL adj=%d reason=stockable still allocated active_alloc=%d action=delete blocked\n",
-					adj.ID,
-					activeAlloc,
-				)
-				failed++
-				continue
-			}
-
-			fmt.Printf(
-				"PLAN adj=%d lane=STOCKABLE function=%s total=%.3f remove_qty=%.3f action=reverse_stock+delete\n",
-				adj.ID,
-				route.FunctionCode,
-				adj.TotalQty,
-				removeQty,
-			)
-
-			if !apply {
-				skipped++
-				continue
-			}
-
-			err = db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-				if removeQty > 0 {
-					if err := fifoSvc.AdjustStockableQuantity(ctx, commonSvc.StockAdjustRequest{
-						StockableKey:       fifo.StockableKeyAdjustmentIn,
-						StockableID:        adj.ID,
-						ProductWarehouseID: adj.ProductWarehouseID,
-						Quantity:           -removeQty,
-						Tx:                 tx,
-					}); err != nil {
-						return fmt.Errorf("reverse stockable quantity: %w", err)
-					}
-				}
-
-				if err := hardDeleteStockableAllocations(ctx, tx, fifo.StockableKeyAdjustmentIn.String(), adj.ID); err != nil {
-					return err
-				}
-				if err := hardDeleteAdjustmentStockLogs(ctx, tx, adj.ID); err != nil {
-					return err
-				}
-				if err := hardDeleteAdjustment(ctx, tx, adj.ID); err != nil {
-					return err
-				}
-				return nil
-			})
-			if err != nil {
-				fmt.Printf("FAIL adj=%d error=%v\n", adj.ID, err)
-				failed++
-				continue
-			}
-
-			fmt.Printf("DONE adj=%d deleted\n", adj.ID)
-			success++
-
-		default:
-			fmt.Printf("SKIP adj=%d reason=unsupported lane=%s\n", adj.ID, route.Lane)
-			skipped++
-		}
-	}
-
-	fmt.Println()
-	fmt.Printf("Summary: success=%d failed=%d skipped=%d\n", success, failed, skipped)
-	if failed > 0 {
-		os.Exit(1)
-	}
-}
-
-func registerAdjustmentFIFO(fifoSvc commonSvc.FifoService) error {
-	if err := fifoSvc.RegisterStockable(fifo.StockableConfig{
-		Key:   fifo.StockableKeyAdjustmentIn,
-		Table: "adjustment_stocks",
-		Columns: fifo.StockableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			TotalQuantity:      "total_qty",
-			TotalUsedQuantity:  "total_used",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	}); err != nil && !strings.Contains(strings.ToLower(err.Error()), "already registered") {
-		return err
-	}
-
-	if err := fifoSvc.RegisterUsable(fifo.UsableConfig{
-		Key:   fifo.UsableKeyAdjustmentOut,
-		Table: "adjustment_stocks",
-		Columns: fifo.UsableColumns{
-			ID:                 "id",
-			ProductWarehouseID: "product_warehouse_id",
-			UsageQuantity:      "usage_qty",
-			PendingQuantity:    "pending_qty",
-			CreatedAt:          "created_at",
-		},
-		OrderBy: []string{"created_at ASC", "id ASC"},
-	}); err != nil && !strings.Contains(strings.ToLower(err.Error()), "already registered") {
-		return err
-	}
-	return nil
-}
-
-func modeLabel(apply bool) string {
-	if apply {
-		return "APPLY"
-	}
-	return "DRY-RUN"
-}
-
-func parseIDs(raw string) ([]uint, error) {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		return nil, nil
-	}
-
-	parts := strings.Split(raw, ",")
-	out := make([]uint, 0, len(parts))
-	seen := map[uint]struct{}{}
-
-	for _, part := range parts {
-		part = strings.TrimSpace(part)
-		if part == "" {
-			continue
-		}
-		v, err := strconv.ParseUint(part, 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("invalid id %q", part)
-		}
-		if v == 0 {
-			return nil, fmt.Errorf("id must be > 0: %q", part)
-		}
-		id := uint(v)
-		if _, ok := seen[id]; ok {
-			continue
-		}
-		seen[id] = struct{}{}
-		out = append(out, id)
-	}
-	return out, nil
-}
-
-func loadAdjustments(ctx context.Context, db *gorm.DB, ids []uint) ([]adjustmentRow, error) {
-	var rows []adjustmentRow
-	err := db.WithContext(ctx).
-		Table("adjustment_stocks a").
-		Select(`
-			a.id,
-			a.product_warehouse_id,
-			pw.product_id,
-			a.function_code,
-			COALESCE(a.total_qty, 0) AS total_qty,
-			COALESCE(a.usage_qty, 0) AS usage_qty,
-			COALESCE(a.pending_qty, 0) AS pending_qty,
-			COALESCE((
-				SELECT sl.increase
-				FROM stock_logs sl
-				WHERE sl.loggable_type = 'ADJUSTMENT'
-					AND sl.loggable_id = a.id
-				ORDER BY sl.id DESC
-				LIMIT 1
-			), 0) AS stock_log_increase,
-			COALESCE((
-				SELECT sl.decrease
-				FROM stock_logs sl
-				WHERE sl.loggable_type = 'ADJUSTMENT'
-					AND sl.loggable_id = a.id
-				ORDER BY sl.id DESC
-				LIMIT 1
-			), 0) AS stock_log_decrease,
-			a.created_at
-		`).
-		Joins("JOIN product_warehouses pw ON pw.id = a.product_warehouse_id").
-		Where("a.id IN ?", ids).
-		Find(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-	return rows, nil
-}
-
-func resolveRouteByFunctionCode(ctx context.Context, db *gorm.DB, productID uint, functionCode string) (*routeResolution, error) {
-	var rows []routeResolution
-	err := db.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules rr").
-		Select("rr.flag_group_code, rr.lane, rr.function_code").
-		Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
-		Where("rr.is_active = TRUE").
-		Where("rr.function_code = ?", functionCode).
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM flags f
-				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-				WHERE f.flagable_type = ?
-					AND f.flagable_id = ?
-					AND fm.flag_group_code = rr.flag_group_code
-			)
-		`, entity.FlagableTypeProduct, productID).
-		Order("CASE WHEN rr.source_table = 'adjustment_stocks' THEN 0 ELSE 1 END ASC").
-		Order("rr.id ASC").
-		Find(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-	if len(rows) == 0 {
-		return nil, fmt.Errorf("no route found for product_id=%d function_code=%s", productID, functionCode)
-	}
-
-	selected := rows[0]
-	for _, row := range rows {
-		if row.Lane != selected.Lane {
-			return nil, fmt.Errorf("ambiguous lane for product_id=%d function_code=%s", productID, functionCode)
-		}
-	}
-	selected.FunctionCode = functionCode
-	return &selected, nil
-}
-
-func countActiveUsableAllocations(ctx context.Context, db *gorm.DB, usableType string, usableID uint) (int64, error) {
-	var count int64
-	err := db.WithContext(ctx).
-		Table("stock_allocations").
-		Where("usable_type = ? AND usable_id = ?", usableType, usableID).
-		Where("status = ?", entity.StockAllocationStatusActive).
-		Count(&count).Error
-	return count, err
-}
-
-func countActiveStockableAllocations(ctx context.Context, db *gorm.DB, stockableType string, stockableID uint) (int64, error) {
-	var count int64
-	err := db.WithContext(ctx).
-		Table("stock_allocations").
-		Where("stockable_type = ? AND stockable_id = ?", stockableType, stockableID).
-		Where("status = ?", entity.StockAllocationStatusActive).
-		Count(&count).Error
-	return count, err
-}
-
-func hardDeleteUsableAllocations(ctx context.Context, tx *gorm.DB, usableType string, usableID uint) error {
-	return tx.WithContext(ctx).
-		Exec("DELETE FROM stock_allocations WHERE usable_type = ? AND usable_id = ?", usableType, usableID).
-		Error
-}
-
-func hardDeleteStockableAllocations(ctx context.Context, tx *gorm.DB, stockableType string, stockableID uint) error {
-	return tx.WithContext(ctx).
-		Exec("DELETE FROM stock_allocations WHERE stockable_type = ? AND stockable_id = ?", stockableType, stockableID).
-		Error
-}
-
-func hardDeleteAdjustmentStockLogs(ctx context.Context, tx *gorm.DB, adjustmentID uint) error {
-	return tx.WithContext(ctx).
-		Exec("DELETE FROM stock_logs WHERE loggable_type = ? AND loggable_id = ?", "ADJUSTMENT", adjustmentID).
-		Error
-}
-
-func hardDeleteAdjustment(ctx context.Context, tx *gorm.DB, adjustmentID uint) error {
-	return tx.WithContext(ctx).
-		Exec("DELETE FROM adjustment_stocks WHERE id = ?", adjustmentID).
-		Error
-}

cmd/reflow-adjustments/main.go

@@ -1,343 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-type adjustmentRow struct {
-	ID                 uint      `gorm:"column:id"`
-	ProductWarehouseID uint      `gorm:"column:product_warehouse_id"`
-	ProductID          uint      `gorm:"column:product_id"`
-	FunctionCode       string    `gorm:"column:function_code"`
-	UsageQty           float64   `gorm:"column:usage_qty"`
-	PendingQty         float64   `gorm:"column:pending_qty"`
-	StockLogIncrease   float64   `gorm:"column:stock_log_increase"`
-	StockLogDecrease   float64   `gorm:"column:stock_log_decrease"`
-	CreatedAt          time.Time `gorm:"column:created_at"`
-}
-
-type routeResolution struct {
-	FlagGroupCode string `gorm:"column:flag_group_code"`
-	Lane          string `gorm:"column:lane"`
-	FunctionCode  string `gorm:"column:function_code"`
-	SourceTable   string `gorm:"column:source_table"`
-	LegacyTypeKey string `gorm:"column:legacy_type_key"`
-}
-
-func main() {
-	var (
-		idsRaw                 string
-		apply                  bool
-		asOfCreatedAt          bool
-		compensateMissingAlloc bool
-	)
-
-	flag.StringVar(&idsRaw, "ids", "", "Comma-separated adjustment IDs (required), example: 1,2")
-	flag.BoolVar(&apply, "apply", false, "Apply changes. If false, run as dry-run")
-	flag.BoolVar(&asOfCreatedAt, "as-of-created-at", true, "Use adjustment created_at as reflow AsOf boundary")
-	flag.BoolVar(&compensateMissingAlloc, "compensate-missing-alloc", true, "When active allocations are missing and usage_qty > 0, temporarily add back usage_qty before reflow")
-	flag.Parse()
-
-	ids, err := parseIDs(idsRaw)
-	if err != nil {
-		log.Fatalf("invalid --ids: %v", err)
-	}
-	if len(ids) == 0 {
-		log.Fatal("--ids is required")
-	}
-
-	ctx := context.Background()
-	db := database.Connect(config.DBHost, config.DBName)
-	fifoStockV2Svc := commonSvc.NewFifoStockV2Service(db, nil)
-
-	adjustments, err := loadAdjustments(ctx, db, ids)
-	if err != nil {
-		log.Fatalf("failed to load adjustments: %v", err)
-	}
-	if len(adjustments) == 0 {
-		log.Fatal("no adjustments found for provided IDs")
-	}
-
-	sort.Slice(adjustments, func(i, j int) bool {
-		return adjustments[i].ID < adjustments[j].ID
-	})
-
-	fmt.Printf("Mode: %s\n", modeLabel(apply))
-	fmt.Printf("Adjustments loaded: %d\n\n", len(adjustments))
-
-	success := 0
-	failed := 0
-	skipped := 0
-
-	for _, adj := range adjustments {
-		if strings.TrimSpace(adj.FunctionCode) == "" {
-			fmt.Printf("SKIP adj=%d reason=function_code empty\n", adj.ID)
-			skipped++
-			continue
-		}
-
-		route, err := resolveRouteByFunctionCode(ctx, db, adj.ProductID, strings.ToUpper(strings.TrimSpace(adj.FunctionCode)))
-		if err != nil {
-			fmt.Printf("FAIL adj=%d error=resolve route: %v\n", adj.ID, err)
-			failed++
-			continue
-		}
-		if route.Lane != "USABLE" {
-			fmt.Printf("SKIP adj=%d reason=lane=%s (not USABLE)\n", adj.ID, route.Lane)
-			skipped++
-			continue
-		}
-
-		desiredQty := adj.UsageQty + adj.PendingQty
-		desiredQtySource := "usage+pending"
-		if desiredQty <= 0 && adj.StockLogDecrease > 0 {
-			desiredQty = adj.StockLogDecrease
-			desiredQtySource = "stock_log.decrease"
-		}
-		if desiredQty <= 0 {
-			fmt.Printf(
-				"SKIP adj=%d reason=no usable qty (usage=%.3f pending=%.3f stock_log.decrease=%.3f)\n",
-				adj.ID,
-				adj.UsageQty,
-				adj.PendingQty,
-				adj.StockLogDecrease,
-			)
-			skipped++
-			continue
-		}
-
-		usableType := fifo.UsableKeyAdjustmentOut.String()
-		if route.SourceTable == "adjustment_stocks" && strings.TrimSpace(route.LegacyTypeKey) != "" {
-			usableType = strings.TrimSpace(route.LegacyTypeKey)
-		}
-
-		activeAllocationCount, err := countActiveAllocations(ctx, db, usableType, adj.ID)
-		if err != nil {
-			fmt.Printf("FAIL adj=%d error=count allocations: %v\n", adj.ID, err)
-			failed++
-			continue
-		}
-
-		compensateQty := adj.UsageQty
-		if compensateQty <= 0 && desiredQtySource == "stock_log.decrease" {
-			compensateQty = adj.StockLogDecrease
-		}
-		shouldCompensate := compensateMissingAlloc && activeAllocationCount == 0 && compensateQty > 0
-
-		reflowReq := commonSvc.FifoStockV2ReflowRequest{
-			FlagGroupCode:      route.FlagGroupCode,
-			ProductWarehouseID: adj.ProductWarehouseID,
-			Usable: commonSvc.FifoStockV2Ref{
-				ID:            adj.ID,
-				LegacyTypeKey: usableType,
-				FunctionCode:  route.FunctionCode,
-			},
-			DesiredQty:     desiredQty,
-			IdempotencyKey: fmt.Sprintf("manual-adjustment-reflow-%d-%d", adj.ID, time.Now().UnixNano()),
-		}
-		if asOfCreatedAt {
-			asOf := adj.CreatedAt
-			reflowReq.AsOf = &asOf
-		}
-
-		fmt.Printf(
-			"PLAN adj=%d pw=%d product=%d function=%s group=%s desired=%.3f source=%s active_alloc=%d compensate=%t\n",
-			adj.ID,
-			adj.ProductWarehouseID,
-			adj.ProductID,
-			route.FunctionCode,
-			route.FlagGroupCode,
-			desiredQty,
-			desiredQtySource,
-			activeAllocationCount,
-			shouldCompensate,
-		)
-
-		if !apply {
-			skipped++
-			continue
-		}
-
-		err = db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-			if shouldCompensate {
-				if err := tx.Table("product_warehouses").
-					Where("id = ?", adj.ProductWarehouseID).
-					Update("qty", gorm.Expr("COALESCE(qty,0) + ?", compensateQty)).Error; err != nil {
-					return fmt.Errorf("compensate product_warehouse qty: %w", err)
-				}
-			}
-
-			reflowReq.Tx = tx
-			res, err := fifoStockV2Svc.Reflow(ctx, reflowReq)
-			if err != nil {
-				return err
-			}
-
-			fmt.Printf(
-				"DONE adj=%d rollback=%.3f allocate=%.3f pending=%.3f\n",
-				adj.ID,
-				res.Rollback.ReleasedQty,
-				res.Allocate.AllocatedQty,
-				res.Allocate.PendingQty,
-			)
-			return nil
-		})
-		if err != nil {
-			fmt.Printf("FAIL adj=%d error=%v\n", adj.ID, err)
-			failed++
-			continue
-		}
-
-		success++
-	}
-
-	fmt.Println()
-	fmt.Printf("Summary: success=%d failed=%d skipped=%d\n", success, failed, skipped)
-	if failed > 0 {
-		os.Exit(1)
-	}
-}
-
-func modeLabel(apply bool) string {
-	if apply {
-		return "APPLY"
-	}
-	return "DRY-RUN"
-}
-
-func parseIDs(raw string) ([]uint, error) {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		return nil, nil
-	}
-	parts := strings.Split(raw, ",")
-	ids := make([]uint, 0, len(parts))
-	seen := map[uint]struct{}{}
-
-	for _, part := range parts {
-		part = strings.TrimSpace(part)
-		if part == "" {
-			continue
-		}
-		value, err := strconv.ParseUint(part, 10, 64)
-		if err != nil {
-			return nil, fmt.Errorf("invalid id %q", part)
-		}
-		if value == 0 {
-			return nil, fmt.Errorf("id must be > 0: %q", part)
-		}
-		id := uint(value)
-		if _, ok := seen[id]; ok {
-			continue
-		}
-		seen[id] = struct{}{}
-		ids = append(ids, id)
-	}
-
-	return ids, nil
-}
-
-func loadAdjustments(ctx context.Context, db *gorm.DB, ids []uint) ([]adjustmentRow, error) {
-	var rows []adjustmentRow
-	err := db.WithContext(ctx).
-		Table("adjustment_stocks a").
-		Select(`
-				a.id,
-				a.product_warehouse_id,
-				pw.product_id,
-				a.function_code,
-				COALESCE(a.usage_qty, 0) AS usage_qty,
-				COALESCE(a.pending_qty, 0) AS pending_qty,
-				COALESCE((
-					SELECT sl.increase
-					FROM stock_logs sl
-					WHERE sl.loggable_type = 'ADJUSTMENT'
-						AND sl.loggable_id = a.id
-					ORDER BY sl.id DESC
-					LIMIT 1
-				), 0) AS stock_log_increase,
-				COALESCE((
-					SELECT sl.decrease
-					FROM stock_logs sl
-					WHERE sl.loggable_type = 'ADJUSTMENT'
-						AND sl.loggable_id = a.id
-					ORDER BY sl.id DESC
-					LIMIT 1
-				), 0) AS stock_log_decrease,
-				a.created_at
-			`).
-		Joins("JOIN product_warehouses pw ON pw.id = a.product_warehouse_id").
-		Where("a.id IN ?", ids).
-		Find(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-	return rows, nil
-}
-
-func resolveRouteByFunctionCode(ctx context.Context, db *gorm.DB, productID uint, functionCode string) (*routeResolution, error) {
-	var rows []routeResolution
-	err := db.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules rr").
-		Select("rr.flag_group_code, rr.lane, rr.function_code, rr.source_table, rr.legacy_type_key").
-		Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
-		Where("rr.is_active = TRUE").
-		Where("rr.function_code = ?", functionCode).
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM flags f
-				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-				WHERE f.flagable_type = ?
-					AND f.flagable_id = ?
-					AND fm.flag_group_code = rr.flag_group_code
-			)
-		`, entity.FlagableTypeProduct, productID).
-		Order("CASE WHEN rr.source_table = 'adjustment_stocks' THEN 0 ELSE 1 END ASC").
-		Order("rr.id ASC").
-		Find(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-	if len(rows) == 0 {
-		return nil, fmt.Errorf("no route found for product_id=%d function_code=%s", productID, functionCode)
-	}
-
-	selected := rows[0]
-	for _, row := range rows {
-		if row.Lane != selected.Lane {
-			return nil, fmt.Errorf("ambiguous lane for product_id=%d function_code=%s", productID, functionCode)
-		}
-	}
-
-	selected.FunctionCode = functionCode
-	return &selected, nil
-}
-
-func countActiveAllocations(ctx context.Context, db *gorm.DB, usableType string, usableID uint) (int64, error) {
-	var count int64
-	err := db.WithContext(ctx).
-		Table("stock_allocations").
-		Where("usable_type = ? AND usable_id = ?", usableType, usableID).
-		Where("status = ?", entity.StockAllocationStatusActive).
-		Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}

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

@@ -139,11 +139,12 @@ func (r *HppRepositoryImpl) GetOvkUsageCost(ctx context.Context, projectFlockKan
 		Select("COALESCE(SUM(rs.usage_qty * COALESCE(pi.price, 0)), 0)").
 		Joins("JOIN recording_stocks AS rs ON rs.recording_id = r.id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
+		Joins("JOIN flags AS f ON f.flagable_id = pw.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String()).
 		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
 		Where("r.record_datetime <= ?", *date).
-		Where("EXISTS (SELECT 1 FROM flags f WHERE f.flagable_id = pw.product_id AND f.flagable_type = ? AND f.name IN ?)", entity.FlagableTypeProduct, flags).
+		Where("f.name IN ?", flags).
 		Scan(&total).Error
 	if err != nil {
 		return 0, err
@@ -195,10 +196,10 @@ func (r *HppRepositoryImpl) GetPulletCost(ctx context.Context, projectFlockKanda
 }
 
 func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error) {
-	if date == nil {
+	// if date == nil {
-		now := time.Now()
+	// 	now := time.Now()
-		date = &now
+	// 	date = &now
-	}
+	// }
 
 	var totals struct {
 		TotalPieces   float64
@@ -252,7 +253,7 @@ func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangI
 		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)
+		Where("mdp.delivery_date = ?", *startDate)
 
 	var totals struct {
 		TotalPieces float64
@@ -297,9 +298,6 @@ func (r *HppRepositoryImpl) GetTransferSourceSummary(ctx context.Context, projec
 		Table("laying_transfer_targets AS ltt").
 		Select("lt.from_project_flock_id AS project_flock_id, COALESCE(SUM(ltt.total_qty), 0) AS total_qty").
 		Joins("JOIN laying_transfers AS lt ON lt.id = ltt.laying_transfer_id").
-		Where("lt.deleted_at IS NULL").
-		Where("ltt.deleted_at IS NULL").
-		Where("lt.executed_at IS NOT NULL").
 		Where("ltt.target_project_flock_kandang_id = ?", projectFlockKandangId).
 		Group("lt.from_project_flock_id").
 		Scan(&summary).Error

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, orderByDate string) ([]entity.Approval, int64, error)
+	List(ctx context.Context, module string, approvableID *uint, page, limit int, search 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,14 +70,9 @@ 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
@@ -95,7 +90,7 @@ func (s *approvalService) List(
 		func(db *gorm.DB) *gorm.DB {
 			query := db.
 				Where("approvable_type = ?", module).
-				Order("action_at " + orderByDate).
+				Order("action_at DESC").
 				Preload("ActionUser")
 
 			if approvableID != nil {

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

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

@@ -26,7 +26,6 @@ type FifoService interface {
 	Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error)
 	ReleaseUsage(ctx context.Context, req StockReleaseRequest) error
 	AdjustStockableQuantity(ctx context.Context, req StockAdjustRequest) error
-	ResolvePending(ctx context.Context, req PendingResolveRequest) ([]PendingResolution, error)
 }
 
 type fifoService struct {
@@ -112,11 +111,6 @@ type PendingResolution struct {
 	Quantity  float64
 }
 
-type PendingResolveRequest struct {
-	ProductWarehouseID uint
-	Tx                 *gorm.DB
-}
-
 type StockReplenishResult struct {
 	AddedQuantity    float64
 	PendingResolved  []PendingResolution
@@ -153,7 +147,6 @@ type StockReleaseRequest struct {
 	Reason    *string
 	Tx        *gorm.DB
 }
-
 func (s *fifoService) AdjustStockableQuantity(ctx context.Context, req StockAdjustRequest) error {
 	if req.StockableID == 0 || strings.TrimSpace(req.StockableKey.String()) == "" {
 		return errors.New("stockable key and id are required")
@@ -233,23 +226,6 @@ func (s *fifoService) Replenish(ctx context.Context, req StockReplenishRequest)
 	return result, nil
 }
 
-func (s *fifoService) ResolvePending(ctx context.Context, req PendingResolveRequest) ([]PendingResolution, error) {
-	if req.ProductWarehouseID == 0 {
-		return nil, errors.New("product warehouse id is required")
-	}
-
-	var resolved []PendingResolution
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		var err error
-		resolved, err = s.resolvePendingForWarehouse(ctx, tx, req.ProductWarehouseID)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-	return resolved, nil
-}
-
 func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error) {
 	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
 		return nil, errors.New("usable key and id are required")
@@ -332,7 +308,7 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St
 			}
 
 			if reductionTarget > 0 {
-				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget, productWarehouseID)
+				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget)
 				if err != nil {
 					return err
 				}
@@ -379,7 +355,7 @@ func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest)
 		}
 		var usageDelta, pendingDelta float64
 		if ctxRow.UsageQty > 0 {
-			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty, ctxRow.ProductWarehouseID); err != nil {
+			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty); err != nil {
 				return err
 			}
 			usageDelta -= ctxRow.UsageQty
@@ -745,7 +721,6 @@ func (s *fifoService) releaseUsagePortion(
 	usableKey fifo.UsableKey,
 	usableID uint,
 	target float64,
-	expectedWarehouseID uint,
 ) (float64, error) {
 	if target <= 0 {
 		return 0, nil
@@ -761,18 +736,6 @@ func (s *fifoService) releaseUsagePortion(
 	if len(allocations) == 0 {
 		return 0, nil
 	}
-	for i := range allocations {
-		alloc := &allocations[i]
-		if expectedWarehouseID == 0 || alloc.ProductWarehouseId == expectedWarehouseID {
-			continue
-		}
-		if err := tx.Model(&entities.StockAllocation{}).
-			Where("id = ?", alloc.Id).
-			Update("product_warehouse_id", expectedWarehouseID).Error; err != nil {
-			return 0, err
-		}
-		alloc.ProductWarehouseId = expectedWarehouseID
-	}
 
 	var (
 		remaining            = target
@@ -869,30 +832,30 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 			cfg.Columns.CreatedAt,
 		)
 
-		if cfg.Columns.CreatedAt == cfg.Columns.ID {
+		var rows []struct {
-			var rows []struct {
+			ID        uint
-				ID        uint
+			Pending   float64
-				Pending   float64 `gorm:"column:pending_qty"`
+			CreatedAt time.Time
-				CreatedAt int64   `gorm:"column:created_at"`
+		}
-			}
 
-			query := tx.Table(cfg.Table).
+		query := tx.Table(cfg.Table).
-				Select(selectStmt).
+			Select(selectStmt).
-				Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
+			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
-				Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
+			Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
-				Limit(s.pendingBatchPerUsable)
+			Limit(s.pendingBatchPerUsable)
 
-			if cfg.Scope != nil {
+		if cfg.Scope != nil {
-				query = cfg.Scope(query)
+			query = cfg.Scope(query)
-			}
+		}
 
-			for _, order := range s.orderClauses(cfg.OrderBy) {
+		for _, order := range s.orderClauses(cfg.OrderBy) {
-				query = query.Order(order)
+			query = query.Order(order)
-			}
+		}
 
 		if err := query.Find(&rows).Error; err != nil {
 			return nil, err
 		}
+
 		for _, row := range rows {
 			if row.Pending <= 0 {
 				continue
@@ -902,47 +865,9 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 				Config:    cfg,
 				UsableID:  row.ID,
 				Pending:   row.Pending,
-				CreatedAt: time.Unix(0, row.CreatedAt),
+				CreatedAt: row.CreatedAt,
 			})
 		}
-	} else {
-			var rows []struct {
-				ID        uint
-				Pending   float64   `gorm:"column:pending_qty"`
-				CreatedAt time.Time `gorm:"column:created_at"`
-			}
-
-			query := tx.Table(cfg.Table).
-				Select(selectStmt).
-				Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
-				Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
-				Limit(s.pendingBatchPerUsable)
-
-			if cfg.Scope != nil {
-				query = cfg.Scope(query)
-			}
-
-			for _, order := range s.orderClauses(cfg.OrderBy) {
-				query = query.Order(order)
-			}
-
-			if err := query.Find(&rows).Error; err != nil {
-				return nil, err
-			}
-
-			for _, row := range rows {
-				if row.Pending <= 0 {
-					continue
-				}
-				candidates = append(candidates, pendingCandidate{
-					UsableKey: key,
-					Config:    cfg,
-					UsableID:  row.ID,
-					Pending:   row.Pending,
-					CreatedAt: row.CreatedAt,
-				})
-			}
-		}
 	}
 
 	if len(candidates) == 0 {

internal/common/service/common.fifo_stock_v2.service.go

@@ -1,41 +0,0 @@
-package service
-
-import (
-	"github.com/sirupsen/logrus"
-	fifoStockV2 "gitlab.com/mbugroup/lti-api.git/internal/common/service/fifo_stock_v2"
-	"gorm.io/gorm"
-)
-
-type FifoStockV2Service = fifoStockV2.Service
-
-type FifoStockV2Lane = fifoStockV2.Lane
-
-type FifoStockV2Ref = fifoStockV2.Ref
-
-type FifoStockV2GatherRequest = fifoStockV2.GatherRequest
-
-type FifoStockV2GatherRow = fifoStockV2.GatherRow
-
-type FifoStockV2AllocateRequest = fifoStockV2.AllocateRequest
-
-type FifoStockV2AllocateResult = fifoStockV2.AllocateResult
-
-type FifoStockV2AllocationDetail = fifoStockV2.AllocationDetail
-
-type FifoStockV2RollbackRequest = fifoStockV2.RollbackRequest
-
-type FifoStockV2RollbackResult = fifoStockV2.RollbackResult
-
-type FifoStockV2ReflowRequest = fifoStockV2.ReflowRequest
-
-type FifoStockV2ReflowResult = fifoStockV2.ReflowResult
-
-type FifoStockV2RecalculateRequest = fifoStockV2.RecalculateRequest
-
-type FifoStockV2RecalculateResult = fifoStockV2.RecalculateResult
-
-type FifoStockV2WarehouseDrift = fifoStockV2.WarehouseDrift
-
-func NewFifoStockV2Service(db *gorm.DB, logger *logrus.Logger) FifoStockV2Service {
-	return fifoStockV2.NewService(db, logger)
-}

internal/common/service/fifo_stock_v2/RFC.md

@@ -1,58 +0,0 @@
-# RFC Ringkas: FIFO Stock V2
-
-## Tujuan
-`fifo_stock_v2` adalah engine FIFO baru berbasis konfigurasi `Flag Group + Jalur` yang berjalan paralel dengan v1 tanpa memutus kompatibilitas `stock_allocations`, HPP, dan closing/reporting existing.
-
-## Prinsip
-- V1 tidak dihapus, V2 jalan paralel.
-- Semua operasi transactional.
-- FIFO sorting deterministic lintas tabel.
-- Default over-consume `ALLOW` (pending), exception dapat `BLOCK`.
-- Reflow idempotent.
-- Recalculate bisa memperbaiki drift `product_warehouses.qty`.
-
-## Komponen
-- `fifo_stock_v2_flag_groups`: master grouping flag produk.
-- `fifo_stock_v2_flag_members`: pemetaan flag -> group.
-- `fifo_stock_v2_traits`: trait sort per `table:date_column` (+ optional join date source).
-- `fifo_stock_v2_route_rules`: rule per `flag_group + lane + function + table`.
-- `fifo_stock_v2_overconsume_rules`: policy pending/over-consume.
-- `fifo_stock_v2_operation_log`: idempotency + audit operasi.
-- `fifo_stock_v2_reflow_runs` + checkpoints + shadow allocations: bulk reflow resumable/observable.
-
-## API Service
-- `Gather`: union cross-table berdasarkan route rules + trait sorting.
-- `Allocate`: alokasi lot FIFO ke usable.
-- `Rollback`: batalkan alokasi aktif.
-- `Reflow`: rollback penuh lalu allocate ulang (idempotent).
-- `Recalculate`: rekonsiliasi qty warehouse dari ledger FIFO.
-
-## Deterministic Sorting
-Urutan gather:
-1. `sort_at ASC` (dari trait `date_column`)
-2. `sort_priority ASC`
-3. `source_table ASC`
-4. `source_id ASC`
-
-Fallback waktu: `1970-01-01 00:00:00+00` bila tanggal null.
-
-## Compat Strategy
-- Tetap menulis ke `stock_allocations` dengan tambahan metadata:
-  - `engine_version` (`v1`/`v2`)
-  - `flag_group_code`
-  - `function_code`
-  - `idempotency_key`
-- Query lama yang bergantung `stockable_type/usable_type` tetap berjalan.
-
-## Migration Strategy
-1. Deploy schema + seed v2.
-2. Aktifkan shadow-run comparator v1 vs v2.
-3. Canary cutover per flag group.
-4. Full cutover jika parity aman.
-5. Jalankan bulk reflow existing data.
-
-## Acceptance Criteria Singkat
-- Parity mismatch terkendali pada aggregate + detail alokasi.
-- Tidak ada regression closing/HPP.
-- Drift qty warehouse turun signifikan pasca reflow.
-- Rollback via feature flag memungkinkan kembali ke v1.

internal/common/service/fifo_stock_v2/allocate.go

@@ -1,660 +0,0 @@
-package fifo_stock_v2
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math"
-	"strings"
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type allocationRow struct {
-	ID                 uint      `gorm:"column:id"`
-	ProductWarehouseID uint      `gorm:"column:product_warehouse_id"`
-	StockableType      string    `gorm:"column:stockable_type"`
-	StockableID        uint      `gorm:"column:stockable_id"`
-	UsableType         string    `gorm:"column:usable_type"`
-	UsableID           uint      `gorm:"column:usable_id"`
-	Qty                float64   `gorm:"column:qty"`
-	Status             string    `gorm:"column:status"`
-	CreatedAt          time.Time `gorm:"column:created_at"`
-}
-
-type usableQtySnapshot struct {
-	Usage   float64 `gorm:"column:usage_qty"`
-	Pending float64 `gorm:"column:pending_qty"`
-}
-
-func (s *fifoStockV2Service) Allocate(ctx context.Context, req AllocateRequest) (*AllocateResult, error) {
-	if err := s.validateAllocateRequest(req); err != nil {
-		return nil, err
-	}
-
-	result := &AllocateResult{}
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		if err := s.ensureStockAllocationColumns(tx); err != nil {
-			return err
-		}
-		if err := s.lockShard(tx, req.FlagGroupCode, req.ProductWarehouseID); err != nil {
-			return err
-		}
-
-		hash := requestHash(map[string]any{
-			"flag_group_code":      req.FlagGroupCode,
-			"product_warehouse_id": req.ProductWarehouseID,
-			"usable_type":          req.Usable.LegacyTypeKey,
-			"usable_id":            req.Usable.ID,
-			"need_qty":             req.NeedQty,
-			"as_of":                req.AsOf,
-			"allow_over_consume":   req.AllowOverConsume,
-		})
-		logRow, reused, err := s.beginOperation(
-			tx,
-			OperationAllocate,
-			req.IdempotencyKey,
-			hash,
-			req.ProductWarehouseID,
-			req.FlagGroupCode,
-			req.Usable.LegacyTypeKey,
-			req.Usable.ID,
-		)
-		if err != nil {
-			return err
-		}
-		if reused {
-			if len(logRow.ResultPayload) == 0 {
-				return fmt.Errorf("idempotent allocate has empty payload")
-			}
-			if err := json.Unmarshal(logRow.ResultPayload, result); err != nil {
-				return err
-			}
-			return nil
-		}
-		if logRow != nil {
-			defer func() {
-				if err != nil {
-					s.failOperation(tx, logRow, err)
-				}
-			}()
-		}
-
-		allocated, allocErr := s.allocateInternal(ctx, tx, req)
-		if allocErr != nil {
-			err = allocErr
-			return allocErr
-		}
-		*result = *allocated
-
-		if finishErr := s.finishOperation(tx, logRow, result); finishErr != nil {
-			err = finishErr
-			return finishErr
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (s *fifoStockV2Service) allocateInternal(ctx context.Context, tx *gorm.DB, req AllocateRequest) (*AllocateResult, error) {
-	usableRule, err := s.loadRouteRuleByLegacyType(ctx, tx, LaneUsable, req.FlagGroupCode, req.Usable.LegacyTypeKey)
-	if err != nil {
-		return nil, err
-	}
-
-	allowOverConsume := usableRule.AllowPendingDefault
-	if req.AllowOverConsume != nil {
-		allowOverConsume = *req.AllowOverConsume
-	} else {
-		allowOverConsume, err = s.resolveOverConsume(tx, req.FlagGroupCode, req.Usable.FunctionCode, LaneUsable, allowOverConsume)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	gatherRows, err := s.gatherRows(ctx, tx, GatherRequest{
-		FlagGroupCode:      req.FlagGroupCode,
-		Lane:               LaneStockable,
-		ProductWarehouseID: req.ProductWarehouseID,
-		AsOf:               req.AsOf,
-		Limit:              s.defaultGatherLimit,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	stockableRuleMap, err := s.loadStockableRuleMap(ctx, tx, req.FlagGroupCode)
-	if err != nil {
-		return nil, err
-	}
-
-	now := time.Now()
-	remaining := req.NeedQty
-	result := &AllocateResult{Details: make([]AllocationDetail, 0)}
-
-	for _, lot := range gatherRows {
-		if remaining <= 0 {
-			break
-		}
-		if lot.AvailableQuantity <= 0 {
-			continue
-		}
-		portion := math.Min(remaining, lot.AvailableQuantity)
-		if nearlyZero(portion) {
-			continue
-		}
-
-		allocationInsert := map[string]any{
-			"product_warehouse_id": req.ProductWarehouseID,
-			"stockable_type":       lot.Ref.LegacyTypeKey,
-			"stockable_id":         lot.Ref.ID,
-			"usable_type":          req.Usable.LegacyTypeKey,
-			"usable_id":            req.Usable.ID,
-			"qty":                  portion,
-			"status":               activeAllocationStatus(),
-			"created_at":           now,
-			"updated_at":           now,
-			"engine_version":       "v2",
-			"flag_group_code":      req.FlagGroupCode,
-			"function_code":        req.Usable.FunctionCode,
-		}
-		if strings.TrimSpace(req.IdempotencyKey) != "" {
-			allocationInsert["idempotency_key"] = req.IdempotencyKey
-		}
-		if err := tx.Table("stock_allocations").Create(allocationInsert).Error; err != nil {
-			return nil, err
-		}
-
-		rule, ok := stockableRuleMap[lot.Ref.LegacyTypeKey]
-		if !ok {
-			return nil, fmt.Errorf("missing stockable route rule for type %s", lot.Ref.LegacyTypeKey)
-		}
-		if err := s.adjustStockableUsedQuantity(tx, rule, lot.Ref.ID, portion); err != nil {
-			return nil, err
-		}
-
-		result.Details = append(result.Details, AllocationDetail{
-			StockableType: lot.Ref.LegacyTypeKey,
-			StockableID:   lot.Ref.ID,
-			Qty:           portion,
-			SortAt:        lot.SortAt,
-		})
-
-		remaining -= portion
-		result.AllocatedQty += portion
-	}
-
-	if remaining > 0 {
-		if !allowOverConsume {
-			return nil, fmt.Errorf("%w: requested %.3f, allocated %.3f", ErrInsufficientStock, req.NeedQty, result.AllocatedQty)
-		}
-		result.PendingQty = remaining
-	}
-
-	if err := s.applyUsableDeltas(tx, *usableRule, req.Usable.ID, result.AllocatedQty, result.PendingQty); err != nil {
-		return nil, err
-	}
-	if err := s.adjustProductWarehouseQty(tx, req.ProductWarehouseID, -result.AllocatedQty); err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (s *fifoStockV2Service) Rollback(ctx context.Context, req RollbackRequest) (*RollbackResult, error) {
-	if err := s.validateRollbackRequest(req); err != nil {
-		return nil, err
-	}
-
-	result := &RollbackResult{}
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		if err := s.ensureStockAllocationColumns(tx); err != nil {
-			return err
-		}
-
-		flagGroupCode, err := s.resolveRollbackFlagGroup(ctx, tx, req)
-		if err != nil {
-			return err
-		}
-		if err := s.lockShard(tx, flagGroupCode, req.ProductWarehouseID); err != nil {
-			return err
-		}
-
-		hash := requestHash(map[string]any{
-			"product_warehouse_id": req.ProductWarehouseID,
-			"usable_type":          req.Usable.LegacyTypeKey,
-			"usable_id":            req.Usable.ID,
-			"release_qty":          req.ReleaseQty,
-			"reason":               req.Reason,
-			"flag_group_code":      flagGroupCode,
-		})
-		logRow, reused, beginErr := s.beginOperation(
-			tx,
-			OperationRollback,
-			req.IdempotencyKey,
-			hash,
-			req.ProductWarehouseID,
-			flagGroupCode,
-			req.Usable.LegacyTypeKey,
-			req.Usable.ID,
-		)
-		if beginErr != nil {
-			return beginErr
-		}
-		if reused {
-			if len(logRow.ResultPayload) == 0 {
-				return fmt.Errorf("idempotent rollback has empty payload")
-			}
-			if err := json.Unmarshal(logRow.ResultPayload, result); err != nil {
-				return err
-			}
-			return nil
-		}
-		if logRow != nil {
-			defer func() {
-				if err != nil {
-					s.failOperation(tx, logRow, err)
-				}
-			}()
-		}
-
-		rolled, rollbackErr := s.rollbackInternal(ctx, tx, req, flagGroupCode)
-		if rollbackErr != nil {
-			err = rollbackErr
-			return rollbackErr
-		}
-		*result = *rolled
-
-		if finishErr := s.finishOperation(tx, logRow, result); finishErr != nil {
-			err = finishErr
-			return finishErr
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (s *fifoStockV2Service) rollbackInternal(
-	ctx context.Context,
-	tx *gorm.DB,
-	req RollbackRequest,
-	flagGroupCode string,
-) (*RollbackResult, error) {
-	usableRule, err := s.loadRouteRuleByLegacyType(ctx, tx, LaneUsable, flagGroupCode, req.Usable.LegacyTypeKey)
-	if err != nil {
-		return nil, err
-	}
-
-	allocations, err := s.loadActiveAllocations(tx, req.Usable.LegacyTypeKey, req.Usable.ID, req.ProductWarehouseID)
-	if err != nil {
-		return nil, err
-	}
-	if len(allocations) == 0 {
-		if req.ReleaseQty == nil {
-			if err := s.resetUsableQuantities(tx, *usableRule, req.Usable.ID); err != nil {
-				return nil, err
-			}
-		}
-		return &RollbackResult{}, nil
-	}
-
-	stockableRuleMap, err := s.loadStockableRuleMap(ctx, tx, flagGroupCode)
-	if err != nil {
-		return nil, err
-	}
-
-	target := 0.0
-	for _, alloc := range allocations {
-		target += alloc.Qty
-	}
-	if req.ReleaseQty != nil {
-		if *req.ReleaseQty < 0 {
-			return nil, fmt.Errorf("%w: release qty must be >= 0", ErrInvalidRequest)
-		}
-		target = *req.ReleaseQty
-	}
-	if nearlyZero(target) {
-		return &RollbackResult{}, nil
-	}
-
-	result := &RollbackResult{Details: make([]AllocationDetail, 0)}
-	now := time.Now()
-	remaining := target
-
-	for _, alloc := range allocations {
-		if remaining <= 0 {
-			break
-		}
-		portion := math.Min(remaining, alloc.Qty)
-		if nearlyZero(portion) {
-			continue
-		}
-
-		if nearlyZero(alloc.Qty - portion) {
-			updates := map[string]any{
-				"status":      releasedAllocationStatus(),
-				"released_at": now,
-				"updated_at":  now,
-			}
-			if strings.TrimSpace(req.Reason) != "" {
-				updates["note"] = req.Reason
-			}
-			if err := tx.Table("stock_allocations").Where("id = ?", alloc.ID).Updates(updates).Error; err != nil {
-				return nil, err
-			}
-		} else {
-			if err := tx.Table("stock_allocations").
-				Where("id = ?", alloc.ID).
-				Updates(map[string]any{
-					"qty":        alloc.Qty - portion,
-					"updated_at": now,
-				}).Error; err != nil {
-				return nil, err
-			}
-		}
-
-		stockableRule, ok := stockableRuleMap[alloc.StockableType]
-		if !ok {
-			return nil, fmt.Errorf("missing stockable route rule for type %s", alloc.StockableType)
-		}
-		if err := s.adjustStockableUsedQuantity(tx, stockableRule, alloc.StockableID, -portion); err != nil {
-			return nil, err
-		}
-
-		result.ReleasedQty += portion
-		remaining -= portion
-		result.Details = append(result.Details, AllocationDetail{
-			StockableType: alloc.StockableType,
-			StockableID:   alloc.StockableID,
-			Qty:           portion,
-			SortAt:        alloc.CreatedAt,
-		})
-	}
-
-	if req.ReleaseQty != nil && remaining > 1e-6 {
-		return nil, fmt.Errorf("unable to release %.3f; only %.3f allocation exists", target, result.ReleasedQty)
-	}
-
-	if req.ReleaseQty == nil {
-		if err := s.resetUsableQuantities(tx, *usableRule, req.Usable.ID); err != nil {
-			return nil, err
-		}
-	} else {
-		if err := s.applyUsableDeltas(tx, *usableRule, req.Usable.ID, -result.ReleasedQty, 0); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := s.adjustProductWarehouseQty(tx, req.ProductWarehouseID, result.ReleasedQty); err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*ReflowResult, error) {
-	if strings.TrimSpace(req.FlagGroupCode) == "" || req.ProductWarehouseID == 0 || req.Usable.ID == 0 || strings.TrimSpace(req.Usable.LegacyTypeKey) == "" {
-		return nil, fmt.Errorf("%w: invalid reflow request", ErrInvalidRequest)
-	}
-	if req.DesiredQty < 0 {
-		return nil, fmt.Errorf("%w: desired qty must be >= 0", ErrInvalidRequest)
-	}
-
-	result := &ReflowResult{}
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		if err := s.ensureStockAllocationColumns(tx); err != nil {
-			return err
-		}
-		if err := s.lockShard(tx, req.FlagGroupCode, req.ProductWarehouseID); err != nil {
-			return err
-		}
-
-		hash := requestHash(map[string]any{
-			"flag_group_code":      req.FlagGroupCode,
-			"product_warehouse_id": req.ProductWarehouseID,
-			"usable_type":          req.Usable.LegacyTypeKey,
-			"usable_id":            req.Usable.ID,
-			"desired_qty":          req.DesiredQty,
-			"as_of":                req.AsOf,
-			"allow_over_consume":   req.AllowOverConsume,
-		})
-		logRow, reused, err := s.beginOperation(
-			tx,
-			OperationReflow,
-			req.IdempotencyKey,
-			hash,
-			req.ProductWarehouseID,
-			req.FlagGroupCode,
-			req.Usable.LegacyTypeKey,
-			req.Usable.ID,
-		)
-		if err != nil {
-			return err
-		}
-		if reused {
-			if len(logRow.ResultPayload) == 0 {
-				return fmt.Errorf("idempotent reflow has empty payload")
-			}
-			if err := json.Unmarshal(logRow.ResultPayload, result); err != nil {
-				return err
-			}
-			return nil
-		}
-		if logRow != nil {
-			defer func() {
-				if err != nil {
-					s.failOperation(tx, logRow, err)
-				}
-			}()
-		}
-
-		rollbackRes, rollbackErr := s.rollbackInternal(ctx, tx, RollbackRequest{
-			ProductWarehouseID: req.ProductWarehouseID,
-			Usable:             req.Usable,
-			ReleaseQty:         nil,
-			Reason:             "reflow reset",
-		}, req.FlagGroupCode)
-		if rollbackErr != nil {
-			err = rollbackErr
-			return rollbackErr
-		}
-		result.Rollback = *rollbackRes
-
-		if req.DesiredQty > 0 {
-			allocateRes, allocateErr := s.allocateInternal(ctx, tx, AllocateRequest{
-				FlagGroupCode:      req.FlagGroupCode,
-				ProductWarehouseID: req.ProductWarehouseID,
-				Usable:             req.Usable,
-				NeedQty:            req.DesiredQty,
-				AllowOverConsume:   req.AllowOverConsume,
-				AsOf:               req.AsOf,
-			})
-			if allocateErr != nil {
-				err = allocateErr
-				return allocateErr
-			}
-			result.Allocate = *allocateRes
-		}
-
-		if finishErr := s.finishOperation(tx, logRow, result); finishErr != nil {
-			err = finishErr
-			return finishErr
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (s *fifoStockV2Service) loadActiveAllocations(
-	tx *gorm.DB,
-	usableType string,
-	usableID uint,
-	productWarehouseID uint,
-) ([]allocationRow, error) {
-	query := tx.Table("stock_allocations").
-		Select("id, product_warehouse_id, stockable_type, stockable_id, usable_type, usable_id, qty, status, created_at").
-		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, activeAllocationStatus())
-	if productWarehouseID > 0 {
-		query = query.Where("product_warehouse_id = ?", productWarehouseID)
-	}
-	query = query.Order("created_at DESC, id DESC")
-
-	var rows []allocationRow
-	if err := query.Find(&rows).Error; err != nil {
-		return nil, err
-	}
-	return rows, nil
-}
-
-func (s *fifoStockV2Service) loadStockableRuleMap(ctx context.Context, tx *gorm.DB, flagGroupCode string) (map[string]routeRule, error) {
-	rules, err := s.loadRouteRules(ctx, tx, flagGroupCode, LaneStockable)
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]routeRule, len(rules))
-	for _, rule := range rules {
-		m[rule.LegacyTypeKey] = rule
-	}
-	return m, nil
-}
-
-func (s *fifoStockV2Service) adjustStockableUsedQuantity(tx *gorm.DB, rule routeRule, sourceID uint, delta float64) error {
-	if nearlyZero(delta) || sourceID == 0 {
-		return nil
-	}
-	if rule.UsedQuantityCol == nil || strings.TrimSpace(*rule.UsedQuantityCol) == "" {
-		return nil
-	}
-
-	usedCol, _ := mustSafeIdentifier(*rule.UsedQuantityCol)
-	sourceIDCol, _ := mustSafeIdentifier(rule.SourceIDColumn)
-	sourceTable, _ := mustSafeIdentifier(rule.SourceTable)
-
-	expr := fmt.Sprintf("GREATEST(0, COALESCE(%s,0) + ?)", usedCol)
-	return tx.Table(sourceTable).
-		Where(fmt.Sprintf("%s = ?", sourceIDCol), sourceID).
-		Update(usedCol, gorm.Expr(expr, delta)).Error
-}
-
-func (s *fifoStockV2Service) applyUsableDeltas(tx *gorm.DB, rule routeRule, sourceID uint, usageDelta, pendingDelta float64) error {
-	if sourceID == 0 || (nearlyZero(usageDelta) && nearlyZero(pendingDelta)) {
-		return nil
-	}
-	sourceTable, _ := mustSafeIdentifier(rule.SourceTable)
-	sourceIDCol, _ := mustSafeIdentifier(rule.SourceIDColumn)
-	usageCol, _ := mustSafeIdentifier(rule.QuantityCol)
-
-	updates := map[string]any{}
-	if !nearlyZero(usageDelta) {
-		expr := fmt.Sprintf("GREATEST(0, COALESCE(%s,0) + ?)", usageCol)
-		updates[usageCol] = gorm.Expr(expr, usageDelta)
-	}
-	if rule.PendingQuantityCol != nil && strings.TrimSpace(*rule.PendingQuantityCol) != "" && !nearlyZero(pendingDelta) {
-		pendingCol, _ := mustSafeIdentifier(*rule.PendingQuantityCol)
-		expr := fmt.Sprintf("GREATEST(0, COALESCE(%s,0) + ?)", pendingCol)
-		updates[pendingCol] = gorm.Expr(expr, pendingDelta)
-	}
-	if len(updates) == 0 {
-		return nil
-	}
-
-	return tx.Table(sourceTable).
-		Where(fmt.Sprintf("%s = ?", sourceIDCol), sourceID).
-		Updates(updates).Error
-}
-
-func (s *fifoStockV2Service) resetUsableQuantities(tx *gorm.DB, rule routeRule, sourceID uint) error {
-	if sourceID == 0 {
-		return nil
-	}
-	sourceTable, _ := mustSafeIdentifier(rule.SourceTable)
-	sourceIDCol, _ := mustSafeIdentifier(rule.SourceIDColumn)
-	usageCol, _ := mustSafeIdentifier(rule.QuantityCol)
-
-	updates := map[string]any{usageCol: 0}
-	if rule.PendingQuantityCol != nil && strings.TrimSpace(*rule.PendingQuantityCol) != "" {
-		pendingCol, _ := mustSafeIdentifier(*rule.PendingQuantityCol)
-		updates[pendingCol] = 0
-	}
-
-	return tx.Table(sourceTable).
-		Where(fmt.Sprintf("%s = ?", sourceIDCol), sourceID).
-		Updates(updates).Error
-}
-
-func (s *fifoStockV2Service) resolveRollbackFlagGroup(ctx context.Context, tx *gorm.DB, req RollbackRequest) (string, error) {
-	type row struct {
-		FlagGroupCode string `gorm:"column:flag_group_code"`
-	}
-	var latest row
-	err := tx.WithContext(ctx).
-		Table("stock_allocations").
-		Select("flag_group_code").
-		Where("usable_type = ? AND usable_id = ?", req.Usable.LegacyTypeKey, req.Usable.ID).
-		Where("engine_version = 'v2'").
-		Where("flag_group_code IS NOT NULL AND flag_group_code <> ''").
-		Order("id DESC").
-		Limit(1).
-		Take(&latest).Error
-	if err == nil && strings.TrimSpace(latest.FlagGroupCode) != "" {
-		return latest.FlagGroupCode, nil
-	}
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return "", err
-	}
-
-	var rules []routeRule
-	err = tx.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules").
-		Where("is_active = TRUE").
-		Where("lane = ?", string(LaneUsable)).
-		Where("legacy_type_key = ?", req.Usable.LegacyTypeKey).
-		Find(&rules).Error
-	if err != nil {
-		return "", err
-	}
-	if len(rules) == 0 {
-		return "", fmt.Errorf("cannot resolve flag group for usable type %s", req.Usable.LegacyTypeKey)
-	}
-	if len(rules) > 1 {
-		return "", fmt.Errorf("ambiguous rollback flag group for usable type %s", req.Usable.LegacyTypeKey)
-	}
-	return rules[0].FlagGroupCode, nil
-}
-
-func (s *fifoStockV2Service) validateAllocateRequest(req AllocateRequest) error {
-	if strings.TrimSpace(req.FlagGroupCode) == "" || req.ProductWarehouseID == 0 {
-		return fmt.Errorf("%w: missing flag group or product warehouse", ErrInvalidRequest)
-	}
-	if req.Usable.ID == 0 || strings.TrimSpace(req.Usable.LegacyTypeKey) == "" {
-		return fmt.Errorf("%w: usable id and type are required", ErrInvalidRequest)
-	}
-	if req.NeedQty < 0 {
-		return fmt.Errorf("%w: need qty must be >= 0", ErrInvalidRequest)
-	}
-	return nil
-}
-
-func (s *fifoStockV2Service) validateRollbackRequest(req RollbackRequest) error {
-	if req.ProductWarehouseID == 0 {
-		return fmt.Errorf("%w: product warehouse is required", ErrInvalidRequest)
-	}
-	if req.Usable.ID == 0 || strings.TrimSpace(req.Usable.LegacyTypeKey) == "" {
-		return fmt.Errorf("%w: usable id and type are required", ErrInvalidRequest)
-	}
-	if req.ReleaseQty != nil && *req.ReleaseQty < 0 {
-		return fmt.Errorf("%w: release qty must be >= 0", ErrInvalidRequest)
-	}
-	return nil
-}

internal/common/service/fifo_stock_v2/config.go

@@ -1,170 +0,0 @@
-package fifo_stock_v2
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"gorm.io/gorm"
-)
-
-type routeRule struct {
-	ID                  uint    `gorm:"column:id"`
-	FlagGroupCode       string  `gorm:"column:flag_group_code"`
-	Lane                string  `gorm:"column:lane"`
-	FunctionCode        string  `gorm:"column:function_code"`
-	SourceTable         string  `gorm:"column:source_table"`
-	SourceIDColumn      string  `gorm:"column:source_id_column"`
-	ProductWarehouseCol string  `gorm:"column:product_warehouse_col"`
-	QuantityCol         string  `gorm:"column:quantity_col"`
-	UsedQuantityCol     *string `gorm:"column:used_quantity_col"`
-	PendingQuantityCol  *string `gorm:"column:pending_quantity_col"`
-	ScopeSQL            *string `gorm:"column:scope_sql"`
-	LegacyTypeKey       string  `gorm:"column:legacy_type_key"`
-	AllowPendingDefault bool    `gorm:"column:allow_pending_default"`
-}
-
-type traitRule struct {
-	ID                 uint    `gorm:"column:id"`
-	SourceTable        string  `gorm:"column:source_table"`
-	Lane               string  `gorm:"column:lane"`
-	DateTable          *string `gorm:"column:date_table"`
-	DateJoinLeftCol    *string `gorm:"column:date_join_left_col"`
-	DateJoinRightCol   *string `gorm:"column:date_join_right_col"`
-	DateColumn         string  `gorm:"column:date_column"`
-	FallbackDateColumn *string `gorm:"column:fallback_date_column"`
-	SortPriority       int     `gorm:"column:sort_priority"`
-	IDColumn           string  `gorm:"column:id_column"`
-}
-
-func (s *fifoStockV2Service) loadRouteRules(ctx context.Context, tx *gorm.DB, flagGroupCode string, lane Lane) ([]routeRule, error) {
-	var rules []routeRule
-	err := tx.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules").
-		Where("is_active = TRUE").
-		Where("flag_group_code = ?", flagGroupCode).
-		Where("lane = ?", string(lane)).
-		Order("id ASC").
-		Find(&rules).Error
-	if err != nil {
-		return nil, err
-	}
-	for _, rule := range rules {
-		if err := validateRouteRule(rule); err != nil {
-			return nil, err
-		}
-	}
-	return rules, nil
-}
-
-func (s *fifoStockV2Service) loadRouteRuleByLegacyType(
-	ctx context.Context,
-	tx *gorm.DB,
-	lane Lane,
-	flagGroupCode string,
-	legacyTypeKey string,
-) (*routeRule, error) {
-	var rule routeRule
-	err := tx.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules").
-		Where("is_active = TRUE").
-		Where("lane = ?", string(lane)).
-		Where("flag_group_code = ?", flagGroupCode).
-		Where("legacy_type_key = ?", legacyTypeKey).
-		Order("id ASC").
-		Limit(1).
-		Take(&rule).Error
-	if err != nil {
-		return nil, err
-	}
-	if err := validateRouteRule(rule); err != nil {
-		return nil, err
-	}
-	return &rule, nil
-}
-
-func (s *fifoStockV2Service) loadTraitMap(
-	ctx context.Context,
-	tx *gorm.DB,
-	lane Lane,
-	sourceTables []string,
-) (map[string]traitRule, error) {
-	if len(sourceTables) == 0 {
-		return map[string]traitRule{}, nil
-	}
-
-	var traits []traitRule
-	err := tx.WithContext(ctx).
-		Table("fifo_stock_v2_traits").
-		Where("is_active = TRUE").
-		Where("lane = ?", string(lane)).
-		Where("source_table IN ?", sourceTables).
-		Find(&traits).Error
-	if err != nil {
-		return nil, err
-	}
-
-	out := make(map[string]traitRule, len(traits))
-	for _, tr := range traits {
-		if err := validateTraitRule(tr); err != nil {
-			return nil, err
-		}
-		out[tr.SourceTable] = tr
-	}
-	return out, nil
-}
-
-func validateRouteRule(rule routeRule) error {
-	fields := []string{rule.SourceTable, rule.SourceIDColumn, rule.ProductWarehouseCol, rule.QuantityCol}
-	for _, value := range fields {
-		if _, err := mustSafeIdentifier(value); err != nil {
-			return err
-		}
-	}
-	if rule.UsedQuantityCol != nil {
-		if _, err := mustSafeIdentifier(*rule.UsedQuantityCol); err != nil {
-			return err
-		}
-	}
-	if rule.PendingQuantityCol != nil {
-		if _, err := mustSafeIdentifier(*rule.PendingQuantityCol); err != nil {
-			return err
-		}
-	}
-	if strings.TrimSpace(rule.LegacyTypeKey) == "" {
-		return fmt.Errorf("route rule has empty legacy type key")
-	}
-	return nil
-}
-
-func validateTraitRule(rule traitRule) error {
-	if _, err := mustSafeIdentifier(rule.SourceTable); err != nil {
-		return err
-	}
-	if _, err := mustSafeIdentifier(rule.DateColumn); err != nil {
-		return err
-	}
-	if _, err := mustSafeIdentifier(rule.IDColumn); err != nil {
-		return err
-	}
-	if rule.DateTable != nil {
-		if _, err := mustSafeIdentifier(*rule.DateTable); err != nil {
-			return err
-		}
-		if rule.DateJoinLeftCol == nil || rule.DateJoinRightCol == nil {
-			return fmt.Errorf("trait %s requires date join columns", rule.SourceTable)
-		}
-		if _, err := mustSafeIdentifier(*rule.DateJoinLeftCol); err != nil {
-			return err
-		}
-		if _, err := mustSafeIdentifier(*rule.DateJoinRightCol); err != nil {
-			return err
-		}
-	}
-	if rule.FallbackDateColumn != nil {
-		if _, err := mustSafeIdentifier(*rule.FallbackDateColumn); err != nil {
-			return err
-		}
-	}
-	return nil
-}

internal/common/service/fifo_stock_v2/errors.go

@@ -1,8 +0,0 @@
-package fifo_stock_v2
-
-import "errors"
-
-var (
-	ErrInvalidRequest    = errors.New("invalid fifo stock v2 request")
-	ErrInsufficientStock = errors.New("insufficient stock")
-)

internal/common/service/fifo_stock_v2/gather.go

@@ -1,268 +0,0 @@
-package fifo_stock_v2
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-type gatherSQLRow struct {
-	SourceTable        string    `gorm:"column:source_table"`
-	LegacyTypeKey      string    `gorm:"column:legacy_type_key"`
-	FunctionCode       string    `gorm:"column:function_code"`
-	SourceID           uint      `gorm:"column:source_id"`
-	ProductWarehouseID uint      `gorm:"column:product_warehouse_id"`
-	SortAt             time.Time `gorm:"column:sort_at"`
-	SortPriority       int       `gorm:"column:sort_priority"`
-	Quantity           float64   `gorm:"column:quantity"`
-	UsedQuantity       float64   `gorm:"column:used_quantity"`
-	PendingQuantity    float64   `gorm:"column:pending_quantity"`
-	AvailableQuantity  float64   `gorm:"column:available_quantity"`
-}
-
-func (s *fifoStockV2Service) Gather(ctx context.Context, req GatherRequest) ([]GatherRow, error) {
-	if strings.TrimSpace(req.FlagGroupCode) == "" || req.ProductWarehouseID == 0 {
-		return nil, fmt.Errorf("%w: flag group and product warehouse are required", ErrInvalidRequest)
-	}
-	if req.Lane != LaneStockable && req.Lane != LaneUsable {
-		return nil, fmt.Errorf("%w: unsupported lane %q", ErrInvalidRequest, req.Lane)
-	}
-
-	var out []GatherRow
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		rows, err := s.gatherRows(ctx, tx, req)
-		if err != nil {
-			return err
-		}
-		out = rows
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (s *fifoStockV2Service) gatherRows(ctx context.Context, tx *gorm.DB, req GatherRequest) ([]GatherRow, error) {
-	rules, err := s.loadRouteRules(ctx, tx, req.FlagGroupCode, req.Lane)
-	if err != nil {
-		return nil, err
-	}
-	if len(rules) == 0 {
-		return []GatherRow{}, nil
-	}
-
-	tables := make([]string, 0, len(rules))
-	for _, rule := range rules {
-		tables = append(tables, rule.SourceTable)
-	}
-
-	traits, err := s.loadTraitMap(ctx, tx, req.Lane, tables)
-	if err != nil {
-		return nil, err
-	}
-
-	subqueries := make([]string, 0, len(rules))
-	args := make([]any, 0, len(rules)*10)
-
-	for _, rule := range rules {
-		trait, ok := traits[rule.SourceTable]
-		if !ok {
-			return nil, fmt.Errorf("missing trait for table %s lane %s", rule.SourceTable, req.Lane)
-		}
-		subSQL, subArgs, err := s.buildGatherSubquery(rule, trait, req)
-		if err != nil {
-			return nil, err
-		}
-		subqueries = append(subqueries, subSQL)
-		args = append(args, subArgs...)
-	}
-
-	if len(subqueries) == 0 {
-		return []GatherRow{}, nil
-	}
-
-	limit := req.Limit
-	if limit <= 0 {
-		limit = s.defaultGatherLimit
-	}
-	if limit <= 0 {
-		limit = 1000
-	}
-
-	query := "SELECT * FROM (" + strings.Join(subqueries, " UNION ALL ") + ") AS g"
-	if req.AfterSortAt != nil {
-		query += `
-			 WHERE
-			 	(g.sort_at > ?)
-			 	OR (g.sort_at = ? AND g.source_table > ?)
-			 	OR (g.sort_at = ? AND g.source_table = ? AND g.source_id > ?)
-		`
-		args = append(args,
-			*req.AfterSortAt,
-			*req.AfterSortAt, req.AfterSourceTable,
-			*req.AfterSortAt, req.AfterSourceTable, req.AfterSourceID,
-		)
-	}
-	query += " ORDER BY g.sort_at ASC, g.sort_priority ASC, g.source_table ASC, g.source_id ASC LIMIT ?"
-	args = append(args, limit)
-
-	var rows []gatherSQLRow
-	if err := tx.WithContext(ctx).Raw(query, args...).Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	out := make([]GatherRow, 0, len(rows))
-	for _, row := range rows {
-		out = append(out, GatherRow{
-			Ref: Ref{
-				Table:         row.SourceTable,
-				ID:            row.SourceID,
-				LegacyTypeKey: row.LegacyTypeKey,
-				FunctionCode:  row.FunctionCode,
-			},
-			FlagGroupCode:      req.FlagGroupCode,
-			ProductWarehouseID: row.ProductWarehouseID,
-			SortAt:             row.SortAt,
-			SortPriority:       row.SortPriority,
-			Quantity:           row.Quantity,
-			UsedQuantity:       row.UsedQuantity,
-			PendingQuantity:    row.PendingQuantity,
-			AvailableQuantity:  row.AvailableQuantity,
-			SourceTable:        row.SourceTable,
-			SourceID:           row.SourceID,
-		})
-	}
-
-	return out, nil
-}
-
-func (s *fifoStockV2Service) buildGatherSubquery(rule routeRule, trait traitRule, req GatherRequest) (string, []any, error) {
-	sourceTable, _ := mustSafeIdentifier(rule.SourceTable)
-	sourceIDCol, _ := mustSafeIdentifier(rule.SourceIDColumn)
-	productWarehouseCol, _ := mustSafeIdentifier(rule.ProductWarehouseCol)
-	quantityCol, _ := mustSafeIdentifier(rule.QuantityCol)
-
-	baseQtyExpr := fmt.Sprintf("COALESCE(src.%s,0)::numeric", quantityCol)
-	usedExpr := "0::numeric"
-	pendingExpr := "0::numeric"
-	availableExpr := baseQtyExpr
-	extraArgs := make([]any, 0, 1)
-
-	if req.Lane == LaneStockable {
-		if rule.UsedQuantityCol != nil && strings.TrimSpace(*rule.UsedQuantityCol) != "" {
-			usedCol, _ := mustSafeIdentifier(*rule.UsedQuantityCol)
-			usedExpr = fmt.Sprintf("COALESCE(src.%s,0)::numeric", usedCol)
-		} else {
-			usedExpr = fmt.Sprintf(
-				"(SELECT COALESCE(SUM(sa.qty),0)::numeric FROM stock_allocations sa WHERE sa.stockable_type = ? AND sa.stockable_id = src.%s AND sa.status = '%s')",
-				sourceIDCol,
-				activeAllocationStatus(),
-			)
-			extraArgs = append(extraArgs, rule.LegacyTypeKey)
-		}
-		availableExpr = fmt.Sprintf("(%s - %s)", baseQtyExpr, usedExpr)
-	} else {
-		if rule.PendingQuantityCol != nil && strings.TrimSpace(*rule.PendingQuantityCol) != "" {
-			pendingCol, _ := mustSafeIdentifier(*rule.PendingQuantityCol)
-			pendingExpr = fmt.Sprintf("COALESCE(src.%s,0)::numeric", pendingCol)
-		}
-		availableExpr = baseQtyExpr
-	}
-
-	sortExpr, joinClause, err := buildSortExpr(trait)
-	if err != nil {
-		return "", nil, err
-	}
-
-	whereParts := []string{
-		fmt.Sprintf("src.%s = ?", productWarehouseCol),
-		fmt.Sprintf(`EXISTS (
-			SELECT 1
-			FROM product_warehouses pw
-			JOIN flags f ON f.flagable_type = ? AND f.flagable_id = pw.product_id
-			JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-			WHERE pw.id = src.%s AND fm.flag_group_code = ?
-		)`, productWarehouseCol),
-	}
-
-	if req.Lane == LaneStockable {
-		whereParts = append(whereParts, fmt.Sprintf("%s > 0", availableExpr))
-	}
-
-	if req.AsOf != nil {
-		whereParts = append(whereParts, fmt.Sprintf("%s <= ?", sortExpr))
-	}
-
-	if rule.ScopeSQL != nil && strings.TrimSpace(*rule.ScopeSQL) != "" {
-		whereParts = append(whereParts, fmt.Sprintf("(%s)", normalizeScopeSQL(*rule.ScopeSQL)))
-	}
-
-	subquery := fmt.Sprintf(`
-		SELECT
-			?::text AS source_table,
-			?::text AS legacy_type_key,
-			?::text AS function_code,
-			src.%s AS source_id,
-			src.%s AS product_warehouse_id,
-			%s AS sort_at,
-			?::int AS sort_priority,
-			%s AS quantity,
-			%s AS used_quantity,
-			%s AS pending_quantity,
-			%s AS available_quantity
-		FROM %s src
-		%s
-		WHERE %s
-	`, sourceIDCol, productWarehouseCol, sortExpr, baseQtyExpr, usedExpr, pendingExpr, availableExpr, sourceTable, joinClause, strings.Join(whereParts, " AND "))
-
-	args := []any{
-		rule.SourceTable,
-		rule.LegacyTypeKey,
-		rule.FunctionCode,
-		trait.SortPriority,
-	}
-	args = append(args, extraArgs...)
-	args = append(args,
-		req.ProductWarehouseID,
-		entity.FlagableTypeProduct,
-		req.FlagGroupCode,
-	)
-
-	if req.AsOf != nil {
-		args = append(args, *req.AsOf)
-	}
-
-	return subquery, args, nil
-}
-
-func buildSortExpr(trait traitRule) (string, string, error) {
-	dateCol, _ := mustSafeIdentifier(trait.DateColumn)
-	idCol, _ := mustSafeIdentifier(trait.IDColumn)
-	_ = idCol
-
-	joinClause := ""
-	sortBase := fmt.Sprintf("src.%s", dateCol)
-	if trait.DateTable != nil && strings.TrimSpace(*trait.DateTable) != "" {
-		dateTable, _ := mustSafeIdentifier(*trait.DateTable)
-		if trait.DateJoinLeftCol == nil || trait.DateJoinRightCol == nil {
-			return "", "", fmt.Errorf("trait %s requires date join columns", trait.SourceTable)
-		}
-		leftCol, _ := mustSafeIdentifier(*trait.DateJoinLeftCol)
-		rightCol, _ := mustSafeIdentifier(*trait.DateJoinRightCol)
-		joinClause = fmt.Sprintf("LEFT JOIN %s dt ON src.%s = dt.%s", dateTable, leftCol, rightCol)
-		sortBase = fmt.Sprintf("dt.%s", dateCol)
-	}
-
-	if trait.FallbackDateColumn != nil && strings.TrimSpace(*trait.FallbackDateColumn) != "" {
-		fallbackCol, _ := mustSafeIdentifier(*trait.FallbackDateColumn)
-		sortBase = fmt.Sprintf("COALESCE(%s, src.%s)", sortBase, fallbackCol)
-	}
-
-	sortExpr := fmt.Sprintf("COALESCE(%s, '1970-01-01 00:00:00+00'::timestamptz)", sortBase)
-	return sortExpr, joinClause, nil
-}

internal/common/service/fifo_stock_v2/recalculate.go

@@ -1,177 +0,0 @@
-package fifo_stock_v2
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"math"
-	"time"
-
-	"gorm.io/gorm"
-)
-
-func (s *fifoStockV2Service) Recalculate(ctx context.Context, req RecalculateRequest) (*RecalculateResult, error) {
-	result := &RecalculateResult{Drifts: make([]WarehouseDrift, 0)}
-
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		hash := requestHash(map[string]any{
-			"product_warehouse_ids": req.ProductWarehouseIDs,
-			"flag_group_codes":      req.FlagGroupCodes,
-			"as_of":                 req.AsOf,
-			"fix_drift":             req.FixDrift,
-		})
-		logRow, reused, err := s.beginOperation(
-			tx,
-			OperationRecalculate,
-			req.IdempotencyKey,
-			hash,
-			0,
-			"RECALCULATE",
-			"",
-			0,
-		)
-		if err != nil {
-			return err
-		}
-		if reused {
-			if len(logRow.ResultPayload) == 0 {
-				return fmt.Errorf("idempotent recalculate has empty payload")
-			}
-			if err := json.Unmarshal(logRow.ResultPayload, result); err != nil {
-				return err
-			}
-			return nil
-		}
-		if logRow != nil {
-			defer func() {
-				if err != nil {
-					s.failOperation(tx, logRow, err)
-				}
-			}()
-		}
-
-		warehouseIDs, err := s.resolveRecalculateWarehouseIDs(ctx, tx, req.ProductWarehouseIDs)
-		if err != nil {
-			return err
-		}
-		groupCodes, err := s.resolveRecalculateGroupCodes(ctx, tx, req.FlagGroupCodes)
-		if err != nil {
-			return err
-		}
-
-		for _, warehouseID := range warehouseIDs {
-			expected := 0.0
-			for _, flagGroup := range groupCodes {
-				available, calcErr := s.calculateWarehouseAvailableForGroup(ctx, tx, warehouseID, flagGroup, req.AsOf)
-				if calcErr != nil {
-					return calcErr
-				}
-				expected += available
-			}
-
-			actual, actualErr := s.loadWarehouseQty(ctx, tx, warehouseID)
-			if actualErr != nil {
-				return actualErr
-			}
-
-			delta := expected - actual
-			result.Checked++
-			if math.Abs(delta) < 1e-6 {
-				continue
-			}
-
-			drift := WarehouseDrift{
-				ProductWarehouseID: warehouseID,
-				ExpectedQty:        expected,
-				ActualQty:          actual,
-				Delta:              delta,
-			}
-			result.Drifts = append(result.Drifts, drift)
-
-			if req.FixDrift {
-				if err := s.adjustProductWarehouseQty(tx, warehouseID, delta); err != nil {
-					return err
-				}
-				result.Fixed++
-			}
-		}
-
-		if err := s.finishOperation(tx, logRow, result); err != nil {
-			return err
-		}
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return result, nil
-}
-
-func (s *fifoStockV2Service) resolveRecalculateWarehouseIDs(ctx context.Context, tx *gorm.DB, provided []uint) ([]uint, error) {
-	if len(provided) > 0 {
-		return provided, nil
-	}
-	var ids []uint
-	err := tx.WithContext(ctx).Table("product_warehouses").Select("id").Order("id ASC").Scan(&ids).Error
-	if err != nil {
-		return nil, err
-	}
-	return ids, nil
-}
-
-func (s *fifoStockV2Service) resolveRecalculateGroupCodes(ctx context.Context, tx *gorm.DB, provided []string) ([]string, error) {
-	if len(provided) > 0 {
-		return provided, nil
-	}
-	var groups []string
-	err := tx.WithContext(ctx).
-		Table("fifo_stock_v2_flag_groups").
-		Select("code").
-		Where("is_active = TRUE").
-		Order("priority ASC, code ASC").
-		Scan(&groups).Error
-	if err != nil {
-		return nil, err
-	}
-	return groups, nil
-}
-
-func (s *fifoStockV2Service) calculateWarehouseAvailableForGroup(
-	ctx context.Context,
-	tx *gorm.DB,
-	warehouseID uint,
-	flagGroupCode string,
-	asOf *time.Time,
-) (float64, error) {
-	rows, err := s.gatherRows(ctx, tx, GatherRequest{
-		FlagGroupCode:      flagGroupCode,
-		Lane:               LaneStockable,
-		ProductWarehouseID: warehouseID,
-		AsOf:               asOf,
-		Limit:              50000,
-	})
-	if err != nil {
-		return 0, err
-	}
-	total := 0.0
-	for _, row := range rows {
-		total += row.AvailableQuantity
-	}
-	return total, nil
-}
-
-func (s *fifoStockV2Service) loadWarehouseQty(ctx context.Context, tx *gorm.DB, warehouseID uint) (float64, error) {
-	type row struct {
-		Qty float64 `gorm:"column:qty"`
-	}
-	var out row
-	err := tx.WithContext(ctx).
-		Table("product_warehouses").
-		Select("COALESCE(qty,0) AS qty").
-		Where("id = ?", warehouseID).
-		Take(&out).Error
-	if err != nil {
-		return 0, err
-	}
-	return out.Qty, nil
-}

internal/common/service/fifo_stock_v2/scope_sql.go

@@ -1,100 +0,0 @@
-package fifo_stock_v2
-
-import "strings"
-
-func normalizeScopeSQL(scopeSQL string) string {
-	scopeSQL = strings.TrimSpace(scopeSQL)
-	if scopeSQL == "" {
-		return scopeSQL
-	}
-
-	var out strings.Builder
-	out.Grow(len(scopeSQL) + 16)
-
-	inSingleQuote := false
-	inDoubleQuote := false
-
-	for i := 0; i < len(scopeSQL); {
-		ch := scopeSQL[i]
-
-		if inSingleQuote {
-			out.WriteByte(ch)
-			i++
-			if ch == '\'' {
-				if i < len(scopeSQL) && scopeSQL[i] == '\'' {
-					out.WriteByte(scopeSQL[i])
-					i++
-				} else {
-					inSingleQuote = false
-				}
-			}
-			continue
-		}
-
-		if inDoubleQuote {
-			out.WriteByte(ch)
-			i++
-			if ch == '"' {
-				inDoubleQuote = false
-			}
-			continue
-		}
-
-		if ch == '\'' {
-			inSingleQuote = true
-			out.WriteByte(ch)
-			i++
-			continue
-		}
-
-		if ch == '"' {
-			inDoubleQuote = true
-			out.WriteByte(ch)
-			i++
-			continue
-		}
-
-		if isIdentifierStart(ch) {
-			start := i
-			i++
-			for i < len(scopeSQL) && isIdentifierPart(scopeSQL[i]) {
-				i++
-			}
-
-			token := scopeSQL[start:i]
-			if strings.EqualFold(token, "deleted_at") && !hasAliasQualifier(scopeSQL, start) {
-				out.WriteString("src.deleted_at")
-			} else {
-				out.WriteString(token)
-			}
-			continue
-		}
-
-		out.WriteByte(ch)
-		i++
-	}
-
-	return out.String()
-}
-
-func hasAliasQualifier(scopeSQL string, tokenStart int) bool {
-	for i := tokenStart - 1; i >= 0; i-- {
-		switch scopeSQL[i] {
-		case ' ', '\t', '\n', '\r':
-			continue
-		case '.':
-			return true
-		default:
-			return false
-		}
-	}
-	return false
-}
-
-func isIdentifierStart(ch byte) bool {
-	return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch == '_'
-}
-
-func isIdentifierPart(ch byte) bool {
-	return isIdentifierStart(ch) || (ch >= '0' && ch <= '9')
-}

internal/common/service/fifo_stock_v2/service.go

@@ -1,265 +0,0 @@
-package fifo_stock_v2
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"hash/fnv"
-	"math"
-	"regexp"
-	"strings"
-
-	"github.com/sirupsen/logrus"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-var identifierPattern = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_]*$`)
-
-type fifoStockV2Service struct {
-	db                 *gorm.DB
-	logger             *logrus.Logger
-	defaultGatherLimit int
-}
-
-func NewService(db *gorm.DB, logger *logrus.Logger) Service {
-	if logger == nil {
-		logger = logrus.StandardLogger()
-	}
-
-	return &fifoStockV2Service{
-		db:                 db,
-		logger:             logger,
-		defaultGatherLimit: 1000,
-	}
-}
-
-func (s *fifoStockV2Service) withTransaction(
-	ctx context.Context,
-	tx *gorm.DB,
-	fn func(*gorm.DB) error,
-) error {
-	if tx != nil {
-		return fn(tx.WithContext(ctx))
-	}
-	return s.db.WithContext(ctx).Transaction(func(inner *gorm.DB) error {
-		return fn(inner)
-	})
-}
-
-func isSafeIdentifier(v string) bool {
-	return identifierPattern.MatchString(strings.TrimSpace(v))
-}
-
-func mustSafeIdentifier(v string) (string, error) {
-	v = strings.TrimSpace(v)
-	if !isSafeIdentifier(v) {
-		return "", fmt.Errorf("unsafe identifier: %s", v)
-	}
-	return v, nil
-}
-
-func requestHash(v any) string {
-	payload, _ := json.Marshal(v)
-	sum := sha256.Sum256(payload)
-	return hex.EncodeToString(sum[:])
-}
-
-func shardLockKey(flagGroupCode string, productWarehouseID uint) int64 {
-	h := fnv.New64a()
-	_, _ = h.Write([]byte(strings.TrimSpace(strings.ToUpper(flagGroupCode))))
-	_, _ = h.Write([]byte("|"))
-	_, _ = h.Write([]byte(fmt.Sprintf("%d", productWarehouseID)))
-	return int64(h.Sum64())
-}
-
-func (s *fifoStockV2Service) lockShard(tx *gorm.DB, flagGroupCode string, productWarehouseID uint) error {
-	if strings.TrimSpace(flagGroupCode) == "" || productWarehouseID == 0 {
-		return fmt.Errorf("lock shard requires flag group and product warehouse")
-	}
-	return tx.Exec("SELECT pg_advisory_xact_lock(?)", shardLockKey(flagGroupCode, productWarehouseID)).Error
-}
-
-type operationLogRow struct {
-	ID            uint            `gorm:"column:id"`
-	Status        string          `gorm:"column:status"`
-	RequestHash   string          `gorm:"column:request_hash"`
-	ResultPayload json.RawMessage `gorm:"column:result_payload"`
-}
-
-func (s *fifoStockV2Service) beginOperation(
-	tx *gorm.DB,
-	op Operation,
-	idempotencyKey string,
-	requestHashValue string,
-	productWarehouseID uint,
-	flagGroupCode string,
-	usableType string,
-	usableID uint,
-) (*operationLogRow, bool, error) {
-	if strings.TrimSpace(idempotencyKey) == "" {
-		return nil, false, nil
-	}
-
-	inserted := operationLogRow{}
-	insertSQL := `
-		INSERT INTO fifo_stock_v2_operation_log
-			(idempotency_key, operation, product_warehouse_id, flag_group_code, usable_type, usable_id, request_hash, status, created_at)
-		VALUES (?, ?, ?, ?, NULLIF(?, ''), NULLIF(?, 0), ?, 'RUNNING', NOW())
-		ON CONFLICT (idempotency_key, operation) DO NOTHING
-		RETURNING id, status, request_hash
-	`
-	if err := tx.Raw(insertSQL,
-		idempotencyKey,
-		string(op),
-		productWarehouseID,
-		flagGroupCode,
-		usableType,
-		usableID,
-		requestHashValue,
-	).Scan(&inserted).Error; err != nil {
-		return nil, false, err
-	}
-	if inserted.ID != 0 {
-		return &inserted, false, nil
-	}
-
-	existing := operationLogRow{}
-	if err := tx.Table("fifo_stock_v2_operation_log").
-		Select("id, status, request_hash, result_payload").
-		Where("idempotency_key = ? AND operation = ?", idempotencyKey, string(op)).
-		Take(&existing).Error; err != nil {
-		return nil, false, err
-	}
-
-	if existing.RequestHash != requestHashValue {
-		return nil, false, fmt.Errorf("idempotency key %s reused with different payload", idempotencyKey)
-	}
-
-	switch strings.ToUpper(existing.Status) {
-	case "DONE":
-		return &existing, true, nil
-	case "RUNNING":
-		return nil, false, fmt.Errorf("operation %s with idempotency key %s is still running", op, idempotencyKey)
-	case "FAILED":
-		if err := tx.Table("fifo_stock_v2_operation_log").
-			Where("id = ?", existing.ID).
-			Updates(map[string]any{
-				"status":      "RUNNING",
-				"error_text":  nil,
-				"finished_at": nil,
-			}).Error; err != nil {
-			return nil, false, err
-		}
-		existing.Status = "RUNNING"
-		return &existing, false, nil
-	default:
-		return nil, false, fmt.Errorf("unknown operation status: %s", existing.Status)
-	}
-}
-
-func (s *fifoStockV2Service) finishOperation(tx *gorm.DB, logRow *operationLogRow, payload any) error {
-	if logRow == nil || logRow.ID == 0 {
-		return nil
-	}
-
-	encoded, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-
-	return tx.Table("fifo_stock_v2_operation_log").
-		Where("id = ?", logRow.ID).
-		Updates(map[string]any{
-			"status":         "DONE",
-			"result_payload": encoded,
-			"finished_at":    gorm.Expr("NOW()"),
-		}).Error
-}
-
-func (s *fifoStockV2Service) failOperation(tx *gorm.DB, logRow *operationLogRow, failure error) {
-	if logRow == nil || logRow.ID == 0 || failure == nil {
-		return
-	}
-	_ = tx.Table("fifo_stock_v2_operation_log").
-		Where("id = ?", logRow.ID).
-		Updates(map[string]any{
-			"status":      "FAILED",
-			"error_text":  failure.Error(),
-			"finished_at": gorm.Expr("NOW()"),
-		}).Error
-}
-
-func (s *fifoStockV2Service) resolveOverConsume(
-	tx *gorm.DB,
-	flagGroupCode string,
-	functionCode string,
-	lane Lane,
-	defaultValue bool,
-) (bool, error) {
-	type row struct {
-		Allow bool `gorm:"column:allow_overconsume"`
-	}
-	selected := row{}
-	err := tx.Table("fifo_stock_v2_overconsume_rules").
-		Select("allow_overconsume").
-		Where("is_active = TRUE").
-		Where("lane = ?", string(lane)).
-		Where("(flag_group_code IS NULL OR flag_group_code = ?)", flagGroupCode).
-		Where("(function_code IS NULL OR function_code = ?)", functionCode).
-		Order("CASE WHEN flag_group_code IS NULL THEN 1 ELSE 0 END ASC").
-		Order("CASE WHEN function_code IS NULL THEN 1 ELSE 0 END ASC").
-		Order("priority ASC, id ASC").
-		Limit(1).
-		Take(&selected).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return defaultValue, nil
-		}
-		return false, err
-	}
-	return selected.Allow, nil
-}
-
-func (s *fifoStockV2Service) adjustProductWarehouseQty(tx *gorm.DB, productWarehouseID uint, delta float64) error {
-	if productWarehouseID == 0 || delta == 0 {
-		return nil
-	}
-	return tx.Table("product_warehouses").
-		Where("id = ?", productWarehouseID).
-		Update("qty", gorm.Expr("COALESCE(qty,0) + ?", delta)).Error
-}
-
-func nearlyZero(v float64) bool {
-	return math.Abs(v) < 1e-6
-}
-
-func (s *fifoStockV2Service) ensureStockAllocationColumns(tx *gorm.DB) error {
-	checkCols := []string{"engine_version", "flag_group_code", "function_code", "idempotency_key"}
-	for _, col := range checkCols {
-		var count int64
-		err := tx.Raw(`
-			SELECT COUNT(1)
-			FROM information_schema.columns
-			WHERE table_schema = 'public' AND table_name = 'stock_allocations' AND column_name = ?
-		`, col).Scan(&count).Error
-		if err != nil {
-			return err
-		}
-		if count == 0 {
-			return fmt.Errorf("stock_allocations.%s does not exist, run fifo_stock_v2 migration first", col)
-		}
-	}
-	return nil
-}
-
-func activeAllocationStatus() string {
-	return entity.StockAllocationStatusActive
-}
-
-func releasedAllocationStatus() string {
-	return entity.StockAllocationStatusReleased
-}

internal/common/service/fifo_stock_v2/types.go

@@ -1,142 +0,0 @@
-package fifo_stock_v2
-
-import (
-	"context"
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type Lane string
-
-const (
-	LaneStockable Lane = "STOCKABLE"
-	LaneUsable    Lane = "USABLE"
-)
-
-type Operation string
-
-const (
-	OperationAllocate    Operation = "ALLOCATE"
-	OperationRollback    Operation = "ROLLBACK"
-	OperationReflow      Operation = "REFLOW"
-	OperationRecalculate Operation = "RECALCULATE"
-)
-
-type Ref struct {
-	Table         string
-	ID            uint
-	LegacyTypeKey string
-	FunctionCode  string
-}
-
-type GatherRequest struct {
-	FlagGroupCode      string
-	Lane               Lane
-	ProductWarehouseID uint
-	AsOf               *time.Time
-	Limit              int
-	AfterSortAt        *time.Time
-	AfterSourceTable   string
-	AfterSourceID      uint
-	ForUpdate          bool
-	Tx                 *gorm.DB
-}
-
-type GatherRow struct {
-	Ref                Ref
-	FlagGroupCode      string
-	ProductWarehouseID uint
-	SortAt             time.Time
-	SortPriority       int
-	Quantity           float64
-	UsedQuantity       float64
-	PendingQuantity    float64
-	AvailableQuantity  float64
-	SourceTable        string
-	SourceID           uint
-}
-
-type AllocateRequest struct {
-	FlagGroupCode      string
-	ProductWarehouseID uint
-	Usable             Ref
-	NeedQty            float64
-	AllowOverConsume   *bool
-	IdempotencyKey     string
-	AsOf               *time.Time
-	Tx                 *gorm.DB
-}
-
-type AllocationDetail struct {
-	StockableType string
-	StockableID   uint
-	Qty           float64
-	SortAt        time.Time
-}
-
-type AllocateResult struct {
-	AllocatedQty float64
-	PendingQty   float64
-	Details      []AllocationDetail
-}
-
-type RollbackRequest struct {
-	ProductWarehouseID uint
-	Usable             Ref
-	ReleaseQty         *float64
-	Reason             string
-	IdempotencyKey     string
-	Tx                 *gorm.DB
-}
-
-type RollbackResult struct {
-	ReleasedQty float64
-	Details     []AllocationDetail
-}
-
-type ReflowRequest struct {
-	FlagGroupCode      string
-	ProductWarehouseID uint
-	Usable             Ref
-	DesiredQty         float64
-	AllowOverConsume   *bool
-	IdempotencyKey     string
-	AsOf               *time.Time
-	Tx                 *gorm.DB
-}
-
-type ReflowResult struct {
-	Rollback RollbackResult
-	Allocate AllocateResult
-}
-
-type RecalculateRequest struct {
-	ProductWarehouseIDs []uint
-	FlagGroupCodes      []string
-	AsOf                *time.Time
-	FixDrift            bool
-	IdempotencyKey      string
-	Tx                  *gorm.DB
-}
-
-type WarehouseDrift struct {
-	ProductWarehouseID uint
-	ExpectedQty        float64
-	ActualQty          float64
-	Delta              float64
-}
-
-type RecalculateResult struct {
-	Checked int
-	Fixed   int
-	Drifts  []WarehouseDrift
-}
-
-type Service interface {
-	Gather(ctx context.Context, req GatherRequest) ([]GatherRow, error)
-	Allocate(ctx context.Context, req AllocateRequest) (*AllocateResult, error)
-	Rollback(ctx context.Context, req RollbackRequest) (*RollbackResult, error)
-	Reflow(ctx context.Context, req ReflowRequest) (*ReflowResult, error)
-	Recalculate(ctx context.Context, req RecalculateRequest) (*RecalculateResult, error)
-}

internal/config/config.go

@@ -22,61 +22,58 @@ type SSOClientConfig struct {
 }
 
 var (
-	IsProd                         bool
+	IsProd                  bool
-	AppHost                        string
+	AppHost                 string
-	Version                        string
+	Version                 string
-	LogLevel                       string
+	LogLevel                string
-	AppPort                        int
+	AppPort                 int
-	DBHost                         string
+	DBHost                  string
-	DBUser                         string
+	DBUser                  string
-	DBPassword                     string
+	DBPassword              string
-	DBName                         string
+	DBName                  string
-	DBPort                         int
+	DBPort                  int
-	DBSSLMode                      string
+	DBSSLMode               string
-	DBSSLRootCert                  string
+	DBSSLRootCert           string
-	DBSSLCert                      string
+	DBSSLCert               string
-	DBSSLKey                       string
+	DBSSLKey                string
-	JWTSecret                      string
+	JWTSecret               string
-	JWTAccessExp                   int
+	JWTAccessExp            int
-	JWTRefreshExp                  int
+	JWTRefreshExp           int
-	JWTResetPasswordExp            int
+	JWTResetPasswordExp     int
-	JWTVerifyEmailExp              int
+	JWTVerifyEmailExp       int
-	RedisURL                       string
+	RedisURL                string
-	CORSAllowOrigins               []string
+	CORSAllowOrigins        []string
-	CORSAllowMethods               []string
+	CORSAllowMethods        []string
-	CORSAllowHeaders               []string
+	CORSAllowHeaders        []string
-	CORSExposeHeaders              []string
+	CORSExposeHeaders       []string
-	CORSAllowCredentials           bool
+	CORSAllowCredentials    bool
-	CORSMaxAge                     int
+	CORSMaxAge              int
-	SSOIssuer                      string
+	SSOIssuer               string
-	SSOJWKSURL                     string
+	SSOJWKSURL              string
-	SSOAllowedAudiences            []string
+	SSOAllowedAudiences     []string
-	SSOAuthorizeURL                string
+	SSOAuthorizeURL         string
-	SSOTokenURL                    string
+	SSOTokenURL             string
-	SSOGetMeURL                    string
+	SSOGetMeURL             string
-	SSOPortalURL                   string
+	SSOPortalURL            string
-	SSOClients                     map[string]SSOClientConfig
+	SSOClients              map[string]SSOClientConfig
-	SSOAccessCookieName            string
+	SSOAccessCookieName     string
-	SSORefreshCookieName           string
+	SSORefreshCookieName    string
-	SSOCookieDomain                string
+	SSOCookieDomain         string
-	SSOCookieSecure                bool
+	SSOCookieSecure         bool
-	SSOCookieSameSite              string
+	SSOCookieSameSite       string
-	SSOAccessTokenMaxBytes         int
+	SSOTokenBlacklistPrefix string
-	SSOTokenBlacklistPrefix        string
+	SSOPKCETTL              time.Duration
-	SSOPKCETTL                     time.Duration
+	SSOUserSyncDrift        time.Duration
-	SSOUserSyncDrift               time.Duration
+	SSOUserSyncNonceTTL     time.Duration
-	SSOUserSyncNonceTTL            time.Duration
+	SSOUserSyncMaxBodyBytes int
-	SSOUserSyncMaxBodyBytes        int
+	S3Endpoint              string
-	S3Endpoint                     string
+	S3Region                string
-	S3Region                       string
+	S3Bucket                string
-	S3Bucket                       string
+	S3AccessKey             string
-	S3AccessKey                    string
+	S3SecretKey             string
-	S3SecretKey                    string
+	S3ForcePathStyle        bool
-	S3ForcePathStyle               bool
+	S3PublicBaseURL         string
-	S3PublicBaseURL                string
+	S3DocumentKeyPrefix     string
-	S3EnvPrefix                    string
-	S3DocumentKeyPrefix            string
-	TransferToLayingGrowingMaxWeek int
 )
 
 func init() {
@@ -118,11 +115,6 @@ func init() {
 	// Redis
 	RedisURL = viper.GetString("REDIS_URL")
 
-	TransferToLayingGrowingMaxWeek = viper.GetInt("TRANSFER_TO_LAYING_GROWING_MAX_WEEK")
-	if TransferToLayingGrowingMaxWeek <= 0 {
-		TransferToLayingGrowingMaxWeek = 19
-	}
-
 	// Object storage
 	S3Endpoint = strings.TrimSpace(viper.GetString("S3_ENDPOINT"))
 	S3Region = strings.TrimSpace(viper.GetString("S3_REGION"))
@@ -131,12 +123,7 @@ 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")), "/")
-	S3EnvPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_ENV_PREFIX")), "/"), "local")
+	S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
-	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")
@@ -151,10 +138,6 @@ 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
@@ -259,17 +242,6 @@ 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/20260126093054_create_field_stock.up.sql

@@ -16,3 +16,4 @@ UPDATE stock_logs t
 SET stock = c.running_stock
 FROM calc c
 WHERE t.id = c.id;
+

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

@@ -1,56 +0,0 @@
-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

@@ -1,59 +0,0 @@
-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/20260128035908_alter_documents_path_length.down.sql

@@ -1,7 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

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

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

@@ -1,33 +0,0 @@
--- 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/20260203034048_add_field_adj_number.down.sql

@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE adjustment_stocks
-DROP COLUMN adj_number;
-
-COMMIT;

internal/database/migrations/20260203034048_add_field_adj_number.up.sql

@@ -1,10 +0,0 @@
-BEGIN;
-
-ALTER TABLE adjustment_stocks
-ADD COLUMN adj_number VARCHAR(255);
-
-UPDATE adjustment_stocks
-SET adj_number = CONCAT('ADJ-', LPAD(id::text, 5, '0'))
-WHERE adj_number IS NULL;
-
-COMMIT;

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

@@ -1,8 +0,0 @@
--- 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

@@ -1,9 +0,0 @@
--- 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/database/migrations/20260203063959_remove_fcr_id_project_flock.down.sql

@@ -1,47 +0,0 @@
-BEGIN;
-
-DO $$
-DECLARE
-    fallback_fcr_id BIGINT;
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1
-        FROM information_schema.columns
-        WHERE table_schema = 'public'
-          AND table_name = 'project_flocks'
-          AND column_name = 'fcr_id'
-    ) THEN
-        ALTER TABLE project_flocks
-            ADD COLUMN fcr_id BIGINT;
-    END IF;
-
-    SELECT id INTO fallback_fcr_id
-    FROM fcrs
-    ORDER BY id ASC
-    LIMIT 1;
-
-    IF fallback_fcr_id IS NOT NULL THEN
-        UPDATE project_flocks
-        SET fcr_id = fallback_fcr_id
-        WHERE fcr_id IS NULL;
-
-        ALTER TABLE project_flocks
-            ALTER COLUMN fcr_id SET NOT NULL;
-    END IF;
-
-    IF EXISTS (
-        SELECT 1
-        FROM pg_constraint
-        WHERE conname = 'project_flocks_fcr_id_fkey'
-    ) THEN
-        ALTER TABLE project_flocks
-            DROP CONSTRAINT project_flocks_fcr_id_fkey;
-    END IF;
-
-    ALTER TABLE project_flocks
-        ADD CONSTRAINT project_flocks_fcr_id_fkey
-        FOREIGN KEY (fcr_id) REFERENCES fcrs(id)
-        ON DELETE RESTRICT ON UPDATE CASCADE;
-END $$;
-
-COMMIT;

internal/database/migrations/20260203063959_remove_fcr_id_project_flock.up.sql

@@ -1,26 +0,0 @@
-BEGIN;
-
-DO $$
-BEGIN
-    IF EXISTS (
-        SELECT 1
-        FROM information_schema.columns
-        WHERE table_schema = 'public'
-          AND table_name = 'project_flocks'
-          AND column_name = 'fcr_id'
-    ) THEN
-        IF EXISTS (
-            SELECT 1
-            FROM pg_constraint
-            WHERE conname = 'project_flocks_fcr_id_fkey'
-        ) THEN
-            ALTER TABLE project_flocks
-                DROP CONSTRAINT project_flocks_fcr_id_fkey;
-        END IF;
-
-        ALTER TABLE project_flocks
-            DROP COLUMN fcr_id;
-    END IF;
-END $$;
-
-COMMIT;

internal/database/migrations/20260216125014_add_depletions_recording_total_used.down.sql

@@ -1,12 +0,0 @@
-BEGIN;
-
-ALTER TABLE recording_depletions
-    DROP CONSTRAINT IF EXISTS chk_recording_depletions_pending_zero;
-
-ALTER TABLE recording_depletions
-    DROP COLUMN IF EXISTS total_used_qty;
-
-ALTER TABLE recording_depletions
-    DROP COLUMN IF EXISTS usage_qty;
-
-COMMIT;

internal/database/migrations/20260216125014_add_depletions_recording_total_used.up.sql

@@ -1,15 +0,0 @@
-BEGIN;
-
-ALTER TABLE recording_depletions
-    ADD COLUMN IF NOT EXISTS total_used_qty numeric(15, 3) NOT NULL DEFAULT 0,
-    ADD COLUMN IF NOT EXISTS usage_qty numeric(15, 3) NOT NULL DEFAULT 0;
-
-UPDATE recording_depletions
-SET pending_qty = 0
-WHERE pending_qty IS NULL OR pending_qty <> 0;
-
-ALTER TABLE recording_depletions
-    ADD CONSTRAINT chk_recording_depletions_pending_zero
-    CHECK (pending_qty = 0);
-
-COMMIT;

internal/database/migrations/20260218090000_create_fifo_stock_v2_core.down.sql

@@ -1,24 +0,0 @@
-BEGIN;
-
-DROP INDEX IF EXISTS idx_stock_allocations_idempotency;
-DROP INDEX IF EXISTS idx_stock_allocations_flag_group;
-DROP INDEX IF EXISTS idx_stock_allocations_engine_version;
-
-ALTER TABLE stock_allocations
-    DROP COLUMN IF EXISTS idempotency_key,
-    DROP COLUMN IF EXISTS reflow_run_id,
-    DROP COLUMN IF EXISTS function_code,
-    DROP COLUMN IF EXISTS flag_group_code,
-    DROP COLUMN IF EXISTS engine_version;
-
-DROP TABLE IF EXISTS fifo_stock_v2_shadow_allocations;
-DROP TABLE IF EXISTS fifo_stock_v2_reflow_checkpoints;
-DROP TABLE IF EXISTS fifo_stock_v2_reflow_runs;
-DROP TABLE IF EXISTS fifo_stock_v2_operation_log;
-DROP TABLE IF EXISTS fifo_stock_v2_overconsume_rules;
-DROP TABLE IF EXISTS fifo_stock_v2_route_rules;
-DROP TABLE IF EXISTS fifo_stock_v2_traits;
-DROP TABLE IF EXISTS fifo_stock_v2_flag_members;
-DROP TABLE IF EXISTS fifo_stock_v2_flag_groups;
-
-COMMIT;

internal/database/migrations/20260218090000_create_fifo_stock_v2_core.up.sql

@@ -1,151 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_flag_groups (
-    code VARCHAR(64) PRIMARY KEY,
-    name VARCHAR(128) NOT NULL,
-    priority INT NOT NULL DEFAULT 100,
-    is_active BOOLEAN NOT NULL DEFAULT TRUE,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_flag_members (
-    flag_name VARCHAR(64) PRIMARY KEY,
-    flag_group_code VARCHAR(64) NOT NULL REFERENCES fifo_stock_v2_flag_groups(code),
-    priority INT NOT NULL DEFAULT 100,
-    is_active BOOLEAN NOT NULL DEFAULT TRUE,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_traits (
-    id BIGSERIAL PRIMARY KEY,
-    source_table VARCHAR(64) NOT NULL,
-    lane VARCHAR(16) NOT NULL CHECK (lane IN ('STOCKABLE', 'USABLE')),
-    date_table VARCHAR(64) NULL,
-    date_join_left_col VARCHAR(64) NULL,
-    date_join_right_col VARCHAR(64) NULL,
-    date_column VARCHAR(64) NOT NULL,
-    fallback_date_column VARCHAR(64) NULL,
-    sort_priority INT NOT NULL DEFAULT 100,
-    id_column VARCHAR(64) NOT NULL DEFAULT 'id',
-    is_active BOOLEAN NOT NULL DEFAULT TRUE,
-    UNIQUE (source_table, lane)
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_route_rules (
-    id BIGSERIAL PRIMARY KEY,
-    flag_group_code VARCHAR(64) NOT NULL REFERENCES fifo_stock_v2_flag_groups(code),
-    lane VARCHAR(16) NOT NULL CHECK (lane IN ('STOCKABLE', 'USABLE')),
-    function_code VARCHAR(64) NOT NULL,
-    source_table VARCHAR(64) NOT NULL,
-    source_id_column VARCHAR(64) NOT NULL DEFAULT 'id',
-    product_warehouse_col VARCHAR(64) NOT NULL,
-    quantity_col VARCHAR(64) NOT NULL,
-    used_quantity_col VARCHAR(64) NULL,
-    pending_quantity_col VARCHAR(64) NULL,
-    scope_sql TEXT NULL,
-    legacy_type_key VARCHAR(100) NOT NULL,
-    allow_pending_default BOOLEAN NOT NULL DEFAULT TRUE,
-    is_active BOOLEAN NOT NULL DEFAULT TRUE,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    UNIQUE (flag_group_code, lane, function_code, source_table)
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_overconsume_rules (
-    id BIGSERIAL PRIMARY KEY,
-    flag_group_code VARCHAR(64) NULL REFERENCES fifo_stock_v2_flag_groups(code),
-    function_code VARCHAR(64) NULL,
-    lane VARCHAR(16) NOT NULL DEFAULT 'USABLE' CHECK (lane IN ('STOCKABLE', 'USABLE')),
-    allow_overconsume BOOLEAN NOT NULL,
-    priority INT NOT NULL DEFAULT 100,
-    reason TEXT NULL,
-    is_active BOOLEAN NOT NULL DEFAULT TRUE
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_operation_log (
-    id BIGSERIAL PRIMARY KEY,
-    idempotency_key VARCHAR(128) NOT NULL,
-    operation VARCHAR(16) NOT NULL CHECK (operation IN ('ALLOCATE', 'ROLLBACK', 'REFLOW', 'RECALCULATE')),
-    product_warehouse_id BIGINT NOT NULL,
-    flag_group_code VARCHAR(64) NOT NULL,
-    usable_type VARCHAR(100) NULL,
-    usable_id BIGINT NULL,
-    request_hash VARCHAR(64) NOT NULL,
-    status VARCHAR(16) NOT NULL CHECK (status IN ('RUNNING', 'DONE', 'FAILED')),
-    result_payload JSONB NULL,
-    error_text TEXT NULL,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    finished_at TIMESTAMPTZ NULL,
-    UNIQUE (idempotency_key, operation)
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_reflow_runs (
-    id BIGSERIAL PRIMARY KEY,
-    mode VARCHAR(16) NOT NULL CHECK (mode IN ('DRY_RUN', 'APPLY')),
-    status VARCHAR(16) NOT NULL CHECK (status IN ('RUNNING', 'PAUSED', 'DONE', 'FAILED', 'CANCELLED')),
-    as_of TIMESTAMPTZ NULL,
-    started_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    finished_at TIMESTAMPTZ NULL,
-    total_shards INT NOT NULL DEFAULT 0,
-    processed_shards INT NOT NULL DEFAULT 0,
-    processed_rows BIGINT NOT NULL DEFAULT 0,
-    mismatch_rows BIGINT NOT NULL DEFAULT 0,
-    created_by BIGINT NULL,
-    note TEXT NULL
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_reflow_checkpoints (
-    id BIGSERIAL PRIMARY KEY,
-    run_id BIGINT NOT NULL REFERENCES fifo_stock_v2_reflow_runs(id) ON DELETE CASCADE,
-    flag_group_code VARCHAR(64) NOT NULL,
-    product_warehouse_id BIGINT NOT NULL,
-    last_sort_at TIMESTAMPTZ NULL,
-    last_source_table VARCHAR(64) NULL,
-    last_source_id BIGINT NULL,
-    status VARCHAR(16) NOT NULL CHECK (status IN ('PENDING', 'RUNNING', 'DONE', 'FAILED')) DEFAULT 'PENDING',
-    retry_count INT NOT NULL DEFAULT 0,
-    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    UNIQUE (run_id, flag_group_code, product_warehouse_id)
-);
-
-CREATE TABLE IF NOT EXISTS fifo_stock_v2_shadow_allocations (
-    id BIGSERIAL PRIMARY KEY,
-    run_id BIGINT NOT NULL REFERENCES fifo_stock_v2_reflow_runs(id) ON DELETE CASCADE,
-    product_warehouse_id BIGINT NOT NULL,
-    stockable_type VARCHAR(100) NOT NULL,
-    stockable_id BIGINT NOT NULL,
-    usable_type VARCHAR(100) NOT NULL,
-    usable_id BIGINT NOT NULL,
-    qty NUMERIC(15,3) NOT NULL,
-    status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE',
-    sort_at TIMESTAMPTZ NULL,
-    source_table VARCHAR(64) NULL,
-    source_id BIGINT NULL,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
-);
-
-CREATE INDEX IF NOT EXISTS idx_fifo_v2_shadow_run_usable
-    ON fifo_stock_v2_shadow_allocations(run_id, usable_type, usable_id);
-
-CREATE INDEX IF NOT EXISTS idx_fifo_v2_shadow_run_stockable
-    ON fifo_stock_v2_shadow_allocations(run_id, stockable_type, stockable_id);
-
-ALTER TABLE stock_allocations
-    ADD COLUMN IF NOT EXISTS engine_version VARCHAR(8) NOT NULL DEFAULT 'v1',
-    ADD COLUMN IF NOT EXISTS flag_group_code VARCHAR(64) NULL,
-    ADD COLUMN IF NOT EXISTS function_code VARCHAR(64) NULL,
-    ADD COLUMN IF NOT EXISTS reflow_run_id BIGINT NULL,
-    ADD COLUMN IF NOT EXISTS idempotency_key VARCHAR(128) NULL;
-
-CREATE INDEX IF NOT EXISTS idx_stock_allocations_engine_version
-    ON stock_allocations(engine_version);
-
-CREATE INDEX IF NOT EXISTS idx_stock_allocations_flag_group
-    ON stock_allocations(flag_group_code);
-
-CREATE INDEX IF NOT EXISTS idx_stock_allocations_idempotency
-    ON stock_allocations(idempotency_key);
-
-COMMIT;

internal/database/migrations/20260218090010_seed_fifo_stock_v2_config.down.sql

@@ -1,36 +0,0 @@
-BEGIN;
-
-DELETE FROM fifo_stock_v2_overconsume_rules
-WHERE reason IN (
-    'fifo_v2_default_allow',
-    'fifo_v2_exception_ayam_depletion_block',
-    'fifo_v2_exception_marketing_block',
-    'fifo_v2_exception_transfer_block',
-    'fifo_v2_exception_adjustment_block',
-    'fifo_v2_exception_transfer_laying_block'
-);
-
-DELETE FROM fifo_stock_v2_route_rules
-WHERE flag_group_code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
-
-DELETE FROM fifo_stock_v2_traits
-WHERE source_table IN (
-    'purchase_items',
-    'stock_transfer_details',
-    'laying_transfer_targets',
-    'laying_transfer_sources',
-    'adjustment_stocks',
-    'recording_stocks',
-    'recording_depletions',
-    'recording_eggs',
-    'marketing_delivery_products',
-    'project_chickins'
-);
-
-DELETE FROM fifo_stock_v2_flag_members
-WHERE flag_group_code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
-
-DELETE FROM fifo_stock_v2_flag_groups
-WHERE code IN ('AYAM', 'AFKIR_CULLING_MATI', 'PAKAN', 'OVK', 'TELUR', 'TELUR_GRADE');
-
-COMMIT;

internal/database/migrations/20260218090010_seed_fifo_stock_v2_config.up.sql

@@ -1,248 +0,0 @@
-BEGIN;
-
-INSERT INTO fifo_stock_v2_flag_groups(code, name, priority)
-VALUES
-    ('AYAM', 'AYAM', 10),
-    ('AFKIR_CULLING_MATI', 'AFKIR/CULLING/MATI', 20),
-    ('PAKAN', 'PAKAN', 30),
-    ('OVK', 'OVK', 40),
-    ('TELUR', 'TELUR', 50),
-    ('TELUR_GRADE', 'UTUH/PUTIH/RETAK/PECAH/PAPACAL/JUMBO', 60)
-ON CONFLICT (code) DO UPDATE
-SET
-    name = EXCLUDED.name,
-    priority = EXCLUDED.priority,
-    updated_at = NOW();
-
-INSERT INTO fifo_stock_v2_flag_members(flag_name, flag_group_code, priority)
-VALUES
-    ('DOC', 'AYAM', 10),
-    ('PULLET', 'AYAM', 20),
-    ('LAYER', 'AYAM', 30),
-
-    ('AYAM-AFKIR', 'AFKIR_CULLING_MATI', 10),
-    ('AYAM-CULLING', 'AFKIR_CULLING_MATI', 20),
-    ('AYAM-MATI', 'AFKIR_CULLING_MATI', 30),
-
-    ('PAKAN', 'PAKAN', 10),
-    ('PRE-STARTER', 'PAKAN', 20),
-    ('STARTER', 'PAKAN', 30),
-    ('FINISHER', 'PAKAN', 40),
-
-    ('OVK', 'OVK', 10),
-    ('OBAT', 'OVK', 20),
-    ('VITAMIN', 'OVK', 30),
-    ('KIMIA', 'OVK', 40),
-
-    ('TELUR', 'TELUR', 10),
-
-    ('TELUR-UTUH', 'TELUR_GRADE', 10),
-    ('TELUR-PUTIH', 'TELUR_GRADE', 20),
-    ('TELUR-RETAK', 'TELUR_GRADE', 30),
-    ('TELUR-PECAH', 'TELUR_GRADE', 40),
-    ('TELUR-PAPACAL', 'TELUR_GRADE', 50),
-    ('TELUR-JUMBO', 'TELUR_GRADE', 60)
-ON CONFLICT (flag_name) DO UPDATE
-SET
-    flag_group_code = EXCLUDED.flag_group_code,
-    priority = EXCLUDED.priority,
-    updated_at = NOW();
-
-INSERT INTO fifo_stock_v2_traits(
-    source_table,
-    lane,
-    date_table,
-    date_join_left_col,
-    date_join_right_col,
-    date_column,
-    fallback_date_column,
-    sort_priority,
-    id_column
-)
-VALUES
-    ('purchase_items', 'STOCKABLE', NULL, NULL, NULL, 'received_date', NULL, 10, 'id'),
-
-    ('stock_transfer_details', 'STOCKABLE', 'stock_transfers', 'stock_transfer_id', 'id', 'transfer_date', NULL, 20, 'id'),
-    ('stock_transfer_details', 'USABLE', 'stock_transfers', 'stock_transfer_id', 'id', 'transfer_date', NULL, 20, 'id'),
-
-    ('laying_transfer_targets', 'STOCKABLE', 'laying_transfers', 'laying_transfer_id', 'id', 'transfer_date', NULL, 25, 'id'),
-    ('laying_transfer_sources', 'USABLE', 'laying_transfers', 'laying_transfer_id', 'id', 'transfer_date', NULL, 25, 'id'),
-
-    ('adjustment_stocks', 'STOCKABLE', NULL, NULL, NULL, 'created_at', NULL, 30, 'id'),
-    ('adjustment_stocks', 'USABLE', NULL, NULL, NULL, 'created_at', NULL, 30, 'id'),
-
-    ('recording_stocks', 'USABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
-    ('recording_depletions', 'USABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
-    ('recording_depletions', 'STOCKABLE', 'recordings', 'recording_id', 'id', 'record_datetime', NULL, 35, 'id'),
-
-    ('recording_eggs', 'STOCKABLE', 'recordings', 'recording_id', 'id', 'record_datetime', 'created_at', 40, 'id'),
-
-    ('marketing_delivery_products', 'USABLE', NULL, NULL, NULL, 'delivery_date', 'created_at', 45, 'id'),
-
-    ('project_chickins', 'USABLE', NULL, NULL, NULL, 'chick_in_date', 'created_at', 50, 'id')
-ON CONFLICT (source_table, lane) DO UPDATE
-SET
-    date_table = EXCLUDED.date_table,
-    date_join_left_col = EXCLUDED.date_join_left_col,
-    date_join_right_col = EXCLUDED.date_join_right_col,
-    date_column = EXCLUDED.date_column,
-    fallback_date_column = EXCLUDED.fallback_date_column,
-    sort_priority = EXCLUDED.sort_priority,
-    id_column = EXCLUDED.id_column,
-    is_active = TRUE;
-
-INSERT INTO fifo_stock_v2_route_rules(
-    flag_group_code,
-    lane,
-    function_code,
-    source_table,
-    source_id_column,
-    product_warehouse_col,
-    quantity_col,
-    used_quantity_col,
-    pending_quantity_col,
-    scope_sql,
-    legacy_type_key,
-    allow_pending_default,
-    is_active
-)
-VALUES
-    -- AYAM STOCKABLE
-    ('AYAM', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('AYAM', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('AYAM', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
-    ('AYAM', 'STOCKABLE', 'TRANSFER_TO_LAYING_IN', 'laying_transfer_targets', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'TRANSFERTOLAYING_IN', TRUE, TRUE),
-
-    -- AYAM USABLE
-    ('AYAM', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'CHICKIN_OUT', 'project_chickins', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'PROJECT_CHICKIN', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'RECORDING_DEPLETION_OUT', 'recording_depletions', 'id', 'source_product_warehouse_id', 'qty', NULL, 'pending_qty', NULL, 'RECORDING_DEPLETION', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-    ('AYAM', 'USABLE', 'TRANSFER_TO_LAYING_OUT', 'laying_transfer_sources', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_usage_qty', 'deleted_at IS NULL', 'TRANSFERTOLAYING_OUT', TRUE, TRUE),
-
-    -- AFKIR/CULLING/MATI STOCKABLE
-    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'STOCKABLE', 'RECORDING_DEPLETION_IN', 'recording_depletions', 'id', 'product_warehouse_id', 'qty', NULL, NULL, NULL, 'RECORDING_DEPLETION', TRUE, TRUE),
-
-    -- AFKIR/CULLING/MATI USABLE
-    ('AFKIR_CULLING_MATI', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('AFKIR_CULLING_MATI', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- PAKAN STOCKABLE
-    ('PAKAN', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('PAKAN', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('PAKAN', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
-
-    -- PAKAN USABLE
-    ('PAKAN', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('PAKAN', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('PAKAN', 'USABLE', 'RECORDING_STOCK_OUT', 'recording_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'RECORDING_STOCK', TRUE, TRUE),
-    ('PAKAN', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- OVK STOCKABLE
-    ('OVK', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('OVK', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('OVK', 'STOCKABLE', 'PURCHASE_IN', 'purchase_items', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'PURCHASE_ITEMS', TRUE, TRUE),
-
-    -- OVK USABLE
-    ('OVK', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('OVK', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('OVK', 'USABLE', 'RECORDING_STOCK_OUT', 'recording_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'RECORDING_STOCK', TRUE, TRUE),
-    ('OVK', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- TELUR STOCKABLE
-    ('TELUR', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('TELUR', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('TELUR', 'STOCKABLE', 'RECORDING_EGG_IN', 'recording_eggs', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'RECORDING_EGG', TRUE, TRUE),
-
-    -- TELUR USABLE
-    ('TELUR', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('TELUR', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('TELUR', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE),
-
-    -- TELUR_GRADE STOCKABLE
-    ('TELUR_GRADE', 'STOCKABLE', 'ADJUSTMENT_IN', 'adjustment_stocks', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'ADJUSTMENT_IN', TRUE, TRUE),
-    ('TELUR_GRADE', 'STOCKABLE', 'STOCK_TRANSFER_IN', 'stock_transfer_details', 'id', 'dest_product_warehouse_id', 'total_qty', 'total_used', NULL, 'deleted_at IS NULL', 'STOCK_TRANSFER_IN', TRUE, TRUE),
-    ('TELUR_GRADE', 'STOCKABLE', 'RECORDING_EGG_IN', 'recording_eggs', 'id', 'product_warehouse_id', 'total_qty', 'total_used', NULL, NULL, 'RECORDING_EGG', TRUE, TRUE),
-
-    -- TELUR_GRADE USABLE
-    ('TELUR_GRADE', 'USABLE', 'ADJUSTMENT_OUT', 'adjustment_stocks', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'ADJUSTMENT_OUT', TRUE, TRUE),
-    ('TELUR_GRADE', 'USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'id', 'source_product_warehouse_id', 'usage_qty', NULL, 'pending_qty', 'deleted_at IS NULL', 'STOCK_TRANSFER_OUT', TRUE, TRUE),
-    ('TELUR_GRADE', 'USABLE', 'MARKETING_OUT', 'marketing_delivery_products', 'id', 'product_warehouse_id', 'usage_qty', NULL, 'pending_qty', NULL, 'MARKETING_DELIVERY', TRUE, TRUE)
-ON CONFLICT (flag_group_code, lane, function_code, source_table) DO UPDATE
-SET
-    source_id_column = EXCLUDED.source_id_column,
-    product_warehouse_col = EXCLUDED.product_warehouse_col,
-    quantity_col = EXCLUDED.quantity_col,
-    used_quantity_col = EXCLUDED.used_quantity_col,
-    pending_quantity_col = EXCLUDED.pending_quantity_col,
-    scope_sql = EXCLUDED.scope_sql,
-    legacy_type_key = EXCLUDED.legacy_type_key,
-    allow_pending_default = EXCLUDED.allow_pending_default,
-    is_active = EXCLUDED.is_active,
-    updated_at = NOW();
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, NULL, 'USABLE', TRUE, 999, 'fifo_v2_default_allow', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code IS NULL
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_default_allow'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT 'AYAM', 'RECORDING_DEPLETION_OUT', 'USABLE', FALSE, 10, 'fifo_v2_exception_ayam_depletion_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code = 'AYAM'
-      AND function_code = 'RECORDING_DEPLETION_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_ayam_depletion_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'MARKETING_OUT', 'USABLE', FALSE, 20, 'fifo_v2_exception_marketing_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'MARKETING_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_marketing_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'STOCK_TRANSFER_OUT', 'USABLE', FALSE, 30, 'fifo_v2_exception_transfer_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'STOCK_TRANSFER_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_transfer_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'ADJUSTMENT_OUT', 'USABLE', FALSE, 40, 'fifo_v2_exception_adjustment_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'ADJUSTMENT_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_adjustment_block'
-);
-
-INSERT INTO fifo_stock_v2_overconsume_rules(flag_group_code, function_code, lane, allow_overconsume, priority, reason, is_active)
-SELECT NULL, 'TRANSFER_TO_LAYING_OUT', 'USABLE', FALSE, 50, 'fifo_v2_exception_transfer_laying_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1 FROM fifo_stock_v2_overconsume_rules
-    WHERE flag_group_code IS NULL
-      AND function_code = 'TRANSFER_TO_LAYING_OUT'
-      AND lane = 'USABLE'
-      AND reason = 'fifo_v2_exception_transfer_laying_block'
-);
-
-COMMIT;

internal/database/migrations/20260225073024_adjustment_stocks_add_fifo_v2_columns.down.sql

@@ -1,12 +0,0 @@
-BEGIN;
-
-DROP INDEX IF EXISTS idx_adjustment_stocks_function_code;
-DROP INDEX IF EXISTS idx_adjustment_stocks_transaction_type;
-
-ALTER TABLE adjustment_stocks
-    DROP COLUMN IF EXISTS grand_total,
-    DROP COLUMN IF EXISTS price,
-    DROP COLUMN IF EXISTS function_code,
-    DROP COLUMN IF EXISTS transaction_type;
-
-COMMIT;

internal/database/migrations/20260225073024_adjustment_stocks_add_fifo_v2_columns.up.sql

@@ -1,23 +0,0 @@
-BEGIN;
-
-ALTER TABLE adjustment_stocks
-    ADD COLUMN IF NOT EXISTS transaction_type VARCHAR(100) NOT NULL DEFAULT 'LEGACY',
-    ADD COLUMN IF NOT EXISTS function_code VARCHAR(64),
-    ADD COLUMN IF NOT EXISTS price NUMERIC(15, 3) NOT NULL DEFAULT 0,
-    ADD COLUMN IF NOT EXISTS grand_total NUMERIC(15, 3) NOT NULL DEFAULT 0;
-
-UPDATE adjustment_stocks
-SET function_code = CASE
-    WHEN COALESCE(total_qty, 0) > 0 THEN 'ADJUSTMENT_IN'
-    WHEN COALESCE(usage_qty, 0) > 0 THEN 'ADJUSTMENT_OUT'
-    ELSE 'ADJUSTMENT_IN'
-END
-WHERE function_code IS NULL OR function_code = '';
-
-CREATE INDEX IF NOT EXISTS idx_adjustment_stocks_transaction_type
-    ON adjustment_stocks(transaction_type);
-
-CREATE INDEX IF NOT EXISTS idx_adjustment_stocks_function_code
-    ON adjustment_stocks(function_code);
-
-COMMIT;

internal/database/migrations/20260227130000_add_deferred_execution_to_laying_transfers.down.sql

@@ -1,11 +0,0 @@
-DROP INDEX IF EXISTS idx_laying_transfers_executed_by;
-DROP INDEX IF EXISTS idx_laying_transfers_executed_at;
-DROP INDEX IF EXISTS idx_laying_transfers_effective_move_date;
-
-ALTER TABLE laying_transfers
-    DROP CONSTRAINT IF EXISTS fk_laying_transfers_executed_by;
-
-ALTER TABLE laying_transfers
-    DROP COLUMN IF EXISTS executed_by,
-    DROP COLUMN IF EXISTS executed_at,
-    DROP COLUMN IF EXISTS effective_move_date;

internal/database/migrations/20260227130000_add_deferred_execution_to_laying_transfers.up.sql

@@ -1,46 +0,0 @@
-ALTER TABLE laying_transfers
-    ADD COLUMN IF NOT EXISTS effective_move_date DATE,
-    ADD COLUMN IF NOT EXISTS executed_at TIMESTAMPTZ,
-    ADD COLUMN IF NOT EXISTS executed_by BIGINT;
-
-DO $$
-BEGIN
-    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users')
-        AND NOT EXISTS (
-            SELECT 1
-            FROM pg_constraint
-            WHERE conname = 'fk_laying_transfers_executed_by'
-        ) THEN
-        ALTER TABLE laying_transfers
-            ADD CONSTRAINT fk_laying_transfers_executed_by
-            FOREIGN KEY (executed_by)
-            REFERENCES users(id)
-            ON DELETE SET NULL
-            ON UPDATE CASCADE;
-    END IF;
-END $$;
-
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_effective_move_date
-    ON laying_transfers(effective_move_date);
-
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_executed_at
-    ON laying_transfers(executed_at);
-
-CREATE INDEX IF NOT EXISTS idx_laying_transfers_executed_by
-    ON laying_transfers(executed_by);
-
--- Backfill historical approved transfers. Before deferred execution,
--- approved transfers were executed immediately during approval.
-UPDATE laying_transfers lt
-SET
-    effective_move_date = COALESCE(lt.effective_move_date, lt.transfer_date),
-    executed_at = COALESCE(lt.executed_at, lt.updated_at),
-    executed_by = COALESCE(lt.executed_by, lt.created_by)
-WHERE (
-    SELECT a.action
-    FROM approvals a
-    WHERE a.approvable_type = 'TRANSFER_TO_LAYINGS'
-      AND a.approvable_id = lt.id
-    ORDER BY a.id DESC
-    LIMIT 1
-) = 'APPROVED';

internal/database/seed/seeder.go

@@ -74,7 +74,7 @@ func seedUsers(tx *gorm.DB) (map[string]uint, error) {
 }
 
 func seedUoms(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
-	names := []string{"Kilogram", "Gram", "Liter", "Unit", "Ekor", "Butir"}
+	names := []string{"Kilogram", "Gram", "Liter", "Unit", "Ekor"}
 	result := make(map[string]uint, len(names))
 
 	for _, name := range names {
@@ -235,7 +235,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Utuh",
 			Brand:     "-",
 			Sku:       "4",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurUtuh},
@@ -245,7 +245,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Pecah",
 			Brand:     "-",
 			Sku:       "5",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurPecah},
@@ -255,7 +255,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Putih",
 			Brand:     "-",
 			Sku:       "6",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurPutih},
@@ -265,32 +265,12 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Retak",
 			Brand:     "-",
 			Sku:       "7",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurRetak},
 			IsVisible: false,
 		},
-		{
-			Name:      "Telur Papacal",
-			Brand:     "-",
-			Sku:       "8",
-			Uom:       "Butir",
-			Category:  "Telur",
-			Price:     1,
-			Flags:     []utils.FlagType{utils.FlagTelur},
-			IsVisible: false,
-		},
-		{
-			Name:      "Telur Jumbo",
-			Brand:     "-",
-			Sku:       "9",
-			Uom:       "Butir",
-			Category:  "Telur",
-			Price:     1,
-			Flags:     []utils.FlagType{utils.FlagTelur},
-			IsVisible: false,
-		},
 	}
 
 	for _, seed := range seeds {

internal/entities/adjustment_stock.go

@@ -5,17 +5,12 @@ import "time"
 type AdjustmentStock struct {
 	Id                 uint      `gorm:"primaryKey"`
 	ProductWarehouseId uint      `gorm:"column:product_warehouse_id;not null"`
-	TransactionType    string    `gorm:"column:transaction_type;type:varchar(100);not null;default:LEGACY"`
-	FunctionCode       string    `gorm:"column:function_code;type:varchar(64)"`
 	TotalQty           float64   `gorm:"column:total_qty;default:0"`
 	TotalUsed          float64   `gorm:"column:total_used;default:0"`
 	UsageQty           float64   `gorm:"column:usage_qty;default:0"`
 	PendingQty         float64   `gorm:"column:pending_qty;default:0"`
-	Price              float64   `gorm:"column:price;type:numeric(15,3);default:0"`
-	GrandTotal         float64   `gorm:"column:grand_total;type:numeric(15,3);default:0"`
 	CreatedAt          time.Time `gorm:"column:created_at;autoCreateTime"`
 	UpdatedAt          time.Time `gorm:"column:updated_at;autoUpdateTime"`
-	AdjNumber          string    `gorm:"column:adj_number;uniqueIndex;not null"`
 
 	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:255;not null"`
+	Path             string    `gorm:"size:50;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/laying_transfer.go

@@ -12,20 +12,16 @@ type LayingTransfer struct {
 	FromProjectFlockId uint           `gorm:"not null"`
 	ToProjectFlockId   uint           `gorm:"not null"`
 	TransferDate       time.Time      `gorm:"type:date;not null"`
-	EffectiveMoveDate  *time.Time     `gorm:"type:date"`
-	ExecutedAt         *time.Time     `gorm:"type:timestamptz"`
-	ExecutedBy         *uint          `gorm:"index"`
 	Notes              string         `gorm:"type:text"`
 	CreatedBy          uint           `gorm:"not null"`
 	CreatedAt          time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt          gorm.DeletedAt `gorm:"index"`
 
-	FromProjectFlock *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
+	FromProjectFlock    *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
-	ToProjectFlock   *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
+	ToProjectFlock      *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
-	CreatedUser      *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
+	CreatedUser         *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
-	ExecutedUser     *User                  `gorm:"foreignKey:ExecutedBy;references:Id"`
+	Sources             []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	Sources          []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	Targets             []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	Targets          []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	LatestApproval      *Approval              `gorm:"-" json:"-"`
-	LatestApproval   *Approval              `gorm:"-" json:"-"`
 }

internal/entities/marketing.go

@@ -14,7 +14,6 @@ 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,17 +1,14 @@
 package entities
 
 type MarketingProduct struct {
-	Id                  uint     `gorm:"primaryKey;autoIncrement"`
+	Id                 uint    `gorm:"primaryKey;autoIncrement"`
-	MarketingId         uint     `gorm:"not null"`
+	MarketingId        uint    `gorm:"not null"`
-	ProductWarehouseId  uint     `gorm:"not null"`
+	ProductWarehouseId uint    `gorm:"not null"`
-	Qty                 float64  `gorm:"type:numeric(15,3);not null"`
+	Qty                float64 `gorm:"type:numeric(15,3);not null"`
-	ConvertionUnit      *string  `gorm:"type:varchar(20)"`
+	UnitPrice          float64 `gorm:"type:numeric(15,3);not null"`
-	WeightPerConvertion *float64 `gorm:"type:numeric(15,3)"`
+	AvgWeight          float64 `gorm:"type:numeric(15,3);not null"`
-	Week                *int     `gorm:"type:integer"`
+	TotalWeight        float64 `gorm:"type:numeric(15,3);not null"`
-	UnitPrice           float64  `gorm:"type:numeric(15,3);not null"`
+	TotalPrice         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/projectflock.go

@@ -11,6 +11,7 @@ type ProjectFlock struct {
 	FlockName  string         `gorm:"type:varchar(255);not null;uniqueIndex"`
 	AreaId     uint           `gorm:"not null"`
 	Category   string         `gorm:"type:varchar(20);not null"`
+	FcrId      uint           `gorm:"not null"`
 	ProductionStandardId uint `gorm:"column:production_standard_id"`
 	LocationId uint           `gorm:"not null"`
 	CreatedBy  uint           `gorm:"not null"`
@@ -19,6 +20,7 @@ type ProjectFlock struct {
 	DeletedAt  gorm.DeletedAt `gorm:"index" json:"-"`
 
 	Area           Area                  `gorm:"foreignKey:AreaId;references:Id"`
+	Fcr            Fcr                   `gorm:"foreignKey:FcrId;references:Id"`
 	ProductionStandard ProductionStandard `gorm:"foreignKey:ProductionStandardId;references:Id"`
 	Location       Location              `gorm:"foreignKey:LocationId;references:Id"`
 	CreatedUser    User                  `gorm:"foreignKey:CreatedBy;references:Id"`

internal/entities/purchase_item.go

@@ -21,7 +21,6 @@ type PurchaseItem struct {
 	Price                 float64 `gorm:"type:numeric(15,3);default:0"`
 	TotalPrice            float64 `gorm:"type:numeric(15,3);default:0"`
 	ExpenseNonstockId     *uint64
-	HasChickin            bool `gorm:"-" json:"-"`
 
 	// Relations
 	ExpenseNonstock  *ExpenseNonstock  `gorm:"foreignKey:ExpenseNonstockId;references:Id"`

internal/entities/recording.go

@@ -12,9 +12,7 @@ type Recording struct {
 	RecordDatetime        time.Time      `gorm:"column:record_datetime;not null"`
 	Day                   *int           `gorm:"column:day"`
 	TotalDepletionQty     *float64       `gorm:"column:total_depletion_qty"`
-	TotalDepletionCumQty  *float64       `gorm:"-"`
 	CumDepletionRate      *float64       `gorm:"column:cum_depletion_rate"`
-	DepletionRate         *float64       `gorm:"-"`
 	CumIntake             *int           `gorm:"column:cum_intake"`
 	FcrValue              *float64       `gorm:"column:fcr_value"`
 	TotalChickQty         *float64       `gorm:"column:total_chick_qty"`

internal/entities/recording_depletion.go

@@ -6,7 +6,6 @@ type RecordingDepletion struct {
 	ProductWarehouseId       uint    `gorm:"column:product_warehouse_id;not null"`
 	SourceProductWarehouseId *uint   `gorm:"column:source_product_warehouse_id"`
 	Qty                      float64 `gorm:"column:qty;not null"`
-	UsageQty                 float64 `gorm:"column:usage_qty"`
 	PendingQty               float64 `gorm:"column:pending_qty"`
 
 	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`

internal/entities/stock_log.go

@@ -9,7 +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"`
+	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,10 +24,6 @@ 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
@@ -71,19 +67,15 @@ 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 p, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
+			if profile, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
 				utils.Log.WithError(err).Warn("auth: failed to fetch sso profile")
-			} else {
+			} else if profile != nil {
-				profile = p
+				roles = profile.Roles
-			}
+				for _, perm := range profile.PermissionNames() {
-		}
+					if perm != "" {
-		if profile != nil {
+						permissions[perm] = struct{}{}
-			roles = profile.Roles
+					}
-			for _, perm := range profile.PermissionNames() {
-				if perm != "" {
-					permissions[perm] = struct{}{}
 				}
 			}
 		}
@@ -94,16 +86,6 @@ 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

@@ -1,636 +0,0 @@
-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,15 +44,6 @@ 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,
@@ -61,7 +52,6 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 		Page:        page,
 		Limit:       limit,
 		Search:      search,
-		OrderByDate: orderByDate,
 	}
 
 	records, totalResults, err := u.ApprovalService.List(
@@ -71,7 +61,6 @@ 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,5 +7,4 @@ 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/controllers/closing.controller.go

@@ -347,12 +347,12 @@ func (u *ClosingController) GetSapronakByProject(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
 	}
 
-	result, productFlags, err := u.SapronakService.GetSapronakByProject(c, uint(projectID), flag)
+	result, err := u.SapronakService.GetSapronakByProject(c, uint(projectID), flag)
 	if err != nil {
 		return err
 	}
 
-	payload := dto.ToSapronakProjectAggregatedFromReports(result, flag, productFlags)
+	payload := dto.ToSapronakProjectAggregatedFromReports(result, flag)
 
 	return c.Status(fiber.StatusOK).
 		JSON(response.Success{
@@ -377,12 +377,12 @@ func (u *ClosingController) GetSapronakByKandang(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
 	}
 
-	result, productFlags, err := u.SapronakService.GetSapronakByKandang(c, uint(projectID), uint(pfkID), flag)
+	result, err := u.SapronakService.GetSapronakByKandang(c, uint(projectID), uint(pfkID), flag)
 	if err != nil {
 		return err
 	}
 
-	payload := dto.ToSapronakProjectAggregatedFromReport(result, flag, productFlags)
+	payload := dto.ToSapronakProjectAggregatedFromReport(result, flag)
 
 	return c.Status(fiber.StatusOK).
 		JSON(response.Success{

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

@@ -101,44 +101,17 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	}
 }
 
-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{

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

@@ -1,7 +1,6 @@
 package dto
 
 import (
-	"sort"
 	"strings"
 	"time"
 )
@@ -65,7 +64,7 @@ type SapronakCategoryRowDTO struct {
 	QtyOut          float64 `json:"qty_out"`
 	QtyUsed         float64 `json:"qty_used"`
 	Description     string  `json:"description"`
-	ProductCategory []string `json:"product_category"`
+	ProductCategory string  `json:"product_category"`
 	UnitPrice       float64 `json:"unit_price"`
 	TotalAmount     float64 `json:"total_amount"`
 	Notes           string  `json:"notes"`
@@ -128,7 +127,7 @@ type UomSummaryDTO struct {
 
 // === Mapper Functions for Aggregated Sapronak Response ===
 
-func ToSapronakProjectAggregatedFromReports(reports []SapronakReportDTO, flag string, productFlags map[uint][]string) SapronakProjectAggregatedDTO {
+func ToSapronakProjectAggregatedFromReports(reports []SapronakReportDTO, flag string) SapronakProjectAggregatedDTO {
 	result := SapronakProjectAggregatedDTO{}
 
 	if len(reports) == 0 {
@@ -136,10 +135,10 @@ func ToSapronakProjectAggregatedFromReports(reports []SapronakReportDTO, flag st
 	}
 
 	rep := reports[0]
-	return ToSapronakProjectAggregatedFromReport(&rep, flag, productFlags)
+	return ToSapronakProjectAggregatedFromReport(&rep, flag)
 }
 
-func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag string, productFlags map[uint][]string) SapronakProjectAggregatedDTO {
+func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag string) SapronakProjectAggregatedDTO {
 	result := SapronakProjectAggregatedDTO{}
 
 	if report == nil {
@@ -176,53 +175,6 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 		return t.Format("02-Jan-2006")
 	}
 
-	flagOrder := map[string]int{
-		"DOC":    0,
-		"PAKAN":  0,
-		"OVK":    0,
-		"PULLET": 0,
-	}
-
-	buildFlagList := func(productID uint, fallback string) []string {
-		rawFlags := productFlags[productID]
-		if len(rawFlags) == 0 {
-			if fallback == "" {
-				return []string{}
-			}
-			return []string{fallback}
-		}
-		seen := make(map[string]struct{}, len(rawFlags))
-		ordered := make([]string, 0, len(rawFlags))
-		for _, f := range rawFlags {
-			flagName := strings.ToUpper(strings.TrimSpace(f))
-			if flagName == "" {
-				continue
-			}
-			if _, ok := seen[flagName]; ok {
-				continue
-			}
-			seen[flagName] = struct{}{}
-			ordered = append(ordered, flagName)
-		}
-		sort.SliceStable(ordered, func(i, j int) bool {
-			li := ordered[i]
-			lj := ordered[j]
-			ri, iok := flagOrder[li]
-			rj, jok := flagOrder[lj]
-			if iok != jok {
-				if iok {
-					return true
-				}
-				return false
-			}
-			if iok && jok && ri != rj {
-				return ri < rj
-			}
-			return li < lj
-		})
-		return ordered
-	}
-
 	for _, group := range report.Groups {
 		flagKey := normalizeFlag(group.Flag)
 		ptr := byFlag[flagKey]
@@ -254,7 +206,7 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 				Date:            formatDate(item.Tanggal),
 				ReferenceNumber: item.NoReferensi,
 				Description:     item.ProductName,
-				ProductCategory: buildFlagList(item.ProductID, flagKey),
+				ProductCategory: item.ProductName,
 				UnitPrice:       item.Harga,
 				Notes:           "-",
 			}
@@ -282,14 +234,14 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 						row.Notes = "TRANSFER STOCK"
 					}
 				}
-			case "pemakaian":
+			case "pemakaian", "adjustment keluar":
 				price := row.UnitPrice
 				if price == 0 {
 					price = item.Harga
 				}
 				row.QtyUsed += item.QtyKeluar
 				row.TotalAmount += item.QtyKeluar * price
-			case "adjustment keluar", "mutasi keluar", "penjualan":
+			case "mutasi keluar", "penjualan":
 				price := row.UnitPrice
 				if price == 0 {
 					price = item.Harga

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

@@ -24,6 +24,7 @@ type ClosingRepository interface {
 	SumMarketingWeightAndQtyByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, float64, error)
 	SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error)
 	SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error)
+	GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error)
 	GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error)
 	FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error)
 	FetchSapronakIncomingDetails(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error)
@@ -35,7 +36,6 @@ type ClosingRepository interface {
 	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, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
-	FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
 	GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error)
 }
 
@@ -101,12 +101,12 @@ func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params Sapronak
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakRow{}, 0, nil
 		}
-		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
-			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
+			unionParts = append(unionParts, sapronakOutgoingTransfersSQL)
-			args = append(args, params.WarehouseIDs, params.WarehouseIDs)
+			args = append(args, params.WarehouseIDs)
 		}
 		if len(params.ProjectFlockKandangIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingMarketingsSQL)
@@ -173,12 +173,12 @@ func (r *ClosingRepositoryImpl) GetSapronakSummary(ctx context.Context, params S
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakSummaryRow{}, nil
 		}
-		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
-			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
+			unionParts = append(unionParts, sapronakOutgoingTransfersSQL)
-			args = append(args, params.WarehouseIDs, params.WarehouseIDs)
+			args = append(args, params.WarehouseIDs)
 		}
 		if len(params.ProjectFlockKandangIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingMarketingsSQL)
@@ -355,10 +355,9 @@ 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(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").
+		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").
 		Scan(&agg).Error
 	if err != nil {
 		return 0, 0, 0, err
@@ -392,6 +391,22 @@ func (r *ClosingRepositoryImpl) SumRecordingEggQtyByProjectFlockKandangIDsAndFla
 	return agg.TotalQty, nil
 }
 
+func (r *ClosingRepositoryImpl) GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error) {
+	if fcrID == 0 {
+		return []entity.FcrStandard{}, nil
+	}
+
+	var standards []entity.FcrStandard
+	if err := r.DB().WithContext(ctx).
+		Where("fcr_id = ?", fcrID).
+		Order("weight ASC").
+		Find(&standards).Error; err != nil {
+		return nil, err
+	}
+
+	return standards, nil
+}
+
 func (r *ClosingRepositoryImpl) GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error) {
 	db := r.DB().WithContext(ctx)
 
@@ -439,7 +454,7 @@ SELECT
 	COALESCE(pi.received_date, '1970-01-01') AS sort_date,
 	COALESCE(TO_CHAR(pi.received_date, 'DD-Mon-YYYY'), '') AS date_text,
 	COALESCE(p.po_number, '') AS reference_number,
-	'Pembelian' AS transaction_type,
+	'Purchase' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -488,7 +503,7 @@ SELECT
 	st.transfer_date AS sort_date,
 	TO_CHAR(st.transfer_date, 'DD-Mon-YYYY') AS date_text,
 	st.movement_number AS reference_number,
-	'Mutasi' AS transaction_type,
+	'Internal Transfer In' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -522,7 +537,7 @@ SELECT
 	std.usage_qty AS quantity,
 	u.id AS unit_id,
 	u.name AS unit,
-	st.reason AS notes
+	'Stock Refill' AS notes
 FROM stock_transfer_details std
 JOIN stock_transfers st ON st.id = std.stock_transfer_id
 LEFT JOIN warehouses fw ON fw.id = st.from_warehouse_id
@@ -532,63 +547,13 @@ JOIN uoms u ON u.id = prod.uom_id
 WHERE st.to_warehouse_id IN ?
 `
 
-	sapronakIncomingAdjustmentsSQL = `
-SELECT
-	CAST(ast.id AS BIGINT) AS id,
-	ast.created_at AS sort_date,
-	COALESCE(TO_CHAR(ast.created_at, 'DD-Mon-YYYY'), '') AS date_text,
-	COALESCE(ast.adj_number, '') AS reference_number,
-	'Adjustment stock' AS transaction_type,
-	prod.name AS product_name,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_category,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_sub_category,
-	'-' AS source_warehouse,
-	COALESCE(w.name, '')  AS destination_warehouse,
-	'' AS destination,
-	COALESCE(ast.total_qty, 0) AS quantity,
-	u.id AS unit_id,
-	u.name AS unit,
-	'-' AS notes
-FROM adjustment_stocks ast
-JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id
-JOIN warehouses w ON w.id = pw.warehouse_id
-JOIN products prod ON prod.id = pw.product_id
-JOIN uoms u ON u.id = prod.uom_id
-WHERE pw.warehouse_id IN ?
-	AND COALESCE(ast.total_qty, 0) <> 0
-`
-
 	sapronakOutgoingTransfersSQL = `
 SELECT
 	CAST(st.id AS BIGINT) AS id,
 	st.transfer_date AS sort_date,
 	TO_CHAR(st.transfer_date, 'DD-Mon-YYYY') AS date_text,
 	st.movement_number AS reference_number,
-	'Mutasi' AS transaction_type,
+	'Internal Transfer Out' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -622,7 +587,7 @@ SELECT
 	std.usage_qty AS quantity,
 	u.id AS unit_id,
 	u.name AS unit,
-	st.reason AS notes
+	'Transfer to other unit' AS notes
 FROM stock_transfer_details std
 JOIN stock_transfers st ON st.id = std.stock_transfer_id
 LEFT JOIN warehouses fw ON fw.id = st.from_warehouse_id
@@ -632,70 +597,13 @@ JOIN uoms u ON u.id = prod.uom_id
 WHERE st.from_warehouse_id IN ?
 `
 
-	sapronakOutgoingAdjustmentsSQL = `
-SELECT
-	CAST(ast.id AS BIGINT) AS id,
-	ast.created_at AS sort_date,
-	COALESCE(TO_CHAR(ast.created_at, 'DD-Mon-YYYY'), '') AS date_text,
-	COALESCE(ast.adj_number, '') AS reference_number,
-	'Adjustment stock' AS transaction_type,
-	prod.name AS product_name,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_category,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_sub_category,
-	COALESCE(w.name, '') AS source_warehouse,
-	'-' AS destination_warehouse,
-	'' AS destination,
-	COALESCE(ast.usage_qty, 0) AS quantity,
-	u.id AS unit_id,
-	u.name AS unit,
-	'-' AS notes
-FROM adjustment_stocks ast
-JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id
-JOIN warehouses w ON w.id = pw.warehouse_id
-JOIN products prod ON prod.id = pw.product_id
-JOIN uoms u ON u.id = prod.uom_id
-WHERE pw.warehouse_id IN ?
-	AND COALESCE(ast.usage_qty, 0) <> 0
-	AND EXISTS (
-		SELECT 1
-		FROM flags f
-		WHERE f.flagable_id = pw.product_id
-			AND f.flagable_type = 'products'
-			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET', 'AYAM-AFKIR', 'AYAM-MATI', 'AYAM-CULLING', 'TELUR-UTUH', 'TELUR-PECAH', 'TELUR-PUTIH', 'TELUR-RETAK')
-	)
-`
-
 	sapronakOutgoingMarketingsSQL = `
 SELECT
 	CAST(mp.id AS BIGINT) AS id,
 	m.so_date AS sort_date,
 	TO_CHAR(m.so_date, 'DD-Mon-YYYY') AS date_text,
 	m.so_number AS reference_number,
-	'Penjualan' AS transaction_type,
+	'Trading Sales' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -743,7 +651,7 @@ WHERE pw.project_flock_kandang_id IN ?
 		FROM flags f
 		WHERE f.flagable_id = pw.product_id
 			AND f.flagable_type = 'products'
-			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET', 'AYAM-AFKIR', 'AYAM-MATI', 'AYAM-CULLING', 'TELUR-UTUH', 'TELUR-PECAH', 'TELUR-PUTIH', 'TELUR-RETAK')
+			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET')
 	)
 `
 )
@@ -889,7 +797,7 @@ func (r *ClosingRepositoryImpl) detailQuery(
 ) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table(table).
-		Joins("JOIN product_warehouses pw ON " + pwJoinCond).
+		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
 		Joins("JOIN products p ON p.id = pw.product_id")
 
 	db = applyJoins(db, joins...)
@@ -991,14 +899,14 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
-			p_resolve.id AS product_id,
+			pw.product_id AS product_id,
-			p_resolve.name AS product_name,
+			p.name AS product_name,
 			f.name AS flag,
 			COALESCE(
 				pi.received_date,
 				st.transfer_date,
 				lt.transfer_date,
-				ast.created_at,
+				sl.created_at,
 				pc.chick_in_date,
 				r.record_datetime
 			) AS date,
@@ -1013,9 +921,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 			) AS reference,
 			0 AS qty_in,
 			COALESCE(SUM(sa.qty), 0) AS qty_out,
-			COALESCE(pi.price, p_resolve.product_price, 0) AS price
+			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()).
@@ -1025,13 +934,11 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 		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 product_warehouses pw_ltt ON pw_ltt.id = ltt.product_warehouse_id").
 		Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
+		Joins("LEFT JOIN stock_logs sl ON sl.id = ast.stock_log_id").
 		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").
-		Joins("LEFT JOIN products p_resolve ON p_resolve.id = COALESCE(pi.product_id, pw_ltt.product_id, pw.product_id)").
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where(`
 			(sa.usable_type = ? AND r.project_flock_kandangs_id = ?)
@@ -1041,12 +948,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 			fifo.UsableKeyRecordingStock.String(), projectFlockKandangID,
 			fifo.UsableKeyProjectChickin.String(), projectFlockKandangID,
 		)
-	query = r.joinSapronakProductFlag(query, "p_resolve").
+	query = r.joinSapronakProductFlag(query, "p").
 		Group(`
-			p_resolve.id, p_resolve.name, f.name,
+			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,
+			pi.received_date, st.transfer_date, lt.transfer_date, sl.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_resolve.product_price
+			pi.price, p.product_price
 		`)
 
 	return scanAndGroupDetails(query)
@@ -1128,7 +1035,7 @@ 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").
@@ -1178,75 +1085,12 @@ func splitStockLogs(rows []stockLogSapronakRow, refFn func(stockLogSapronakRow)
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
-	poByWarehouse := r.DB().
+	rows, err := r.fetchStockLogs(ctx, kandangID, string(utils.StockLogTypeAdjustment), false)
-		Table("purchase_items pi").
-		Select("DISTINCT ON (pi.product_warehouse_id) pi.product_warehouse_id, po.po_number, pi.received_date").
-		Joins("JOIN purchases po ON po.id = pi.purchase_id").
-		Where("pi.received_date IS NOT NULL").
-		Order("pi.product_warehouse_id, pi.received_date ASC")
-
-	incomingQuery := r.withCtx(ctx).
-		Table("adjustment_stocks AS ast").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			ast.created_at AS date,
-			CONCAT('ADJ-', ast.id) AS reference,
-			COALESCE(ast.total_qty, 0) AS qty_in,
-			0 AS qty_out,
-			COALESCE(p.product_price, 0) AS price
-		`).
-		Joins("JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id").
-		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Where("w.kandang_id = ?", kandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Where("COALESCE(ast.total_qty, 0) > 0")
-	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
-	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
 	}
-
+	in, out := splitStockLogs(rows, func(row stockLogSapronakRow) string { return fmt.Sprintf("ADJ-%d", row.ID) })
-	outgoingQuery := r.withCtx(ctx).
+	return in, out, nil
-		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, pfp_po.received_date, pc.chick_in_date, ast_in.created_at, ast.created_at) AS date,
-			COALESCE(po.po_number, st.movement_number, lt.transfer_number, pfp_po.po_number, CONCAT('CHICKIN-', pc.id), CONCAT('ADJ-', ast_in.id), CONCAT('ADJ-', ast.id)) AS reference,
-			0 AS qty_in,
-			COALESCE(SUM(sa.qty), 0) AS qty_out,
-			COALESCE(p.product_price, 0) AS price
-		`).
-		Joins("JOIN adjustment_stocks ast ON ast.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyAdjustmentOut.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_in ON ast_in.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").
-		Joins("LEFT JOIN (?) pfp_po ON pfp_po.product_warehouse_id = pfp.product_warehouse_id", poByWarehouse).
-		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").
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("w.kandang_id = ?", kandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Where("f.name NOT IN ?", sapronakFlags(utils.FlagDOC, utils.FlagPullet)).
-		Group("pw.product_id, p.name, f.name, pi.received_date, st.transfer_date, lt.transfer_date, pfp_po.received_date, pc.chick_in_date, ast_in.created_at, ast.created_at, po.po_number, st.movement_number, lt.transfer_number, pfp_po.po_number, pc.id, ast_in.id, ast.id, p.product_price")
-	outgoingQuery = r.joinSapronakProductFlag(outgoingQuery, "p")
-	outgoing, err := scanAndGroupDetails(outgoingQuery)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return incoming, outgoing, nil
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
@@ -1442,59 +1286,6 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 	return sales, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(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
-			) AS date,
-			COALESCE(
-				po.po_number,
-				st.movement_number,
-				lt.transfer_number,
-				CONCAT('ADJ-', ast.id),
-				''
-			) 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("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyMarketingDelivery.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()).
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Group(`
-			pw.product_id, p.name, f.name,
-			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at,
-			po.po_number, st.movement_number, lt.transfer_number, ast.id,
-			pi.price, p.product_price
-		`)
-
-	query = r.joinSapronakProductFlag(query, "p")
-	return scanAndGroupDetails(query)
-}
-
 func (r *ClosingRepositoryImpl) GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error) {
 	if len(productIDs) == 0 {
 		return []entity.Product{}, nil

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

@@ -12,7 +12,6 @@ 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"
@@ -99,11 +98,6 @@ 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 {
@@ -117,12 +111,6 @@ 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)
 		}
@@ -162,10 +150,6 @@ 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")
@@ -177,15 +161,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 {
+	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
-			return nil, err
+	if err != nil {
-		}
-	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
 		return nil, err
 	}
 
-	realisasi, err := s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlockID, projectFlockKandangID)
+	realisasi, err := s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlockID, projectFlockKandangID, projectFlock.Category)
 	if err != nil {
 		return nil, err
 	}
@@ -197,8 +179,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 err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+	if projectFlockID == 0 {
-		return nil, err
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
 	if kandangID != nil {
@@ -282,7 +264,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")
@@ -344,8 +326,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 err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+	if projectFlockID == 0 {
-		return nil, 0, err
+		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
 	if params == nil {
@@ -367,7 +349,15 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
+	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)
 	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")
@@ -451,7 +441,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, params.KandangID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
 	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")
@@ -494,16 +484,13 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 	return items, nil
 }
 
-func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
+func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint) ([]uint, error) {
 	var kandangIDs []uint
 	db := s.Repository.DB().WithContext(ctx)
 
-	query := db.Model(&entity.ProjectFlockKandang{}).
+	if err := db.Model(&entity.ProjectFlockKandang{}).
-		Where("project_flock_id = ?", projectFlockID)
+		Where("project_flock_id = ?", projectFlockID).
-	if kandangID != nil && *kandangID > 0 {
+		Pluck("kandang_id", &kandangIDs).Error; err != nil {
-		query = query.Where("id = ?", *kandangID)
-	}
-	if err := query.Pluck("kandang_id", &kandangIDs).Error; err != nil {
 		return nil, err
 	}
 
@@ -555,7 +542,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
 	}
@@ -598,14 +585,6 @@ 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
@@ -694,12 +673,8 @@ 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 projectFlockKandangID != nil {
+	if projectFlockID == 0 {
-		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
-			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)
@@ -836,7 +811,15 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 
 	finalPopulation := population - claimCulling
 
-	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID, kandangID)
+	var standards []entity.FcrStandard
+	if project.FcrId > 0 {
+		standards, err = s.Repository.GetFcrStandardsByFcrID(c.Context(), project.FcrId)
+		if err != nil {
+			s.Log.Errorf("Failed to fetch FCR standards for project flock %d: %+v", projectFlockID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch FCR standard data")
+		}
+	}
+	age, err := s.calculateAverageSalesAge(c.Context(), projectFlockID)
 	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")
@@ -856,7 +839,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		// FeedUsedPerHead:   feedUsedPerHead,
 	}
 
-	chickenFlagNames := []string{string(utils.FlagPullet), string(utils.FlagAyamAfkir), string(utils.FlagAyamCulling), string(utils.FlagLayer)}
+	chickenFlagNames := []string{string(utils.FlagPullet)}
 	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)
@@ -885,7 +868,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		chickenDepletion = 0
 	}
 
-chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age)
+	chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age, standards)
 	if fcrActFromRecording != nil {
 		chickenPerformance.FcrAct = *fcrActFromRecording
 	}
@@ -935,7 +918,7 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 			eggDepletion = 0
 		}
 
-		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age)
+		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age, standards)
 		if fcrActFromRecording != nil {
 			eggPerf.FcrAct = *fcrActFromRecording
 		}
@@ -993,10 +976,10 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 			performance.EggMass = eggMass
 		}
 	}
+	performance.DeffFcr = performance.FcrStd - performance.FcrAct
 	if productionStandardDetail != nil {
 		if productionStandardDetail.StandardFCR != nil {
 			performance.FcrStd = *productionStandardDetail.StandardFCR
-			performance.DeffFcr = performance.FcrStd - performance.FcrAct
 		}
 		if !isGrowing {
 			if productionStandardDetail.TargetHenDayProduction != nil {
@@ -1023,24 +1006,38 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 	return &result, nil
 }
 
-func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) (float64, error) {
+func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint) (float64, error) {
-	penjualan, err := s.MarketingDeliveryProductRepo.GetClosingPenjualanForAgeChickDataProduction(ctx, projectFlockID, projectFlockKandangID)
+	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")
+	})
 	if err != nil {
 		return 0, err
 	}
-	acumulateAgeQty := 0.0
+
-	totalQty := 0.0
+	var (
-	for _, v := range penjualan {
+		totalQty      float64
-		sale := dto.ToSalesAgeDTO(v)
+		totalAgeWeeks float64
-		acumulateAgeQty += float64(sale.Age) * sale.Qty
+	)
-		totalQty += sale.Qty
+
-	}
+	for _, product := range deliveryProducts {
-	if totalQty > 0 {
+		if product.UsageQty == 0 {
-		averageAge := acumulateAgeQty / totalQty
+			continue
-		return averageAge, nil
+		}
+		projectFlockKandang := product.MarketingProduct.ProductWarehouse.ProjectFlockKandang
+		ageWeeks := dto.CalculateAgeFromChickinDataProduksi(projectFlockKandang, product.DeliveryDate)
+		totalAgeWeeks += float64(ageWeeks) * product.UsageQty
+		totalQty += product.UsageQty
 	}
 
-	return 0, err
+	if totalQty == 0 {
+		return 0, nil
+	}
+
+	return totalAgeWeeks / totalQty, nil
 }
 
 func (s closingService) determineProductionWeek(ctx context.Context, projectFlockKandangIDs []uint) (int, error) {
@@ -1083,8 +1080,8 @@ func (s closingService) determineProductionWeek(ctx context.Context, projectFloc
 	return week, nil
 }
 
-func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64) dto.ClosingPerformanceDTO {
+func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64, standards []entity.FcrStandard) dto.ClosingPerformanceDTO {
-	mortalityStd, fcrStd := 0.0, 0.0
+	mortalityStd, fcrStd := closestFcrValues(standards, averageWeight)
 
 	fcrAct := 0.0
 	if totalWeight > 0 {
@@ -1116,3 +1113,21 @@ func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopul
 		AwgAct:        awg,
 	}
 }
+
+func closestFcrValues(standards []entity.FcrStandard, averageWeight float64) (float64, float64) {
+	if len(standards) == 0 || averageWeight <= 0 {
+		return 0, 0
+	}
+
+	closest := standards[0]
+	minDiff := math.Abs(closest.Weight - averageWeight)
+	for _, std := range standards[1:] {
+		diff := math.Abs(std.Weight - averageWeight)
+		if diff < minDiff {
+			minDiff = diff
+			closest = std
+		}
+	}
+
+	return closest.Mortality, closest.FcrNumber
+}

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

@@ -41,7 +41,6 @@ type ProductionData struct {
 	TotalWeightProduced float64
 	TotalEggWeightKg    float64
 	TotalWeightSold     float64
-	TotalBirdSold       float64
 	TotalSalesAmount    float64
 }
 
@@ -271,9 +270,9 @@ func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlo
 
 	var deliveryProducts []entity.MarketingDeliveryProduct
 	if projectFlockKandangID != nil {
-		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, projectFlockKandangID, projectFlock.Category)
+		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlock.Id, projectFlockKandangID, projectFlock.Category)
 	} else {
-		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, nil, projectFlock.Category)
+		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualan(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")
@@ -284,7 +283,6 @@ func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlo
 			continue
 		}
 		data.TotalWeightSold += delivery.TotalWeight
-		data.TotalBirdSold += delivery.UsageQty
 		data.TotalSalesAmount += delivery.TotalPrice
 	}
 
@@ -294,9 +292,6 @@ func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlo
 func (s closingKeuanganService) buildHPPSection(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangs []entity.ProjectFlockKandang, costs *CostData, production *ProductionData) dto.HPPSection {
 
 	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
-	if lastPopulation, ok := s.getLastPopulationFromRecordings(c, projectFlockKandangs); ok {
-		actualPopulation = lastPopulation
-	}
 	totalWeightProduced := production.TotalWeightProduced
 	totalEggWeightKg := production.TotalEggWeightKg
 
@@ -388,77 +383,46 @@ func (s closingKeuanganService) buildHPPSection(c *fiber.Ctx, projectFlock *enti
 
 func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.ProjectFlock, costs *CostData, production *ProductionData) dto.ProfitLossSection {
 
+	totalPopulationIn := production.TotalPopulationIn
 	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)
+	weightForSales := totalWeightSold
+	weightForCalculation := totalWeightProduced
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
+		weightForSales = totalWeightSold
+		weightForCalculation = totalEggWeightKg
+	}
 
-	// Fungsi untuk sales: LAYING = populasi aktual, GROWING = ekor terjual
+	calculateProfitLossMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-	calculateSalesMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+		if totalPopulationIn > 0 {
-		if isLaying {
+			rpPerBird = amount / totalPopulationIn
-			if actualPopulation > 0 {
+		}
-				rpPerBird = amount / actualPopulation
+		if weightForSales > 0 {
-			}
+			rpPerKg = amount / weightForSales
-			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
+	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
-	calculateCostMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
+
+	calculateMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
 		if actualPopulation > 0 {
 			rpPerBird = amount / actualPopulation
 		}
-		if isLaying {
+		if weightForCalculation > 0 {
-			if totalEggWeightKg > 0 {
+			rpPerKg = amount / weightForCalculation
-				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
 	}
 
 	plItems := []dto.ProfitLossItem{}
 
-	salesRpPerBird, salesRpPerKg := calculateSalesMetrics(totalSalesAmount)
+	salesRpPerBird, salesRpPerKg := calculateProfitLossMetrics(totalSalesAmount)
 	salesLabel := "Penjualan Ayam"
-	if isLaying {
+	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
 		salesLabel = "Penjualan Telur"
 	}
 	plItems = append(plItems, dto.ToProfitLossItem(
@@ -471,23 +435,23 @@ func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.Proj
 	))
 
 	totalSapronakAmount := costs.ChickenCost + costs.FeedCost + costs.OvkCost
+	_, sapronakRpPerKg := calculateMetrics(totalSapronakAmount)
 	sapronakRpPerBird := 0.0
-	sapronakRpPerKg := 0.0
 	for _, amount := range []float64{costs.ChickenCost, costs.FeedCost, costs.OvkCost} {
-		rpPerBird, rpPerKg := calculateCostMetrics(amount)
+		rpPerBird, _ := calculateMetrics(amount)
 		sapronakRpPerBird += rpPerBird
-		sapronakRpPerKg += rpPerKg
 	}
+	sapronakLabel := "Pengeluaran Sapronak"
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeSapronak),
-		"Pengeluaran Sapronak",
+		sapronakLabel,
 		"purchase",
 		sapronakRpPerBird,
 		sapronakRpPerKg,
 		totalSapronakAmount,
 	))
 
-	overheadRpPerBird, overheadRpPerKg := calculateOverheadMetrics(costs.RealizationOperational)
+	overheadRpPerBird, overheadRpPerKg := calculateProfitLossMetrics(costs.RealizationOperational)
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeOverhead),
 		"Overhead",
@@ -497,7 +461,7 @@ func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.Proj
 		costs.RealizationOperational,
 	))
 
-	ekspedisiRpPerBird, ekspedisiRpPerKg := calculateOverheadMetrics(costs.ExpeditionCost)
+	ekspedisiRpPerBird, ekspedisiRpPerKg := calculateProfitLossMetrics(costs.ExpeditionCost)
 	plItems = append(plItems, dto.ToProfitLossItem(
 		string(dto.PLCodeEkspedisi),
 		"Ekspedisi",
@@ -532,35 +496,6 @@ func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.Proj
 	return dto.ToProfitLossSection(plItems, plSummary)
 }
 
-func (s closingKeuanganService) getLastPopulationFromRecordings(c *fiber.Ctx, projectFlockKandangs []entity.ProjectFlockKandang) (float64, bool) {
-	if s.RecordingRepo == nil || len(projectFlockKandangs) == 0 {
-		return 0, false
-	}
-
-	total := 0.0
-	recordedCount := 0
-	for _, kandang := range projectFlockKandangs {
-		latest, err := s.RecordingRepo.GetLatestByProjectFlockKandangID(c.Context(), kandang.Id)
-		if err != nil {
-			s.Log.Errorf("Failed to fetch latest recording for project_flock_kandang_id=%d: %+v", kandang.Id, err)
-			return 0, false
-		}
-		if latest == nil || latest.TotalChickQty == nil {
-			continue
-		}
-		recordedCount++
-		if *latest.TotalChickQty > 0 {
-			total += *latest.TotalChickQty
-		}
-	}
-
-	if recordedCount != len(projectFlockKandangs) {
-		return 0, false
-	}
-
-	return total, true
-}
-
 func containsFlag(flags []entity.Flag, name string) bool {
 	for _, flag := range flags {
 		if flag.Name == name {

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

@@ -18,8 +18,8 @@ import (
 )
 
 type SapronakService interface {
-	GetSapronakByProject(ctx *fiber.Ctx, projectFlockID uint, flag string) ([]dto.SapronakReportDTO, map[uint][]string, error)
+	GetSapronakByProject(ctx *fiber.Ctx, projectFlockID uint, flag string) ([]dto.SapronakReportDTO, error)
-	GetSapronakByKandang(ctx *fiber.Ctx, projectFlockID uint, pfkID uint, flag string) (*dto.SapronakReportDTO, map[uint][]string, error)
+	GetSapronakByKandang(ctx *fiber.Ctx, projectFlockID uint, pfkID uint, flag string) (*dto.SapronakReportDTO, error)
 }
 
 type sapronakService struct {
@@ -42,9 +42,9 @@ func NewSapronakService(
 	}
 }
 
-func (s sapronakService) GetSapronakByProject(c *fiber.Ctx, projectFlockID uint, flag string) ([]dto.SapronakReportDTO, map[uint][]string, error) {
+func (s sapronakService) GetSapronakByProject(c *fiber.Ctx, projectFlockID uint, flag string) ([]dto.SapronakReportDTO, error) {
 	if projectFlockID == 0 {
-		return nil, nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_id is required")
+		return nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_id is required")
 	}
 	reports, err := s.computeSapronakReports(c.Context(), &validation.CountSapronakQuery{
 		ProjectFlockID: projectFlockID,
@@ -52,27 +52,19 @@ func (s sapronakService) GetSapronakByProject(c *fiber.Ctx, projectFlockID uint,
 		Flag:           flag,
 	})
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	if len(reports) <= 1 {
-		flags, err := s.collectProductFlags(c.Context(), reports)
+		return reports, nil
-		if err != nil {
-			return nil, nil, err
-		}
-		return reports, flags, nil
 	}
 
 	combined := s.combineSapronakReports(reports, projectFlockID)
-	flags, err := s.collectProductFlags(c.Context(), []dto.SapronakReportDTO{combined})
+	return []dto.SapronakReportDTO{combined}, nil
-	if err != nil {
-		return nil, nil, err
-	}
-	return []dto.SapronakReportDTO{combined}, flags, nil
 }
 
-func (s sapronakService) GetSapronakByKandang(c *fiber.Ctx, projectFlockID uint, pfkID uint, flag string) (*dto.SapronakReportDTO, map[uint][]string, error) {
+func (s sapronakService) GetSapronakByKandang(c *fiber.Ctx, projectFlockID uint, pfkID uint, flag string) (*dto.SapronakReportDTO, error) {
 	if projectFlockID == 0 || pfkID == 0 {
-		return nil, nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_id and project_flock_kandang_id are required")
+		return nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_id and project_flock_kandang_id are required")
 	}
 
 	results, err := s.computeSapronakReports(c.Context(), &validation.CountSapronakQuery{
@@ -82,20 +74,16 @@ func (s sapronakService) GetSapronakByKandang(c *fiber.Ctx, projectFlockID uint,
 		Flag:                  flag,
 	})
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	for _, res := range results {
 		if res.ProjectFlockID == projectFlockID && res.ProjectFlockKandangID == pfkID {
-			flags, err := s.collectProductFlags(c.Context(), []dto.SapronakReportDTO{res})
+			return &res, nil
-			if err != nil {
-				return nil, nil, err
-			}
-			return &res, flags, nil
 		}
 	}
 
-	return nil, nil, fiber.NewError(fiber.StatusNotFound, "Sapronak for kandang not found")
+	return nil, fiber.NewError(fiber.StatusNotFound, "Sapronak for kandang not found")
 }
 
 func (s sapronakService) computeSapronakReports(ctx context.Context, params *validation.CountSapronakQuery) ([]dto.SapronakReportDTO, error) {
@@ -148,52 +136,6 @@ func (s sapronakService) computeSapronakReports(ctx context.Context, params *val
 	return results, nil
 }
 
-func (s sapronakService) collectProductFlags(ctx context.Context, reports []dto.SapronakReportDTO) (map[uint][]string, error) {
-	productIDs := make(map[uint]struct{})
-	for _, report := range reports {
-		for _, group := range report.Groups {
-			for _, item := range group.Items {
-				if item.ProductID > 0 {
-					productIDs[item.ProductID] = struct{}{}
-				}
-			}
-		}
-	}
-	if len(productIDs) == 0 {
-		return map[uint][]string{}, nil
-	}
-
-	ids := make([]uint, 0, len(productIDs))
-	for id := range productIDs {
-		ids = append(ids, id)
-	}
-
-	products, err := s.Repository.GetProductsWithFlagsByIDs(ctx, ids)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make(map[uint][]string, len(products))
-	for _, product := range products {
-		if len(product.Flags) == 0 {
-			continue
-		}
-		flags := make([]string, 0, len(product.Flags))
-		for _, flag := range product.Flags {
-			name := strings.TrimSpace(flag.Name)
-			if name == "" {
-				continue
-			}
-			flags = append(flags, strings.ToUpper(name))
-		}
-		if len(flags) > 0 {
-			result[product.Id] = flags
-		}
-	}
-
-	return result, nil
-}
-
 func (s sapronakService) loadProjectFlockKandangs(ctx context.Context, params *validation.CountSapronakQuery) ([]entity.ProjectFlockKandang, error) {
 	db := s.ProjectFlockKandangRepo.DB().WithContext(ctx).
 		Preload("ProjectFlock").
@@ -421,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.FetchSapronakSalesAllocatedDetails(ctx, pfk.Id)
+	salesOutRows, err := s.Repository.FetchSapronakSales(ctx, pfk.Id)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
@@ -628,12 +570,13 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 			if existing.ProductName == "" {
 				existing.ProductName = d.ProductName
 			}
-			// Adjustment keluar should reduce stock without inflating usage-based HPP.
+			existing.UsageQty += d.QtyKeluar
-			remaining := existing.IncomingQty - existing.UsageQty - d.QtyKeluar
+			existing.UsageValue += d.Nilai
-			if remaining < 0 {
+			if existing.IncomingQty >= existing.UsageQty {
-				remaining = 0
+				existing.RemainingQty = existing.IncomingQty - existing.UsageQty
+			} else {
+				existing.RemainingQty = 0
 			}
-			existing.RemainingQty = remaining
 			itemMap[productID] = existing
 		}
 	}

internal/modules/constants/repositories/constant.repository.go

@@ -12,7 +12,7 @@ import (
 )
 
 type ConstantRepository interface {
-	GetConstants() (map[string]interface{}, error)
+	GetConstants() map[string]interface{}
 }
 
 type ConstantRepositoryImpl struct {
@@ -25,7 +25,7 @@ func NewConstantRepository(db *gorm.DB) ConstantRepository {
 	}
 }
 
-func (r *ConstantRepositoryImpl) GetConstants() (map[string]interface{}, error) {
+func (r *ConstantRepositoryImpl) GetConstants() map[string]interface{} {
 	flagList := make([]string, 0)
 	for f := range utils.AllFlagTypes() {
 		flagList = append(flagList, string(f))
@@ -75,8 +75,6 @@ func (r *ConstantRepositoryImpl) GetConstants() (map[string]interface{}, error)
 		})
 	}
 
-	adjustmentSubtypesByType := utils.AdjustmentTransactionSubtypesByTypeForFrontend()
-
 	return map[string]interface{}{
 		"flags": flagList,
 		"warehouse_types": []string{
@@ -96,9 +94,6 @@ func (r *ConstantRepositoryImpl) GetConstants() (map[string]interface{}, error)
 			"BISNIS",
 			"INDIVIDUAL",
 		},
-		"adjustment": map[string]interface{}{
-			"transaction_subtypes": adjustmentSubtypesByType,
-		},
 		"approval_workflows": approvalWorkflows,
-	}, nil
+	}
 }

internal/modules/constants/services/constant.service.go

@@ -22,5 +22,5 @@ func NewConstantService(repo repository.ConstantRepository, validate *validator.
 }
 
 func (s constantService) GetAll(c *fiber.Ctx) (map[string]interface{}, error) {
-	return s.Repository.GetConstants()
+	return s.Repository.GetConstants(), nil
 }

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

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"math"
-	"mime/multipart"
 	"strconv"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/daily-checklists/dto"
@@ -363,9 +362,6 @@ 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")
@@ -385,16 +381,6 @@ 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,14 +3,13 @@ package service
 import (
 	"errors"
 	"math"
-	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	middleware "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"
@@ -135,87 +134,6 @@ 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
@@ -225,15 +143,7 @@ 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)
@@ -260,9 +170,8 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 	}
 
 	if params.Search != "" {
-		re := regexp.MustCompile("[^a-zA-Z0-9]")
+		like := "%" + params.Search + "%"
-		like := re.ReplaceAll([]byte("%"+params.Search+"%"), []byte(""))
+		db = db.Where("(k.name ILIKE ? OR dc.category::text ILIKE ?)", like, like)
-		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{})
@@ -385,9 +294,6 @@ 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")
@@ -493,9 +399,6 @@ 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 {
@@ -528,9 +431,6 @@ 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 {
@@ -556,7 +456,7 @@ func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, i
 		updateBody["reject_reason"] = *req.RejectReason
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
+	actorID, err := middleware.ActorIDFromContext(c)
 	if err != nil {
 		return &entity.DailyChecklist{}, fiber.NewError(fiber.StatusUnauthorized, "Failed to get actor ID from context")
 	}
@@ -602,9 +502,6 @@ 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")
@@ -619,9 +516,6 @@ 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) {
@@ -703,9 +597,6 @@ 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")
@@ -743,9 +634,6 @@ 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) {
@@ -770,9 +658,6 @@ 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) {
@@ -802,9 +687,6 @@ 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 {
@@ -926,9 +808,6 @@ 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 {
@@ -1021,16 +900,8 @@ 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)
 	}
@@ -1075,15 +946,6 @@ 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 {
@@ -1100,9 +962,6 @@ 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:"omitempty"`
+	PhaseIDs string `json:"phase_ids" validate:"required"`
 }
 
 type AssignTask struct {

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

@@ -6,7 +6,6 @@ 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"
@@ -82,20 +81,6 @@ 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", "")))
 
@@ -191,23 +176,6 @@ 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/repositories/dashboard_stats.repository.go

@@ -107,23 +107,16 @@ func applyDashboardFilters(db *gorm.DB, filters *validation.DashboardFilter) *go
 func (r *DashboardRepositoryImpl) GetRecordingWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]RecordingWeeklyMetric, error) {
 	var rows []RecordingWeeklyMetric
 
-	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(`%s AS week,
+		Select(`((r.day - 1) / 7 + 1) AS week,
 			COALESCE(AVG(r.hen_day), 0) AS hen_day,
 			COALESCE(AVG(r.egg_weight), 0) AS egg_weight,
 			COALESCE(AVG(r.feed_intake), 0) AS feed_intake,
 			COALESCE(AVG(r.fcr_value), 0) AS fcr_value,
-			COALESCE(AVG(r.cum_depletion_rate), 0) AS cum_depletion_rate`, weekExpr)).
+			COALESCE(AVG(r.cum_depletion_rate), 0) AS cum_depletion_rate`).
 		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").
 		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")
@@ -195,19 +188,92 @@ func (r *DashboardRepositoryImpl) GetStandardFcrWeekly(ctx context.Context, week
 		return nil, nil
 	}
 
-	standardIDs := r.standardIDSubquery(filters)
+	filterClause := ""
-	if standardIDs == nil {
+	filterArgs := make([]interface{}, 0)
-		return nil, nil
+	if filters != nil {
+		if len(filters.FlockIds) > 0 {
+			filterClause += " AND pf.id IN ?"
+			filterArgs = append(filterArgs, filters.FlockIds)
+		}
+		if len(filters.KandangIds) > 0 {
+			filterClause += " AND k.id IN ?"
+			filterArgs = append(filterArgs, filters.KandangIds)
+		}
+		if len(filters.LokasiIds) > 0 {
+			filterClause += " AND k.location_id IN ?"
+			filterArgs = append(filterArgs, filters.LokasiIds)
+		}
 	}
 
-	var rows []StandardWeeklyFcrMetric
+	query := fmt.Sprintf(`
-	db := r.DB().WithContext(ctx).
+WITH src AS (
-		Table("production_standard_details AS psd").
+	SELECT DISTINCT pf.production_standard_id, pf.fcr_id
-		Select("psd.week AS week, COALESCE(AVG(psd.standard_fcr), 0) AS std_fcr").
+	FROM project_flocks pf
-		Where("psd.week IN ?", weeks).
+	JOIN project_flock_kandangs pfk ON pfk.project_flock_id = pf.id
-		Where("psd.production_standard_id IN (?)", standardIDs)
+	JOIN kandangs k ON k.id = pfk.kandang_id
+	WHERE pf.production_standard_id > 0 AND pf.fcr_id > 0
+	%s
+),
+actual AS (
+	SELECT u.week AS week,
+		pf.fcr_id AS fcr_id,
+		AVG((u.chart_data->'statistics'->>'average_weight')::numeric) AS avg_weight
+	FROM project_flock_kandang_uniformity u
+	JOIN project_flock_kandangs pfk ON pfk.id = u.project_flock_kandang_id
+	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
+	JOIN kandangs k ON k.id = pfk.kandang_id
+	WHERE u.week IN ? AND u.uniform_date IS NOT NULL AND pf.fcr_id > 0
+	%s
+	GROUP BY u.week, pf.fcr_id
+),
+target AS (
+	SELECT sgd.week AS week,
+		src.fcr_id AS fcr_id,
+		AVG(sgd.target_mean_bw) AS target_mean_bw
+	FROM standard_growth_details sgd
+	JOIN src ON src.production_standard_id = sgd.production_standard_id
+	WHERE sgd.week IN ?
+	GROUP BY sgd.week, src.fcr_id
+),
+weights AS (
+	SELECT COALESCE(a.week, t.week) AS week,
+		COALESCE(a.fcr_id, t.fcr_id) AS fcr_id,
+		COALESCE(
+			CASE WHEN a.avg_weight > 10 THEN a.avg_weight / 1000 ELSE a.avg_weight END,
+			CASE WHEN t.target_mean_bw > 10 THEN t.target_mean_bw / 1000 ELSE t.target_mean_bw END
+		) AS weight
+	FROM actual a
+	FULL OUTER JOIN target t ON t.week = a.week AND t.fcr_id = a.fcr_id
+)
+SELECT w.week AS week,
+	COALESCE(AVG(
+		COALESCE(
+			(SELECT fs.fcr_number
+			 FROM fcr_standards fs
+			 WHERE fs.fcr_id = w.fcr_id
+			 AND fs.weight >= w.weight
+			 ORDER BY fs.weight ASC
+			 LIMIT 1),
+			(SELECT fs.fcr_number
+			 FROM fcr_standards fs
+			 WHERE fs.fcr_id = w.fcr_id
+			 ORDER BY fs.weight DESC
+			 LIMIT 1)
+		)
+	), 0) AS std_fcr
+FROM weights w
+GROUP BY w.week
+ORDER BY w.week ASC
+`, filterClause, filterClause)
 
-	if err := db.Group("psd.week").Order("psd.week ASC").Scan(&rows).Error; err != nil {
+	args := make([]interface{}, 0, len(filterArgs)*2+2)
+	args = append(args, filterArgs...)
+	args = append(args, weeks)
+	args = append(args, filterArgs...)
+	args = append(args, weeks)
+
+	var rows []StandardWeeklyFcrMetric
+	if err := r.DB().WithContext(ctx).Raw(query, args...).Scan(&rows).Error; err != nil {
 		return nil, err
 	}
 
@@ -444,6 +510,30 @@ func (r *DashboardRepositoryImpl) standardIDSubquery(filters *validation.Dashboa
 	return db
 }
 
+func (r *DashboardRepositoryImpl) standardSourceSubquery(filters *validation.DashboardFilter) *gorm.DB {
+	db := r.DB().
+		Table("project_flocks AS pf").
+		Select("DISTINCT pf.production_standard_id, pf.fcr_id").
+		Joins("JOIN project_flock_kandangs AS pfk ON pfk.project_flock_id = pf.id").
+		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Where("pf.production_standard_id > 0").
+		Where("pf.fcr_id > 0")
+
+	if filters != nil {
+		if len(filters.FlockIds) > 0 {
+			db = db.Where("pf.id IN ?", filters.FlockIds)
+		}
+		if len(filters.KandangIds) > 0 {
+			db = db.Where("k.id IN ?", filters.KandangIds)
+		}
+		if len(filters.LokasiIds) > 0 {
+			db = db.Where("k.location_id IN ?", filters.LokasiIds)
+		}
+	}
+
+	return db
+}
+
 func (r *DashboardRepositoryImpl) GetComparisonSeries(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter, comparisonType string) ([]ComparisonSeries, error) {
 	seriesExpr, labelExpr, groupExpr, orderExpr, err := comparisonSeriesColumns(comparisonType)
 	if err != nil {
@@ -482,17 +572,11 @@ 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(`%s AS week,
+		Select(fmt.Sprintf(`(CASE WHEN r.day IS NULL OR r.day <= 0 THEN 1 ELSE ((r.day - 1) / 7 + 1) END) AS week,
 			%s AS series_id,
-			COALESCE(AVG(%s), 0) AS value`, weekExpr, seriesExpr, metricExpr)).
+			COALESCE(AVG(%s), 0) AS value`, 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").
@@ -545,19 +629,13 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyUniformityMetrics(ctx conte
 func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]EggQualityWeeklyMetric, error) {
 	var rows []EggQualityWeeklyMetric
 
-	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("recording_eggs AS re").
-		Select(fmt.Sprintf(`
+		Select(`
-			%s AS week,
+			((r.day - 1) / 7 + 1) AS week,
 			COALESCE(SUM(CASE WHEN f.name = ? THEN re.qty ELSE 0 END), 0) AS normal_qty,
 			COALESCE(SUM(CASE WHEN f.name IN (?, ?, ?) THEN re.qty ELSE 0 END), 0) AS abnormal_qty,
-			COALESCE(SUM(re.qty), 0) AS total_qty`, weekExpr),
+			COALESCE(SUM(re.qty), 0) AS total_qty`,
 			utils.FlagTelurUtuh,
 			utils.FlagTelurPutih,
 			utils.FlagTelurRetak,
@@ -566,7 +644,6 @@ func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context
 		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").
-		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = re.product_warehouse_id").
 		Joins("JOIN products AS p ON p.id = pw.product_id").
 		Joins("JOIN flags AS f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
@@ -587,21 +664,14 @@ func (r *DashboardRepositoryImpl) GetEggQualityWeeklyMetrics(ctx context.Context
 func (r *DashboardRepositoryImpl) GetEggWeightWeeklyGrams(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]WeeklyEggWeightMetric, error) {
 	var rows []WeeklyEggWeightMetric
 
-	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("recording_eggs AS re").
-		Select(fmt.Sprintf(`
+		Select(`
-			%s AS week,
+			((r.day - 1) / 7 + 1) AS week,
-			COALESCE(SUM(re.weight * 1000), 0) AS egg_weight_grams`, weekExpr)).
+			COALESCE(SUM(re.weight * 1000), 0) AS egg_weight_grams`).
 		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").
-		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_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")
@@ -618,22 +688,15 @@ func (r *DashboardRepositoryImpl) GetEggWeightWeeklyGrams(ctx context.Context, s
 func (r *DashboardRepositoryImpl) GetFeedUsageWeeklyByUom(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]WeeklyFeedUsageMetric, error) {
 	var rows []WeeklyFeedUsageMetric
 
-	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("recording_stocks AS rs").
-		Select(fmt.Sprintf(`
+		Select(`
-			%s AS week,
+			((r.day - 1) / 7 + 1) AS week,
 			COALESCE(SUM(rs.usage_qty), 0) + COALESCE(SUM(rs.pending_qty), 0) AS total_qty,
-			LOWER(uoms.name) AS uom_name`, weekExpr)).
+			LOWER(uoms.name) AS uom_name`).
 		Joins("JOIN recordings AS r ON r.id = rs.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").
-		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
 		Joins("JOIN products AS p ON p.id = pw.product_id").
 		Joins("JOIN uoms ON uoms.id = p.uom_id").

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

@@ -18,12 +18,10 @@ 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 {
@@ -42,10 +40,6 @@ func NewDashboardService(repo repository.DashboardRepository, validate *validato
 	}
 }
 
-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

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

@@ -328,7 +328,6 @@ 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,28 +139,9 @@ func (r *ExpenseRealizationRepositoryImpl) GetAllWithFilters(ctx context.Context
 	locationID := filters.LocationId
 	areaID := filters.AreaId
 
-	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 {
+		db = db.Joins("JOIN kandangs ON kandangs.id = expense_nonstocks.kandang_id")
+
 		if locationID > 0 {
 			db = db.Where("kandangs.location_id = ?", uint(locationID))
 		}

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

@@ -87,22 +87,16 @@ 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
@@ -123,16 +117,7 @@ func (s expenseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]expens
 }
 
 func (s expenseService) GetOne(c *fiber.Ctx, id uint) (*expenseDto.ExpenseDetailDTO, error) {
-	var scopeErr error
+	expense, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
-
-	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/transactions/controllers/transaction.controller.go

@@ -24,81 +24,46 @@ func NewTransactionController(transactionService service.TransactionService) *Tr
 }
 
 func (u *TransactionController) GetAll(c *fiber.Ctx) error {
-	parseUintListParam := func(key string) ([]uint, error) {
+	parseOptionalUint := func(key string) (*uint, error) {
 		raw := strings.TrimSpace(c.Query(key, ""))
 		if raw == "" {
 			return nil, nil
 		}
-		parts := strings.Split(raw, ",")
+		parsed, err := strconv.ParseUint(raw, 10, 64)
-		ids := make([]uint, 0, len(parts))
+		if err != nil {
-		for _, part := range parts {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid "+key)
-			trimmed := strings.TrimSpace(part)
-			if trimmed == "" {
-				return nil, strconv.ErrSyntax
-			}
-			parsed, err := strconv.ParseUint(trimmed, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			if parsed == 0 {
-				continue
-			}
-			ids = append(ids, uint(parsed))
 		}
-		if len(ids) == 0 {
+		if parsed == 0 {
 			return nil, nil
 		}
-		return ids, nil
+		value := uint(parsed)
+		return &value, nil
 	}
 
-	parseStringListParam := func(key string) ([]string, error) {
+	bankId, err := parseOptionalUint("bank_id")
-		raw := strings.TrimSpace(c.Query(key, ""))
-		if raw == "" {
-			return nil, nil
-		}
-		parts := strings.Split(raw, ",")
-		values := make([]string, 0, len(parts))
-		for _, part := range parts {
-			trimmed := strings.TrimSpace(part)
-			if trimmed == "" {
-				return nil, strconv.ErrSyntax
-			}
-			values = append(values, trimmed)
-		}
-		if len(values) == 0 {
-			return nil, nil
-		}
-		return values, nil
-	}
-
-	bankIDs, err := parseUintListParam("bank_ids")
 	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid bank_ids")
+		return err
 	}
-	customerIDs, err := parseUintListParam("customer_ids")
+	customerId, err := parseOptionalUint("customer_id")
 	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid customer_ids")
+		return err
 	}
-	supplierIDs, err := parseUintListParam("supplier_ids")
+	supplierId, err := parseOptionalUint("supplier_id")
 	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid supplier_ids")
+		return err
-	}
-	transactionTypes, err := parseStringListParam("transaction_types")
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid transaction_types")
 	}
 
 	query := &validation.Query{
-		Page:             c.QueryInt("page", 1),
+		Page:            c.QueryInt("page", 1),
-		Limit:            c.QueryInt("limit", 10),
+		Limit:           c.QueryInt("limit", 10),
-		Search:           c.Query("search", ""),
+		Search:          c.Query("search", ""),
-		TransactionTypes: transactionTypes,
+		TransactionType: c.Query("transaction_type", ""),
-		BankIDs:          bankIDs,
+		BankId:          bankId,
-		CustomerIDs:      customerIDs,
+		CustomerId:      customerId,
-		SupplierIDs:      supplierIDs,
+		SupplierId:      supplierId,
-		SortDate:         c.Query("sort_date", ""),
+		SortDate:        c.Query("sort_date", ""),
-		StartDate:        c.Query("start_date", ""),
+		StartDate:       c.Query("start_date", ""),
-		EndDate:          c.Query("end_date", ""),
+		EndDate:         c.Query("end_date", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

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

@@ -74,59 +74,33 @@ func (s transactionService) GetAll(c *fiber.Ctx, params *validation.Query) ([]en
 
 		if params.Search != "" {
 			like := "%" + strings.ToLower(strings.TrimSpace(params.Search)) + "%"
-			db = db.Joins(
-				"LEFT JOIN customers ON customers.id = payments.party_id AND payments.party_type = ? AND customers.deleted_at IS NULL",
-				string(utils.PaymentPartyCustomer),
-			).Joins(
-				"LEFT JOIN suppliers ON suppliers.id = payments.party_id AND payments.party_type = ? AND suppliers.deleted_at IS NULL",
-				string(utils.PaymentPartySupplier),
-			).Joins(
-				"LEFT JOIN banks ON banks.id = payments.bank_id AND banks.deleted_at IS NULL",
-			)
 			db = db.Where(
 				`LOWER(payment_code) LIKE ? OR
 				LOWER(COALESCE(reference_number, '')) LIKE ? OR
-				LOWER(COALESCE(payment_method, '')) LIKE ? OR
 				LOWER(COALESCE(transaction_type, '')) LIKE ? OR
-				LOWER(COALESCE(notes, '')) LIKE ? OR
+				LOWER(COALESCE(notes, '')) LIKE ?`,
-				LOWER(COALESCE(customers.name, '')) LIKE ? OR
+				like, like, like, like,
-				LOWER(COALESCE(suppliers.name, '')) LIKE ? OR
-				LOWER(COALESCE(banks.name, '')) LIKE ?`,
-				like, like, like, like, like, like, like, like,
 			)
 		}
 
-		if len(params.TransactionTypes) > 0 {
+		if strings.TrimSpace(params.TransactionType) != "" {
-			types := make([]string, 0, len(params.TransactionTypes))
+			db = db.Where("transaction_type = ?", strings.ToUpper(strings.TrimSpace(params.TransactionType)))
-			for _, transactionType := range params.TransactionTypes {
-				normalized := strings.ToUpper(strings.TrimSpace(transactionType))
-				if normalized == "" {
-					continue
-				}
-				types = append(types, normalized)
-			}
-			if len(types) > 0 {
-				db = db.Where("transaction_type IN ?", types)
-			}
 		}
 
-		if len(params.BankIDs) > 0 {
+		if params.BankId != nil {
-			db = db.Where("bank_id IN ?", params.BankIDs)
+			db = db.Where("bank_id = ?", *params.BankId)
 		}
 
-		customerIDs := params.CustomerIDs
+		if params.CustomerId != nil && params.SupplierId != nil {
-		supplierIDs := params.SupplierIDs
-
-		if len(customerIDs) > 0 && len(supplierIDs) > 0 {
 			db = db.Where(
-				"(party_type = ? AND party_id IN ?) OR (party_type = ? AND party_id IN ?)",
+				"(party_type = ? AND party_id = ?) OR (party_type = ? AND party_id = ?)",
-				string(utils.PaymentPartyCustomer), customerIDs,
+				string(utils.PaymentPartyCustomer), *params.CustomerId,
-				string(utils.PaymentPartySupplier), supplierIDs,
+				string(utils.PaymentPartySupplier), *params.SupplierId,
 			)
-		} else if len(customerIDs) > 0 {
+		} else if params.CustomerId != nil {
-			db = db.Where("party_type = ? AND party_id IN ?", string(utils.PaymentPartyCustomer), customerIDs)
+			db = db.Where("party_type = ? AND party_id = ?", string(utils.PaymentPartyCustomer), *params.CustomerId)
-		} else if len(supplierIDs) > 0 {
+		} else if params.SupplierId != nil {
-			db = db.Where("party_type = ? AND party_id IN ?", string(utils.PaymentPartySupplier), supplierIDs)
+			db = db.Where("party_type = ? AND party_id = ?", string(utils.PaymentPartySupplier), *params.SupplierId)
 		}
 
 		if startDate != nil {

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

@@ -1,22 +1,22 @@
 package validation
 
 type Create struct {
-	Name string `json:"name" validate:"required_strict,min=3"`
+	Name   string `json:"name" validate:"required_strict,min=3"`
 }
 
 type Update struct {
-	Name *string `json:"name,omitempty" validate:"omitempty"`
+	Name   *string `json:"name,omitempty" validate:"omitempty"`
 }
 
 type Query struct {
-	Page             int      `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit            int      `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search           string   `query:"search" validate:"omitempty,max=50"`
+	Search          string `query:"search" validate:"omitempty,max=50"`
-	TransactionTypes []string `query:"transaction_types" validate:"omitempty,dive,max=50"`
+	TransactionType string `query:"transaction_type" validate:"omitempty,max=50"`
-	BankIDs          []uint   `query:"bank_ids" validate:"omitempty,dive,gt=0"`
+	BankId          *uint  `query:"bank_id" validate:"omitempty,number,gt=0"`
-	CustomerIDs      []uint   `query:"customer_ids" validate:"omitempty,dive,gt=0"`
+	CustomerId      *uint  `query:"customer_id" validate:"omitempty,number,gt=0"`
-	SupplierIDs      []uint   `query:"supplier_ids" validate:"omitempty,dive,gt=0"`
+	SupplierId      *uint  `query:"supplier_id" validate:"omitempty,number,gt=0"`
-	SortDate         string   `query:"sort_date" validate:"omitempty,oneof=created_at payment_date"`
+	SortDate        string `query:"sort_date" validate:"omitempty,oneof=created_at payment_date"`
-	StartDate        string   `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
+	StartDate       string `query:"start_date" validate:"omitempty,datetime=2006-01-02"`
-	EndDate          string   `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
+	EndDate         string `query:"end_date" validate:"omitempty,datetime=2006-01-02"`
 }

internal/modules/inventory/adjustments/controllers/adjustment.controller.go

@@ -47,13 +47,11 @@ func (u *AdjustmentController) Adjustment(c *fiber.Ctx) error {
 
 func (u *AdjustmentController) AdjustmentHistory(c *fiber.Ctx) error {
 	query := &validation.Query{
-		Page:               c.QueryInt("page", 1),
+		Page:            c.QueryInt("page", 1),
-		Limit:              c.QueryInt("limit", 10),
+		Limit:           c.QueryInt("limit", 10),
-		ProductID:          uint(c.QueryInt("product_id", 0)),
+		ProductID:       uint(c.QueryInt("product_id", 0)),
-		WarehouseID:        uint(c.QueryInt("warehouse_id", 0)),
+		WarehouseID:     uint(c.QueryInt("warehouse_id", 0)),
-		TransactionType:    c.Query("transaction_type", ""),
+		TransactionType: c.Query("transaction_type", ""),
-		TransactionSubtype: c.Query("transaction_subtype", ""),
-		FunctionCode:       c.Query("function_code", ""),
 	}
 
 	result, totalResults, err := u.AdjustmentService.AdjustmentHistory(c, query)

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

@@ -17,49 +17,27 @@ type ProductRelationDTO struct {
 	ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
 }
 
-type LocationRelationDTO struct {
+type WarehouseRelationDTO struct {
 	Id   uint   `json:"id"`
 	Name string `json:"name"`
 }
 
-type ProjectFlockRelationDTO struct {
-	Id        uint   `json:"id"`
-	FlockName string `json:"flock_name"`
-	Period    int    `json:"period"`
-}
-
-type WarehouseRelationDTO struct {
-	Id       uint                 `json:"id"`
-	Name     string               `json:"name"`
-	Location *LocationRelationDTO `json:"location,omitempty"`
-}
-
 type ProductWarehouseDTO struct {
-	Id           uint                     `json:"id"`
+	Id          uint                  `json:"id"`
-	ProductId    uint                     `json:"product_id"`
+	ProductId   uint                  `json:"product_id"`
-	WarehouseId  uint                     `json:"warehouse_id"`
+	WarehouseId uint                  `json:"warehouse_id"`
-	Quantity     float64                  `json:"quantity"`
+	Quantity    float64               `json:"quantity"`
-	Product      *ProductRelationDTO      `json:"product,omitempty"`
+	Product     *ProductRelationDTO   `json:"product,omitempty"`
-	Warehouse    *WarehouseRelationDTO    `json:"warehouse,omitempty"`
+	Warehouse   *WarehouseRelationDTO `json:"warehouse,omitempty"`
-	ProjectFlock *ProjectFlockRelationDTO `json:"project_flock,omitempty"`
 }
 
 type AdjustmentRelationDTO struct {
-	Id                 uint                     `json:"id"`
+	Id                 uint                 `json:"id"`
-	AdjNumber          string                   `json:"adj_number"`
+	Increase           float64              `json:"increase"`
-	TransactionType    string                   `json:"transaction_type"`
+	Decrease           float64              `json:"decrease"`
-	TransactionSubtype string                   `json:"transaction_subtype"`
+	Note               string               `json:"note,omitempty"`
-	FunctionCode       string                   `json:"function_code"`
+	ProductWarehouseId uint                 `json:"product_warehouse_id"`
-	Qty                float64                  `json:"qty"`
+	ProductWarehouse   *ProductWarehouseDTO `json:"product_warehouse,omitempty"`
-	Price              float64                  `json:"price"`
-	GrandTotal         float64                  `json:"grand_total"`
-	Increase           float64                  `json:"increase"`
-	Decrease           float64                  `json:"decrease"`
-	Notes              string                   `json:"notes,omitempty"`
-	Location           *LocationRelationDTO     `json:"location,omitempty"`
-	ProjectFlock       *ProjectFlockRelationDTO `json:"project_flock,omitempty"`
-	ProductWarehouseId uint                     `json:"product_warehouse_id"`
-	ProductWarehouse   *ProductWarehouseDTO     `json:"product_warehouse,omitempty"`
 }
 
 type AdjustmentListDTO struct {
@@ -103,80 +81,31 @@ func ToWarehouseRelationDTO(e *entity.Warehouse) *WarehouseRelationDTO {
 		return nil
 	}
 	return &WarehouseRelationDTO{
-		Id:       e.Id,
-		Name:     e.Name,
-		Location: ToLocationRelationDTO(e.Location),
-	}
-}
-
-func ToLocationRelationDTO(e *entity.Location) *LocationRelationDTO {
-	if e == nil {
-		return nil
-	}
-	return &LocationRelationDTO{
 		Id:   e.Id,
 		Name: e.Name,
 	}
 }
 
-func ToProjectFlockRelationDTO(e *entity.ProjectFlockKandang) *ProjectFlockRelationDTO {
-	if e == nil || e.ProjectFlock.Id == 0 {
-		return nil
-	}
-	return &ProjectFlockRelationDTO{
-		Id:        e.ProjectFlock.Id,
-		FlockName: e.ProjectFlock.FlockName,
-		Period:    e.Period,
-	}
-}
-
 func ToProductWarehouseDTO(e *entity.ProductWarehouse) *ProductWarehouseDTO {
 	if e == nil {
 		return nil
 	}
 	return &ProductWarehouseDTO{
-		Id:           e.Id,
+		Id:          e.Id,
-		ProductId:    e.ProductId,
+		ProductId:   e.ProductId,
-		WarehouseId:  e.WarehouseId,
+		WarehouseId: e.WarehouseId,
-		Quantity:     e.Quantity,
+		Quantity:    e.Quantity,
-		Product:      ToProductRelationDTO(&e.Product),
+		Product:     ToProductRelationDTO(&e.Product),
-		Warehouse:    ToWarehouseRelationDTO(&e.Warehouse),
+		Warehouse:   ToWarehouseRelationDTO(&e.Warehouse),
-		ProjectFlock: ToProjectFlockRelationDTO(e.ProjectFlockKandang),
 	}
 }
 
 func ToAdjustmentRelationDTO(e *entity.AdjustmentStock) AdjustmentRelationDTO {
-	note := ""
-	if e.StockLog != nil {
-		note = e.StockLog.Notes
-	}
-
-	qty := e.TotalQty
-	if qty <= 0 {
-		qty = e.UsageQty + e.PendingQty
-	}
-
-	var location *LocationRelationDTO
-	var projectFlock *ProjectFlockRelationDTO
-	if e.ProductWarehouse != nil {
-		location = ToLocationRelationDTO(e.ProductWarehouse.Warehouse.Location)
-		projectFlock = ToProjectFlockRelationDTO(e.ProductWarehouse.ProjectFlockKandang)
-	}
-
 	return AdjustmentRelationDTO{
 		Id:                 e.Id,
-		AdjNumber:          e.AdjNumber,
+		Note:               "",
-		TransactionType:    e.TransactionType,
-		TransactionSubtype: e.FunctionCode,
-		FunctionCode:       e.FunctionCode,
-		Qty:                qty,
-		Price:              e.Price,
-		GrandTotal:         e.GrandTotal,
 		Increase:           e.TotalQty,
 		Decrease:           e.UsageQty,
-		Notes:              note,
-		Location:           location,
-		ProjectFlock:       projectFlock,
 		ProductWarehouseId: e.ProductWarehouseId,
 		ProductWarehouse:   ToProductWarehouseDTO(e.ProductWarehouse),
 	}

internal/modules/inventory/adjustments/module.go

@@ -34,7 +34,6 @@ func (AdjustmentModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validat
 	stockAllocRepo := commonRepo.NewStockAllocationRepository(db)
 
 	fifoService := commonSvc.NewFifoService(db, stockAllocRepo, productWarehouseRepo, utils.Log)
-	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
 
 	err := fifoService.RegisterStockable(fifo.StockableConfig{
 		Key:   fifo.StockableKeyAdjustmentIn,
@@ -75,7 +74,6 @@ func (AdjustmentModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validat
 		productWarehouseRepo,
 		adjustmentStockRepo,
 		fifoService,
-		fifoStockV2Service,
 		validate,
 		projectFlockKandangRepo,
 	)

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

@@ -2,46 +2,16 @@ package repositories
 
 import (
 	"context"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 type AdjustmentStockRepository interface {
 	CreateOne(ctx context.Context, data *entity.AdjustmentStock, modifier func(*gorm.DB) *gorm.DB) error
 	GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error)
-	FindKandangIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (uint, error)
-	FindRoutesByFunctionCode(ctx context.Context, productID uint, functionCode string) ([]AdjustmentRouteResolution, error)
-	FindOverconsumeRule(ctx context.Context, lane, flagGroupCode, functionCode string) (*bool, error)
-	FindHistory(ctx context.Context, filter AdjustmentHistoryFilter, modifier func(*gorm.DB) *gorm.DB) ([]*entity.AdjustmentStock, int64, error)
 	WithTx(tx *gorm.DB) AdjustmentStockRepository
 	DB() *gorm.DB
-	GenerateSequentialNumber(ctx context.Context, prefix string) (string, error)
-}
-
-type AdjustmentRouteResolution struct {
-	FlagGroupCode       string `gorm:"column:flag_group_code"`
-	Lane                string `gorm:"column:lane"`
-	FunctionCode        string `gorm:"column:function_code"`
-	SourceTable         string `gorm:"column:source_table"`
-	LegacyTypeKey       string `gorm:"column:legacy_type_key"`
-	AllowPendingDefault bool   `gorm:"column:allow_pending_default"`
-}
-
-type AdjustmentHistoryFilter struct {
-	ProductID       uint
-	WarehouseID     uint
-	TransactionType string
-	FunctionCode    string
-	ScopeRestrict   bool
-	ScopeIDs        []uint
-	Offset          int
-	Limit           int
 }
 
 type adjustmentStockRepositoryImpl struct {
@@ -73,151 +43,6 @@ func (r *adjustmentStockRepositoryImpl) GetByID(ctx context.Context, id uint, mo
 	return &record, nil
 }
 
-func (r *adjustmentStockRepositoryImpl) FindKandangIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (uint, error) {
-	type pfkRow struct {
-		KandangID uint `gorm:"column:kandang_id"`
-	}
-
-	var pfk pfkRow
-	err := r.db.WithContext(ctx).
-		Table("project_flock_kandangs pfk").
-		Select("pfk.kandang_id").
-		Where("pfk.id = ?", projectFlockKandangID).
-		Where("pfk.closed_at IS NULL").
-		Take(&pfk).Error
-	if err != nil {
-		return 0, err
-	}
-	return pfk.KandangID, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) FindRoutesByFunctionCode(
-	ctx context.Context,
-	productID uint,
-	functionCode string,
-) ([]AdjustmentRouteResolution, error) {
-	var rows []AdjustmentRouteResolution
-	err := r.db.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules rr").
-		Select("rr.flag_group_code, rr.lane, rr.function_code, rr.source_table, rr.legacy_type_key, rr.allow_pending_default").
-		Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
-		Where("rr.is_active = TRUE").
-		Where("rr.function_code = ?", functionCode).
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM flags f
-				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-				WHERE f.flagable_type = ?
-				  AND f.flagable_id = ?
-				  AND fm.flag_group_code = rr.flag_group_code
-			)
-		`, entity.FlagableTypeProduct, productID).
-		Order("CASE WHEN rr.source_table = 'adjustment_stocks' THEN 0 ELSE 1 END ASC").
-		Order("rr.id ASC").
-		Find(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-	return rows, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) FindOverconsumeRule(
-	ctx context.Context,
-	lane string,
-	flagGroupCode string,
-	functionCode string,
-) (*bool, error) {
-	type selectedRow struct {
-		AllowOverconsume bool `gorm:"column:allow_overconsume"`
-	}
-
-	var selected selectedRow
-	err := r.db.WithContext(ctx).
-		Table("fifo_stock_v2_overconsume_rules").
-		Select("allow_overconsume").
-		Where("is_active = TRUE").
-		Where("lane = ?", lane).
-		Where("(flag_group_code IS NULL OR flag_group_code = ?)", flagGroupCode).
-		Where("(function_code IS NULL OR function_code = ?)", functionCode).
-		Order("CASE WHEN flag_group_code IS NULL THEN 1 ELSE 0 END ASC").
-		Order("CASE WHEN function_code IS NULL THEN 1 ELSE 0 END ASC").
-		Order("priority ASC, id ASC").
-		Limit(1).
-		Take(&selected).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, err
-	}
-
-	return &selected.AllowOverconsume, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) FindHistory(
-	ctx context.Context,
-	filter AdjustmentHistoryFilter,
-	modifier func(*gorm.DB) *gorm.DB,
-) ([]*entity.AdjustmentStock, int64, error) {
-	q := r.db.WithContext(ctx).Model(&entity.AdjustmentStock{}).
-		Preload("ProductWarehouse").
-		Preload("ProductWarehouse.Product").
-		Preload("ProductWarehouse.Warehouse").
-		Preload("ProductWarehouse.Warehouse.Location").
-		Preload("ProductWarehouse.ProjectFlockKandang").
-		Preload("ProductWarehouse.ProjectFlockKandang.ProjectFlock").
-		Preload("StockLog.CreatedUser")
-
-	if modifier != nil {
-		q = modifier(q)
-	}
-
-	if filter.ScopeRestrict {
-		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")
-		if len(filter.ScopeIDs) == 0 {
-			q = q.Where("1 = 0")
-		} else {
-			q = q.Where("w_scope.location_id IN ?", filter.ScopeIDs)
-		}
-	}
-
-	if filter.ProductID > 0 || filter.WarehouseID > 0 {
-		q = q.Joins("JOIN product_warehouses pw_filter ON pw_filter.id = adjustment_stocks.product_warehouse_id")
-		if filter.ProductID > 0 {
-			q = q.Where("pw_filter.product_id = ?", filter.ProductID)
-		}
-		if filter.WarehouseID > 0 {
-			q = q.Where("pw_filter.warehouse_id = ?", filter.WarehouseID)
-		}
-	}
-
-	if strings.TrimSpace(filter.TransactionType) != "" {
-		q = q.Where("UPPER(adjustment_stocks.transaction_type) = ?", strings.ToUpper(strings.TrimSpace(filter.TransactionType)))
-	}
-
-	if strings.TrimSpace(filter.FunctionCode) != "" {
-		q = q.Where("adjustment_stocks.function_code = ?", strings.ToUpper(strings.TrimSpace(filter.FunctionCode)))
-	}
-
-	var total int64
-	if err := q.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	var rows []entity.AdjustmentStock
-	if err := q.Offset(filter.Offset).Limit(filter.Limit).Order("created_at DESC").Find(&rows).Error; err != nil {
-		return nil, 0, err
-	}
-
-	result := make([]*entity.AdjustmentStock, len(rows))
-	for i := range rows {
-		result[i] = &rows[i]
-	}
-	return result, total, nil
-}
-
 func (r *adjustmentStockRepositoryImpl) WithTx(tx *gorm.DB) AdjustmentStockRepository {
 	return &adjustmentStockRepositoryImpl{db: tx}
 }
@@ -225,71 +50,3 @@ func (r *adjustmentStockRepositoryImpl) WithTx(tx *gorm.DB) AdjustmentStockRepos
 func (r *adjustmentStockRepositoryImpl) DB() *gorm.DB {
 	return r.db
 }
-
-func (r *adjustmentStockRepositoryImpl) GenerateSequentialNumber(ctx context.Context, prefix string) (string, error) {
-	var values []string
-	err := r.db.WithContext(ctx).
-		Model(&entity.AdjustmentStock{}).
-		Where(fmt.Sprintf("%s ILIKE ?", "adj_number"), prefix+"%").
-		Select("adj_number").
-		Order(fmt.Sprintf("%s DESC", "adj_number")).
-		Limit(20).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Pluck("adj_number", &values).Error
-	if err != nil {
-		return "", err
-	}
-
-	next := 1
-	for _, value := range values {
-		if number, ok := parseNumericSuffix(value, prefix); ok {
-			next = number + 1
-			break
-		}
-	}
-
-	const maxAttempts = 20
-	for attempt := 0; attempt < maxAttempts; attempt++ {
-		candidate := fmt.Sprintf("%s%0*d", prefix, 5, next)
-		exists, err := r.numberExists(ctx, r.db, candidate)
-		if err != nil {
-			return "", err
-		}
-		if !exists {
-			return candidate, nil
-		}
-		next++
-	}
-
-	return "", fmt.Errorf("unable to generate unique %s", "adj_number")
-}
-
-func (r *adjustmentStockRepositoryImpl) numberExists(ctx context.Context, db *gorm.DB, value string) (bool, error) {
-	var count int64
-	if err := db.WithContext(ctx).
-		Model(&entity.AdjustmentStock{}).
-		Where(fmt.Sprintf("%s = ?", "adj_number"), value).
-		Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count > 0, nil
-}
-
-func parseNumericSuffix(value, prefix string) (int, bool) {
-	if !strings.HasPrefix(value, prefix) {
-		return 0, false
-	}
-	suffix := strings.TrimPrefix(value, prefix)
-	if suffix == "" {
-		return 0, false
-	}
-	trimmed := strings.TrimLeft(suffix, "0")
-	if trimmed == "" {
-		trimmed = "0"
-	}
-	number, err := strconv.Atoi(trimmed)
-	if err != nil {
-		return 0, false
-	}
-	return number, true
-}

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

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
@@ -41,14 +40,8 @@ type adjustmentService struct {
 	ProjectFlockKandangRepo   projectFlockKandangRepo.ProjectFlockKandangRepository
 	AdjustmentStockRepository adjustmentStockRepo.AdjustmentStockRepository
 	FifoSvc                   common.FifoService
-	FifoStockV2Svc            common.FifoStockV2Service
 }
 
-const (
-	adjustmentLaneStockable = "STOCKABLE"
-	adjustmentLaneUsable    = "USABLE"
-)
-
 func NewAdjustmentService(
 	productRepo productRepo.ProductRepository,
 	stockLogsRepo stockLogsRepo.StockLogRepository,
@@ -56,7 +49,6 @@ func NewAdjustmentService(
 	productWarehouseRepo ProductWarehouse.ProductWarehouseRepository,
 	adjustmentStockRepo adjustmentStockRepo.AdjustmentStockRepository,
 	fifoSvc common.FifoService,
-	fifoStockV2Svc common.FifoStockV2Service,
 	validate *validator.Validate,
 	projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository,
 ) AdjustmentService {
@@ -70,7 +62,6 @@ func NewAdjustmentService(
 		ProjectFlockKandangRepo:   projectFlockKandangRepo,
 		AdjustmentStockRepository: adjustmentStockRepo,
 		FifoSvc:                   fifoSvc,
-		FifoStockV2Svc:            fifoStockV2Svc,
 	}
 }
 
@@ -79,17 +70,10 @@ func (s *adjustmentService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("ProductWarehouse").
 		Preload("ProductWarehouse.Product").
 		Preload("ProductWarehouse.Warehouse").
-		Preload("ProductWarehouse.Warehouse.Location").
-		Preload("ProductWarehouse.ProjectFlockKandang").
-		Preload("ProductWarehouse.ProjectFlockKandang.ProjectFlock").
 		Preload("StockLog.CreatedUser")
 }
 
 func (s *adjustmentService) GetOne(c *fiber.Ctx, id uint) (*entity.AdjustmentStock, error) {
-	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) {
@@ -106,93 +90,44 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}
-
-	productID := req.ProductID
-	if productID == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Product is required")
-	}
-
-	qty := req.Qty
-	if qty <= 0 {
-		qty = req.Quantity
-	}
-	if qty <= 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Quantity must be greater than zero")
-	}
-
-	functionCode := strings.ToUpper(strings.TrimSpace(req.TransactionSubtype))
-	if functionCode == "" {
-		functionCode = strings.ToUpper(strings.TrimSpace(req.TransactionSubType))
-	}
-	if functionCode == "" {
-		functionCode = strings.ToUpper(strings.TrimSpace(req.FunctionCode))
-	}
-	if functionCode == "" {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Transaction subtype is required")
-	}
-	if functionCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn) {
-		functionCode = string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut)
-	}
-
-	warehouseID, err := s.resolveWarehouseID(c.Context(), req)
-	if err != nil {
-		return nil, err
-	}
-
-	note := strings.TrimSpace(req.Notes)
-	if note == "" {
-		note = strings.TrimSpace(req.Note)
-	}
-	grandTotal := math.Round((qty*req.Price)*1000) / 1000
-
 	ctx := c.Context()
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
 	}
-	if err := m.EnsureWarehouseAccess(c, s.WarehouseRepo.DB(), warehouseID); err != nil {
+	if err := common.EnsureRelations(c.Context(),
-		return nil, err
+		common.RelationCheck{Name: "Product", ID: &req.ProductID, Exists: s.ProductRepo.IdExists},
-	}
+		common.RelationCheck{Name: "Warehouse", ID: &req.WarehouseID, Exists: s.WarehouseRepo.IdExists},
-	if err := common.EnsureRelations(ctx,
-		common.RelationCheck{Name: "Product", ID: &productID, Exists: s.ProductRepo.IdExists},
-		common.RelationCheck{Name: "Warehouse", ID: &warehouseID, Exists: s.WarehouseRepo.IdExists},
 	); err != nil {
 		return nil, err
 	}
 
-	routeMeta, err := s.resolveRouteByFunctionCode(ctx, productID, functionCode)
+	if req.Quantity <= 0 {
-	if err != nil {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Quantity must be greater than zero")
-		return nil, err
 	}
 
-	transactionType := utils.ResolveAdjustmentTransactionType(routeMeta.FunctionCode)
+	transactionType := strings.ToUpper(req.TransactionType)
-
+	if transactionType != string(utils.StockLogTransactionTypeIncrease) && transactionType != string(utils.StockLogTransactionTypeDecrease) {
-	allowPending := false
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid transaction type")
-	if routeMeta.Lane == adjustmentLaneUsable {
-		allowPending, err = s.resolveOverconsumePolicy(ctx, routeMeta)
-		if err != nil {
-			s.Log.Errorf("Failed to resolve overconsume rule: %+v", err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve FIFO policy")
-		}
 	}
 
 	var createdAdjustmentStockId uint
 
 	var projectFlockKandangID *uint
-	pfkID, err := s.getActiveProjectFlockKandangID(ctx, warehouseID)
+	pfkID, err := s.getActiveProjectFlockKandangID(ctx, uint(req.WarehouseID))
 	if err == nil && pfkID > 0 {
 		projectFlockKandangID = &pfkID
 	}
 
-	pw, err := s.ProductWarehouseRepo.FindByProductWarehouseAndPfk(ctx, productID, warehouseID, projectFlockKandangID)
+	pw, err := s.ProductWarehouseRepo.FindByProductWarehouseAndPfk(ctx, uint(req.ProductID), uint(req.WarehouseID), projectFlockKandangID)
 	if err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to get product warehouse")
 		}
 
 		newPW := &entity.ProductWarehouse{
-			ProductId:             productID,
+			ProductId:             uint(req.ProductID),
-			WarehouseId:           warehouseID,
+			WarehouseId:           uint(req.WarehouseID),
 			Quantity:              0,
 			ProjectFlockKandangId: projectFlockKandangID,
 		}
@@ -211,114 +146,98 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 	err = s.StockLogsRepository.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		productWarehouseRepoTX := ProductWarehouse.NewProductWarehouseRepository(tx)
-		stockLogRepoTX := stockLogsRepo.NewStockLogRepository(tx)
-		adjustmentStockRepoTX := s.AdjustmentStockRepository.WithTx(tx)
 
-		productWarehouse, err := productWarehouseRepoTX.FindByProductWarehouseAndPfk(ctx, productID, warehouseID, projectFlockKandangID)
+		productWarehouse, err := s.ProductWarehouseRepo.FindByProductWarehouseAndPfk(ctx, uint(req.ProductID), uint(req.WarehouseID), projectFlockKandangID)
 		if err != nil {
 			s.Log.Errorf("Failed to get product warehouse: %+v", err)
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to get product warehouse")
 		}
 
-		adjustmentStock := &entity.AdjustmentStock{
+		afterQuantity := productWarehouse.Quantity
+		newLog := &entity.StockLog{
+			LoggableType:       string(utils.StockLogTypeAdjustment),
+			LoggableId:         0,
+			Notes:              req.Note,
 			ProductWarehouseId: productWarehouse.Id,
-			TransactionType:    transactionType,
+			CreatedBy:          actorID,
-			FunctionCode:       routeMeta.FunctionCode,
-			Price:              req.Price,
-			GrandTotal:         grandTotal,
-		}
-		code, err := adjustmentStockRepoTX.GenerateSequentialNumber(ctx, utils.AdjustmentStockNumberPrefix)
-		if err != nil {
-			return err
-		}
-		adjustmentStock.AdjNumber = code
-		if err := adjustmentStockRepoTX.CreateOne(ctx, adjustmentStock, nil); err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create adjustment stock record")
 		}
 
-		var increaseQty float64
+		stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(ctx, productWarehouse.Id, 1)
-		var decreaseQty float64
-
-		switch routeMeta.Lane {
-		case adjustmentLaneStockable:
-			fifoNote := fmt.Sprintf("Stock Adjustment %s #%s", routeMeta.FunctionCode, adjustmentStock.AdjNumber)
-			result, err := s.FifoSvc.Replenish(ctx, common.StockReplenishRequest{
-				StockableKey:       fifo.StockableKeyAdjustmentIn,
-				StockableID:        adjustmentStock.Id,
-				ProductWarehouseID: productWarehouse.Id,
-				Quantity:           qty,
-				Note:               &fifoNote,
-				Tx:                 tx,
-			})
-			if err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to replenish stock via FIFO: %v", err))
-			}
-			increaseQty = result.AddedQuantity
-		case adjustmentLaneUsable:
-			if s.FifoStockV2Svc != nil {
-				usableLegacyTypeKey := fifo.UsableKeyAdjustmentOut.String()
-				if routeMeta.SourceTable == "adjustment_stocks" && strings.TrimSpace(routeMeta.LegacyTypeKey) != "" {
-					usableLegacyTypeKey = strings.TrimSpace(routeMeta.LegacyTypeKey)
-				}
-
-				reflowResult, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
-					FlagGroupCode:      routeMeta.FlagGroupCode,
-					ProductWarehouseID: productWarehouse.Id,
-					Usable: common.FifoStockV2Ref{
-						ID:            adjustmentStock.Id,
-						LegacyTypeKey: usableLegacyTypeKey,
-						FunctionCode:  routeMeta.FunctionCode,
-					},
-					DesiredQty:       qty,
-					AllowOverConsume: &allowPending,
-					Tx:               tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to consume stock via FIFO v2: %v", err))
-				}
-				decreaseQty = reflowResult.Allocate.AllocatedQty
-			} else {
-				result, err := s.FifoSvc.Consume(ctx, common.StockConsumeRequest{
-					UsableKey:          fifo.UsableKeyAdjustmentOut,
-					UsableID:           adjustmentStock.Id,
-					ProductWarehouseID: productWarehouse.Id,
-					Quantity:           qty,
-					AllowPending:       allowPending,
-					Tx:                 tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to consume stock via FIFO: %v", err))
-				}
-				decreaseQty = result.UsageQuantity
-			}
-		default:
-			return fiber.NewError(fiber.StatusBadRequest, "Unsupported transaction subtype lane")
-		}
-
-		stockLogs, err := stockLogRepoTX.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")
 		}
 
-		currentStock := 0.0
 		if len(stockLogs) > 0 {
-			currentStock = stockLogs[0].Stock
+			latestStockLog := stockLogs[0]
+			newLog.Stock = latestStockLog.Stock
+		} else {
+			newLog.Stock = 0
 		}
 
-		newLog := &entity.StockLog{
+		if transactionType == string(utils.StockLogTransactionTypeIncrease) {
-			LoggableType:       string(utils.StockLogTypeAdjustment),
+			afterQuantity += req.Quantity
-			LoggableId:         adjustmentStock.Id,
+			newLog.Increase = req.Quantity
-			Notes:              note,
+			newLog.Stock += newLog.Increase
+		} else {
+			if 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 = req.Quantity
+			newLog.Stock -= newLog.Decrease
+		}
+
+		if err := s.StockLogsRepository.WithTx(tx).CreateOne(ctx, newLog, nil); err != nil {
+			return err
+		}
+
+		adjustmentStock := &entity.AdjustmentStock{
 			ProductWarehouseId: productWarehouse.Id,
-			CreatedBy:          actorID,
+		}
-			Increase:           increaseQty,
+		if err := s.AdjustmentStockRepository.WithTx(tx).CreateOne(ctx, adjustmentStock, nil); err != nil {
-			Decrease:           decreaseQty,
+
-			Stock:              currentStock + increaseQty - decreaseQty,
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to create adjustment stock record")
 		}
 
-		if err := stockLogRepoTX.CreateOne(ctx, newLog, nil); err != nil {
+		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)
+			_, err := s.FifoSvc.Replenish(ctx, common.StockReplenishRequest{
+				StockableKey:       fifo.StockableKeyAdjustmentIn,
+				StockableID:        adjustmentStock.Id,
+				ProductWarehouseID: uint(productWarehouse.Id),
+				Quantity:           req.Quantity,
+				Note:               &note,
+				Tx:                 tx,
+			})
+			if err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to replenish stock via FIFO: %v", err))
+			}
+
+		} else {
+			_, err := s.FifoSvc.Consume(ctx, common.StockConsumeRequest{
+				UsableKey:          fifo.UsableKeyAdjustmentOut,
+				UsableID:           adjustmentStock.Id,
+				ProductWarehouseID: uint(productWarehouse.Id),
+				Quantity:           req.Quantity,
+				AllowPending:       false,
+				Tx:                 tx,
+			})
+			if err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to consume stock via FIFO: %v", err))
+			}
+		}
+
+		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
 		}
 
@@ -338,91 +257,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 	return s.GetOne(c, createdAdjustmentStockId)
 }
 
-func (s *adjustmentService) resolveWarehouseID(ctx context.Context, req *validation.Create) (uint, error) {
-	if req == nil {
-		return 0, fiber.NewError(fiber.StatusBadRequest, "Invalid request")
-	}
-
-	if req.WarehouseID > 0 {
-		return req.WarehouseID, nil
-	}
-
-	if req.ProjectFlockKandangID != nil && *req.ProjectFlockKandangID > 0 {
-		kandangID, err := s.AdjustmentStockRepository.FindKandangIDByProjectFlockKandangID(ctx, *req.ProjectFlockKandangID)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return 0, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id tidak valid atau tidak aktif")
-			}
-			return 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate project_flock_kandang_id context")
-		}
-
-		warehouse, err := s.WarehouseRepo.GetLatestByKandangID(ctx, kandangID)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return 0, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Warehouse untuk project_flock_kandang_id %d tidak ditemukan", *req.ProjectFlockKandangID))
-			}
-			return 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve warehouse by project_flock_kandang_id")
-		}
-		return warehouse.Id, nil
-	}
-
-	return 0, fiber.NewError(fiber.StatusBadRequest, "warehouse_id atau project_flock_kandang_id wajib diisi")
-}
-
-func (s *adjustmentService) resolveRouteByFunctionCode(
-	ctx context.Context,
-	productID uint,
-	functionCode string,
-) (*adjustmentStockRepo.AdjustmentRouteResolution, error) {
-	rows, err := s.AdjustmentStockRepository.FindRoutesByFunctionCode(ctx, productID, functionCode)
-	if err != nil {
-		return nil, err
-	}
-	if len(rows) == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Transaction subtype tidak kompatibel dengan konfigurasi FIFO v2 produk")
-	}
-
-	selected := rows[0]
-	for _, row := range rows {
-		if row.Lane != selected.Lane {
-			return nil, fiber.NewError(fiber.StatusBadRequest, "Transaction subtype ambigu: lane FIFO v2 lebih dari satu")
-		}
-	}
-
-	selected.FunctionCode = functionCode
-	switch selected.Lane {
-	case adjustmentLaneStockable, adjustmentLaneUsable:
-		return &selected, nil
-	default:
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Transaction subtype memiliki lane FIFO v2 yang tidak didukung")
-	}
-}
-
-func (s *adjustmentService) resolveOverconsumePolicy(
-	ctx context.Context,
-	route *adjustmentStockRepo.AdjustmentRouteResolution,
-) (bool, error) {
-	if route == nil {
-		return false, fmt.Errorf("route is required")
-	}
-
-	defaultValue := route.AllowPendingDefault
-	selected, err := s.AdjustmentStockRepository.FindOverconsumeRule(
-		ctx,
-		route.Lane,
-		route.FlagGroupCode,
-		route.FunctionCode,
-	)
-	if err != nil {
-		return false, err
-	}
-	if selected == nil {
-		return defaultValue, nil
-	}
-
-	return *selected, nil
-}
-
 func (s *adjustmentService) getActiveProjectFlockKandangID(ctx context.Context, warehouseID uint) (uint, error) {
 	warehouse, err := s.WarehouseRepo.GetByID(ctx, warehouseID, nil)
 	if err != nil {
@@ -453,12 +287,6 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 	if err := s.Validate.Struct(query); err != nil {
 		return nil, 0, err
 	}
-	if query.Page <= 0 {
-		query.Page = 1
-	}
-	if query.Limit <= 0 {
-		query.Limit = 10
-	}
 	offset := (query.Page - 1) * query.Limit
 
 	var isProductsExist bool
@@ -481,40 +309,46 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 		return nil, 0, fiber.NewError(fiber.StatusNotFound, "Product not found")
 	}
 
-	scope, scopeErr := m.ResolveLocationScope(c, s.AdjustmentStockRepository.DB())
+	var adjustmentStocks []entity.AdjustmentStock
-	if scopeErr != nil {
+	var total int64
-		return nil, 0, scopeErr
+
-	}
+	q := s.AdjustmentStockRepository.DB().WithContext(c.Context()).Model(&entity.AdjustmentStock{}).
-	if scope.Restrict {
+		Preload("ProductWarehouse").
-		if len(scope.IDs) == 0 {
+		Preload("ProductWarehouse.Product").
-			return []*entity.AdjustmentStock{}, 0, nil
+		Preload("ProductWarehouse.Warehouse").
-		}
+		Preload("StockLog.CreatedUser")
+
+	if query.ProductID > 0 {
+		q = q.Joins("JOIN product_warehouses ON product_warehouses.id = adjustment_stocks.product_warehouse_id").
+			Where("product_warehouses.product_id = ?", query.ProductID)
 	}
 
-	functionCode := strings.ToUpper(strings.TrimSpace(query.TransactionSubtype))
+	if query.WarehouseID > 0 {
-	if functionCode == "" {
+		q = q.Joins("JOIN product_warehouses ON product_warehouses.id = adjustment_stocks.product_warehouse_id").
-		functionCode = strings.ToUpper(strings.TrimSpace(query.FunctionCode))
+			Where("product_warehouses.warehouse_id = ?", query.WarehouseID)
 	}
-	transactionType := strings.ToUpper(strings.TrimSpace(query.TransactionType))
 
-	adjustmentStocks, total, err := s.AdjustmentStockRepository.FindHistory(
+	if query.TransactionType != "" {
-		c.Context(),
+		q = q.Joins("JOIN stock_logs ON stock_logs.loggable_type = ? AND stock_logs.loggable_id = adjustment_stocks.id", "ADJUSTMENT").
-		adjustmentStockRepo.AdjustmentHistoryFilter{
+			Where("stock_logs.transaction_type = ?", strings.ToUpper(query.TransactionType))
-			ProductID:       query.ProductID,
+	}
-			WarehouseID:     query.WarehouseID,
+
-			TransactionType: transactionType,
+	if err = q.Count(&total).Error; err != nil {
-			FunctionCode:    functionCode,
+		s.Log.Errorf("Failed to get adjustments: %+v", err)
-			ScopeRestrict:   scope.Restrict,
+		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to get adjustment history")
-			ScopeIDs:        scope.IDs,
+	}
-			Offset:          offset,
+
-			Limit:           query.Limit,
+	err = q.Offset(offset).Limit(query.Limit).Order("created_at DESC").Find(&adjustmentStocks).Error
-		},
+
-		nil,
-	)
 	if err != nil {
 		s.Log.Errorf("Failed to get adjustments: %+v", err)
 		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to get adjustment history")
 	}
 
-	return adjustmentStocks, total, nil
+	result := make([]*entity.AdjustmentStock, len(adjustmentStocks))
+	for i := range adjustmentStocks {
+		result[i] = &adjustmentStocks[i]
+	}
+
+	return result, total, nil
 }

internal/modules/inventory/adjustments/validations/adjustment.validation.go

@@ -1,25 +1,17 @@
 package validation
 
 type Create struct {
-	ProjectFlockKandangID *uint   `json:"project_flock_kandang_id" validate:"omitempty,min=1"`
+	ProductID       uint    `json:"product_id" validate:"required"`
-	WarehouseID           uint    `json:"warehouse_id" validate:"omitempty,min=1"`
+	WarehouseID     uint    `json:"warehouse_id" validate:"required"`
-	ProductID             uint    `json:"product_id" validate:"omitempty,min=1"`
+	TransactionType string  `json:"transaction_type" validate:"required,oneof=increase decrease"`
-	TransactionSubtype    string  `json:"transaction_subtype" validate:"required_without=TransactionSubType,max=64"`
+	Quantity        float64 `json:"quantity" validate:"required,gt=0"`
-	TransactionSubType    string  `json:"transaction_sub_type" validate:"required_without=TransactionSubtype,max=64"`
+	Note            string  `json:"note" validate:"omitempty,max=255"`
-	FunctionCode          string  `json:"function_code" validate:"omitempty,max=64"`
-	Qty                   float64 `json:"qty" validate:"omitempty,gt=0"`
-	Quantity              float64 `json:"quantity" validate:"omitempty,gt=0"`
-	Price                 float64 `json:"price" validate:"required,gte=0"`
-	Notes                 string  `json:"notes" validate:"omitempty,max=255"`
-	Note                  string  `json:"note" validate:"omitempty,max=255"`
 }
 
 type Query struct {
-	Page               int    `query:"page" validate:"omitempty,min=1"`
+	Page            int    `query:"page" validate:"omitempty,min=1"`
-	Limit              int    `query:"limit" validate:"omitempty,min=1,max=100"`
+	Limit           int    `query:"limit" validate:"omitempty,min=1,max=100"`
-	ProductID          uint   `query:"product_id" validate:"omitempty,min=0"`
+	ProductID       uint   `query:"product_id" validate:"omitempty,min=0"`
-	WarehouseID        uint   `query:"warehouse_id" validate:"omitempty,min=0"`
+	WarehouseID     uint   `query:"warehouse_id" validate:"omitempty,min=0"`
-	TransactionType    string `query:"transaction_type" validate:"omitempty,max=100"`
+	TransactionType string `query:"transaction_type" validate:"omitempty,oneof=increase decrease"`
-	TransactionSubtype string `query:"transaction_subtype" validate:"omitempty,max=64"`
-	FunctionCode       string `query:"function_code" validate:"omitempty,max=64"`
 }

internal/modules/inventory/product-stocks/dto/product-stock.dto.go

@@ -62,7 +62,6 @@ type StockLogDetailDTO struct {
 	Id                 uint                     `json:"id"`
 	Increase           float64                  `json:"increase"`
 	Decrease           float64                  `json:"decrease"`
-	Stock              float64                  `json:"stock"`
 	LoggableType       string                   `json:"loggable_type"`
 	LoggableId         uint                     `json:"loggable_id"`
 	Notes              *string                  `json:"notes"`
@@ -196,7 +195,6 @@ func mapStockLogs(src []entity.StockLog) []StockLogDetailDTO {
 			Id:                 log.Id,
 			Increase:           log.Increase,
 			Decrease:           log.Decrease,
-			Stock:              log.Stock,
 			LoggableType:       log.LoggableType,
 			LoggableId:         log.LoggableId,
 			Notes:              notes,

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

@@ -4,7 +4,6 @@ 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"
@@ -37,49 +36,19 @@ func NewProductStockService(
 	}
 }
 
-func (s productStockService) withRelations(db *gorm.DB, locationScope, areaScope m.ScopeFilter) *gorm.DB {
+func (s productStockService) withRelations(db *gorm.DB) *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", productWarehouseScope).
+		Preload("ProductWarehouses").
-		Preload("ProductWarehouses.Warehouse", warehouseScope).
+		Preload("ProductWarehouses.Warehouse").
 		Preload("ProductWarehouses.Warehouse.Location").
 		Preload("ProductWarehouses.Warehouse.Location.Area").
-		Preload("ProductWarehouses.StockLogs", stockLogScope).
+		Preload("ProductWarehouses.StockLogs", func(db *gorm.DB) *gorm.DB {
+			return db.Order("created_at ASC")
+		}).
 		Preload("ProductWarehouses.StockLogs.CreatedUser").
 		Preload("ProductSuppliers").
 		Preload("ProductSuppliers.Supplier", func(db *gorm.DB) *gorm.DB {
@@ -92,40 +61,17 @@ 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 {
-		if locationScope.Restrict || areaScope.Restrict {
+		db = db.Where(`EXISTS (
-			if (locationScope.Restrict && len(locationScope.IDs) == 0) || (areaScope.Restrict && len(areaScope.IDs) == 0) {
+			SELECT 1
-				return db.Where("1 = 0")
+			FROM product_warehouses pw
-			}
+			WHERE pw.product_id = products.id
-			db = db.Where(`EXISTS (
+				AND pw.qty > 0
-				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, locationScope, areaScope)
+		db = s.withRelations(db)
 		if params.Search != "" {
 			db = db.Where("products.name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -140,34 +86,7 @@ func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 }
 
 func (s productStockService) GetOne(c *fiber.Ctx, id uint) (*entity.Product, error) {
-	locationScope, areaScope, err := m.ResolveLocationAreaScopes(c, s.ProductRepository.DB())
+	product, err := s.ProductRepository.GetByID(c.Context(), id, s.withRelations)
-	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")
 	}
@@ -175,47 +94,5 @@ func (s productStockService) GetOne(c *fiber.Ctx, id uint) (*entity.Product, err
 		s.Log.Errorf("Failed get product by id: %+v", err)
 		return nil, err
 	}
-
-	if len(product.ProductWarehouses) > 0 {
-		ids := make([]uint, 0, len(product.ProductWarehouses))
-		for _, pw := range product.ProductWarehouses {
-			if pw.Id != 0 {
-				ids = append(ids, pw.Id)
-			}
-		}
-
-		if len(ids) > 0 {
-			type pendingUsageRow struct {
-				ProductWarehouseId uint
-				PendingQty         float64
-			}
-
-			var rows []pendingUsageRow
-			if err := s.ProductRepository.DB().WithContext(c.Context()).
-				Table("recording_stocks").
-				Select("product_warehouse_id, COALESCE(SUM(pending_qty), 0) AS pending_qty").
-				Where("pending_qty > 0").
-				Where("product_warehouse_id IN ?", ids).
-				Group("product_warehouse_id").
-				Scan(&rows).Error; err != nil {
-				s.Log.Errorf("Failed to load pending usage for product warehouses: %+v", err)
-				return nil, err
-			}
-
-			if len(rows) > 0 {
-				pendingMap := make(map[uint]float64, len(rows))
-				for _, row := range rows {
-					pendingMap[row.ProductWarehouseId] = row.PendingQty
-				}
-
-				for i := range product.ProductWarehouses {
-					pw := &product.ProductWarehouses[i]
-					if pending, ok := pendingMap[pw.Id]; ok && pending != 0 {
-						pw.Quantity -= pending
-					}
-				}
-			}
-		}
-	}
 	return product, nil
 }

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

@@ -8,7 +8,6 @@ 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"
 )
@@ -25,14 +24,12 @@ func NewProductWarehouseController(productWarehouseService service.ProductWareho
 
 func (u *ProductWarehouseController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
-		Page:            c.QueryInt("page", 1),
+		Page:        c.QueryInt("page", 1),
-		Limit:           c.QueryInt("limit", 10),
+		Limit:       c.QueryInt("limit", 10),
-		ProductId:       uint(c.QueryInt("product_id", 0)),
+		ProductId:   uint(c.QueryInt("product_id", 0)),
-		WarehouseId:     uint(c.QueryInt("warehouse_id", 0)),
+		WarehouseId: uint(c.QueryInt("warehouse_id", 0)),
-		Flags:           c.Query("flags", ""),
+		Flags:       c.Query("flags", ""),
-		KandangId:       uint(c.QueryInt("kandang_id", 0)),
+		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,7 +6,6 @@ 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 ===
@@ -23,7 +22,6 @@ 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"`
@@ -111,22 +109,6 @@ 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
@@ -156,58 +138,3 @@ 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

@@ -168,10 +168,9 @@ func (r *ProductWarehouseRepositoryImpl) ApplyFlagsFilter(db *gorm.DB, flags []s
 	}
 
 	return db.
-		Joins("JOIN products p_flag ON p_flag.id = product_warehouses.product_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
-		Joins("JOIN flags f_flag ON f_flag.flagable_id = p_flag.id AND f_flag.flagable_type = ?", "products").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
-		Where("f_flag.name IN ?", flags).
+		Where("flags.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,7 +7,6 @@ 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"
@@ -46,8 +45,7 @@ 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) {
@@ -55,19 +53,6 @@ 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 {
@@ -100,32 +85,11 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 
 	offset := (params.Page - 1) * params.Limit
 
-	var marketingTypes []string
-	if params.Type != "" {
-		marketingTypes = utils.ParseQueryArray(params.Type)
-		for _, t := range marketingTypes {
-			if !utils.IsValidMarketingType(t) {
-				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)
 		}
@@ -139,48 +103,7 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 			db = db.Where("warehouse_id = ?", params.WarehouseId)
 		}
 
-		if len(marketingTypes) > 0 {
+		db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
-			flagSet := make(map[string]struct{})
-			for _, t := range marketingTypes {
-				switch t {
-				case string(utils.MarketingTypeAyamPullet):
-					flagSet[string(utils.FlagDOC)] = struct{}{}
-					flagSet[string(utils.FlagPullet)] = struct{}{}
-					flagSet[string(utils.FlagLayer)] = struct{}{}
-				case string(utils.MarketingTypeAyam):
-					flagSet[string(utils.FlagAyamAfkir)] = struct{}{}
-					flagSet[string(utils.FlagAyamCulling)] = struct{}{}
-					flagSet[string(utils.FlagAyamMati)] = struct{}{}
-				case string(utils.MarketingTypeTelur):
-					flagSet[string(utils.FlagTelur)] = struct{}{}
-					flagSet[string(utils.FlagTelurUtuh)] = struct{}{}
-					flagSet[string(utils.FlagTelurPecah)] = struct{}{}
-					flagSet[string(utils.FlagTelurPutih)] = struct{}{}
-					flagSet[string(utils.FlagTelurRetak)] = struct{}{}
-				case string(utils.MarketingTypeTrading):
-					flagSet[string(utils.FlagPakan)] = struct{}{}
-					flagSet[string(utils.FlagPreStarter)] = struct{}{}
-					flagSet[string(utils.FlagStarter)] = struct{}{}
-					flagSet[string(utils.FlagFinisher)] = struct{}{}
-					flagSet[string(utils.FlagOVK)] = struct{}{}
-					flagSet[string(utils.FlagObat)] = struct{}{}
-					flagSet[string(utils.FlagVitamin)] = struct{}{}
-					flagSet[string(utils.FlagKimia)] = struct{}{}
-					flagSet[string(utils.FlagEkspedisi)] = struct{}{}
-				}
-			}
-			if len(flagSet) > 0 {
-				flags := make([]string, 0, len(flagSet))
-				for f := range flagSet {
-					flags = append(flags, f)
-				}
-				db = s.Repository.ApplyFlagsFilter(db, flags)
-			}
-		}
-
-		if len(cleanFlags) > 0 {
-			db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
-		}
 
 		return db.Order("product_warehouses.id DESC")
 	})
@@ -193,33 +116,7 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 }
 
 func (s productWarehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.ProductWarehouse, error) {
-	applyScope := true
+	productWarehouse, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
-	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,12 +13,10 @@ type Update struct {
 }
 
 type Query struct {
-	Page            int    `query:"page" 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"`
+	Limit       int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	ProductId       uint   `query:"product_id" validate:"omitempty,number,min=1"`
+	ProductId   uint   `query:"product_id" validate:"omitempty,number,min=1"`
-	WarehouseId     uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
+	WarehouseId uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
-	Flags           string `query:"flags" validate:"omitempty"`
+	Flags       string `query:"flags" validate:"omitempty"`
-	KandangId       uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
+	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"`
 }

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

@@ -9,12 +9,12 @@ import (
 )
 
 type TransferRelationDTO struct {
-	Id                   uint64                             `json:"id"`
+	Id                   uint64                                `json:"id"`
-	MovementNumber       string                             `json:"movement_number"`
+	MovementNumber       string                                `json:"movement_number"`
-	TransferReason       string                             `json:"transfer_reason"`
+	TransferReason       string                                `json:"transfer_reason"`
-	TransferDate         string                             `json:"transfer_date"`
+	TransferDate         string                                `json:"transfer_date"`
-	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO `json:"source_warehouse,omitempty"`
+	SourceWarehouse      *warehouseDTO.WarehouseRelationDTO    `json:"source_warehouse,omitempty"`
-	DestinationWarehouse *warehouseDTO.WarehouseRelationDTO `json:"destination_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"`
+	Id                uint64           `json:"id"`
-	Product          ProductSimpleDTO   `json:"product"`
+	Product           ProductSimpleDTO `json:"product"`
-	Quantity         float64            `json:"quantity"`
+	Quantity          float64          `json:"quantity"`
-	TransportPerItem *float64           `json:"transport_per_item,omitempty"` // Biaya ekspedisi per item
+	TransportPerItem  *float64         `json:"transport_per_item,omitempty"`  // Biaya ekspedisi per item
-	ExpeditionVendor *SupplierSimpleDTO `json:"expedition_vendor,omitempty"`  // Vendor ekspedisi
+	ExpeditionVendor  *SupplierSimpleDTO `json:"expedition_vendor,omitempty"` // Vendor ekspedisi
 }
 
 type TransferDeliveryDTO struct {
 	Id                uint64                    `json:"id"`
-	Supplier          *SupplierSimpleDTO        `json:"supplier,omitempty"`
+	Supplier          SupplierSimpleDTO         `json:"supplier"`
 	VehiclePlate      string                    `json:"vehicle_plate"`
 	DriverName        string                    `json:"driver_name"`
 	DocumentNumber    string                    `json:"document_number"`
@@ -115,6 +115,7 @@ 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
@@ -154,17 +155,12 @@ func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 			}
 		}
 
-		var supplier *SupplierSimpleDTO
+		deliveries = append(deliveries, TransferDeliveryDTO{
-		if del.Supplier != nil {
+			Id: del.Id,
-			supplier = &SupplierSimpleDTO{
+			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,
@@ -205,6 +201,7 @@ 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
@@ -244,17 +241,12 @@ func ToTransferDetailDTO(e entity.StockTransfer) TransferDetailDTO {
 			}
 		}
 
-		var supplier *SupplierSimpleDTO
+		deliveries = append(deliveries, TransferDeliveryDTO{
-		if del.Supplier != nil {
+			Id: del.Id,
-			supplier = &SupplierSimpleDTO{
+			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/module.go

@@ -52,6 +52,7 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		panic(err)
 	}
 
+
 	approvalRepo := commonRepo.NewApprovalRepository(db)
 	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
 	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowExpense, utils.ExpenseApprovalSteps); err != nil {
@@ -70,7 +71,6 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 	)
 
 	fifoService := commonSvc.NewFifoService(db, stockAllocRepo, productWarehouseRepo, utils.Log)
-	fifoStockV2Service := commonSvc.NewFifoStockV2Service(db, utils.Log)
 	expenseBridge := sTransfer.NewTransferExpenseBridge(
 		db,
 		stockTransferRepo,
@@ -111,7 +111,7 @@ func (TransferModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate
 		panic(err)
 	}
 
-	transferService := sTransfer.NewTransferService(validate, stockTransferRepo, stockTransferDetailRepo, stockTransferDeliveryRepo, StockTransferDeliveryItemRepo, stockLogsRepo, productWarehouseRepo, supplierRepo, warehouseRepo, projectFlockKandangRepo, documentSvc, fifoService, fifoStockV2Service, expenseBridge)
+	transferService := sTransfer.NewTransferService(validate, stockTransferRepo, stockTransferDetailRepo, stockTransferDeliveryRepo, StockTransferDeliveryItemRepo, stockLogsRepo, productWarehouseRepo, supplierRepo, warehouseRepo, projectFlockKandangRepo, documentSvc, fifoService, expenseBridge)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	TransferRoutes(router, userService, transferService)

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

@@ -46,11 +46,10 @@ type transferService struct {
 	ProjectFlockKandangRepo       projectFlockKandangRepo.ProjectFlockKandangRepository
 	DocumentSvc                   commonSvc.DocumentService
 	FifoSvc                       commonSvc.FifoService
-	FifoStockV2Svc                commonSvc.FifoStockV2Service
 	ExpenseBridge                 TransferExpenseBridge
 }
 
-func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTransfer.StockTransferRepository, stockTransferDetailRepo rStockTransfer.StockTransferDetailRepository, stockTransferDeliveryRepo rStockTransfer.StockTransferDeliveryRepository, stockTransferDeliveryItemRepo rStockTransfer.StockTransferDeliveryItemRepository, stockLogsRepo rStockLogs.StockLogRepository, productWarehouseRepo rProductWarehouse.ProductWarehouseRepository, supplierRepo rSupplier.SupplierRepository, warehouseRepo warehouseRepo.WarehouseRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, documentSvc commonSvc.DocumentService, fifoSvc commonSvc.FifoService, fifoStockV2Svc commonSvc.FifoStockV2Service, expenseBridge TransferExpenseBridge) TransferService {
+func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTransfer.StockTransferRepository, stockTransferDetailRepo rStockTransfer.StockTransferDetailRepository, stockTransferDeliveryRepo rStockTransfer.StockTransferDeliveryRepository, stockTransferDeliveryItemRepo rStockTransfer.StockTransferDeliveryItemRepository, stockLogsRepo rStockLogs.StockLogRepository, productWarehouseRepo rProductWarehouse.ProductWarehouseRepository, supplierRepo rSupplier.SupplierRepository, warehouseRepo warehouseRepo.WarehouseRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, documentSvc commonSvc.DocumentService, fifoSvc commonSvc.FifoService, expenseBridge TransferExpenseBridge) TransferService {
 	return &transferService{
 		Log:                           utils.Log,
 		Validate:                      validate,
@@ -65,7 +64,6 @@ func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTr
 		ProjectFlockKandangRepo:       projectFlockKandangRepo,
 		DocumentSvc:                   documentSvc,
 		FifoSvc:                       fifoSvc,
-		FifoStockV2Svc:                fifoStockV2Svc,
 		ExpenseBridge:                 expenseBridge,
 	}
 }
@@ -96,24 +94,10 @@ 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").
@@ -132,28 +116,6 @@ 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)
@@ -234,24 +196,6 @@ 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) {
@@ -366,16 +310,9 @@ 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:        supplierId,
+				SupplierId:        uint64(delivery.SupplierID),
 				VehiclePlate:      delivery.VehiclePlate,
 				DriverName:        delivery.DriverName,
 				ShippingCostItem:  delivery.DeliveryCostPerItem,
@@ -444,73 +381,26 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			}
 		}
 
-		pakanProducts := map[uint]bool{}
-		if s.FifoStockV2Svc != nil && len(req.Products) > 0 {
-			pakanProducts, err = s.resolvePakanProducts(c.Context(), tx, req.Products)
-			if err != nil {
-				return err
-			}
-		}
-
 		for _, product := range req.Products {
 			detail := detailMap[uint64(product.ProductID)]
 
-			outUsageQty := 0.0
+			consumeResult, err := s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
-			outPendingQty := 0.0
+				UsableKey:          fifo.UsableKeyStockTransferOut,
-			useFifoV2 := s.FifoStockV2Svc != nil && pakanProducts[uint(product.ProductID)]
+				UsableID:           uint(detail.Id),
-			if useFifoV2 {
+				ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-				s.Log.Infof(
+				Quantity:           product.ProductQty,
-					"[fifo-v2][transfer] use reflow movement=%s detail_id=%d product_id=%d source_pw=%d qty=%.3f",
+				AllowPending:       false,
-					entityTransfer.MovementNumber,
+				Tx:                 tx,
-					detail.Id,
+			})
-					product.ProductID,
+			if err != nil {
-					*detail.SourceProductWarehouseID,
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
-					product.ProductQty,
-				)
-				reflowResult, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
-					FlagGroupCode:      "PAKAN",
-					ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-					Usable: commonSvc.FifoStockV2Ref{
-						ID:            uint(detail.Id),
-						LegacyTypeKey: fifo.UsableKeyStockTransferOut.String(),
-						FunctionCode:  "STOCK_TRANSFER_OUT",
-					},
-					DesiredQty: product.ProductQty,
-					Tx:         tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
-				}
-				outUsageQty = reflowResult.Allocate.AllocatedQty
-				outPendingQty = reflowResult.Allocate.PendingQty
-				s.Log.Infof(
-					"[fifo-v2][transfer] reflow result movement=%s detail_id=%d usage=%.3f pending=%.3f",
-					entityTransfer.MovementNumber,
-					detail.Id,
-					outUsageQty,
-					outPendingQty,
-				)
-			} else {
-				consumeResult, err := s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
-					UsableKey:          fifo.UsableKeyStockTransferOut,
-					UsableID:           uint(detail.Id),
-					ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-					Quantity:           product.ProductQty,
-					AllowPending:       false,
-					Tx:                 tx,
-				})
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
-				}
-				outUsageQty = consumeResult.UsageQuantity
-				outPendingQty = consumeResult.PendingQuantity
 			}
 
 			if err := tx.Model(&entity.StockTransferDetail{}).
 				Where("id = ?", detail.Id).
 				Updates(map[string]interface{}{
-					"usage_qty":   outUsageQty,
+					"usage_qty":   consumeResult.UsageQuantity,
-					"pending_qty": outPendingQty,
+					"pending_qty": consumeResult.PendingQuantity,
 				}).Error; err != nil {
 				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")
@@ -525,34 +415,11 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				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)
-			inAddedQty := 0.0
-			if useFifoV2 {
-				s.Log.Infof(
-					"[fifo-v2][transfer] stock-in uses replenish path movement=%s detail_id=%d product_id=%d dest_pw=%d qty=%.3f",
-					entityTransfer.MovementNumber,
-					detail.Id,
-					product.ProductID,
-					*detail.DestProductWarehouseID,
-					product.ProductQty,
-				)
-			}
 			replenishResult, err := s.FifoSvc.Replenish(c.Context(), commonSvc.StockReplenishRequest{
 				StockableKey:       fifo.StockableKeyStockTransferIn,
 				StockableID:        uint(detail.Id),
@@ -565,12 +432,11 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				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")
 			}
-			inAddedQty = replenishResult.AddedQuantity
 
 			if err := tx.Model(&entity.StockTransferDetail{}).
 				Where("id = ?", detail.Id).
 				Updates(map[string]interface{}{
-					"total_qty": inAddedQty,
+					"total_qty": replenishResult.AddedQuantity,
 				}).Error; err != nil {
 				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")
@@ -585,17 +451,6 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				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")
 			}
@@ -603,11 +458,6 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 
 		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 {
@@ -657,53 +507,6 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	return result, nil
 }
 
-func (s *transferService) resolvePakanProducts(
-	ctx context.Context,
-	tx *gorm.DB,
-	products []validation.TransferProduct,
-) (map[uint]bool, error) {
-	out := make(map[uint]bool, len(products))
-	if len(products) == 0 {
-		return out, nil
-	}
-
-	productIDs := make([]uint, 0, len(products))
-	seen := make(map[uint]struct{}, len(products))
-	for _, product := range products {
-		if product.ProductID == 0 {
-			continue
-		}
-		if _, ok := seen[product.ProductID]; ok {
-			continue
-		}
-		seen[product.ProductID] = struct{}{}
-		productIDs = append(productIDs, product.ProductID)
-	}
-	if len(productIDs) == 0 {
-		return out, nil
-	}
-
-	type row struct {
-		ProductID uint `gorm:"column:product_id"`
-	}
-	var rows []row
-	err := tx.WithContext(ctx).
-		Table("flags f").
-		Select("DISTINCT f.flagable_id AS product_id").
-		Where("f.flagable_type = ?", entity.FlagableTypeProduct).
-		Where("f.name IN ?", []string{"PAKAN", "PRE-STARTER", "STARTER", "FINISHER"}).
-		Where("f.flagable_id IN ?", productIDs).
-		Scan(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-
-	for _, row := range rows {
-		out[row.ProductID] = true
-	}
-	return out, nil
-}
-
 func (s *transferService) notifyExpenseItemsDelivered(c *fiber.Ctx, transferID uint64, payloads []TransferExpenseReceivingPayload) error {
 	if s.ExpenseBridge == nil || transferID == 0 || len(payloads) == 0 {
 		return nil