FIX[BE]: fix wrong get data on transfer stock

.gitlab-ci.yml

@@ -1,142 +1,21 @@
-stages:
-  - build
-  - gitops
-
-variables:
-  AWS_REGION: ap-southeast-3
-  ECR_REGISTRY: 886436954922.dkr.ecr.ap-southeast-3.amazonaws.com
-  ECR_REPO_NAME: mbugroup/lti-api
-  ECR_REPOSITORY: ${ECR_REGISTRY}/${ECR_REPO_NAME}
-
-  DOCKER_HOST: unix:///var/run/docker.sock
-  DOCKER_TLS_CERTDIR: ""
-  DOCKER_BUILDKIT: "1"
-
 workflow:
   rules:
-    # run untuk branch utama & MR
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
+    - if: '$CI_COMMIT_BRANCH == "development"'
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_COMMIT_BRANCH == "staging"'
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
+    - if: '$CI_COMMIT_BRANCH == "production"'
     - when: never
 
-# =========================
+include:
-# Helper: login ECR
+  - local: "ci/development.yml"
-# =========================
+    rules:
-.ecr_login: &ecr_login |
+      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-  AWS_CLI_ENV_ARGS=""
+      - if: '$CI_COMMIT_BRANCH == "development"'
-  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_REGION=$AWS_REGION"
-  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}"
-  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}"
-  if [ -n "${AWS_SESSION_TOKEN:-}" ]; then
-    AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
-  fi
 
-  PASS="$(docker run --rm $AWS_CLI_ENV_ARGS public.ecr.aws/aws-cli/aws-cli:latest \
+  - local: "ci/staging.yml"
-    ecr get-login-password --region "$AWS_REGION" || true)"
+    rules:
-  if [ -z "$PASS" ]; then
+      - if: '$CI_COMMIT_BRANCH == "staging"'
-    echo "ERROR: Failed to get ECR login password."
-    exit 1
-  fi
-  echo "$PASS" | docker login --username AWS --password-stdin "$ECR_REGISTRY"
 
-# =========================
+  - local: "ci/production.yml"
-# MR
+    rules:
-# =========================
+      - if: '$CI_COMMIT_BRANCH == "production"'
-build_mr:
-  stage: build
-  image: public.ecr.aws/docker/library/docker:27
-  tags: [self-hosted-dev]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
-  variables:
-    IMAGE_TAG: "prod-mr-${CI_COMMIT_SHORT_SHA}"
-  before_script:
-    - set -eu
-    - docker version
-    - docker info
-    - *ecr_login
-  script: |
-    set -eu
-    echo "Build (MR) : $ECR_REPOSITORY:$IMAGE_TAG"
-    docker build -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
-    echo "Pushing image for MR..."
-    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
-
-# =========================
-# DEVELOPMENT (push branch development)
-# =========================
-build_push_dev:
-  stage: build
-  image: public.ecr.aws/docker/library/docker:27
-  tags: [self-hosted-dev]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
-  variables:
-    IMAGE_TAG: "dev-${CI_COMMIT_SHORT_SHA}"
-  before_script:
-    - set -eu
-    - docker version
-    - docker info
-    - *ecr_login
-  script: |
-    set -eu
-    echo "Build & push (dev): $ECR_REPOSITORY:$IMAGE_TAG"
-    docker build -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
-    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
-
-# =========================
-# PRODUCTION (push branch production)
-# =========================
-build_push_prod:
-  stage: build
-  image: public.ecr.aws/docker/library/docker:27
-  tags: [self-hosted-dev]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-  variables:
-    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
-  before_script:
-    - set -eu
-    - docker version
-    - docker info
-    - *ecr_login
-  script: |
-    set -eu
-    echo "Build & push (prod): $ECR_REPOSITORY:$IMAGE_TAG"
-    docker build -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
-    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
-
-update_gitops_prod_lti:
-  stage: gitops
-  image: public.ecr.aws/docker/library/alpine:3.20
-  tags: [self-hosted-dev]
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-  needs: ["build_push_prod"]
-  variables:
-    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
-    GITOPS_BRANCH: main
-    VALUES_FILE: environments/lti/prod/lti-values-prod.yaml
-    GITOPS_REPO_URL: https://oauth2:${GITOPS_TOKEN}@gitlab.com/cristian.anggita.parjaman/gitops.git
-  before_script:
-    - set -eu
-    - apk add --no-cache git yq
-    - git config --global user.email "ci@gitlab"
-    - git config --global user.name "gitlab-ci"
-  script: |
-    set -eu
-    rm -rf gitops
-    git clone --depth 1 --branch "$GITOPS_BRANCH" "$GITOPS_REPO_URL" gitops
-    cd gitops
-
-    echo "Updating prod image.tag to $IMAGE_TAG"
-    yq -i '.image.tag = strenv(IMAGE_TAG)' "$VALUES_FILE"
-
-    git add "$VALUES_FILE"
-    if git diff --cached --quiet; then
-      echo "No changes to commit"
-      exit 0
-    fi
-    git commit -m "lti prod deploy ${IMAGE_TAG}"
-    git push origin "$GITOPS_BRANCH"

README.md

@@ -111,4 +111,3 @@ IT Development PT Mitra Berlian Unggas Group
 ## 📃 License
 
 > This project is private. All rights reserved.
-# mr test Sat  7 Feb 2026 00:14:58 WIB

ci/development.yml

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

ci/merge_request.yml

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

ci/production.yml

@@ -1,6 +1,6 @@
 stages:
   - build
-  - migrate
+#  - migrate
   - deploy
   - seed
 
@@ -8,6 +8,12 @@ default:
   tags:
     - self-hosted-prod
 
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+      when: always
+    - when: never
+
 variables:
   DOCKER_BUILDKIT: "1"
 
@@ -24,9 +30,7 @@ variables:
 build_production:
   stage: build
   rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
   script: |
     set -e
     docker info
@@ -43,72 +47,44 @@ build_production:
     docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
     docker push "$IMAGE_LATEST"
 
+
 # =========================
-# MIGRATE (PRODUCTION)
+# MIGRATE (PRODUCTION - MANUAL)
 # =========================
-migrate_production:
+#migrate_production:
-  stage: migrate
+#  stage: migrate
-  rules:
+#  rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
+#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: on_success
+#      when: manual
-    - when: never
+#      allow_failure: false
-  needs:
+#  needs:
-    - job: build_production
+#    - job: build_production
-      artifacts: false
+#      artifacts: false
-  script: |
+#  script: |
-    set -e
+#    set -e
-    echo "✅ Running migrations (production) ..."
+#    cd /opt/deploy/lti
+#    test -f .env || (echo "❌ .env not found" && exit 1)
 
-    cd "$DEPLOY_DIR"
+#   set -a
-    test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
+#    . ./.env
-    test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
+#    set +a
 
-    set -a
+    # Validasi env wajib
-    . ./.env
+#    : "${DB_HOST:?DB_HOST not set}"
-    set +a
+#    : "${DB_PORT:?DB_PORT not set}"
+#    : "${DB_USER:?DB_USER not set}"
+#    : "${DB_PASSWORD:?DB_PASSWORD not set}"
+#    : "${DB_NAME:?DB_NAME not set}"
 
-    test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
+#    DB_SSLMODE="${DB_SSLMODE:-require}"
-    test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
+#    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE}"
-    test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
-    test -n "$DB_PASSWORD" || (echo "❌ DB_PASSWORD empty" && exit 1)
-    test -n "$DB_NAME" || (echo "❌ DB_NAME empty" && exit 1)
 
-    export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
+#   echo "✅ Running migrations (production)..."
-    echo "✅ DATABASE_URL=$DATABASE_URL"
+#    docker run --rm \
+#      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
+#      migrate/migrate:v4.15.2 \
+#      -path=/migrations -database "$DATABASE_URL" up
 
-    # NOTE: pastikan nama servicenya benar untuk production (ini sebelumnya masih stg-*)
-    docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
-
-    COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
-    NETWORK_NAME="$(docker network ls --format '{{.Name}}' | grep "_${COMPOSE_NETWORK_KEY}$" | head -n 1)"
-    test -n "$NETWORK_NAME" || (echo "❌ Cannot find docker network for compose ($COMPOSE_NETWORK_KEY)" && exit 1)
-
-    echo "✅ Checking migrations from repo..."
-    ls -lah "$CI_PROJECT_DIR/internal/database/migrations"
-
-    echo "✅ Running migrations via migrate/migrate container"
-    set +e
-    out=$(docker run --rm \
-      --network "$NETWORK_NAME" \
-      -v "$CI_PROJECT_DIR/internal/database/migrations:/migrations:ro" \
-      migrate/migrate:v4.15.2 \
-      -path=/migrations -database "$DATABASE_URL" up 2>&1)
-    code=$?
-    set -e
-
-    echo "$out"
-
-    if echo "$out" | grep -qi "no change"; then
-      echo "✅ No change (already up to date)"
-      exit 0
-    fi
-
-    if [ $code -ne 0 ]; then
-      echo "❌ Migration failed with exit code $code"
-      exit $code
-    fi
-
-    echo "✅ Migration applied successfully"
 
 # =========================
 # DEPLOY (AUTO)
@@ -116,10 +92,10 @@ migrate_production:
 deploy_production:
   stage: deploy
   rules:
-    - if: '$CI_COMMIT_BRANCH == "production"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-      when: on_success
-    - when: never
   needs:
+#    - job: migrate_production
+#      artifacts: false
     - job: build_production
       artifacts: false
   script: |
@@ -135,6 +111,7 @@ deploy_production:
     docker compose -f "$COMPOSE_FILE" up -d --force-recreate
     docker image prune -f
 
+
 # =========================
 # SEED (MANUAL)
 # =========================
@@ -143,10 +120,9 @@ seed_production:
   rules:
     - if: '$CI_COMMIT_BRANCH == "production"'
       when: manual
-    - when: never
   script: |
     set -e
-    cd "$DEPLOY_DIR"
+    cd /opt/deploy/lti
     test -f .env || (echo "❌ .env not found" && exit 1)
 
     echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"

ci/staging.yml

@@ -8,6 +8,12 @@ default:
   tags:
     - self-hosted-stg
 
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
+      when: always
+    - when: never
+
 variables:
   DOCKER_BUILDKIT: "1"
 
@@ -24,9 +30,7 @@ variables:
 build_staging:
   stage: build
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
   script: |
     set -e
     docker info
@@ -43,15 +47,14 @@ build_staging:
     docker tag "$IMAGE_NAME" "$IMAGE_LATEST"
     docker push "$IMAGE_LATEST"
 
+
 # =========================
 # MIGRATE (AUTO)
 # =========================
 migrate_staging:
   stage: migrate
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
   needs:
     - job: build_staging
       artifacts: false
@@ -63,10 +66,12 @@ migrate_staging:
     test -f "$COMPOSE_FILE" || (echo "❌ $COMPOSE_FILE not found in $DEPLOY_DIR" && exit 1)
     test -f .env || (echo "❌ .env not found in $DEPLOY_DIR" && exit 1)
 
+    # ✅ load env dari server
     set -a
     . ./.env
     set +a
 
+    # ✅ validasi
     test -n "$DB_HOST" || (echo "❌ DB_HOST empty" && exit 1)
     test -n "$DB_PORT" || (echo "❌ DB_PORT empty" && exit 1)
     test -n "$DB_USER" || (echo "❌ DB_USER empty" && exit 1)
@@ -76,17 +81,21 @@ migrate_staging:
     export DATABASE_URL="postgres://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}?sslmode=${DB_SSLMODE:-disable}"
     echo "✅ DATABASE_URL=$DATABASE_URL"
 
+    # ✅ Pastikan postgres & redis ON (sesuaikan nama service compose kamu!)
     echo "✅ Ensuring postgres & redis running ..."
     docker compose -f "$COMPOSE_FILE" up -d stg-postgres-lti stg-redis-lti || true
 
+    # ✅ Ambil network key dari compose
     COMPOSE_NETWORK_KEY="$(docker compose -f "$COMPOSE_FILE" config | awk '/networks:/ {getline; print $1}' | tr -d ':')"
     echo "✅ Compose network key: $COMPOSE_NETWORK_KEY"
 
+    # ✅ Cari network name yang dipakai docker
     NETWORK_NAME="$(docker network ls --format '{{.Name}}' | grep "_${COMPOSE_NETWORK_KEY}$" | head -n 1)"
     test -n "$NETWORK_NAME" || (echo "❌ Cannot find docker network for compose ($COMPOSE_NETWORK_KEY)" && exit 1)
 
     echo "✅ Docker network detected: $NETWORK_NAME"
 
+    # ✅ Migrations dari repo (CI workspace)
     echo "✅ Checking migrations from repo..."
     ls -lah "$CI_PROJECT_DIR/internal/database/migrations"
 
@@ -102,6 +111,7 @@ migrate_staging:
 
     echo "$out"
 
+    # ✅ Handle no change dengan benar (tidak false-success)
     if echo "$out" | grep -qi "no change"; then
       echo "✅ No change (already up to date)"
       exit 0
@@ -114,15 +124,14 @@ migrate_staging:
 
     echo "✅ Migration applied successfully"
 
+
 # =========================
 # DEPLOY (AUTO)
 # =========================
 deploy_staging:
   stage: deploy
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: on_success
-    - when: never
   needs:
     - job: migrate_staging
       artifacts: false
@@ -141,18 +150,18 @@ deploy_staging:
     docker compose -f "$COMPOSE_FILE" up -d --force-recreate
     docker image prune -f
 
+
 # =========================
 # SEED (MANUAL)
 # =========================
 seed_staging:
   stage: seed
   rules:
-    - if: '$CI_COMMIT_BRANCH == "staging"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "staging"'
-      when: manual
-    - when: never
   needs:
     - job: deploy_staging
       artifacts: false
+  when: manual
   allow_failure: false
   script: |
     set -e
@@ -161,4 +170,4 @@ seed_staging:
     test -f .env || (echo "❌ .env not found" && exit 1)
 
     docker compose -f "$COMPOSE_FILE" pull seed || true
-    docker compose -f "$COMPOSE_FILE" run --rm seed
+    docker compose -f "$COMPOSE_FILE" run --rm seed%

cmd/api/main.go

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

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

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

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

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

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

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

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

@@ -147,7 +147,6 @@ type StockReleaseRequest struct {
 	Reason    *string
 	Tx        *gorm.DB
 }
-
 func (s *fifoService) AdjustStockableQuantity(ctx context.Context, req StockAdjustRequest) error {
 	if req.StockableID == 0 || strings.TrimSpace(req.StockableKey.String()) == "" {
 		return errors.New("stockable key and id are required")
@@ -309,7 +308,7 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St
 			}
 
 			if reductionTarget > 0 {
-				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget, productWarehouseID)
+				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget)
 				if err != nil {
 					return err
 				}
@@ -356,7 +355,7 @@ func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest)
 		}
 		var usageDelta, pendingDelta float64
 		if ctxRow.UsageQty > 0 {
-			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty, ctxRow.ProductWarehouseID); err != nil {
+			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty); err != nil {
 				return err
 			}
 			usageDelta -= ctxRow.UsageQty
@@ -722,7 +721,6 @@ func (s *fifoService) releaseUsagePortion(
 	usableKey fifo.UsableKey,
 	usableID uint,
 	target float64,
-	expectedWarehouseID uint,
 ) (float64, error) {
 	if target <= 0 {
 		return 0, nil
@@ -738,18 +736,6 @@ func (s *fifoService) releaseUsagePortion(
 	if len(allocations) == 0 {
 		return 0, nil
 	}
-	for i := range allocations {
-		alloc := &allocations[i]
-		if expectedWarehouseID == 0 || alloc.ProductWarehouseId == expectedWarehouseID {
-			continue
-		}
-		if err := tx.Model(&entities.StockAllocation{}).
-			Where("id = ?", alloc.Id).
-			Update("product_warehouse_id", expectedWarehouseID).Error; err != nil {
-			return 0, err
-		}
-		alloc.ProductWarehouseId = expectedWarehouseID
-	}
 
 	var (
 		remaining            = target
@@ -846,80 +832,41 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 			cfg.Columns.CreatedAt,
 		)
 
-		if cfg.Columns.CreatedAt == cfg.Columns.ID {
+		var rows []struct {
-			var rows []struct {
+			ID        uint
-				ID        uint
+			Pending   float64
-				Pending   float64
+			CreatedAt time.Time
-				CreatedAt int64
+		}
-			}
 
-			query := tx.Table(cfg.Table).
+		query := tx.Table(cfg.Table).
-				Select(selectStmt).
+			Select(selectStmt).
-				Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
+			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
-				Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
+			Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
-				Limit(s.pendingBatchPerUsable)
+			Limit(s.pendingBatchPerUsable)
 
-			if cfg.Scope != nil {
+		if cfg.Scope != nil {
-				query = cfg.Scope(query)
+			query = cfg.Scope(query)
-			}
+		}
 
-			for _, order := range s.orderClauses(cfg.OrderBy) {
+		for _, order := range s.orderClauses(cfg.OrderBy) {
-				query = query.Order(order)
+			query = query.Order(order)
-			}
+		}
 
-			if err := query.Find(&rows).Error; err != nil {
+		if err := query.Find(&rows).Error; err != nil {
-				return nil, err
+			return nil, err
-			}
+		}
 
-			for _, row := range rows {
+		for _, row := range rows {
-				if row.Pending <= 0 {
+			if row.Pending <= 0 {
-					continue
+				continue
-				}
-				candidates = append(candidates, pendingCandidate{
-					UsableKey: key,
-					Config:    cfg,
-					UsableID:  row.ID,
-					Pending:   row.Pending,
-					CreatedAt: time.Unix(0, row.CreatedAt),
-				})
-			}
-		} else {
-			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)
-
-			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,
-				})
 			}
+			candidates = append(candidates, pendingCandidate{
+				UsableKey: key,
+				Config:    cfg,
+				UsableID:  row.ID,
+				Pending:   row.Pending,
+				CreatedAt: row.CreatedAt,
+			})
 		}
 	}
 

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

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

internal/config/config.go

@@ -61,7 +61,6 @@ var (
 	SSOCookieDomain         string
 	SSOCookieSecure         bool
 	SSOCookieSameSite       string
-	SSOAccessTokenMaxBytes  int
 	SSOTokenBlacklistPrefix string
 	SSOPKCETTL              time.Duration
 	SSOUserSyncDrift        time.Duration
@@ -74,7 +73,6 @@ var (
 	S3SecretKey             string
 	S3ForcePathStyle        bool
 	S3PublicBaseURL         string
-	S3EnvPrefix             string
 	S3DocumentKeyPrefix     string
 )
 
@@ -125,12 +123,7 @@ func init() {
 	S3SecretKey = strings.TrimSpace(viper.GetString("S3_SECRET_KEY"))
 	S3ForcePathStyle = viper.GetBool("S3_FORCE_PATH_STYLE")
 	S3PublicBaseURL = strings.TrimSuffix(strings.TrimSpace(viper.GetString("S3_PUBLIC_BASE_URL")), "/")
-	S3EnvPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_ENV_PREFIX")), "/"), "local")
+	S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
-	docPrefix := strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/")
-	if docPrefix == "" {
-		docPrefix = "docs"
-	}
-	S3DocumentKeyPrefix = joinPath(S3EnvPrefix, docPrefix)
 
 	// SSO integration
 	SSOIssuer = viper.GetString("SSO_ISSUER")
@@ -145,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
@@ -253,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/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/entities/adjustment_stock.go

@@ -4,6 +4,7 @@ import "time"
 
 type AdjustmentStock struct {
 	Id                 uint      `gorm:"primaryKey"`
+	StockLogId         uint      `gorm:"column:stock_log_id;not null;index"`
 	ProductWarehouseId uint      `gorm:"column:product_warehouse_id;not null"`
 	TotalQty           float64   `gorm:"column:total_qty;default:0"`
 	TotalUsed          float64   `gorm:"column:total_used;default:0"`
@@ -11,8 +12,7 @@ type AdjustmentStock struct {
 	PendingQty         float64   `gorm:"column:pending_qty;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"`
 
+	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/marketing.go

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

internal/entities/marketing_product.go

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

internal/entities/projectflock.go

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

internal/entities/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/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 {
+			} else if profile != nil {
-				profile = p
+				roles = profile.Roles
-			}
+				for _, perm := range profile.PermissionNames() {
-		}
+					if perm != "" {
-		if profile != nil {
+						permissions[perm] = struct{}{}
-			roles = profile.Roles
+					}
-			for _, perm := range profile.PermissionNames() {
-				if perm != "" {
-					permissions[perm] = struct{}{}
 				}
 			}
 		}
@@ -94,16 +86,6 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 			User:         user,
 			Roles:        roles,
 			Permissions:  permissions,
-			UserAreaIDs:     nil,
-			UserLocationIDs: nil,
-			UserAllArea:     false,
-			UserAllLocation: false,
-		}
-		if profile != nil {
-			ctx.UserAreaIDs = profile.AreaIDs
-			ctx.UserLocationIDs = profile.LocationIDs
-			ctx.UserAllArea = profile.AllArea
-			ctx.UserAllLocation = profile.AllLocation
 		}
 
 		c.Locals(authContextLocalsKey, ctx)

internal/middleware/role_scope.go

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

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

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

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

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

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

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

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

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

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

@@ -196,11 +196,7 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 		}
 
 		for idx, item := range group.Items {
-			refKey := strings.TrimSpace(item.NoReferensi)
+			productKey := strings.ToUpper(flagKey + "|" + item.ProductName)
-			productKey := strings.ToUpper(flagKey + "|" + item.ProductName + "|" + refKey)
-			if refKey == "" {
-				productKey = strings.ToUpper(flagKey + "|" + item.ProductName + "|" + formatDate(item.Tanggal))
-			}
 			baseRow := SapronakCategoryRowDTO{
 				ID:              idx + 1,
 				Date:            formatDate(item.Tanggal),
@@ -216,9 +212,6 @@ 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
@@ -234,14 +227,14 @@ func ToSapronakProjectAggregatedFromReport(report *SapronakReportDTO, flag strin
 						row.Notes = "TRANSFER STOCK"
 					}
 				}
-			case "pemakaian":
+			case "pemakaian", "adjustment keluar":
 				price := row.UnitPrice
 				if price == 0 {
 					price = item.Harga
 				}
 				row.QtyUsed += item.QtyKeluar
 				row.TotalAmount += item.QtyKeluar * price
-			case "adjustment keluar", "mutasi keluar", "penjualan":
+			case "mutasi keluar", "penjualan":
 				price := row.UnitPrice
 				if price == 0 {
 					price = item.Harga

internal/modules/closings/module.go

@@ -25,6 +25,7 @@ type ClosingModule struct{}
 
 func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	closingRepo := rClosing.NewClosingRepository(db)
+	closingKeuanganRepo := rClosing.NewClosingKeuanganRepository(db)
 	userRepo := rUser.NewUserRepository(db)
 	projectFlockRepo := rProjectFlock.NewProjectflockRepository(db)
 	projectFlockKandangRepo := rProjectFlock.NewProjectFlockKandangRepository(db)
@@ -39,11 +40,9 @@ 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)
+	closingKeuanganService := sClosing.NewClosingKeuanganService(closingKeuanganRepo, projectFlockRepo, projectFlockKandangRepo, marketingDeliveryProductRepo, expenseRealizationRepo, projectBudgetRepo, chickinRepo, recordingRepo)
 	sapronakService := sClosing.NewSapronakService(closingRepo, projectFlockKandangRepo, validate)
 	userService := sUser.NewUserService(userRepo, validate)
 

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

@@ -24,6 +24,7 @@ type ClosingRepository interface {
 	SumMarketingWeightAndQtyByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, float64, error)
 	SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error)
 	SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error)
+	GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error)
 	GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error)
 	FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error)
 	FetchSapronakIncomingDetails(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error)
@@ -31,11 +32,9 @@ type ClosingRepository interface {
 	FetchSapronakUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakChickinUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error)
 	FetchSapronakChickinUsageDetails(ctx context.Context, pfkID uint) (map[uint][]SapronakDetailRow, error)
-	FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
 	FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error)
-	FetchSapronakSales(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakSales(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error)
-	FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error)
 	GetProductsWithFlagsByIDs(ctx context.Context, productIDs []uint) ([]entity.Product, error)
 }
 
@@ -101,12 +100,12 @@ func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params Sapronak
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakRow{}, 0, nil
 		}
-		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
-			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
+			unionParts = append(unionParts, sapronakOutgoingTransfersSQL)
-			args = append(args, params.WarehouseIDs, params.WarehouseIDs)
+			args = append(args, params.WarehouseIDs)
 		}
 		if len(params.ProjectFlockKandangIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingMarketingsSQL)
@@ -173,12 +172,12 @@ func (r *ClosingRepositoryImpl) GetSapronakSummary(ctx context.Context, params S
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakSummaryRow{}, nil
 		}
-		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
-			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
+			unionParts = append(unionParts, sapronakOutgoingTransfersSQL)
-			args = append(args, params.WarehouseIDs, params.WarehouseIDs)
+			args = append(args, params.WarehouseIDs)
 		}
 		if len(params.ProjectFlockKandangIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingMarketingsSQL)
@@ -355,10 +354,9 @@ func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDs
 		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
-		Joins("JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
 		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name IN ?", flagNames).
-		Select("COALESCE(SUM(mdp.total_weight), 0) AS total_weight, COALESCE(SUM(mdp.usage_qty), 0) AS total_qty, COALESCE(SUM(mdp.total_price), 0) AS total_price").
+		Select("COALESCE(SUM(mp.total_weight), 0) AS total_weight, COALESCE(SUM(mp.qty), 0) AS total_qty, COALESCE(SUM(mp.total_price), 0) AS total_price").
 		Scan(&agg).Error
 	if err != nil {
 		return 0, 0, 0, err
@@ -392,6 +390,22 @@ func (r *ClosingRepositoryImpl) SumRecordingEggQtyByProjectFlockKandangIDsAndFla
 	return agg.TotalQty, nil
 }
 
+func (r *ClosingRepositoryImpl) GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error) {
+	if fcrID == 0 {
+		return []entity.FcrStandard{}, nil
+	}
+
+	var standards []entity.FcrStandard
+	if err := r.DB().WithContext(ctx).
+		Where("fcr_id = ?", fcrID).
+		Order("weight ASC").
+		Find(&standards).Error; err != nil {
+		return nil, err
+	}
+
+	return standards, nil
+}
+
 func (r *ClosingRepositoryImpl) GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error) {
 	db := r.DB().WithContext(ctx)
 
@@ -439,7 +453,7 @@ SELECT
 	COALESCE(pi.received_date, '1970-01-01') AS sort_date,
 	COALESCE(TO_CHAR(pi.received_date, 'DD-Mon-YYYY'), '') AS date_text,
 	COALESCE(p.po_number, '') AS reference_number,
-	'Pembelian' AS transaction_type,
+	'Purchase' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -488,7 +502,7 @@ SELECT
 	st.transfer_date AS sort_date,
 	TO_CHAR(st.transfer_date, 'DD-Mon-YYYY') AS date_text,
 	st.movement_number AS reference_number,
-	'Mutasi' AS transaction_type,
+	'Internal Transfer In' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -522,7 +536,7 @@ SELECT
 	std.usage_qty AS quantity,
 	u.id AS unit_id,
 	u.name AS unit,
-	st.reason AS notes
+	'Stock Refill' AS notes
 FROM stock_transfer_details std
 JOIN stock_transfers st ON st.id = std.stock_transfer_id
 LEFT JOIN warehouses fw ON fw.id = st.from_warehouse_id
@@ -532,63 +546,13 @@ JOIN uoms u ON u.id = prod.uom_id
 WHERE st.to_warehouse_id IN ?
 `
 
-	sapronakIncomingAdjustmentsSQL = `
-SELECT
-	CAST(ast.id AS BIGINT) AS id,
-	ast.created_at AS sort_date,
-	COALESCE(TO_CHAR(ast.created_at, 'DD-Mon-YYYY'), '') AS date_text,
-	COALESCE(ast.adj_number, '') AS reference_number,
-	'Adjustment stock' AS transaction_type,
-	prod.name AS product_name,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_category,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_sub_category,
-	'-' AS source_warehouse,
-	COALESCE(w.name, '')  AS destination_warehouse,
-	'' AS destination,
-	COALESCE(ast.total_qty, 0) AS quantity,
-	u.id AS unit_id,
-	u.name AS unit,
-	'-' AS notes
-FROM adjustment_stocks ast
-JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id
-JOIN warehouses w ON w.id = pw.warehouse_id
-JOIN products prod ON prod.id = pw.product_id
-JOIN uoms u ON u.id = prod.uom_id
-WHERE pw.warehouse_id IN ?
-	AND COALESCE(ast.total_qty, 0) <> 0
-`
-
 	sapronakOutgoingTransfersSQL = `
 SELECT
 	CAST(st.id AS BIGINT) AS id,
 	st.transfer_date AS sort_date,
 	TO_CHAR(st.transfer_date, 'DD-Mon-YYYY') AS date_text,
 	st.movement_number AS reference_number,
-	'Mutasi' AS transaction_type,
+	'Internal Transfer Out' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -622,7 +586,7 @@ SELECT
 	std.usage_qty AS quantity,
 	u.id AS unit_id,
 	u.name AS unit,
-	st.reason AS notes
+	'Transfer to other unit' AS notes
 FROM stock_transfer_details std
 JOIN stock_transfers st ON st.id = std.stock_transfer_id
 LEFT JOIN warehouses fw ON fw.id = st.from_warehouse_id
@@ -632,70 +596,13 @@ JOIN uoms u ON u.id = prod.uom_id
 WHERE st.from_warehouse_id IN ?
 `
 
-	sapronakOutgoingAdjustmentsSQL = `
-SELECT
-	CAST(ast.id AS BIGINT) AS id,
-	ast.created_at AS sort_date,
-	COALESCE(TO_CHAR(ast.created_at, 'DD-Mon-YYYY'), '') AS date_text,
-	COALESCE(ast.adj_number, '') AS reference_number,
-	'Adjustment stock' AS transaction_type,
-	prod.name AS product_name,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_category,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_sub_category,
-	COALESCE(w.name, '') AS source_warehouse,
-	'-' AS destination_warehouse,
-	'' AS destination,
-	COALESCE(ast.usage_qty, 0) AS quantity,
-	u.id AS unit_id,
-	u.name AS unit,
-	'-' AS notes
-FROM adjustment_stocks ast
-JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id
-JOIN warehouses w ON w.id = pw.warehouse_id
-JOIN products prod ON prod.id = pw.product_id
-JOIN uoms u ON u.id = prod.uom_id
-WHERE pw.warehouse_id IN ?
-	AND COALESCE(ast.usage_qty, 0) <> 0
-	AND EXISTS (
-		SELECT 1
-		FROM flags f
-		WHERE f.flagable_id = pw.product_id
-			AND f.flagable_type = 'products'
-			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET', 'AYAM-AFKIR', 'AYAM-MATI', 'AYAM-CULLING', 'TELUR-UTUH', 'TELUR-PECAH', 'TELUR-PUTIH', 'TELUR-RETAK')
-	)
-`
-
 	sapronakOutgoingMarketingsSQL = `
 SELECT
 	CAST(mp.id AS BIGINT) AS id,
 	m.so_date AS sort_date,
 	TO_CHAR(m.so_date, 'DD-Mon-YYYY') AS date_text,
 	m.so_number AS reference_number,
-	'Penjualan' AS transaction_type,
+	'Trading Sales' AS transaction_type,
 	prod.name AS product_name,
 	COALESCE((
 		SELECT string_agg(
@@ -743,7 +650,7 @@ WHERE pw.project_flock_kandang_id IN ?
 		FROM flags f
 		WHERE f.flagable_id = pw.product_id
 			AND f.flagable_type = 'products'
-			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET', 'AYAM-AFKIR', 'AYAM-MATI', 'AYAM-CULLING', 'TELUR-UTUH', 'TELUR-PECAH', 'TELUR-PUTIH', 'TELUR-RETAK')
+			AND UPPER(f.name) NOT IN ('DOC', 'LAYER', 'PULLET')
 	)
 `
 )
@@ -801,23 +708,6 @@ var (
 	sapronakFlagsChickin = sapronakFlags(utils.FlagDOC, utils.FlagPullet)
 )
 
-func (r *ClosingRepositoryImpl) joinSapronakProductFlag(db *gorm.DB, productAlias string) *gorm.DB {
-	subquery := r.DB().
-		Table("flags").
-		Select("DISTINCT ON (flagable_id) flagable_id, name").
-		Where("flagable_type = ?", entity.FlagableTypeProduct).
-		Where("name IN ?", sapronakFlagsAll).
-		Order(fmt.Sprintf(
-			"flagable_id, CASE WHEN name = '%s' THEN 1 WHEN name = '%s' THEN 2 WHEN name = '%s' THEN 3 WHEN name = '%s' THEN 4 ELSE 5 END",
-			utils.FlagDOC,
-			utils.FlagPullet,
-			utils.FlagPakan,
-			utils.FlagOVK,
-		))
-
-	return db.Joins("JOIN (?) f ON f.flagable_id = "+productAlias+".id", subquery)
-}
-
 func groupSapronakDetails(rows []SapronakDetailRow) map[uint][]SapronakDetailRow {
 	m := make(map[uint][]SapronakDetailRow)
 	for _, row := range rows {
@@ -854,12 +744,11 @@ func (r *ClosingRepositoryImpl) usageQuery(
 		COALESCE(p.product_price, 0) AS default_price
 	`)
 	db = applyJoins(db, joins...)
-	db = db.
+	return db.
 		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
 		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where(where, args...)
-	db = r.joinSapronakProductFlag(db, "p")
-	return db
 }
 
 func (r *ClosingRepositoryImpl) fetchSapronakUsage(
@@ -889,11 +778,11 @@ func (r *ClosingRepositoryImpl) detailQuery(
 ) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table(table).
-		Joins("JOIN product_warehouses pw ON " + pwJoinCond).
+		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
-		Joins("JOIN products p ON p.id = pw.product_id")
+		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct)
 
 	db = applyJoins(db, joins...)
-	db = r.joinSapronakProductFlag(db, "p")
 	return db.Select(selectSQL).Where(where, args...)
 }
 
@@ -983,84 +872,16 @@ func (r *ClosingRepositoryImpl) FetchSapronakChickinUsageDetails(ctx context.Con
 	)
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
-	if projectFlockKandangID == 0 {
-		return map[uint][]SapronakDetailRow{}, nil
-	}
-
-	query := r.withCtx(ctx).
-		Table("stock_allocations AS sa").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			COALESCE(
-				pi.received_date,
-				st.transfer_date,
-				lt.transfer_date,
-				ast.created_at,
-				pc.chick_in_date,
-				r.record_datetime
-			) AS date,
-			COALESCE(
-				po.po_number,
-				st.movement_number,
-				lt.transfer_number,
-				CONCAT('ADJ-', ast.id),
-				CONCAT('CHICKIN-', pc.id),
-				CAST(r.id AS TEXT),
-				''
-			) AS reference,
-			0 AS qty_in,
-			COALESCE(SUM(sa.qty), 0) AS qty_out,
-			COALESCE(pi.price, p.product_price, 0) AS price
-		`).
-		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN recording_stocks rs ON rs.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyRecordingStock.String()).
-		Joins("LEFT JOIN recordings r ON r.id = rs.recording_id").
-		Joins("LEFT JOIN project_chickins pc_used ON pc_used.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyProjectChickin.String()).
-		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
-		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
-		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
-		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
-		Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
-		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Where(`
-			(sa.usable_type = ? AND r.project_flock_kandangs_id = ?)
-			OR
-			(sa.usable_type = ? AND pc_used.project_flock_kandang_id = ?)
-		`,
-			fifo.UsableKeyRecordingStock.String(), projectFlockKandangID,
-			fifo.UsableKeyProjectChickin.String(), projectFlockKandangID,
-		)
-	query = r.joinSapronakProductFlag(query, "p").
-		Group(`
-			pw.product_id, p.name, f.name,
-			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at, pc.chick_in_date, r.record_datetime,
-			po.po_number, st.movement_number, lt.transfer_number, ast.id, pc.id, r.id,
-			pi.price, p.product_price
-		`)
-
-	return scanAndGroupDetails(query)
-}
-
 func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandangID uint) *gorm.DB {
-	db := r.withCtx(ctx).
+	return r.withCtx(ctx).
 		Table("purchase_items AS pi").
 		Joins("JOIN purchases po ON po.id = pi.purchase_id AND po.deleted_at IS NULL").
 		Joins("JOIN products p ON p.id = pi.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("JOIN warehouses w ON w.id = pi.warehouse_id").
 		Where("w.kandang_id = ?", kandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where("pi.received_date IS NOT NULL")
-	return r.joinSapronakProductFlag(db, "p")
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error) {
@@ -1127,14 +948,14 @@ func (r *ClosingRepositoryImpl) fetchStockLogs(ctx context.Context, kandangID ui
 			COALESCE(sl.increase,0) AS increase,
 			COALESCE(sl.decrease,0) AS decrease,
 			COALESCE(p.product_price,0) AS price,
-			` + movementSelect + `
+			`+movementSelect+`
 		`).
 		Joins("JOIN product_warehouses pw ON pw.id = sl.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id")
 
 	db = applyJoins(db, joins...)
-	db = r.joinSapronakProductFlag(db, "p")
 
 	if err := db.
 		Where("sl.loggable_type = ?", logType).
@@ -1177,75 +998,12 @@ func splitStockLogs(rows []stockLogSapronakRow, refFn func(stockLogSapronakRow)
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakAdjustments(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
-	poByWarehouse := r.DB().
+	rows, err := r.fetchStockLogs(ctx, kandangID, string(utils.StockLogTypeAdjustment), false)
-		Table("purchase_items pi").
-		Select("DISTINCT ON (pi.product_warehouse_id) pi.product_warehouse_id, po.po_number, pi.received_date").
-		Joins("JOIN purchases po ON po.id = pi.purchase_id").
-		Where("pi.received_date IS NOT NULL").
-		Order("pi.product_warehouse_id, pi.received_date ASC")
-
-	incomingQuery := r.withCtx(ctx).
-		Table("adjustment_stocks AS ast").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			ast.created_at AS date,
-			CONCAT('ADJ-', ast.id) AS reference,
-			COALESCE(ast.total_qty, 0) AS qty_in,
-			0 AS qty_out,
-			COALESCE(p.product_price, 0) AS price
-		`).
-		Joins("JOIN product_warehouses pw ON pw.id = ast.product_warehouse_id").
-		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Where("w.kandang_id = ?", kandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Where("COALESCE(ast.total_qty, 0) > 0")
-	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
-	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
 	}
-
+	in, out := splitStockLogs(rows, func(row stockLogSapronakRow) string { return fmt.Sprintf("ADJ-%d", row.ID) })
-	outgoingQuery := r.withCtx(ctx).
+	return in, out, nil
-		Table("stock_allocations AS sa").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			COALESCE(pi.received_date, st.transfer_date, lt.transfer_date, pfp_po.received_date, pc.chick_in_date, ast_in.created_at, ast.created_at) AS date,
-			COALESCE(po.po_number, st.movement_number, lt.transfer_number, pfp_po.po_number, CONCAT('CHICKIN-', pc.id), CONCAT('ADJ-', ast_in.id), CONCAT('ADJ-', ast.id)) AS reference,
-			0 AS qty_in,
-			COALESCE(SUM(sa.qty), 0) AS qty_out,
-			COALESCE(p.product_price, 0) AS price
-		`).
-		Joins("JOIN adjustment_stocks ast ON ast.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyAdjustmentOut.String()).
-		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
-		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
-		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
-		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
-		Joins("LEFT JOIN adjustment_stocks ast_in ON ast_in.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
-		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
-		Joins("LEFT JOIN (?) pfp_po ON pfp_po.product_warehouse_id = pfp.product_warehouse_id", poByWarehouse).
-		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
-		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("w.kandang_id = ?", kandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Where("f.name NOT IN ?", sapronakFlags(utils.FlagDOC, utils.FlagPullet)).
-		Group("pw.product_id, p.name, f.name, pi.received_date, st.transfer_date, lt.transfer_date, pfp_po.received_date, pc.chick_in_date, ast_in.created_at, ast.created_at, po.po_number, st.movement_number, lt.transfer_number, pfp_po.po_number, pc.id, ast_in.id, ast.id, p.product_price")
-	outgoingQuery = r.joinSapronakProductFlag(outgoingQuery, "p")
-	outgoing, err := scanAndGroupDetails(outgoingQuery)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return incoming, outgoing, nil
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, map[uint][]SapronakDetailRow, error) {
@@ -1266,10 +1024,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("JOIN product_warehouses pw ON pw.id = std.dest_product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = std.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(fw.kandang_id IS NULL OR fw.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll)
-	incomingQuery = r.joinSapronakProductFlag(incomingQuery, "p")
 	incoming, err := scanAndGroupDetails(incomingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1294,10 +1052,10 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("JOIN product_warehouses pw ON pw.id = ltt.product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_source.kandang_id IS NULL OR w_source.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll)
-	incomingLayingQuery = r.joinSapronakProductFlag(incomingLayingQuery, "p")
 	incomingLaying, err := scanAndGroupDetails(incomingLayingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1325,12 +1083,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("LEFT JOIN product_warehouses pw_dest ON pw_dest.id = std.dest_product_warehouse_id").
 		Joins("LEFT JOIN warehouses w_dest ON w_dest.id = pw_dest.warehouse_id").
 		Joins("JOIN products p ON p.id = std.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_dest.kandang_id IS NULL OR w_dest.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("std.id, std.product_id, p.name, f.name, st.transfer_date, st.movement_number, p.product_price")
-	outgoingQuery = r.joinSapronakProductFlag(outgoingQuery, "p")
 	outgoing, err := scanAndGroupDetails(outgoingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1356,12 +1114,12 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
 		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("w.kandang_id = ?", kandangID).
 		Where("(w_dest.kandang_id IS NULL OR w_dest.kandang_id <> w.kandang_id)").
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("lts.id, pw.product_id, p.name, f.name, lt.transfer_date, lt.transfer_number, p.product_price")
-	outgoingLayingQuery = r.joinSapronakProductFlag(outgoingLayingQuery, "p")
 	outgoingLaying, err := scanAndGroupDetails(outgoingLayingQuery)
 	if err != nil {
 		return nil, nil, err
@@ -1373,7 +1131,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 	return incoming, outgoing, nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error) {
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
@@ -1390,107 +1148,14 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
 		Joins("JOIN marketings m ON m.id = mp.marketing_id").
 		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
+		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
+		Where("w.kandang_id = ?", kandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
 
-	query = r.joinSapronakProductFlag(query, "p")
-	sales, err := scanAndGroupDetails(query)
-	if err != nil {
-		return nil, err
-	}
-
-	nonFifoQuery := r.withCtx(ctx).
-		Table("marketing_delivery_products AS mdp").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			COALESCE(mdp.delivery_date, mdp.created_at) AS date,
-			COALESCE(m.so_number, '') AS reference,
-			0 AS qty_in,
-			COALESCE(mdp.usage_qty, 0) AS qty_out,
-			COALESCE(mdp.unit_price, mp.unit_price, 0) AS price
-		`).
-		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
-		Joins("JOIN marketings m ON m.id = mp.marketing_id").
-		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN stock_allocations sa ON sa.usable_id = mdp.id AND sa.usable_type = ? AND sa.status = ?",
-			fifo.UsableKeyMarketingDelivery.String(),
-			entity.StockAllocationStatusActive,
-		).
-		Where("mdp.usage_qty > 0").
-		Where("sa.id IS NULL").
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
-
-	nonFifoQuery = r.joinSapronakProductFlag(nonFifoQuery, "p")
-	nonFifoSales, err := scanAndGroupDetails(nonFifoQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	for pid, rows := range nonFifoSales {
-		sales[pid] = append(sales[pid], rows...)
-	}
-
-	return sales, nil
-}
-
-func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.Context, projectFlockKandangID uint) (map[uint][]SapronakDetailRow, error) {
-	if projectFlockKandangID == 0 {
-		return map[uint][]SapronakDetailRow{}, nil
-	}
-
-	query := r.withCtx(ctx).
-		Table("stock_allocations AS sa").
-		Select(`
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			COALESCE(
-				pi.received_date,
-				st.transfer_date,
-				lt.transfer_date,
-				ast.created_at
-			) AS date,
-			COALESCE(
-				po.po_number,
-				st.movement_number,
-				lt.transfer_number,
-				CONCAT('ADJ-', ast.id),
-				''
-			) AS reference,
-			0 AS qty_in,
-			COALESCE(SUM(sa.qty), 0) AS qty_out,
-			COALESCE(pi.price, p.product_price, 0) AS price
-		`).
-		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN marketing_delivery_products mdp ON mdp.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyMarketingDelivery.String()).
-		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
-		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
-		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
-		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
-		Joins("LEFT JOIN adjustment_stocks ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyAdjustmentIn.String()).
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
-		Where("f.name IN ?", sapronakFlagsAll).
-		Group(`
-			pw.product_id, p.name, f.name,
-			pi.received_date, st.transfer_date, lt.transfer_date, ast.created_at,
-			po.po_number, st.movement_number, lt.transfer_number, ast.id,
-			pi.price, p.product_price
-		`)
-
-	query = r.joinSapronakProductFlag(query, "p")
 	return scanAndGroupDetails(query)
 }
 

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

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

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

@@ -12,7 +12,6 @@ import (
 
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
@@ -99,11 +98,6 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 		return nil, 0, err
 	}
 
-	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
-	if err != nil {
-		return nil, 0, err
-	}
-
 	offset := (params.Page - 1) * params.Limit
 	statusFilter := ""
 	if params.ProjectStatus != nil {
@@ -117,12 +111,6 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 
 	closings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withClosingRelations(db)
-		if scope.Restrict {
-			if len(scope.IDs) == 0 {
-				return db.Where("1 = 0")
-			}
-			db = m.ApplyScopeFilter(db, scope, "project_flocks.location_id")
-		}
 		if params.LocationID != nil {
 			db = db.Where("location_id = ?", *params.LocationID)
 		}
@@ -162,10 +150,6 @@ func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.Cl
 }
 
 func (s closingService) GetProjectFlockByID(c *fiber.Ctx, id uint) (*entity.ProjectFlock, error) {
-	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), id); err != nil {
-		return nil, err
-	}
-
 	projectFlock, err := s.ProjectFlockRepo.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Project Flock not found")
@@ -177,13 +161,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 +174,8 @@ func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint, projectF
 }
 
 func (s closingService) GetClosingSummary(c *fiber.Ctx, projectFlockID uint, kandangID *uint) (any, error) {
-	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+	if projectFlockID == 0 {
-		return nil, err
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
 	if kandangID != nil {
@@ -282,7 +259,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 +321,8 @@ func (s closingService) getClosingSummaryByKandang(ctx context.Context, projectF
 }
 
 func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakItemDTO, int64, error) {
-	if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
+	if projectFlockID == 0 {
-		return nil, 0, err
+		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
 	}
 
 	if params == nil {
@@ -367,7 +344,15 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "type must be either incoming or outgoing")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
+	if _, err := s.Repository.GetByID(c.Context(), projectFlockID, nil); err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Project flock tidak ditemukan")
+		}
+		s.Log.Errorf("Failed get project flock %d for sapronak closing: %+v", projectFlockID, err)
+		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
+	}
+
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -451,7 +436,7 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
-	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID, params.KandangID)
+	warehouseIDs, err := s.getWarehouseIDsByProjectFlock(c.Context(), projectFlockID)
 	if err != nil {
 		s.Log.Errorf("Failed to fetch warehouses for project flock %d: %+v", projectFlockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch warehouses for project flock")
@@ -494,16 +479,13 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 	return items, nil
 }
 
-func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint, kandangID *uint) ([]uint, error) {
+func (s closingService) getWarehouseIDsByProjectFlock(ctx context.Context, projectFlockID uint) ([]uint, error) {
 	var kandangIDs []uint
 	db := s.Repository.DB().WithContext(ctx)
 
-	query := db.Model(&entity.ProjectFlockKandang{}).
+	if err := db.Model(&entity.ProjectFlockKandang{}).
-		Where("project_flock_id = ?", projectFlockID)
+		Where("project_flock_id = ?", projectFlockID).
-	if kandangID != nil && *kandangID > 0 {
+		Pluck("kandang_id", &kandangIDs).Error; err != nil {
-		query = query.Where("id = ?", *kandangID)
-	}
-	if err := query.Pluck("kandang_id", &kandangIDs).Error; err != nil {
 		return nil, err
 	}
 
@@ -555,7 +537,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 +580,6 @@ func (s closingService) getApprovalStatuses(ctx context.Context, projectFlockID
 }
 
 func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.OverheadListDTO, error) {
-	if projectFlockKandangID != nil {
-		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
-			return nil, err
-		}
-	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
-		return nil, err
-	}
-
 	budgets, err := s.ProjectBudgetRepo.GetByProjectFlockID(c.Context(), projectFlockID)
 	if err != nil {
 		return nil, err
@@ -694,12 +668,8 @@ func (s closingService) GetOverhead(c *fiber.Ctx, projectFlockID uint, projectFl
 }
 
 func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
-	if projectFlockKandangID != nil {
+	if projectFlockID == 0 {
-		if err := m.EnsureProjectFlockKandangAccess(c, s.Repository.DB(), projectFlockID, *projectFlockKandangID); err != nil {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
-			return nil, err
-		}
-	} else if err := m.EnsureProjectFlockAccess(c, s.Repository.DB(), projectFlockID); err != nil {
-		return nil, err
 	}
 
 	rows, err := s.Repository.GetExpeditionHPP(c.Context(), projectFlockID, projectFlockKandangID)
@@ -773,10 +743,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 +802,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 +830,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 +859,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 +909,7 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 			eggDepletion = 0
 		}
 
-		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age)
+		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age, standards)
 		if fcrActFromRecording != nil {
 			eggPerf.FcrAct = *fcrActFromRecording
 		}
@@ -993,10 +967,10 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 			performance.EggMass = eggMass
 		}
 	}
+	performance.DeffFcr = performance.FcrStd - performance.FcrAct
 	if productionStandardDetail != nil {
 		if productionStandardDetail.StandardFCR != nil {
 			performance.FcrStd = *productionStandardDetail.StandardFCR
-			performance.DeffFcr = performance.FcrStd - performance.FcrAct
 		}
 		if !isGrowing {
 			if productionStandardDetail.TargetHenDayProduction != nil {
@@ -1023,24 +997,38 @@ chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenS
 	return &result, nil
 }
 
-func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) (float64, error) {
+func (s closingService) calculateAverageSalesAge(ctx context.Context, projectFlockID uint) (float64, error) {
-	penjualan, err := s.MarketingDeliveryProductRepo.GetClosingPenjualanForAgeChickDataProduction(ctx, projectFlockID, projectFlockKandangID)
+	deliveryProducts, err := s.MarketingDeliveryProductRepo.GetDeliveryProductsByProjectFlockID(ctx, projectFlockID, func(db *gorm.DB) *gorm.DB {
+		return db.
+			Preload("MarketingProduct").
+			Preload("MarketingProduct.ProductWarehouse").
+			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+			Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins")
+	})
 	if err != nil {
 		return 0, err
 	}
-	acumulateAgeQty := 0.0
+
-	totalQty := 0.0
+	var (
-	for _, v := range penjualan {
+		totalQty      float64
-		sale := dto.ToSalesAgeDTO(v)
+		totalAgeWeeks float64
-		acumulateAgeQty += float64(sale.Age) * sale.Qty
+	)
-		totalQty += sale.Qty
+
-	}
+	for _, product := range deliveryProducts {
-	if totalQty > 0 {
+		if product.UsageQty == 0 {
-		averageAge := acumulateAgeQty / totalQty
+			continue
-		return averageAge, nil
+		}
+		projectFlockKandang := product.MarketingProduct.ProductWarehouse.ProjectFlockKandang
+		ageWeeks := dto.CalculateAgeFromChickinDataProduksi(projectFlockKandang, product.DeliveryDate)
+		totalAgeWeeks += float64(ageWeeks) * product.UsageQty
+		totalQty += product.UsageQty
 	}
 
-	return 0, err
+	if totalQty == 0 {
+		return 0, nil
+	}
+
+	return totalAgeWeeks / totalQty, nil
 }
 
 func (s closingService) determineProductionWeek(ctx context.Context, projectFlockKandangIDs []uint) (int, error) {
@@ -1083,8 +1071,8 @@ func (s closingService) determineProductionWeek(ctx context.Context, projectFloc
 	return week, nil
 }
 
-func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64) dto.ClosingPerformanceDTO {
+func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64, standards []entity.FcrStandard) dto.ClosingPerformanceDTO {
-	mortalityStd, fcrStd := 0.0, 0.0
+	mortalityStd, fcrStd := closestFcrValues(standards, averageWeight)
 
 	fcrAct := 0.0
 	if totalWeight > 0 {
@@ -1116,3 +1104,21 @@ func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopul
 		AwgAct:        awg,
 	}
 }
+
+func closestFcrValues(standards []entity.FcrStandard, averageWeight float64) (float64, float64) {
+	if len(standards) == 0 || averageWeight <= 0 {
+		return 0, 0
+	}
+
+	closest := standards[0]
+	minDiff := math.Abs(closest.Weight - averageWeight)
+	for _, std := range standards[1:] {
+		diff := math.Abs(std.Weight - averageWeight)
+		if diff < minDiff {
+			minDiff = diff
+			closest = std
+		}
+	}
+
+	return closest.Mortality, closest.FcrNumber
+}

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

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

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

@@ -347,14 +347,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
@@ -363,7 +355,7 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	salesOutRows, err := s.Repository.FetchSapronakSalesAllocatedDetails(ctx, pfk.Id)
+	salesOutRows, err := s.Repository.FetchSapronakSales(ctx, pfk.KandangId)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
@@ -570,12 +562,13 @@ func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.Proj
 			if existing.ProductName == "" {
 				existing.ProductName = d.ProductName
 			}
-			// Adjustment keluar should reduce stock without inflating usage-based HPP.
+			existing.UsageQty += d.QtyKeluar
-			remaining := existing.IncomingQty - existing.UsageQty - d.QtyKeluar
+			existing.UsageValue += d.Nilai
-			if remaining < 0 {
+			if existing.IncomingQty >= existing.UsageQty {
-				remaining = 0
+				existing.RemainingQty = existing.IncomingQty - existing.UsageQty
+			} else {
+				existing.RemainingQty = 0
 			}
-			existing.RemainingQty = remaining
 			itemMap[productID] = existing
 		}
 	}

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

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

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

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

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

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

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

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

internal/modules/dashboards/module.go

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,7 +3,6 @@ package controller
 import (
 	"math"
 	"strconv"
-	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/finance/transactions/services"
@@ -24,81 +23,10 @@ func NewTransactionController(transactionService service.TransactionService) *Tr
 }
 
 func (u *TransactionController) GetAll(c *fiber.Ctx) error {
-	parseUintListParam := func(key string) ([]uint, error) {
-		raw := strings.TrimSpace(c.Query(key, ""))
-		if raw == "" {
-			return nil, nil
-		}
-		parts := strings.Split(raw, ",")
-		ids := make([]uint, 0, len(parts))
-		for _, part := range parts {
-			trimmed := strings.TrimSpace(part)
-			if trimmed == "" {
-				return nil, strconv.ErrSyntax
-			}
-			parsed, err := strconv.ParseUint(trimmed, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			if parsed == 0 {
-				continue
-			}
-			ids = append(ids, uint(parsed))
-		}
-		if len(ids) == 0 {
-			return nil, nil
-		}
-		return ids, nil
-	}
-
-	parseStringListParam := func(key string) ([]string, error) {
-		raw := strings.TrimSpace(c.Query(key, ""))
-		if raw == "" {
-			return nil, nil
-		}
-		parts := strings.Split(raw, ",")
-		values := make([]string, 0, len(parts))
-		for _, part := range parts {
-			trimmed := strings.TrimSpace(part)
-			if trimmed == "" {
-				return nil, strconv.ErrSyntax
-			}
-			values = append(values, trimmed)
-		}
-		if len(values) == 0 {
-			return nil, nil
-		}
-		return values, nil
-	}
-
-	bankIDs, err := parseUintListParam("bank_ids")
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid bank_ids")
-	}
-	customerIDs, err := parseUintListParam("customer_ids")
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid customer_ids")
-	}
-	supplierIDs, err := parseUintListParam("supplier_ids")
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid supplier_ids")
-	}
-	transactionTypes, err := parseStringListParam("transaction_types")
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid transaction_types")
-	}
-
 	query := &validation.Query{
-		Page:             c.QueryInt("page", 1),
+		Page:   c.QueryInt("page", 1),
-		Limit:            c.QueryInt("limit", 10),
+		Limit:  c.QueryInt("limit", 10),
-		Search:           c.Query("search", ""),
+		Search: c.Query("search", ""),
-		TransactionTypes: transactionTypes,
-		BankIDs:          bankIDs,
-		CustomerIDs:      customerIDs,
-		SupplierIDs:      supplierIDs,
-		SortDate:         c.Query("sort_date", ""),
-		StartDate:        c.Query("start_date", ""),
-		EndDate:          c.Query("end_date", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

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

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

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

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"strings"
-	"time"
 
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -62,81 +61,21 @@ func (s transactionService) GetAll(c *fiber.Ctx, params *validation.Query) ([]en
 		return nil, 0, err
 	}
 
-	startDate, endDate, err := parseTransactionDateRange(params.StartDate, params.EndDate)
-	if err != nil {
-		return nil, 0, err
-	}
-
 	offset := (params.Page - 1) * params.Limit
 
 	transactions, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
-
 		if params.Search != "" {
 			like := "%" + strings.ToLower(strings.TrimSpace(params.Search)) + "%"
-			db = db.Joins(
+			return db.Where(
-				"LEFT JOIN customers ON customers.id = payments.party_id AND payments.party_type = ? AND customers.deleted_at IS NULL",
-				string(utils.PaymentPartyCustomer),
-			).Joins(
-				"LEFT JOIN suppliers ON suppliers.id = payments.party_id AND payments.party_type = ? AND suppliers.deleted_at IS NULL",
-				string(utils.PaymentPartySupplier),
-			).Joins(
-				"LEFT JOIN banks ON banks.id = payments.bank_id AND banks.deleted_at IS NULL",
-			)
-			db = db.Where(
 				`LOWER(payment_code) LIKE ? OR
 				LOWER(COALESCE(reference_number, '')) LIKE ? OR
-				LOWER(COALESCE(payment_method, '')) LIKE ? OR
 				LOWER(COALESCE(transaction_type, '')) LIKE ? OR
-				LOWER(COALESCE(notes, '')) LIKE ? OR
+				LOWER(COALESCE(notes, '')) LIKE ?`,
-				LOWER(COALESCE(customers.name, '')) LIKE ? OR
+				like, like, like, like,
-				LOWER(COALESCE(suppliers.name, '')) LIKE ? OR
-				LOWER(COALESCE(banks.name, '')) LIKE ?`,
-				like, like, like, like, like, like, like, like,
 			)
 		}
-
+		return db.Order("payment_date DESC").Order("created_at DESC")
-		if len(params.TransactionTypes) > 0 {
-			types := make([]string, 0, len(params.TransactionTypes))
-			for _, transactionType := range params.TransactionTypes {
-				normalized := strings.ToUpper(strings.TrimSpace(transactionType))
-				if normalized == "" {
-					continue
-				}
-				types = append(types, normalized)
-			}
-			if len(types) > 0 {
-				db = db.Where("transaction_type IN ?", types)
-			}
-		}
-
-		if len(params.BankIDs) > 0 {
-			db = db.Where("bank_id IN ?", params.BankIDs)
-		}
-
-		customerIDs := params.CustomerIDs
-		supplierIDs := params.SupplierIDs
-
-		if len(customerIDs) > 0 && len(supplierIDs) > 0 {
-			db = db.Where(
-				"(party_type = ? AND party_id IN ?) OR (party_type = ? AND party_id IN ?)",
-				string(utils.PaymentPartyCustomer), customerIDs,
-				string(utils.PaymentPartySupplier), supplierIDs,
-			)
-		} else if len(customerIDs) > 0 {
-			db = db.Where("party_type = ? AND party_id IN ?", string(utils.PaymentPartyCustomer), customerIDs)
-		} else if len(supplierIDs) > 0 {
-			db = db.Where("party_type = ? AND party_id IN ?", string(utils.PaymentPartySupplier), supplierIDs)
-		}
-
-		if startDate != nil {
-			db = db.Where("payment_date >= ?", *startDate)
-		}
-		if endDate != nil {
-			db = db.Where("payment_date < ?", *endDate)
-		}
-
-		return applyTransactionSort(db, params.SortDate)
 	})
 
 	if err != nil {
@@ -234,47 +173,3 @@ func (s transactionService) approvalQueryModifier() func(*gorm.DB) *gorm.DB {
 		return db.Preload("ActionUser")
 	}
 }
-
-func parseTransactionDateRange(startDate, endDate string) (*time.Time, *time.Time, error) {
-	start := strings.TrimSpace(startDate)
-	end := strings.TrimSpace(endDate)
-
-	var startPtr *time.Time
-	var endPtr *time.Time
-	var endValue *time.Time
-
-	if start != "" {
-		parsed, err := utils.ParseDateString(start)
-		if err != nil {
-			return nil, nil, utils.BadRequest("start_date must use format YYYY-MM-DD")
-		}
-		startPtr = &parsed
-	}
-
-	if end != "" {
-		parsed, err := utils.ParseDateString(end)
-		if err != nil {
-			return nil, nil, utils.BadRequest("end_date must use format YYYY-MM-DD")
-		}
-		endValue = &parsed
-		nextDay := parsed.AddDate(0, 0, 1)
-		endPtr = &nextDay
-	}
-
-	if startPtr != nil && endValue != nil && startPtr.After(*endValue) {
-		return nil, nil, utils.BadRequest("start_date must be earlier than end_date")
-	}
-
-	return startPtr, endPtr, nil
-}
-
-func applyTransactionSort(db *gorm.DB, sortDate string) *gorm.DB {
-	switch strings.ToLower(strings.TrimSpace(sortDate)) {
-	case "created_at":
-		return db.Order("created_at DESC").Order("payment_date DESC")
-	case "payment_date":
-		return db.Order("payment_date DESC").Order("created_at DESC")
-	default:
-		return db.Order("payment_date DESC").Order("created_at DESC")
-	}
-}

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

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

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

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

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

@@ -2,21 +2,16 @@ package repositories
 
 import (
 	"context"
-	"fmt"
-	"strconv"
-	"strings"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 type AdjustmentStockRepository interface {
 	CreateOne(ctx context.Context, data *entity.AdjustmentStock, modifier func(*gorm.DB) *gorm.DB) error
-	GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error)
+	GetByStockLogID(ctx context.Context, stockLogID uint) (*entity.AdjustmentStock, error)
 	WithTx(tx *gorm.DB) AdjustmentStockRepository
 	DB() *gorm.DB
-	GenerateSequentialNumber(ctx context.Context, prefix string) (string, error)
 }
 
 type adjustmentStockRepositoryImpl struct {
@@ -35,13 +30,19 @@ func (r *adjustmentStockRepositoryImpl) CreateOne(ctx context.Context, data *ent
 	return q.Create(data).Error
 }
 
-func (r *adjustmentStockRepositoryImpl) GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error) {
+func (r *adjustmentStockRepositoryImpl) GetByStockLogID(ctx context.Context, stockLogID uint) (*entity.AdjustmentStock, error) {
 	var record entity.AdjustmentStock
-	q := r.db.WithContext(ctx)
+	err := r.db.WithContext(ctx).
-	if modifier != nil {
+		Preload("StockLog").
-		q = modifier(q)
+		Preload("StockLog.ProductWarehouse").
-	}
+		Preload("StockLog.ProductWarehouse.Product").
-	err := q.First(&record, id).Error
+		Preload("StockLog.ProductWarehouse.Warehouse").
+		Preload("StockLog.CreatedUser").
+		Preload("ProductWarehouse").
+		Preload("ProductWarehouse.Product").
+		Preload("ProductWarehouse.Warehouse").
+		Where("stock_log_id = ?", stockLogID).
+		First(&record).Error
 	if err != nil {
 		return nil, err
 	}
@@ -55,71 +56,3 @@ func (r *adjustmentStockRepositoryImpl) WithTx(tx *gorm.DB) AdjustmentStockRepos
 func (r *adjustmentStockRepositoryImpl) DB() *gorm.DB {
 	return r.db
 }
-
-func (r *adjustmentStockRepositoryImpl) GenerateSequentialNumber(ctx context.Context, prefix string) (string, error) {
-	var values []string
-	err := r.db.WithContext(ctx).
-		Model(&entity.AdjustmentStock{}).
-		Where(fmt.Sprintf("%s ILIKE ?", "adj_number"), prefix+"%").
-		Select("adj_number").
-		Order(fmt.Sprintf("%s DESC", "adj_number")).
-		Limit(20).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Pluck("adj_number", &values).Error
-	if err != nil {
-		return "", err
-	}
-
-	next := 1
-	for _, value := range values {
-		if number, ok := parseNumericSuffix(value, prefix); ok {
-			next = number + 1
-			break
-		}
-	}
-
-	const maxAttempts = 20
-	for attempt := 0; attempt < maxAttempts; attempt++ {
-		candidate := fmt.Sprintf("%s%0*d", prefix, 5, next)
-		exists, err := r.numberExists(ctx, r.db, candidate)
-		if err != nil {
-			return "", err
-		}
-		if !exists {
-			return candidate, nil
-		}
-		next++
-	}
-
-	return "", fmt.Errorf("unable to generate unique %s", "adj_number")
-}
-
-func (r *adjustmentStockRepositoryImpl) numberExists(ctx context.Context, db *gorm.DB, value string) (bool, error) {
-	var count int64
-	if err := db.WithContext(ctx).
-		Model(&entity.AdjustmentStock{}).
-		Where(fmt.Sprintf("%s = ?", "adj_number"), value).
-		Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count > 0, nil
-}
-
-func parseNumericSuffix(value, prefix string) (int, bool) {
-	if !strings.HasPrefix(value, prefix) {
-		return 0, false
-	}
-	suffix := strings.TrimPrefix(value, prefix)
-	if suffix == "" {
-		return 0, false
-	}
-	trimmed := strings.TrimLeft(suffix, "0")
-	if trimmed == "" {
-		trimmed = "0"
-	}
-	number, err := strconv.Atoi(trimmed)
-	if err != nil {
-		return 0, false
-	}
-	return number, true
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

internal/modules/marketing/module.go

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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