FEAT[BE]: add GetAllProductUsageByProjectFlockKandangID method and ProductUsageRow struct

Merge branch 'development' of https://gitlab.com/mbugroup/lti-api into FEAT/BE/Closing_keuangan
feat{be]: partial psuh closing keuangan(belum beres)
2026-05-20 13:31:56 +00:00 · 2026-01-15 18:04:37 +07:00 · 2026-01-15 16:45:52 +07:00 · 2026-01-15 15:57:29 +07:00 · 2026-01-15 08:52:11 +00:00 · 2026-01-15 08:51:57 +00:00
273 changed files with 19590 additions and 2948 deletions
@@ -9,11 +9,13 @@ main
 bin/
 *.exe
 *.out
-
+.air.toml
 Makefile
 docker-compose.local.yml
 docker-compose.yaml
+Dockerfile
 Dockerfile.local
+.gitlab-ci.yml
 # Go build cache
 .gocache/
 vendor
@@ -27,3 +29,4 @@ coverage/
 .vscode/
 .idea/
 *.swp
+.DS_Store
@@ -1,20 +1,38 @@
-FROM golang:1.23-alpine
+# =========================
+# Builder stage
+# =========================
+FROM golang:1.23-alpine AS builder

-# Install dependensi dasar
-RUN apk add --no-cache git curl bash build-base
+RUN apk add --no-cache git ca-certificates tzdata
+WORKDIR /app

-# Install Air (pakai repo baru air-verse)
-RUN go install github.com/air-verse/air@v1.52.3
-
-WORKDIR /lti-api
-
-# Cache dependencies
 COPY go.mod go.sum ./
 RUN go mod download

-# Copy source code
 COPY . .

+# Build API binary
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+    go build -trimpath -ldflags="-s -w" -o lti-api ./cmd/api
+
+# Build SEED binary (pastikan cmd/seed ada)
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+    go build -trimpath -ldflags="-s -w" -o lti-seed ./cmd/seed
+
+# =========================
+# Runtime stage
+# =========================
+FROM alpine:3.20
+
+RUN apk add --no-cache ca-certificates tzdata curl bash postgresql-client \
+  && adduser -D -H -u 10001 appuser
+
+WORKDIR /app
+
+COPY --from=builder /app/lti-api /app/lti-api
+COPY --from=builder /app/lti-seed /app/lti-seed
+
+USER appuser
 EXPOSE 8081

-CMD ["air", "-c", ".air.toml"]
+CMD ["/app/lti-api"]
@@ -110,4 +110,4 @@ IT Development PT Mitra Berlian Unggas Group

 ## 📃 License

-This project is private. All rights reserved.
+> This project is private. All rights reserved.
@@ -1,77 +0,0 @@
-services:
-  postgresdb:
-    image: postgres:alpine
-    restart: always
-    ports:
-      - "${DB_PORT_HOST:-5542}:5432"
-    environment:
-      POSTGRES_USER: ${DB_USER:-postgres}
-      POSTGRES_PASSWORD: ${DB_PASSWORD:-postgres}
-      POSTGRES_DB: ${DB_NAME:-db_lti_erp}
-    volumes:
-      - dbdata:/var/lib/postgresql/data
-      - ./internal/database/init:/docker-entrypoint-initdb.d
-    networks: [go-network]
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-db_lti_erp}",
-        ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-  redis:
-    image: redis:7-alpine
-    restart: unless-stopped
-    ports:
-      - "${REDIS_PORT_HOST:-6381}:6379"
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-    networks: [go-network]
-
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile.local
-    image: cosmtrek/air:v1.52.3
-    working_dir: /lti-api
-    volumes:
-      - .:/lti-api
-      - ./internal/config/jwtRS256.key:/run/keys/jwtRS256.key
-      - ./internal/config/jwtRS256.key.pub:/run/keys/jwtRS256.key.pub
-    command: air -c .air.toml
-    env_file:
-      - .env
-    environment:
-      DB_HOST: postgresdb
-      DB_PORT: 5432
-      DB_USER: ${DB_USER:-postgres}
-      DB_PASSWORD: ${DB_PASSWORD:-postgres}
-      DB_NAME: ${DB_NAME:-db_lti_erp}
-      REDIS_URL: ${REDIS_URL:-redis://redis:6379/0}
-    ports:
-      - "${APP_PORT:-8081}:8081"
-    depends_on:
-      postgresdb:
-        condition: service_healthy
-    networks: [go-network]
-    healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://localhost:8081/healthz || exit 1"]
-      interval: 10s
-      timeout: 3s
-      retries: 10
-      start_period: 10s
-
-volumes:
-  dbdata:
-  go-mod-cache:
-  go-build-cache:
-
-networks:
-  go-network:
-    name: lti-api_go-network
-    driver: bridge
@@ -1,98 +0,0 @@
-services:
-  dev-api-lti:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: dev-api-lti
-    working_dir: /lti-api
-    command: ["/bin/sh", "scripts/entrypoint.sh"]
-    ports:
-      - "8081:8081"
-    env_file:
-      - .env
-    environment:
-      # override agar koneksi ke container internal
-      DB_HOST: dev-postgres-lti
-      DB_PORT: 5432
-      REDIS_URL: redis://dev-redis-lti:6379/0
-    volumes:
-      - .:/lti-api
-      - ./.air.toml:/lti-api/.air.toml:ro
-      - ./internal/config/jwtRS256.key:/run/keys/jwtRS256.key
-      - ./internal/config/jwtRS256.key.pub:/run/keys/jwtRS256.key.pub
-    depends_on:
-      - dev-postgres-lti
-      - dev-redis-lti
-    networks:
-      - lti-network
-    healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://localhost:8081/healthz || exit 1"]
-      interval: 10s
-      timeout: 3s
-      retries: 10
-      start_period: 10s
-    deploy:
-      resources:
-        limits:
-          cpus: "2.0"
-          memory: 2G
-        reservations:
-          cpus: "1.0"
-          memory: 512M
-
-  dev-postgres-lti:
-    image: postgres:15-alpine
-    container_name: dev-postgres-lti
-    restart: always
-    env_file:
-      - credential/.env.db
-    ports:
-      - "5433:5432"
-    volumes:
-      - dev-postgres-lti-data:/var/lib/postgresql/data
-      - ./credential:/docker-entrypoint-initdb.d:ro
-    networks:
-      - lti-network
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-db_lti_erp}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 5s
-    deploy:
-      resources:
-        limits:
-          cpus: "1.0"
-          memory: 2G
-        reservations:
-          cpus: "0.5"
-          memory: 512M
-
-  dev-redis-lti:
-    image: redis:7-alpine
-    container_name: dev-redis-lti
-    restart: always
-    ports:
-      - "6380:6379"
-    networks:
-      - lti-network
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 3s
-      retries: 10
-    deploy:
-      resources:
-        limits:
-          cpus: "0.5"
-          memory: 512M
-        reservations:
-          cpus: "0.2"
-          memory: 256M
-
-networks:
-  lti-network:
-    driver: bridge
-
-volumes:
-  dev-postgres-lti-data:
@@ -16,9 +16,11 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgconn v1.14.1
+	github.com/jackc/pgx/v5 v5.5.5
 	github.com/redis/go-redis/v9 v9.14.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/viper v1.19.0
+	github.com/xuri/excelize/v2 v2.9.0
 	golang.org/x/crypto v0.33.0
 	gorm.io/driver/postgres v1.5.9
 	gorm.io/gorm v1.25.11
@@ -59,7 +61,6 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.5.5 // indirect
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -71,9 +72,12 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/richardlehane/mscfb v1.0.4 // indirect
+	github.com/richardlehane/msoleps v1.0.4 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -82,12 +86,15 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tinylib/msgp v1.1.8 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.55.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
+	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
+	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
@@ -182,6 +182,8 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
@@ -195,6 +197,11 @@ github.com/redis/go-redis/v9 v9.14.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
+github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
+github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
+github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -238,8 +245,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
@@ -252,6 +260,12 @@ github.com/valyala/fasthttp v1.55.0 h1:Zkefzgt6a7+bVKHnu/YaYSOPfNYNisSVBo/unVCf8
 github.com/valyala/fasthttp v1.55.0/go.mod h1:NkY9JtkrpPKmgwV3HTaS2HWaJss9RSIsRVfcxxoHiOM=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d h1:llb0neMWDQe87IzJLS4Ci7psK/lVsjIS2otl+1WyRyY=
+github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
+github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
+github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 h1:hPVCafDV85blFTabnqKgNhDCkJX25eik94Si9cTER4A=
+github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -278,6 +292,8 @@ golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
+golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
+golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -187,10 +187,11 @@ func (r *BaseRepositoryImpl[T]) PatchOne(
 	updates map[string]any,
 	modifier func(*gorm.DB) *gorm.DB,
 ) error {
-	q := r.db.WithContext(ctx).Model(new(T)).Where("id = ?", id)
+	q := r.db.WithContext(ctx)
 	if modifier != nil {
 		q = modifier(q)
 	}
+	q = q.Model(new(T)).Where("id = ?", id)

 	result := q.Updates(updates)
 	if result.Error != nil {
@@ -6,8 +6,10 @@ import (
 	"fmt"
 	"mime"
 	"mime/multipart"
+	"net/url"
 	"path/filepath"
 	"strings"
+	"time"

 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
@@ -29,6 +31,7 @@ type DocumentService interface {
 	DeleteDocuments(ctx context.Context, ids []uint, removeFromStorage bool) error
 	DeleteByTarget(ctx context.Context, documentableType string, documentableID uint64, removeFromStorage bool) error
 	PublicURL(document entity.Document) string
+	PresignURL(ctx context.Context, document entity.Document, expires time.Duration) (string, error)
 }

 type DocumentUploadRequest struct {
@@ -293,6 +296,66 @@ func (s *documentService) PublicURL(document entity.Document) string {
 	return s.storage.URL(document.Path)
 }

+func (s *documentService) PresignURL(ctx context.Context, document entity.Document, expires time.Duration) (string, error) {
+	if s.storage == nil {
+		return "", errors.New("document storage not configured")
+	}
+	if strings.TrimSpace(document.Path) == "" {
+		return "", errors.New("document path is required")
+	}
+	return s.storage.PresignURL(ctx, document.Path, expires)
+}
+
+// ResolveDocumentURL normalizes a stored path or URL into a presigned URL.
+func ResolveDocumentURL(
+	ctx context.Context,
+	svc DocumentService,
+	rawPath string,
+	expires time.Duration,
+) (string, error) {
+	if svc == nil {
+		return "", nil
+	}
+
+	rawPath = strings.TrimSpace(rawPath)
+	if rawPath == "" {
+		return "", nil
+	}
+
+	key := rawPath
+	lower := strings.ToLower(rawPath)
+	if strings.HasPrefix(lower, "http://") || strings.HasPrefix(lower, "https://") {
+		key = extractS3KeyFromURL(rawPath)
+		if key == "" {
+			return "", nil
+		}
+	}
+
+	return svc.PresignURL(ctx, entity.Document{Path: key}, expires)
+}
+
+func extractS3KeyFromURL(raw string) string {
+	parsed, err := url.Parse(strings.TrimSpace(raw))
+	if err != nil {
+		return ""
+	}
+	path := strings.TrimPrefix(parsed.Path, "/")
+	if path == "" {
+		return ""
+	}
+
+	host := strings.ToLower(strings.TrimSpace(parsed.Host))
+	if strings.HasPrefix(host, "s3.") || strings.HasPrefix(host, "s3-") {
+		parts := strings.SplitN(path, "/", 2)
+		if len(parts) == 2 {
+			return parts[1]
+		}
+		return ""
+	}
+
+	return path
+}
+
 func (s *documentService) generateObjectKey(ext string) (string, error) {
 	normalizedExt := strings.TrimSpace(ext)
 	if normalizedExt != "" && !strings.HasPrefix(normalizedExt, ".") {
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"time"

 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
@@ -17,6 +18,7 @@ type DocumentStorage interface {
 	Upload(ctx context.Context, key string, body io.Reader, size int64, contentType string) (DocumentStorageUploadResult, error)
 	Delete(ctx context.Context, key string) error
 	URL(key string) string
+	PresignURL(ctx context.Context, key string, expires time.Duration) (string, error)
 }

 type DocumentStorageUploadResult struct {
@@ -36,9 +38,10 @@ type S3DocumentStorageConfig struct {
 }

 type s3DocumentStorage struct {
-	client *s3.Client
-	bucket string
-	base   string
+	client        *s3.Client
+	presignClient *s3.PresignClient
+	bucket        string
+	base          string
 }

 func NewS3DocumentStorage(ctx context.Context, cfg S3DocumentStorageConfig) (DocumentStorage, error) {
@@ -86,6 +89,7 @@ func NewS3DocumentStorage(ctx context.Context, cfg S3DocumentStorageConfig) (Doc
 	client := s3.NewFromConfig(awsCfg, func(o *s3.Options) {
 		o.UsePathStyle = cfg.ForcePathStyle
 	})
+	presignClient := s3.NewPresignClient(client)

 	baseURL := strings.TrimSuffix(strings.TrimSpace(cfg.BaseURL), "/")
 	if baseURL == "" {
@@ -97,9 +101,10 @@ func NewS3DocumentStorage(ctx context.Context, cfg S3DocumentStorageConfig) (Doc
 	}

 	return &s3DocumentStorage{
-		client: client,
-		bucket: bucket,
-		base:   baseURL,
+		client:        client,
+		presignClient: presignClient,
+		bucket:        bucket,
+		base:          baseURL,
 	}, nil
 }

@@ -158,3 +163,23 @@ func (s *s3DocumentStorage) URL(key string) string {
 	}
 	return fmt.Sprintf("%s/%s", s.base, key)
 }
+
+func (s *s3DocumentStorage) PresignURL(ctx context.Context, key string, expires time.Duration) (string, error) {
+	key = strings.TrimPrefix(strings.TrimSpace(key), "/")
+	if key == "" {
+		return "", errors.New("storage key is required")
+	}
+	if expires <= 0 {
+		expires = 15 * time.Minute
+	}
+
+	out, err := s.presignClient.PresignGetObject(ctx, &s3.GetObjectInput{
+		Bucket: aws.String(s.bucket),
+		Key:    aws.String(key),
+	}, s3.WithPresignExpires(expires))
+	if err != nil {
+		return "", err
+	}
+
+	return out.URL, nil
+}
@@ -192,7 +192,6 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St
 	if req.Quantity < 0 {
 		return nil, errors.New("quantity must be zero or greater")
 	}
-
 	cfg, ok := fifo.Usable(req.UsableKey)
 	if !ok {
 		return nil, fmt.Errorf("usable %q is not registered", req.UsableKey)
@@ -220,7 +219,6 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St
 		currentPending := ctxRow.PendingQty
 		currentTotal := currentUsage + currentPending
 		delta := req.Quantity - currentTotal
-
 		var (
 			usageDelta     float64
 			pendingDelta   float64
@@ -230,7 +228,13 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St

 		switch {
 		case delta > 0:
-			allocationRes, err := s.allocateFromStock(ctx, tx, productWarehouseID, req.UsableKey, req.UsableID, delta)
+
+			var excludedStockables []fifo.StockableKey
+			if cfg.ExcludedStockables != nil {
+				excludedStockables = cfg.ExcludedStockables
+			}
+
+			allocationRes, err := s.allocateFromStock(ctx, tx, productWarehouseID, req.UsableKey, req.UsableID, delta, excludedStockables)
 			if err != nil {
 				return err
 			}
@@ -285,7 +289,6 @@ func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*St
 		result.ReleasedQuantity = releasedAmount
 		result.UsageQuantity = currentUsage + usageDelta
 		result.PendingQuantity = currentPending + pendingDelta
-
 		return nil
 	})
 	if err != nil {
@@ -299,7 +302,6 @@ func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest)
 	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
 		return errors.New("usable key and id are required")
 	}
-
 	return s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
 		cfg, ok := fifo.Usable(req.UsableKey)
 		if !ok {
@@ -310,7 +312,6 @@ func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest)
 		if err != nil {
 			return err
 		}
-
 		var usageDelta, pendingDelta float64
 		if ctxRow.UsageQty > 0 {
 			if _, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, ctxRow.UsageQty); err != nil {
@@ -415,8 +416,9 @@ func (s *fifoService) allocateFromStock(
 	usableKey fifo.UsableKey,
 	usableID uint,
 	requestQty float64,
+	excludedStockables []fifo.StockableKey,
 ) (*allocationOutcome, error) {
-	lots, err := s.fetchStockLots(ctx, tx, productWarehouseID)
+	lots, err := s.fetchStockLots(ctx, tx, productWarehouseID, excludedStockables)
 	if err != nil {
 		return nil, err
 	}
@@ -497,14 +499,24 @@ func (s *fifoService) allocateFromStock(
 	}, nil
 }

-func (s *fifoService) fetchStockLots(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]stockLot, error) {
+func (s *fifoService) fetchStockLots(ctx context.Context, tx *gorm.DB, productWarehouseID uint, excludedStockables []fifo.StockableKey) ([]stockLot, error) {
 	configs := fifo.Stockables()
 	if len(configs) == 0 {
 		return nil, nil
 	}

+	// Create exclusion set for faster lookup
+	excludedSet := make(map[fifo.StockableKey]bool)
+	for _, key := range excludedStockables {
+		excludedSet[key] = true
+	}
+
 	var lots []stockLot
 	for key, cfg := range configs {
+		// Skip excluded stockables
+		if excludedSet[key] {
+			continue
+		}

 		usesNumericTime := cfg.Columns.CreatedAt == cfg.Columns.ID

@@ -621,7 +633,13 @@ func (s *fifoService) resolvePendingForWarehouse(ctx context.Context, tx *gorm.D
 			continue
 		}

-		outcome, err := s.allocateFromStock(ctx, tx, productWarehouseID, candidate.UsableKey, candidate.UsableID, candidate.Pending)
+		// Get excluded stockables from candidate usable config
+		var excludedStockables []fifo.StockableKey
+		if candidate.Config.ExcludedStockables != nil {
+			excludedStockables = candidate.Config.ExcludedStockables
+		}
+
+		outcome, err := s.allocateFromStock(ctx, tx, productWarehouseID, candidate.UsableKey, candidate.UsableID, candidate.Pending, excludedStockables)
 		if err != nil {
 			return nil, err
 		}
@@ -715,7 +733,7 @@ func (s *fifoService) releaseUsagePortion(
 			}
 		} else {
 			if err := s.allocations.PatchOne(ctx, allocation.Id, map[string]any{
-				"quantity": allocation.Qty - releaseAmt,
+				"qty": allocation.Qty - releaseAmt,
 			}, func(db *gorm.DB) *gorm.DB {
 				return s.txOrDB(tx, db)
 			}); err != nil {
@@ -54,6 +54,7 @@ var (
 	SSOAuthorizeURL         string
 	SSOTokenURL             string
 	SSOGetMeURL             string
+	SSOPortalURL            string
 	SSOClients              map[string]SSOClientConfig
 	SSOAccessCookieName     string
 	SSORefreshCookieName    string
@@ -131,6 +132,7 @@ func init() {
 	SSOAuthorizeURL = viper.GetString("SSO_AUTHORIZE_URL")
 	SSOTokenURL = viper.GetString("SSO_TOKEN_URL")
 	SSOGetMeURL = viper.GetString("SSO_GETME_URL")
+	SSOPortalURL = strings.TrimSpace(viper.GetString("SSO_PORTAL_URL"))
 	SSOAccessCookieName = defaultString(viper.GetString("SSO_ACCESS_COOKIE_NAME"), "sso_access")
 	SSORefreshCookieName = defaultString(viper.GetString("SSO_REFRESH_COOKIE_NAME"), "sso_refresh")
 	SSOCookieDomain = viper.GetString("SSO_COOKIE_DOMAIN")
@@ -13,6 +13,7 @@ func FiberConfig() fiber.Config {
 		CaseSensitive: true,
 		ServerHeader:  "Fiber",
 		AppName:       "Fiber API",
+		BodyLimit:    8 * 1024 * 1024,
 		ErrorHandler:  utils.ErrorHandler,
 		JSONEncoder:   sonic.Marshal,
 		JSONDecoder:   sonic.Unmarshal,
@@ -1 +1,2 @@
+DROP SEQUENCE IF EXISTS expenses_ref_seq;
 DROP TABLE IF EXISTS expenses;
@@ -1,3 +1,3 @@
 -- Drop function and sequence for sales order numbers
-DROP FUNCTION IF EXISTS generate_so_number();
 DROP SEQUENCE IF EXISTS so_number_seq;
+DROP FUNCTION IF EXISTS generate_so_number();
@@ -0,0 +1,6 @@
+DROP INDEX IF EXISTS idx_project_flock_kandang_uniformity_deleted_at;
+DROP INDEX IF EXISTS idx_project_flock_kandang_uniformity_created_by;
+DROP INDEX IF EXISTS idx_project_flock_kandang_uniformity_project_flock_kandang_week;
+DROP INDEX IF EXISTS idx_project_flock_kandang_uniformity_project_flock_kandang_id;
+
+DROP TABLE IF EXISTS project_flock_kandang_uniformity;
@@ -0,0 +1,58 @@
+CREATE TABLE IF NOT EXISTS project_flock_kandang_uniformity (
+    id BIGSERIAL PRIMARY KEY,
+    uniformity NUMERIC(15, 3),
+    week INT NOT NULL,
+    cv NUMERIC(15, 3),
+    chick_qty_of_weight NUMERIC(15, 3),
+    mean_up NUMERIC(15, 3),
+    mean_down NUMERIC(15, 3),
+    project_flock_kandang_id BIGINT NOT NULL,
+    uniform_qty NUMERIC(15, 3),
+    not_uniform_qty NUMERIC(15, 3),
+    uniform_date TIMESTAMPTZ,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    deleted_at TIMESTAMPTZ,
+    created_by BIGINT NOT NULL
+);
+
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_flock_kandangs') THEN
+        IF NOT EXISTS (
+            SELECT 1 FROM pg_constraint WHERE conname = 'fk_project_flock_kandang_uniformity_project_flock_kandang'
+        ) THEN
+            EXECUTE
+            'ALTER TABLE project_flock_kandang_uniformity
+             ADD CONSTRAINT fk_project_flock_kandang_uniformity_project_flock_kandang
+             FOREIGN KEY (project_flock_kandang_id)
+             REFERENCES project_flock_kandangs(id)
+             ON DELETE RESTRICT ON UPDATE CASCADE';
+        END IF;
+    END IF;
+
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        IF NOT EXISTS (
+            SELECT 1 FROM pg_constraint WHERE conname = 'fk_project_flock_kandang_uniformity_created_by'
+        ) THEN
+            EXECUTE
+            'ALTER TABLE project_flock_kandang_uniformity
+             ADD CONSTRAINT fk_project_flock_kandang_uniformity_created_by
+             FOREIGN KEY (created_by)
+             REFERENCES users(id)
+             ON DELETE RESTRICT ON UPDATE CASCADE';
+        END IF;
+    END IF;
+END $$;
+
+CREATE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_project_flock_kandang_id
+    ON project_flock_kandang_uniformity (project_flock_kandang_id);
+
+CREATE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_project_flock_kandang_week
+    ON project_flock_kandang_uniformity (project_flock_kandang_id, week);
+
+CREATE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_created_by
+    ON project_flock_kandang_uniformity (created_by);
+
+CREATE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_deleted_at
+    ON project_flock_kandang_uniformity (deleted_at);
@@ -0,0 +1,54 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS recording_bws (
+    id            BIGSERIAL PRIMARY KEY,
+    recording_id  BIGINT NOT NULL,
+    avg_weight    NUMERIC(8,2) NOT NULL,
+    qty           NUMERIC(15,3) NOT NULL DEFAULT 1,
+    total_weight  NUMERIC(10,3) NOT NULL,
+    created_at    TIMESTAMPTZ DEFAULT NOW(),
+    updated_at    TIMESTAMPTZ DEFAULT NOW(),
+
+    CONSTRAINT fk_recording_bws_recording
+        FOREIGN KEY (recording_id) REFERENCES recordings(id) ON DELETE CASCADE,
+
+    CONSTRAINT chk_recording_bws_nonneg
+        CHECK (avg_weight >= 0 AND qty >= 0 AND total_weight >= 0)
+);
+
+CREATE INDEX IF NOT EXISTS idx_recording_bws_recording
+    ON recording_bws (recording_id);
+
+ALTER TABLE recordings
+    DROP CONSTRAINT IF EXISTS chk_recordings_nonnegatives_v3;
+
+ALTER TABLE recordings
+    DROP COLUMN IF EXISTS hand_day,
+    DROP COLUMN IF EXISTS hand_house,
+    DROP COLUMN IF EXISTS feed_intake,
+    DROP COLUMN IF EXISTS egg_mesh,
+    DROP COLUMN IF EXISTS egg_weight;
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_nonnegatives_v2 CHECK (
+        (total_depletion_qty IS NULL OR total_depletion_qty >= 0) AND
+        (cum_depletion_rate  IS NULL OR cum_depletion_rate  >= 0) AND
+        (daily_gain          IS NULL OR daily_gain          >= 0) AND
+        (avg_daily_gain      IS NULL OR avg_daily_gain      >= 0) AND
+        (cum_intake          IS NULL OR cum_intake          >= 0) AND
+        (fcr_value           IS NULL OR fcr_value           >= 0) AND
+        (total_chick_qty     IS NULL OR total_chick_qty     >= 0)
+    );
+
+ALTER TABLE recording_eggs
+    DROP CONSTRAINT IF EXISTS chk_recording_eggs_qty;
+
+ALTER TABLE recording_eggs
+    ALTER COLUMN weight TYPE NUMERIC(10,3) USING weight::NUMERIC(10,3);
+
+ALTER TABLE recording_eggs
+    ADD CONSTRAINT chk_recording_eggs_qty CHECK (
+        qty >= 0 AND (weight IS NULL OR weight >= 0)
+    );
+
+COMMIT;
@@ -0,0 +1,44 @@
+BEGIN;
+
+ALTER TABLE recordings
+    DROP CONSTRAINT IF EXISTS chk_recordings_nonnegatives_v2;
+
+ALTER TABLE recordings
+    ADD COLUMN IF NOT EXISTS hand_day NUMERIC(15,3),
+    ADD COLUMN IF NOT EXISTS hand_house NUMERIC(15,3),
+    ADD COLUMN IF NOT EXISTS feed_intake NUMERIC(15,3),
+    ADD COLUMN IF NOT EXISTS egg_mesh NUMERIC(15,3),
+    ADD COLUMN IF NOT EXISTS egg_weight NUMERIC(15,3);
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_nonnegatives_v3 CHECK (
+        (total_depletion_qty IS NULL OR total_depletion_qty >= 0) AND
+        (cum_depletion_rate  IS NULL OR cum_depletion_rate  >= 0) AND
+        (daily_gain          IS NULL OR daily_gain          >= 0) AND
+        (avg_daily_gain      IS NULL OR avg_daily_gain      >= 0) AND
+        (cum_intake          IS NULL OR cum_intake          >= 0) AND
+        (fcr_value           IS NULL OR fcr_value           >= 0) AND
+        (total_chick_qty     IS NULL OR total_chick_qty     >= 0) AND
+        (hand_day            IS NULL OR hand_day            >= 0) AND
+        (hand_house          IS NULL OR hand_house          >= 0) AND
+        (feed_intake         IS NULL OR feed_intake         >= 0) AND
+        (egg_mesh            IS NULL OR egg_mesh            >= 0) AND
+        (egg_weight          IS NULL OR egg_weight          >= 0)
+    );
+
+ALTER TABLE recording_eggs
+    ALTER COLUMN weight TYPE NUMERIC(15,3) USING weight::NUMERIC(15,3);
+
+ALTER TABLE recording_eggs
+    DROP CONSTRAINT IF EXISTS chk_recording_eggs_qty;
+
+ALTER TABLE recording_eggs
+    ADD CONSTRAINT chk_recording_eggs_qty CHECK (
+        qty >= 0 AND
+        (weight IS NULL OR weight >= 0)
+    );
+
+DROP INDEX IF EXISTS idx_recording_bws_recording;
+DROP TABLE IF EXISTS recording_bws;
+
+COMMIT;
@@ -0,0 +1,3 @@
+-- Remove standard_fcr column from production_standard_details table
+ALTER TABLE production_standard_details
+DROP COLUMN IF EXISTS standard_fcr;
@@ -0,0 +1,3 @@
+-- Add standard_fcr column to production_standard_details table
+ALTER TABLE production_standard_details
+ADD COLUMN standard_fcr NUMERIC(15, 3);
@@ -0,0 +1,20 @@
+-- Drop CASCADE constraint
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'fk_project_chickins_kandang'
+        AND conrelid = 'project_chickins'::regclass
+    ) THEN
+        ALTER TABLE project_chickins
+        DROP CONSTRAINT fk_project_chickins_kandang;
+    END IF;
+END $$;
+
+-- Recreate foreign key constraint with RESTRICT (original behavior)
+ALTER TABLE project_chickins
+ADD CONSTRAINT fk_project_chickins_kandang
+FOREIGN KEY (project_flock_kandang_id)
+REFERENCES project_flock_kandangs(id)
+ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -0,0 +1,20 @@
+-- Drop existing foreign key constraint with RESTRICT
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'fk_project_chickins_kandang'
+        AND conrelid = 'project_chickins'::regclass
+    ) THEN
+        ALTER TABLE project_chickins
+        DROP CONSTRAINT fk_project_chickins_kandang;
+    END IF;
+END $$;
+
+-- Add new foreign key constraint with CASCADE delete
+ALTER TABLE project_chickins
+ADD CONSTRAINT fk_project_chickins_kandang
+FOREIGN KEY (project_flock_kandang_id)
+REFERENCES project_flock_kandangs(id)
+ON DELETE CASCADE ON UPDATE CASCADE;
@@ -0,0 +1,126 @@
+CREATE OR REPLACE FUNCTION soft_delete_handle_fk() RETURNS TRIGGER AS $$
+DECLARE
+    fk record;
+    child_column text;
+    parent_column text;
+    parent_value text;
+    child_has_deleted_at boolean;
+    ref_exists boolean;
+    sql text;
+BEGIN
+    IF OLD.deleted_at IS NULL AND NEW.deleted_at IS NOT NULL THEN
+        FOR fk IN
+            SELECT conrelid::regclass AS child_table,
+                   conkey AS child_cols,
+                   confkey AS parent_cols,
+                   confdeltype
+            FROM pg_constraint
+            WHERE contype = 'f'
+              AND confrelid = TG_RELID
+        LOOP
+            IF array_length(fk.child_cols, 1) IS DISTINCT FROM 1
+                OR array_length(fk.parent_cols, 1) IS DISTINCT FROM 1 THEN
+                RAISE NOTICE 'soft_delete_handle_fk skipped composite fk on %', fk.child_table;
+                CONTINUE;
+            END IF;
+
+            SELECT attname INTO child_column
+            FROM pg_attribute
+            WHERE attrelid = fk.child_table
+              AND attnum = fk.child_cols[1]
+              AND NOT attisdropped;
+
+            SELECT attname INTO parent_column
+            FROM pg_attribute
+            WHERE attrelid = TG_RELID
+              AND attnum = fk.parent_cols[1]
+              AND NOT attisdropped;
+
+            EXECUTE format('SELECT ($1).%I', parent_column)
+                INTO parent_value
+                USING OLD;
+
+            SELECT EXISTS (
+                SELECT 1
+                FROM pg_attribute
+                WHERE attrelid = fk.child_table
+                  AND attname = 'deleted_at'
+                  AND NOT attisdropped
+            ) INTO child_has_deleted_at;
+
+            IF fk.confdeltype IN ('r', 'a') THEN
+                sql := format(
+                    'SELECT EXISTS (SELECT 1 FROM %s WHERE %I = $1 %s)',
+                    fk.child_table,
+                    child_column,
+                    CASE WHEN child_has_deleted_at THEN 'AND deleted_at IS NULL' ELSE '' END
+                );
+                EXECUTE sql INTO ref_exists USING parent_value;
+                IF ref_exists THEN
+                    RAISE EXCEPTION 'Cannot soft delete %, still referenced by %',
+                        TG_TABLE_NAME, fk.child_table;
+                END IF;
+            ELSIF fk.confdeltype = 'n' THEN
+                sql := format(
+                    'UPDATE %s SET %I = NULL WHERE %I = $1 %s',
+                    fk.child_table,
+                    child_column,
+                    child_column,
+                    CASE WHEN child_has_deleted_at THEN 'AND deleted_at IS NULL' ELSE '' END
+                );
+                EXECUTE sql USING parent_value;
+            ELSIF fk.confdeltype = 'c' THEN
+                IF child_has_deleted_at THEN
+                    sql := format(
+                        'UPDATE %s SET deleted_at = NOW() WHERE %I = $1 AND deleted_at IS NULL',
+                        fk.child_table,
+                        child_column
+                    );
+                    EXECUTE sql USING parent_value;
+                ELSE
+                    sql := format(
+                        'DELETE FROM %s WHERE %I = $1',
+                        fk.child_table,
+                        child_column
+                    );
+                    EXECUTE sql USING parent_value;
+                END IF;
+            ELSIF fk.confdeltype = 'd' THEN
+                sql := format(
+                    'UPDATE %s SET %I = DEFAULT WHERE %I = $1 %s',
+                    fk.child_table,
+                    child_column,
+                    child_column,
+                    CASE WHEN child_has_deleted_at THEN 'AND deleted_at IS NULL' ELSE '' END
+                );
+                EXECUTE sql USING parent_value;
+            END IF;
+        END LOOP;
+    END IF;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DO $$
+DECLARE
+    r record;
+    trigger_name text;
+BEGIN
+    FOR r IN
+        SELECT table_schema, table_name
+        FROM information_schema.columns
+        WHERE column_name = 'deleted_at'
+          AND table_schema = 'public'
+        GROUP BY table_schema, table_name
+    LOOP
+        trigger_name := format('trg_soft_delete_fk_%s', r.table_name);
+        EXECUTE format('DROP TRIGGER IF EXISTS %I ON %I.%I', trigger_name, r.table_schema, r.table_name);
+        EXECUTE format(
+            'CREATE TRIGGER %I BEFORE UPDATE OF deleted_at ON %I.%I FOR EACH ROW EXECUTE FUNCTION soft_delete_handle_fk()',
+            trigger_name,
+            r.table_schema,
+            r.table_name
+        );
+    END LOOP;
+END $$;
@@ -0,0 +1,142 @@
+CREATE OR REPLACE FUNCTION soft_delete_handle_fk() RETURNS TRIGGER AS $$
+DECLARE
+    fk record;
+    child_column text;
+    parent_column text;
+    parent_value text;
+    child_has_deleted_at boolean;
+    ref_exists boolean;
+    sql text;
+    child_type text;
+BEGIN
+    IF OLD.deleted_at IS NULL AND NEW.deleted_at IS NOT NULL THEN
+        FOR fk IN
+            SELECT conrelid::regclass AS child_table,
+                   conkey AS child_cols,
+                   confkey AS parent_cols,
+                   confdeltype
+            FROM pg_constraint
+            WHERE contype = 'f'
+              AND confrelid = TG_RELID
+        LOOP
+            IF array_length(fk.child_cols, 1) IS DISTINCT FROM 1
+                OR array_length(fk.parent_cols, 1) IS DISTINCT FROM 1 THEN
+                RAISE NOTICE 'soft_delete_handle_fk skipped composite fk on %', fk.child_table;
+                CONTINUE;
+            END IF;
+
+            SELECT attname INTO child_column
+            FROM pg_attribute
+            WHERE attrelid = fk.child_table
+              AND attnum = fk.child_cols[1]
+              AND NOT attisdropped;
+
+            SELECT attname INTO parent_column
+            FROM pg_attribute
+            WHERE attrelid = TG_RELID
+              AND attnum = fk.parent_cols[1]
+              AND NOT attisdropped;
+
+            SELECT format_type(atttypid, atttypmod) INTO child_type
+            FROM pg_attribute
+            WHERE attrelid = fk.child_table
+              AND attname = child_column
+              AND NOT attisdropped;
+
+            IF child_type IS NULL THEN
+                child_type := 'text';
+            END IF;
+
+            EXECUTE format('SELECT ($1).%I', parent_column)
+                INTO parent_value
+                USING OLD;
+
+            SELECT EXISTS (
+                SELECT 1
+                FROM pg_attribute
+                WHERE attrelid = fk.child_table
+                  AND attname = 'deleted_at'
+                  AND NOT attisdropped
+            ) INTO child_has_deleted_at;
+
+            IF fk.confdeltype IN ('r', 'a') THEN
+                sql := format(
+                    'SELECT EXISTS (SELECT 1 FROM %s WHERE %I = $1::%s %s)',
+                    fk.child_table,
+                    child_column,
+                    child_type,
+                    CASE WHEN child_has_deleted_at THEN 'AND deleted_at IS NULL' ELSE '' END
+                );
+                EXECUTE sql INTO ref_exists USING parent_value;
+                IF ref_exists THEN
+                    RAISE EXCEPTION 'Cannot soft delete %, still referenced by %',
+                        TG_TABLE_NAME, fk.child_table;
+                END IF;
+            ELSIF fk.confdeltype = 'n' THEN
+                sql := format(
+                    'UPDATE %s SET %I = NULL WHERE %I = $1::%s %s',
+                    fk.child_table,
+                    child_column,
+                    child_column,
+                    child_type,
+                    CASE WHEN child_has_deleted_at THEN 'AND deleted_at IS NULL' ELSE '' END
+                );
+                EXECUTE sql USING parent_value;
+            ELSIF fk.confdeltype = 'c' THEN
+                IF child_has_deleted_at THEN
+                    sql := format(
+                        'UPDATE %s SET deleted_at = NOW() WHERE %I = $1::%s AND deleted_at IS NULL',
+                        fk.child_table,
+                        child_column,
+                        child_type
+                    );
+                    EXECUTE sql USING parent_value;
+                ELSE
+                    sql := format(
+                        'DELETE FROM %s WHERE %I = $1::%s',
+                        fk.child_table,
+                        child_column,
+                        child_type
+                    );
+                    EXECUTE sql USING parent_value;
+                END IF;
+            ELSIF fk.confdeltype = 'd' THEN
+                sql := format(
+                    'UPDATE %s SET %I = DEFAULT WHERE %I = $1::%s %s',
+                    fk.child_table,
+                    child_column,
+                    child_column,
+                    child_type,
+                    CASE WHEN child_has_deleted_at THEN 'AND deleted_at IS NULL' ELSE '' END
+                );
+                EXECUTE sql USING parent_value;
+            END IF;
+        END LOOP;
+    END IF;
+
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DO $$
+DECLARE
+    r record;
+    trigger_name text;
+BEGIN
+    FOR r IN
+        SELECT table_schema, table_name
+        FROM information_schema.columns
+        WHERE column_name = 'deleted_at'
+          AND table_schema = 'public'
+        GROUP BY table_schema, table_name
+    LOOP
+        trigger_name := format('trg_soft_delete_fk_%s', r.table_name);
+        EXECUTE format('DROP TRIGGER IF EXISTS %I ON %I.%I', trigger_name, r.table_schema, r.table_name);
+        EXECUTE format(
+            'CREATE TRIGGER %I BEFORE UPDATE OF deleted_at ON %I.%I FOR EACH ROW EXECUTE FUNCTION soft_delete_handle_fk()',
+            trigger_name,
+            r.table_schema,
+            r.table_name
+        );
+    END LOOP;
+END $$;
@@ -0,0 +1,86 @@
+BEGIN;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'fk_project_flock_kandang_uniformity_project_flock_kandang'
+    ) THEN
+        ALTER TABLE project_flock_kandang_uniformity
+            DROP CONSTRAINT fk_project_flock_kandang_uniformity_project_flock_kandang;
+    END IF;
+END $$;
+
+ALTER TABLE project_flock_kandang_uniformity
+    ADD CONSTRAINT fk_project_flock_kandang_uniformity_project_flock_kandang
+        FOREIGN KEY (project_flock_kandang_id)
+        REFERENCES project_flock_kandangs (id)
+        ON DELETE RESTRICT ON UPDATE CASCADE;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_tables
+        WHERE tablename = 'project_budgets'
+    ) THEN
+        IF EXISTS (
+            SELECT 1
+            FROM pg_constraint
+            WHERE conname = 'fk_project_budgets_project_flock_id'
+        ) THEN
+            ALTER TABLE project_budgets
+                DROP CONSTRAINT fk_project_budgets_project_flock_id;
+        END IF;
+
+        ALTER TABLE project_budgets
+            ADD CONSTRAINT fk_project_budgets_project_flock_id
+            FOREIGN KEY (project_flock_id)
+            REFERENCES project_flocks(id);
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_tables
+        WHERE tablename = 'project_flock_kandang_uniformity'
+    ) THEN
+        IF NOT EXISTS (
+            SELECT 1
+            FROM information_schema.columns
+            WHERE table_schema = 'public'
+              AND table_name = 'project_flock_kandang_uniformity'
+              AND column_name = 'created_at'
+        ) THEN
+            ALTER TABLE project_flock_kandang_uniformity
+                ADD COLUMN created_at TIMESTAMPTZ DEFAULT NOW();
+        END IF;
+
+        IF NOT EXISTS (
+            SELECT 1
+            FROM information_schema.columns
+            WHERE table_schema = 'public'
+              AND table_name = 'project_flock_kandang_uniformity'
+              AND column_name = 'updated_at'
+        ) THEN
+            ALTER TABLE project_flock_kandang_uniformity
+                ADD COLUMN updated_at TIMESTAMPTZ DEFAULT NOW();
+        END IF;
+
+        IF NOT EXISTS (
+            SELECT 1
+            FROM information_schema.columns
+            WHERE table_schema = 'public'
+              AND table_name = 'project_flock_kandang_uniformity'
+              AND column_name = 'deleted_at'
+        ) THEN
+            ALTER TABLE project_flock_kandang_uniformity
+                ADD COLUMN deleted_at TIMESTAMPTZ;
+        END IF;
+    END IF;
+END $$;
+
+COMMIT;
@@ -0,0 +1,90 @@
+BEGIN;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'fk_project_flock_kandang_uniformity_project_flock_kandang'
+    ) THEN
+        ALTER TABLE project_flock_kandang_uniformity
+            DROP CONSTRAINT fk_project_flock_kandang_uniformity_project_flock_kandang;
+    END IF;
+END $$;
+
+ALTER TABLE project_flock_kandang_uniformity
+    ADD CONSTRAINT fk_project_flock_kandang_uniformity_project_flock_kandang
+        FOREIGN KEY (project_flock_kandang_id)
+        REFERENCES project_flock_kandangs (id)
+        ON DELETE CASCADE ON UPDATE CASCADE;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_tables
+        WHERE tablename = 'project_budgets'
+    ) THEN
+        IF EXISTS (
+            SELECT 1
+            FROM pg_constraint
+            WHERE conname = 'fk_project_budgets_project_flock_id'
+        ) THEN
+            ALTER TABLE project_budgets
+                DROP CONSTRAINT fk_project_budgets_project_flock_id;
+        END IF;
+
+        ALTER TABLE project_budgets
+            ADD CONSTRAINT fk_project_budgets_project_flock_id
+            FOREIGN KEY (project_flock_id)
+            REFERENCES project_flocks(id)
+            ON DELETE CASCADE ON UPDATE CASCADE;
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_trigger
+        WHERE tgname = 'trg_soft_delete_fk_project_flock_kandang_uniformity'
+    ) THEN
+        DROP TRIGGER trg_soft_delete_fk_project_flock_kandang_uniformity
+        ON project_flock_kandang_uniformity;
+    END IF;
+
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'project_flock_kandang_uniformity'
+          AND column_name = 'created_at'
+    ) THEN
+        ALTER TABLE project_flock_kandang_uniformity
+            DROP COLUMN created_at;
+    END IF;
+
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'project_flock_kandang_uniformity'
+          AND column_name = 'updated_at'
+    ) THEN
+        ALTER TABLE project_flock_kandang_uniformity
+            DROP COLUMN updated_at;
+    END IF;
+
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'project_flock_kandang_uniformity'
+          AND column_name = 'deleted_at'
+    ) THEN
+        ALTER TABLE project_flock_kandang_uniformity
+            DROP COLUMN deleted_at;
+    END IF;
+END $$;
+
+COMMIT;
@@ -0,0 +1,14 @@
+-- Drop tables in correct order (child tables before parent tables)
+DROP TABLE IF EXISTS daily_checklist_activity_task_assignments; -- Child table with FK to daily_checklist_activity_tasks
+DROP TABLE IF EXISTS daily_checklist_activity_task_assignees;
+DROP TABLE IF EXISTS daily_checklist_activity_tasks;
+DROP TABLE IF EXISTS daily_checklist_tasks;
+DROP TABLE IF EXISTS daily_checklist_phases;
+DROP TABLE IF EXISTS daily_checklists;
+DROP TABLE IF EXISTS checklists;
+DROP TABLE IF EXISTS phase_activities;
+DROP TABLE IF EXISTS phases;
+DROP TABLE IF EXISTS employee_kandangs;
+DROP TABLE IF EXISTS employees;
+
+DROP TYPE IF EXISTS category_code;
@@ -0,0 +1,194 @@
+CREATE TYPE category_code AS ENUM (
+    'pullet_open',
+    'pullet_close',
+    'produksi_open',
+    'produksi_close'
+);
+
+-- MASTER TABLES
+
+CREATE TABLE employees (
+  id          bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  name        varchar NOT NULL,
+  is_active   boolean NOT NULL DEFAULT true,
+  created_at  timestamptz NOT NULL DEFAULT now(),
+  updated_at  timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE employee_kandangs (
+  id           bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  employee_id  bigint NOT NULL,
+  kandang_id   bigint NOT NULL,
+  created_at   timestamptz NOT NULL DEFAULT now(),
+  updated_at   timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_employee_kandangs_employee
+    FOREIGN KEY (employee_id) REFERENCES employees(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_employee_kandangs_kandang
+    FOREIGN KEY (kandang_id) REFERENCES kandangs(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT uq_employee_kandangs UNIQUE (employee_id, kandang_id)
+);
+
+-- PHASE & CHECKLIST
+
+CREATE TABLE phases (
+  id          bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  name        varchar NOT NULL,
+  is_active   boolean NOT NULL DEFAULT true,
+  category    category_code NOT NULL,
+  created_at  timestamptz NOT NULL DEFAULT now()
+);
+
+CREATE TABLE phase_activities (
+  id          bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  phase_id    bigint NOT NULL,
+  name        varchar NOT NULL,
+  description text,
+  time_type   text,
+  created_at  timestamptz NOT NULL DEFAULT now(),
+  updated_at  timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_phase_activities_phase
+    FOREIGN KEY (phase_id) REFERENCES phases(id)
+    ON DELETE CASCADE
+);
+
+CREATE TABLE checklists (
+  id          bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  name        varchar NOT NULL,
+  description text,
+  phase_id    bigint,
+  created_at  timestamptz NOT NULL DEFAULT now(),
+  updated_at  timestamptz NOT NULL DEFAULT now(),
+  deleted_at  timestamptz,
+
+  CONSTRAINT fk_checklists_phase
+    FOREIGN KEY (phase_id) REFERENCES phases(id)
+    ON DELETE SET NULL
+);
+
+
+-- DAILY CHECKLISTS
+CREATE TABLE daily_checklists (
+  id            bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  kandang_id    bigint NOT NULL,
+  checklist_id  bigint NOT NULL,
+  date          date NOT NULL,
+  name          varchar,
+  status        varchar,
+  category      category_code NOT NULL,
+  total_score   integer,
+  document_path varchar,
+  reject_reason text,
+  created_by    bigint,
+  created_at    timestamptz NOT NULL DEFAULT now(),
+  updated_at    timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_daily_checklists_kandang
+    FOREIGN KEY (kandang_id) REFERENCES kandangs(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_daily_checklists_checklist
+    FOREIGN KEY (checklist_id) REFERENCES checklists(id)
+    ON DELETE RESTRICT,
+
+  CONSTRAINT fk_daily_checklists_created_by
+    FOREIGN KEY (created_by) REFERENCES users(id)
+    ON DELETE SET NULL
+);
+
+
+--RELASI CHECKLIST ⇄ PHASE
+
+CREATE TABLE daily_checklist_phases (
+  id           bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  checklist_id bigint NOT NULL,
+  phase_id     bigint NOT NULL,
+  created_at   timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_dcp_checklist
+    FOREIGN KEY (checklist_id) REFERENCES checklists(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_dcp_phase
+    FOREIGN KEY (phase_id) REFERENCES phases(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT uq_daily_checklist_phases UNIQUE (checklist_id, phase_id)
+);
+
+
+--ACTIVITY TASKS & ASSIGNMENT
+
+
+CREATE TABLE daily_checklist_activity_tasks (
+  id               bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  checklist_id     bigint NOT NULL,
+  phase_id         bigint NOT NULL,
+  phase_activity_id bigint NOT NULL,
+  time_type        text,
+  notes            text,
+  created_at       timestamptz NOT NULL DEFAULT now(),
+  updated_at       timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_dcat_checklist
+    FOREIGN KEY (checklist_id) REFERENCES checklists(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_dcat_phase
+    FOREIGN KEY (phase_id) REFERENCES phases(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_dcat_phase_activity
+    FOREIGN KEY (phase_activity_id) REFERENCES phase_activities(id)
+    ON DELETE CASCADE
+);
+
+CREATE TABLE daily_checklist_activity_task_assignments (
+  id          bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  task_id     bigint NOT NULL,
+  employee_id bigint NOT NULL,
+  checked     boolean NOT NULL DEFAULT false,
+  note        text,
+  created_at  timestamptz NOT NULL DEFAULT now(),
+  updated_at  timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_assignment_task
+    FOREIGN KEY (task_id) REFERENCES daily_checklist_activity_tasks(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_assignment_employee
+    FOREIGN KEY (employee_id) REFERENCES employees(id)
+    ON DELETE CASCADE
+);
+
+--DAILY CHECKLIST TASK RESULT
+CREATE TABLE daily_checklist_tasks (
+  id                bigint GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
+  daily_checklist_id bigint NOT NULL,
+  checklist_id      bigint NOT NULL,
+  checklist_item_id bigint,
+  is_completed      boolean NOT NULL DEFAULT false,
+  score_value       integer,
+  notes             text,
+  photo_proof       varchar,
+  status            varchar,
+  created_at        timestamptz NOT NULL DEFAULT now(),
+  updated_at        timestamptz NOT NULL DEFAULT now(),
+
+  CONSTRAINT fk_dct_daily
+    FOREIGN KEY (daily_checklist_id) REFERENCES daily_checklists(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_dct_checklist
+    FOREIGN KEY (checklist_id) REFERENCES checklists(id)
+    ON DELETE CASCADE,
+
+  CONSTRAINT fk_dct_checklist_item
+    FOREIGN KEY (checklist_item_id) REFERENCES phase_activities(id)
+    ON DELETE SET NULL
+);
@@ -0,0 +1,21 @@
+BEGIN;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'fk_recordings_project_flock_kandang'
+    ) THEN
+        ALTER TABLE recordings
+            DROP CONSTRAINT fk_recordings_project_flock_kandang;
+    END IF;
+END $$;
+
+ALTER TABLE recordings
+    ADD CONSTRAINT fk_recordings_project_flock_kandang
+        FOREIGN KEY (project_flock_kandangs_id)
+        REFERENCES project_flock_kandangs (id)
+        ON DELETE RESTRICT ON UPDATE CASCADE;
+
+COMMIT;
@@ -0,0 +1,21 @@
+BEGIN;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM pg_constraint
+        WHERE conname = 'fk_recordings_project_flock_kandang'
+    ) THEN
+        ALTER TABLE recordings
+            DROP CONSTRAINT fk_recordings_project_flock_kandang;
+    END IF;
+END $$;
+
+ALTER TABLE recordings
+    ADD CONSTRAINT fk_recordings_project_flock_kandang
+        FOREIGN KEY (project_flock_kandangs_id)
+        REFERENCES project_flock_kandangs (id)
+        ON DELETE CASCADE ON UPDATE CASCADE;
+
+COMMIT;
@@ -0,0 +1,2 @@
+ALTER TABLE daily_checklists
+    DROP CONSTRAINT IF EXISTS daily_checklists_date_kandang_category_key;
@@ -0,0 +1,3 @@
+ALTER TABLE daily_checklists
+    ADD CONSTRAINT daily_checklists_date_kandang_category_key
+    UNIQUE (date, kandang_id, category);
@@ -0,0 +1,2 @@
+ALTER TABLE daily_checklists
+    ALTER COLUMN checklist_id SET NOT NULL;
@@ -0,0 +1,2 @@
+ALTER TABLE daily_checklists
+    ALTER COLUMN checklist_id DROP NOT NULL;
@@ -0,0 +1,4 @@
+ALTER TABLE daily_checklist_phases
+    DROP CONSTRAINT IF EXISTS fk_dcp_daily_checklist,
+    ADD CONSTRAINT fk_dcp_checklist
+        FOREIGN KEY (checklist_id) REFERENCES checklists(id) ON DELETE CASCADE;
@@ -0,0 +1,4 @@
+ALTER TABLE daily_checklist_phases
+    DROP CONSTRAINT IF EXISTS fk_dcp_checklist,
+    ADD CONSTRAINT fk_dcp_daily_checklist
+        FOREIGN KEY (checklist_id) REFERENCES daily_checklists(id) ON DELETE CASCADE;
@@ -0,0 +1,15 @@
+-- Revert back to NO ACTION (RESTRICT behavior)
+ALTER TABLE expense_nonstocks DROP CONSTRAINT IF EXISTS fk_expense_nonstocks_expense_id;
+
+ALTER TABLE expense_nonstocks
+    ADD CONSTRAINT fk_expense_nonstocks_expense_id
+    FOREIGN KEY (expense_id) REFERENCES expenses(id)
+    ON DELETE NO ACTION;
+
+-- Revert expense_realizations FK
+ALTER TABLE expense_realizations DROP CONSTRAINT IF EXISTS fk_expense_realizations_nonstock_id;
+
+ALTER TABLE expense_realizations
+    ADD CONSTRAINT fk_expense_realizations_nonstock_id
+    FOREIGN KEY (expense_nonstock_id) REFERENCES expense_nonstocks(id)
+    ON DELETE NO ACTION;
@@ -0,0 +1,16 @@
+-- Drop existing FK constraints
+ALTER TABLE expense_nonstocks DROP CONSTRAINT IF EXISTS fk_expense_nonstocks_expense_id;
+
+-- Recreate with ON DELETE CASCADE
+ALTER TABLE expense_nonstocks
+    ADD CONSTRAINT fk_expense_nonstocks_expense_id
+    FOREIGN KEY (expense_id) REFERENCES expenses(id)
+    ON DELETE CASCADE;
+
+-- Drop and recreate expense_realizations FK
+ALTER TABLE expense_realizations DROP CONSTRAINT IF EXISTS fk_expense_realizations_nonstock_id;
+
+ALTER TABLE expense_realizations
+    ADD CONSTRAINT fk_expense_realizations_nonstock_id
+    FOREIGN KEY (expense_nonstock_id) REFERENCES expense_nonstocks(id)
+    ON DELETE CASCADE;
@@ -0,0 +1,20 @@
+-- Revert back to NO ACTION (for rollback safety)
+DO $$
+BEGIN
+    ALTER TABLE marketing_products DROP CONSTRAINT IF EXISTS fk_marketing_products_marketing_id;
+
+    ALTER TABLE marketing_products
+        ADD CONSTRAINT fk_marketing_products_marketing_id
+        FOREIGN KEY (marketing_id) REFERENCES marketings(id)
+        ON DELETE NO ACTION;
+END $$;
+
+DO $$
+BEGIN
+    ALTER TABLE marketing_delivery_products DROP CONSTRAINT IF EXISTS fk_marketing_delivery_products_marketing_product_id;
+
+    ALTER TABLE marketing_delivery_products
+        ADD CONSTRAINT fk_marketing_delivery_products_marketing_product_id
+        FOREIGN KEY (marketing_product_id) REFERENCES marketing_products(id)
+        ON DELETE NO ACTION;
+END $$;
@@ -0,0 +1,35 @@
+-- Ensure marketing_products FK is CASCADE (it should already be, but let's make sure)
+DO $$
+BEGIN
+    -- Drop existing FK if exists
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'fk_marketing_products_marketing_id'
+    ) THEN
+        ALTER TABLE marketing_products DROP CONSTRAINT fk_marketing_products_marketing_id;
+    END IF;
+
+    -- Recreate with ON DELETE CASCADE
+    ALTER TABLE marketing_products
+        ADD CONSTRAINT fk_marketing_products_marketing_id
+        FOREIGN KEY (marketing_id) REFERENCES marketings(id)
+        ON DELETE CASCADE;
+END $$;
+
+-- Ensure marketing_delivery_products FK is CASCADE
+DO $$
+BEGIN
+    -- Drop existing FK if exists
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'fk_marketing_delivery_products_marketing_product_id'
+    ) THEN
+        ALTER TABLE marketing_delivery_products DROP CONSTRAINT fk_marketing_delivery_products_marketing_product_id;
+    END IF;
+
+    -- Recreate with ON DELETE CASCADE
+    ALTER TABLE marketing_delivery_products
+        ADD CONSTRAINT fk_marketing_delivery_products_marketing_product_id
+        FOREIGN KEY (marketing_product_id) REFERENCES marketing_products(id)
+        ON DELETE CASCADE;
+END $$;
@@ -0,0 +1,9 @@
+-- Drop foreign key and column
+ALTER TABLE laying_transfers
+DROP CONSTRAINT IF EXISTS fk_laying_transfers_product_warehouse_id;
+
+ALTER TABLE laying_transfers
+DROP COLUMN IF EXISTS product_warehouse_id;
+
+-- Drop index
+DROP INDEX IF EXISTS idx_laying_transfers_product_warehouse_id;
@@ -0,0 +1,19 @@
+-- Add product_warehouse_id to laying_transfers for FIFO support
+ALTER TABLE laying_transfers
+ADD COLUMN product_warehouse_id BIGINT;
+
+-- Add foreign key
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
+        ALTER TABLE laying_transfers
+            ADD CONSTRAINT fk_laying_transfers_product_warehouse_id
+            FOREIGN KEY (product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE SET NULL;
+    END IF;
+END $$;
+
+-- Add index
+CREATE INDEX idx_laying_transfers_product_warehouse_id
+ON laying_transfers(product_warehouse_id);
@@ -0,0 +1,4 @@
+ALTER TABLE daily_checklist_activity_tasks
+    DROP CONSTRAINT IF EXISTS fk_dcat_daily_checklist,
+    ADD CONSTRAINT fk_dcat_checklist
+        FOREIGN KEY (checklist_id) REFERENCES checklists(id) ON DELETE CASCADE;
@@ -0,0 +1,4 @@
+ALTER TABLE daily_checklist_activity_tasks
+    DROP CONSTRAINT IF EXISTS fk_dcat_checklist,
+    ADD CONSTRAINT fk_dcat_daily_checklist
+        FOREIGN KEY (checklist_id) REFERENCES daily_checklists(id) ON DELETE CASCADE;
@@ -0,0 +1,14 @@
+-- Rollback: Remove STOCKABLE fields from laying_transfers
+
+-- Drop index
+DROP INDEX IF EXISTS idx_laying_transfers_dest_product_warehouse_id;
+
+-- Drop foreign key constraint
+ALTER TABLE laying_transfers
+DROP CONSTRAINT IF EXISTS fk_laying_transfers_dest_product_warehouse_id;
+
+-- Drop columns
+ALTER TABLE laying_transfers
+DROP COLUMN IF EXISTS dest_product_warehouse_id,
+DROP COLUMN IF EXISTS total_qty,
+DROP COLUMN IF EXISTS total_used;
@@ -0,0 +1,30 @@
+-- Add STOCKABLE fields to laying_transfers for destination warehouse
+-- This enables Transfer to Laying to work as DUAL ROLE (Stockable + Usable)
+
+-- Add columns for STOCKABLE role (destination warehouse)
+ALTER TABLE laying_transfers
+ADD COLUMN dest_product_warehouse_id BIGINT,
+ADD COLUMN total_qty NUMERIC(15, 3) DEFAULT 0,
+ADD COLUMN total_used NUMERIC(15, 3) DEFAULT 0;
+
+-- Add foreign key constraint
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
+        ALTER TABLE laying_transfers
+            ADD CONSTRAINT fk_laying_transfers_dest_product_warehouse_id
+            FOREIGN KEY (dest_product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE SET NULL;
+    END IF;
+END $$;
+
+-- Add index for performance
+CREATE INDEX idx_laying_transfers_dest_product_warehouse_id
+ON laying_transfers(dest_product_warehouse_id);
+
+-- Add comment for documentation
+COMMENT ON COLUMN laying_transfers.product_warehouse_id IS 'Product warehouse at source (Growing flock) - for USABLE role';
+COMMENT ON COLUMN laying_transfers.dest_product_warehouse_id IS 'Product warehouse at destination (Laying flock) - for STOCKABLE role';
+COMMENT ON COLUMN laying_transfers.total_qty IS 'Total lot quantity introduced to destination warehouse - for STOCKABLE role';
+COMMENT ON COLUMN laying_transfers.total_used IS 'Quantity already consumed from this lot at destination - for STOCKABLE role';
@@ -0,0 +1,2 @@
+ALTER TABLE daily_checklist_activity_task_assignments
+    DROP CONSTRAINT IF EXISTS daily_checklist_activity_task_assignments_task_employee_key;
@@ -0,0 +1,3 @@
+ALTER TABLE daily_checklist_activity_task_assignments
+    ADD CONSTRAINT daily_checklist_activity_task_assignments_task_employee_key
+    UNIQUE (task_id, employee_id);
@@ -0,0 +1,8 @@
+ALTER TABLE phase_activities
+    DROP COLUMN IF EXISTS deleted_at;
+
+ALTER TABLE phases
+    DROP COLUMN IF EXISTS deleted_at;
+
+ALTER TABLE employees
+    DROP COLUMN IF EXISTS deleted_at;
@@ -0,0 +1,8 @@
+ALTER TABLE employees
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
+
+ALTER TABLE phases
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
+
+ALTER TABLE phase_activities
+    ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
@@ -0,0 +1,7 @@
+-- Remove chart_data, uniform_date, and related indexes
+DROP INDEX IF EXISTS idx_project_flock_kandang_uniformity_uniform_date;
+DROP INDEX IF EXISTS idx_project_flock_kandang_uniformity_unique;
+
+ALTER TABLE project_flock_kandang_uniformity
+    DROP COLUMN IF EXISTS chart_data,
+    DROP COLUMN IF EXISTS uniform_date;
@@ -0,0 +1,25 @@
+-- Add uniform_date (if missing), chart_data, and unique constraint for uniformity records
+ALTER TABLE project_flock_kandang_uniformity
+    ADD COLUMN IF NOT EXISTS uniform_date TIMESTAMPTZ,
+    ADD COLUMN IF NOT EXISTS chart_data JSONB;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_schema = 'public'
+          AND table_name = 'project_flock_kandang_uniformity'
+          AND column_name = 'deleted_at'
+    ) THEN
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_unique
+            ON project_flock_kandang_uniformity (project_flock_kandang_id, week, uniform_date)
+            WHERE deleted_at IS NULL;
+    ELSE
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_unique
+            ON project_flock_kandang_uniformity (project_flock_kandang_id, week, uniform_date);
+    END IF;
+END $$;
+
+CREATE INDEX IF NOT EXISTS idx_project_flock_kandang_uniformity_uniform_date
+    ON project_flock_kandang_uniformity (uniform_date);
@@ -0,0 +1,4 @@
+-- Remove expense_nonstock_id from stock_transfer_details
+ALTER TABLE stock_transfer_details DROP CONSTRAINT IF EXISTS fk_stock_transfer_details_expense_nonstock;
+ALTER TABLE stock_transfer_details DROP COLUMN IF EXISTS expense_nonstock_id;
+DROP INDEX IF EXISTS idx_stock_transfer_details_expense_nonstock_id;
@@ -0,0 +1,10 @@
+-- Add expense_nonstock_id to stock_transfer_details
+-- This allows tracking expedition/transport costs for stock transfers (same as purchase)
+
+ALTER TABLE stock_transfer_details
+ADD COLUMN expense_nonstock_id BIGINT,
+ADD CONSTRAINT fk_stock_transfer_details_expense_nonstock
+FOREIGN KEY (expense_nonstock_id) REFERENCES expense_nonstocks(id) ON DELETE SET NULL;
+
+-- Create index for better query performance
+CREATE INDEX idx_stock_transfer_details_expense_nonstock_id ON stock_transfer_details(expense_nonstock_id);
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS config_checklists;
@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS config_checklists (
+    id BIGSERIAL PRIMARY KEY,
+    date DATE NOT NULL,
+    percentage_threshold_bad INTEGER NOT NULL,
+    percentage_threshold_enough INTEGER NOT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    deleted_at TIMESTAMPTZ
+);
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE payments
+    DROP COLUMN IF EXISTS party_account_number;
+
+COMMIT;
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE payments
+    ADD COLUMN IF NOT EXISTS party_account_number VARCHAR(50);
+
+COMMIT;
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS projects;
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS projects;
@@ -0,0 +1,20 @@
+-- Revert master data foreign keys to CASCADE delete (except FCR)
+ALTER TABLE nonstock_suppliers
+    DROP CONSTRAINT IF EXISTS nonstock_suppliers_nonstock_id_fkey,
+    DROP CONSTRAINT IF EXISTS nonstock_suppliers_supplier_id_fkey;
+
+ALTER TABLE nonstock_suppliers
+    ADD CONSTRAINT nonstock_suppliers_nonstock_id_fkey FOREIGN KEY (nonstock_id)
+        REFERENCES nonstocks (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    ADD CONSTRAINT nonstock_suppliers_supplier_id_fkey FOREIGN KEY (supplier_id)
+        REFERENCES suppliers (id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE product_suppliers
+    DROP CONSTRAINT IF EXISTS product_suppliers_product_id_fkey,
+    DROP CONSTRAINT IF EXISTS product_suppliers_supplier_id_fkey;
+
+ALTER TABLE product_suppliers
+    ADD CONSTRAINT product_suppliers_product_id_fkey FOREIGN KEY (product_id)
+        REFERENCES products (id) ON DELETE CASCADE ON UPDATE CASCADE,
+    ADD CONSTRAINT product_suppliers_supplier_id_fkey FOREIGN KEY (supplier_id)
+        REFERENCES suppliers (id) ON DELETE CASCADE ON UPDATE CASCADE;
@@ -0,0 +1,20 @@
+-- Update master data foreign keys to RESTRICT delete (except FCR)
+ALTER TABLE nonstock_suppliers
+    DROP CONSTRAINT IF EXISTS nonstock_suppliers_nonstock_id_fkey,
+    DROP CONSTRAINT IF EXISTS nonstock_suppliers_supplier_id_fkey;
+
+ALTER TABLE nonstock_suppliers
+    ADD CONSTRAINT nonstock_suppliers_nonstock_id_fkey FOREIGN KEY (nonstock_id)
+        REFERENCES nonstocks (id) ON DELETE RESTRICT ON UPDATE CASCADE,
+    ADD CONSTRAINT nonstock_suppliers_supplier_id_fkey FOREIGN KEY (supplier_id)
+        REFERENCES suppliers (id) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE product_suppliers
+    DROP CONSTRAINT IF EXISTS product_suppliers_product_id_fkey,
+    DROP CONSTRAINT IF EXISTS product_suppliers_supplier_id_fkey;
+
+ALTER TABLE product_suppliers
+    ADD CONSTRAINT product_suppliers_product_id_fkey FOREIGN KEY (product_id)
+        REFERENCES products (id) ON DELETE RESTRICT ON UPDATE CASCADE,
+    ADD CONSTRAINT product_suppliers_supplier_id_fkey FOREIGN KEY (supplier_id)
+        REFERENCES suppliers (id) ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -0,0 +1,79 @@
+-- Rollback: Revert FIFO fields back to laying_transfers from detail tables
+
+-- ============================================================================
+-- PART 1: Remove FIFO columns from detail tables
+-- ============================================================================
+
+-- Add back old qty column first
+ALTER TABLE laying_transfer_sources
+    ADD COLUMN IF NOT EXISTS qty NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+ALTER TABLE laying_transfer_targets
+    ADD COLUMN IF NOT EXISTS qty NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+-- Now drop FIFO columns
+ALTER TABLE laying_transfer_sources
+    DROP COLUMN IF EXISTS usage_qty,
+    DROP COLUMN IF EXISTS pending_usage_qty;
+
+ALTER TABLE laying_transfer_targets
+    DROP COLUMN IF EXISTS total_qty,
+    DROP COLUMN IF EXISTS total_used;
+
+-- ============================================================================
+-- PART 2: Add back FIFO columns to laying_transfers table
+-- ============================================================================
+
+-- Add columns back for USABLE role (source warehouse)
+ALTER TABLE laying_transfers
+    ADD COLUMN product_warehouse_id BIGINT,
+    ADD COLUMN pending_usage_qty NUMERIC(15, 3),
+    ADD COLUMN usage_qty NUMERIC(15, 3);
+
+-- Add columns back for STOCKABLE role (destination warehouse)
+ALTER TABLE laying_transfers
+    ADD COLUMN dest_product_warehouse_id BIGINT,
+    ADD COLUMN total_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL,
+    ADD COLUMN total_used NUMERIC(15, 3) DEFAULT 0 NOT NULL;
+
+-- ============================================================================
+-- PART 3: Recreate foreign key constraints
+-- ============================================================================
+
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
+        -- Add source product warehouse FK
+        ALTER TABLE laying_transfers
+            ADD CONSTRAINT fk_laying_transfers_product_warehouse_id
+            FOREIGN KEY (product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE SET NULL;
+
+        -- Add destination product warehouse FK
+        ALTER TABLE laying_transfers
+            ADD CONSTRAINT fk_laying_transfers_dest_product_warehouse_id
+            FOREIGN KEY (dest_product_warehouse_id)
+            REFERENCES product_warehouses(id)
+            ON DELETE SET NULL;
+    END IF;
+END $$;
+
+-- ============================================================================
+-- PART 4: Recreate indexes for performance
+-- ============================================================================
+
+CREATE INDEX idx_laying_transfers_product_warehouse_id
+    ON laying_transfers(product_warehouse_id);
+
+CREATE INDEX idx_laying_transfers_dest_product_warehouse_id
+    ON laying_transfers(dest_product_warehouse_id);
+
+-- ============================================================================
+-- PART 5: Recreate comments for documentation
+-- ============================================================================
+
+COMMENT ON COLUMN laying_transfers.product_warehouse_id IS 'Product warehouse at source (Growing flock) - for USABLE role';
+COMMENT ON COLUMN laying_transfers.dest_product_warehouse_id IS 'Product warehouse at destination (Laying flock) - for STOCKABLE role';
+COMMENT ON COLUMN laying_transfers.total_qty IS 'Total lot quantity introduced to destination warehouse - for STOCKABLE role';
+COMMENT ON COLUMN laying_transfers.total_used IS 'Quantity already consumed from this lot at destination - for FIFO STOCKABLE role';
@@ -0,0 +1,73 @@
+-- Move FIFO fields from laying_transfers to detail tables (sources & targets)
+-- This enables proper FIFO integration for transfer laying with multiple sources and targets
+
+-- ============================================================================
+-- PART 1: Remove FIFO-related columns from laying_transfers table
+-- ============================================================================
+
+-- Drop foreign key constraints first
+DO $$
+BEGIN
+    -- Drop source product warehouse FK
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'fk_laying_transfers_product_warehouse_id'
+    ) THEN
+        ALTER TABLE laying_transfers
+            DROP CONSTRAINT fk_laying_transfers_product_warehouse_id;
+    END IF;
+
+    -- Drop destination product warehouse FK
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint
+        WHERE conname = 'fk_laying_transfers_dest_product_warehouse_id'
+    ) THEN
+        ALTER TABLE laying_transfers
+            DROP CONSTRAINT fk_laying_transfers_dest_product_warehouse_id;
+    END IF;
+END $$;
+
+-- Drop indexes
+DROP INDEX IF EXISTS idx_laying_transfers_product_warehouse_id;
+DROP INDEX IF EXISTS idx_laying_transfers_dest_product_warehouse_id;
+
+-- Remove columns from laying_transfers
+ALTER TABLE laying_transfers
+    DROP COLUMN IF EXISTS product_warehouse_id,
+    DROP COLUMN IF EXISTS dest_product_warehouse_id,
+    DROP COLUMN IF EXISTS pending_usage_qty,
+    DROP COLUMN IF EXISTS usage_qty,
+    DROP COLUMN IF EXISTS total_qty,
+    DROP COLUMN IF EXISTS total_used;
+
+-- ============================================================================
+-- PART 2: Add FIFO columns to laying_transfer_sources (USABLE role)
+-- ============================================================================
+
+ALTER TABLE laying_transfer_sources
+    ADD COLUMN usage_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL,
+    ADD COLUMN pending_usage_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL;
+
+-- Add comments for documentation
+COMMENT ON COLUMN laying_transfer_sources.usage_qty IS 'Quantity consumed from this source - for FIFO USABLE role';
+COMMENT ON COLUMN laying_transfer_sources.pending_usage_qty IS 'Quantity pending to consume from this source - for FIFO USABLE role';
+
+-- Drop old qty column as it's replaced by usage_qty
+ALTER TABLE laying_transfer_sources
+    DROP COLUMN IF EXISTS qty;
+
+-- ============================================================================
+-- PART 3: Add FIFO columns to laying_transfer_targets (STOCKABLE role)
+-- ============================================================================
+
+ALTER TABLE laying_transfer_targets
+    ADD COLUMN total_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL,
+    ADD COLUMN total_used NUMERIC(15, 3) DEFAULT 0 NOT NULL;
+
+-- Add comments for documentation
+COMMENT ON COLUMN laying_transfer_targets.total_qty IS 'Total lot quantity introduced to this target warehouse - for FIFO STOCKABLE role';
+COMMENT ON COLUMN laying_transfer_targets.total_used IS 'Quantity already consumed from this lot at target warehouse - for FIFO STOCKABLE role';
+
+-- Drop old qty column as it's replaced by total_qty
+ALTER TABLE laying_transfer_targets
+    DROP COLUMN IF EXISTS qty;
@@ -0,0 +1,59 @@
+BEGIN;
+
+ALTER TABLE recordings
+    DROP CONSTRAINT IF EXISTS chk_recordings_nonnegatives_v4;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'recordings' AND column_name = 'hen_day'
+    ) THEN
+        ALTER TABLE recordings RENAME COLUMN hen_day TO hand_day;
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'recordings' AND column_name = 'hen_house'
+    ) THEN
+        ALTER TABLE recordings RENAME COLUMN hen_house TO hand_house;
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'recordings' AND column_name = 'egg_mass'
+    ) THEN
+        ALTER TABLE recordings RENAME COLUMN egg_mass TO egg_mesh;
+    END IF;
+END $$;
+
+ALTER TABLE recordings
+    ADD COLUMN IF NOT EXISTS daily_gain NUMERIC(7,3),
+    ADD COLUMN IF NOT EXISTS avg_daily_gain NUMERIC(7,3);
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_nonnegatives_v3 CHECK (
+        (total_depletion_qty IS NULL OR total_depletion_qty >= 0) AND
+        (cum_depletion_rate  IS NULL OR cum_depletion_rate  >= 0) AND
+        (daily_gain          IS NULL OR daily_gain          >= 0) AND
+        (avg_daily_gain      IS NULL OR avg_daily_gain      >= 0) AND
+        (cum_intake          IS NULL OR cum_intake          >= 0) AND
+        (fcr_value           IS NULL OR fcr_value           >= 0) AND
+        (total_chick_qty     IS NULL OR total_chick_qty     >= 0) AND
+        (hand_day            IS NULL OR hand_day            >= 0) AND
+        (hand_house          IS NULL OR hand_house          >= 0) AND
+        (feed_intake         IS NULL OR feed_intake         >= 0) AND
+        (egg_mesh            IS NULL OR egg_mesh            >= 0) AND
+        (egg_weight          IS NULL OR egg_weight          >= 0)
+    );
+
+COMMIT;
@@ -0,0 +1,57 @@
+BEGIN;
+
+ALTER TABLE recordings
+    DROP CONSTRAINT IF EXISTS chk_recordings_nonnegatives_v3;
+
+ALTER TABLE recordings
+    DROP COLUMN IF EXISTS daily_gain,
+    DROP COLUMN IF EXISTS avg_daily_gain;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'recordings' AND column_name = 'hand_day'
+    ) THEN
+        ALTER TABLE recordings RENAME COLUMN hand_day TO hen_day;
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'recordings' AND column_name = 'hand_house'
+    ) THEN
+        ALTER TABLE recordings RENAME COLUMN hand_house TO hen_house;
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'recordings' AND column_name = 'egg_mesh'
+    ) THEN
+        ALTER TABLE recordings RENAME COLUMN egg_mesh TO egg_mass;
+    END IF;
+END $$;
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_nonnegatives_v4 CHECK (
+        (total_depletion_qty IS NULL OR total_depletion_qty >= 0) AND
+        (cum_depletion_rate  IS NULL OR cum_depletion_rate  >= 0) AND
+        (cum_intake          IS NULL OR cum_intake          >= 0) AND
+        (fcr_value           IS NULL OR fcr_value           >= 0) AND
+        (total_chick_qty     IS NULL OR total_chick_qty     >= 0) AND
+        (hen_day             IS NULL OR hen_day             >= 0) AND
+        (hen_house           IS NULL OR hen_house           >= 0) AND
+        (feed_intake         IS NULL OR feed_intake         >= 0) AND
+        (egg_mass            IS NULL OR egg_mass            >= 0) AND
+        (egg_weight          IS NULL OR egg_weight          >= 0)
+    );
+
+COMMIT;
@@ -0,0 +1,6 @@
+-- Rollback: remove price from supplier relations
+ALTER TABLE product_suppliers
+    DROP COLUMN IF EXISTS price;
+
+ALTER TABLE nonstock_suppliers
+    DROP COLUMN IF EXISTS price;
@@ -0,0 +1,6 @@
+-- Migration: add price to supplier relations
+ALTER TABLE product_suppliers
+    ADD COLUMN IF NOT EXISTS price NUMERIC(15, 3) NOT NULL DEFAULT 0;
+
+ALTER TABLE nonstock_suppliers
+    ADD COLUMN IF NOT EXISTS price NUMERIC(15, 3) NOT NULL DEFAULT 0;
@@ -0,0 +1,3 @@
+ALTER TABLE recording_eggs
+    DROP COLUMN IF EXISTS total_used,
+    DROP COLUMN IF EXISTS total_qty;
@@ -0,0 +1,7 @@
+ALTER TABLE recording_eggs
+    ADD COLUMN total_qty NUMERIC(15, 3) DEFAULT 0 NOT NULL,
+    ADD COLUMN total_used NUMERIC(15, 3) DEFAULT 0 NOT NULL;
+
+UPDATE recording_eggs
+SET total_qty = qty
+WHERE total_qty = 0;
@@ -0,0 +1,3 @@
+-- Rollback: add price back to nonstock_suppliers
+ALTER TABLE nonstock_suppliers
+    ADD COLUMN IF NOT EXISTS price NUMERIC(15, 3) NOT NULL DEFAULT 0;
@@ -0,0 +1,3 @@
+-- Migration: remove price from nonstock_suppliers
+ALTER TABLE nonstock_suppliers
+    DROP COLUMN IF EXISTS price;
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"

 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -25,66 +24,20 @@ func Run(db *gorm.DB) error {
 			return err
 		}

-		areas, err := seedAreas(tx, adminID)
-		if err != nil {
-			return err
-		}
-
-		locations, err := seedLocations(tx, adminID, areas)
-		if err != nil {
-			return err
-		}
-
 		productCategories, err := seedProductCategories(tx, adminID)
 		if err != nil {
 			return err
 		}

-		if _, err := seedFlocks(tx, adminID); err != nil {
-			return err
-		}
-
-		if _, err := seedFcr(tx, adminID); err != nil {
-			return err
-		}
-
-		kandangs, err := seedKandangs(tx, adminID, locations, users)
-		if err != nil {
-			return err
-		}
-
-		if err := seedWarehouses(tx, adminID, areas, locations, kandangs); err != nil {
-			return err
-		}
-
 		suppliers, err := seedSuppliers(tx, adminID)
 		if err != nil {
 			return err
 		}

-		if err := seedCustomers(tx, adminID, users); err != nil {
-			return err
-		}
-
 		if err := seedProducts(tx, adminID, uoms, productCategories, suppliers); err != nil {
 			return err
 		}

-		if err := seedNonstocks(tx, adminID, uoms, suppliers); err != nil {
-			return err
-		}
-
-		if err := seedBanks(tx, adminID); err != nil {
-			return err
-		}
-
-		if err := seedProductWarehouse(tx, adminID); err != nil {
-			return err
-		}
-
-		if err := seedTransferStock(tx); err != nil {
-			return err
-		}
 		fmt.Println("✅ Master data seeding completed")
 		return nil
 	})
@@ -141,224 +94,6 @@ func seedUoms(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
 	return result, nil
 }

-func seedAreas(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
-	names := []string{"Priangan", "Banten"}
-	result := make(map[string]uint, len(names))
-
-	for _, name := range names {
-		var area entity.Area
-		err := tx.Where("name = ?", name).First(&area).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			area = entity.Area{Name: name, CreatedBy: createdBy}
-			if err := tx.Create(&area).Error; err != nil {
-				return nil, err
-			}
-		} else if err != nil {
-			return nil, err
-		}
-		result[name] = area.Id
-	}
-
-	return result, nil
-}
-
-func seedLocations(tx *gorm.DB, createdBy uint, areas map[string]uint) (map[string]uint, error) {
-	seeds := []struct {
-		Name    string
-		Address string
-		Area    string
-	}{
-		{"Singaparna", "Tasik", "Priangan"},
-		{"Cikaum", "Cikaum", "Banten"},
-	}
-
-	result := make(map[string]uint, len(seeds))
-
-	for _, seed := range seeds {
-		areaID, ok := areas[seed.Area]
-		if !ok {
-			return nil, fmt.Errorf("area %s not seeded", seed.Area)
-		}
-
-		var loc entity.Location
-		err := tx.Where("name = ?", seed.Name).First(&loc).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			loc = entity.Location{
-				Name:      seed.Name,
-				Address:   seed.Address,
-				AreaId:    areaID,
-				CreatedBy: createdBy,
-			}
-			if err := tx.Create(&loc).Error; err != nil {
-				return nil, err
-			}
-		} else if err != nil {
-			return nil, err
-		}
-		result[seed.Name] = loc.Id
-	}
-
-	return result, nil
-}
-
-func seedFlocks(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
-	names := []string{"Flock Priangan", "Flock Banten"}
-	result := make(map[string]uint, len(names))
-
-	for _, name := range names {
-		var flock entity.Flock
-		err := tx.Where("name = ?", name).First(&flock).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			flock = entity.Flock{
-				Name:      name,
-				CreatedBy: createdBy,
-			}
-			if err := tx.Create(&flock).Error; err != nil {
-				return nil, err
-			}
-		} else if err != nil {
-			return nil, err
-		} else {
-			if err := tx.Model(&entity.Flock{}).Where("id = ?", flock.Id).Updates(map[string]any{
-				"created_by": createdBy,
-			}).Error; err != nil {
-				return nil, err
-			}
-		}
-		result[name] = flock.Id
-	}
-
-	return result, nil
-}
-
-func seedKandangs(tx *gorm.DB, createdBy uint, locations map[string]uint, users map[string]uint) (map[string]uint, error) {
-	seeds := []struct {
-		Name     string
-		Status   utils.KandangStatus
-		Capacity float64
-		Location string
-		PicKey   string
-	}{
-		{Name: "Singaparna 1", Status: utils.KandangStatusNonActive, Capacity: 50000, Location: "Singaparna", PicKey: "admin"},
-		{Name: "Singaparna 2", Status: utils.KandangStatusNonActive, Capacity: 50000, Location: "Singaparna", PicKey: "admin"},
-		{Name: "Cikaum 1", Status: utils.KandangStatusNonActive, Capacity: 50000, Location: "Cikaum", PicKey: "admin"},
-		{Name: "Cikaum 2", Status: utils.KandangStatusNonActive, Capacity: 50000, Location: "Cikaum", PicKey: "admin"},
-	}
-
-	result := make(map[string]uint, len(seeds))
-
-	for _, seed := range seeds {
-		locID, ok := locations[seed.Location]
-		if !ok {
-			return nil, fmt.Errorf("location %s not seeded", seed.Location)
-		}
-		picID, ok := users[seed.PicKey]
-		if !ok {
-			return nil, fmt.Errorf("user %s not seeded", seed.PicKey)
-		}
-
-		var kandang entity.Kandang
-		err := tx.Where("name = ?", seed.Name).First(&kandang).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			kandang = entity.Kandang{
-				Name:       seed.Name,
-				Status:     string(seed.Status),
-				LocationId: locID,
-				PicId:      picID,
-				CreatedBy:  createdBy,
-			}
-			if err := tx.Create(&kandang).Error; err != nil {
-				return nil, err
-			}
-		} else if err != nil {
-			return nil, err
-		} else {
-			updates := map[string]any{
-				"location_id": locID,
-				"pic_id":      picID,
-				"status":      string(seed.Status),
-			}
-			if err := tx.Model(&entity.Kandang{}).Where("id = ?", kandang.Id).Updates(updates).Error; err != nil {
-				return nil, err
-			}
-		}
-		result[seed.Name] = kandang.Id
-	}
-
-	return result, nil
-}
-
-func seedWarehouses(tx *gorm.DB, createdBy uint, areas map[string]uint, locations map[string]uint, kandangs map[string]uint) error {
-	seeds := []struct {
-		Name     string
-		Type     string
-		Area     string
-		Location *string
-		Kandang  *string
-	}{
-		{Name: "Gudang Priangan", Type: string(utils.WarehouseTypeArea), Area: "Priangan"},
-		{Name: "Gudang Singaparna", Type: string(utils.WarehouseTypeLokasi), Area: "Priangan", Location: strPtr("Singaparna")},
-		{Name: "Gudang Singaparna 1", Type: string(utils.WarehouseTypeKandang), Area: "Priangan", Location: strPtr("Singaparna"), Kandang: strPtr("Singaparna 1")},
-		{Name: "Gudang Singaparna 2", Type: string(utils.WarehouseTypeKandang), Area: "Priangan", Location: strPtr("Singaparna"), Kandang: strPtr("Singaparna 2")},
-		{Name: "Gudang Banten", Type: string(utils.WarehouseTypeArea), Area: "Banten"},
-		{Name: "Gudang Cikaum", Type: string(utils.WarehouseTypeLokasi), Area: "Banten", Location: strPtr("Cikaum")},
-		{Name: "Gudang Cikaum 1", Type: string(utils.WarehouseTypeKandang), Area: "Banten", Location: strPtr("Cikaum"), Kandang: strPtr("Cikaum 1")},
-		{Name: "Gudang Cikaum 2", Type: string(utils.WarehouseTypeKandang), Area: "Banten", Location: strPtr("Cikaum"), Kandang: strPtr("Cikaum 2")},
-	}
-
-	for _, seed := range seeds {
-		areaID, ok := areas[seed.Area]
-		if !ok {
-			return fmt.Errorf("area %s not seeded", seed.Area)
-		}
-
-		var warehouse entity.Warehouse
-		err := tx.Where("name = ?", seed.Name).First(&warehouse).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			warehouse = entity.Warehouse{
-				Name:      seed.Name,
-				Type:      seed.Type,
-				AreaId:    areaID,
-				CreatedBy: createdBy,
-			}
-		} else if err != nil {
-			return err
-		}
-
-		if seed.Location != nil {
-			locID, ok := locations[*seed.Location]
-			if !ok {
-				return fmt.Errorf("location %s not seeded", *seed.Location)
-			}
-			warehouse.LocationId = uintPtr(locID)
-		}
-		if seed.Kandang != nil {
-			kandangID, ok := kandangs[*seed.Kandang]
-			if !ok {
-				return fmt.Errorf("kandang %s not seeded", *seed.Kandang)
-			}
-			warehouse.KandangId = uintPtr(kandangID)
-		}
-
-		if warehouse.Id == 0 {
-			if err := tx.Create(&warehouse).Error; err != nil {
-				return err
-			}
-		} else {
-			if err := tx.Model(&entity.Warehouse{}).Where("id = ?", warehouse.Id).Updates(map[string]any{
-				"type":        warehouse.Type,
-				"area_id":     warehouse.AreaId,
-				"location_id": warehouse.LocationId,
-				"kandang_id":  warehouse.KandangId,
-			}).Error; err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
 func seedProductCategories(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
 	seeds := []struct {
 		Name string
@@ -440,113 +175,6 @@ func seedSuppliers(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
 	return result, nil
 }

-func seedCustomers(tx *gorm.DB, createdBy uint, users map[string]uint) error {
-	seeds := []struct {
-		Name    string
-		PicKey  string
-		Address string
-		Phone   string
-		Email   string
-	}{
-		{"Abdul Azis", "admin", "Jl. Raya Utama 1, Bekasi", "082100000001", "abdul.azis@gmail.com"},
-	}
-
-	for idx, seed := range seeds {
-		picID, ok := users[seed.PicKey]
-		if !ok {
-			return fmt.Errorf("user %s not seeded", seed.PicKey)
-		}
-
-		var customer entity.Customer
-		err := tx.Where("name = ?", seed.Name).First(&customer).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			customer = entity.Customer{
-				Name:          seed.Name,
-				PicId:         picID,
-				Type:          string(utils.CustomerSupplierTypeBisnis),
-				Address:       seed.Address,
-				Phone:         seed.Phone,
-				Email:         seed.Email,
-				AccountNumber: *strPtr(fmt.Sprintf("%03d", idx+1)),
-				CreatedBy:     createdBy,
-			}
-			if err := tx.Create(&customer).Error; err != nil {
-				return err
-			}
-		} else if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func seedFcr(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
-	seeds := []struct {
-		Name      string
-		Standards []struct {
-			Weight    float64
-			FcrNumber float64
-			Mortality float64
-		}
-	}{
-		{
-			Name: "FCR Layer",
-			Standards: []struct {
-				Weight    float64
-				FcrNumber float64
-				Mortality float64
-			}{
-				{Weight: 0.8, FcrNumber: 1.60, Mortality: 2.0},
-				{Weight: 1.5, FcrNumber: 1.75, Mortality: 3.5},
-			},
-		},
-	}
-
-	result := make(map[string]uint, len(seeds))
-
-	for _, seed := range seeds {
-		var fcr entity.Fcr
-		err := tx.Where("name = ?", seed.Name).First(&fcr).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			fcr = entity.Fcr{Name: seed.Name, CreatedBy: createdBy}
-			if err := tx.Create(&fcr).Error; err != nil {
-				return nil, err
-			}
-		} else if err != nil {
-			return nil, err
-		}
-		result[seed.Name] = fcr.Id
-
-		for _, std := range seed.Standards {
-			var standard entity.FcrStandard
-			err := tx.Where("fcr_id = ? AND weight = ?", fcr.Id, std.Weight).First(&standard).Error
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				standard = entity.FcrStandard{
-					FcrID:     fcr.Id,
-					Weight:    std.Weight,
-					FcrNumber: std.FcrNumber,
-					Mortality: std.Mortality,
-				}
-				if err := tx.Create(&standard).Error; err != nil {
-					return nil, err
-				}
-			} else if err != nil {
-				return nil, err
-			} else {
-				if err := tx.Model(&entity.FcrStandard{}).Where("id = ?", standard.Id).Updates(map[string]any{
-					"fcr_number": std.FcrNumber,
-					"mortality":  std.Mortality,
-				}).Error; err != nil {
-					return nil, err
-				}
-			}
-		}
-	}
-
-	return result, nil
-}
-
 func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories map[string]uint, suppliers map[string]uint) error {
 	seeds := []struct {
 		Name      string
@@ -560,92 +188,88 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 		Expiry    *int
 		Suppliers []string
 		Flags     []utils.FlagType
+		IsVisible bool
 	}{
 		{
-			Name:      "DOC Broiler",
-			Brand:     "MBU Broiler",
-			Sku:       "BRO0001",
+			Name:      "ISA Brown",
+			Brand:     "ISA Brown",
+			Sku:       "ISA0001",
 			Uom:       "Ekor",
 			Category:  "Day Old Chick",
 			Price:     7500,
 			Suppliers: []string{"PT CHAROEN POKPHAND INDONESIA Tbk"},
-			Flags:     []utils.FlagType{utils.FlagDOC},
+			Flags:     []utils.FlagType{utils.FlagDOC, utils.FlagPullet, utils.FlagLayer},
+			IsVisible: true,
 		},
 		{
-			Name:      "Ayam Pullet",
-			Brand:     "MBU Pullet",
-			Sku:       "PLT0001",
-			Uom:       "Ekor",
-			Category:  "Pullet",
-			Price:     15000,
-			Suppliers: []string{"PT CHAROEN POKPHAND INDONESIA Tbk"},
-			Flags:     []utils.FlagType{utils.FlagPullet},
-		},
-		{
-			Name:     "Ayam Afkir",
-			Brand:    "-",
-			Sku:      "1",
-			Uom:      "Ekor",
-			Category: "Day Old Chick",
-			Price:    1,
-			Flags:    []utils.FlagType{utils.FlagAyamAfkir},
-		},
-		{
-			Name:     "Ayam Mati",
-			Brand:    "-",
-			Sku:      "2",
-			Uom:      "Ekor",
-			Category: "Day Old Chick",
-			Price:    1,
-			Flags:    []utils.FlagType{utils.FlagAyamMati},
-		},
-		{
-			Name:     "Ayam Culling",
-			Brand:    "-",
-			Sku:      "3",
-			Uom:      "Ekor",
-			Category: "Day Old Chick",
-			Price:    1,
-			Flags:    []utils.FlagType{utils.FlagAyamCulling},
-		},
-		{
-			Name:     "Telur Konsumsi Baik",
-			Brand:    "-",
-			Sku:      "4",
-			Uom:      "Unit",
-			Category: "Telur",
-			Price:    1,
-			Flags:    []utils.FlagType{utils.FlagTelurUtuh},
-		},
-		{
-			Name:     "Telur Pecah",
-			Brand:    "-",
-			Sku:      "5",
-			Uom:      "Unit",
-			Category: "Telur",
-			Price:    1,
-			Flags:    []utils.FlagType{utils.FlagTelurPecah},
-		},
-		{
-			Name:      "281 SPECIAL STARTER",
-			Brand:     "281 STARTER",
-			Sku:       "281",
-			Uom:       "Kilogram",
-			Category:  "Bahan Baku",
-			Price:     7850,
-			Expiry:    intPtr(60),
-			Suppliers: []string{"PT CHAROEN POKPHAND INDONESIA Tbk"},
-			Flags:     []utils.FlagType{utils.FlagPakan, utils.FlagStarter},
-		},
-		{
-			Name:      "Ayam Layer",
+			Name:      "Ayam Afkir",
 			Brand:     "-",
-			Sku:       "LYR0001",
+			Sku:       "1",
 			Uom:       "Ekor",
-			Category:  "Pullet",
-			Price:     20000,
-			Suppliers: []string{"PT CHAROEN POKPHAND INDONESIA Tbk"},
-			Flags:     []utils.FlagType{utils.FlagLayer},
+			Category:  "Day Old Chick",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagAyamAfkir},
+			IsVisible: false,
+		},
+		{
+			Name:      "Ayam Mati",
+			Brand:     "-",
+			Sku:       "2",
+			Uom:       "Ekor",
+			Category:  "Day Old Chick",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagAyamMati},
+			IsVisible: false,
+		},
+		{
+			Name:      "Ayam Culling",
+			Brand:     "-",
+			Sku:       "3",
+			Uom:       "Ekor",
+			Category:  "Day Old Chick",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagAyamCulling},
+			IsVisible: false,
+		},
+		{
+			Name:      "Telur Utuh",
+			Brand:     "-",
+			Sku:       "4",
+			Uom:       "Gram",
+			Category:  "Telur",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagTelurUtuh},
+			IsVisible: false,
+		},
+		{
+			Name:      "Telur Pecah",
+			Brand:     "-",
+			Sku:       "5",
+			Uom:       "Gram",
+			Category:  "Telur",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagTelurPecah},
+			IsVisible: false,
+		},
+		{
+			Name:      "Telur Putih",
+			Brand:     "-",
+			Sku:       "6",
+			Uom:       "Gram",
+			Category:  "Telur",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagTelurPutih},
+			IsVisible: false,
+		},
+		{
+			Name:      "Telur Retak",
+			Brand:     "-",
+			Sku:       "7",
+			Uom:       "Gram",
+			Category:  "Telur",
+			Price:     1,
+			Flags:     []utils.FlagType{utils.FlagTelurRetak},
+			IsVisible: false,
 		},
 	}

@@ -675,6 +299,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 				Tax:               tax,
 				ExpiryPeriod:      seed.Expiry,
 				CreatedBy:         createdBy,
+				IsVisible:         seed.IsVisible,
 			}
 			if err := tx.Create(&product).Error; err != nil {
 				return err
@@ -724,78 +349,78 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 	return nil
 }

-func seedNonstocks(tx *gorm.DB, createdBy uint, uoms map[string]uint, suppliers map[string]uint) error {
-	seeds := []struct {
-		Name      string
-		Uom       string
-		Suppliers []string
-		Flags     []utils.FlagType
-	}{
-		{
-			Name:      "Expedisi DOC",
-			Uom:       "Ekor",
-			Suppliers: []string{"Ekspedisi"},
-			Flags:     []utils.FlagType{utils.FlagEkspedisi},
-		},
-		{
-			Name:      "Solar",
-			Uom:       "Liter",
-			Suppliers: []string{"BOP Vendor"},
-			Flags:     []utils.FlagType{},
-		},
-	}
+// func seedNonstocks(tx *gorm.DB, createdBy uint, uoms map[string]uint, suppliers map[string]uint) error {
+// 	seeds := []struct {
+// 		Name      string
+// 		Uom       string
+// 		Suppliers []string
+// 		Flags     []utils.FlagType
+// 	}{
+// 		{
+// 			Name:      "LAJ",
+// 			Uom:       "Unit",
+// 			Suppliers: []string{"Ekspedisi"},
+// 			Flags:     []utils.FlagType{utils.FlagEkspedisi},
+// 		},
+// 		{
+// 			Name:      "Solar",
+// 			Uom:       "Liter",
+// 			Suppliers: []string{"BOP Vendor"},
+// 			Flags:     []utils.FlagType{},
+// 		},
+// 	}

-	for _, seed := range seeds {
-		uomID, ok := uoms[seed.Uom]
-		if !ok {
-			return fmt.Errorf("uom %s not seeded", seed.Uom)
-		}
+// 	for _, seed := range seeds {
+// 		uomID, ok := uoms[seed.Uom]
+// 		if !ok {
+// 			return fmt.Errorf("uom %s not seeded", seed.Uom)
+// 		}

-		var nonstock entity.Nonstock
-		err := tx.Where("name = ?", seed.Name).First(&nonstock).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			nonstock = entity.Nonstock{
-				Name:      seed.Name,
-				UomId:     uomID,
-				CreatedBy: createdBy,
-			}
-			if err := tx.Create(&nonstock).Error; err != nil {
-				return err
-			}
-		} else if err != nil {
-			return err
-		} else {
-			if err := tx.Model(&entity.Nonstock{}).Where("id = ?", nonstock.Id).Updates(map[string]any{
-				"uom_id": uomID,
-			}).Error; err != nil {
-				return err
-			}
-		}
+// 		var nonstock entity.Nonstock
+// 		err := tx.Where("name = ?", seed.Name).First(&nonstock).Error
+// 		if errors.Is(err, gorm.ErrRecordNotFound) {
+// 			nonstock = entity.Nonstock{
+// 				Name:      seed.Name,
+// 				UomId:     uomID,
+// 				CreatedBy: createdBy,
+// 			}
+// 			if err := tx.Create(&nonstock).Error; err != nil {
+// 				return err
+// 			}
+// 		} else if err != nil {
+// 			return err
+// 		} else {
+// 			if err := tx.Model(&entity.Nonstock{}).Where("id = ?", nonstock.Id).Updates(map[string]any{
+// 				"uom_id": uomID,
+// 			}).Error; err != nil {
+// 				return err
+// 			}
+// 		}

-		for _, supplierName := range seed.Suppliers {
-			supplierID, ok := suppliers[supplierName]
-			if !ok {
-				return fmt.Errorf("supplier %s not seeded", supplierName)
-			}
-			var existing entity.NonstockSupplier
-			err := tx.Where("nonstock_id = ? AND supplier_id = ?", nonstock.Id, supplierID).First(&existing).Error
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				link := entity.NonstockSupplier{NonstockId: nonstock.Id, SupplierId: supplierID}
-				if err := tx.Create(&link).Error; err != nil {
-					return err
-				}
-			} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				return err
-			}
-		}
+// 		for _, supplierName := range seed.Suppliers {
+// 			supplierID, ok := suppliers[supplierName]
+// 			if !ok {
+// 				return fmt.Errorf("supplier %s not seeded", supplierName)
+// 			}
+// 			var existing entity.NonstockSupplier
+// 			err := tx.Where("nonstock_id = ? AND supplier_id = ?", nonstock.Id, supplierID).First(&existing).Error
+// 			if errors.Is(err, gorm.ErrRecordNotFound) {
+// 				link := entity.NonstockSupplier{NonstockId: nonstock.Id, SupplierId: supplierID}
+// 				if err := tx.Create(&link).Error; err != nil {
+// 					return err
+// 				}
+// 			} else if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+// 				return err
+// 			}
+// 		}

-		if err := seedFlags(tx, nonstock.Id, entity.FlagableTypeNonstock, seed.Flags); err != nil {
-			return err
-		}
-	}
+// 		if err := seedFlags(tx, nonstock.Id, entity.FlagableTypeNonstock, seed.Flags); err != nil {
+// 			return err
+// 		}
+// 	}

-	return nil
-}
+// 	return nil
+// }

 // nanti saya isi

@@ -823,213 +448,6 @@ func seedFlags(tx *gorm.DB, flagableID uint, flagableType string, flags []utils.
 	return nil
 }

-func seedBanks(tx *gorm.DB, createdBy uint) error {
-	seeds := []struct {
-		Name          string
-		Alias         string
-		Owner         *string
-		AccountNumber string
-	}{
-		{
-			Name:          "Bank Central Asia",
-			Alias:         "BCA",
-			AccountNumber: "1234567890",
-			Owner:         ptr("PT MBU Group"),
-		},
-		{
-			Name:          "Bank Rakyat Indonesia",
-			Alias:         "BRI",
-			AccountNumber: "9876543210",
-			Owner:         ptr("PT MBU Group"),
-		},
-		{
-			Name:          "Bank Mandiri",
-			Alias:         "MAND",
-			AccountNumber: "1122334455",
-			Owner:         ptr("PT MBU Group"),
-		},
-	}
-
-	for _, seed := range seeds {
-		var bank entity.Bank
-		err := tx.Where("name = ?", seed.Name).First(&bank).Error
-
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			bank = entity.Bank{
-				Name:          seed.Name,
-				Alias:         seed.Alias,
-				Owner:         seed.Owner,
-				AccountNumber: seed.AccountNumber,
-				CreatedBy:     createdBy,
-				CreatedAt:     time.Now(),
-				UpdatedAt:     time.Now(),
-			}
-			if err := tx.Create(&bank).Error; err != nil {
-				return err
-			}
-		} else if err != nil {
-			return err
-		} else {
-			// update data jika sudah ada
-			if err := tx.Model(&entity.Bank{}).Where("id = ?", bank.Id).Updates(map[string]any{
-				"alias":          seed.Alias,
-				"owner":          seed.Owner,
-				"account_number": seed.AccountNumber,
-				"updated_at":     time.Now(),
-			}).Error; err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func seedProductWarehouse(tx *gorm.DB, createdBy uint) error {
-	seeds := []struct {
-		ProductName   string
-		WarehouseName string
-		Quantity      float64
-	}{
-		{ProductName: "DOC Broiler", WarehouseName: "Gudang Priangan", Quantity: 100},
-		{ProductName: "281 SPECIAL STARTER", WarehouseName: "Gudang Singaparna", Quantity: 200},
-		{ProductName: "281 SPECIAL STARTER", WarehouseName: "Gudang Banten", Quantity: 300},
-		{ProductName: "DOC Broiler", WarehouseName: "Gudang Singaparna 1", Quantity: 5000},
-		{ProductName: "Telur Konsumsi Baik", WarehouseName: "Gudang Singaparna 1", Quantity: 600},
-		{ProductName: "Telur Pecah", WarehouseName: "Gudang Singaparna 1", Quantity: 80},
-		{ProductName: "Telur Konsumsi Baik", WarehouseName: "Gudang Cikaum 1", Quantity: 450},
-		{ProductName: "Telur Pecah", WarehouseName: "Gudang Cikaum 1", Quantity: 60},
-	}
-
-	for _, seed := range seeds {
-		var product entity.Product
-		if err := tx.Where("name = ?", seed.ProductName).First(&product).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return fmt.Errorf("product %q not found for product warehouse seeding", seed.ProductName)
-			}
-			return err
-		}
-
-		var warehouse entity.Warehouse
-		if err := tx.Where("name = ?", seed.WarehouseName).First(&warehouse).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return fmt.Errorf("warehouse %q not found for product warehouse seeding", seed.WarehouseName)
-			}
-			return err
-		}
-
-		var productWarehouse entity.ProductWarehouse
-		err := tx.Where("product_id = ? AND warehouse_id = ?", product.Id, warehouse.Id).First(&productWarehouse).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			productWarehouse = entity.ProductWarehouse{
-				ProductId:   product.Id,
-				WarehouseId: warehouse.Id,
-				Quantity:    seed.Quantity,
-				// CreatedBy:   createdBy,
-			}
-			if err := tx.Create(&productWarehouse).Error; err != nil {
-				return err
-			}
-		} else if err != nil {
-			return err
-		} else {
-			if err := tx.Model(&productWarehouse).Updates(map[string]any{
-				"quantity": seed.Quantity,
-			}).Error; err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func seedTransferStock(tx *gorm.DB) error {
-
-	transfer := entity.StockTransfer{
-		FromWarehouseId: 1,
-		ToWarehouseId:   2,
-		Reason:          "Seed transfer stock",
-		TransferDate:    time.Now(),
-		MovementNumber:  "SEED-TRF-00001",
-		CreatedBy:       1,
-	}
-	if err := tx.Create(&transfer).Error; err != nil {
-		return err
-	}
-
-	details := []entity.StockTransferDetail{
-		{
-			StockTransferId: transfer.Id,
-			ProductId:       1,
-			// Quantity:        10,
-		},
-		{
-			StockTransferId: transfer.Id,
-			ProductId:       2,
-			// Quantity:        5,
-		},
-	}
-	for i := range details {
-		if err := tx.Create(&details[i]).Error; err != nil {
-			return err
-		}
-	}
-
-	deliveries := []entity.StockTransferDelivery{
-		{
-			StockTransferId:   transfer.Id,
-			SupplierId:        1,
-			VehiclePlate:      "B 1234 XYZ",
-			DriverName:        "Driver Seed",
-			DocumentPath:      "seed.pdf",
-			ShippingCostItem:  1000,
-			ShippingCostTotal: 2000,
-		},
-	}
-	for i := range deliveries {
-		if err := tx.Create(&deliveries[i]).Error; err != nil {
-			return err
-		}
-	}
-
-	detailMap := make(map[uint64]uint64)
-	for _, d := range details {
-		detailMap[d.ProductId] = d.Id
-	}
-
-	deliveryItems := []entity.StockTransferDeliveryItem{
-		{
-			StockTransferDeliveryId: deliveries[0].Id,
-			StockTransferDetailId:   detailMap[1],
-			Quantity:                50,
-		},
-		{
-			StockTransferDeliveryId: deliveries[0].Id,
-			StockTransferDetailId:   detailMap[2],
-			Quantity:                30,
-		},
-	}
-	for i := range deliveryItems {
-		if err := tx.Create(&deliveryItems[i]).Error; err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-func ptr[T any](v T) *T {
-	return &v
-}
-
 func strPtr(s string) *string {
 	return &s
 }
-
-func intPtr(v int) *int {
-	return &v
-}
-
-func uintPtr(v uint) *uint {
-	return &v
-}
@@ -0,0 +1,17 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type ConfigChecklist struct {
+	Id                        uint           `gorm:"primaryKey"`
+	Date                      time.Time      `gorm:"type:date;not null"`
+	PercentageThresholdBad    int            `gorm:"not null"`
+	PercentageThresholdEnough int            `gorm:"not null"`
+	CreatedAt                 time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt                 time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt                 gorm.DeletedAt `gorm:"index" json:"-"`
+}
@@ -0,0 +1,81 @@
+package entities
+
+import "time"
+
+type DailyChecklist struct {
+	Id           uint `gorm:"primaryKey"`
+	KandangId    uint `gorm:"not null"`
+	ChecklistId  *uint
+	Date         time.Time `gorm:"type:date;not null"`
+	Name         *string   `gorm:"type:varchar(255)"`
+	Status       *string   `gorm:"type:varchar(255)"`
+	Category     string    `gorm:"type:category_code;not null"`
+	TotalScore   *int
+	DocumentPath *string
+	RejectReason *string
+	CreatedBy    *uint
+	CreatedAt    time.Time `gorm:"autoCreateTime"`
+	UpdatedAt    time.Time `gorm:"autoUpdateTime"`
+
+	Kandang   Kandang              `gorm:"foreignKey:KandangId;references:Id"`
+	Checklist *Checklist           `gorm:"foreignKey:ChecklistId;references:Id"`
+	Creator   *User                `gorm:"foreignKey:CreatedBy;references:Id"`
+	Tasks     []DailyChecklistTask `gorm:"foreignKey:DailyChecklistId;references:Id"`
+}
+
+type DailyChecklistPhase struct {
+	Id          uint      `gorm:"primaryKey"`
+	ChecklistId uint      `gorm:"not null"`
+	PhaseId     uint      `gorm:"not null"`
+	CreatedAt   time.Time `gorm:"autoCreateTime"`
+
+	Checklist Checklist `gorm:"foreignKey:ChecklistId;references:Id"`
+	Phase     Phases    `gorm:"foreignKey:PhaseId;references:Id"`
+}
+
+type DailyChecklistActivityTask struct {
+	Id              uint      `gorm:"primaryKey"`
+	ChecklistId     uint      `gorm:"not null"`
+	PhaseId         uint      `gorm:"not null"`
+	PhaseActivityId uint      `gorm:"not null"`
+	TimeType        *string   `gorm:"type:text"`
+	Notes           *string   `gorm:"type:text"`
+	CreatedAt       time.Time `gorm:"autoCreateTime"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime"`
+
+	Checklist     DailyChecklist                         `gorm:"foreignKey:ChecklistId;references:Id"`
+	Phase         Phases                                 `gorm:"foreignKey:PhaseId;references:Id"`
+	PhaseActivity PhaseActivity                          `gorm:"foreignKey:PhaseActivityId;references:Id"`
+	Assignments   []DailyChecklistActivityTaskAssignment `gorm:"foreignKey:TaskId;references:Id"`
+}
+
+type DailyChecklistActivityTaskAssignment struct {
+	Id         uint      `gorm:"primaryKey"`
+	TaskId     uint      `gorm:"not null"`
+	EmployeeId uint      `gorm:"not null"`
+	Checked    bool      `gorm:"not null;default:false"`
+	Note       *string   `gorm:"type:text"`
+	CreatedAt  time.Time `gorm:"autoCreateTime"`
+	UpdatedAt  time.Time `gorm:"autoUpdateTime"`
+
+	Task     DailyChecklistActivityTask `gorm:"foreignKey:TaskId;references:Id"`
+	Employee Employee                   `gorm:"foreignKey:EmployeeId;references:Id"`
+}
+
+type DailyChecklistTask struct {
+	Id               uint `gorm:"primaryKey"`
+	DailyChecklistId uint `gorm:"not null"`
+	ChecklistId      uint `gorm:"not null"`
+	ChecklistItemId  *uint
+	IsCompleted      bool `gorm:"not null;default:false"`
+	ScoreValue       *int
+	Notes            *string `gorm:"type:text"`
+	PhotoProof       *string
+	Status           *string
+	CreatedAt        time.Time `gorm:"autoCreateTime"`
+	UpdatedAt        time.Time `gorm:"autoUpdateTime"`
+
+	DailyChecklist *DailyChecklist `gorm:"foreignKey:DailyChecklistId;references:Id"`
+	Checklist      Checklist       `gorm:"foreignKey:ChecklistId;references:Id"`
+	ChecklistItem  *PhaseActivity  `gorm:"foreignKey:ChecklistItemId;references:Id"`
+}
@@ -0,0 +1,18 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Dashboard struct {
+	Id        uint           `gorm:"primaryKey"`
+	Name      string         `gorm:"not null;uniqueIndex:idx_name,where:deleted_at IS NULL"`
+	CreatedBy uint           `gorm:"not null"`
+	CreatedAt time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
+
+	CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"`
+}
@@ -0,0 +1,31 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Employee struct {
+	Id        uint           `gorm:"primaryKey"`
+	Name      string         `gorm:"not null"`
+	IsActive  bool           `gorm:"not null"`
+	CreatedAt time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
+
+	EmployeeKandangs []EmployeeKandang `gorm:"foreignKey:EmployeeId;references:Id"`
+}
+
+type Employees = Employee
+
+type EmployeeKandang struct {
+	Id         uint      `gorm:"primaryKey"`
+	EmployeeId uint      `gorm:"not null"`
+	KandangId  uint      `gorm:"not null"`
+	CreatedAt  time.Time `gorm:"autoCreateTime"`
+	UpdatedAt  time.Time `gorm:"autoUpdateTime"`
+
+	Employee Employee `gorm:"foreignKey:EmployeeId;references:Id"`
+	Kandang  Kandang  `gorm:"foreignKey:KandangId;references:Id"`
+}
@@ -5,15 +5,15 @@ import (
 )

 type ExpenseNonstock struct {
-	Id                    uint64              `gorm:"primaryKey;autoIncrement"`
-	ExpenseId             *uint64             `gorm:""`
-	ProjectFlockKandangId *uint64             `gorm:""`
-	KandangId             *uint64             `gorm:""`
-	NonstockId            *uint64             `gorm:""`
-	Qty                   float64             `gorm:"type:numeric(15,3);not null"`
-	Price                 float64             `gorm:"type:numeric(15,3);not null;column:price"`
-	Notes                 string              `gorm:"type:text;column:notes"`
-	CreatedAt             time.Time           `gorm:"type:timestamptz;default:CURRENT_TIMESTAMP"`
+	Id                    uint64    `gorm:"primaryKey;autoIncrement"`
+	ExpenseId             *uint64   `gorm:""`
+	ProjectFlockKandangId *uint64   `gorm:""`
+	KandangId             *uint64   `gorm:""`
+	NonstockId            *uint64   `gorm:""`
+	Qty                   float64   `gorm:"type:numeric(15,3);not null"`
+	Price                 float64   `gorm:"type:numeric(15,3);not null;column:price"`
+	Notes                 string    `gorm:"type:text;column:notes"`
+	CreatedAt             time.Time `gorm:"type:timestamptz;default:CURRENT_TIMESTAMP"`

 	Expense             *Expense             `gorm:"foreignKey:ExpenseId;references:Id"`
 	ProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
@@ -12,18 +12,16 @@ type LayingTransfer struct {
 	FromProjectFlockId uint           `gorm:"not null"`
 	ToProjectFlockId   uint           `gorm:"not null"`
 	TransferDate       time.Time      `gorm:"type:date;not null"`
-	PendingUsageQty    *float64       `gorm:"type:numeric(15,3)"`
-	UsageQty           *float64       `gorm:"type:numeric(15,3)"`
 	Notes              string         `gorm:"type:text"`
 	CreatedBy          uint           `gorm:"not null"`
 	CreatedAt          time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt          gorm.DeletedAt `gorm:"index"`

-	FromProjectFlock *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
-	ToProjectFlock   *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
-	CreatedUser      *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
-	Sources          []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	Targets          []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
-	LatestApproval   *Approval              `gorm:"-" json:"-"`
+	FromProjectFlock    *ProjectFlock          `gorm:"foreignKey:FromProjectFlockId;references:Id"`
+	ToProjectFlock      *ProjectFlock          `gorm:"foreignKey:ToProjectFlockId;references:Id"`
+	CreatedUser         *User                  `gorm:"foreignKey:CreatedBy;references:Id"`
+	Sources             []LayingTransferSource `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	Targets             []LayingTransferTarget `gorm:"foreignKey:LayingTransferId;constraint:OnDelete:CASCADE"`
+	LatestApproval      *Approval              `gorm:"-" json:"-"`
 }
@@ -11,7 +11,8 @@ type LayingTransferSource struct {
 	LayingTransferId            uint           `gorm:"index;not null"`
 	SourceProjectFlockKandangId uint           `gorm:"not null"`
 	ProductWarehouseId          *uint          `gorm:""`
-	Qty                         float64        `gorm:"type:numeric(15,3);not null"`
+	UsageQty                    float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO USABLE field
+	PendingUsageQty             float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO USABLE field
 	Note                        string         `gorm:"type:text"`
 	CreatedAt                   time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt                   time.Time      `gorm:"autoUpdateTime"`
@@ -10,7 +10,8 @@ type LayingTransferTarget struct {
 	Id                          uint           `gorm:"primaryKey"`
 	LayingTransferId            uint           `gorm:"index;not null"`
 	TargetProjectFlockKandangId uint           `gorm:"not null"`
-	Qty                         float64        `gorm:"type:numeric(15,3);not null"`
+	TotalQty                    float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO STOCKABLE field
+	TotalUsed                   float64        `gorm:"type:numeric(15,3);default:0;not null"`        // FIFO STOCKABLE field
 	ProductWarehouseId          *uint          `gorm:""`
 	Note                        string         `gorm:"type:text"`
 	CreatedAt                   time.Time      `gorm:"autoCreateTime"`
@@ -7,22 +7,23 @@ import (
 )

 type Payment struct {
-	Id              uint           `gorm:"primaryKey;autoIncrement"`
-	PaymentCode     string         `gorm:"type:varchar(50);not null"`
-	ReferenceNumber *string        `gorm:"type:varchar(100)"`
-	TransactionType string         `gorm:"type:varchar(50)"`
-	PartyType       string         `gorm:"type:varchar(50);not null;index:payments_party_polymorphic,priority:1"`
-	PartyId         uint           `gorm:"not null;index:payments_party_polymorphic,priority:2"`
-	PaymentDate     time.Time      `gorm:"not null"`
-	PaymentMethod   string         `gorm:"type:varchar(20);not null"`
-	BankId          *uint          `gorm:"not null;index:idx_payments_bank_id"`
-	Direction       string         `gorm:"type:varchar(5);not null"`
-	Nominal         float64        `gorm:"type:numeric(15,3);not null"`
-	Notes           string         `gorm:"type:text;not null"`
-	CreatedAt       time.Time      `gorm:"autoCreateTime"`
-	UpdatedAt       time.Time      `gorm:"autoUpdateTime"`
-	DeletedAt       gorm.DeletedAt `gorm:"index" json:"-"`
-	CreatedBy       uint           `gorm:"index" json:"-"`
+	Id                 uint           `gorm:"primaryKey;autoIncrement"`
+	PaymentCode        string         `gorm:"type:varchar(50);not null"`
+	ReferenceNumber    *string        `gorm:"type:varchar(100)"`
+	TransactionType    string         `gorm:"type:varchar(50)"`
+	PartyType          string         `gorm:"type:varchar(50);not null;index:payments_party_polymorphic,priority:1"`
+	PartyId            uint           `gorm:"not null;index:payments_party_polymorphic,priority:2"`
+	PartyAccountNumber *string        `gorm:"type:varchar(50)"`
+	PaymentDate        time.Time      `gorm:"not null"`
+	PaymentMethod      string         `gorm:"type:varchar(20);not null"`
+	BankId             *uint          `gorm:"not null;index:idx_payments_bank_id"`
+	Direction          string         `gorm:"type:varchar(5);not null"`
+	Nominal            float64        `gorm:"type:numeric(15,3);not null"`
+	Notes              string         `gorm:"type:text;not null"`
+	CreatedAt          time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt          gorm.DeletedAt `gorm:"index" json:"-"`
+	CreatedBy          uint           `gorm:"index" json:"-"`

 	BankWarehouse  Bank      `gorm:"foreignKey:BankId;references:Id"`
 	CreatedUser    User      `gorm:"foreignKey:CreatedBy;references:Id"`
@@ -0,0 +1,44 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Phases struct {
+	Id            uint           `gorm:"primaryKey"`
+	Name          string         `gorm:"not null"`
+	IsActive      bool           `gorm:"not null;default:true"`
+	Category      string         `gorm:"type:category_code;not null"`
+	CreatedAt     time.Time      `gorm:"autoCreateTime"`
+	DeletedAt     gorm.DeletedAt `gorm:"index" json:"-"`
+	ActivityCount int            `gorm:"-" json:"-"`
+
+	Activities []PhaseActivity `gorm:"foreignKey:PhaseId;references:Id"`
+}
+
+type PhaseActivity struct {
+	Id          uint           `gorm:"primaryKey"`
+	PhaseId     uint           `gorm:"not null"`
+	Name        string         `gorm:"not null"`
+	Description *string        `gorm:"type:text"`
+	TimeType    *string        `gorm:"type:text"`
+	CreatedAt   time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt   gorm.DeletedAt `gorm:"index" json:"-"`
+
+	Phase Phases `gorm:"foreignKey:PhaseId;references:Id"`
+}
+
+type Checklist struct {
+	Id          uint    `gorm:"primaryKey"`
+	Name        string  `gorm:"not null"`
+	Description *string `gorm:"type:text"`
+	PhaseId     *uint
+	CreatedAt   time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt   gorm.DeletedAt `gorm:"index" json:"-"`
+
+	Phase *Phases `gorm:"foreignKey:PhaseId;references:Id"`
+}
@@ -21,7 +21,7 @@ type Product struct {
 	CreatedAt         time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt         time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt         gorm.DeletedAt `gorm:"index" json:"-"`
-	IsVisible         bool           `gorm:"column:is_visible;default:true"`
+	IsVisible         bool           ``

 	CreatedUser       User               `gorm:"foreignKey:CreatedBy;references:Id"`
 	Uom               Uom                `gorm:"foreignKey:UomId;references:Id"`
@@ -5,6 +5,7 @@ import "time"
 type ProductSupplier struct {
 	ProductId  uint      `gorm:"not null"`
 	SupplierId uint      `gorm:"not null"`
+	Price      float64   `gorm:"type:numeric(15,3);not null;default:0"`
 	CreatedAt  time.Time `gorm:"autoCreateTime"`

 	Product  Product  `gorm:"foreignKey:ProductId;references:Id"`
@@ -12,6 +12,7 @@ type ProductionStandardDetail struct {
 	TargetHenHouseProduction *float64   `gorm:"type:numeric(15,3)"`
 	TargetEggWeight          *float64   `gorm:"type:numeric(15,3)"`
 	TargetEggMass            *float64   `gorm:"type:numeric(15,3)"`
+	StandardFCR              *float64   `gorm:"type:numeric(15,3)"`
 	CreatedAt                time.Time  `gorm:"type:timestamptz;not null"`
 	UpdatedAt                time.Time  `gorm:"type:timestamptz;not null"`

@@ -0,0 +1,30 @@
+package entities
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type ProjectFlockKandangUniformity struct {
+	Id                    uint            `gorm:"primaryKey"`
+	Uniformity            float64         `gorm:"type:numeric(15,3)"`
+	Week                  int             `gorm:"not null"`
+	Cv                    float64         `gorm:"type:numeric(15,3)"`
+	ChickQtyOfWeight      float64         `gorm:"type:numeric(15,3)"`
+	MeanUp                float64         `gorm:"type:numeric(15,3)"`
+	MeanDown              float64         `gorm:"type:numeric(15,3)"`
+	ProjectFlockKandangId uint            `gorm:"not null"`
+	UniformQty            float64         `gorm:"type:numeric(15,3)"`
+	NotUniformQty         float64         `gorm:"type:numeric(15,3)"`
+	ChartData             json.RawMessage `gorm:"type:jsonb"`
+	UniformDate           *time.Time      `gorm:"type:timestamptz"`
+	CreatedBy             uint            `gorm:"not null"`
+
+	ProjectFlockKandang ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
+	CreatedUser         User                `gorm:"foreignKey:CreatedBy;references:Id"`
+	LatestApproval      *Approval           `gorm:"-" json:"-"`
+}
+
+func (ProjectFlockKandangUniformity) TableName() string {
+	return "project_flock_kandang_uniformity"
+}
@@ -10,8 +10,9 @@ type ProjectFlockKandang struct {
 	ClosedAt       *time.Time `gorm:"index"`
 	CreatedAt      time.Time  `gorm:"autoCreateTime"`

-	ProjectFlock   ProjectFlock     `gorm:"foreignKey:ProjectFlockId;references:Id"`
-	Kandang        Kandang          `gorm:"foreignKey:KandangId;references:Id"`
-	Chickins       []ProjectChickin `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
-	LatestApproval *Approval        `gorm:"-" json:"-"`
+	ProjectFlock               ProjectFlock     `gorm:"foreignKey:ProjectFlockId;references:Id"`
+	Kandang                    Kandang          `gorm:"foreignKey:KandangId;references:Id"`
+	Chickins                   []ProjectChickin `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
+	LatestProjectFlockApproval *Approval        `gorm:"-" json:"-"`
+	LatestChickinApproval      *Approval        `gorm:"-" json:"-"`
 }
@@ -13,11 +13,14 @@ type Recording struct {
 	Day                   *int           `gorm:"column:day"`
 	TotalDepletionQty     *float64       `gorm:"column:total_depletion_qty"`
 	CumDepletionRate      *float64       `gorm:"column:cum_depletion_rate"`
-	DailyGain             *float64       `gorm:"column:daily_gain"`
-	AvgDailyGain          *float64       `gorm:"column:avg_daily_gain"`
 	CumIntake             *int           `gorm:"column:cum_intake"`
 	FcrValue              *float64       `gorm:"column:fcr_value"`
 	TotalChickQty         *float64       `gorm:"column:total_chick_qty"`
+	HenDay                *float64       `gorm:"column:hen_day"`
+	HenHouse              *float64       `gorm:"column:hen_house"`
+	FeedIntake            *float64       `gorm:"column:feed_intake"`
+	EggMass               *float64       `gorm:"column:egg_mass"`
+	EggWeight             *float64       `gorm:"column:egg_weight"`
 	CreatedBy             uint           `gorm:"column:created_by"`
 	CreatedAt             time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt             time.Time      `gorm:"autoUpdateTime"`
@@ -25,10 +28,17 @@ type Recording struct {

 	ProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
 	CreatedUser         *User                `gorm:"foreignKey:CreatedBy;references:Id"`
-	BodyWeights         []RecordingBW        `gorm:"foreignKey:RecordingId;references:Id"`
 	Depletions          []RecordingDepletion `gorm:"foreignKey:RecordingId;references:Id"`
 	Stocks              []RecordingStock     `gorm:"foreignKey:RecordingId;references:Id"`
 	Eggs                []RecordingEgg       `gorm:"foreignKey:RecordingId;references:Id"`

 	LatestApproval *Approval `gorm:"-" json:"-"`
+
+	StandardHenDay       *float64 `gorm:"-"`
+	StandardHenHouse     *float64 `gorm:"-"`
+	StandardFeedIntake   *float64 `gorm:"-"`
+	StandardMaxDepletion *float64 `gorm:"-"`
+	StandardEggMass      *float64 `gorm:"-"`
+	StandardEggWeight    *float64 `gorm:"-"`
+	StandardFcr          *float64 `gorm:"-"`
 }
@@ -1,15 +0,0 @@
-package entities
-
-import "time"
-
-type RecordingBW struct {
-	Id          uint      `gorm:"primaryKey"`
-	RecordingId uint      `gorm:"column:recording_id;not null;index"`
-	AvgWeight   float64   `gorm:"column:avg_weight;not null"`
-	Qty         float64   `gorm:"column:qty;not null"`
-	TotalWeight float64   `gorm:"column:total_weight;not null"`
-	CreatedAt   time.Time `gorm:"autoCreateTime"`
-	UpdatedAt   time.Time `gorm:"autoUpdateTime"`
-
-	Recording Recording `gorm:"foreignKey:RecordingId;references:Id"`
-}
@@ -7,11 +7,14 @@ type RecordingEgg struct {
 	RecordingId        uint             `gorm:"column:recording_id;not null;index"`
 	ProductWarehouseId uint             `gorm:"column:product_warehouse_id;not null"`
 	Qty                int              `gorm:"column:qty;not null"`
+	TotalQty           float64          `gorm:"column:total_qty"`
+	TotalUsed          float64          `gorm:"column:total_used"`
 	Weight             *float64         `gorm:"column:weight"`
 	CreatedBy          uint             `gorm:"column:created_by"`
 	CreatedAt          time.Time        `gorm:"autoCreateTime"`
 	UpdatedAt          time.Time        `gorm:"autoUpdateTime"`
 	ProductWarehouse   ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	ProductFlagName    *string          `gorm:"->;column:product_flag_name" json:"-"`
 	CreatedUser        *User            `gorm:"foreignKey:CreatedBy;references:Id"`
 	Recording          Recording        `gorm:"foreignKey:RecordingId;references:Id"`
 }
@@ -8,27 +8,22 @@ type StockTransferDetail struct {
 	StockTransferId uint64
 	ProductId       uint64

-	// === FIFO FIELDS - SOURCE WAREHOUSE (Usable) ===
-	// Tracking stock yang DIAMBIL dari source warehouse
 	SourceProductWarehouseID *uint64 `gorm:"column:source_product_warehouse_id"`
 	UsageQty                 float64 `gorm:"column:usage_qty;default:0"`   // Actual yang berhasil diambil
 	PendingQty               float64 `gorm:"column:pending_qty;default:0"` // Yang pending (nunggu stock)
-
-	// === FIFO FIELDS - DESTINATION WAREHOUSE (Stockable) ===
-	// Tracking stock yang DITAMBAHKAN ke destination warehouse
-	DestProductWarehouseID *uint64 `gorm:"column:dest_product_warehouse_id"`
-	TotalQty               float64 `gorm:"column:total_qty;default:0"`  // Total lot yang tersedia
-	TotalUsed              float64 `gorm:"column:total_used;default:0"` // Yang sudah dipakai dari lot ini
-
-	// === METADATA ===
-	CreatedAt time.Time
-	UpdatedAt time.Time
-	DeletedAt *time.Time `gorm:"index"`
+	DestProductWarehouseID   *uint64 `gorm:"column:dest_product_warehouse_id"`
+	TotalQty                 float64 `gorm:"column:total_qty;default:0"`  // Total lot yang tersedia
+	TotalUsed                float64 `gorm:"column:total_used;default:0"` // Yang sudah dipakai dari lot ini
+	ExpenseNonstockId        *uint64 `gorm:"column:expense_nonstock_id"`
+	CreatedAt                time.Time
+	UpdatedAt                time.Time
+	DeletedAt                *time.Time `gorm:"index"`

 	// === RELATIONS ===
 	StockTransfer          *StockTransfer              `gorm:"foreignKey:StockTransferId"`
 	Product                *Product                    `gorm:"foreignKey:ProductId"`
 	SourceProductWarehouse *ProductWarehouse           `gorm:"foreignKey:SourceProductWarehouseID"`
 	DestProductWarehouse   *ProductWarehouse           `gorm:"foreignKey:DestProductWarehouseID"`
+	ExpenseNonstock        *ExpenseNonstock            `gorm:"foreignKey:ExpenseNonstockId;references:Id"`
 	DeliveryItems          []StockTransferDeliveryItem `gorm:"foreignKey:StockTransferDetailId"`
 }
@@ -0,0 +1,18 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Uniformity struct {
+	Id        uint           `gorm:"primaryKey"`
+	Name      string         `gorm:"not null;uniqueIndex:idx_name,where:deleted_at IS NULL"`
+	CreatedBy uint           `gorm:"not null"`
+	CreatedAt time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
+
+	CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"`
+}
@@ -1,5 +1,9 @@
 package middleware

+const (
+	P_DashboardGetAll = "lti.dashboard.list"
+)
+
 // project-flock
 const (
 	P_ProjectFlockKandangsClosing      = "lti.production.project_flock_kandangs.closing"
@@ -19,18 +23,19 @@ const (
 )

 const (
-	P_ExpenseGetAll               = "lti.expense.list"
-	P_ExpenseCreateOne            = "lti.expense.create"
-	P_ExpenseUpdateOne            = "lti.expense.update"
-	P_ExpenseGetOne               = "lti.expense.detail"
-	P_ExpenseDeleteOne            = "lti.expense.delete"
-	P_ExpenseApprovalManager      = "lti.expense.approve.manager"
-	P_ExpenseApprovalFinance      = "lti.expense.approve.finance"
-	P_ExpenseCreateRealizations   = "lti.expense.create.realization"
-	P_ExpenseUpdateRealizations   = "lti.expense.update.realization"
-	P_ExpenseCompleteExpense      = "lti.expense.complete.expense"
-	P_ExpenseDocument             = "lti.expense.document"
-	P_ExpenseDocumentRealizations = "lti.expense.document.realization"
+	P_ExpenseGetAll                    = "lti.expense.list"
+	P_ExpenseCreateOne                 = "lti.expense.create"
+	P_ExpenseUpdateOne                 = "lti.expense.update"
+	P_ExpenseGetOne                    = "lti.expense.detail"
+	P_ExpenseDeleteOne                 = "lti.expense.delete"
+	P_ExpenseApprovalHeadArea          = "lti.expense.approve.head_area"
+	P_ExpenseApprovalFinance           = "lti.expense.approve.finance"
+	P_ExpenseApprovalUnitVicePresident = "lti.expense.approve.unit_vice_president"
+	P_ExpenseCreateRealizations        = "lti.expense.create.realization"
+	P_ExpenseUpdateRealizations        = "lti.expense.update.realization"
+	P_ExpenseCompleteExpense           = "lti.expense.complete.expense"
+	P_ExpenseDocument                  = "lti.expense.document"
+	P_ExpenseDocumentRealizations      = "lti.expense.document.realization"
 )
 const (
 	P_AdjustmentGetAll = "lti.inventory.list"
@@ -44,6 +49,9 @@ const (
 	P_ReportExpenseGetAll          = "lti.repport.expense.list"
 	P_ReportDeliveryGetAll         = "lti.repport.delivery.list"
 	P_ReportPurchaseSupplierGetAll = "lti.repport.purchasesupplier.list"
+	P_ReportDebtSupplierGetAll     = "lti.repport.debtsupplier.list"
+	P_ReportHppPerKandangGetAll    = "lti.repport.gethppperkandang.list"
+	P_ReportProductionResultGetAll = "lti.repport.production_result.list"
 )

 const (
@@ -133,17 +141,17 @@ const (
 	P_NonstocksUpdateOne = "lti.master.nonstocks.update"
 	P_NonstocksDeleteOne = "lti.master.nonstocks.delete"

-	P_ProductCategoriesGetAll    = "lti.master.Product_categories.list"
-	P_ProductCategoriesGetOne    = "lti.master.Product_categories.detail"
-	P_ProductCategoriesCreateOne = "lti.master.Product_categories.create"
-	P_ProductCategoriesUpdateOne = "lti.master.Product_categories.update"
-	P_ProductCategoriesDeleteOne = "lti.master.Product_categories.delete"
+	P_ProductCategoriesGetAll    = "lti.master.product_categories.list"
+	P_ProductCategoriesGetOne    = "lti.master.product_categories.detail"
+	P_ProductCategoriesCreateOne = "lti.master.product_categories.create"
+	P_ProductCategoriesUpdateOne = "lti.master.product_categories.update"
+	P_ProductCategoriesDeleteOne = "lti.master.product_categories.delete"

-	P_ProductsGetAll    = "lti.master.Products.list"
-	P_ProductsGetOne    = "lti.master.Products.detail"
-	P_ProductsCreateOne = "lti.master.Products.create"
-	P_ProductsUpdateOne = "lti.master.Products.update"
-	P_ProductsDeleteOne = "lti.master.Products.delete"
+	P_ProductsGetAll    = "lti.master.products.list"
+	P_ProductsGetOne    = "lti.master.products.detail"
+	P_ProductsCreateOne = "lti.master.products.create"
+	P_ProductsUpdateOne = "lti.master.products.update"
+	P_ProductsDeleteOne = "lti.master.products.delete"

 	P_SuppliersGetAll    = "lti.master.suppliers.list"
 	P_SuppliersGetOne    = "lti.master.suppliers.detail"
@@ -206,27 +214,40 @@ const (
 )

 const (
-	P_PurchaseGetAll          = "lti.Purchase.list"
-	P_PurchaseGetOne          = "lti.Purchase.detail"
-	P_PurchaseCreateOne       = "lti.Purchase.create"
-	P_PurchaseUpdateOne       = "lti.Purchase.update"
-	P_PurchaseDeleteOne       = "lti.Purchase.delete"
-	P_PurchaseItemDeleteOne   = "lti.Purchase.delete.item"
-	P_PurchaseReceive         = "lti.Purchase.receive"
-	P_PurchaseApprovalStaff   = "lti.Purchase.approve.staff"
-	P_PurchaseApprovalManager = "lti.Purchase.approve.manager"
+	P_PurchaseGetAll          = "lti.purchase.list"
+	P_PurchaseGetOne          = "lti.purchase.detail"
+	P_PurchaseCreateOne       = "lti.purchase.create"
+	P_PurchaseUpdateOne       = "lti.purchase.update"
+	P_PurchaseDeleteOne       = "lti.purchase.delete"
+	P_PurchaseItemDeleteOne   = "lti.purchase.delete.item"
+	P_PurchaseReceive         = "lti.purchase.receive"
+	P_PurchaseApprovalStaff   = "lti.purchase.approve.staff"
+	P_PurchaseApprovalManager = "lti.purchase.approve.manager"
 )

 const (
-	P_FinanceGetAll    = "lti.finance.list"
-	P_FinanceGetOne    = "lti.finance.detail"
-	P_FinanceCreateOne = "lti.finance.create"
-	P_FinanceUpdateOne = "lti.finance.update"
-	P_FinanceDeleteOne = "lti.finance.delete"
-	P_FinanceApproval  = "lti.finance.approve"
+	P_Uniformities_GetAll    = "lti.production.uniformity.list"
+	P_Uniformities_GetOne    = "lti.production.uniformity.detail"
+	P_Uniformities_Verify    = "lti.production.uniformity.verify"
+	P_Uniformities_CreateOne = "lti.production.uniformity.create"
+	P_Uniformities_UpdateOne = "lti.production.uniformity.update"
+	P_Uniformities_DeleteOne = "lti.production.uniformity.delete"
+	P_Uniformities_Approval  = "lti.production.uniformity.approve"
 )

 const (
 	P_UserGetAll = "lti.users.list"
 	P_UserGetOne = "lti.users.detail"
 )
+
+// daily-checklist
+const (
+	P_DailyChecklistDashboardList  = "lti.daily_checklist.dashboard.list"
+	P_DailyChecklistCreateOne      = "lti.daily_checklist.create"
+	P_DailyChecklistGetAll         = "lti.daily_checklist.list"
+	P_DailyChecklistGetOne         = "lti.daily_checklist.detail"
+	P_DailyChecklistReports        = "lti.daily_checklist.reports"
+	P_DailyChecklistEmployee       = "lti.daily_checklist.master_data.employee"
+	P_DailyChecklistActivity       = "lti.daily_checklist.master_data.activity"
+	P_DailyChecklistActivityConfig = "lti.daily_checklist.master_data.configuration"
+)
@@ -78,6 +78,36 @@ func (u *ClosingController) GetOne(c *fiber.Ctx) error {
 		})
 }

+func (u *ClosingController) GetOverheadByProjectFlockKandang(c *fiber.Ctx) error {
+	projectParam := c.Params("project_flock_id")
+	kandangParam := c.Params("project_flock_kandang_id")
+
+	projectFlockID, err := strconv.Atoi(projectParam)
+	if err != nil || projectFlockID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
+	}
+
+	pfkID, err := strconv.Atoi(kandangParam)
+	if err != nil || pfkID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
+	}
+
+	kandangID := uint(pfkID)
+
+	result, err := u.ClosingService.GetOverhead(c, uint(projectFlockID), &kandangID)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get overhead by project flock kandang successfully",
+			Data:    result,
+		})
+}
+
 func (u *ClosingController) GetClosingSummary(c *fiber.Ctx) error {
 	param := c.Params("projectFlockId")

@@ -86,7 +116,17 @@ func (u *ClosingController) GetClosingSummary(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid projectFlockId")
 	}

-	result, err := u.ClosingService.GetClosingSummary(c, uint(id))
+	var kandangID *uint
+	if raw := c.Query("kandang_id"); raw != "" {
+		kandangInt, convErr := strconv.Atoi(raw)
+		if convErr != nil || kandangInt <= 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang_id")
+		}
+		kandangUint := uint(kandangInt)
+		kandangID = &kandangUint
+	}
+
+	result, err := u.ClosingService.GetClosingSummary(c, uint(id), kandangID)
 	if err != nil {
 		return err
 	}
@@ -108,12 +148,7 @@ func (u *ClosingController) GetPenjualan(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid Project Flock Id")
 	}

-	projectFlock, err := u.ClosingService.GetProjectFlockByID(c, uint(projectFlockID))
-	if err != nil {
-		return err
-	}
-
-	result, err := u.ClosingService.GetPenjualan(c, uint(projectFlockID))
+	result, err := u.ClosingService.GetPenjualan(c, uint(projectFlockID), nil)
 	if err != nil {
 		return err
 	}
@@ -123,19 +158,60 @@ func (u *ClosingController) GetPenjualan(c *fiber.Ctx) error {
 			Code:    fiber.StatusOK,
 			Status:  "success",
 			Message: "Get closing penjualan successfully",
-			Data:    dto.ToPenjualanRealisasiResponseDTO(projectFlock.Category, uint(projectFlockID), result),
+			Data:    dto.ToPenjualanRealisasiResponseDTO(uint(projectFlockID), result),
+		})
+}
+
+func (u *ClosingController) GetPenjualanByProjectFlockKandang(c *fiber.Ctx) error {
+	projectParam := c.Params("project_flock_id")
+	kandangParam := c.Params("project_flock_kandang_id")
+
+	projectFlockID, err := strconv.Atoi(projectParam)
+	if err != nil || projectFlockID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
+	}
+
+	pfkID, err := strconv.Atoi(kandangParam)
+	if err != nil || pfkID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
+	}
+
+	kandangID := uint(pfkID)
+
+	result, err := u.ClosingService.GetPenjualan(c, uint(projectFlockID), &kandangID)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get closing penjualan by project flock kandang successfully",
+			Data:    dto.ToPenjualanRealisasiResponseDTO(uint(projectFlockID), result),
 		})
 }

 func (u *ClosingController) GetOverhead(c *fiber.Ctx) error {
-	param := c.Params("project_flock_id")
+	projectParam := c.Params("project_flock_id")
+	kandangParam := c.Params("project_flock_kandang_id")

-	projectFlockID, err := strconv.Atoi(param)
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid Project Flock Id")
+	projectFlockID, err := strconv.Atoi(projectParam)
+	if err != nil || projectFlockID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
 	}

-	result, err := u.ClosingService.GetOverhead(c, uint(projectFlockID))
+	var projectFlockKandangID *uint
+	if kandangParam != "" {
+		pfkID, err := strconv.Atoi(kandangParam)
+		if err != nil || pfkID <= 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
+		}
+		kandangID := uint(pfkID)
+		projectFlockKandangID = &kandangID
+	}
+
+	result, err := u.ClosingService.GetOverhead(c, uint(projectFlockID), projectFlockKandangID)
 	if err != nil {
 		return err
 	}
@@ -162,6 +238,14 @@ func (u *ClosingController) GetClosingSapronak(c *fiber.Ctx) error {
 		Page:  c.QueryInt("page", 1),
 		Limit: c.QueryInt("limit", 10),
 	}
+	if raw := c.Query("kandang_id"); raw != "" {
+		kandangInt, convErr := strconv.Atoi(raw)
+		if convErr != nil || kandangInt <= 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang_id")
+		}
+		kandangUint := uint(kandangInt)
+		query.KandangID = &kandangUint
+	}

 	if query.Page < 1 || query.Limit < 1 {
 		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
@@ -247,7 +331,7 @@ func (u *ClosingController) GetSapronakByKandang(c *fiber.Ctx) error {
 }

 func (u *ClosingController) GetClosingKeuangan(c *fiber.Ctx) error {
-	param := c.Params("project_flock_id")
+	param := c.Params("projectFlockId")

 	projectFlockID, err := strconv.Atoi(param)
 	if err != nil {
@@ -338,7 +422,18 @@ func (u *ClosingController) GetClosingDataProduksi(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid projectFlockId")
 	}

-	result, err := u.ClosingService.GetClosingDataProduksi(c, uint(id))
+	var kandangID *uint
+	if raw := c.Query("kandang_id"); raw != "" {
+		kandangInt, convErr := strconv.Atoi(raw)
+		if convErr != nil || kandangInt <= 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang_id")
+		}
+		kandangUint := uint(kandangInt)
+		kandangID = &kandangUint
+
+	}
+
+	result, err := u.ClosingService.GetClosingDataProduksi(c, uint(id), kandangID)
 	if err != nil {
 		return err
 	}
@@ -59,39 +59,65 @@ type ClosingSummaryDTO struct {
 	StatusClosing string `json:"closing_status"`
 }

+type ClosingSummaryKandangDTO struct {
+	FlockID             uint   `json:"flock_id"`
+	Period              int    `json:"period"`
+	LocationName        string `json:"location_name"`
+	Population          int    `json:"population"`
+	PopulationFormatted string `json:"population_formatted"`
+	ProjectType         string `json:"project_type"`
+	ClosingDate         string `json:"closing_date"`
+	KandangName         string `json:"kandang_name"`
+	ChickInDate         string `json:"chick_in_date"`
+	PicName             string `json:"pic_name"`
+	ApprovalDate        string `json:"approval_date"`
+	ProjectStatus       string `json:"project_status"`
+}
+
 type ClosingPurchaseDTO struct {
 	InitialPopulation int     `json:"initial_population"`
 	ClaimCulling      int     `json:"claim_culling"`
 	FinalPopulation   int     `json:"final_population"`
 	FeedIn            float64 `json:"feed_in"`
 	FeedUsed          float64 `json:"feed_used"`
-	FeedUsedPerHead   float64 `json:"feed_used_per_head"`
+	// FeedUsedPerHead   float64 `json:"feed_used_per_head"`
 }

 type ClosingSalesDTO struct {
 	SalesPopulation     int     `json:"sales_population"`
 	SalesWeight         float64 `json:"sales_weight"`
-	AverageWeight       float64 `json:"average_weight"`
-	AverageSellingPrice float64 `json:"chicken_average_selling_price"`
+	AverageWeight       float64 `json:"avg_weight"`
+	AverageSellingPrice float64 `json:"avg_selling_price"`
 }

 type ClosingEggSalesDTO struct {
 	EggPieces           int     `json:"egg_pieces"`
-	EggMassKg           float64 `json:"egg_mass_kg"`
-	AverageEggWeightKg  float64 `json:"average_egg_weight_kg"`
-	AverageSellingPrice float64 `json:"egg_average_selling_price"`
+	EggMassKg           float64 `json:"egg_mass"`
+	AverageEggWeightKg  float64 `json:"avg_egg_weight"`
+	AverageSellingPrice float64 `json:"avg_selling_price"`
 }

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

 type ClosingSalesGroupDTO struct {
@@ -164,7 +190,7 @@ func sumPopulation(history []entity.ProjectFlockKandang) float64 {
 	var total float64
 	for _, h := range history {
 		for _, chickin := range h.Chickins {
-			total += chickin.UsageQty + chickin.PendingUsageQty
+			total += chickin.UsageQty
 		}
 	}
 	return total
@@ -79,10 +79,11 @@ type HppGroup struct {
 }

 type SummaryHpp struct {
-	Label          string `json:"label"`
-	Comparison     `json:"-"`
-	EggBudgeting   *FinancialMetrics `json:"egg_budgeting,omitempty"`
-	EggRealization *FinancialMetrics `json:"egg_realization,omitempty"`
+	Label            string            `json:"label"`
+	Budgeting        FinancialMetrics  `json:"budgeting"`
+	Realization      FinancialMetrics  `json:"realization"`
+	EggBudgeting     *FinancialMetrics `json:"egg_budgeting,omitempty"`
+	EggRealization   *FinancialMetrics `json:"egg_realization,omitempty"`
 }

 type HppPurchasesSection struct {
@@ -246,11 +247,9 @@ func ToSummaryHpp(label string, purchaseItems []entities.PurchaseItem, budgets [
 	realizationRpPerBird, realizationRpPerKg := calculatePerUnitMetrics(totalRealization, ctx.TotalPopulation, ctx.TotalWeightProduced)

 	summary := SummaryHpp{
-		Label: label,
-		Comparison: ToComparison(
-			ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, totalBudget),
-			ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, totalRealization),
-		),
+		Label:       label,
+		Budgeting:   ToFinancialMetrics(budgetRpPerBird, budgetRpPerKg, totalBudget),
+		Realization: ToFinancialMetrics(realizationRpPerBird, realizationRpPerKg, totalRealization),
 	}

 	if projectFlockCategory == string(utils.ProjectFlockCategoryLaying) && ctx.TotalEggWeightKg > 0 {
--- a/Show More
+++ b/Show More