tes commit

.gitignore

@@ -9,7 +9,7 @@ main
 bin/
 *.exe
 *.out
-.air.toml
+
 Makefile
 docker-compose.local.yml
 docker-compose.yaml

.gitlab-ci.yml

@@ -1,35 +1,90 @@
-workflow:
-  rules:
-    # MR pipeline
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: always
+stages:
+  - deploy
 
-    # 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
+deploy-dev:
+  stage: deploy
+  image: alpine:3.20
+  variables:
+    DEPLOY_APP: "LTI-MBUGROUP"
+    # Opsional: kalau pakai submodule, ini bikin clone submodule pakai SSH juga
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_DEPTH: "1"
 
-    # Selain itu jangan buat pipeline
-    - when: never
+  before_script:
+    - echo "🧰 Installing dependencies..."
+    - apk update && apk add --no-cache openssh git curl bash
 
-include:
-  # khusus MR (notif)
-  - local: "ci/merge_request.yml"
-    rules:
-      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    # Setup SSH di runner
+    - mkdir -p ~/.ssh
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
+    - chmod 600 ~/.ssh/id_rsa
+    - eval "$(ssh-agent -s)"
+    - ssh-add ~/.ssh/id_rsa
 
-  # khusus push ke branch env
-  - local: "ci/development.yml"
-    rules:
-      - if: '$CI_COMMIT_BRANCH == "development"'
+    # Trust host keys (server + gitlab) biar SSH gak nanya interaktif
+    - ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
+    - ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
 
-  - local: "ci/staging.yml"
-    rules:
-      - if: '$CI_COMMIT_BRANCH == "staging"'
+  script:
+    - echo "🚀 Deploying latest code to $SERVER_USER@$SERVER_IP"
 
-  - local: "ci/production.yml"
-    rules:
-      - if: '$CI_COMMIT_BRANCH == "production"'
+    - >
+      if ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
+        set -e
+
+        cd /home/devops/docker/deployment/development/lti-api
+
+        # Pastikan remote origin SSH (antisipasi kalau pernah ke-set HTTPS)
+        git remote set-url origin git@gitlab.com:mbugroup/lti-api.git
+
+        # Pastikan server percaya gitlab.com juga (untuk git fetch via SSH)
+        mkdir -p ~/.ssh
+        ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
+
+        # Fetch/reset pakai SSH
+        GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git fetch origin development
+        git reset --hard origin/development
+
+        docker compose restart dev-api-lti || docker compose up -d dev-api-lti
+      "; then
+        STATUS='success';
+      else
+        STATUS='failed';
+      fi;
+
+      RUN_URL="${CI_PROJECT_URL}/-/pipelines/${CI_PIPELINE_ID}";
+
+      if [ "$STATUS" = "success" ]; then
+        COLOR=3066993;
+        TITLE="✅ Deployment API Succeeded";
+        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` completed successfully.";
+      else
+        COLOR=15158332;
+        TITLE="❌ Deployment API Failed Gaes";
+        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` failed.";
+      fi;
+
+      echo "{
+        \"username\": \"CI Bot\",
+        \"embeds\": [{
+          \"title\": \"$TITLE\",
+          \"description\": \"$DESC\",
+          \"color\": $COLOR,
+          \"fields\": [
+            {\"name\": \"Repository\", \"value\": \"${CI_PROJECT_PATH}\", \"inline\": true},
+            {\"name\": \"Actor\", \"value\": \"${GITLAB_USER_LOGIN}\", \"inline\": true},
+            {\"name\": \"Commit\", \"value\": \"${CI_COMMIT_SHA}\", \"inline\": false},
+            {\"name\": \"Pipeline\", \"value\": \"[Open run](${RUN_URL})\", \"inline\": false}
+          ]
+        }]
+      }" > payload.json;
+
+      echo "📡 Sending notification to Discord...";
+      curl -sS -H "Content-Type: application/json" \
+        -d @payload.json "$DISCORD_WEBHOOK_URL";
+
+  only:
+    - development
+
+  environment:
+    name: development

README.md

@@ -106,8 +106,8 @@ internal/
 
 ## ✨ Author
 
-IT Development PT Mitra Berlian Unggas Group
+IT Development PT Mitra Berlian Unggas Groups
 
-## 📃 License
+## 📃 Licensee
 
 > This project is private. All rights reserved.

ci/development.yml

@@ -1,91 +0,0 @@
-stages:
-  - deploy
-
-deploy-dev:
-  stage: deploy
-  image: alpine:3.20
-
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "development"'
-      when: on_success
-    - when: never
-
-  variables:
-    DEPLOY_APP: "LTI-MBUGROUP"
-    GIT_SUBMODULE_STRATEGY: recursive
-    GIT_DEPTH: "1"
-
-  before_script:
-    - echo "🧰 Installing dependencies..."
-    - apk update && apk add --no-cache openssh git curl bash
-
-    # Setup SSH di runner
-    - mkdir -p ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
-    - chmod 600 ~/.ssh/id_rsa
-    - eval "$(ssh-agent -s)"
-    - ssh-add ~/.ssh/id_rsa
-
-    # Trust host keys (server + gitlab) biar SSH gak nanya interaktif
-    - ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
-    - ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
-
-  script:
-    - echo "🚀 Deploying latest code to $SERVER_USER@$SERVER_IP"
-    - >
-      if ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
-        set -e
-
-        cd /home/devops/docker/deployment/development/lti-api
-
-        # Pastikan remote origin SSH (antisipasi kalau pernah ke-set HTTPS)
-        git remote set-url origin git@gitlab.com:mbugroup/lti-api.git
-
-        # Pastikan server percaya gitlab.com juga (untuk git fetch via SSH)
-        mkdir -p ~/.ssh
-        ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
-
-        # Fetch/reset pakai SSH
-        GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git fetch origin development
-        git reset --hard origin/development
-
-        docker compose restart dev-api-lti || docker compose up -d dev-api-lti
-      "; then
-        STATUS='success';
-      else
-        STATUS='failed';
-      fi;
-
-      RUN_URL="${CI_PROJECT_URL}/-/pipelines/${CI_PIPELINE_ID}";
-
-      if [ "$STATUS" = "success" ]; then
-        COLOR=3066993;
-        TITLE="✅ Deployment API Succeeded";
-        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` completed successfully.";
-      else
-        COLOR=15158332;
-        TITLE="❌ Deployment API Failed Gaes";
-        DESC="Deployment job on branch \`${CI_COMMIT_REF_NAME}\` failed.";
-      fi;
-
-      echo "{
-        \"username\": \"CI Bot\",
-        \"embeds\": [{
-          \"title\": \"$TITLE\",
-          \"description\": \"$DESC\",
-          \"color\": $COLOR,
-          \"fields\": [
-            {\"name\": \"Repository\", \"value\": \"${CI_PROJECT_PATH}\", \"inline\": true},
-            {\"name\": \"Actor\", \"value\": \"${GITLAB_USER_LOGIN}\", \"inline\": true},
-            {\"name\": \"Commit\", \"value\": \"${CI_COMMIT_SHA}\", \"inline\": false},
-            {\"name\": \"Pipeline\", \"value\": \"[Open run](${RUN_URL})\", \"inline\": false}
-          ]
-        }]
-      }" > payload.json;
-
-      echo "📡 Sending notification to Discord...";
-      curl -sS -H "Content-Type: application/json" \
-        -d @payload.json "$DISCORD_WEBHOOK_URL";
-
-  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,155 +0,0 @@
-stages:
-  - build
-  - migrate
-  - deploy
-  - seed
-
-default:
-  tags:
-    - self-hosted-prod
-
-variables:
-  DOCKER_BUILDKIT: "1"
-
-  IMAGE_TAG: "production_${CI_COMMIT_SHORT_SHA}"
-  IMAGE_NAME: "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}"
-  IMAGE_LATEST: "${CI_REGISTRY_IMAGE}:production_latest"
-
-  DEPLOY_DIR: "/opt/deploy/lti"
-  COMPOSE_FILE: "docker-compose.yaml"
-
-# =========================
-# BUILD (AUTO)
-# =========================
-build_production:
-  stage: build
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
-  script: |
-    set -e
-    docker info
-
-    echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-
-    echo "✅ Build image: $IMAGE_NAME"
-    docker build -t "$IMAGE_NAME" -f Dockerfile .
-
-    echo "✅ Push image: $IMAGE_NAME"
-    docker push "$IMAGE_NAME"
-
-    echo "✅ Tag latest: $IMAGE_LATEST"
-    docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
-    docker push "$IMAGE_LATEST"
-
-# =========================
-# MIGRATE (PRODUCTION)
-# =========================
-migrate_production:
-  stage: migrate
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
-  needs:
-    - job: build_production
-      artifacts: false
-  script: |
-    set -e
-    echo "✅ Running migrations (production) ..."
-
-    cd "$DEPLOY_DIR"
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
-    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
-
-    set -a
-    . ./.env
-    set +a
-
-    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
-    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
-    test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
-    test -n "$DB_PASSWORD" || (echo "❌ DB_PASSWORD empty" && exit 1)
-    test -n "$DB_NAME" || (echo "❌ DB_NAME empty" && exit 1)
-
-    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
-    echo "✅ DATABASE_URL=$DATABASE_URL"
-
-    # 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)
-# =========================
-deploy_production:
-  stage: deploy
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
-  needs:
-    - job: build_production
-      artifacts: false
-  script: |
-    set -e
-    docker info
-    echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-
-    cd "$DEPLOY_DIR"
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
-    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
-
-    docker compose -f "$COMPOSE_FILE" pull
-    docker compose -f "$COMPOSE_FILE" up -d --force-recreate
-    docker image prune -f
-
-# =========================
-# SEED (MANUAL)
-# =========================
-seed_production:
-  stage: seed
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
-      when: manual
-    - when: never
-  script: |
-    set -e
-    cd "$DEPLOY_DIR"
-    test -f .env || (echo "❌ .env not found" && exit 1)
-
-    echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-
-    docker compose --env-file .env pull seed
-    docker compose --env-file .env run --rm seed

ci/staging.yml

@@ -1,164 +0,0 @@
-stages:
-  - build
-  - migrate
-  - deploy
-  - seed
-
-default:
-  tags:
-    - self-hosted-stg
-
-variables:
-  DOCKER_BUILDKIT: "1"
-
-  IMAGE_TAG: "staging_${CI_COMMIT_SHORT_SHA}"
-  IMAGE_NAME: "${CI_REGISTRY_IMAGE}:${IMAGE_TAG}"
-  IMAGE_LATEST: "${CI_REGISTRY_IMAGE}:staging_latest"
-
-  DEPLOY_DIR: "/opt/deploy/stg-lti-api"
-  COMPOSE_FILE: "docker-compose.yaml"
-
-# =========================
-# BUILD (AUTO)
-# =========================
-build_staging:
-  stage: build
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
-  script: |
-    set -e
-    docker info
-
-    echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-
-    echo "✅ Build image: $IMAGE_NAME"
-    docker build -t "$IMAGE_NAME" -f Dockerfile .
-
-    echo "✅ Push image: $IMAGE_NAME"
-    docker push "$IMAGE_NAME"
-
-    echo "✅ Tag latest: $IMAGE_LATEST"
-    docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
-    docker push "$IMAGE_LATEST"
-
-# =========================
-# MIGRATE (AUTO)
-# =========================
-migrate_staging:
-  stage: migrate
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
-  needs:
-    - job: build_staging
-      artifacts: false
-  script: |
-    set -e
-    echo "✅ Running migrations (staging) ..."
-
-    cd "$DEPLOY_DIR"
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
-    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
-
-    set -a
-    . ./.env
-    set +a
-
-    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
-    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
-    test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
-    test -n "$DB_PASSWORD" || (echo "❌ DB_PASSWORD empty" && exit 1)
-    test -n "$DB_NAME" || (echo "❌ DB_NAME empty" && exit 1)
-
-    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
-    echo "✅ DATABASE_URL=$DATABASE_URL"
-
-    echo "✅ Ensuring postgres & redis running ..."
-    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 ':')"
-    echo "✅ Compose network key: $COMPOSE_NETWORK_KEY"
-
-    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"
-
-    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)
-# =========================
-deploy_staging:
-  stage: deploy
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
-  needs:
-    - job: migrate_staging
-      artifacts: false
-    - job: build_staging
-      artifacts: false
-  script: |
-    set -e
-    docker info
-    echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
-
-    cd "$DEPLOY_DIR"
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
-    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
-
-    docker compose -f "$COMPOSE_FILE" pull
-    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"'
-      when: manual
-    - when: never
-  needs:
-    - job: deploy_staging
-      artifacts: false
-  allow_failure: false
-  script: |
-    set -e
-    cd "$DEPLOY_DIR"
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found" && exit 1)
-    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

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

@@ -1,311 +0,0 @@
-package repository
-
-import (
-	"context"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-type HppCostRepository interface {
-	GetProjectFlockKandangIDs(ctx context.Context, projectFlockId uint) ([]uint, error)
-	GetDocCost(ctx context.Context, projectFlockKandangIDs []uint) (float64, error)
-	GetBudgetCostByProjectFlockId(ctx context.Context, projectFlockId uint) (float64, error)
-	GetExpedisionCost(ctx context.Context, projectFlockKandangIDs []uint) (float64, error)
-	GetFeedUsageCost(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, error)
-	GetOvkUsageCost(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, error)
-	GetTotalPopulation(ctx context.Context, projectFlockKandangIDs []uint) (float64, error)
-	GetPulletCost(ctx context.Context, projectFlockKandangId uint) (float64, error)
-	GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error)
-	GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, startDate *time.Time, endDate *time.Time) (float64, float64, error)
-	GetProjectFlockIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangId uint) (uint, error)
-	GetTransferSourceSummary(ctx context.Context, projectFlockKandangId uint) (uint, float64, error)
-}
-
-type HppRepositoryImpl struct {
-	db *gorm.DB
-}
-
-func NewHppCostRepository(db *gorm.DB) HppCostRepository {
-	return &HppRepositoryImpl{db: db}
-}
-
-func (r *HppRepositoryImpl) GetProjectFlockKandangIDs(ctx context.Context, projectFlockId uint) ([]uint, error) {
-	var ids []uint
-	err := r.db.WithContext(ctx).
-		Table("project_flock_kandangs").
-		Select("id").
-		Where("project_flock_id = ?", projectFlockId).
-		Scan(&ids).Error
-	if err != nil {
-		return nil, err
-	}
-
-	return ids, nil
-}
-
-func (r *HppRepositoryImpl) GetDocCost(ctx context.Context, projectFlockKandangIDs []uint) (float64, error) {
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("project_chickins AS pc").
-		Select("COALESCE(SUM(pc.usage_qty * COALESCE(pi.price, 0)), 0)").
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND sa.stockable_type = ?", fifo.UsableKeyProjectChickin.String(), fifo.StockableKeyPurchaseItems.String()).
-		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
-		Where("pc.project_flock_kandang_id IN (?)", projectFlockKandangIDs).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetBudgetCostByProjectFlockId(ctx context.Context, projectFlockId uint) (float64, error) {
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("project_budgets AS pb").
-		Select("COALESCE(SUM(pb.qty * pb.price), 0)").
-		Where("pb.project_flock_id = ?", projectFlockId).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetExpedisionCost(ctx context.Context, projectFlockKandangIDs []uint) (float64, error) {
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("expense_nonstocks AS en").
-		Select("COALESCE(SUM(er.qty * er.price), 0)").
-		Joins("JOIN expense_realizations AS er ON er.expense_nonstock_id = en.id").
-		Joins("JOIN flags AS f ON f.flagable_id = en.nonstock_id AND f.flagable_type = ?", entity.FlagableTypeNonstock).
-		Where("en.project_flock_kandang_id IN (?)", projectFlockKandangIDs).
-		Where("f.name = ?", utils.FlagEkspedisi).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetFeedUsageCost(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
-
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		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("f.name = ?", utils.FlagPakan).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetOvkUsageCost(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
-
-	flags := []utils.FlagType{
-		utils.FlagOVK,
-		utils.FlagObat,
-		utils.FlagVitamin,
-		utils.FlagKimia,
-	}
-
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		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 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).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetTotalPopulation(ctx context.Context, projectFlockKandangIDs []uint) (float64, error) {
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("project_chickins AS pc").
-		Select("COALESCE(SUM(pc.usage_qty), 0)").
-		Where("pc.project_flock_kandang_id IN (?)", projectFlockKandangIDs).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetPulletCost(ctx context.Context, projectFlockKandangId uint) (float64, error) {
-	stockablePurchase := fifo.StockableKeyPurchaseItems.String()
-	stockableTransferIn := fifo.StockableKeyStockTransferIn.String()
-	usableProjectChickin := fifo.UsableKeyProjectChickin.String()
-
-	var total float64
-	err := r.db.WithContext(ctx).
-		Table("project_chickins AS pc").
-		Select(`
-			COALESCE(SUM(pc.usage_qty * CASE
-				WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
-				WHEN sa.stockable_type = ? THEN COALESCE(tpi.price, 0)
-				ELSE 0
-			END), 0)`,
-			stockablePurchase, stockableTransferIn).
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id", usableProjectChickin).
-		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", stockablePurchase).
-		Joins("LEFT JOIN stock_allocations AS tsa ON tsa.usable_type = ? AND tsa.usable_id = sa.stockable_id AND sa.stockable_type = ? AND tsa.stockable_type = ?", stockableTransferIn, stockableTransferIn, stockablePurchase).
-		Joins("LEFT JOIN purchase_items AS tpi ON tpi.id = tsa.stockable_id").
-		Where("pc.project_flock_kandang_id = ?", projectFlockKandangId).
-		Scan(&total).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return total, nil
-}
-
-func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
-
-	var totals struct {
-		TotalPieces   float64
-		TotalWeightKg float64
-	}
-	err := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		Select("COALESCE(SUM(re.qty), 0) AS total_pieces, COALESCE(SUM(re.weight), 0)AS total_weight_kg").
-		Joins("JOIN recording_eggs AS re ON re.recording_id = r.id").
-		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
-		Where("r.record_datetime <= ?", *date).
-		Scan(&totals).Error
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return totals.TotalPieces, totals.TotalWeightKg, nil
-}
-
-func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(
-	ctx context.Context,
-	projectFlockKandangIDs []uint,
-	startDate *time.Time,
-	endDate *time.Time,
-) (float64, float64, error) {
-
-	if endDate == nil {
-		now := time.Now()
-		endDate = &now
-	}
-
-	type subResult struct {
-		UsableID    uint
-		MdpUsageQty float64
-		MdpWeight   float64
-	}
-
-	subQuery := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		Select(`
-			DISTINCT sa.usable_id,
-			mdp.usage_qty  AS mdp_usage_qty,
-			mdp.total_weight AS mdp_weight
-		`).
-		Joins("JOIN recording_eggs re ON re.recording_id = r.id").
-		Joins(
-			"JOIN stock_allocations sa ON sa.stockable_type = ? AND sa.stockable_id = re.id AND sa.usable_type = ?",
-			fifo.StockableKeyRecordingEgg.String(),
-			fifo.UsableKeyMarketingDelivery.String(),
-		).
-		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id").
-		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
-		Where("r.record_datetime <= ?", *endDate).
-		Where("mdp.delivery_date <= ?", *startDate)
-
-	var totals struct {
-		TotalPieces float64
-		TotalWeight float64
-	}
-
-	err := r.db.WithContext(ctx).
-		Table("(?) AS x", subQuery).
-		Select(`
-			COALESCE(SUM(x.mdp_usage_qty), 0)  AS total_pieces,
-			COALESCE(SUM(x.mdp_weight), 0)     AS total_weight
-		`).
-		Scan(&totals).Error
-
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return totals.TotalPieces, totals.TotalWeight, nil
-}
-
-func (r *HppRepositoryImpl) GetProjectFlockIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangId uint) (uint, error) {
-	var projectFlockID uint
-	err := r.db.WithContext(ctx).
-		Table("project_flock_kandangs").
-		Select("project_flock_id").
-		Where("id = ?", projectFlockKandangId).
-		Scan(&projectFlockID).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return projectFlockID, nil
-}
-
-func (r *HppRepositoryImpl) GetTransferSourceSummary(ctx context.Context, projectFlockKandangId uint) (uint, float64, error) {
-	var summary struct {
-		ProjectFlockID uint
-		TotalQty       float64
-	}
-	err := r.db.WithContext(ctx).
-		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
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return summary.ProjectFlockID, summary.TotalQty, nil
-}

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", u, normalizedExt)
-	if keyPrefix != "" {
-		key = fmt.Sprintf("%s/%s%s", keyPrefix, u, normalizedExt)
+	key := fmt.Sprintf("%s/%s%s", strings.Trim(s.keyPrefix, "/"), u, normalizedExt)
+	if s.keyPrefix == "" {
+		key = fmt.Sprintf("%s%s", u, normalizedExt)
 	}
 
 	if len(key) > s.maxPathLength {
-		compact := strings.ReplaceAll(u, "-", "")
-		if keyPrefix != "" {
-			key = fmt.Sprintf("%s/%s%s", keyPrefix, compact, normalizedExt)
-		} else {
-			key = fmt.Sprintf("%s%s", compact, normalizedExt)
-		}
+		key = fmt.Sprintf("%s%s", u, normalizedExt)
 	}
 
 	if len(key) > s.maxPathLength {

internal/common/service/common.fifo.service.go

@@ -25,8 +25,6 @@ type FifoService interface {
 	Replenish(ctx context.Context, req StockReplenishRequest) (*StockReplenishResult, error)
 	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 {
@@ -97,26 +95,12 @@ type StockReplenishRequest struct {
 	Tx                 *gorm.DB
 }
 
-type StockAdjustRequest struct {
-	StockableKey       fifo.StockableKey
-	StockableID        uint
-	ProductWarehouseID uint
-	Quantity           float64
-	Note               *string
-	Tx                 *gorm.DB
-}
-
 type PendingResolution struct {
 	UsableKey fifo.UsableKey
 	UsableID  uint
 	Quantity  float64
 }
 
-type PendingResolveRequest struct {
-	ProductWarehouseID uint
-	Tx                 *gorm.DB
-}
-
 type StockReplenishResult struct {
 	AddedQuantity    float64
 	PendingResolved  []PendingResolution
@@ -154,38 +138,6 @@ type StockReleaseRequest struct {
 	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")
-	}
-	if req.ProductWarehouseID == 0 {
-		return errors.New("product warehouse id is required")
-	}
-	if req.Quantity == 0 {
-		return nil
-	}
-	if req.Quantity > 0 {
-		return errors.New("quantity must be negative")
-	}
-
-	cfg, ok := fifo.Stockable(req.StockableKey)
-	if !ok {
-		return fmt.Errorf("stockable %q is not registered", req.StockableKey)
-	}
-
-	return s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		if err := s.incrementStockableQty(ctx, tx, cfg, req.StockableID, req.Quantity); err != nil {
-			return err
-		}
-
-		return s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
-			req.ProductWarehouseID: req.Quantity,
-		}, func(db *gorm.DB) *gorm.DB {
-			return s.txOrDB(tx, db)
-		})
-	})
-}
-
 func (s *fifoService) Replenish(ctx context.Context, req StockReplenishRequest) (*StockReplenishResult, error) {
 	if req.StockableID == 0 || strings.TrimSpace(req.StockableKey.String()) == "" {
 		return nil, errors.New("stockable key and id are required")
@@ -233,23 +185,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 +267,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 +314,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 +680,6 @@ func (s *fifoService) releaseUsagePortion(
 	usableKey fifo.UsableKey,
 	usableID uint,
 	target float64,
-	expectedWarehouseID uint,
 ) (float64, error) {
 	if target <= 0 {
 		return 0, nil
@@ -761,18 +695,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 +791,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 {
-				ID        uint
-				Pending   float64 `gorm:"column:pending_qty"`
-				CreatedAt int64   `gorm:"column:created_at"`
-			}
+		var rows []struct {
+			ID        uint
+			Pending   float64
+			CreatedAt time.Time
+		}
 
-			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)
+		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)
-			}
+		if cfg.Scope != nil {
+			query = cfg.Scope(query)
+		}
 
-			for _, order := range s.orderClauses(cfg.OrderBy) {
-				query = query.Order(order)
-			}
+		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
@@ -902,47 +824,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/common.hpp.service.go

@@ -1,272 +0,0 @@
-package service
-
-import (
-	"context"
-	"math"
-	"time"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-)
-
-type HppService interface {
-	CalculateHppCost(projectFlockKandangId uint, date *time.Time) (*HppCostResponse, error)
-	GetTotalDepresiasiFlockGrowing(sourceProjectFlockID uint, date *time.Time) (float64, error)
-	GetTotalProductionCost(projectFlockKandangId uint, endDate *time.Time, depresiasiTransfer float64) (float64, error)
-	GetBudgetKandangLaying(projectFlockKandangId uint, endDate *time.Time) (float64, error)
-	GetDepresiasiTransfer(projectFlockKandangId uint, date *time.Time) (float64, error)
-	GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, startDate *time.Time, endDate *time.Time) (*HppCostResponse, error)
-}
-
-type HppCostResponse struct {
-	Estimation HppCostDetail `json:"estimation"`
-	Real       HppCostDetail `json:"real"`
-}
-
-type HppCostDetail struct {
-	HargaKg    float64 `json:"harga_kg"`
-	HargaButir float64 `json:"harga_butir"`
-	Total      float64 `json:"total"`
-	Kg         float64 `json:"kg"`
-	Butir      float64 `json:"butir"`
-}
-
-type hppService struct {
-	hppRepo commonRepo.HppCostRepository
-}
-
-func NewHppService(hppRepo commonRepo.HppCostRepository) HppService {
-	return &hppService{hppRepo: hppRepo}
-}
-
-func (s *hppService) CalculateHppCost(projectFlockKandangId uint, date *time.Time) (*HppCostResponse, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
-
-	location, err := time.LoadLocation("Asia/Jakarta")
-	if err != nil {
-		return nil, err
-	}
-
-	startOfDay := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, location)
-	endOfDay := startOfDay.Add(24 * time.Hour)
-
-	depresiasiTransfer, err := s.GetDepresiasiTransfer(projectFlockKandangId, &endOfDay)
-	if err != nil {
-		return nil, err
-	}
-
-	totalProductionCost, err := s.GetTotalProductionCost(projectFlockKandangId, &endOfDay, depresiasiTransfer)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.GetHppEstimationDanRealisasi(totalProductionCost, projectFlockKandangId, &startOfDay, &endOfDay)
-
-}
-
-func (s *hppService) GetTotalDepresiasiFlockGrowing(sourceProjectFlockID uint, date *time.Time) (float64, error) {
-	if date == nil {
-		now := time.Now()
-		date = &now
-	}
-
-	if s.hppRepo == nil {
-		return 0, nil
-	}
-
-	kandangIDs, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), sourceProjectFlockID)
-	if err != nil {
-		return 0, err
-	}
-
-	docCost, err := s.hppRepo.GetDocCost(context.Background(), kandangIDs)
-	if err != nil {
-		return 0, err
-	}
-
-	budgetCost, err := s.hppRepo.GetBudgetCostByProjectFlockId(context.Background(), sourceProjectFlockID)
-	if err != nil {
-		return 0, err
-	}
-
-	expedisionCost, err := s.hppRepo.GetExpedisionCost(context.Background(), kandangIDs)
-	if err != nil {
-		return 0, err
-	}
-
-	feedCost, err := s.hppRepo.GetFeedUsageCost(context.Background(), kandangIDs, date)
-	if err != nil {
-		return 0, err
-	}
-
-	ovkCost, err := s.hppRepo.GetOvkUsageCost(context.Background(), kandangIDs, date)
-	if err != nil {
-		return 0, err
-	}
-
-	return docCost + budgetCost + expedisionCost + feedCost + ovkCost, nil
-}
-
-func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, endDate *time.Time, depresiasiTransfer float64) (float64, error) {
-	// if date == nil {
-	// 	now := time.Now()
-	// 	date = &now
-	// }
-
-	costPullet, err := s.hppRepo.GetPulletCost(context.Background(), projectFlockKandangId)
-	if err != nil {
-		return 0, err
-	}
-
-	costFeed, err := s.hppRepo.GetFeedUsageCost(context.Background(), []uint{projectFlockKandangId}, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	costOvk, err := s.hppRepo.GetOvkUsageCost(context.Background(), []uint{projectFlockKandangId}, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	costExpedision, err := s.hppRepo.GetExpedisionCost(context.Background(), []uint{projectFlockKandangId})
-	if err != nil {
-		return 0, err
-	}
-
-	costBudget, err := s.GetBudgetKandangLaying(projectFlockKandangId, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	return depresiasiTransfer + costPullet + costFeed + costOvk + costExpedision + costBudget, nil
-}
-
-func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, endDate *time.Time) (float64, error) {
-	// if date == nil {
-	// 	now := time.Now()
-	// 	date = &now
-	// }
-
-	if s.hppRepo == nil {
-		return 0, nil
-	}
-
-	projectFlockId, err := s.hppRepo.GetProjectFlockIDByProjectFlockKandangID(context.Background(), projectFlockKandangId)
-	if err != nil {
-		return 0, err
-	}
-
-	projectFlockKandangIds, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), projectFlockId)
-	if err != nil {
-		return 0, err
-	}
-
-	eggProduksiPiecesFlock, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), projectFlockKandangIds, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	eggProduksiPiecesKandang, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	totalBudgetCost, err := s.hppRepo.GetBudgetCostByProjectFlockId(context.Background(), projectFlockId)
-	if err != nil {
-		return 0, err
-	}
-
-	if eggProduksiPiecesFlock == 0 {
-		return 0, nil
-	}
-
-	return (totalBudgetCost * eggProduksiPiecesKandang) / eggProduksiPiecesFlock, nil
-}
-
-func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, endDate *time.Time) (float64, error) {
-	// if endDate == nil {
-	// 	now := time.Now()
-	// 	endDate = &now
-	// }
-
-	if s.hppRepo == nil {
-		return 0, nil
-	}
-
-	sourceProjectFlockID, transferTotalQty, err := s.hppRepo.GetTransferSourceSummary(context.Background(), projectFlockKandangId)
-	if err != nil {
-		return 0, err
-	}
-
-	kandangIDsGrowing, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), sourceProjectFlockID)
-	if err != nil {
-		return 0, err
-	}
-
-	totalPopulationFlockGrowing, err := s.hppRepo.GetTotalPopulation(context.Background(), kandangIDsGrowing)
-	if err != nil {
-		return 0, err
-	}
-	if totalPopulationFlockGrowing == 0 {
-		return 0, nil
-	}
-
-	totalDepresiasiFlockGrowing, err := s.GetTotalDepresiasiFlockGrowing(sourceProjectFlockID, endDate)
-	if err != nil {
-		return 0, err
-	}
-
-	return (totalDepresiasiFlockGrowing * transferTotalQty) / totalPopulationFlockGrowing, nil
-}
-
-func (s *hppService) GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, startDate *time.Time, endDate *time.Time) (*HppCostResponse, error) {
-
-	if s.hppRepo == nil {
-		return &HppCostResponse{}, nil
-	}
-
-	estimPieces, estimWeightKg, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, endDate)
-	if err != nil {
-		return nil, err
-	}
-
-	realPieces, realWeightKg, err := s.hppRepo.GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, startDate, endDate)
-	if err != nil {
-		return nil, err
-	}
-
-	estimation := HppCostDetail{
-		Total: totalProductionCost,
-		Kg:    estimWeightKg,
-		Butir: estimPieces,
-	}
-	if estimWeightKg > 0 {
-		estimation.HargaKg = roundToTwoDecimals(totalProductionCost / estimWeightKg)
-	}
-	if estimPieces > 0 {
-		estimation.HargaButir = roundToTwoDecimals(totalProductionCost / estimPieces)
-	}
-
-	real := HppCostDetail{
-		Total: totalProductionCost,
-		Kg:    realWeightKg,
-		Butir: realPieces,
-	}
-	if realWeightKg > 0 {
-		real.HargaKg = roundToTwoDecimals(totalProductionCost / realWeightKg)
-	}
-	if realPieces > 0 {
-		real.HargaButir = roundToTwoDecimals(totalProductionCost / realPieces)
-	}
-
-	return &HppCostResponse{
-		Estimation: estimation,
-		Real:       real,
-	}, nil
-}
-
-func roundToTwoDecimals(value float64) float64 {
-	return math.Round(value*100) / 100
-}

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
-	AppHost                        string
-	Version                        string
-	LogLevel                       string
-	AppPort                        int
-	DBHost                         string
-	DBUser                         string
-	DBPassword                     string
-	DBName                         string
-	DBPort                         int
-	DBSSLMode                      string
-	DBSSLRootCert                  string
-	DBSSLCert                      string
-	DBSSLKey                       string
-	JWTSecret                      string
-	JWTAccessExp                   int
-	JWTRefreshExp                  int
-	JWTResetPasswordExp            int
-	JWTVerifyEmailExp              int
-	RedisURL                       string
-	CORSAllowOrigins               []string
-	CORSAllowMethods               []string
-	CORSAllowHeaders               []string
-	CORSExposeHeaders              []string
-	CORSAllowCredentials           bool
-	CORSMaxAge                     int
-	SSOIssuer                      string
-	SSOJWKSURL                     string
-	SSOAllowedAudiences            []string
-	SSOAuthorizeURL                string
-	SSOTokenURL                    string
-	SSOGetMeURL                    string
-	SSOPortalURL                   string
-	SSOClients                     map[string]SSOClientConfig
-	SSOAccessCookieName            string
-	SSORefreshCookieName           string
-	SSOCookieDomain                string
-	SSOCookieSecure                bool
-	SSOCookieSameSite              string
-	SSOAccessTokenMaxBytes         int
-	SSOTokenBlacklistPrefix        string
-	SSOPKCETTL                     time.Duration
-	SSOUserSyncDrift               time.Duration
-	SSOUserSyncNonceTTL            time.Duration
-	SSOUserSyncMaxBodyBytes        int
-	S3Endpoint                     string
-	S3Region                       string
-	S3Bucket                       string
-	S3AccessKey                    string
-	S3SecretKey                    string
-	S3ForcePathStyle               bool
-	S3PublicBaseURL                string
-	S3EnvPrefix                    string
-	S3DocumentKeyPrefix            string
-	TransferToLayingGrowingMaxWeek int
+	IsProd                  bool
+	AppHost                 string
+	Version                 string
+	LogLevel                string
+	AppPort                 int
+	DBHost                  string
+	DBUser                  string
+	DBPassword              string
+	DBName                  string
+	DBPort                  int
+	DBSSLMode               string
+	DBSSLRootCert           string
+	DBSSLCert               string
+	DBSSLKey                string
+	JWTSecret               string
+	JWTAccessExp            int
+	JWTRefreshExp           int
+	JWTResetPasswordExp     int
+	JWTVerifyEmailExp       int
+	RedisURL                string
+	CORSAllowOrigins        []string
+	CORSAllowMethods        []string
+	CORSAllowHeaders        []string
+	CORSExposeHeaders       []string
+	CORSAllowCredentials    bool
+	CORSMaxAge              int
+	SSOIssuer               string
+	SSOJWKSURL              string
+	SSOAllowedAudiences     []string
+	SSOAuthorizeURL         string
+	SSOTokenURL             string
+	SSOGetMeURL             string
+	SSOPortalURL            string
+	SSOClients              map[string]SSOClientConfig
+	SSOAccessCookieName     string
+	SSORefreshCookieName    string
+	SSOCookieDomain         string
+	SSOCookieSecure         bool
+	SSOCookieSameSite       string
+	SSOTokenBlacklistPrefix string
+	SSOPKCETTL              time.Duration
+	SSOUserSyncDrift        time.Duration
+	SSOUserSyncNonceTTL     time.Duration
+	SSOUserSyncMaxBodyBytes int
+	S3Endpoint              string
+	S3Region                string
+	S3Bucket                string
+	S3AccessKey             string
+	S3SecretKey             string
+	S3ForcePathStyle        bool
+	S3PublicBaseURL         string
+	S3DocumentKeyPrefix     string
 )
 
 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")
-	docPrefix := strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/")
-	if docPrefix == "" {
-		docPrefix = "docs"
-	}
-	S3DocumentKeyPrefix = joinPath(S3EnvPrefix, docPrefix)
+	S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
 
 	// 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/20260115062032_add_fifo_recording_eggs.down.sql

@@ -1,3 +0,0 @@
-ALTER TABLE recording_eggs
-    DROP COLUMN IF EXISTS total_used,
-    DROP COLUMN IF EXISTS total_qty;

internal/database/migrations/20260115062032_add_fifo_recording_eggs.up.sql

@@ -1,7 +0,0 @@
-ALTER TABLE recording_eggs
-    ADD COLUMN total_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL,
-    ADD COLUMN total_used NUMERIC(15, 3) DEFAULT 0 NOT NULL;
-
-UPDATE recording_eggs
-SET total_qty = qty
-WHERE total_qty = 0;

internal/database/migrations/20260115082849_remove_price_from_nonstock_suppliers.down.sql

@@ -1,3 +0,0 @@
--- Rollback: add price back to nonstock_suppliers
-ALTER TABLE nonstock_suppliers
-    ADD COLUMN IF NOT EXISTS price NUMERIC(15, 3) NOT NULL DEFAULT 0;

internal/database/migrations/20260115082849_remove_price_from_nonstock_suppliers.up.sql

@@ -1,3 +0,0 @@
--- Migration: remove price from nonstock_suppliers
-ALTER TABLE nonstock_suppliers
-    DROP COLUMN IF EXISTS price;

internal/database/migrations/20260119055524_add_requested_qty_to_laying_transfer_sources.down.sql

@@ -1,4 +0,0 @@
--- Rollback: Remove requested_qty column from laying_transfer_sources table
-
-ALTER TABLE laying_transfer_sources
-DROP COLUMN IF EXISTS requested_qty;

internal/database/migrations/20260119055524_add_requested_qty_to_laying_transfer_sources.up.sql

@@ -1,9 +0,0 @@
--- Add requested_qty column to laying_transfer_sources table
--- This field stores the quantity requested by user during create/update
--- Separate from UsageQty (FIFO consumed) and PendingUsageQty (FIFO pending)
-
-ALTER TABLE laying_transfer_sources
-ADD COLUMN requested_qty NUMERIC(15,3) DEFAULT 0 NOT NULL;
-
--- Add comment for documentation
-COMMENT ON COLUMN laying_transfer_sources.requested_qty IS 'Quantity requested by user during create/update';

internal/database/migrations/20260119095650_add_fifo_recording_depletions.down.sql

@@ -1,3 +0,0 @@
-ALTER TABLE recording_depletions
-    DROP COLUMN IF EXISTS pending_qty,
-    DROP COLUMN IF EXISTS source_product_warehouse_id;

internal/database/migrations/20260119095650_add_fifo_recording_depletions.up.sql

@@ -1,17 +0,0 @@
-ALTER TABLE recording_depletions
-    ADD COLUMN IF NOT EXISTS pending_qty numeric(15,3) NOT NULL DEFAULT 0,
-    ADD COLUMN IF NOT EXISTS source_product_warehouse_id bigint;
-
-UPDATE recording_depletions rd
-SET source_product_warehouse_id = src.product_warehouse_id
-FROM recordings r
-JOIN LATERAL (
-    SELECT pfp.product_warehouse_id
-    FROM project_chickins pc
-    JOIN project_flock_populations pfp ON pfp.project_chickin_id = pc.id
-    WHERE pc.project_flock_kandang_id = r.project_flock_kandangs_id
-    ORDER BY pfp.created_at ASC, pfp.id ASC
-    LIMIT 1
-) AS src ON true
-WHERE r.id = rd.recording_id
-  AND rd.source_product_warehouse_id IS NULL;

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

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

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

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

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

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

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

@@ -1 +0,0 @@
-ALTER TABLE adjustment_stocks DROP COLUMN IF EXISTS stock_log_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/20260128034158_create_field_stock.down.sql

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

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

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

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

@@ -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

@@ -2,21 +2,28 @@ package entities
 
 import "time"
 
+// AdjustmentStock tracks FIFO allocation for stock adjustments
+// - For INCREASE adjustments (Stockable): Tracks stock added to warehouse
+// - For DECREASE adjustments (Usable): Tracks stock consumed from warehouse
 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"`
+	Id                 uint   `gorm:"primaryKey"`
+	StockLogId         uint   `gorm:"column:stock_log_id;not null;index"`
+	ProductWarehouseId uint   `gorm:"column:product_warehouse_id;not null"`
 
+	// === FIFO FIELDS FOR INCREASE ADJUSTMENT (Stockable) ===
+	// Tracks stock added to warehouse via adjustment INCREASE
+	TotalQty  float64 `gorm:"column:total_qty;default:0"`  // Total lot quantity available
+	TotalUsed float64 `gorm:"column:total_used;default:0"` // Quantity already used from this lot
+
+	// === FIFO FIELDS FOR DECREASE ADJUSTMENT (Usable) ===
+	// Tracks stock consumed from warehouse via adjustment DECREASE
+	UsageQty   float64 `gorm:"column:usage_qty;default:0"`   // Actual quantity consumed
+	PendingQty float64 `gorm:"column:pending_qty;default:0"` // Pending quantity (waiting for stock)
+
+	CreatedAt time.Time `gorm:"column:created_at;autoCreateTime"`
+	UpdatedAt time.Time `gorm:"column:updated_at;autoUpdateTime"`
+
+	// Relations
+	StockLog         *StockLog         `gorm:"foreignKey:StockLogId;references:Id"`
 	ProductWarehouse *ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
-	StockLog         *StockLog         `gorm:"polymorphic:Loggable;polymorphicType:LoggableType;polymorphicId:LoggableId;polymorphicValue:ADJUSTMENT"`
 }

internal/entities/document.go

@@ -7,7 +7,7 @@ type Document struct {
 	DocumentableType string    `gorm:"size:50;not null;index:documents_documentable_polymorphic,priority:1"`
 	DocumentableId   uint64    `gorm:"not null;index:documents_documentable_polymorphic,priority:2"`
 	Type             string    `gorm:"size:50;not null"`
-	Path             string    `gorm:"size: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"`
-	ToProjectFlock   *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
-	CreatedUser      *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
-	ExecutedUser     *User                  `gorm:"foreignKey:ExecutedBy;references:Id"`
-	Sources          []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	Targets          []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	LatestApproval   *Approval              `gorm:"-" json:"-"`
+	FromProjectFlock    *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
+	ToProjectFlock      *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
+	CreatedUser         *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
+	Sources             []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	Targets             []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	LatestApproval      *Approval              `gorm:"-" json:"-"`
 }

internal/entities/laying_transfer_source.go

@@ -11,7 +11,6 @@ type LayingTransferSource struct {
 	LayingTransferId            uint           `gorm:"index;not null"`
 	SourceProjectFlockKandangId uint           `gorm:"not null"`
 	ProductWarehouseId          *uint          `gorm:""`
-	RequestedQty                float64        `gorm:"type:numeric(15,3);default:0;not null"` // Quantity requested by user
 	UsageQty                    float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO USABLE field
 	PendingUsageQty             float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO USABLE field
 	Note                        string         `gorm:"type:text"`

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"`
-	MarketingId         uint     `gorm:"not null"`
-	ProductWarehouseId  uint     `gorm:"not null"`
-	Qty                 float64  `gorm:"type:numeric(15,3);not null"`
-	ConvertionUnit      *string  `gorm:"type:varchar(20)"`
-	WeightPerConvertion *float64 `gorm:"type:numeric(15,3)"`
-	Week                *int     `gorm:"type:integer"`
-	UnitPrice           float64  `gorm:"type:numeric(15,3);not null"`
-	AvgWeight           float64  `gorm:"type:numeric(15,3);not null"`
-	TotalWeight         float64  `gorm:"type:numeric(15,3);not null"`
-	TotalPrice          float64  `gorm:"type:numeric(15,3);not null"`
+	Id                 uint    `gorm:"primaryKey;autoIncrement"`
+	MarketingId        uint    `gorm:"not null"`
+	ProductWarehouseId uint    `gorm:"not null"`
+	Qty                float64 `gorm:"type:numeric(15,3);not null"`
+	UnitPrice          float64 `gorm:"type:numeric(15,3);not null"`
+	AvgWeight          float64 `gorm:"type:numeric(15,3);not null"`
+	TotalWeight        float64 `gorm:"type:numeric(15,3);not null"`
+	TotalPrice         float64 `gorm:"type:numeric(15,3);not null"`
 
 	Marketing        Marketing                 `gorm:"foreignKey:MarketingId;references:Id"`
 	ProductWarehouse ProductWarehouse          `gorm:"foreignKey:ProductWarehouseId;references:Id"`

internal/entities/nonstock_supplier.go

@@ -5,6 +5,7 @@ import "time"
 type NonstockSupplier struct {
 	NonstockId uint      `gorm:"not null"`
 	SupplierId uint      `gorm:"not null"`
+	Price      float64   `gorm:"type:numeric(15,3);not null;default:0"`
 	CreatedAt  time.Time `gorm:"autoCreateTime"`
 
 	Nonstock Nonstock `gorm:"foreignKey:NonstockId;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

@@ -1,13 +1,10 @@
 package entities
 
 type RecordingDepletion struct {
-	Id                       uint    `gorm:"primaryKey"`
-	RecordingId              uint    `gorm:"column:recording_id;not null;index"`
-	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"`
+	Id                 uint    `gorm:"primaryKey"`
+	RecordingId        uint    `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint    `gorm:"column:product_warehouse_id;not null"`
+	Qty                float64 `gorm:"column:qty;not null"`
 
 	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
 	ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`

internal/entities/recording_egg.go

@@ -7,8 +7,6 @@ type RecordingEgg struct {
 	RecordingId        uint             `gorm:"column:recording_id;not null;index"`
 	ProductWarehouseId uint             `gorm:"column:product_warehouse_id;not null"`
 	Qty                int              `gorm:"column:qty;not null"`
-	TotalQty           float64          `gorm:"column:total_qty"`
-	TotalUsed          float64          `gorm:"column:total_used"`
 	Weight             *float64         `gorm:"column:weight"`
 	CreatedBy          uint             `gorm:"column:created_by"`
 	CreatedAt          time.Time        `gorm:"autoCreateTime"`

internal/entities/stock_log.go

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

internal/entities/stock_transfer_delivery.go

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

internal/middleware/auth.go

@@ -7,8 +7,8 @@ import (
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
-	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+	"gitlab.com/mbugroup/lti-api.git/internal/sso"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
@@ -24,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 {
-				profile = p
-			}
-		}
-		if profile != nil {
-			roles = profile.Roles
-			for _, perm := range profile.PermissionNames() {
-				if perm != "" {
-					permissions[perm] = struct{}{}
+			} else if profile != nil {
+				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/permissions.go

@@ -1,9 +1,8 @@
 package middleware
 
-const (
+const(
 	P_DashboardGetAll = "lti.dashboard.list"
 )
-
 // project-flock
 const (
 	P_ProjectFlockKandangsClosing      = "lti.production.project_flock_kandangs.closing"
@@ -52,7 +51,6 @@ const (
 	P_ReportDebtSupplierGetAll     = "lti.repport.debtsupplier.list"
 	P_ReportHppPerKandangGetAll    = "lti.repport.gethppperkandang.list"
 	P_ReportProductionResultGetAll = "lti.repport.production_result.list"
-	P_ReportCustomerPaymentGetAll  = "lti.repport.customerpayment.list"
 )
 
 const (
@@ -153,7 +151,7 @@ const (
 	P_ProductsCreateOne = "lti.master.products.create"
 	P_ProductsUpdateOne = "lti.master.products.update"
 	P_ProductsDeleteOne = "lti.master.products.delete"
-
+	
 	P_SuppliersGetAll    = "lti.master.suppliers.list"
 	P_SuppliersGetOne    = "lti.master.suppliers.detail"
 	P_SuppliersCreateOne = "lti.master.suppliers.create"
@@ -240,15 +238,3 @@ const (
 	P_UserGetAll = "lti.users.list"
 	P_UserGetOne = "lti.users.detail"
 )
-
-// daily-checklist
-const (
-	P_DailyChecklistDashboardList  = "lti.daily_checklist.dashboard.list"
-	P_DailyChecklistCreateOne      = "lti.daily_checklist.create"
-	P_DailyChecklistGetAll         = "lti.daily_checklist.list"
-	P_DailyChecklistGetOne         = "lti.daily_checklist.detail"
-	P_DailyChecklistReports        = "lti.daily_checklist.reports"
-	P_DailyChecklistEmployee       = "lti.daily_checklist.master_data.employee"
-	P_DailyChecklistActivity       = "lti.daily_checklist.master_data.activity"
-	P_DailyChecklistActivityConfig = "lti.daily_checklist.master_data.configuration"
-)

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

@@ -14,45 +14,22 @@ import (
 )
 
 type ClosingController struct {
-	ClosingService         service.ClosingService
-	SapronakService        service.SapronakService
-	ClosingKeuanganService service.ClosingKeuanganService
+	ClosingService  service.ClosingService
+	SapronakService service.SapronakService
 }
 
-func NewClosingController(closingService service.ClosingService, sapronakService service.SapronakService, closingKeuanganService service.ClosingKeuanganService) *ClosingController {
+func NewClosingController(closingService service.ClosingService, sapronakService service.SapronakService) *ClosingController {
 	return &ClosingController{
-		ClosingService:         closingService,
-		SapronakService:        sapronakService,
-		ClosingKeuanganService: closingKeuanganService,
+		ClosingService:  closingService,
+		SapronakService: sapronakService,
 	}
 }
 
 func (u *ClosingController) GetAll(c *fiber.Ctx) error {
-	var projectStatus *int
-	if raw := c.Query("project_status"); raw != "" {
-		statusValue, err := strconv.Atoi(raw)
-		if err != nil {
-			return fiber.NewError(fiber.StatusBadRequest, "Invalid project_status")
-		}
-		projectStatus = &statusValue
-	}
-
-	var locationID *uint
-	if raw := c.Query("location_id"); raw != "" {
-		locationValue, err := strconv.Atoi(raw)
-		if err != nil || locationValue <= 0 {
-			return fiber.NewError(fiber.StatusBadRequest, "Invalid location_id")
-		}
-		locationUint := uint(locationValue)
-		locationID = &locationUint
-	}
-
 	query := &validation.Query{
-		Page:          c.QueryInt("page", 1),
-		Limit:         c.QueryInt("limit", 10),
-		Search:        c.Query("search", ""),
-		ProjectStatus: projectStatus,
-		LocationID:    locationID,
+		Page:   c.QueryInt("page", 1),
+		Limit:  c.QueryInt("limit", 10),
+		Search: c.Query("search", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {
@@ -181,7 +158,7 @@ func (u *ClosingController) GetPenjualan(c *fiber.Ctx) error {
 			Code:    fiber.StatusOK,
 			Status:  "success",
 			Message: "Get closing penjualan successfully",
-			Data:    dto.ToPenjualanRealisasiResponseDTO(result),
+			Data:    dto.ToPenjualanRealisasiResponseDTO(uint(projectFlockID), result),
 		})
 }
 
@@ -211,7 +188,7 @@ func (u *ClosingController) GetPenjualanByProjectFlockKandang(c *fiber.Ctx) erro
 			Code:    fiber.StatusOK,
 			Status:  "success",
 			Message: "Get closing penjualan by project flock kandang successfully",
-			Data:    dto.ToPenjualanRealisasiResponseDTO(result),
+			Data:    dto.ToPenjualanRealisasiResponseDTO(uint(projectFlockID), result),
 		})
 }
 
@@ -257,10 +234,9 @@ func (u *ClosingController) GetClosingSapronak(c *fiber.Ctx) error {
 	}
 
 	query := &validation.ClosingSapronakQuery{
-		Type:   strings.ToLower(c.Query("type")),
-		Page:   c.QueryInt("page", 1),
-		Limit:  c.QueryInt("limit", 10),
-		Search: c.Query("search"),
+		Type:  strings.ToLower(c.Query("type")),
+		Page:  c.QueryInt("page", 1),
+		Limit: c.QueryInt("limit", 10),
 	}
 	if raw := c.Query("kandang_id"); raw != "" {
 		kandangInt, convErr := strconv.Atoi(raw)
@@ -299,45 +275,6 @@ func (u *ClosingController) GetClosingSapronak(c *fiber.Ctx) error {
 		})
 }
 
-func (u *ClosingController) GetClosingSapronakSummary(c *fiber.Ctx) error {
-	param := c.Params("projectFlockId")
-
-	id, err := strconv.Atoi(param)
-	if err != nil || id <= 0 {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid projectFlockId")
-	}
-
-	query := &validation.ClosingSapronakQuery{
-		Type:   strings.ToLower(c.Query("type")),
-		Search: c.Query("search"),
-	}
-	if raw := c.Query("kandang_id"); raw != "" {
-		kandangInt, convErr := strconv.Atoi(raw)
-		if convErr != nil || kandangInt <= 0 {
-			return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang_id")
-		}
-		kandangUint := uint(kandangInt)
-		query.KandangID = &kandangUint
-	}
-
-	if query.Type != validation.SapronakTypeIncoming && query.Type != validation.SapronakTypeOutgoing {
-		return fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
-	}
-
-	result, err := u.ClosingService.GetClosingSapronakSummary(c, uint(id), query)
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Success{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Retrieved closing report (sapronak summary) successfully",
-			Data:    result,
-		})
-}
-
 func (u *ClosingController) GetSapronakByProject(c *fiber.Ctx) error {
 	param := c.Params("project_flock_id")
 	flag := c.Query("flag", "")
@@ -347,12 +284,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 +314,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{
@@ -401,7 +338,7 @@ func (u *ClosingController) GetClosingKeuangan(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid Project Flock Id")
 	}
 
-	result, err := u.ClosingKeuanganService.GetClosingKeuangan(c, uint(projectFlockID))
+	result, err := u.ClosingService.GetClosingKeuangan(c, uint(projectFlockID))
 	if err != nil {
 		return err
 	}
@@ -415,34 +352,6 @@ func (u *ClosingController) GetClosingKeuangan(c *fiber.Ctx) error {
 		})
 }
 
-func (u *ClosingController) GetClosingKeuanganByKandang(c *fiber.Ctx) error {
-	projectParam := c.Params("project_flock_id")
-	kandangParam := c.Params("project_flock_kandang_id")
-
-	projectFlockID, err := strconv.Atoi(projectParam)
-	if err != nil || projectFlockID <= 0 {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
-	}
-
-	pfkID, err := strconv.Atoi(kandangParam)
-	if err != nil || pfkID <= 0 {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
-	}
-
-	result, err := u.ClosingKeuanganService.GetClosingKeuanganByKandang(c, uint(projectFlockID), uint(pfkID))
-	if err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Success{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Get closing keuangan by kandang successfully",
-			Data:    result,
-		})
-}
-
 func (u *ClosingController) GetExpeditionHPP(c *fiber.Ctx) error {
 	param := c.Params("project_flock_id")
 

internal/modules/closings/dto/closing.dto.go

@@ -98,26 +98,26 @@ type ClosingEggSalesDTO struct {
 }
 
 type ClosingPerformanceDTO struct {
-	Depletion     float64 `json:"depletion"`
-	Age           float64 `json:"age_day"`
-	MortalityStd  float64 `json:"mor_std"`
-	MortalityAct  float64 `json:"mor_act"`
-	DeffMortality float64 `json:"mor_diff"`
-	FcrStd        float64 `json:"fcr_std"`
-	FcrAct        float64 `json:"fcr_act"`
-	DeffFcr       float64 `json:"fcr_diff"`
-	AwgAct        float64 `json:"awg_act"`
-	AwgStd        float64 `json:"awg_std"`
-	FeedIntake    float64 `json:"feed_intake"`
-	FeedIntakeStd float64 `json:"feed_intake_std"`
-	HenDayAct     float64 `json:"hen_day_act,omitempty"`
-	HendayStd     float64 `json:"hen_day_std"`
-	EggMass       float64 `json:"egg_mass,omitempty"`
-	EggMassStd    float64 `json:"egg_mass_std"`
-	EggWeight     float64 `json:"egg_weight,omitempty"`
-	EggWeightStd  float64 `json:"egg_weight_std"`
-	HenHouseAct   float64 `json:"hen_housed_act,omitempty"`
-	HenHouseStd   float64 `json:"hen_housed_std"`
+	Depletion     float64  `json:"depletion"`
+	Age           float64  `json:"age_day"`
+	MortalityStd  float64  `json:"mor_std"`
+	MortalityAct  float64  `json:"mor_act"`
+	DeffMortality float64  `json:"mor_diff"`
+	FcrStd        float64  `json:"fcr_std"`
+	FcrAct        float64  `json:"fcr_act"`
+	DeffFcr       float64  `json:"fcr_diff"`
+	AwgAct        float64  `json:"awg_act"`
+	AwgStd        float64  `json:"awg_std"`
+	FeedIntake    float64  `json:"feed_intake"`
+	FeedIntakeStd float64  `json:"feed_intake_std"`
+	HenDayAct     *float64 `json:"hen_day_act,omitempty"`
+	HendayStd     *float64 `json:"hen_day_std,omitempty"`
+	EggMass       *float64 `json:"egg_mass,omitempty"`
+	EggMassStd    *float64 `json:"egg_mass_std,omitempty"`
+	EggWeight     *float64 `json:"egg_weight,omitempty"`
+	EggWeightStd  *float64 `json:"egg_weight_std,omitempty"`
+	HenHouseAct   *float64 `json:"hen_housed_act,omitempty"`
+	HenHouseStd   *float64 `json:"hen_housed_std,omitempty"`
 }
 
 type ClosingSalesGroupDTO struct {

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

@@ -1,31 +1,59 @@
 package dto
 
 import (
+	"slices"
 	"strings"
 
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
-type ClosingHPPCode string
-
+// === CONSTANTS ===
 const (
-	HPPCodePakan      ClosingHPPCode = "PAKAN"
-	HPPCodeOVK        ClosingHPPCode = "OVK"
-	HPPCodeDOC        ClosingHPPCode = "DOC"
-	HPPCodeDepresiasi ClosingHPPCode = "DEPRESIASI"
-	HPPCodeOverhead   ClosingHPPCode = "OVERHEAD"
-	HPPCodeEkspedisi  ClosingHPPCode = "EKSPEDISI"
+	HPPGroupPengeluaran = "HPP dan Pengeluaran"
+	HPPGroupBahanBaku   = "HPP dan Bahan Baku"
+	HPPLabelOverhead    = "Pengeluaran Overhead"
+	HPPLabelEkspedisi   = "Beban Ekspedisi"
+	HPPSummaryLabel     = "HPP"
+
+	PLSalesTypeChicken = "Penjualan Ayam Besar"
+	PLSalesTypeEgg     = "Penjualan Telur"
+
+	PLItemTypeSapronak  = "Pembelian Sapronak"
+	PLItemTypeOverhead  = "Pengeluaran Overhead"
+	PLItemTypeEkspedisi = "Beban Ekspedisi"
+
+	PLSummaryLabelGrossProfit = "LABA RUGI BRUTTO"
+	PLSummaryLabelSubTotal    = "SUB TOTAL"
+	PLSummaryLabelNetProfit   = "LABA RUGI NETTO"
+
+	PurchaseLabelPrefix = "Pembelian "
 )
 
-type ClosingProfitLossCode string
+// === CONTEXT STRUCTS ===
 
-const (
-	PLCodeSales     ClosingProfitLossCode = "SALES"
-	PLCodeSapronak  ClosingProfitLossCode = "SAPRONAK"
-	PLCodeOverhead  ClosingProfitLossCode = "OVERHEAD"
-	PLCodeEkspedisi ClosingProfitLossCode = "EKSPEDISI"
-)
+type CalculationContext struct {
+	TotalPopulation     float64
+	TotalWeightProduced float64
+	TotalEggWeightKg    float64
+	TotalDepletion      float64
+	TotalWeightSold     float64
+	ActualPopulation    float64
+}
+
+type ClosingKeuanganInput struct {
+	ProjectFlockCategory string
+	PurchaseItems        []entities.PurchaseItem
+	Budgets              []entities.ProjectBudget
+	Realizations         []entities.ExpenseRealization
+	DeliveryProducts     []entities.MarketingDeliveryProduct
+	Chickins             []entities.ProjectChickin
+	TotalWeightProduced  float64
+	TotalEggWeightKg     float64
+	TotalDepletion       float64
+}
+
+// === BASE METRICS ===
 
 type FinancialMetrics struct {
 	RpPerBird float64 `json:"rp_per_bird"`
@@ -33,58 +61,75 @@ type FinancialMetrics struct {
 	Amount    float64 `json:"amount"`
 }
 
-type HPPItem struct {
-	ID          uint             `json:"id"`
-	Category    string           `json:"category"`
-	Code        string           `json:"code"`
-	Label       string           `json:"label"`
+type Comparison struct {
 	Budgeting   FinancialMetrics `json:"budgeting"`
 	Realization FinancialMetrics `json:"realization"`
 }
 
-type HPPSummary struct {
-	Label          string            `json:"label"`
-	Budgeting      FinancialMetrics  `json:"budgeting"`
-	Realization    FinancialMetrics  `json:"realization"`
-	EggBudgeting   *FinancialMetrics `json:"egg_budgeting,omitempty"`
-	EggRealization *FinancialMetrics `json:"egg_realization,omitempty"`
+// === HPP PURCHASES PACKAGE ===
+
+type HppItem struct {
+	Type string `json:"type"`
+	Comparison
 }
 
-type HPPSection struct {
-	Items   []HPPItem  `json:"items"`
-	Summary HPPSummary `json:"summary"`
+type HppGroup struct {
+	GroupName string    `json:"group_name"`
+	Data      []HppItem `json:"data"`
 }
 
-type ProfitLossItem struct {
-	Code      string  `json:"code"`
-	Label     string  `json:"label"`
-	Type      string  `json:"type"`
-	RpPerBird float64 `json:"rp_per_bird"`
-	RpPerKg   float64 `json:"rp_per_kg"`
-	Amount    float64 `json:"amount"`
+type SummaryHpp struct {
+	Label            string            `json:"label"`
+	Budgeting        FinancialMetrics  `json:"budgeting"`
+	Realization      FinancialMetrics  `json:"realization"`
+	EggBudgeting     *FinancialMetrics `json:"egg_budgeting,omitempty"`
+	EggRealization   *FinancialMetrics `json:"egg_realization,omitempty"`
 }
 
-type ProfitLossSummary struct {
-	GrossProfit FinancialMetrics `json:"gross_profit"`
-	SubTotal    FinancialMetrics `json:"sub_total"`
-	NetProfit   FinancialMetrics `json:"net_profit"`
+type HppPurchasesSection struct {
+	Hpp        []HppGroup `json:"hpp"`
+	SummaryHpp SummaryHpp `json:"summary_hpp"`
+}
+
+// === PROFIT LOSS PACKAGE ===
+
+type PLItem struct {
+	Type string `json:"type"`
+	FinancialMetrics
+}
+
+type PLSummaryItem struct {
+	Label string `json:"label"`
+	FinancialMetrics
+}
+
+type PLSummaryGroup struct {
+	GrossProfit PLSummaryItem `json:"gross_profit"`
+	SubTotal    PLSummaryItem `json:"sub_total"`
+	NetProfit   PLSummaryItem `json:"net_profit"`
+}
+
+type ProfitLossData struct {
+	Penjualan []PLItem       `json:"penjualan"`
+	Pembelian []PLItem       `json:"pembelian"`
+	Overhead  PLItem         `json:"overhead"`
+	Ekspedisi PLItem         `json:"ekspedisi"`
+	Summary   PLSummaryGroup `json:"summary"`
 }
 
 type ProfitLossSection struct {
-	Items   []ProfitLossItem  `json:"items"`
-	Summary ProfitLossSummary `json:"summary"`
+	Data ProfitLossData `json:"data"`
 }
 
-type ClosingKeuanganData struct {
-	HPP        HPPSection        `json:"hpp"`
-	ProfitLoss ProfitLossSection `json:"profit_loss"`
-}
-type MetricsCalculator struct {
-	TotalPopulation     float64
-	ActualPopulation    float64
-	TotalWeightProduced float64
+// === RESPONSE DTO (ROOT) ===
+
+type ReportResponse struct {
+	HppPurchases HppPurchasesSection `json:"hpp_purchases"`
+	ProfitLoss   ProfitLossSection   `json:"profit_loss"`
 }
 
+// === MAPPER FUNCTIONS ===
+
 func ToFinancialMetrics(rpPerBird, rpPerKg, amount float64) FinancialMetrics {
 	return FinancialMetrics{
 		RpPerBird: rpPerBird,
@@ -93,133 +138,451 @@ func ToFinancialMetrics(rpPerBird, rpPerKg, amount float64) FinancialMetrics {
 	}
 }
 
-func ToHPPItem(id uint, category, code, label string, budgeting, realization FinancialMetrics) HPPItem {
-	return HPPItem{
-		ID:          id,
-		Category:    category,
-		Code:        code,
-		Label:       label,
+func ToComparison(budgeting, realization FinancialMetrics) Comparison {
+	return Comparison{
 		Budgeting:   budgeting,
 		Realization: realization,
 	}
 }
 
-func ToHPPSummary(label string, budgeting, realization FinancialMetrics, eggBudgeting, eggRealization *FinancialMetrics) HPPSummary {
-	return HPPSummary{
-		Label:          label,
-		Budgeting:      budgeting,
-		Realization:    realization,
-		EggBudgeting:   eggBudgeting,
-		EggRealization: eggRealization,
-	}
+// === HPP PENGELUARAN (from Purchase Items) ===
+
+func getFlagLabel(flagType utils.FlagType) string {
+	return PurchaseLabelPrefix + string(flagType)
 }
 
-func ToHPPSection(items []HPPItem, summary HPPSummary) HPPSection {
-	return HPPSection{
-		Items:   items,
-		Summary: summary,
+func buildHppItemsByPurchaseFlags(purchaseItems []entities.PurchaseItem, ctx CalculationContext) []HppItem {
+	flags := []utils.FlagType{
+		utils.FlagDOC, utils.FlagPullet, utils.FlagLayer, utils.FlagPakan,
+		utils.FlagPreStarter, utils.FlagStarter, utils.FlagFinisher,
+		utils.FlagOVK, utils.FlagObat, utils.FlagVitamin, utils.FlagKimia,
 	}
-}
 
-func ToProfitLossItem(code, label, itemType string, rpPerBird, rpPerKg, amount float64) ProfitLossItem {
-	return ProfitLossItem{
-		Code:      code,
-		Label:     label,
-		Type:      itemType,
-		RpPerBird: rpPerBird,
-		RpPerKg:   rpPerKg,
-		Amount:    amount,
-	}
-}
+	items := []HppItem{}
+	seenFlags := make(map[utils.FlagType]bool)
 
-func ToProfitLossSummary(grossProfit, subTotal, netProfit FinancialMetrics) ProfitLossSummary {
-	return ProfitLossSummary{
-		GrossProfit: grossProfit,
-		SubTotal:    subTotal,
-		NetProfit:   netProfit,
-	}
-}
-
-func ToProfitLossSection(items []ProfitLossItem, summary ProfitLossSummary) ProfitLossSection {
-	return ProfitLossSection{
-		Items:   items,
-		Summary: summary,
-	}
-}
-
-func ToClosingKeuanganData(hpp HPPSection, profitLoss ProfitLossSection) ClosingKeuanganData {
-	return ClosingKeuanganData{
-		HPP:        hpp,
-		ProfitLoss: profitLoss,
-	}
-}
-
-func (mc *MetricsCalculator) CalculateMetrics(amount float64) (rpPerBird, rpPerKg float64) {
-	if mc.ActualPopulation > 0 {
-		rpPerBird = amount / mc.ActualPopulation
-	}
-	if mc.TotalWeightProduced > 0 {
-		rpPerKg = amount / mc.TotalWeightProduced
-	}
-	return
-}
-
-func (mc *MetricsCalculator) CalculateProfitLossMetrics(amount float64) (rpPerBird, rpPerKg float64) {
-	if mc.TotalPopulation > 0 {
-		rpPerBird = amount / mc.TotalPopulation
-	}
-	if mc.TotalWeightProduced > 0 {
-		rpPerKg = amount / mc.TotalWeightProduced
-	}
-	return
-}
-
-type ProductFilter struct {
-	ProjectFlockCategory string
-}
-
-func (pf *ProductFilter) IsEggProduct(product entity.Product) bool {
-	for _, flag := range product.Flags {
-		flagName := strings.ToUpper(flag.Name)
-		if flagName == string(utils.FlagTelur) ||
-			flagName == string(utils.FlagTelurUtuh) ||
-			flagName == string(utils.FlagTelurPecah) ||
-			flagName == string(utils.FlagTelurPutih) ||
-			flagName == string(utils.FlagTelurRetak) {
-			return true
-		}
-	}
-	return false
-}
-
-func (pf *ProductFilter) IsChickenProduct(product entity.Product) bool {
-	for _, flag := range product.Flags {
-		flagName := strings.ToUpper(flag.Name)
-		if flagName == string(utils.FlagAyamAfkir) ||
-			flagName == string(utils.FlagAyamCulling) ||
-			flagName == string(utils.FlagAyamMati) {
-			return true
-		}
-	}
-	return false
-}
-
-func (pf *ProductFilter) ShouldIncludeProduct(product entity.Product) bool {
-	if pf.ProjectFlockCategory == string(utils.ProjectFlockCategoryLaying) {
-		return pf.IsEggProduct(product)
-	}
-	return pf.IsChickenProduct(product) || (!pf.IsEggProduct(product) && !pf.IsChickenProduct(product))
-}
-
-func (pf *ProductFilter) FilterDeliveryProducts(deliveries []entity.MarketingDeliveryProduct) []entity.MarketingDeliveryProduct {
-	filtered := make([]entity.MarketingDeliveryProduct, 0)
-	for _, delivery := range deliveries {
-		if delivery.MarketingProduct.ProductWarehouse.Product.Id == 0 {
+	for _, item := range purchaseItems {
+		if item.Product == nil || len(item.Product.Flags) == 0 {
 			continue
 		}
-		if pf.ShouldIncludeProduct(delivery.MarketingProduct.ProductWarehouse.Product) {
-			filtered = append(filtered, delivery)
+
+		for _, flag := range item.Product.Flags {
+			flagType := utils.FlagType(flag.Name)
+
+			if slices.Contains(flags, flagType) && !seenFlags[flagType] {
+				amount := sumPurchasesByFlag(purchaseItems, flagType)
+				rpPerBird, rpPerKg := calculatePerUnitMetrics(amount, ctx.TotalPopulation, ctx.TotalWeightProduced)
+
+				items = append(items, HppItem{
+					Type: getFlagLabel(flagType),
+					Comparison: ToComparison(
+						ToFinancialMetrics(rpPerBird, rpPerKg, amount),
+						ToFinancialMetrics(rpPerBird, rpPerKg, amount),
+					),
+				})
+				seenFlags[flagType] = true
+			}
 		}
 	}
-	return filtered
+
+	return items
+}
+
+// === HPP BAHAN BAKU (from ProjectBudget + ExpenseRealization) ===
+
+func createHppOverheadItem(budgetAmount, realizationAmount float64, ctx CalculationContext) HppItem {
+	budgetRpPerBird, budgetRpPerKg := calculatePerUnitMetrics(budgetAmount, ctx.TotalPopulation, ctx.TotalWeightProduced)
+	realizationRpPerBird, realizationRpPerKg := calculatePerUnitMetrics(realizationAmount, ctx.TotalPopulation, ctx.TotalWeightProduced)
+
+	return HppItem{
+		Type: HPPLabelOverhead,
+		Comparison: ToComparison(
+			ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, budgetAmount),
+			ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, realizationAmount),
+		),
+	}
+}
+
+func createHppEkspedisiItem(ekspedisiAmount float64, ctx CalculationContext) HppItem {
+	ekspedisiRpPerBird, ekspedisiRpPerKg := calculatePerUnitMetrics(ekspedisiAmount, ctx.TotalPopulation, ctx.TotalWeightProduced)
+
+	return HppItem{
+		Type: HPPLabelEkspedisi,
+		Comparison: ToComparison(
+			ToFinancialMetrics(ekspedisiRpPerBird, ekspedisiRpPerKg, ekspedisiAmount),
+			ToFinancialMetrics(ekspedisiRpPerBird, ekspedisiRpPerKg, ekspedisiAmount),
+		),
+	}
+}
+
+func ToHppBahanBakuGroup(budgets []entities.ProjectBudget, realizations []entities.ExpenseRealization, ctx CalculationContext) HppGroup {
+	items := []HppItem{}
+
+	budgetAmount := sumBudgetsByFilter(budgets, func(*entities.ProjectBudget) bool { return true })
+	realizationAmount := getOperationalExpenses(realizations)
+
+	if budgetAmount > 0 || realizationAmount > 0 {
+		items = append(items, createHppOverheadItem(budgetAmount, realizationAmount, ctx))
+	}
+
+	ekspedisiAmount := sumRealizationsByFilter(realizations, filterRealizationByNonstockFlag(utils.FlagEkspedisi))
+	items = append(items, createHppEkspedisiItem(ekspedisiAmount, ctx))
+
+	return HppGroup{
+		GroupName: HPPGroupBahanBaku,
+		Data:      items,
+	}
+}
+
+// === HPP SUMMARY ===
+
+func ToSummaryHpp(label string, purchaseItems []entities.PurchaseItem, budgets []entities.ProjectBudget, realizations []entities.ExpenseRealization, projectFlockCategory string, ctx CalculationContext) SummaryHpp {
+	purchaseTotal := sumPurchaseTotal(purchaseItems)
+	budgetTotal := sumBudgetsByFilter(budgets, func(*entities.ProjectBudget) bool { return true })
+	totalBudget := purchaseTotal + budgetTotal
+
+	totalRealization := sumRealizationsByFilter(realizations, func(*entities.ExpenseRealization) bool { return true })
+
+	budgetRpPerBird, budgetRpPerKg := calculatePerUnitMetrics(totalBudget, ctx.TotalPopulation, ctx.TotalWeightProduced)
+	realizationRpPerBird, realizationRpPerKg := calculatePerUnitMetrics(totalRealization, ctx.TotalPopulation, ctx.TotalWeightProduced)
+
+	summary := SummaryHpp{
+		Label:       label,
+		Budgeting:   ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, totalBudget),
+		Realization: ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, totalRealization),
+	}
+
+	if projectFlockCategory == string(utils.ProjectFlockCategoryLaying) && ctx.TotalEggWeightKg > 0 {
+		budgetEggRpPerKg, _ := calculatePerUnitMetrics(totalBudget, 0, ctx.TotalEggWeightKg)
+		realizationEggRpPerKg, _ := calculatePerUnitMetrics(totalRealization, 0, ctx.TotalEggWeightKg)
+
+		summary.EggBudgeting = &FinancialMetrics{
+			RpPerBird: 0,
+			RpPerKg:   budgetEggRpPerKg,
+			Amount:    totalBudget,
+		}
+		summary.EggRealization = &FinancialMetrics{
+			RpPerBird: 0,
+			RpPerKg:   realizationEggRpPerKg,
+			Amount:    totalRealization,
+		}
+	}
+
+	return summary
+}
+
+func ToHppPurchasesSection(purchaseItems []entities.PurchaseItem, budgets []entities.ProjectBudget, realizations []entities.ExpenseRealization, projectFlockCategory string, ctx CalculationContext) HppPurchasesSection {
+	hppGroups := []HppGroup{
+		{
+			GroupName: HPPGroupPengeluaran,
+			Data:      buildHppItemsByPurchaseFlags(purchaseItems, ctx),
+		},
+		ToHppBahanBakuGroup(budgets, realizations, ctx),
+	}
+
+	summaryHpp := ToSummaryHpp(HPPSummaryLabel, purchaseItems, budgets, realizations, projectFlockCategory, ctx)
+
+	return HppPurchasesSection{
+		Hpp:        hppGroups,
+		SummaryHpp: summaryHpp,
+	}
+}
+
+// === PROFIT & LOSS ===
+
+func ToPLItem(itemType string, metrics FinancialMetrics) PLItem {
+	return PLItem{
+		Type:             itemType,
+		FinancialMetrics: metrics,
+	}
+}
+
+func ToPLSummaryItem(label string, metrics FinancialMetrics) PLSummaryItem {
+	return PLSummaryItem{
+		Label:            label,
+		FinancialMetrics: metrics,
+	}
+}
+
+func createPLItemWithMetrics(itemType string, amount float64, ctx CalculationContext) PLItem {
+	rpPerBird, rpPerKg := calculatePerUnitMetrics(amount, ctx.ActualPopulation, ctx.TotalWeightProduced)
+	return ToPLItem(itemType, ToFinancialMetrics(rpPerBird, rpPerKg, amount))
+}
+
+func sumPLItems(items []PLItem) (totalAmount, totalPerBird float64) {
+	for _, item := range items {
+		totalAmount += item.Amount
+		totalPerBird += item.RpPerBird
+	}
+	return
+}
+
+func createPenjualanItem(salesType string, amount float64, ctx CalculationContext) PLItem {
+	rpPerBird, rpPerKg := calculatePerUnitMetrics(amount, ctx.ActualPopulation, ctx.TotalWeightSold)
+	return ToPLItem(salesType, ToFinancialMetrics(rpPerBird, rpPerKg, amount))
+}
+
+func ToPenjualanItems(projectFlockCategory string, deliveryProducts []entities.MarketingDeliveryProduct, ctx CalculationContext) []PLItem {
+	items := []PLItem{}
+
+	categorized := categorizeDeliveriesBySalesType(deliveryProducts)
+
+	if projectFlockCategory == string(utils.ProjectFlockCategoryLaying) {
+		ayamAmount := sumDeliveriesByCategory(categorized[PLSalesTypeChicken])
+		telurAmount := sumDeliveriesByCategory(categorized[PLSalesTypeEgg])
+
+		items = append(items, createPenjualanItem(PLSalesTypeChicken, ayamAmount, ctx))
+		items = append(items, createPenjualanItem(PLSalesTypeEgg, telurAmount, ctx))
+	} else {
+		ayamAmount := sumDeliveriesByCategory(categorized[PLSalesTypeChicken])
+		items = append(items, createPenjualanItem(PLSalesTypeChicken, ayamAmount, ctx))
+	}
+
+	return items
+}
+
+func ToPembelianItems(purchases []entities.PurchaseItem, realizations []entities.ExpenseRealization, ctx CalculationContext) []PLItem {
+	purchaseAmount := sumPurchaseTotal(purchases)
+
+	return []PLItem{
+		createPLItemWithMetrics(PLItemTypeSapronak, purchaseAmount, ctx),
+	}
+}
+
+func ToOverheadItems(realizations []entities.ExpenseRealization, ctx CalculationContext) []PLItem {
+	realizationAmount := getOperationalExpenses(realizations)
+	return []PLItem{
+		createPLItemWithMetrics(PLItemTypeOverhead, realizationAmount, ctx),
+	}
+}
+
+func ToEkspedisiItems(realizations []entities.ExpenseRealization, ctx CalculationContext) []PLItem {
+	amount := sumRealizationsByFilter(realizations, filterRealizationByNonstockFlag(utils.FlagEkspedisi))
+	return []PLItem{
+		createPLItemWithMetrics(PLItemTypeEkspedisi, amount, ctx),
+	}
+}
+
+func ToPLSummaryGroup(penjualanItems, pembelianItems, overheadItems, ekspedisiItems []PLItem) PLSummaryGroup {
+	totalPenjualan, totalPenjualanPerBird := sumPLItems(penjualanItems)
+	totalPembelian, totalPembelianPerBird := sumPLItems(pembelianItems)
+	totalOverhead, totalOverheadPerBird := sumPLItems(overheadItems)
+	totalEkspedisi, totalEkspedisiPerBird := sumPLItems(ekspedisiItems)
+
+	grossProfit := totalPenjualan - totalPembelian
+	grossProfitPerBird := totalPenjualanPerBird - totalPembelianPerBird
+
+	totalOtherExpenses := totalOverhead + totalEkspedisi
+	totalOtherExpensesPerBird := totalOverheadPerBird + totalEkspedisiPerBird
+
+	netProfit := grossProfit - totalOtherExpenses
+	netProfitPerBird := grossProfitPerBird - totalOtherExpensesPerBird
+
+	return PLSummaryGroup{
+		GrossProfit: ToPLSummaryItem(PLSummaryLabelGrossProfit, ToFinancialMetrics(grossProfitPerBird, 0, grossProfit)),
+		SubTotal:    ToPLSummaryItem(PLSummaryLabelSubTotal, ToFinancialMetrics(totalOtherExpensesPerBird, 0, totalOtherExpenses)),
+		NetProfit:   ToPLSummaryItem(PLSummaryLabelNetProfit, ToFinancialMetrics(netProfitPerBird, 0, netProfit)),
+	}
+}
+
+func ToProfitLossData(penjualanItems, pembelianItems, overheadItems, ekspedisiItems []PLItem) ProfitLossData {
+	summary := ToPLSummaryGroup(penjualanItems, pembelianItems, overheadItems, ekspedisiItems)
+
+	totalOverhead := aggregatePLItems(overheadItems, PLItemTypeOverhead)
+	totalEkspedisi := aggregatePLItems(ekspedisiItems, PLItemTypeEkspedisi)
+
+	return ProfitLossData{
+		Penjualan: penjualanItems,
+		Pembelian: pembelianItems,
+		Overhead:  totalOverhead,
+		Ekspedisi: totalEkspedisi,
+		Summary:   summary,
+	}
+}
+
+func ToProfitLossSection(penjualanItems, pembelianItems, overheadItems, ekspedisiItems []PLItem) ProfitLossSection {
+	return ProfitLossSection{
+		Data: ToProfitLossData(penjualanItems, pembelianItems, overheadItems, ekspedisiItems),
+	}
+}
+
+func aggregatePLItems(items []PLItem, label string) PLItem {
+	totalAmount, totalPerBird := sumPLItems(items)
+	return ToPLItem(label, ToFinancialMetrics(totalPerBird, 0, totalAmount))
+}
+
+func ToReportResponse(hppPurchases HppPurchasesSection, profitLoss ProfitLossSection) ReportResponse {
+	return ReportResponse{
+		HppPurchases: hppPurchases,
+		ProfitLoss:   profitLoss,
+	}
+}
+
+func ToClosingKeuanganReport(input ClosingKeuanganInput) ReportResponse {
+	var totalPopulation float64
+	var totalWeightSold float64
+
+	for _, chickin := range input.Chickins {
+		totalPopulation += chickin.UsageQty
+	}
+
+	for _, delivery := range input.DeliveryProducts {
+		totalWeightSold += delivery.TotalWeight
+	}
+
+	ctx := CalculationContext{
+		TotalPopulation:     totalPopulation,
+		TotalWeightProduced: input.TotalWeightProduced,
+		TotalEggWeightKg:    input.TotalEggWeightKg,
+		TotalDepletion:      input.TotalDepletion,
+		TotalWeightSold:     totalWeightSold,
+		ActualPopulation:    totalPopulation - input.TotalDepletion,
+	}
+
+	hppSection := ToHppPurchasesSection(input.PurchaseItems, input.Budgets, input.Realizations, input.ProjectFlockCategory, ctx)
+	penjualanItems := ToPenjualanItems(input.ProjectFlockCategory, input.DeliveryProducts, ctx)
+	pembelianItems := ToPembelianItems(input.PurchaseItems, input.Realizations, ctx)
+	overheadItems := ToOverheadItems(input.Realizations, ctx)
+	ekspedisiItems := ToEkspedisiItems(input.Realizations, ctx)
+	plSection := ToProfitLossSection(penjualanItems, pembelianItems, overheadItems, ekspedisiItems)
+
+	return ToReportResponse(hppSection, plSection)
+}
+
+// === HELPER FUNCTIONS ===
+
+func calculatePerUnitMetrics(amount, totalPopulation, totalWeightSold float64) (rpPerBird, rpPerKg float64) {
+	if totalPopulation > 0 {
+		rpPerBird = amount / totalPopulation
+	}
+	if totalWeightSold > 0 {
+		rpPerKg = amount / totalWeightSold
+	}
+	return rpPerBird, rpPerKg
+}
+
+func hasProductFlag(flags []entities.Flag, flagType utils.FlagType) bool {
+	for _, flag := range flags {
+		if strings.ToUpper(flag.Name) == string(flagType) {
+			return true
+		}
+	}
+	return false
+}
+
+func filterByPurchaseFlag(flagType utils.FlagType) func(*entities.PurchaseItem) bool {
+	return func(item *entities.PurchaseItem) bool {
+		if item.Product == nil || len(item.Product.Flags) == 0 {
+			return false
+		}
+		return hasProductFlag(item.Product.Flags, flagType)
+	}
+}
+
+func filterRealizationByNonstockFlag(flagType utils.FlagType) func(*entities.ExpenseRealization) bool {
+	return func(realization *entities.ExpenseRealization) bool {
+		if realization.ExpenseNonstock == nil || realization.ExpenseNonstock.Nonstock == nil {
+			return false
+		}
+		return hasProductFlag(realization.ExpenseNonstock.Nonstock.Flags, flagType)
+	}
+}
+
+func filterRealizationExceptFlag(flagType utils.FlagType) func(*entities.ExpenseRealization) bool {
+	hasFlag := filterRealizationByNonstockFlag(flagType)
+	return func(realization *entities.ExpenseRealization) bool {
+		return !hasFlag(realization)
+	}
+}
+
+func sumByFilter[T any](items []T, extractor func(*T) float64, filter func(*T) bool) float64 {
+	amount := 0.0
+	for i := range items {
+		if filter(&items[i]) {
+			amount += extractor(&items[i])
+		}
+	}
+	return amount
+}
+
+func sumPurchasesByFilter(purchases []entities.PurchaseItem, filter func(*entities.PurchaseItem) bool) float64 {
+	return sumByFilter(purchases, func(p *entities.PurchaseItem) float64 { return p.TotalPrice }, filter)
+}
+
+func sumPurchasesByFlag(purchases []entities.PurchaseItem, flagType utils.FlagType) float64 {
+	return sumPurchasesByFilter(purchases, filterByPurchaseFlag(flagType))
+}
+
+func sumPurchaseTotal(purchases []entities.PurchaseItem) float64 {
+	return sumByFilter(purchases, func(p *entities.PurchaseItem) float64 { return p.TotalPrice }, func(*entities.PurchaseItem) bool { return true })
+}
+
+func sumBudgetsByFilter(budgets []entities.ProjectBudget, filter func(*entities.ProjectBudget) bool) float64 {
+	return sumByFilter(budgets, func(b *entities.ProjectBudget) float64 { return b.Price * b.Qty }, filter)
+}
+
+func sumRealizationsByFilter(realizations []entities.ExpenseRealization, filter func(*entities.ExpenseRealization) bool) float64 {
+	return sumByFilter(realizations, func(r *entities.ExpenseRealization) float64 { return r.Price * r.Qty }, filter)
+}
+
+func getOperationalExpenses(realizations []entities.ExpenseRealization) float64 {
+	return sumRealizationsByFilter(realizations, filterRealizationExceptFlag(utils.FlagEkspedisi))
+}
+
+func isChickenProductFlag(flagType utils.FlagType) bool {
+	switch flagType {
+	case utils.FlagDOC, utils.FlagPullet, utils.FlagLayer,
+		utils.FlagAyamAfkir, utils.FlagAyamCulling, utils.FlagAyamMati:
+		return true
+	}
+	return false
+}
+
+func isEggProductFlag(flagType utils.FlagType) bool {
+	switch flagType {
+	case utils.FlagTelur, utils.FlagTelurUtuh, utils.FlagTelurPecah,
+		utils.FlagTelurPutih, utils.FlagTelurRetak:
+		return true
+	}
+	return false
+}
+
+func getSalesTypeFromProductFlags(product *entities.Product) string {
+	if product == nil || len(product.Flags) == 0 {
+		return PLSalesTypeChicken
+	}
+
+	for _, flag := range product.Flags {
+		flagType := utils.FlagType(strings.ToUpper(flag.Name))
+
+		if isEggProductFlag(flagType) {
+			return PLSalesTypeEgg
+		}
+		if isChickenProductFlag(flagType) {
+			return PLSalesTypeChicken
+		}
+	}
+
+	return PLSalesTypeChicken
+}
+
+func categorizeDeliveriesBySalesType(deliveries []entities.MarketingDeliveryProduct) map[string][]entities.MarketingDeliveryProduct {
+	categorized := make(map[string][]entities.MarketingDeliveryProduct)
+
+	for _, delivery := range deliveries {
+		product := delivery.MarketingProduct.ProductWarehouse.Product
+		salesType := getSalesTypeFromProductFlags(&product)
+
+		categorized[salesType] = append(categorized[salesType], delivery)
+	}
+
+	return categorized
+}
+
+func sumDeliveriesByCategory(deliveries []entities.MarketingDeliveryProduct) float64 {
+	amount := 0.0
+	for _, delivery := range deliveries {
+		amount += delivery.TotalPrice
+	}
+	return amount
 }

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

@@ -8,54 +8,34 @@ import (
 	customerDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 )
 
 // === Response DTO ===
 type SalesDTO struct {
-	Id               uint                             `json:"id"`
-	RealizationDate  time.Time                        `json:"realization_date"`
-	Age              int                              `json:"age"`
-	Week             int                              `json:"week"`
-	DoNumber         string                           `json:"do_number"`
-	Product          *productDTO.ProductRelationDTO   `json:"product,omitempty"`
-	Customer         *customerDTO.CustomerRelationDTO `json:"customer,omitempty"`
-	Qty              float64                          `json:"qty"`
-	Weight           float64                          `json:"weight"`
-	AvgWeight        float64                          `json:"avg_weight"`
-	SalesPrice       float64                          `json:"sales_price"`
-	TotalSalesPrice  float64                          `json:"total_sales_price"`
-	ActualPrice      float64                          `json:"actual_price"`
-	TotalActualPrice float64                          `json:"total_actual_price"`
-	Kandang          *kandangDTO.KandangRelationDTO   `json:"kandang,omitempty"`
-}
-type SummaryDTO struct {
-	TotalSalesPrice  float64 `json:"total_sales_price"`
-	AvgSalesPrice    float64 `json:"avg_sales_price"`
-	TotalActualPrice float64 `json:"total_actual_price"`
-	AvgActualPrice   float64 `json:"avg_actual_price"`
+	Id              uint                             `json:"id"`
+	RealizationDate time.Time                        `json:"realization_date"`
+	Age             int                              `json:"age"`
+	DoNumber        string                           `json:"do_number"`
+	Product         *productDTO.ProductRelationDTO   `json:"product,omitempty"`
+	Customer        *customerDTO.CustomerRelationDTO `json:"customer,omitempty"`
+	Qty             float64                          `json:"qty"`
+	Weight          float64                          `json:"weight"`
+	AvgWeight       float64                          `json:"avg_weight"`
+	Price           float64                          `json:"price"`
+	TotalPrice      float64                          `json:"total_price"`
+	Kandang         *kandangDTO.KandangRelationDTO   `json:"kandang,omitempty"`
+	PaymentStatus   string                           `json:"payment_status"`
 }
 
 type PenjualanRealisasiResponseDTO struct {
-	Sales   []SalesDTO `json:"sales"`
-	Summary SummaryDTO `json:"summary"`
+	Sales []SalesDTO `json:"sales"`
 }
 
 // === Mapper Functions ===
 
 func ToSalesDTO(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, ageInWeeks := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate, productFlags, category)
+	age := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate)
 
 	var product *productDTO.ProductRelationDTO
 	if e.MarketingProduct.ProductWarehouse.Product.Id != 0 {
@@ -83,69 +63,19 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	doNumber := deliveryOrdersDTO.GenerateDeliveryOrderNumber(e.MarketingProduct.Marketing.SoNumber, e.DeliveryDate, e.MarketingProduct.ProductWarehouse.Warehouse.Id)
 
 	return SalesDTO{
-		Id:               e.Id,
-		RealizationDate:  realizationDate,
-		Age:              ageInDay,
-		Week:             ageInWeeks,
-		DoNumber:         doNumber,
-		Product:          product,
-		Customer:         customer,
-		Qty:              e.UsageQty,
-		Weight:           e.TotalWeight,
-		AvgWeight:        e.AvgWeight,
-		SalesPrice:       e.MarketingProduct.UnitPrice,
-		TotalSalesPrice:  e.MarketingProduct.TotalPrice,
-		ActualPrice:      e.UnitPrice,
-		TotalActualPrice: e.TotalPrice,
-		Kandang:          kandang,
-	}
-}
-
-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{
-		TotalSalesPrice:  totalSalesPrice,
-		TotalActualPrice: totalActualPrice,
-		AvgSalesPrice:    sumSales / float64(count),
-		AvgActualPrice:   sumActual / float64(count),
+		Id:              e.Id,
+		RealizationDate: realizationDate,
+		Age:             age,
+		DoNumber:        doNumber,
+		Product:         product,
+		Customer:        customer,
+		Qty:             e.UsageQty,
+		Weight:          e.TotalWeight,
+		AvgWeight:       e.AvgWeight,
+		Price:           e.UnitPrice,
+		TotalPrice:      e.TotalPrice,
+		Kandang:         kandang,
+		PaymentStatus:   "Paid",
 	}
 }
 
@@ -157,36 +87,29 @@ func ToSalesDTOs(e []entity.MarketingDeliveryProduct) []SalesDTO {
 	return result
 }
 
-func ToPenjualanRealisasiResponseDTO(e []entity.MarketingDeliveryProduct) PenjualanRealisasiResponseDTO {
+func ToPenjualanRealisasiResponseDTO(projectFlockID uint, e []entity.MarketingDeliveryProduct) PenjualanRealisasiResponseDTO {
+
 	return PenjualanRealisasiResponseDTO{
-		Sales:   ToSalesDTOs(e),
-		Summary: ToSummaryDto(e),
+
+		Sales: ToSalesDTOs(e),
 	}
 }
 
-func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, deliveryDate *time.Time, productFlags []string, category string) (int, int) {
-	if projectFlockKandang == nil || deliveryDate == nil || len(projectFlockKandang.Chickins) == 0 {
-		return 0, 0
-	}
-
-	for _, flag := range productFlags {
-		if flag == string(utils.FlagOVK) ||
-			flag == string(utils.FlagPakan) ||
-			flag == string(utils.FlagPreStarter) ||
-			flag == string(utils.FlagStarter) ||
-			flag == string(utils.FlagFinisher) ||
-			flag == string(utils.FlagObat) ||
-			flag == string(utils.FlagVitamin) ||
-			flag == string(utils.FlagKimia) ||
-			flag == string(utils.FlagEkspedisi) ||
-			flag == string(utils.FlagTelur) ||
-			flag == string(utils.FlagTelurUtuh) ||
-			flag == string(utils.FlagTelurPecah) ||
-			flag == string(utils.FlagTelurPutih) ||
-			flag == string(utils.FlagTelurRetak) {
-			return 0, 0
+func extractPeriodFromRealisasi(realisasi []entity.MarketingDeliveryProduct) int {
+	if len(realisasi) > 0 {
+		for _, item := range realisasi {
+			if item.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil {
+				return item.MarketingProduct.ProductWarehouse.ProjectFlockKandang.Period
+			}
 		}
 	}
+	return 0
+}
+
+func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, deliveryDate *time.Time) int {
+	if projectFlockKandang == nil || deliveryDate == nil || len(projectFlockKandang.Chickins) == 0 {
+		return 0
+	}
 
 	earliestChickinDate := projectFlockKandang.Chickins[0].ChickInDate
 	for _, chickin := range projectFlockKandang.Chickins {
@@ -195,20 +118,7 @@ func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, de
 		}
 	}
 
-	diff := deliveryDate.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
+	ageInDays := int(deliveryDate.Sub(earliestChickinDate).Hours() / 24)
+	ageInWeeks := ageInDays / 7
+	return ageInWeeks
 }

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"`
@@ -115,20 +114,9 @@ type ClosingSapronakDTO struct {
 	OutgoingSapronak []ClosingSapronakItemDTO `json:"outgoing_sapronak"`
 }
 
-type ClosingSapronakSummaryItemDTO struct {
-	Category string        `json:"category"`
-	TotalQty int64         `json:"total_qty"`
-	Uom      UomSummaryDTO `json:"uom"`
-}
-
-type UomSummaryDTO struct {
-	ID   uint   `json:"id"`
-	Name string `json:"name"`
-}
-
 // === 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 +124,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 +164,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]
@@ -244,17 +185,13 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 		}
 
 		for idx, item := range group.Items {
-			refKey := strings.TrimSpace(item.NoReferensi)
-			productKey := strings.ToUpper(flagKey + "|" + item.ProductName + "|" + refKey)
-			if refKey == "" {
-				productKey = strings.ToUpper(flagKey + "|" + item.ProductName + "|" + formatDate(item.Tanggal))
-			}
+			productKey := strings.ToUpper(flagKey + "|" + item.ProductName)
 			baseRow := SapronakCategoryRowDTO{
 				ID:              idx + 1,
 				Date:            formatDate(item.Tanggal),
 				ReferenceNumber: item.NoReferensi,
 				Description:     item.ProductName,
-				ProductCategory: buildFlagList(item.ProductID, flagKey),
+				ProductCategory: item.ProductName,
 				UnitPrice:       item.Harga,
 				Notes:           "-",
 			}
@@ -264,51 +201,18 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 			switch strings.ToLower(item.JenisTransaksi) {
 			case "pembelian", "adjustment masuk", "mutasi masuk":
 				row.QtyIn += item.QtyMasuk
-				if item.Tanggal != nil {
-					row.Date = formatDate(item.Tanggal)
-				}
-				if row.UnitPrice == 0 {
-					if item.QtyMasuk > 0 && item.Nilai > 0 {
-						row.UnitPrice = item.Nilai / item.QtyMasuk
-					} else if item.Harga > 0 {
-						row.UnitPrice = item.Harga
-					}
-				}
-				if strings.ToLower(item.JenisTransaksi) == "mutasi masuk" {
-					ref := strings.ToUpper(strings.TrimSpace(item.NoReferensi))
-					if strings.HasPrefix(ref, "TL-") {
-						row.Notes = "TRANSFER LAYING"
-					} else if strings.HasPrefix(ref, "ST-") {
-						row.Notes = "TRANSFER STOCK"
-					}
-				}
-			case "pemakaian":
-				price := row.UnitPrice
-				if price == 0 {
-					price = item.Harga
-				}
+				row.TotalAmount += item.Nilai
+			case "pemakaian", "adjustment keluar":
 				row.QtyUsed += item.QtyKeluar
-				row.TotalAmount += item.QtyKeluar * price
-			case "adjustment keluar", "mutasi keluar", "penjualan":
-				price := row.UnitPrice
-				if price == 0 {
-					price = item.Harga
-				}
+			case "mutasi keluar":
 				row.QtyOut += item.QtyKeluar
-				if strings.ToLower(item.JenisTransaksi) == "mutasi keluar" {
-					ref := strings.ToUpper(strings.TrimSpace(item.NoReferensi))
-					if strings.HasPrefix(ref, "TL-") {
-						row.Notes = "TRANSFER LAYING"
-					} else if strings.HasPrefix(ref, "ST-") {
-						row.Notes = "TRANSFER STOCK"
-					}
-				}
 			default:
 				row.QtyIn += item.QtyMasuk
 				row.TotalAmount += item.Nilai
-				if row.QtyIn > 0 {
-					row.UnitPrice = row.TotalAmount / row.QtyIn
-				}
+			}
+
+			if row.QtyIn > 0 {
+				row.UnitPrice = row.TotalAmount / row.QtyIn
 			}
 		}
 
@@ -329,8 +233,8 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 			total += r.TotalAmount
 		}
 		avg := 0.0
-		if qtyUsed > 0 {
-			avg = total / qtyUsed
+		if qtyIn > 0 {
+			avg = total / qtyIn
 		}
 		cat.Total = SapronakCategoryTotalDTO{
 			Label:        label,

internal/modules/closings/module.go

@@ -39,13 +39,10 @@ func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	purchaseRepo := rPurchase.NewPurchaseRepository(db)
 	approvalRepo := commonRepo.NewApprovalRepository(db)
 	approvalService := commonSvc.NewApprovalService(approvalRepo)
-	hppCostRepo := commonRepo.NewHppCostRepository(db)
-	hppService := commonSvc.NewHppService(hppCostRepo)
 
 	closingService := sClosing.NewClosingService(closingRepo, projectFlockRepo, projectFlockKandangRepo, marketingRepo, marketingDeliveryProductRepo, approvalService, expenseRealizationRepo, projectBudgetRepo, chickinRepo, purchaseRepo, recordingRepo, standardGrowthDetailRepo, productionStandardDetailRepo, validate)
-	closingKeuanganService := sClosing.NewClosingKeuanganService(projectFlockRepo, projectFlockKandangRepo, marketingDeliveryProductRepo, expenseRealizationRepo, projectBudgetRepo, chickinRepo, recordingRepo, hppService, hppCostRepo)
 	sapronakService := sClosing.NewSapronakService(closingRepo, projectFlockKandangRepo, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 
-	ClosingRoutes(router, userService, closingService, sapronakService, closingKeuanganService)
+	ClosingRoutes(router, userService, closingService, sapronakService)
 }

internal/modules/closings/route.go

@@ -9,8 +9,8 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService, sapronakSvc closing.SapronakService, closingKeuanganSvc closing.ClosingKeuanganService) {
-	ctrl := controller.NewClosingController(s, sapronakSvc, closingKeuanganSvc)
+func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService, sapronakSvc closing.SapronakService) {
+	ctrl := controller.NewClosingController(s, sapronakSvc)
 
 	route := v1.Group("/closings")
 	route.Use(m.Auth(u))
@@ -30,11 +30,9 @@ func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService
 	route.Get("/:project_flock_id/:project_flock_kandang_id/perhitungan_sapronak", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetSapronakByKandang)
 	route.Get("/:project_flock_id/perhitungan_sapronak", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetSapronakByProject)
 	route.Get("/:projectFlockId/sapronak", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingSapronak)
-	route.Get("/:projectFlockId/sapronak/summary", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingSapronakSummary)
 	route.Get("/:project_flock_id/expedition-hpp", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetExpeditionHPP)
 	route.Get("/:project_flock_id/:project_flock_kandang_id/expedition-hpp", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetExpeditionHPPByKandang)
 	route.Get("/:projectFlockId/production-data", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingDataProduksi)
 	route.Get("/:projectFlockId/keuangan", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingKeuangan)
-	route.Get("/:project_flock_id/:project_flock_kandang_id/keuangan", m.RequirePermissions(m.P_ClosingDetail), ctrl.GetClosingKeuanganByKandang)
 
 }

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"
@@ -41,7 +40,7 @@ type ClosingService interface {
 	GetClosingDataProduksi(ctx *fiber.Ctx, projectFlockID uint, kandangID *uint) (*dto.ClosingProductionReportDTO, error)
 	GetOverhead(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.OverheadListDTO, error)
 	GetClosingSapronak(ctx *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakItemDTO, int64, error)
-	GetClosingSapronakSummary(ctx *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakSummaryItemDTO, error)
+	GetClosingKeuangan(ctx *fiber.Ctx, projectFlockID uint) (*dto.ReportResponse, error)
 	GetExpeditionHPP(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error)
 }
 
@@ -99,43 +98,10 @@ 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 {
-		switch *params.ProjectStatus {
-		case 1:
-			statusFilter = "Pengajuan"
-		case 2:
-			statusFilter = "Aktif"
-		}
-	}
 
 	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)
-		}
-		if statusFilter != "" {
-			latestApprovalSubQuery := s.Repository.DB().
-				WithContext(c.Context()).
-				Table("approvals").
-				Select("DISTINCT ON (approvable_id) approvable_id, step_name, id").
-				Where("approvable_type = ?", utils.ApprovalWorkflowProjectFlock.String()).
-				Order("approvable_id, id DESC")
-			db = db.Joins("JOIN (?) AS latest_approval ON latest_approval.approvable_id = project_flocks.id", latestApprovalSubQuery).
-				Where("LOWER(latest_approval.step_name) = LOWER(?)", statusFilter)
-		}
 		if params.Search != "" {
 			return db.Where("flock_name ILIKE ?", "%"+params.Search+"%")
 		}
@@ -162,10 +128,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,13 +139,6 @@ func (s closingService) GetProjectFlockByID(c *fiber.Ctx, id uint) (*entity.Proj
 }
 
 func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
-	if projectFlockKandangID != nil {
-		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
-			return nil, err
-		}
-	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
-		return nil, err
-	}
 
 	realisasi, err := s.MarketingDeliveryProductRepo.GetClosingPenjualan(c.Context(), projectFlockID, projectFlockKandangID)
 	if err != nil {
@@ -197,8 +152,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 {
-		return nil, err
+	if projectFlockID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
 	if kandangID != nil {
@@ -282,7 +237,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 +299,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 {
-		return nil, 0, err
+	if projectFlockID == 0 {
+		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
 	if params == nil {
@@ -367,17 +322,23 @@ 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")
 	}
 
 	var projectFlockKandangIDs []uint
-	if params.KandangID != nil && *params.KandangID > 0 {
-		projectFlockKandangIDs = []uint{*params.KandangID}
-	} else if params.Type == validation.SapronakTypeOutgoing {
-		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
+	if params.Type == validation.SapronakTypeOutgoing {
+		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID, params.KandangID)
 		if err != nil {
 			s.Log.Errorf("Failed to fetch project flock kandang IDs for project flock %d: %+v", projectFlockID, err)
 			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
@@ -391,7 +352,6 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		ProjectFlockKandangIDs: projectFlockKandangIDs,
 		Limit:                  params.Limit,
 		Offset:                 offset,
-		Search:                 params.Search,
 	})
 	if err != nil {
 		s.Log.Errorf("Failed to fetch sapronak %s for project flock %d: %+v", params.Type, projectFlockID, err)
@@ -426,84 +386,13 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 	return items, totalResults, nil
 }
 
-func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakSummaryItemDTO, error) {
-	if projectFlockID == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
-	}
-
-	if params == nil {
-		params = &validation.ClosingSapronakQuery{}
-	}
-
-	if err := s.Validate.Struct(params); err != nil {
-		return nil, fiber.NewError(fiber.StatusBadRequest, err.Error())
-	}
-
-	if params.Type != validation.SapronakTypeIncoming && params.Type != validation.SapronakTypeOutgoing {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
-	}
-
-	if _, err := s.Repository.GetByID(c.Context(), projectFlockID, nil); err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fiber.NewError(fiber.StatusNotFound, "Project flock tidak ditemukan")
-		}
-		s.Log.Errorf("Failed get project flock %d for sapronak closing summary: %+v", projectFlockID, err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
-	}
-
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
-	if err != nil {
-		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
-	}
-
-	var projectFlockKandangIDs []uint
-	if params.KandangID != nil && *params.KandangID > 0 {
-		projectFlockKandangIDs = []uint{*params.KandangID}
-	} else if params.Type == validation.SapronakTypeOutgoing {
-		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
-		if err != nil {
-			s.Log.Errorf("Failed to fetch project flock kandang IDs for project flock %d: %+v", projectFlockID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
-		}
-	}
-
-	rows, err := s.Repository.GetSapronakSummary(c.Context(), repository.SapronakQueryParams{
-		Type:                   params.Type,
-		WarehouseIDs:           warehouseIDs,
-		ProjectFlockKandangIDs: projectFlockKandangIDs,
-		Search:                 params.Search,
-	})
-	if err != nil {
-		s.Log.Errorf("Failed to fetch sapronak %s summary for project flock %d: %+v", params.Type, projectFlockID, err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch sapronak summary data")
-	}
-
-	items := make([]dto.ClosingSapronakSummaryItemDTO, 0, len(rows))
-	for _, row := range rows {
-		items = append(items, dto.ClosingSapronakSummaryItemDTO{
-			Category: row.Category,
-			TotalQty: row.TotalQty,
-			Uom: dto.UomSummaryDTO{
-				ID:   row.UomID,
-				Name: row.UomName,
-			},
-		})
-	}
-
-	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{}).
-		Where("project_flock_id = ?", projectFlockID)
-	if kandangID != nil && *kandangID > 0 {
-		query = query.Where("id = ?", *kandangID)
-	}
-	if err := query.Pluck("kandang_id", &kandangIDs).Error; err != nil {
+	if err := db.Model(&entity.ProjectFlockKandang{}).
+		Where("project_flock_id = ?", projectFlockID).
+		Pluck("kandang_id", &kandangIDs).Error; err != nil {
 		return nil, err
 	}
 
@@ -529,11 +418,14 @@ func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, proje
 	return ids, nil
 }
 
-func (s closingService) getProjectFlockKandangIDs(ctx context.Context, projectFlockID uint) ([]uint, error) {
+func (s closingService) getProjectFlockKandangIDs(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
 	var ids []uint
 	query := s.Repository.DB().WithContext(ctx).
 		Model(&entity.ProjectFlockKandang{}).
 		Where("project_flock_id = ?", projectFlockID)
+	if kandangID != nil {
+		query = query.Where("kandang_id = ?", *kandangID)
+	}
 	err := query.Order("id ASC").Pluck("id", &ids).Error
 	if err != nil {
 		return nil, err
@@ -555,7 +447,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 +490,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
@@ -693,15 +577,87 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 	return &result, nil
 }
 
-func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, 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 {
+func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*dto.ReportResponse, error) {
+
+	if err := commonSvc.EnsureRelations(c.Context(),
+		commonSvc.RelationCheck{Name: "Project Flock", ID: &projectFlockID, Exists: s.ProjectFlockRepo.IdExists},
+	); err != nil {
 		return nil, err
 	}
 
+	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
+	}
+
+	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
+	}
+
+	actualUsageRows, err := s.Repository.GetActualUsageCostByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch actual usage cost")
+	}
+
+	purchaseItems := s.convertActualUsageToPurchaseItems(c.Context(), actualUsageRows)
+
+	realizations, err := s.ExpenseRealizationRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch realizations")
+	}
+
+	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(c.Context(), projectFlockID, func(db *gorm.DB) *gorm.DB {
+		return db.Preload("MarketingProduct").
+			Preload("MarketingProduct.ProductWarehouse").
+			Preload("MarketingProduct.ProductWarehouse.Product")
+	})
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery products")
+	}
+
+	chickins, err := s.ChickinRepo.GetByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch chickins")
+	}
+
+	totalWeightProduced, _, err := s.RecordingRepo.GetProductionWeightAndQtyByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil {
+		s.Log.Warnf("GetProductionWeightAndQtyByProjectFlockID error: %v", err)
+	}
+
+	totalEggWeightKg, err := s.RecordingRepo.GetTotalEggProductionWeightByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil {
+		s.Log.Warnf("GetTotalEggProductionWeightByProjectFlockID error: %v", err)
+	}
+
+	totalDepletion, err := s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlockID)
+	if err != nil {
+		s.Log.Warnf("GetTotalDepletionByProjectFlockID error: %v", err)
+	}
+
+	input := dto.ClosingKeuanganInput{
+		ProjectFlockCategory: projectFlock.Category,
+		PurchaseItems:        purchaseItems,
+		Budgets:              budgets,
+		Realizations:         realizations,
+		DeliveryProducts:     deliveryProducts,
+		Chickins:             chickins,
+		TotalWeightProduced:  totalWeightProduced,
+		TotalEggWeightKg:     totalEggWeightKg,
+		TotalDepletion:       totalDepletion,
+	}
+
+	report := dto.ToClosingKeuanganReport(input)
+
+	return &report, nil
+}
+
+func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
+	if projectFlockID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	}
+
 	rows, err := s.Repository.GetExpeditionHPP(c.Context(), projectFlockID, projectFlockKandangID)
 	if err != nil {
 		s.Log.Errorf("Failed to get expedition HPP for project flock %d: %+v", projectFlockID, err)
@@ -734,16 +690,10 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
-	var projectFlockKandangIDs []uint
-	if kandangID != nil && *kandangID > 0 {
-		projectFlockKandangIDs = []uint{*kandangID}
-	} else {
-		var err error
-		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
-		if err != nil {
-			s.Log.Errorf("Failed to fetch project flock kandangs for %d: %+v", projectFlockID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandangs")
-		}
+	projectFlockKandangIDs, err := s.getProjectFlockKandangIDs(c.Context(), projectFlockID, kandangID)
+	if err != nil {
+		s.Log.Errorf("Failed to fetch project flock kandangs for %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandangs")
 	}
 
 	if len(projectFlockKandangIDs) == 0 {
@@ -773,10 +723,6 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to determine production week")
 	}
 
-	if !isGrowing && currentWeek != 0 {
-		currentWeek = currentWeek + 17
-	}
-
 	targetAverages, err := s.RecordingRepo.GetAverageTargetMetricsByProjectFlockKandangID(c.Context(), projectFlockKandangIDs[0], !isGrowing)
 	if err != nil {
 		s.Log.Errorf("Failed to calculate target metrics for project flock %d: %+v", projectFlockID, err)
@@ -836,7 +782,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 +810,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 +839,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 +889,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
 		}
@@ -978,38 +932,38 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 	if !isGrowing {
 		if targetAverages.HenDayCount > 0 {
 			henDayAct := targetAverages.HenDayAvg
-			performance.HenDayAct = henDayAct
+			performance.HenDayAct = &henDayAct
 		}
 		if targetAverages.HenHouseCount > 0 {
 			henHouseAct := targetAverages.HenHouseAvg
-			performance.HenHouseAct = henHouseAct
+			performance.HenHouseAct = &henHouseAct
 		}
 		if targetAverages.EggWeightCount > 0 {
 			eggWeight := targetAverages.EggWeightAvg
-			performance.EggWeight = eggWeight
+			performance.EggWeight = &eggWeight
 		}
 		if targetAverages.EggMassCount > 0 {
 			eggMass := targetAverages.EggMassAvg
-			performance.EggMass = eggMass
+			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 {
-				performance.HendayStd = *productionStandardDetail.TargetHenDayProduction
+				performance.HendayStd = productionStandardDetail.TargetHenDayProduction
 			}
 			if productionStandardDetail.TargetHenHouseProduction != nil {
-				performance.HenHouseStd = *productionStandardDetail.TargetHenHouseProduction
+				performance.HenHouseStd = productionStandardDetail.TargetHenHouseProduction
 			}
 			if productionStandardDetail.TargetEggWeight != nil {
-				performance.EggWeightStd = *productionStandardDetail.TargetEggWeight
+				performance.EggWeightStd = productionStandardDetail.TargetEggWeight
 			}
 			if productionStandardDetail.TargetEggMass != nil {
-				performance.EggMassStd = *productionStandardDetail.TargetEggMass
+				performance.EggMassStd = productionStandardDetail.TargetEggMass
 			}
 		}
 	}
@@ -1023,24 +977,38 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 	return &result, nil
 }
 
-func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) (float64, error) {
-	penjualan, err := s.MarketingDeliveryProductRepo.GetClosingPenjualanForAgeChickDataProduction(ctx, projectFlockID, projectFlockKandangID)
+func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint) (float64, error) {
+	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(ctx, projectFlockID, func(db *gorm.DB) *gorm.DB {
+		return db.
+			Preload("MarketingProduct").
+			Preload("MarketingProduct.ProductWarehouse").
+			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins")
+	})
 	if err != nil {
 		return 0, err
 	}
-	acumulateAgeQty := 0.0
-	totalQty := 0.0
-	for _, v := range penjualan {
-		sale := dto.ToSalesAgeDTO(v)
-		acumulateAgeQty += float64(sale.Age) * sale.Qty
-		totalQty += sale.Qty
-	}
-	if totalQty > 0 {
-		averageAge := acumulateAgeQty / totalQty
-		return averageAge, nil
+
+	var (
+		totalQty      float64
+		totalAgeWeeks float64
+	)
+
+	for _, product := range deliveryProducts {
+		if product.UsageQty == 0 {
+			continue
+		}
+		projectFlockKandang := product.MarketingProduct.ProductWarehouse.ProjectFlockKandang
+		ageWeeks := dto.CalculateAgeFromChickinDataProduksi(projectFlockKandang, product.DeliveryDate)
+		totalAgeWeeks += float64(ageWeeks) * product.UsageQty
+		totalQty += product.UsageQty
 	}
 
-	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 +1051,8 @@ func (s closingService) determineProductionWeek(ctx context.Context, projectFloc
 	return week, nil
 }
 
-func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64) dto.ClosingPerformanceDTO {
-	mortalityStd, fcrStd := 0.0, 0.0
+func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64, standards []entity.FcrStandard) dto.ClosingPerformanceDTO {
+	mortalityStd, fcrStd := closestFcrValues(standards, averageWeight)
 
 	fcrAct := 0.0
 	if totalWeight > 0 {
@@ -1116,3 +1084,71 @@ 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
+}
+
+func (s closingService) convertActualUsageToPurchaseItems(ctx context.Context, actualUsageRows []repository.ActualUsageCostRow) []entity.PurchaseItem {
+	if len(actualUsageRows) == 0 {
+		return []entity.PurchaseItem{}
+	}
+
+	// Collect all product IDs
+	productIDs := make([]uint, len(actualUsageRows))
+	for i, row := range actualUsageRows {
+		productIDs[i] = row.ProductID
+	}
+
+	// Fetch products with flags from repository
+	products, err := s.Repository.GetProductsWithFlagsByIDs(ctx, productIDs)
+	if err != nil {
+		s.Log.Warnf("Failed to fetch products for actual usage: %v", err)
+		products = []entity.Product{}
+	}
+
+	// Create product map
+	productMap := make(map[uint]*entity.Product)
+	for i := range products {
+		productMap[products[i].Id] = &products[i]
+	}
+
+	// Convert to pseudo purchase items
+	purchaseItems := make([]entity.PurchaseItem, 0, len(actualUsageRows))
+	for _, row := range actualUsageRows {
+		product := productMap[row.ProductID]
+
+		// Skip if product not found
+		if product == nil {
+			s.Log.Warnf("Product ID %d not found for actual usage", row.ProductID)
+			continue
+		}
+
+		purchaseItem := entity.PurchaseItem{
+			Id:         0, // Pseudo item, no ID
+			ProductId:  row.ProductID,
+			TotalQty:   row.TotalQty,
+			TotalPrice: row.TotalPrice,
+			Price:      row.AveragePrice,
+			Product:    product,
+		}
+
+		purchaseItems = append(purchaseItems, purchaseItem)
+	}
+
+	return purchaseItems
+}

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

@@ -1,571 +0,0 @@
-package service
-
-import (
-	"errors"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/sirupsen/logrus"
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
-	expenseRealizationRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
-	marketingDeliveryProductRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/repositories"
-	chickinRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
-	projectflockRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
-	recordingRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gorm.io/gorm"
-)
-
-// ClosingKeuanganService handles closing keuangan business logic
-type ClosingKeuanganService interface {
-	GetClosingKeuangan(ctx *fiber.Ctx, projectFlockID uint) (*dto.ClosingKeuanganData, error)
-	GetClosingKeuanganByKandang(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID uint) (*dto.ClosingKeuanganData, error)
-}
-
-// CostData holds all cost-related information
-type CostData struct {
-	FeedCost               float64
-	OvkCost                float64
-	ChickenCost            float64
-	ExpeditionCost         float64
-	BudgetOperational      float64
-	RealizationOperational float64
-}
-
-// ProductionData holds all production and sales related information
-type ProductionData struct {
-	TotalPopulationIn   float64
-	TotalDepletion      float64
-	TotalWeightProduced float64
-	TotalEggWeightKg    float64
-	TotalWeightSold     float64
-	TotalBirdSold       float64
-	TotalSalesAmount    float64
-}
-
-type closingKeuanganService struct {
-	Log                          *logrus.Logger
-	ProjectFlockRepo             projectflockRepository.ProjectflockRepository
-	ProjectFlockKandangRepo      projectflockRepository.ProjectFlockKandangRepository
-	MarketingDeliveryProductRepo marketingDeliveryProductRepository.MarketingDeliveryProductRepository
-	ExpenseRealizationRepo       expenseRealizationRepository.ExpenseRealizationRepository
-	ProjectBudgetRepo            projectflockRepository.ProjectBudgetRepository
-	ChickinRepo                  chickinRepository.ProjectChickinRepository
-	RecordingRepo                recordingRepository.RecordingRepository
-	HppSvc                       commonSvc.HppService
-	HppRepo                      commonRepo.HppCostRepository
-}
-
-func NewClosingKeuanganService(
-	projectFlockRepo projectflockRepository.ProjectflockRepository,
-	projectFlockKandangRepo projectflockRepository.ProjectFlockKandangRepository,
-	marketingDeliveryProductRepo marketingDeliveryProductRepository.MarketingDeliveryProductRepository,
-	expenseRealizationRepo expenseRealizationRepository.ExpenseRealizationRepository,
-	projectBudgetRepo projectflockRepository.ProjectBudgetRepository,
-	chickinRepo chickinRepository.ProjectChickinRepository,
-	recordingRepo recordingRepository.RecordingRepository,
-	hppSvc commonSvc.HppService,
-	hppRepo commonRepo.HppCostRepository,
-) ClosingKeuanganService {
-	return &closingKeuanganService{
-		Log:                          utils.Log,
-		ProjectFlockRepo:             projectFlockRepo,
-		ProjectFlockKandangRepo:      projectFlockKandangRepo,
-		MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
-		ExpenseRealizationRepo:       expenseRealizationRepo,
-		ProjectBudgetRepo:            projectBudgetRepo,
-		ChickinRepo:                  chickinRepo,
-		RecordingRepo:                recordingRepo,
-		HppSvc:                       hppSvc,
-		HppRepo:                      hppRepo,
-	}
-}
-
-func (s closingKeuanganService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*dto.ClosingKeuanganData, error) {
-
-	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Project Flock", ID: &projectFlockID, Exists: s.ProjectFlockRepo.IdExists},
-	); err != nil {
-		return nil, err
-	}
-
-	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
-	}
-
-	projectFlockKandangs, err := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlockID)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch kandangs")
-	}
-
-	return s.calculateClosingKeuangan(c, projectFlock, projectFlockKandangs)
-}
-
-func (s closingKeuanganService) GetClosingKeuanganByKandang(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID uint) (*dto.ClosingKeuanganData, error) {
-
-	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Project Flock", ID: &projectFlockID, Exists: s.ProjectFlockRepo.IdExists},
-	); err != nil {
-		return nil, err
-	}
-
-	projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), projectFlockKandangID)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusNotFound, "Project flock kandang not found")
-	}
-	if projectFlockKandang.ProjectFlockId != projectFlockID {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Project flock kandang does not belong to this project flock")
-	}
-
-	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), projectFlockID, nil)
-	if err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
-	}
-
-	projectFlockKandangs := []entity.ProjectFlockKandang{*projectFlockKandang}
-
-	return s.calculateClosingKeuangan(c, projectFlock, projectFlockKandangs)
-}
-
-func (s closingKeuanganService) calculateClosingKeuangan(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangs []entity.ProjectFlockKandang) (*dto.ClosingKeuanganData, error) {
-
-	var projectFlockKandangIDs []uint
-	for _, projectFlockKandang := range projectFlockKandangs {
-		projectFlockKandangIDs = append(projectFlockKandangIDs, projectFlockKandang.Id)
-	}
-
-	isPerKandang := len(projectFlockKandangs) == 1
-	var projectFlockKandangID *uint
-	if isPerKandang {
-		kandangID := projectFlockKandangs[0].Id
-		projectFlockKandangID = &kandangID
-	}
-
-	costs, err := s.calculateCosts(c, projectFlock, projectFlockKandangs, projectFlockKandangIDs, projectFlockKandangID)
-	if err != nil {
-		return nil, err
-	}
-
-	productionData, err := s.calculateProductionData(c, projectFlock, projectFlockKandangIDs, projectFlockKandangID)
-	if err != nil {
-		return nil, err
-	}
-
-	hppSection := s.buildHPPSection(c, projectFlock, projectFlockKandangs, costs, productionData)
-
-	profitLossSection := s.buildProfitLossSection(projectFlock, costs, productionData)
-
-	data := dto.ToClosingKeuanganData(hppSection, profitLossSection)
-	return &data, nil
-}
-
-func (s closingKeuanganService) calculateCosts(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangs []entity.ProjectFlockKandang, projectFlockKandangIDs []uint, projectFlockKandangID *uint) (*CostData, error) {
-	costs := &CostData{}
-	var err error
-
-	costs.FeedCost, err = s.HppRepo.GetFeedUsageCost(c.Context(), projectFlockKandangIDs, nil)
-	if err != nil {
-		costs.FeedCost = 0
-	}
-
-	costs.OvkCost, err = s.HppRepo.GetOvkUsageCost(c.Context(), projectFlockKandangIDs, nil)
-	if err != nil {
-		costs.OvkCost = 0
-	}
-
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		for _, projectFlockKandang := range projectFlockKandangs {
-			depresiasiCost, err := s.HppSvc.GetDepresiasiTransfer(projectFlockKandang.Id, nil)
-			if err == nil {
-				costs.ChickenCost += depresiasiCost
-			}
-			pulletCost, err := s.HppRepo.GetPulletCost(c.Context(), projectFlockKandang.Id)
-			if err == nil {
-				costs.ChickenCost += pulletCost
-			}
-		}
-	} else {
-		for _, projectFlockKandang := range projectFlockKandangs {
-			pulletCost, err := s.HppRepo.GetPulletCost(c.Context(), projectFlockKandang.Id)
-			if err == nil {
-				costs.ChickenCost += pulletCost
-			}
-		}
-	}
-
-	costs.ExpeditionCost, err = s.HppRepo.GetExpedisionCost(c.Context(), projectFlockKandangIDs)
-	if err != nil {
-		costs.ExpeditionCost = 0
-	}
-
-	if budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlock.Id); err == nil {
-		totalBudget := 0.0
-		for _, budget := range budgets {
-			totalBudget += budget.Price * budget.Qty
-		}
-		if projectFlockKandangID != nil {
-			allKandangs, errKandang := s.ProjectFlockKandangRepo.GetByProjectFlockID(c.Context(), projectFlock.Id)
-			if errKandang == nil && len(allKandangs) > 0 {
-				costs.BudgetOperational = totalBudget / float64(len(allKandangs))
-			}
-		} else {
-			costs.BudgetOperational = totalBudget
-		}
-	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-		s.Log.Errorf("Failed to fetch budgets for project_flock_id=%d: %+v", projectFlock.Id, err)
-	}
-
-	if realizations, err := s.ExpenseRealizationRepo.GetClosingOverhead(c.Context(), projectFlock.Id, projectFlockKandangID); err == nil {
-		for _, realization := range realizations {
-			amount := realization.Price * realization.Qty
-			isEkspedisi := realization.ExpenseNonstock != nil &&
-				realization.ExpenseNonstock.Nonstock != nil &&
-				containsFlag(realization.ExpenseNonstock.Nonstock.Flags, "EKSPEDISI")
-			if !isEkspedisi {
-				costs.RealizationOperational += amount
-			}
-		}
-	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-		s.Log.Errorf("Failed to fetch realizations for project_flock_id=%d: %+v", projectFlock.Id, err)
-	}
-
-	return costs, nil
-}
-
-func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlock *entity.ProjectFlock, projectFlockKandangIDs []uint, projectFlockKandangID *uint) (*ProductionData, error) {
-	data := &ProductionData{}
-	var err error
-
-	data.TotalPopulationIn, err = s.HppRepo.GetTotalPopulation(c.Context(), projectFlockKandangIDs)
-	if err != nil {
-		data.TotalPopulationIn = 0
-	}
-
-	if projectFlockKandangID != nil {
-		data.TotalDepletion, err = s.RecordingRepo.GetTotalDepletionByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
-	} else {
-		data.TotalDepletion, err = s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlock.Id)
-	}
-	if err != nil {
-		data.TotalDepletion = 0
-	}
-
-	if projectFlockKandangID != nil {
-		data.TotalWeightProduced, err = s.RecordingRepo.GetTotalWeightProducedFromUniformityByProjectFlockKandangID(c.Context(), *projectFlockKandangID)
-	} else {
-		data.TotalWeightProduced, err = s.RecordingRepo.GetTotalWeightProducedFromUniformityByProjectFlockID(c.Context(), projectFlock.Id)
-	}
-	if err != nil {
-		data.TotalWeightProduced = 0
-	}
-
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		_, data.TotalEggWeightKg, err = s.HppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(c.Context(), projectFlockKandangIDs, nil)
-		if err != nil {
-			data.TotalEggWeightKg = 0
-		}
-	}
-
-	var deliveryProducts []entity.MarketingDeliveryProduct
-	if projectFlockKandangID != nil {
-		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, projectFlockKandangID, projectFlock.Category)
-	} else {
-		deliveryProducts, err = s.MarketingDeliveryProductRepo.GetClosingPenjualanByCategory(c.Context(), projectFlock.Id, nil, projectFlock.Category)
-	}
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data penjualan")
-	}
-
-	for _, delivery := range deliveryProducts {
-		if delivery.MarketingProduct.ProductWarehouse.Product.Id == 0 {
-			continue
-		}
-		data.TotalWeightSold += delivery.TotalWeight
-		data.TotalBirdSold += delivery.UsageQty
-		data.TotalSalesAmount += delivery.TotalPrice
-	}
-
-	return data, nil
-}
-
-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
-
-	weightForCalculation := totalWeightProduced
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		weightForCalculation = totalEggWeightKg
-	}
-
-	calculateMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-		if actualPopulation > 0 {
-			rpPerBird = amount / actualPopulation
-		}
-		if weightForCalculation > 0 {
-			rpPerKg = amount / weightForCalculation
-		}
-		return
-	}
-
-	createHPPItem := func(id uint, category, code, label string, budgetAmount, realizationAmount float64) dto.HPPItem {
-		budgetRpPerBird, budgetRpPerKg := calculateMetrics(budgetAmount)
-		realizationRpPerBird, realizationRpPerKg := calculateMetrics(realizationAmount)
-		return dto.ToHPPItem(
-			id,
-			category,
-			code,
-			label,
-			dto.ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, budgetAmount),
-			dto.ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, realizationAmount),
-		)
-	}
-
-	hppItems := []dto.HPPItem{}
-
-	hppItems = append(hppItems, createHPPItem(1, "purchase", string(dto.HPPCodePakan), "Pembelian Pakan", costs.FeedCost, costs.FeedCost))
-	hppItems = append(hppItems, createHPPItem(2, "purchase", string(dto.HPPCodeOVK), "Pembelian OVK", costs.OvkCost, costs.OvkCost))
-
-	docCode := string(dto.HPPCodeDOC)
-	docLabel := "Pembelian DOC"
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		docCode = string(dto.HPPCodeDepresiasi)
-		docLabel = "Depresiasi"
-	}
-	hppItems = append(hppItems, createHPPItem(3, "purchase", docCode, docLabel, costs.ChickenCost, costs.ChickenCost))
-	hppItems = append(hppItems, createHPPItem(4, "overhead", string(dto.HPPCodeOverhead), "Pengeluaran Overhead", costs.BudgetOperational, costs.RealizationOperational))
-	hppItems = append(hppItems, createHPPItem(5, "overhead", string(dto.HPPCodeEkspedisi), "Beban Ekspedisi", costs.ExpeditionCost, costs.ExpeditionCost))
-
-	totalBudgetHpp := costs.FeedCost + costs.OvkCost + costs.ChickenCost + costs.BudgetOperational + costs.ExpeditionCost
-	totalRealizationHpp := costs.FeedCost + costs.OvkCost + costs.ChickenCost + costs.RealizationOperational + costs.ExpeditionCost
-
-	hppBudgetRpPerBird, hppBudgetRpPerKg := calculateMetrics(totalBudgetHpp)
-	hppRealizationRpPerBird, hppRealizationRpPerKg := calculateMetrics(totalRealizationHpp)
-
-	var eggBudgeting, eggRealization *dto.FinancialMetrics
-	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		accumulateEggMetrics := func(metrics **dto.FinancialMetrics, amount, rpPerKg float64) {
-			if *metrics == nil {
-				*metrics = &dto.FinancialMetrics{
-					RpPerBird: 0,
-					RpPerKg:   rpPerKg,
-					Amount:    amount,
-				}
-			} else {
-				(*metrics).Amount += amount
-				if totalEggWeightKg > 0 {
-					(*metrics).RpPerKg = (*metrics).Amount / totalEggWeightKg
-				}
-			}
-		}
-
-		for _, projectFlockKandang := range projectFlockKandangs {
-			hppResponse, err := s.HppSvc.CalculateHppCost(projectFlockKandang.Id, nil)
-			if err == nil {
-				accumulateEggMetrics(&eggBudgeting, hppResponse.Estimation.Total, hppResponse.Estimation.HargaKg)
-				accumulateEggMetrics(&eggRealization, hppResponse.Real.Total, hppResponse.Real.HargaKg)
-			}
-		}
-	}
-
-	hppSummary := dto.ToHPPSummary(
-		"HPP",
-		dto.ToFinancialMetrics(hppBudgetRpPerBird, hppBudgetRpPerKg, totalBudgetHpp),
-		dto.ToFinancialMetrics(hppRealizationRpPerBird, hppRealizationRpPerKg, totalRealizationHpp),
-		eggBudgeting,
-		eggRealization,
-	)
-
-	return dto.ToHPPSection(hppItems, hppSummary)
-}
-
-func (s closingKeuanganService) buildProfitLossSection(projectFlock *entity.ProjectFlock, costs *CostData, production *ProductionData) dto.ProfitLossSection {
-
-	totalWeightProduced := production.TotalWeightProduced
-	totalEggWeightKg := production.TotalEggWeightKg
-	totalSalesAmount := production.TotalSalesAmount
-	totalWeightSold := production.TotalWeightSold
-	totalBirdSold := production.TotalBirdSold
-	actualPopulation := production.TotalPopulationIn - production.TotalDepletion
-
-	isLaying := projectFlock.Category == string(utils.ProjectFlockCategoryLaying)
-
-	// Fungsi untuk sales: LAYING = populasi aktual, GROWING = ekor terjual
-	calculateSalesMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-		if isLaying {
-			if actualPopulation > 0 {
-				rpPerBird = amount / actualPopulation
-			}
-			if totalWeightSold > 0 {
-				rpPerKg = amount / totalWeightSold
-			}
-		} else {
-			if totalBirdSold > 0 {
-				rpPerBird = amount / totalBirdSold
-			}
-			if totalWeightSold > 0 {
-				rpPerKg = amount / totalWeightSold
-			}
-		}
-		return
-	}
-
-	// Fungsi untuk cost: per ekor = populasi aktual, per kg = LAYING telur produksi / GROWING ayam produksi
-	calculateCostMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-		if actualPopulation > 0 {
-			rpPerBird = amount / actualPopulation
-		}
-		if isLaying {
-			if totalEggWeightKg > 0 {
-				rpPerKg = amount / totalEggWeightKg
-			}
-		} else {
-			if totalWeightProduced > 0 {
-				rpPerKg = amount / totalWeightProduced
-			}
-		}
-		return
-	}
-
-	// Fungsi untuk overhead/ekspedisi: LAYING = populasi aktual, GROWING = ekor terjual
-	calculateOverheadMetrics := func(amount float64) (rpPerBird, rpPerKg float64) {
-		if isLaying {
-			if actualPopulation > 0 {
-				rpPerBird = amount / actualPopulation
-			}
-			if totalWeightSold > 0 {
-				rpPerKg = amount / totalWeightSold
-			}
-		} else {
-			if totalBirdSold > 0 {
-				rpPerBird = amount / totalBirdSold
-			}
-			if totalWeightSold > 0 {
-				rpPerKg = amount / totalWeightSold
-			}
-		}
-		return
-	}
-
-	plItems := []dto.ProfitLossItem{}
-
-	salesRpPerBird, salesRpPerKg := calculateSalesMetrics(totalSalesAmount)
-	salesLabel := "Penjualan Ayam"
-	if isLaying {
-		salesLabel = "Penjualan Telur"
-	}
-	plItems = append(plItems, dto.ToProfitLossItem(
-		string(dto.PLCodeSales),
-		salesLabel,
-		"income",
-		salesRpPerBird,
-		salesRpPerKg,
-		totalSalesAmount,
-	))
-
-	totalSapronakAmount := costs.ChickenCost + costs.FeedCost + costs.OvkCost
-	sapronakRpPerBird := 0.0
-	sapronakRpPerKg := 0.0
-	for _, amount := range []float64{costs.ChickenCost, costs.FeedCost, costs.OvkCost} {
-		rpPerBird, rpPerKg := calculateCostMetrics(amount)
-		sapronakRpPerBird += rpPerBird
-		sapronakRpPerKg += rpPerKg
-	}
-	plItems = append(plItems, dto.ToProfitLossItem(
-		string(dto.PLCodeSapronak),
-		"Pengeluaran Sapronak",
-		"purchase",
-		sapronakRpPerBird,
-		sapronakRpPerKg,
-		totalSapronakAmount,
-	))
-
-	overheadRpPerBird, overheadRpPerKg := calculateOverheadMetrics(costs.RealizationOperational)
-	plItems = append(plItems, dto.ToProfitLossItem(
-		string(dto.PLCodeOverhead),
-		"Overhead",
-		"overhead",
-		overheadRpPerBird,
-		overheadRpPerKg,
-		costs.RealizationOperational,
-	))
-
-	ekspedisiRpPerBird, ekspedisiRpPerKg := calculateOverheadMetrics(costs.ExpeditionCost)
-	plItems = append(plItems, dto.ToProfitLossItem(
-		string(dto.PLCodeEkspedisi),
-		"Ekspedisi",
-		"overhead",
-		ekspedisiRpPerBird,
-		ekspedisiRpPerKg,
-		costs.ExpeditionCost,
-	))
-
-	costOfGoodsSold := costs.ChickenCost + costs.FeedCost + costs.OvkCost
-	costOfGoodsSoldRpPerBird := sapronakRpPerBird
-	costOfGoodsSoldRpPerKg := sapronakRpPerKg
-
-	grossProfit := totalSalesAmount - costOfGoodsSold
-	grossProfitRpPerBird := salesRpPerBird - costOfGoodsSoldRpPerBird
-	grossProfitRpPerKg := salesRpPerKg - costOfGoodsSoldRpPerKg
-
-	totalOperatingExpenses := costs.RealizationOperational + costs.ExpeditionCost
-	totalOperatingExpensesRpPerBird := overheadRpPerBird + ekspedisiRpPerBird
-	totalOperatingExpensesRpPerKg := overheadRpPerKg + ekspedisiRpPerKg
-
-	netProfit := grossProfit - totalOperatingExpenses
-	netProfitRpPerBird := grossProfitRpPerBird - totalOperatingExpensesRpPerBird
-	netProfitRpPerKg := grossProfitRpPerKg - totalOperatingExpensesRpPerKg
-
-	plSummary := dto.ToProfitLossSummary(
-		dto.ToFinancialMetrics(grossProfitRpPerBird, grossProfitRpPerKg, grossProfit),
-		dto.ToFinancialMetrics(totalOperatingExpensesRpPerBird, totalOperatingExpensesRpPerKg, totalOperatingExpenses),
-		dto.ToFinancialMetrics(netProfitRpPerBird, netProfitRpPerKg, netProfit),
-	)
-
-	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 {
-			return true
-		}
-	}
-	return false
-}

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

@@ -2,8 +2,8 @@ package service
 
 import (
 	"context"
-	"fmt"
 	"strings"
+	"time"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -18,8 +18,8 @@ import (
 )
 
 type SapronakService interface {
-	GetSapronakByProject(ctx *fiber.Ctx, projectFlockID uint, flag string) ([]dto.SapronakReportDTO, map[uint][]string, error)
-	GetSapronakByKandang(ctx *fiber.Ctx, projectFlockID uint, pfkID 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, 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)
-		if err != nil {
-			return nil, nil, err
-		}
-		return reports, flags, nil
+		return reports, nil
 	}
 
 	combined := s.combineSapronakReports(reports, projectFlockID)
-	flags, err := s.collectProductFlags(c.Context(), []dto.SapronakReportDTO{combined})
-	if err != nil {
-		return nil, nil, err
-	}
-	return []dto.SapronakReportDTO{combined}, flags, nil
+	return []dto.SapronakReportDTO{combined}, 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})
-			if err != nil {
-				return nil, nil, err
-			}
-			return &res, flags, nil
+			return &res, 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) {
@@ -124,7 +112,7 @@ func (s sapronakService) computeSapronakReports(ctx context.Context, params *val
 		}
 
 		// We no longer filter by date for closing sapronak report; pass nil pointers.
-		items, groups, totalIncoming, totalUsage, err := s.buildSapronakItems(ctx, pfk, params.Flag)
+		items, groups, totalIncoming, totalUsage, err := s.buildSapronakItems(ctx, pfk, nil, nil, params.Flag)
 		if err != nil {
 			s.Log.Errorf("Failed to build sapronak items for pfk %d: %+v", pfk.Id, err)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to calculate sapronak report")
@@ -138,6 +126,8 @@ func (s sapronakService) computeSapronakReports(ctx context.Context, params *val
 			KandangName:           pfk.Kandang.Name,
 			Period:                pfk.Period,
 			Status:                status,
+			StartDate:             nil,
+			EndDate:               nil,
 			TotalIncomingValue:    totalIncoming,
 			TotalUsageValue:       totalUsage,
 			Items:                 items,
@@ -148,52 +138,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").
@@ -321,7 +265,6 @@ type sapronakDetailMaps struct {
 	AdjOutgoing map[uint][]dto.SapronakDetailDTO
 	TransferIn  map[uint][]dto.SapronakDetailDTO
 	TransferOut map[uint][]dto.SapronakDetailDTO
-	SalesOut    map[uint][]dto.SapronakDetailDTO
 }
 
 func buildSapronakDetails(
@@ -331,7 +274,6 @@ func buildSapronakDetails(
 	adjOutgoingRows map[uint][]repository.SapronakDetailRow,
 	transferInRows map[uint][]repository.SapronakDetailRow,
 	transferOutRows map[uint][]repository.SapronakDetailRow,
-	salesOutRows map[uint][]repository.SapronakDetailRow,
 ) sapronakDetailMaps {
 	result := sapronakDetailMaps{
 		Incoming:    make(map[uint][]dto.SapronakDetailDTO),
@@ -340,7 +282,6 @@ func buildSapronakDetails(
 		AdjOutgoing: make(map[uint][]dto.SapronakDetailDTO),
 		TransferIn:  make(map[uint][]dto.SapronakDetailDTO),
 		TransferOut: make(map[uint][]dto.SapronakDetailDTO),
-		SalesOut:    make(map[uint][]dto.SapronakDetailDTO),
 	}
 
 	addRows := func(target map[uint][]dto.SapronakDetailDTO, src map[uint][]repository.SapronakDetailRow, jenis string, masuk bool) {
@@ -373,12 +314,11 @@ func buildSapronakDetails(
 	addRows(result.AdjOutgoing, adjOutgoingRows, "Adjustment Keluar", false)
 	addRows(result.TransferIn, transferInRows, "Mutasi Masuk", true)
 	addRows(result.TransferOut, transferOutRows, "Mutasi Keluar", false)
-	addRows(result.SalesOut, salesOutRows, "Penjualan", false)
 
 	return result
 }
 
-func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.ProjectFlockKandang, flagFilter string) ([]dto.SapronakItemDTO, []dto.SapronakGroupDTO, float64, float64, error) {
+func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.ProjectFlockKandang, start, end *time.Time, flagFilter string) ([]dto.SapronakItemDTO, []dto.SapronakGroupDTO, float64, float64, error) {
 	// For sapronak closing report we intentionally ignore date range
 	// and aggregate all historical transactions for the kandang/project.
 	incomingRows, err := s.Repository.FetchSapronakIncoming(ctx, pfk.KandangId)
@@ -405,14 +345,6 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	usageAllocatedDetails, err := s.Repository.FetchSapronakUsageAllocatedDetails(ctx, pfk.Id)
-	if err != nil {
-		return nil, nil, 0, 0, err
-	}
-	if len(usageAllocatedDetails) > 0 {
-		usageDetailsRows = usageAllocatedDetails
-		chickinUsageDetailsRows = map[uint][]repository.SapronakDetailRow{}
-	}
 	adjIncomingRows, adjOutgoingRows, err := s.Repository.FetchSapronakAdjustments(ctx, pfk.KandangId)
 	if err != nil {
 		return nil, nil, 0, 0, err
@@ -421,10 +353,6 @@ 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)
-	if err != nil {
-		return nil, nil, 0, 0, err
-	}
 
 	filterFlag := strings.ToUpper(strings.TrimSpace(flagFilter))
 	matchesFlag := func(f string) bool {
@@ -437,34 +365,6 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		}
 		return candidate == filterFlag
 	}
-	dedupTransfers := func(src map[uint][]dto.SapronakDetailDTO) map[uint][]dto.SapronakDetailDTO {
-		result := make(map[uint][]dto.SapronakDetailDTO, len(src))
-		seen := make(map[string]struct{})
-		for pid, rows := range src {
-			for _, d := range rows {
-				dateKey := ""
-				if d.Tanggal != nil {
-					dateKey = d.Tanggal.Format("2006-01-02")
-				}
-				qtyKey := d.QtyMasuk
-				if qtyKey == 0 {
-					qtyKey = d.QtyKeluar
-				}
-
-				ref := strings.TrimSpace(d.NoReferensi)
-				key := fmt.Sprintf("%d|%s|%s|%.3f", pid, ref, dateKey, qtyKey)
-				if ref == "" {
-					key = fmt.Sprintf("%d|%s|%s|%.3f|%s", pid, ref, dateKey, qtyKey, strings.ToUpper(strings.TrimSpace(d.Flag)))
-				}
-				if _, ok := seen[key]; ok {
-					continue
-				}
-				seen[key] = struct{}{}
-				result[pid] = append(result[pid], d)
-			}
-		}
-		return result
-	}
 
 	// For project flocks with category GROWING, pullet usage from chickin
 	// should not be counted yet. Only when category is LAYING we allow
@@ -503,17 +403,13 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		usageDetailsRows[pid] = append(usageDetailsRows[pid], rows...)
 	}
 
-	detailMaps := buildSapronakDetails(incomingDetailsRows, usageDetailsRows, adjIncomingRows, adjOutgoingRows, transIncomingRows, transOutgoingRows, salesOutRows)
+	detailMaps := buildSapronakDetails(incomingDetailsRows, usageDetailsRows, adjIncomingRows, adjOutgoingRows, transIncomingRows, transOutgoingRows)
 	incomingDetails := detailMaps.Incoming
 	usageDetails := detailMaps.Usage
 	adjIncoming := detailMaps.AdjIncoming
 	adjOutgoing := detailMaps.AdjOutgoing
 	transIncoming := detailMaps.TransferIn
 	transOutgoing := detailMaps.TransferOut
-	salesOutgoing := detailMaps.SalesOut
-
-	transIncoming = dedupTransfers(transIncoming)
-	transOutgoing = dedupTransfers(transOutgoing)
 
 	ensureGroup := func(flag string) *dto.SapronakGroupDTO {
 		if g, ok := groupMap[flag]; ok {
@@ -523,22 +419,6 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 		return groupMap[flag]
 	}
 
-	resolveFlagName := func(productID uint, details []dto.SapronakDetailDTO) (string, string) {
-		flag := ""
-		name := ""
-		if item, ok := itemMap[productID]; ok {
-			flag = item.Flag
-			name = item.ProductName
-		}
-		if flag == "" && len(details) > 0 {
-			flag = details[0].Flag
-		}
-		if name == "" && len(details) > 0 {
-			name = details[0].ProductName
-		}
-		return flag, name
-	}
-
 	for _, row := range incoming {
 		if !matchesFlag(row.Flag) {
 			continue
@@ -628,12 +508,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.
-			remaining := existing.IncomingQty - existing.UsageQty - d.QtyKeluar
-			if remaining < 0 {
-				remaining = 0
+			existing.UsageQty += d.QtyKeluar
+			existing.UsageValue += d.Nilai
+			if existing.IncomingQty >= existing.UsageQty {
+				existing.RemainingQty = existing.IncomingQty - existing.UsageQty
+			} else {
+				existing.RemainingQty = 0
 			}
-			existing.RemainingQty = remaining
 			itemMap[productID] = existing
 		}
 	}
@@ -673,18 +554,19 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range incomingDetails {
-		flag, name := resolveFlagName(productID, details)
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
+			d.Flag = flag
+			d.ProductName = name
 			group.Items = append(group.Items, d)
 			group.TotalMasuk += d.QtyMasuk
 			group.TotalNilai += d.Nilai
@@ -693,18 +575,19 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range adjIncoming {
-		flag, name := resolveFlagName(productID, details)
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
+			d.Flag = flag
+			d.ProductName = name
 			group.Items = append(group.Items, d)
 			group.TotalMasuk += d.QtyMasuk
 			group.TotalNilai += d.Nilai
@@ -713,18 +596,19 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range usageDetails {
-		flag, name := resolveFlagName(productID, details)
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
+			d.Flag = flag
+			d.ProductName = name
 			group.Items = append(group.Items, d)
 			group.TotalKeluar += d.QtyKeluar
 			group.SaldoAkhir -= d.QtyKeluar
@@ -732,18 +616,19 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range adjOutgoing {
-		flag, name := resolveFlagName(productID, details)
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
+			d.Flag = flag
+			d.ProductName = name
 			group.Items = append(group.Items, d)
 			group.TotalKeluar += d.QtyKeluar
 			group.SaldoAkhir -= d.QtyKeluar
@@ -751,18 +636,19 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range transIncoming {
-		flag, name := resolveFlagName(productID, details)
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
+			d.Flag = flag
+			d.ProductName = name
 			group.Items = append(group.Items, d)
 			group.TotalMasuk += d.QtyMasuk
 			group.TotalNilai += d.Nilai
@@ -771,37 +657,19 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	}
 
 	for productID, details := range transOutgoing {
-		flag, name := resolveFlagName(productID, details)
+		flag := ""
+		name := ""
+		if item, ok := itemMap[productID]; ok {
+			flag = item.Flag
+			name = item.ProductName
+		}
 		if !matchesFlag(flag) {
 			continue
 		}
 		group := ensureGroup(flag)
 		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
-			group.Items = append(group.Items, d)
-			group.TotalKeluar += d.QtyKeluar
-			group.SaldoAkhir -= d.QtyKeluar
-		}
-	}
-
-	for productID, details := range salesOutgoing {
-		flag, name := resolveFlagName(productID, details)
-		if !matchesFlag(flag) {
-			continue
-		}
-		group := ensureGroup(flag)
-		for _, d := range details {
-			if d.Flag == "" {
-				d.Flag = flag
-			}
-			if d.ProductName == "" {
-				d.ProductName = name
-			}
+			d.Flag = flag
+			d.ProductName = name
 			group.Items = append(group.Items, d)
 			group.TotalKeluar += d.QtyKeluar
 			group.SaldoAkhir -= d.QtyKeluar

internal/modules/closings/validations/closing.validation.go

@@ -9,11 +9,9 @@ type Update struct {
 }
 
 type Query struct {
-	Page          int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit         int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search        string `query:"search" validate:"omitempty,max=50"`
-	ProjectStatus *int   `query:"project_status" validate:"omitempty,oneof=1 2"`
-	LocationID    *uint  `query:"location_id" validate:"omitempty,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"`
+	Search string `query:"search" validate:"omitempty,max=50"`
 }
 
 const (
@@ -26,5 +24,4 @@ type ClosingSapronakQuery struct {
 	Page      int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
 	Limit     int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
 	KandangID *uint  `query:"kandang_id" validate:"omitempty,gt=0"`
-	Search    string `query:"search" validate:"omitempty,max=100"`
 }

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{
@@ -85,7 +83,7 @@ func (r *ConstantRepositoryImpl) GetConstants() (map[string]interface{}, error)
 			"KANDANG",
 		},
 		"stock_log": map[string][]string{
-			"log_types":         []string{"TRANSFER", "ADJUSTMENT", "MARKETING", "CHICKIN", "PURCHASE", "RECORDING"},
+			"log_types":         []string{"TRANSFER", "ADJUSTMENT"},
 			"transaction_types": []string{"INCREASE", "DECREASE"},
 		},
 		"supplier_categories": []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/route.go

@@ -15,49 +15,49 @@ func DailyChecklistRoutes(v1 fiber.Router, u user.UserService, s dailyChecklist.
 	route := v1.Group("/daily-checklists")
 	route.Use(m.Auth(u))
 
-	route.Get("/", m.RequirePermissions(m.P_DailyChecklistGetAll), ctrl.GetAll)
-	route.Get("/report", m.RequirePermissions(m.P_DailyChecklistReports), ctrl.GetReport)
+	route.Get("/", ctrl.GetAll)
+	route.Get("/report", ctrl.GetReport)
 
-	route.Get("/summary", m.RequirePermissions(m.P_DailyChecklistDashboardList), ctrl.GetSummary)
+	route.Get("/summary", ctrl.GetSummary)
 
-	// route.Get("/report", ctrl.GetReport)
+	route.Get("/report", ctrl.GetReport)
 
 	// upsert daily checklist
-	route.Post("/", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.CreateOne)
+	route.Post("/", ctrl.CreateOne)
 
 	// get detail data daily checklist by id
-	route.Get("/relation/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistGetOne), ctrl.GetOne)
+	route.Get("/relation/:idDailyChecklist", ctrl.GetOne)
 
 	// get phases by daily checklist id
-	route.Get("/phase/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.GetPhaseByIdChecklist)
+	route.Get("/phase/:idDailyChecklist", ctrl.GetPhaseByIdChecklist)
 
 	// create task
 	/*
 		ketika add phase
 	*/
-	route.Post("/phase/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.CreateDailyChecklistPhase)
+	route.Post("/phase/:idDailyChecklist", ctrl.CreateDailyChecklistPhase)
 
 	// create assigment
 	/*
 		ketika add ABK
 	*/
-	route.Post("/assignment/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.CreateAssignment)
+	route.Post("/assignment/:idDailyChecklist", ctrl.CreateAssignment)
 
 	// remove assignment
 	/*
 		ketika remove ABK
 	*/
-	route.Delete("/:idDailyChecklist/assignments/:idEmployee", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.RemoveAssignment)
+	route.Delete("/:idDailyChecklist/assignments/:idEmployee", ctrl.RemoveAssignment)
 
 	//get all tasks
-	route.Get("/tasks", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.GetAllTasks)
+	route.Get("/tasks", ctrl.GetAllTasks)
 
 	// update assignment
 	/*
 		ketika check dan uncheck tugas oleh ABK
 	*/
-	route.Post("/assignment", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.UpdateAssignment)
+	route.Post("/assignment", ctrl.UpdateAssignment)
 
-	route.Patch("/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.UpdateOne)
-	route.Delete("/:idDailyChecklist", m.RequirePermissions(m.P_DailyChecklistCreateOne), ctrl.DeleteOne)
+	route.Patch("/:idDailyChecklist", ctrl.UpdateOne)
+	route.Delete("/:idDailyChecklist", ctrl.DeleteOne)
 }

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 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
-	}
+		Joins("JOIN kandangs k ON k.id = dc.kandang_id")
 
 	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 := re.ReplaceAll([]byte("%"+params.Search+"%"), []byte(""))
-		db = db.Where("(regexp_replace(k.name, '[^a-zA-Z0-9]', '', 'g') ILIKE ? OR regexp_replace(dc.category::text, '[^a-zA-Z0-9]', '', 'g') ILIKE ?)", string(like), string(like))
+		like := "%" + params.Search + "%"
+		db = db.Where("(k.name ILIKE ? OR dc.category::text ILIKE ?)", like, 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 {
@@ -52,7 +52,7 @@ type SummaryQuery struct {
 
 type ReportQuery struct {
 	Page       int   `query:"page" validate:"required,number,min=1,gt=0"`
-	Limit      int   `query:"limit" validate:"required,number,min=1,gt=0"`
+	Limit      int   `query:"limit" validate:"required,number,min=1,max=100,gt=0"`
 	Month      int   `query:"bulan" validate:"required,number,min=1,max=12"`
 	Year       int   `query:"tahun" validate:"required,number,min=1900"`
 	AreaID     *uint `query:"area_id" validate:"omitempty"`