Merge branch 'feat/BE/Sprint-6' of https://gitlab.com/mbugroup/lti-api into dev/ragil

Feat[BE][US#283]: init module closing

See merge request mbugroup/lti-api!76

.air.toml

@@ -3,13 +3,9 @@ root = "."
 tmp_dir = "tmp"
 
 [build]
-# Build binary utama
-cmd = "go build -o /lti-api/tmp/main ./cmd/api"
-# Lokasi binary hasil build
-bin = "/lti-api/tmp/main"
-# Jalankan binary langsung dengan environment dev
-full_bin = "APP_ENV=dev /lti-api/tmp/main"
-# File yang dipantau oleh Air
+cmd = "go build -o ./tmp/main ./cmd/api"
+bin = "tmp/main"
+full_bin = "APP_ENV=dev ./tmp/main"
 include_ext = ["go", "tpl", "tmpl", "html"]
 exclude_dir = ["vendor", "tmp"]
 

.gitlab-ci.yml

@@ -6,24 +6,45 @@ deploy-dev:
   image: alpine:3.20
   variables:
     DEPLOY_APP: "LTI-MBUGROUP"
+    # Opsional: kalau pakai submodule, ini bikin clone submodule pakai SSH juga
+    GIT_SUBMODULE_STRATEGY: recursive
+    GIT_DEPTH: "1"
 
   before_script:
     - echo "🧰 Installing dependencies..."
-    - apk update && apk add --no-cache openssh git curl
+    - apk update && apk add --no-cache openssh git curl bash
+
+    # Setup SSH di runner
     - mkdir -p ~/.ssh
-    - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
     - chmod 600 ~/.ssh/id_rsa
-    - eval $(ssh-agent -s)
+    - eval "$(ssh-agent -s)"
     - ssh-add ~/.ssh/id_rsa
+
+    # Trust host keys (server + gitlab) biar SSH gak nanya interaktif
     - ssh-keyscan -H "$SERVER_IP" >> ~/.ssh/known_hosts
+    - ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
 
   script:
     - echo "🚀 Deploying latest code to $SERVER_USER@$SERVER_IP"
+
     - >
       if ssh -o StrictHostKeyChecking=no "$SERVER_USER@$SERVER_IP" "
-        cd /home/devops/docker/deployment/development/lti-api &&
-        git fetch origin development &&
-        git reset --hard origin/development &&
+        set -e
+
+        cd /home/devops/docker/deployment/development/lti-api
+
+        # Pastikan remote origin SSH (antisipasi kalau pernah ke-set HTTPS)
+        git remote set-url origin git@gitlab.com:mbugroup/lti-api.git
+
+        # Pastikan server percaya gitlab.com juga (untuk git fetch via SSH)
+        mkdir -p ~/.ssh
+        ssh-keyscan -H gitlab.com >> ~/.ssh/known_hosts
+
+        # Fetch/reset pakai SSH
+        GIT_SSH_COMMAND='ssh -o StrictHostKeyChecking=no' git fetch origin development
+        git reset --hard origin/development
+
         docker compose restart dev-api-lti || docker compose up -d dev-api-lti
       "; then
         STATUS='success';

docker-compose.local.yml

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

go.mod

@@ -5,7 +5,6 @@ go 1.23
 require (
 	github.com/MicahParks/keyfunc/v2 v2.1.0
 	github.com/bytedance/sonic v1.12.1
-	github.com/glebarez/sqlite v1.11.0
 	github.com/go-playground/validator/v10 v10.27.0
 	github.com/gofiber/contrib/jwt v1.0.10
 	github.com/gofiber/fiber/v2 v2.52.5
@@ -26,10 +25,8 @@ require (
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
-	github.com/glebarez/go-sqlite v1.21.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
@@ -54,7 +51,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // 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/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -79,8 +75,4 @@ require (
 	golang.org/x/text v0.22.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.22.5 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
-	modernc.org/sqlite v1.23.1 // indirect
 )

go.sum

@@ -27,18 +27,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
-github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
-github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
-github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
-github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -56,8 +50,6 @@ github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17w
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -154,9 +146,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.14.0 h1:u4tNCjXOyzfgeLN+vAZaW1xUooqWDqVEsZN0U01jfAE=
 github.com/redis/go-redis/v9 v9.14.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
-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/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=
@@ -317,12 +306,4 @@ gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8=
 gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
 gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg=
 gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
-modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
-modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
-modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
-modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
-modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=

internal/common/repository/common.stock_allocation.repository.go

@@ -0,0 +1,75 @@
+package repository
+
+import (
+	"context"
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type StockAllocationRepository interface {
+	BaseRepository[entity.StockAllocation]
+	FindActiveByUsable(ctx context.Context, usableType string, usableID uint, modifier func(*gorm.DB) *gorm.DB) ([]entity.StockAllocation, error)
+	ReleaseByUsable(ctx context.Context, usableType string, usableID uint, note *string, modifier func(*gorm.DB) *gorm.DB) error
+}
+
+type StockAllocationRepositoryImpl struct {
+	*BaseRepositoryImpl[entity.StockAllocation]
+}
+
+func NewStockAllocationRepository(db *gorm.DB) StockAllocationRepository {
+	return &StockAllocationRepositoryImpl{
+		BaseRepositoryImpl: NewBaseRepository[entity.StockAllocation](db),
+	}
+}
+
+func (r *StockAllocationRepositoryImpl) FindActiveByUsable(
+	ctx context.Context,
+	usableType string,
+	usableID uint,
+	modifier func(*gorm.DB) *gorm.DB,
+) ([]entity.StockAllocation, error) {
+	var allocations []entity.StockAllocation
+
+	q := r.DB().WithContext(ctx).
+		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, entity.StockAllocationStatusActive)
+
+	if modifier != nil {
+		q = modifier(q)
+	}
+
+	if err := q.Order("created_at ASC").Find(&allocations).Error; err != nil {
+		return nil, err
+	}
+
+	return allocations, nil
+}
+
+func (r *StockAllocationRepositoryImpl) ReleaseByUsable(
+	ctx context.Context,
+	usableType string,
+	usableID uint,
+	note *string,
+	modifier func(*gorm.DB) *gorm.DB,
+) error {
+	now := time.Now()
+
+	updates := map[string]any{
+		"status":      entity.StockAllocationStatusReleased,
+		"released_at": now,
+	}
+	if note != nil {
+		updates["note"] = *note
+	}
+
+	q := r.DB().WithContext(ctx).
+		Model(&entity.StockAllocation{}).
+		Where("usable_type = ? AND usable_id = ? AND status = ?", usableType, usableID, entity.StockAllocationStatusActive)
+
+	if modifier != nil {
+		q = modifier(q)
+	}
+
+	return q.Updates(updates).Error
+}

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

@@ -0,0 +1,820 @@
+package service
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"math"
+	"sort"
+	"strings"
+	"time"
+
+	"github.com/sirupsen/logrus"
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	"gitlab.com/mbugroup/lti-api.git/internal/entities"
+	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+type FifoService interface {
+	RegisterStockable(cfg fifo.StockableConfig) error
+	RegisterUsable(cfg fifo.UsableConfig) error
+
+	Replenish(ctx context.Context, req StockReplenishRequest) (*StockReplenishResult, error)
+	Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error)
+	ReleaseUsage(ctx context.Context, req StockReleaseRequest) error
+}
+
+type fifoService struct {
+	db                     *gorm.DB
+	logger                 *logrus.Logger
+	allocations            commonRepo.StockAllocationRepository
+	productWarehouseRepo   productWarehouseRepo.ProductWarehouseRepository
+	defaultOrderBy         []string
+	pendingBatchPerUsable  int
+	maxLotsPerStockable    int
+	defaultAllocationNotes string
+}
+
+func NewFifoService(
+	db *gorm.DB,
+	allocations commonRepo.StockAllocationRepository,
+	productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository,
+	logger *logrus.Logger,
+) FifoService {
+	if logger == nil {
+		logger = logrus.StandardLogger()
+	}
+	return &fifoService{
+		db:                    db,
+		logger:                logger,
+		allocations:           allocations,
+		productWarehouseRepo:  productWarehouseRepo,
+		defaultOrderBy:        []string{"created_at ASC", "id ASC"},
+		pendingBatchPerUsable: 25,
+		maxLotsPerStockable:   50,
+	}
+}
+
+func (s *fifoService) withTransaction(
+	ctx context.Context,
+	tx *gorm.DB,
+	fn func(*gorm.DB) error,
+) error {
+	if tx != nil {
+		return fn(tx.WithContext(ctx))
+	}
+	return s.db.WithContext(ctx).Transaction(func(inner *gorm.DB) error {
+		return fn(inner)
+	})
+}
+
+func (s *fifoService) txOrDB(tx, db *gorm.DB) *gorm.DB {
+	if tx != nil {
+		return tx
+	}
+	return db
+}
+
+func (s *fifoService) RegisterStockable(cfg fifo.StockableConfig) error {
+	return fifo.RegisterStockable(cfg)
+}
+
+func (s *fifoService) RegisterUsable(cfg fifo.UsableConfig) error {
+	return fifo.RegisterUsable(cfg)
+}
+
+type StockReplenishRequest struct {
+	StockableKey       fifo.StockableKey
+	StockableID        uint
+	ProductWarehouseID uint
+	Quantity           float64
+	Note               *string
+	Tx                 *gorm.DB
+}
+
+type PendingResolution struct {
+	UsableKey fifo.UsableKey
+	UsableID  uint
+	Quantity  float64
+}
+
+type StockReplenishResult struct {
+	AddedQuantity    float64
+	PendingResolved  []PendingResolution
+	RemainingPending float64
+}
+
+type StockConsumeRequest struct {
+	UsableKey          fifo.UsableKey
+	UsableID           uint
+	ProductWarehouseID uint
+	Quantity           float64
+	AllowPending       bool
+	Note               *string
+	Tx                 *gorm.DB
+}
+
+type AllocationDetail struct {
+	StockableKey fifo.StockableKey
+	StockableID  uint
+	Quantity     float64
+}
+
+type StockConsumeResult struct {
+	RequestedQuantity float64
+	UsageQuantity     float64
+	PendingQuantity   float64
+	AddedAllocations  []AllocationDetail
+	ReleasedQuantity  float64
+}
+
+type StockReleaseRequest struct {
+	UsableKey fifo.UsableKey
+	UsableID  uint
+	Reason    *string
+	Tx        *gorm.DB
+}
+
+func (s *fifoService) Replenish(ctx context.Context, req StockReplenishRequest) (*StockReplenishResult, error) {
+	if req.StockableID == 0 || strings.TrimSpace(req.StockableKey.String()) == "" {
+		return nil, errors.New("stockable key and id are required")
+	}
+	if req.ProductWarehouseID == 0 {
+		return nil, errors.New("product warehouse id is required")
+	}
+	if req.Quantity <= 0 {
+		return nil, errors.New("quantity must be greater than zero")
+	}
+
+	cfg, ok := fifo.Stockable(req.StockableKey)
+	if !ok {
+		return nil, fmt.Errorf("stockable %q is not registered", req.StockableKey)
+	}
+
+	result := &StockReplenishResult{
+		AddedQuantity: req.Quantity,
+	}
+
+	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
+		if err := s.incrementStockableQty(ctx, tx, cfg, req.StockableID, req.Quantity); err != nil {
+			return err
+		}
+
+		if err := s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
+			req.ProductWarehouseID: req.Quantity,
+		}, func(db *gorm.DB) *gorm.DB {
+			return s.txOrDB(tx, db)
+		}); err != nil {
+			return err
+		}
+
+		resolved, err := s.resolvePendingForWarehouse(ctx, tx, req.ProductWarehouseID)
+		if err != nil {
+			return err
+		}
+		result.PendingResolved = resolved
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error) {
+	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
+		return nil, errors.New("usable key and id are required")
+	}
+	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)
+	}
+
+	result := &StockConsumeResult{
+		RequestedQuantity: req.Quantity,
+	}
+
+	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
+		ctxRow, err := s.loadUsableContext(ctx, tx, cfg, req.UsableID)
+		if err != nil {
+			return err
+		}
+
+		productWarehouseID := ctxRow.ProductWarehouseID
+		if productWarehouseID == 0 {
+			return fmt.Errorf("usable %q (id: %d) has no product warehouse reference", req.UsableKey, req.UsableID)
+		}
+		if req.ProductWarehouseID != 0 && req.ProductWarehouseID != productWarehouseID {
+			return fmt.Errorf("usable %q (id: %d) references product warehouse %d but %d was provided", req.UsableKey, req.UsableID, productWarehouseID, req.ProductWarehouseID)
+		}
+
+		currentUsage := ctxRow.UsageQty
+		currentPending := ctxRow.PendingQty
+		currentTotal := currentUsage + currentPending
+		delta := req.Quantity - currentTotal
+
+		var (
+			usageDelta     float64
+			pendingDelta   float64
+			addedAlloc     []AllocationDetail
+			releasedAmount float64
+		)
+
+		switch {
+		case delta > 0:
+			allocationRes, err := s.allocateFromStock(ctx, tx, productWarehouseID, req.UsableKey, req.UsableID, delta)
+			if err != nil {
+				return err
+			}
+			if allocationRes.pending > 0 && !req.AllowPending {
+				return fmt.Errorf("insufficient stock: requested %.3f, allocated %.3f", req.Quantity, currentUsage+allocationRes.allocated)
+			}
+
+			usageDelta += allocationRes.allocated
+			pendingDelta += allocationRes.pending
+			addedAlloc = allocationRes.allocations
+
+			if allocationRes.allocated > 0 {
+				if err := s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
+					productWarehouseID: -allocationRes.allocated,
+				}, func(db *gorm.DB) *gorm.DB {
+					return s.txOrDB(tx, db)
+				}); err != nil {
+					return err
+				}
+			}
+		case delta < 0:
+			reductionTarget := -delta
+
+			if currentPending > 0 {
+				pendingReduction := math.Min(currentPending, reductionTarget)
+				if pendingReduction > 0 {
+					pendingDelta -= pendingReduction
+					reductionTarget -= pendingReduction
+				}
+			}
+
+			if reductionTarget > 0 {
+				released, err := s.releaseUsagePortion(ctx, tx, req.UsableKey, req.UsableID, reductionTarget)
+				if err != nil {
+					return err
+				}
+				if released+1e-6 < reductionTarget {
+					return fmt.Errorf("unable to release %.3f from usable %d, only %.3f available", reductionTarget, req.UsableID, released)
+				}
+				usageDelta -= released
+				releasedAmount = released
+			}
+		default:
+			// no change
+		}
+
+		if err := s.applyUsableDeltas(ctx, tx, cfg, req.UsableID, usageDelta, pendingDelta); err != nil {
+			return err
+		}
+
+		result.AddedAllocations = addedAlloc
+		result.ReleasedQuantity = releasedAmount
+		result.UsageQuantity = currentUsage + usageDelta
+		result.PendingQuantity = currentPending + pendingDelta
+
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+func (s *fifoService) ReleaseUsage(ctx context.Context, req StockReleaseRequest) error {
+	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 {
+			return fmt.Errorf("usable %q is not registered", req.UsableKey)
+		}
+
+		ctxRow, err := s.loadUsableContext(ctx, tx, cfg, req.UsableID)
+		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 {
+				return err
+			}
+			usageDelta -= ctxRow.UsageQty
+		}
+		if ctxRow.PendingQty > 0 {
+			pendingDelta -= ctxRow.PendingQty
+		}
+
+		if err := s.applyUsableDeltas(ctx, tx, cfg, req.UsableID, usageDelta, pendingDelta); err != nil {
+			return err
+		}
+
+		return s.allocations.ReleaseByUsable(ctx, req.UsableKey.String(), req.UsableID, req.Reason, func(db *gorm.DB) *gorm.DB {
+			return s.txOrDB(tx, db)
+		})
+	})
+}
+
+// --- helpers ---
+
+type usableContextRow struct {
+	ProductWarehouseID uint
+	UsageQty           float64
+	PendingQty         float64
+}
+
+func (s *fifoService) loadUsableContext(ctx context.Context, tx *gorm.DB, cfg fifo.UsableConfig, id uint) (*usableContextRow, error) {
+	var row usableContextRow
+
+	query := tx.Table(cfg.Table).
+		Select(fmt.Sprintf("%s AS product_warehouse_id, COALESCE(%s,0) AS usage_qty, COALESCE(%s,0) AS pending_qty", cfg.Columns.ProductWarehouseID, cfg.Columns.UsageQuantity, cfg.Columns.PendingQuantity)).
+		Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id).
+		Clauses(clause.Locking{Strength: "UPDATE"})
+
+	if cfg.Scope != nil {
+		query = cfg.Scope(query)
+	}
+
+	if err := query.Take(&row).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, fmt.Errorf("usable record %d not found", id)
+		}
+		return nil, err
+	}
+
+	return &row, nil
+}
+
+func (s *fifoService) incrementStockableQty(ctx context.Context, tx *gorm.DB, cfg fifo.StockableConfig, id uint, qty float64) error {
+	column := cfg.Columns.TotalQuantity
+
+	query := tx.Table(cfg.Table).
+		Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id)
+	if cfg.Scope != nil {
+		query = cfg.Scope(query)
+	}
+
+	updates := map[string]any{
+		column: gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", column), qty),
+	}
+	if cfg.Columns.TotalUsedQuantity != "" {
+		updates[cfg.Columns.TotalUsedQuantity] = gorm.Expr(fmt.Sprintf("COALESCE(%s,0)", cfg.Columns.TotalUsedQuantity))
+	}
+
+	return query.Updates(updates).Error
+}
+
+func (s *fifoService) incrementStockableUsage(ctx context.Context, tx *gorm.DB, cfg fifo.StockableConfig, id uint, qty float64) error {
+	if qty == 0 {
+		return nil
+	}
+	column := cfg.Columns.TotalUsedQuantity
+	query := tx.Table(cfg.Table).
+		Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id)
+	if cfg.Scope != nil {
+		query = cfg.Scope(query)
+	}
+
+	return query.Update(column, gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", column), qty)).Error
+}
+
+type allocationOutcome struct {
+	allocated   float64
+	pending     float64
+	allocations []AllocationDetail
+}
+
+type stockLot struct {
+	StockableKey fifo.StockableKey
+	RecordID     uint
+	AvailableQty float64
+	CreatedAt    time.Time
+}
+
+func (s *fifoService) allocateFromStock(
+	ctx context.Context,
+	tx *gorm.DB,
+	productWarehouseID uint,
+	usableKey fifo.UsableKey,
+	usableID uint,
+	requestQty float64,
+) (*allocationOutcome, error) {
+	lots, err := s.fetchStockLots(ctx, tx, productWarehouseID)
+	if err != nil {
+		return nil, err
+	}
+	if len(lots) == 0 {
+		return &allocationOutcome{pending: requestQty}, nil
+	}
+
+	var (
+		remaining           = requestQty
+		applied             float64
+		allocations         []*entities.StockAllocation
+		allocationSummaries []AllocationDetail
+		usageAdjustments    = make(map[fifo.StockableKey]map[uint]float64)
+	)
+
+	for _, lot := range lots {
+		if remaining <= 0 {
+			break
+		}
+		if lot.AvailableQty <= 0 {
+			continue
+		}
+
+		portion := lot.AvailableQty
+		if portion > remaining {
+			portion = remaining
+		}
+
+		applied += portion
+		remaining -= portion
+
+		allocationSummaries = append(allocationSummaries, AllocationDetail{
+			StockableKey: lot.StockableKey,
+			StockableID:  lot.RecordID,
+			Quantity:     portion,
+		})
+
+		allocations = append(allocations, &entities.StockAllocation{
+			ProductWarehouseId: productWarehouseID,
+			StockableType:      lot.StockableKey.String(),
+			StockableId:        lot.RecordID,
+			UsableType:         usableKey.String(),
+			UsableId:           usableID,
+			Qty:                portion,
+			Status:             entities.StockAllocationStatusActive,
+		})
+
+		if _, ok := usageAdjustments[lot.StockableKey]; !ok {
+			usageAdjustments[lot.StockableKey] = make(map[uint]float64)
+		}
+		usageAdjustments[lot.StockableKey][lot.RecordID] += portion
+	}
+
+	if len(allocations) > 0 {
+		if err := s.allocations.CreateMany(ctx, allocations, func(db *gorm.DB) *gorm.DB {
+			return s.txOrDB(tx, db)
+		}); err != nil {
+			return nil, err
+		}
+
+		for key, deltas := range usageAdjustments {
+			cfg, ok := fifo.Stockable(key)
+			if !ok {
+				continue
+			}
+			for id, qty := range deltas {
+				if err := s.incrementStockableUsage(ctx, tx, cfg, id, qty); err != nil {
+					return nil, err
+				}
+			}
+		}
+	}
+
+	return &allocationOutcome{
+		allocated:   applied,
+		pending:     remaining,
+		allocations: allocationSummaries,
+	}, nil
+}
+
+func (s *fifoService) fetchStockLots(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]stockLot, error) {
+	configs := fifo.Stockables()
+	if len(configs) == 0 {
+		return nil, nil
+	}
+
+	var lots []stockLot
+	for key, cfg := range configs {
+		selectStmt := fmt.Sprintf(
+			"%s AS id, %s AS available_qty, %s AS created_at",
+			cfg.Columns.ID,
+			fmt.Sprintf("%s - COALESCE(%s,0)", cfg.Columns.TotalQuantity, cfg.Columns.TotalUsedQuantity),
+			cfg.Columns.CreatedAt,
+		)
+
+		var rows []struct {
+			ID           uint
+			AvailableQty float64
+			CreatedAt    time.Time
+		}
+
+		query := tx.Table(cfg.Table).
+			Select(selectStmt).
+			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
+			Where(fmt.Sprintf("%s > %s", cfg.Columns.TotalQuantity, cfg.Columns.TotalUsedQuantity))
+
+		if cfg.Scope != nil {
+			query = cfg.Scope(query)
+		}
+
+		for _, order := range s.orderClauses(cfg.OrderBy) {
+			query = query.Order(order)
+		}
+		query = query.Limit(s.maxLotsPerStockable)
+
+		if err := query.Find(&rows).Error; err != nil {
+			return nil, err
+		}
+
+		for _, row := range rows {
+			if row.AvailableQty <= 0 {
+				continue
+			}
+			lots = append(lots, stockLot{
+				StockableKey: key,
+				RecordID:     row.ID,
+				AvailableQty: row.AvailableQty,
+				CreatedAt:    row.CreatedAt,
+			})
+		}
+	}
+
+	if len(lots) == 0 {
+		return nil, nil
+	}
+
+	sort.SliceStable(lots, func(i, j int) bool {
+		if lots[i].CreatedAt.Equal(lots[j].CreatedAt) {
+			return lots[i].RecordID < lots[j].RecordID
+		}
+		return lots[i].CreatedAt.Before(lots[j].CreatedAt)
+	})
+
+	return lots, nil
+}
+
+func (s *fifoService) applyUsableDeltas(ctx context.Context, tx *gorm.DB, cfg fifo.UsableConfig, id uint, usageDelta, pendingDelta float64) error {
+	if usageDelta == 0 && pendingDelta == 0 {
+		return nil
+	}
+
+	updates := map[string]any{}
+	if usageDelta != 0 {
+		updates[cfg.Columns.UsageQuantity] = gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", cfg.Columns.UsageQuantity), usageDelta)
+	}
+	if pendingDelta != 0 {
+		updates[cfg.Columns.PendingQuantity] = gorm.Expr(fmt.Sprintf("COALESCE(%s,0) + ?", cfg.Columns.PendingQuantity), pendingDelta)
+	}
+
+	query := tx.Table(cfg.Table).Where(fmt.Sprintf("%s = ?", cfg.Columns.ID), id)
+	if cfg.Scope != nil {
+		query = cfg.Scope(query)
+	}
+
+	return query.Updates(updates).Error
+}
+
+type pendingCandidate struct {
+	UsableKey fifo.UsableKey
+	Config    fifo.UsableConfig
+	UsableID  uint
+	Pending   float64
+	CreatedAt time.Time
+}
+
+func (s *fifoService) resolvePendingForWarehouse(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]PendingResolution, error) {
+	candidates, err := s.fetchPendingCandidates(ctx, tx, productWarehouseID)
+	if err != nil {
+		return nil, err
+	}
+	if len(candidates) == 0 {
+		return nil, nil
+	}
+
+	var resolutions []PendingResolution
+
+	for _, candidate := range candidates {
+		if candidate.Pending <= 0 {
+			continue
+		}
+
+		outcome, err := s.allocateFromStock(ctx, tx, productWarehouseID, candidate.UsableKey, candidate.UsableID, candidate.Pending)
+		if err != nil {
+			return nil, err
+		}
+		if outcome.allocated <= 0 {
+			break
+		}
+
+		if err := s.applyUsableDeltas(ctx, tx, candidate.Config, candidate.UsableID, outcome.allocated, -outcome.allocated); err != nil {
+			return nil, err
+		}
+
+		if err := s.productWarehouseRepo.AdjustQuantities(ctx, map[uint]float64{
+			productWarehouseID: -outcome.allocated,
+		}, func(db *gorm.DB) *gorm.DB {
+			return s.txOrDB(tx, db)
+		}); err != nil {
+			return nil, err
+		}
+
+		resolutions = append(resolutions, PendingResolution{
+			UsableKey: candidate.UsableKey,
+			UsableID:  candidate.UsableID,
+			Quantity:  outcome.allocated,
+		})
+
+		if outcome.pending > 0 {
+			// No more stock available for this warehouse at the moment.
+			break
+		}
+	}
+
+	return resolutions, nil
+}
+
+func (s *fifoService) releaseUsagePortion(
+	ctx context.Context,
+	tx *gorm.DB,
+	usableKey fifo.UsableKey,
+	usableID uint,
+	target float64,
+) (float64, error) {
+	if target <= 0 {
+		return 0, nil
+	}
+
+	allocations, err := s.allocations.FindActiveByUsable(ctx, usableKey.String(), usableID, func(db *gorm.DB) *gorm.DB {
+		target := s.txOrDB(tx, db)
+		return target.Clauses(clause.Locking{Strength: "UPDATE"})
+	})
+	if err != nil {
+		return 0, err
+	}
+	if len(allocations) == 0 {
+		return 0, nil
+	}
+
+	var (
+		remaining            = target
+		totalReleased        float64
+		warehouseAdjustments = make(map[uint]float64)
+		stockableAdjustments = make(map[fifo.StockableKey]map[uint]float64)
+	)
+
+	now := time.Now()
+
+	for i := len(allocations) - 1; i >= 0 && remaining > 0; i-- {
+		allocation := allocations[i]
+		releaseAmt := allocation.Qty
+		if releaseAmt > remaining {
+			releaseAmt = remaining
+		}
+
+		remaining -= releaseAmt
+		totalReleased += releaseAmt
+		warehouseAdjustments[allocation.ProductWarehouseId] += releaseAmt
+
+		key := fifo.StockableKey(allocation.StockableType)
+		if _, ok := stockableAdjustments[key]; !ok {
+			stockableAdjustments[key] = make(map[uint]float64)
+		}
+		stockableAdjustments[key][allocation.StockableId] += releaseAmt
+
+		if releaseAmt == allocation.Qty {
+			if err := s.allocations.PatchOne(ctx, allocation.Id, map[string]any{
+				"status":      entities.StockAllocationStatusReleased,
+				"released_at": now,
+			}, func(db *gorm.DB) *gorm.DB {
+				return s.txOrDB(tx, db)
+			}); err != nil {
+				return 0, err
+			}
+		} else {
+			if err := s.allocations.PatchOne(ctx, allocation.Id, map[string]any{
+				"quantity": allocation.Qty - releaseAmt,
+			}, func(db *gorm.DB) *gorm.DB {
+				return s.txOrDB(tx, db)
+			}); err != nil {
+				return 0, err
+			}
+		}
+	}
+
+	if totalReleased == 0 {
+		return 0, nil
+	}
+
+	for key, deltas := range stockableAdjustments {
+		cfg, ok := fifo.Stockable(key)
+		if !ok {
+			continue
+		}
+		for id, qty := range deltas {
+			if err := s.incrementStockableUsage(ctx, tx, cfg, id, -qty); err != nil {
+				return 0, err
+			}
+		}
+	}
+
+	if len(warehouseAdjustments) > 0 {
+		if err := s.productWarehouseRepo.AdjustQuantities(ctx, warehouseAdjustments, func(db *gorm.DB) *gorm.DB {
+			return s.txOrDB(tx, db)
+		}); err != nil {
+			return 0, err
+		}
+
+		for warehouseID := range warehouseAdjustments {
+			if _, err := s.resolvePendingForWarehouse(ctx, tx, warehouseID); err != nil {
+				return 0, err
+			}
+		}
+	}
+
+	return totalReleased, nil
+}
+
+func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, productWarehouseID uint) ([]pendingCandidate, error) {
+	configs := fifo.Usables()
+	if len(configs) == 0 {
+		return nil, nil
+	}
+
+	var candidates []pendingCandidate
+
+	for key, cfg := range configs {
+		selectStmt := fmt.Sprintf(
+			"%s AS id, %s AS pending_qty, %s AS created_at",
+			cfg.Columns.ID,
+			cfg.Columns.PendingQuantity,
+			cfg.Columns.CreatedAt,
+		)
+
+		var rows []struct {
+			ID        uint
+			Pending   float64
+			CreatedAt time.Time
+		}
+
+		query := tx.Table(cfg.Table).
+			Select(selectStmt).
+			Where(fmt.Sprintf("%s = ?", cfg.Columns.ProductWarehouseID), productWarehouseID).
+			Where(fmt.Sprintf("%s > 0", cfg.Columns.PendingQuantity)).
+			Limit(s.pendingBatchPerUsable)
+
+		if cfg.Scope != nil {
+			query = cfg.Scope(query)
+		}
+
+		for _, order := range s.orderClauses(cfg.OrderBy) {
+			query = query.Order(order)
+		}
+
+		if err := query.Find(&rows).Error; err != nil {
+			return nil, err
+		}
+
+		for _, row := range rows {
+			if row.Pending <= 0 {
+				continue
+			}
+			candidates = append(candidates, pendingCandidate{
+				UsableKey: key,
+				Config:    cfg,
+				UsableID:  row.ID,
+				Pending:   row.Pending,
+				CreatedAt: row.CreatedAt,
+			})
+		}
+	}
+
+	if len(candidates) == 0 {
+		return nil, nil
+	}
+
+	sort.SliceStable(candidates, func(i, j int) bool {
+		if candidates[i].CreatedAt.Equal(candidates[j].CreatedAt) {
+			return candidates[i].UsableID < candidates[j].UsableID
+		}
+		return candidates[i].CreatedAt.Before(candidates[j].CreatedAt)
+	})
+
+	return candidates, nil
+}
+
+func (s *fifoService) orderClauses(custom []string) []string {
+	if len(custom) > 0 {
+		return custom
+	}
+	return s.defaultOrderBy
+}

internal/database/migrations/20250925040409_create_master_tables.up.sql

@@ -2,42 +2,42 @@
 CREATE TABLE users (
     id BIGSERIAL PRIMARY KEY,
     id_user BIGINT NOT NULL,
-    name VARCHAR NOT NULL,
-    email VARCHAR NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    name VARCHAR(50) NOT NULL,
+    email VARCHAR(50) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ
 );
 
-CREATE UNIQUE INDEX users_id_user_unique ON users (id_user) WHERE deleted_at IS NULL;
+CREATE UNIQUE INDEX users_id_user_unique ON users (id_user)
+WHERE
+    deleted_at IS NULL;
 
-CREATE UNIQUE INDEX users_email_unique ON users (email) WHERE deleted_at IS NULL;
+CREATE UNIQUE INDEX users_email_unique ON users (email)
+WHERE
+    deleted_at IS NULL;
 
 -- FLAGS
 CREATE TABLE flags (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     flagable_id BIGINT NOT NULL,
     flagable_type VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW()
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW ()
 );
 
-CREATE UNIQUE INDEX flags_unique_flagable ON flags (
-    name,
-    flagable_id,
-    flagable_type
-);
+CREATE UNIQUE INDEX flags_unique_flagable ON flags (name, flagable_id, flagable_type);
 
 CREATE INDEX flags_flagable_lookup ON flags (flagable_type, flagable_id);
 
 -- PRODUCT CATEGORIES
 CREATE TABLE product_categories (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     code VARCHAR(10) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -53,9 +53,9 @@ WHERE
 -- UOM
 CREATE TABLE uoms (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    name VARCHAR(50) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -67,12 +67,12 @@ WHERE
 -- BANKS
 CREATE TABLE banks (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     alias VARCHAR(5) NOT NULL,
-    owner VARCHAR,
+    owner VARCHAR(50),
     account_number VARCHAR(50) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -84,9 +84,9 @@ WHERE
 -- AREAS
 CREATE TABLE areas (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    name VARCHAR(50) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -98,11 +98,11 @@ WHERE
 -- LOCATIONS
 CREATE TABLE locations (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     address TEXT NOT NULL,
     area_id BIGINT NOT NULL REFERENCES areas (id) ON DELETE RESTRICT ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -114,11 +114,11 @@ WHERE
 -- KANDANG
 CREATE TABLE kandangs (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     location_id BIGINT NOT NULL REFERENCES locations (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     pic_id BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -130,13 +130,13 @@ WHERE
 -- WAREHOUSES
 CREATE TABLE warehouses (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     type VARCHAR(50) NOT NULL,
     area_id BIGINT NOT NULL REFERENCES areas (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     location_id BIGINT REFERENCES locations (id) ON DELETE SET NULL ON UPDATE CASCADE,
     kandang_id BIGINT REFERENCES kandangs (id) ON DELETE SET NULL ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -148,16 +148,16 @@ WHERE
 -- CUSTOMERS
 CREATE TABLE customers (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     pic_id BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
     type VARCHAR(50) NOT NULL,
     address TEXT NOT NULL,
     phone VARCHAR(20) NOT NULL,
-    email VARCHAR NOT NULL,
+    email VARCHAR(50) NOT NULL,
     account_number VARCHAR(50) NOT NULL,
     balance NUMERIC(15, 3) DEFAULT 0,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -169,10 +169,10 @@ WHERE
 -- NONSTOCK
 CREATE TABLE nonstocks (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     uom_id BIGINT NOT NULL REFERENCES uoms (id) ON DELETE RESTRICT ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -184,9 +184,9 @@ WHERE
 -- FCR
 CREATE TABLE fcrs (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    name VARCHAR(50) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -201,29 +201,29 @@ CREATE TABLE fcr_standards (
     weight NUMERIC(15, 3) NOT NULL,
     fcr_number NUMERIC(15, 3) NOT NULL,
     mortality NUMERIC(15, 3) NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ
 );
 
 -- SUPPLIERS
 CREATE TABLE suppliers (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
     alias VARCHAR(5) NOT NULL,
-    pic VARCHAR NOT NULL,
+    pic VARCHAR(50) NOT NULL,
     type VARCHAR(50) NOT NULL,
     category VARCHAR(20) NOT NULL,
-    hatchery VARCHAR,
+    hatchery VARCHAR(50),
     phone VARCHAR(20) NOT NULL,
-    email VARCHAR NOT NULL,
+    email VARCHAR(50) NOT NULL,
     address TEXT NOT NULL,
     npwp VARCHAR(50),
     account_number VARCHAR(50),
     balance NUMERIC(15, 3) DEFAULT 0,
     due_date INT NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -235,15 +235,15 @@ WHERE
 CREATE TABLE nonstock_suppliers (
     nonstock_id BIGINT NOT NULL REFERENCES nonstocks (id) ON DELETE CASCADE ON UPDATE CASCADE,
     supplier_id BIGINT NOT NULL REFERENCES suppliers (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
     PRIMARY KEY (nonstock_id, supplier_id)
 );
 
 -- PRODUCTS
 CREATE TABLE products (
     id BIGSERIAL PRIMARY KEY,
-    name VARCHAR NOT NULL,
-    brand VARCHAR NOT NULL,
+    name VARCHAR(50) NOT NULL,
+    brand VARCHAR(50) NOT NULL,
     sku VARCHAR(100),
     uom_id BIGINT NOT NULL REFERENCES uoms (id) ON DELETE RESTRICT ON UPDATE CASCADE,
     product_category_id BIGINT NOT NULL REFERENCES product_categories (id) ON DELETE RESTRICT ON UPDATE CASCADE,
@@ -251,8 +251,8 @@ CREATE TABLE products (
     selling_price NUMERIC(15, 3),
     tax NUMERIC(15, 3),
     expiry_period INT,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -268,15 +268,15 @@ WHERE
 CREATE TABLE product_suppliers (
     product_id BIGINT NOT NULL REFERENCES products (id) ON DELETE CASCADE ON UPDATE CASCADE,
     supplier_id BIGINT NOT NULL REFERENCES suppliers (id) ON DELETE CASCADE ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
     PRIMARY KEY (product_id, supplier_id)
 );
 
 -- PROJECTS
 CREATE TABLE projects (
     id BIGSERIAL PRIMARY KEY,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ,
     created_by BIGINT REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE
 );
@@ -288,8 +288,8 @@ CREATE TABLE product_warehouses (
     warehouse_id BIGINT NOT NULL REFERENCES warehouses (id),
     quantity INTEGER NOT NULL DEFAULT 0,
     created_by BIGINT NOT NULL REFERENCES users (id),
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ
 );
 
@@ -316,8 +316,8 @@ CREATE TABLE stock_logs (
     note TEXT,
     product_warehouse_id BIGINT NOT NULL REFERENCES product_warehouses (id) ON DELETE CASCADE ON UPDATE CASCADE,
     created_by BIGINT NOT NULL REFERENCES users (id) ON DELETE SET NULL ON UPDATE CASCADE,
-    created_at TIMESTAMPTZ DEFAULT NOW(),
-    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    created_at TIMESTAMPTZ DEFAULT NOW (),
+    updated_at TIMESTAMPTZ DEFAULT NOW (),
     deleted_at TIMESTAMPTZ
 );
 
@@ -330,4 +330,4 @@ CREATE INDEX stock_logs_created_by_idx ON stock_logs (created_by);
 
 CREATE INDEX stock_logs_created_at_idx ON stock_logs (created_at);
 
-CREATE INDEX stock_logs_deleted_at_idx ON stock_logs (deleted_at);
+CREATE INDEX stock_logs_deleted_at_idx ON stock_logs (deleted_at);

internal/database/migrations/20251107013921_create_marketings.down.sql

@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS marketing_delivery_products CASCADE;
+
+DROP TABLE IF EXISTS marketing_products CASCADE;
+
+DROP TABLE IF EXISTS marketings CASCADE;

internal/database/migrations/20251107013921_create_marketings.up.sql

@@ -0,0 +1,44 @@
+CREATE TABLE marketings (
+    id BIGSERIAL PRIMARY KEY,
+    so_number VARCHAR(255) UNIQUE NOT NULL,
+    customer_id BIGINT NOT NULL,
+    so_docs VARCHAR(20),
+    so_date DATE NOT NULL,
+    sales_person_id BIGINT NOT NULL,
+    notes TEXT,
+    created_by BIGINT NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    deleted_at TIMESTAMPTZ
+);
+
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'customers') THEN
+        ALTER TABLE marketings
+            ADD CONSTRAINT fk_marketings_customer_id 
+            FOREIGN KEY (customer_id) REFERENCES customers(id) ON DELETE RESTRICT;
+    END IF;
+
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        ALTER TABLE marketings
+            ADD CONSTRAINT fk_marketings_sales_person_id 
+            FOREIGN KEY (sales_person_id) REFERENCES users(id) ON DELETE RESTRICT;
+    END IF;
+
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        ALTER TABLE marketings
+            ADD CONSTRAINT fk_marketings_created_by 
+            FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE RESTRICT;
+    END IF;
+END $$;
+
+CREATE INDEX idx_marketings_customer_id ON marketings (customer_id);
+
+CREATE INDEX idx_marketings_sales_person_id ON marketings (sales_person_id);
+
+CREATE INDEX idx_marketings_created_by ON marketings (created_by);
+
+CREATE INDEX idx_marketings_so_date ON marketings (so_date);
+
+CREATE INDEX idx_marketings_deleted_at ON marketings (deleted_at);

internal/database/migrations/20251107015122_create_marketing_products.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS marketing_products CASCADE;

internal/database/migrations/20251107015122_create_marketing_products.up.sql

@@ -0,0 +1,34 @@
+CREATE TABLE marketing_products (
+    id BIGSERIAL PRIMARY KEY,
+    marketing_id BIGINT NOT NULL,
+    product_warehouse_id BIGINT NOT NULL,
+    qty NUMERIC(15, 3) NOT NULL,
+    unit_price NUMERIC(15, 3) NOT NULL,
+    avg_weight NUMERIC(15, 3) NOT NULL,
+    total_weight NUMERIC(15, 3) NOT NULL,
+    total_price NUMERIC(15, 3) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    deleted_at TIMESTAMPTZ
+);
+
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'marketings') THEN
+        ALTER TABLE marketing_products
+            ADD CONSTRAINT fk_marketing_products_marketing_id 
+            FOREIGN KEY (marketing_id) REFERENCES marketings(id) ON DELETE CASCADE;
+    END IF;
+
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
+        ALTER TABLE marketing_products
+            ADD CONSTRAINT fk_marketing_products_product_warehouse_id 
+            FOREIGN KEY (product_warehouse_id) REFERENCES product_warehouses(id) ON DELETE RESTRICT;
+    END IF;
+END $$;
+
+CREATE INDEX idx_marketing_products_marketing_id ON marketing_products (marketing_id);
+
+CREATE INDEX idx_marketing_products_product_warehouse_id ON marketing_products (product_warehouse_id);
+
+CREATE INDEX idx_marketing_products_deleted_at ON marketing_products (deleted_at);

internal/database/migrations/20251107015128_create_marketing_product_deliveries.down.sql

@@ -0,0 +1,2 @@
+
+DROP TABLE IF EXISTS marketing_delivery_products CASCADE;

internal/database/migrations/20251107015128_create_marketing_product_deliveries.up.sql

@@ -0,0 +1,29 @@
+CREATE TABLE marketing_delivery_products (
+    id BIGSERIAL PRIMARY KEY,
+    marketing_product_id BIGINT UNIQUE NOT NULL,
+    qty NUMERIC(15, 3) NOT NULL,
+    unit_price NUMERIC(15, 3) NOT NULL,
+    total_weight NUMERIC(15, 3) NOT NULL,
+    avg_weight NUMERIC(15, 3) NOT NULL,
+    total_price NUMERIC(15, 3) NOT NULL,
+    delivery_date DATE,
+    vehicle_number VARCHAR(50),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    deleted_at TIMESTAMPTZ
+);
+
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'marketing_products') THEN
+        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 IF;
+END $$;
+
+CREATE INDEX idx_marketing_delivery_products_marketing_product_id ON marketing_delivery_products (marketing_product_id);
+
+CREATE INDEX idx_marketing_delivery_products_delivery_date ON marketing_delivery_products (delivery_date);
+
+CREATE INDEX idx_marketing_delivery_products_deleted_at ON marketing_delivery_products (deleted_at);

internal/database/migrations/20251110070219_create_stock_allocations_table.down.sql

@@ -0,0 +1,7 @@
+DROP INDEX IF EXISTS stock_allocations_released_at_idx;
+DROP INDEX IF EXISTS stock_allocations_status_idx;
+DROP INDEX IF EXISTS stock_allocations_usage_lookup;
+DROP INDEX IF EXISTS stock_allocations_lookup;
+DROP INDEX IF EXISTS stock_allocations_product_warehouse_id_idx;
+
+DROP TABLE IF EXISTS stock_allocations;

internal/database/migrations/20251110070219_create_stock_allocations_table.up.sql

@@ -0,0 +1,30 @@
+CREATE TABLE IF NOT EXISTS stock_allocations (
+    id BIGSERIAL PRIMARY KEY,
+    product_warehouse_id BIGINT NOT NULL REFERENCES product_warehouses(id),
+    stockable_type VARCHAR(100) NOT NULL,
+    stockable_id BIGINT NOT NULL,
+    usable_type VARCHAR(100) NOT NULL,
+    usable_id BIGINT NOT NULL,
+    qty NUMERIC(15,3) NOT NULL,
+    status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE',
+    note TEXT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    released_at TIMESTAMPTZ NULL,
+    deleted_at TIMESTAMPTZ NULL
+);
+
+CREATE INDEX IF NOT EXISTS stock_allocations_product_warehouse_id_idx
+    ON stock_allocations (product_warehouse_id);
+
+CREATE INDEX IF NOT EXISTS stock_allocations_lookup
+    ON stock_allocations (stockable_type, stockable_id);
+
+CREATE INDEX IF NOT EXISTS stock_allocations_usage_lookup
+    ON stock_allocations (usable_type, usable_id);
+
+CREATE INDEX IF NOT EXISTS stock_allocations_status_idx
+    ON stock_allocations (status);
+
+CREATE INDEX IF NOT EXISTS stock_allocations_released_at_idx
+    ON stock_allocations (released_at);

internal/database/migrations/20251117034511_create_expenses_table.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS expenses;

internal/database/migrations/20251117034511_create_expenses_table.up.sql

@@ -0,0 +1,50 @@
+CREATE TABLE expenses (
+    id BIGSERIAL PRIMARY KEY,
+    reference_number VARCHAR(50) UNIQUE NOT NULL,
+    supplier_id BIGINT NOT NULL,
+    category VARCHAR(50) NOT NULL CHECK (
+        category IN ('BOP', 'NON-BOP')
+    ),
+    po_number VARCHAR(50) NULL,
+    document_path JSON,
+    realization_document_path JSON,
+    expense_date DATE NOT NULL,
+    realization_date DATE,
+    grand_total NUMERIC(15, 3) DEFAULT 0,
+    note TEXT,
+    created_by BIGINT,
+    created_at TIMESTAMPTZ DEFAULT now(),
+    updated_at TIMESTAMPTZ DEFAULT now(),
+    deleted_at TIMESTAMPTZ
+);
+
+CREATE SEQUENCE expenses_ref_seq INCREMENT BY 1 START WITH 1;
+
+-- Tambahkan Foreign Key ke suppliers
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'suppliers') THEN
+        ALTER TABLE expenses
+            ADD CONSTRAINT fk_expenses_supplier_id 
+            FOREIGN KEY (supplier_id) REFERENCES suppliers(id);
+
+END IF;
+
+END $$;
+
+-- Tambahkan Foreign Key ke users (created_by)
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        ALTER TABLE expenses
+            ADD CONSTRAINT fk_expenses_created_by
+            FOREIGN KEY (created_by) REFERENCES users(id);
+    END IF;
+END $$;
+
+-- Index
+CREATE INDEX idx_expenses_supplier_id ON expenses (supplier_id);
+
+CREATE INDEX idx_expenses_expense_date ON expenses (expense_date);
+
+CREATE INDEX idx_expenses_deleted_at ON expenses (deleted_at);

internal/database/migrations/20251117034529_create_expense_nonstocks_table.down.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS expense_nonstocks;
+
+DROP SEQUENCE expenses_ref_seq;

internal/database/migrations/20251117034529_create_expense_nonstocks_table.up.sql

@@ -0,0 +1,56 @@
+CREATE TABLE expense_nonstocks (
+    id BIGSERIAL PRIMARY KEY,
+    expense_id BIGINT NOT NULL,
+    project_flock_kandang_id BIGINT NULL,
+    kandang_id BIGINT NULL,
+    nonstock_id BIGINT,
+    qty NUMERIC(15, 3) NOT NULL,
+    unit_price NUMERIC(15, 3) NOT NULL,
+    total_price NUMERIC(15, 3) NOT NULL,
+    note TEXT NULL
+);
+
+-- Tambahkan Foreign Key ke expenses
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'expenses') THEN
+        ALTER TABLE expense_nonstocks
+            ADD CONSTRAINT fk_expense_nonstocks_expense_id 
+            FOREIGN KEY (expense_id) REFERENCES expenses(id);
+    END IF;
+END $$;
+
+-- Tambahkan Foreign Key ke project_flock_kandangs
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_flock_kandangs') THEN
+        ALTER TABLE expense_nonstocks
+            ADD CONSTRAINT fk_expense_nonstocks_kandang_id 
+            FOREIGN KEY (project_flock_kandang_id) REFERENCES project_flock_kandangs(id);
+    END IF;
+END $$;
+
+-- Tambahkan Foreign key ke kandang_id
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'kandangs') THEN
+        ALTER TABLE expense_nonstocks
+            ADD CONSTRAINT fk_expense_nonstocks_kandang_id_2 
+            FOREIGN KEY (kandang_id) REFERENCES kandangs(id);
+    END IF;
+END $$;
+
+-- Tambahkan Foreign Key ke nonstocks
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'nonstocks') THEN
+        ALTER TABLE expense_nonstocks
+            ADD CONSTRAINT fk_expense_nonstocks_nonstock_id 
+            FOREIGN KEY (nonstock_id) REFERENCES nonstocks(id);
+    END IF;
+END $$;
+
+-- Index
+CREATE INDEX idx_expense_nonstocks_expense_id ON expense_nonstocks (expense_id);
+
+CREATE INDEX idx_expense_nonstocks_nonstock_id ON expense_nonstocks (nonstock_id);

internal/database/migrations/20251117034538_create_expense_realizations_table.down.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS expense_realizations;

internal/database/migrations/20251117034538_create_expense_realizations_table.up.sql

@@ -0,0 +1,35 @@
+CREATE TABLE expense_realizations (
+    id BIGSERIAL PRIMARY KEY,
+    expense_nonstock_id BIGINT UNIQUE,
+    realization_qty NUMERIC(15, 3) NOT NULL,
+    realization_unit_price NUMERIC(15, 3) NOT NULL,
+    realization_total_price NUMERIC(15, 3) NOT NULL,
+    realization_date DATE NOT NULL,
+    note TEXT,
+    created_by BIGINT
+);
+
+-- Tambahkan Foreign Key ke expense_nonstocks
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'expense_nonstocks') THEN
+        ALTER TABLE expense_realizations
+            ADD CONSTRAINT fk_expense_realizations_nonstock_id 
+            FOREIGN KEY (expense_nonstock_id) REFERENCES expense_nonstocks(id);
+    END IF;
+END $$;
+
+-- Tambahkan Foreign Key ke users (created_by)
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
+        ALTER TABLE expense_realizations
+            ADD CONSTRAINT fk_expense_realizations_created_by
+            FOREIGN KEY (created_by) REFERENCES users(id);
+    END IF;
+END $$;
+
+-- Index
+CREATE INDEX idx_expense_realizations_nonstock_id ON expense_realizations (expense_nonstock_id);
+
+CREATE INDEX idx_expense_realizations_date ON expense_realizations (realization_date);

internal/database/migrations/20251118044026_update_marketing_product_and_marketing_delivery.down.sql

@@ -0,0 +1,11 @@
+-- Add back timestamp columns to marketing_products table
+ALTER TABLE marketing_products
+ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW(),
+ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT NOW(),
+ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;
+
+-- Add back timestamp columns to marketing_delivery_products table
+ALTER TABLE marketing_delivery_products
+ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW(),
+ADD COLUMN IF NOT EXISTS updated_at TIMESTAMPTZ DEFAULT NOW(),
+ADD COLUMN IF NOT EXISTS deleted_at TIMESTAMPTZ;

internal/database/migrations/20251118044026_update_marketing_product_and_marketing_delivery.up.sql

@@ -0,0 +1,27 @@
+-- Drop timestamp columns from marketing_products table if it exists
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'marketing_products' AND column_name = 'created_at') THEN
+        ALTER TABLE marketing_products DROP COLUMN created_at;
+    END IF;
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'marketing_products' AND column_name = 'updated_at') THEN
+        ALTER TABLE marketing_products DROP COLUMN updated_at;
+    END IF;
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'marketing_products' AND column_name = 'deleted_at') THEN
+        ALTER TABLE marketing_products DROP COLUMN deleted_at;
+    END IF;
+END $$;
+
+-- Drop timestamp columns from marketing_delivery_products table if it exists
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'marketing_delivery_products' AND column_name = 'created_at') THEN
+        ALTER TABLE marketing_delivery_products DROP COLUMN created_at;
+    END IF;
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'marketing_delivery_products' AND column_name = 'updated_at') THEN
+        ALTER TABLE marketing_delivery_products DROP COLUMN updated_at;
+    END IF;
+    IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'marketing_delivery_products' AND column_name = 'deleted_at') THEN
+        ALTER TABLE marketing_delivery_products DROP COLUMN deleted_at;
+    END IF;
+END $$;

internal/database/migrations/20251125055613_update_expneses_expense_nostock_and_expense_ralization.up.sql

@@ -0,0 +1,44 @@
+-- ============================
+-- EXPENSES
+-- ============================
+ALTER TABLE expenses DROP COLUMN IF EXISTS grand_total;
+
+ALTER TABLE expenses RENAME COLUMN note TO notes;
+
+ALTER TABLE expenses RENAME COLUMN expense_date TO transaction_date;
+
+-- ============================
+-- EXPENSE_REALIZATIONS
+-- ============================
+ALTER TABLE expense_realizations
+RENAME COLUMN realization_qty TO qty;
+
+ALTER TABLE expense_realizations
+RENAME COLUMN realization_unit_price TO price;
+
+ALTER TABLE expense_realizations RENAME COLUMN note TO notes;
+
+ALTER TABLE expense_realizations
+DROP COLUMN IF EXISTS realization_total_price;
+
+ALTER TABLE expense_realizations
+DROP COLUMN IF EXISTS realization_date;
+
+ALTER TABLE expense_realizations DROP COLUMN IF EXISTS created_by;
+
+ALTER TABLE expense_realizations
+ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW();
+
+-- ============================
+-- EXPENSE_NONSTOCKS
+-- ============================
+ALTER TABLE expense_nonstocks RENAME COLUMN note TO notes;
+
+ALTER TABLE expense_nonstocks DROP COLUMN IF EXISTS total_price;
+
+ALTER TABLE expense_nonstocks RENAME COLUMN unit_price TO price;
+
+ALTER TABLE expense_nonstocks DROP COLUMN IF EXISTS created_by;
+
+ALTER TABLE expense_nonstocks
+ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW();

internal/database/migrations/20251127070744_create_project_budgets.down.sql

@@ -0,0 +1,2 @@
+DROP Table IF EXISTS project_budgets;
+

internal/database/migrations/20251127070744_create_project_budgets.up.sql

@@ -0,0 +1,31 @@
+CREATE TABLE project_budgets (
+    id BIGSERIAL PRIMARY KEY,
+    project_flock_id BIGINT NOT NULL,
+    nonstock_id BIGINT NOT NULL,
+    qty NUMERIC(15, 3) NOT NULL,
+    price NUMERIC(15, 3) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT now()
+);
+
+-- Tambahkan Foreign Key ke project_flocks
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_flocks') THEN
+        ALTER TABLE project_budgets
+            ADD CONSTRAINT fk_project_budgets_project_flock_id 
+            FOREIGN KEY (project_flock_id) REFERENCES project_flocks(id);
+    END IF;
+END $$;
+-- Tambahkan Foreign Key ke nonstocks
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'nonstocks') THEN
+        ALTER TABLE project_budgets
+            ADD CONSTRAINT fk_project_budgets_nonstock_id 
+            FOREIGN KEY (nonstock_id) REFERENCES nonstocks(id);
+    END IF;
+END $$;
+-- Index
+CREATE INDEX idx_project_budgets_project_flock_id ON project_budgets (project_flock_id);
+
+CREATE INDEX idx_project_budgets_nonstock_id ON project_budgets (nonstock_id);

internal/database/seed/seeder.go

@@ -82,7 +82,7 @@ func Run(db *gorm.DB) error {
 			return err
 		}
 
-		if err := seedTransferStock(tx, adminID); err != nil {
+		if err := seedTransferStock(tx); err != nil {
 			return err
 		}
 		fmt.Println("✅ Master data seeding completed")
@@ -589,6 +589,14 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Category: "Day Old Chick",
 			Price:    1,
 		},
+		{
+			Name:     "Ayam Mati",
+			Brand:    "-",
+			Sku:      "2",
+			Uom:      "Ekor",
+			Category: "Day Old Chick",
+			Price:    1,
+		},
 		{
 			Name:     "Ayam Culling",
 			Brand:    "-",
@@ -684,7 +692,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			var existing entity.ProductSupplier
 			err := tx.Where("product_id = ? AND supplier_id = ?", product.Id, supplierID).First(&existing).Error
 			if errors.Is(err, gorm.ErrRecordNotFound) {
-				link := entity.ProductSupplier{ProductID: product.Id, SupplierID: supplierID}
+				link := entity.ProductSupplier{ProductId: product.Id, SupplierId: supplierID}
 				if err := tx.Create(&link).Error; err != nil {
 					return err
 				}
@@ -757,7 +765,7 @@ func seedNonstocks(tx *gorm.DB, createdBy uint, uoms map[string]uint, suppliers
 			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}
+				link := entity.NonstockSupplier{NonstockId: nonstock.Id, SupplierId: supplierID}
 				if err := tx.Create(&link).Error; err != nil {
 					return err
 				}
@@ -921,7 +929,7 @@ func seedProductWarehouse(tx *gorm.DB, createdBy uint) error {
 	return nil
 }
 
-func seedTransferStock(tx *gorm.DB, createdBy uint) error {
+func seedTransferStock(tx *gorm.DB) error {
 
 	transfer := entity.StockTransfer{
 		FromWarehouseId: 1,

internal/entities/area.go

@@ -8,7 +8,7 @@ import (
 
 type Area struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"not null;uniqueIndex:areas_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:areas_name_unique,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`

internal/entities/bank.go

@@ -8,9 +8,9 @@ import (
 
 type Bank struct {
 	Id            uint           `gorm:"primaryKey"`
-	Name          string         `gorm:"not null;uniqueIndex:banks_name_unique,where:deleted_at IS NULL"`
+	Name          string         `gorm:"type:varchar(50);not null;uniqueIndex:banks_name_unique,where:deleted_at IS NULL"`
 	Alias         string         `gorm:"not null;size:5"`
-	Owner         *string        `gorm:""`
+	Owner         *string        `gorm:"type:varchar(50)"`
 	AccountNumber string         `gorm:"not null;size:50"`
 	CreatedBy     uint           `gorm:"not null"`
 	CreatedAt     time.Time      `gorm:"autoCreateTime"`

internal/entities/customer.go

@@ -8,12 +8,12 @@ import (
 
 type Customer struct {
 	Id            uint           `gorm:"primaryKey"`
-	Name          string         `gorm:"not null;uniqueIndex:customers_name_unique,where:deleted_at IS NULL"`
+	Name          string         `gorm:"type:varchar(50);not null;uniqueIndex:customers_name_unique,where:deleted_at IS NULL"`
 	PicId         uint           `gorm:"not null"`
 	Type          string         `gorm:"not null;size:50"`
 	Address       string         `gorm:"not null"`
 	Phone         string         `gorm:"not null;size:20"`
-	Email         string         `gorm:"not null"`
+	Email         string         `gorm:"type:varchar(50);not null"`
 	AccountNumber string         `gorm:"not null;size:50"`
 	Balance       float64        `gorm:"default:0"`
 	CreatedBy     uint           `gorm:"not null"`

internal/entities/expense.go

@@ -0,0 +1,30 @@
+package entities
+
+import (
+	"database/sql"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Expense struct {
+	Id                      uint64         `gorm:"primaryKey;autoIncrement"`
+	ReferenceNumber         string         `gorm:"type:varchar(50);uniqueIndex"`
+	SupplierId              uint64         `gorm:""`
+	Category                string         `gorm:"type:varchar(50);not null"`
+	PoNumber                string         `gorm:"type:varchar(50)"`
+	DocumentPath            sql.NullString `gorm:"type:json"`
+	RealizationDocumentPath sql.NullString `gorm:"type:json;column:realization_document_path"`
+	RealizationDate         time.Time      `gorm:"type:date;column:realization_date"`
+	TransactionDate         time.Time      `gorm:"type:date;not null"`
+	Notes                   string         `gorm:"type:text;column:notes"`
+	CreatedBy               uint64         `gorm:""`
+	CreatedAt               time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt               time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt               gorm.DeletedAt `gorm:"index" json:"-"`
+
+	Supplier       *Supplier         `gorm:"foreignKey:SupplierId;references:Id"`
+	CreatedUser    *User             `gorm:"foreignKey:CreatedBy;references:Id"`
+	Nonstocks      []ExpenseNonstock `gorm:"foreignKey:ExpenseId;references:Id"`
+	LatestApproval *Approval         `gorm:"-" json:"latest_approval,omitempty"`
+}

internal/entities/expense_nonstock.go

@@ -0,0 +1,23 @@
+package entities
+
+import (
+	"time"
+)
+
+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"`
+
+	Expense             *Expense             `gorm:"foreignKey:ExpenseId;references:Id"`
+	ProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
+	Kandang             *Kandang             `gorm:"foreignKey:KandangId;references:Id"`
+	Nonstock            *Nonstock            `gorm:"foreignKey:NonstockId;references:Id"`
+	Realization         *ExpenseRealization  `gorm:"foreignKey:Id;references:ExpenseNonstockId"`
+}

internal/entities/expense_realization.go

@@ -0,0 +1,16 @@
+package entities
+
+import (
+	"time"
+)
+
+type ExpenseRealization struct {
+	Id                uint64    `gorm:"primaryKey;autoIncrement"`
+	ExpenseNonstockId *uint64   `gorm:""`
+	Qty               float64   `gorm:"type:numeric(15,3);not null;"`
+	Price             float64   `gorm:"type:numeric(15,3);not null;"`
+	Notes             string    `gorm:"type:text;"`
+	CreatedAt         time.Time `gorm:"type:timestamptz;default:CURRENT_TIMESTAMP"`
+
+	ExpenseNonstock *ExpenseNonstock `gorm:"foreignKey:ExpenseNonstockId;references:Id"`
+}

internal/entities/fcr.go

@@ -8,7 +8,7 @@ import (
 
 type Fcr struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"not null;uniqueIndex:idx_suppliers_name,where:deleted_at IS NULL"`
+	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:idx_suppliers_name,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`

internal/entities/flag.go

@@ -9,7 +9,7 @@ const (
 
 type Flag struct {
 	Id           uint      `gorm:"primaryKey"`
-	Name         string    `gorm:"not null;uniqueIndex:flags_unique_flagable"`
+	Name         string    `gorm:"type:varchar(50);size:50;not null;uniqueIndex:flags_unique_flagable"`
 	FlagableID   uint      `gorm:"not null;uniqueIndex:flags_unique_flagable;index:flags_flagable_lookup,priority:2"`
 	FlagableType string    `gorm:"size:50;not null;uniqueIndex:flags_unique_flagable;index:flags_flagable_lookup,priority:1"`
 	CreatedAt    time.Time `gorm:"autoCreateTime"`

internal/entities/kandang.go

@@ -8,7 +8,7 @@ import (
 
 type Kandang struct {
 	Id                   uint                  `gorm:"primaryKey"`
-	Name                 string                `gorm:"not null;uniqueIndex:kandangs_name_unique,where:deleted_at IS NULL"`
+	Name                 string                `gorm:"type:varchar(50);not null;uniqueIndex:kandangs_name_unique,where:deleted_at IS NULL"`
 	Status               string                `gorm:"type:varchar(50);not null"`
 	LocationId           uint                  `gorm:"not null"`
 	Capacity             float64               `gorm:"not null"`

internal/entities/location.go

@@ -8,7 +8,7 @@ import (
 
 type Location struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"not null;uniqueIndex:locations_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:locations_name_unique,where:deleted_at IS NULL"`
 	Address   string         `gorm:"not null"`
 	AreaId    uint           `gorm:"not null"`
 	CreatedBy uint           `gorm:"not null"`

internal/entities/marketing.go

@@ -0,0 +1,27 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Marketing struct {
+	Id            uint           `gorm:"primaryKey;autoIncrement"`
+	SoNumber      string         `gorm:"uniqueIndex;not null"`
+	CustomerId    uint           `gorm:"not null"`
+	SoDocs        string         `gorm:"type:varchar(20)"`
+	SoDate        time.Time      `gorm:"type:date;not null"`
+	SalesPersonId uint           `gorm:"not null"`
+	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" json:"-"`
+
+	Customer       Customer           `gorm:"foreignKey:CustomerId;references:Id"`
+	SalesPerson    User               `gorm:"foreignKey:SalesPersonId;references:Id"`
+	CreatedUser    User               `gorm:"foreignKey:CreatedBy;references:Id"`
+	Products       []MarketingProduct `gorm:"foreignKey:MarketingId;references:Id"`
+	LatestApproval *Approval          `gorm:"-" json:"latest_approval,omitempty"`
+}

internal/entities/marketing_delivery_product.go

@@ -0,0 +1,19 @@
+package entities
+
+import (
+	"time"
+)
+
+type MarketingDeliveryProduct struct {
+	Id                 uint       `gorm:"primaryKey;autoIncrement"`
+	MarketingProductId uint       `gorm:"uniqueIndex;not null"`
+	Qty                float64    `gorm:"type:numeric(15,3)"`
+	UnitPrice          float64    `gorm:"type:numeric(15,3)"`
+	TotalWeight        float64    `gorm:"type:numeric(15,3)"`
+	AvgWeight          float64    `gorm:"type:numeric(15,3)"`
+	TotalPrice         float64    `gorm:"type:numeric(15,3)"`
+	DeliveryDate       *time.Time `gorm:"type:timestamptz"`
+	VehicleNumber      string     `gorm:"type:varchar(50)"`
+
+	MarketingProduct MarketingProduct `gorm:"foreignKey:MarketingProductId;references:Id"`
+}

internal/entities/marketing_product.go

@@ -0,0 +1,16 @@
+package entities
+
+type MarketingProduct struct {
+	Id                 uint    `gorm:"primaryKey;autoIncrement"`
+	MarketingId        uint    `gorm:"not null"`
+	ProductWarehouseId uint    `gorm:"not null"`
+	Qty                float64 `gorm:"type:numeric(15,3);not null"`
+	UnitPrice          float64 `gorm:"type:numeric(15,3);not null"`
+	AvgWeight          float64 `gorm:"type:numeric(15,3);not null"`
+	TotalWeight        float64 `gorm:"type:numeric(15,3);not null"`
+	TotalPrice         float64 `gorm:"type:numeric(15,3);not null"`
+
+	Marketing        Marketing                 `gorm:"foreignKey:MarketingId;references:Id"`
+	ProductWarehouse ProductWarehouse          `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	DeliveryProduct  *MarketingDeliveryProduct `gorm:"foreignKey:MarketingProductId;references:Id"`
+}

internal/entities/nonstock.go

@@ -8,15 +8,15 @@ import (
 
 type Nonstock struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"not null;uniqueIndex:nonstocks_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:nonstocks_name_unique,where:deleted_at IS NULL"`
 	UomId     uint           `gorm:"not 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"`
-	Uom         Uom        `gorm:"foreignKey:UomId;references:Id"`
-	Suppliers   []Supplier `gorm:"many2many:nonstock_suppliers;joinForeignKey:NonstockID;joinReferences:SupplierID"`
-	Flags       []Flag     `gorm:"polymorphic:Flagable;polymorphicValue:nonstocks"`
+	CreatedUser       User               `gorm:"foreignKey:CreatedBy;references:Id"`
+	Uom               Uom                `gorm:"foreignKey:UomId;references:Id"`
+	NonstockSuppliers []NonstockSupplier `gorm:"foreignKey:NonstockId;references:Id"`
+	Flags             []Flag             `gorm:"polymorphic:Flagable;polymorphicValue:nonstocks"`
 }

internal/entities/nonstock_supplier.go

@@ -3,7 +3,10 @@ package entities
 import "time"
 
 type NonstockSupplier struct {
-	NonstockID uint      `gorm:"primaryKey"`
-	SupplierID uint      `gorm:"primaryKey"`
+	NonstockId uint      `gorm:"not null"`
+	SupplierId uint      `gorm:"not null"`
 	CreatedAt  time.Time `gorm:"autoCreateTime"`
+
+	Nonstock Nonstock `gorm:"foreignKey:NonstockId;references:Id"`
+	Supplier Supplier `gorm:"foreignKey:SupplierId;references:Id"`
 }

internal/entities/product-category.go

@@ -8,7 +8,7 @@ import (
 
 type ProductCategory struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"not null;uniqueIndex:product_categories_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:product_categories_name_unique,where:deleted_at IS NULL"`
 	Code      string         `gorm:"not null;size:10;uniqueIndex:product_categories_code_unique,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`

internal/entities/product.go

@@ -8,8 +8,8 @@ import (
 
 type Product struct {
 	Id                uint           `gorm:"primaryKey"`
-	Name              string         `gorm:"not null;uniqueIndex:products_name_unique,where:deleted_at IS NULL"`
-	Brand             string         `gorm:"not null"`
+	Name              string         `gorm:"type:varchar(50);not null;uniqueIndex:products_name_unique,where:deleted_at IS NULL"`
+	Brand             string         `gorm:"type:varchar(50);not null"`
 	Sku               *string        `gorm:"size:100;uniqueIndex:products_sku_unique,where:deleted_at IS NULL"`
 	UomId             uint           `gorm:"not null"`
 	ProductCategoryId uint           `gorm:"not null"`
@@ -22,9 +22,9 @@ type Product struct {
 	UpdatedAt         time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt         gorm.DeletedAt `gorm:"index" json:"-"`
 
-	CreatedUser     User            `gorm:"foreignKey:CreatedBy;references:Id"`
-	Uom             Uom             `gorm:"foreignKey:UomId;references:Id"`
-	ProductCategory ProductCategory `gorm:"foreignKey:ProductCategoryId;references:Id"`
-	Suppliers       []Supplier      `gorm:"many2many:product_suppliers;joinForeignKey:ProductID;joinReferences:SupplierID"`
-	Flags           []Flag          `gorm:"polymorphic:Flagable;polymorphicValue:products"`
+	CreatedUser      User              `gorm:"foreignKey:CreatedBy;references:Id"`
+	Uom              Uom               `gorm:"foreignKey:UomId;references:Id"`
+	ProductCategory  ProductCategory   `gorm:"foreignKey:ProductCategoryId;references:Id"`
+	ProductSuppliers []ProductSupplier `gorm:"foreignKey:ProductId;references:Id"`
+	Flags            []Flag            `gorm:"polymorphic:Flagable;polymorphicValue:products"`
 }

internal/entities/product_supplier.go

@@ -3,7 +3,10 @@ package entities
 import "time"
 
 type ProductSupplier struct {
-	ProductID  uint      `gorm:"primaryKey"`
-	SupplierID uint      `gorm:"primaryKey"`
+	ProductId  uint      `gorm:"not null"`
+	SupplierId uint      `gorm:"not null"`
 	CreatedAt  time.Time `gorm:"autoCreateTime"`
+
+	Product  Product  `gorm:"foreignKey:ProductId;references:Id"`
+	Supplier Supplier `gorm:"foreignKey:SupplierId;references:Id"`
 }

internal/entities/project_budget.go

@@ -0,0 +1,15 @@
+package entities
+
+import (
+	"time"
+)
+
+type ProjectBudget struct {
+	Id        uint      `gorm:"primaryKey"`
+	Qty       float64   `gorm:"type:numeric(15,3);not null"`
+	Price     float64   `gorm:"type:numeric(15,3);not null"`
+	CreatedAt time.Time `gorm:"autoCreateTime"`
+
+	Nonstock     *Nonstock     `gorm:"foreignKey:Id;references:Id"`
+	ProjectFlock *ProjectFlock `gorm:"foreignKey:Id;references:Id"`
+}

internal/entities/purchase.go

@@ -5,11 +5,11 @@ import (
 )
 
 type Purchase struct {
-	Id         uint64 `gorm:"primaryKey;autoIncrement"`
+	Id         uint `gorm:"primaryKey;autoIncrement"`
 	PrNumber   string `gorm:"not null"`
 	PoNumber   *string
 	PoDate     *time.Time
-	SupplierId uint64 `gorm:"not null"`
+	SupplierId uint `gorm:"not null"`
 	CreditTerm *int
 	DueDate    *time.Time
 	GrandTotal float64 `gorm:"type:numeric(15,3);default:0"`
@@ -17,7 +17,7 @@ type Purchase struct {
 	CreatedAt  time.Time  `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time  `gorm:"autoUpdateTime"`
 	DeletedAt  *time.Time `gorm:"index"`
-	CreatedBy  uint64     `gorm:"not null"`
+	CreatedBy  uint     `gorm:"not null"`
 
 	// Relations
 	Supplier       Supplier       `gorm:"foreignKey:SupplierId;references:Id"`

internal/entities/purchase_item.go

@@ -5,11 +5,11 @@ import (
 )
 
 type PurchaseItem struct {
-	Id                 uint64 `gorm:"primaryKey;autoIncrement"`
-	PurchaseId         uint64 `gorm:"not null"`
-	ProductId          uint64 `gorm:"not null"`
-	WarehouseId        uint64 `gorm:"not null"`
-	ProductWarehouseId *uint64
+	Id                 uint `gorm:"primaryKey;autoIncrement"`
+	PurchaseId         uint `gorm:"not null"`
+	ProductId          uint `gorm:"not null"`
+	WarehouseId        uint `gorm:"not null"`
+	ProductWarehouseId *uint
 	ReceivedDate       *time.Time
 	TravelNumber       *string
 	TravelNumberDocs   *string

internal/entities/stock_allocation.go

@@ -0,0 +1,33 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+const (
+	StockAllocationStatusPending  = "PENDING"
+	StockAllocationStatusActive   = "ACTIVE"
+	StockAllocationStatusReleased = "RELEASED"
+)
+
+// StockAllocation links a usable record (consumption) with an incoming stock record.
+// The combination lets us trace FIFO deductions while keeping each module focused on its own fields.
+type StockAllocation struct {
+	Id                 uint           `gorm:"primaryKey"`
+	ProductWarehouseId uint           `gorm:"not null;index"`
+	StockableType      string         `gorm:"size:100;not null;index:stock_allocations_lookup,priority:1"`
+	StockableId        uint           `gorm:"not null;index:stock_allocations_lookup,priority:2"`
+	UsableType         string         `gorm:"size:100;not null;index:stock_allocations_usage_lookup,priority:1"`
+	UsableId           uint           `gorm:"not null;index:stock_allocations_usage_lookup,priority:2"`
+	Qty                float64        `gorm:"type:numeric(15,3);not null"`
+	Status             string         `gorm:"size:20;not null;default:ACTIVE"`
+	Note               *string        `gorm:"type:text"`
+	CreatedAt          time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt          time.Time      `gorm:"autoUpdateTime"`
+	ReleasedAt         *time.Time     `gorm:"index"`
+	DeletedAt          gorm.DeletedAt `gorm:"index"`
+
+	ProductWarehouse *ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+}

internal/entities/supplier.go

@@ -8,14 +8,14 @@ import (
 
 type Supplier struct {
 	Id            uint           `gorm:"primaryKey"`
-	Name          string         `gorm:"not null;uniqueIndex:suppliers_name_unique,where:deleted_at IS NULL"`
+	Name          string         `gorm:"type:varchar(50);not null;uniqueIndex:suppliers_name_unique,where:deleted_at IS NULL"`
 	Alias         string         `gorm:"not null;size:5"`
-	Pic           string         `gorm:"not null"`
+	Pic           string         `gorm:"type:varchar(50);not null"`
 	Type          string         `gorm:"not null;size:50"`
 	Category      string         `gorm:"not null;size:20"`
-	Hatchery      *string        `gorm:"size:255"`
+	Hatchery      *string        `gorm:"type:varchar(50)"`
 	Phone         string         `gorm:"not null;size:20"`
-	Email         string         `gorm:"not null"`
+	Email         string         `gorm:"type:varchar(50);not null"`
 	Address       string         `gorm:"not null"`
 	Npwp          *string        `gorm:"size:50"`
 	AccountNumber *string        `gorm:"size:50"`
@@ -26,5 +26,7 @@ type Supplier struct {
 	UpdatedAt     time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt     gorm.DeletedAt `gorm:"index" json:"-"`
 
-	CreatedUser User `gorm:"foreignKey:CreatedBy;references:Id"`
+	CreatedUser       User               `gorm:"foreignKey:CreatedBy;references:Id"`
+	ProductSuppliers  []ProductSupplier  `gorm:"foreignKey:SupplierId;references:Id"`
+	NonstockSuppliers []NonstockSupplier `gorm:"foreignKey:SupplierId;references:Id"`
 }

internal/entities/uom.go

@@ -8,7 +8,7 @@ import (
 
 type Uom struct {
 	Id        uint           `gorm:"primaryKey"`
-	Name      string         `gorm:"not null;uniqueIndex:uoms_name_unique,where:deleted_at IS NULL"`
+	Name      string         `gorm:"type:varchar(50);not null;uniqueIndex:uoms_name_unique,where:deleted_at IS NULL"`
 	CreatedBy uint           `gorm:"not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`

internal/entities/user.go

@@ -9,8 +9,8 @@ import (
 type User struct {
 	Id        uint           `gorm:"primaryKey"`
 	IdUser    int64          `gorm:"uniqueIndex"`
-	Email     string         `gorm:"uniqueIndex"`
-	Name      string         `gorm:"not null"`
+	Email     string         `gorm:"type:varchar(50);uniqueIndex"`
+	Name      string         `gorm:"type:varchar(50);not null"`
 	CreatedAt time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`

internal/entities/warehouse.go

@@ -8,7 +8,7 @@ import (
 
 type Warehouse struct {
 	Id         uint   `gorm:"primaryKey"`
-	Name       string `gorm:"not null"`
+	Name       string `gorm:"type:varchar(50);not null"`
 	Type       string `gorm:"not null"`
 	AreaId     uint   `gorm:"not null"`
 	LocationId *uint

internal/middleware/auth.go

@@ -105,6 +105,14 @@ func AuthenticatedUser(c *fiber.Ctx) (*entity.User, bool) {
 	return nil, false
 }
 
+func ActorIDFromContext(c *fiber.Ctx) (uint, error) {
+	user, ok := AuthenticatedUser(c)
+	if !ok || user == nil || user.Id == 0 { 
+		return 0, fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
+	}
+	return user.Id, nil
+}
+
 // AuthDetails returns the full authentication context (token, claims, user).
 func AuthDetails(c *fiber.Ctx) (*AuthContext, bool) {
 	value := c.Locals(authContextLocalsKey)

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

@@ -85,7 +85,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
 
 	flat := dto.ToApprovalDTOs(records)
 	return c.Status(fiber.StatusOK).
-		JSON(response.SuccessWithPaginate[dto.ApprovalBaseDTO]{
+		JSON(response.SuccessWithPaginate[dto.ApprovalRelationDTO]{
 			Code:    fiber.StatusOK,
 			Status:  "success",
 			Message: "Get All approvals successfully",

internal/modules/approvals/dto/approval.dto.go

@@ -10,24 +10,24 @@ import (
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 )
 
-type ApprovalBaseDTO struct {
-	Id         uint                `json:"id"`
-	StepNumber uint16              `json:"step_number"`
-	StepName   string              `json:"step_name"`
-	Action     *string             `json:"action"`
-	Notes      *string             `json:"notes"`
-	ActionBy   userDTO.UserBaseDTO `json:"action_by"`
-	ActionAt   time.Time           `json:"action_at"`
+type ApprovalRelationDTO struct {
+	Id         uint                    `json:"id"`
+	StepNumber uint16                  `json:"step_number"`
+	StepName   string                  `json:"step_name"`
+	Action     *string                 `json:"action"`
+	Notes      *string                 `json:"notes"`
+	ActionBy   userDTO.UserRelationDTO `json:"action_by"`
+	ActionAt   time.Time               `json:"action_at"`
 }
 
 type ApprovalGroupDTO struct {
-	StepNumber uint16            `json:"step_number"`
-	StepName   string            `json:"step_name"`
-	Approvals  []ApprovalBaseDTO `json:"approvals"`
+	StepNumber uint16                `json:"step_number"`
+	StepName   string                `json:"step_name"`
+	Approvals  []ApprovalRelationDTO `json:"approvals"`
 }
 
-func ToApprovalDTO(e entity.Approval) ApprovalBaseDTO {
-	dto := ApprovalBaseDTO{
+func ToApprovalDTO(e entity.Approval) ApprovalRelationDTO {
+	dto := ApprovalRelationDTO{
 		Id:    e.Id,
 		Notes: e.Notes,
 	}
@@ -54,10 +54,10 @@ func ToApprovalDTO(e entity.Approval) ApprovalBaseDTO {
 	}
 
 	if e.ActionUser != nil && e.ActionUser.Id != 0 {
-		user := userDTO.ToUserBaseDTO(*e.ActionUser)
+		user := userDTO.ToUserRelationDTO(*e.ActionUser)
 		dto.ActionBy = user
 	} else if e.ActionBy != nil && *e.ActionBy != 0 {
-		dto.ActionBy = userDTO.UserBaseDTO{
+		dto.ActionBy = userDTO.UserRelationDTO{
 			Id:     *e.ActionBy,
 			IdUser: int64(*e.ActionBy),
 		}
@@ -71,8 +71,8 @@ func ToApprovalDTO(e entity.Approval) ApprovalBaseDTO {
 	return dto
 }
 
-func ToApprovalDTOs(items []entity.Approval) []ApprovalBaseDTO {
-	result := make([]ApprovalBaseDTO, len(items))
+func ToApprovalDTOs(items []entity.Approval) []ApprovalRelationDTO {
+	result := make([]ApprovalRelationDTO, len(items))
 	for i, item := range items {
 		result[i] = ToApprovalDTO(item)
 	}
@@ -86,7 +86,7 @@ func ToApprovalGroupDTOs(items []entity.Approval) []ApprovalGroupDTO {
 
 	type groupAccumulator struct {
 		StepName  string
-		Approvals []ApprovalBaseDTO
+		Approvals []ApprovalRelationDTO
 	}
 
 	groups := make(map[uint16]*groupAccumulator)

internal/modules/approvals/route.go

@@ -3,7 +3,7 @@ package approvals
 import (
 	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"github.com/gofiber/fiber/v2"
-
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/controllers"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -12,8 +12,8 @@ import (
 func ApprovalRoutes(v1 fiber.Router, u user.UserService, s common.ApprovalService) {
 	_ = u
 	ctrl := controller.NewApprovalController(s)
-
 	route := v1.Group("/approvals")
+	route.Use(m.Auth(u))
 
 	route.Get("/", ctrl.GetAll)
 }

internal/modules/closings/controllers/closing.controller.go

@@ -0,0 +1,76 @@
+package controller
+
+import (
+	"math"
+	"strconv"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/closings/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/response"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+type ClosingController struct {
+	ClosingService service.ClosingService
+}
+
+func NewClosingController(closingService service.ClosingService) *ClosingController {
+	return &ClosingController{
+		ClosingService: closingService,
+	}
+}
+
+func (u *ClosingController) GetAll(c *fiber.Ctx) error {
+	query := &validation.Query{
+		Page:   c.QueryInt("page", 1),
+		Limit:  c.QueryInt("limit", 10),
+		Search: c.Query("search", ""),
+	}
+
+	if query.Page < 1 || query.Limit < 1 {
+		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
+	}
+
+	result, totalResults, err := u.ClosingService.GetAll(c, query)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.SuccessWithPaginate[dto.ClosingListDTO]{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get all closings successfully",
+			Meta: response.Meta{
+				Page:         query.Page,
+				Limit:        query.Limit,
+				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+				TotalResults: totalResults,
+			},
+			Data: dto.ToClosingListDTOs(result),
+		})
+}
+
+func (u *ClosingController) GetOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	result, err := u.ClosingService.GetOne(c, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get closing successfully",
+			Data:    dto.ToClosingListDTO(*result),
+		})
+}

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

@@ -0,0 +1,64 @@
+package dto
+
+import (
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+)
+
+// === DTO Structs ===
+
+type ClosingRelationDTO struct {
+	Id   uint   `json:"id"`
+	Name string `json:"name"`
+}
+
+type ClosingListDTO struct {
+	Id          uint                     `json:"id"`
+	Name        string                   `json:"name"`
+	CreatedUser *userDTO.UserRelationDTO `json:"created_user"`
+	CreatedAt   time.Time                `json:"created_at"`
+	UpdatedAt   time.Time                `json:"updated_at"`
+}
+
+type ClosingDetailDTO struct {
+	ClosingListDTO
+}
+
+// === Mapper Functions ===
+
+func ToClosingRelationDTO(e entity.ProjectFlock) ClosingRelationDTO {
+	return ClosingRelationDTO{
+		Id: e.Id,
+	}
+}
+
+func ToClosingListDTO(e entity.ProjectFlock) ClosingListDTO {
+	var createdUser *userDTO.UserRelationDTO
+	if e.CreatedUser.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(e.CreatedUser)
+		createdUser = &mapped
+	}
+
+	return ClosingListDTO{
+		Id:          e.Id,
+		CreatedAt:   e.CreatedAt,
+		UpdatedAt:   e.UpdatedAt,
+		CreatedUser: createdUser,
+	}
+}
+
+func ToClosingListDTOs(e []entity.ProjectFlock) []ClosingListDTO {
+	result := make([]ClosingListDTO, len(e))
+	for i, r := range e {
+		result[i] = ToClosingListDTO(r)
+	}
+	return result
+}
+
+func ToClosingDetailDTO(e entity.ProjectFlock) ClosingDetailDTO {
+	return ClosingDetailDTO{
+		ClosingListDTO: ToClosingListDTO(e),
+	}
+}

internal/modules/closings/module.go

@@ -0,0 +1,26 @@
+package closings
+
+import (
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	rClosing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
+	sClosing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
+
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+)
+
+type ClosingModule struct{}
+
+func (ClosingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	closingRepo := rClosing.NewClosingRepository(db)
+	userRepo := rUser.NewUserRepository(db)
+
+	closingService := sClosing.NewClosingService(closingRepo, validate)
+	userService := sUser.NewUserService(userRepo, validate)
+
+	ClosingRoutes(router, userService, closingService)
+}
+

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

@@ -0,0 +1,21 @@
+package repository
+
+import (
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type ClosingRepository interface {
+	repository.BaseRepository[entity.ProjectFlock]
+}
+
+type ClosingRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.ProjectFlock]
+}
+
+func NewClosingRepository(db *gorm.DB) ClosingRepository {
+	return &ClosingRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.ProjectFlock](db),
+	}
+}

internal/modules/closings/route.go

@@ -0,0 +1,25 @@
+package closings
+
+import (
+	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/controllers"
+	closing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
+	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService) {
+	ctrl := controller.NewClosingController(s)
+
+	route := v1.Group("/closings")
+
+	// route.Get("/", m.Auth(u), ctrl.GetAll)
+	// route.Post("/", m.Auth(u), ctrl.CreateOne)
+	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
+	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
+	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
+
+	route.Get("/", ctrl.GetAll)
+	route.Get("/:id", ctrl.GetOne)
+}

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

@@ -0,0 +1,72 @@
+package service
+
+import (
+	"errors"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/repositories"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
+)
+
+type ClosingService interface {
+	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, error)
+	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, error)
+}
+
+type closingService struct {
+	Log        *logrus.Logger
+	Validate   *validator.Validate
+	Repository repository.ClosingRepository
+}
+
+func NewClosingService(repo repository.ClosingRepository, validate *validator.Validate) ClosingService {
+	return &closingService{
+		Log:        utils.Log,
+		Validate:   validate,
+		Repository: repo,
+	}
+}
+
+func (s closingService) withRelations(db *gorm.DB) *gorm.DB {
+	return db.Preload("CreatedUser")
+}
+
+func (s closingService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, error) {
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, 0, err
+	}
+
+	offset := (params.Page - 1) * params.Limit
+
+	closings, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
+		db = s.withRelations(db)
+		if params.Search != "" {
+			return db.Where("name LIKE ?", "%"+params.Search+"%")
+		}
+		return db.Order("created_at DESC").Order("updated_at DESC")
+	})
+
+	if err != nil {
+		s.Log.Errorf("Failed to get closings: %+v", err)
+		return nil, 0, err
+	}
+	return closings, total, nil
+}
+
+func (s closingService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, error) {
+	closing, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusNotFound, "Closing not found")
+	}
+	if err != nil {
+		s.Log.Errorf("Failed get closing by id: %+v", err)
+		return nil, err
+	}
+	return closing, nil
+}

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

@@ -0,0 +1,15 @@
+package validation
+
+type Create struct {
+	Name   string `json:"name" validate:"required_strict,min=3"`
+}
+
+type Update struct {
+	Name   *string `json:"name,omitempty" validate:"omitempty"`
+}
+
+type Query struct {
+	Page   int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search string `query:"search" validate:"omitempty,max=50"`
+}

internal/modules/expenses/controllers/expense.controller.go

@@ -0,0 +1,403 @@
+package controller
+
+import (
+	"encoding/json"
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/response"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+type ExpenseController struct {
+	ExpenseService service.ExpenseService
+}
+
+func NewExpenseController(expenseService service.ExpenseService) *ExpenseController {
+	return &ExpenseController{
+		ExpenseService: expenseService,
+	}
+}
+
+func (u *ExpenseController) GetAll(c *fiber.Ctx) error {
+	query := &validation.Query{
+		Page:   c.QueryInt("page", 1),
+		Limit:  c.QueryInt("limit", 10),
+		Search: c.Query("search", ""),
+	}
+
+	if query.Page < 1 || query.Limit < 1 {
+		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
+	}
+
+	result, totalResults, err := u.ExpenseService.GetAll(c, query)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.SuccessWithPaginate[dto.ExpenseListDTO]{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get all expenses successfully",
+			Meta: response.Meta{
+				Page:         query.Page,
+				Limit:        query.Limit,
+				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+				TotalResults: totalResults,
+			},
+			Data: result,
+		})
+}
+
+func (u *ExpenseController) GetOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	result, err := u.ExpenseService.GetOne(c, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get expense successfully",
+			Data:    result,
+		})
+}
+
+func (u *ExpenseController) CreateOne(c *fiber.Ctx) error {
+	req := new(validation.Create)
+
+	req.TransactionDate = c.FormValue("transaction_date")
+	req.Category = c.FormValue("category")
+
+	supplierID, err := strconv.ParseUint(c.FormValue("supplier_id"), 10, 64)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid supplier_id format")
+	}
+	req.SupplierID = supplierID
+
+	form, err := c.MultipartForm()
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid multipart form")
+	}
+	req.Documents = form.File["documents"]
+
+	expenseNonstocksJSON := c.FormValue("expense_nonstocks")
+	if expenseNonstocksJSON != "" {
+
+		if err := json.Unmarshal([]byte(expenseNonstocksJSON), &req.ExpenseNonstocks); err != nil {
+
+			var singleExpenseNonstock validation.ExpenseNonstock
+			if err := json.Unmarshal([]byte(expenseNonstocksJSON), &singleExpenseNonstock); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid expense_nonstocks JSON: %v", err))
+			}
+
+			if singleExpenseNonstock.KandangID == 0 {
+				return fiber.NewError(fiber.StatusBadRequest, "Field KandangID is required")
+			}
+
+			req.ExpenseNonstocks = []validation.ExpenseNonstock{singleExpenseNonstock}
+		} else {
+			for i, expenseNonstock := range req.ExpenseNonstocks {
+				if expenseNonstock.KandangID == 0 {
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Field KandangID is required for expense_nonstocks[%d]", i))
+				}
+			}
+		}
+	} else {
+		return fiber.NewError(fiber.StatusBadRequest, "Field expense_nonstocks is required")
+	}
+
+	result, err := u.ExpenseService.CreateOne(c, req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusCreated).
+		JSON(response.Success{
+			Code:    fiber.StatusCreated,
+			Status:  "success",
+			Message: "Create expense successfully",
+			Data:    result,
+		})
+}
+
+func (u *ExpenseController) UpdateOne(c *fiber.Ctx) error {
+	req := new(validation.Update)
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	form, err := c.MultipartForm()
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid multipart form")
+	}
+
+	req.Documents = form.File["documents"]
+	if transactionDate := c.FormValue("transaction_date"); transactionDate != "" {
+		req.TransactionDate = &transactionDate
+	}
+
+	categoryVal := c.FormValue("category")
+	req.Category = &categoryVal
+
+	supplierIDVal := c.FormValue("supplier_id")
+	if supplierIDVal != "" {
+		supplierID, err := strconv.ParseUint(supplierIDVal, 10, 64)
+		if err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid supplier_id format")
+		}
+		req.SupplierID = &supplierID
+	}
+
+	expenseNonstocksJSON := c.FormValue("expense_nonstocks")
+	if expenseNonstocksJSON != "" {
+		var expenseNonstocks []validation.ExpenseNonstock
+		if err := json.Unmarshal([]byte(expenseNonstocksJSON), &expenseNonstocks); err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid expense_nonstocks JSON: %v", err))
+		}
+
+		for i, expenseNonstock := range expenseNonstocks {
+			if expenseNonstock.KandangID == 0 {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Field KandangID is required for expense_nonstocks[%d]", i))
+			}
+		}
+
+		req.ExpenseNonstocks = &expenseNonstocks
+	}
+
+	result, err := u.ExpenseService.UpdateOne(c, req, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Update expense successfully",
+			Data:    result,
+		})
+}
+
+func (u *ExpenseController) DeleteOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	if err := u.ExpenseService.DeleteOne(c, uint(id)); err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Common{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Delete expense successfully",
+		})
+}
+
+func (u *ExpenseController) Approval(c *fiber.Ctx) error {
+	req := new(validation.ApprovalRequest)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	path := c.Path()
+	approvalType := ""
+	if strings.Contains(path, "/approvals/manager") {
+		approvalType = "manager"
+	} else if strings.Contains(path, "/approvals/finance") {
+		approvalType = "finance"
+	} else {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid approval path")
+	}
+
+	results, err := u.ExpenseService.Approval(c, req, approvalType)
+	if err != nil {
+		return err
+	}
+
+	var (
+		data    interface{}
+		message = "Submit expense approval successfully"
+	)
+	if len(results) == 1 {
+		data = results[0]
+	} else {
+		message = "Submit expense approvals successfully"
+		data = results
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: message,
+			Data:    data,
+		})
+}
+
+func (u *ExpenseController) CreateRealization(c *fiber.Ctx) error {
+	expenseID := c.Params("id")
+	id, err := strconv.Atoi(expenseID)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid expense ID")
+	}
+
+	req := new(validation.CreateRealization)
+
+	form, err := c.MultipartForm()
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid multipart form")
+	}
+	req.Documents = form.File["documents"]
+	req.RealizationDate = c.FormValue("realization_date")
+
+	realizationsJSON := c.FormValue("realizations")
+	if realizationsJSON != "" {
+		if err := json.Unmarshal([]byte(realizationsJSON), &req.Realizations); err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid realizations JSON: %v", err))
+		}
+	}
+
+	expense, err := u.ExpenseService.CreateRealization(c, uint(id), req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusCreated).
+		JSON(response.Success{
+			Code:    fiber.StatusCreated,
+			Status:  "success",
+			Message: "Create realization successfully",
+			Data:    expense,
+		})
+}
+
+func (u *ExpenseController) UpdateRealization(c *fiber.Ctx) error {
+	expenseID := c.Params("id")
+	id, err := strconv.Atoi(expenseID)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid expense ID")
+	}
+
+	var req validation.UpdateRealization
+
+	form, err := c.MultipartForm()
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid multipart form")
+	}
+
+	req.Documents = form.File["documents"]
+
+	req.RealizationDate = c.FormValue("realization_date")
+
+	realizationsJSON := c.FormValue("realizations")
+	if realizationsJSON != "" {
+		if err := json.Unmarshal([]byte(realizationsJSON), &req.Realizations); err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid realizations JSON: %v", err))
+		}
+	}
+
+	expense, err := u.ExpenseService.UpdateRealization(c, uint(id), &req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Update realization successfully",
+			Data:    expense,
+		})
+}
+
+func (u *ExpenseController) CompleteExpense(c *fiber.Ctx) error {
+	expenseID := c.Params("id")
+	id, err := strconv.Atoi(expenseID)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid expense ID")
+	}
+
+	expense, err := u.ExpenseService.CompleteExpense(c, uint(id), nil)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Complete expense successfully",
+			Data:    expense,
+		})
+}
+
+func (u *ExpenseController) DeleteDocument(c *fiber.Ctx) error {
+	expenseID, err := strconv.Atoi(c.Params("id"))
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid expense ID")
+	}
+
+	documentID, err := strconv.ParseUint(c.Params("documentId"), 10, 64)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid document ID")
+	}
+
+	if err := u.ExpenseService.DeleteDocument(c, uint(expenseID), documentID, false); err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Common{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Delete document successfully",
+		})
+}
+
+func (u *ExpenseController) DeleteRealizationDocument(c *fiber.Ctx) error {
+	expenseID, err := strconv.Atoi(c.Params("id"))
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid expense ID")
+	}
+
+	documentID, err := strconv.ParseUint(c.Params("documentId"), 10, 64)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid document ID")
+	}
+
+	if err := u.ExpenseService.DeleteDocument(c, uint(expenseID), documentID, true); err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Common{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Delete realization document successfully",
+		})
+}

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

@@ -0,0 +1,328 @@
+package dto
+
+import (
+	"encoding/json"
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	approvalDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/dto"
+	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
+	nonstockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/nonstocks/dto"
+	supplierDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/dto"
+	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+)
+
+// === DTO Structs ===
+
+type ExpenseRelationDTO struct {
+	Id              uint64    `json:"id"`
+	PoNumber        string    `json:"po_number"`
+	TransactionDate time.Time `json:"transaction_date"`
+}
+
+type ExpenseBaseDTO struct {
+	Id              uint64                           `json:"id"`
+	ReferenceNumber string                           `json:"reference_number"`
+	PoNumber        string                           `json:"po_number"`
+	Category        string                           `json:"category"`
+	Supplier        *supplierDTO.SupplierRelationDTO `json:"supplier,omitempty"`
+	RealizationDate *time.Time                       `json:"realization_date,omitempty"`
+	TransactionDate time.Time                        `json:"transaction_date"`
+	Location        *locationDTO.LocationRelationDTO `json:"location,omitempty"`
+}
+
+type ExpenseListDTO struct {
+	ExpenseBaseDTO
+	CreatedUser    *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
+	CreatedAt      time.Time                        `json:"created_at"`
+	UpdatedAt      time.Time                        `json:"updated_at"`
+	LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
+}
+
+type ExpenseDetailDTO struct {
+	ExpenseBaseDTO
+	Documents       []DocumentDTO                    `json:"documents,omitempty"`
+	RealizationDocs []DocumentDTO                    `json:"realization_docs,omitempty"`
+	Kandangs        []KandangGroupDTO                `json:"kandangs,omitempty"`
+	TotalPengajuan  float64                          `json:"total_pengajuan"`
+	TotalRealisasi  float64                          `json:"total_realisasi"`
+	CreatedAt       time.Time                        `json:"created_at"`
+	UpdatedAt       time.Time                        `json:"updated_at"`
+	CreatedUser     *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
+	LatestApproval  *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
+}
+
+type ExpenseNonstockDTO struct {
+	Id                    uint64                           `json:"id"`
+	ExpenseId             *uint64                          `json:"expense_id,omitempty"`
+	ProjectFlockKandangId *uint64                          `json:"project_flock_kandang_id,omitempty"`
+	KandangId             *uint64                          `json:"kandang_id,omitempty"`
+	NonstockId            *uint64                          `json:"nonstock_id,omitempty"`
+	Qty                   float64                          `json:"qty"`
+	Price                 float64                          `json:"price"`
+	Notes                 string                           `json:"notes"`
+	Nonstock              *nonstockDTO.NonstockRelationDTO `json:"nonstock,omitempty"`
+	CreatedAt             time.Time                        `json:"created_at"`
+}
+
+type ExpenseRealizationDTO struct {
+	Id                uint64                           `json:"id"`
+	ExpenseNonstockId *uint64                          `json:"expense_nonstock_id,omitempty"`
+	Qty               float64                          `json:"qty"`
+	Price             float64                          `json:"price"`
+	Notes             string                           `json:"notes"`
+	Nonstock          *nonstockDTO.NonstockRelationDTO `json:"nonstock,omitempty"`
+	CreatedAt         time.Time                        `json:"created_at"`
+}
+
+type KandangGroupDTO struct {
+	Id         uint64                  `json:"id"`
+	KandangId  uint64                  `json:"kandang_id"`
+	Name       string                  `json:"name,omitempty"`
+	Pengajuans []ExpenseNonstockDTO    `json:"pengajuans,omitempty"`
+	Realisasi  []ExpenseRealizationDTO `json:"realisasi,omitempty"`
+}
+
+type DocumentDTO struct {
+	ID   uint64 `json:"id"`
+	Path string `json:"path"`
+}
+
+// === MAPPERS ===
+
+func ToExpenseRelationDTO(e entity.Expense) ExpenseRelationDTO {
+	return ExpenseRelationDTO{
+		Id:              e.Id,
+		PoNumber:        e.PoNumber,
+		TransactionDate: e.TransactionDate,
+	}
+}
+
+func ToExpenseBaseDTO(e *entity.Expense) ExpenseBaseDTO {
+	var location *locationDTO.LocationRelationDTO
+	var supplier *supplierDTO.SupplierRelationDTO
+
+	var realizationDate *time.Time
+	if !e.RealizationDate.IsZero() {
+		realizationDate = &e.RealizationDate
+	}
+
+	if len(e.Nonstocks) > 0 && e.Nonstocks[0].Kandang != nil {
+		if e.Nonstocks[0].Kandang.Location.Id != 0 {
+			mapped := locationDTO.ToLocationRelationDTO(e.Nonstocks[0].Kandang.Location)
+			location = &mapped
+		}
+	}
+
+	if e.Supplier != nil && e.Supplier.Id != 0 {
+		mapped := supplierDTO.ToSupplierRelationDTO(*e.Supplier)
+		supplier = &mapped
+	}
+
+	return ExpenseBaseDTO{
+		Id:              e.Id,
+		ReferenceNumber: e.ReferenceNumber,
+		PoNumber:        e.PoNumber,
+		Category:        e.Category,
+		Supplier:        supplier,
+		RealizationDate: realizationDate,
+		TransactionDate: e.TransactionDate,
+		Location:        location,
+	}
+}
+
+func ToExpenseListDTO(e entity.Expense) ExpenseListDTO {
+	var createdUser *userDTO.UserRelationDTO
+	if e.CreatedUser.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(*e.CreatedUser)
+		createdUser = &mapped
+	}
+
+	var latestApproval *approvalDTO.ApprovalRelationDTO
+	if e.LatestApproval != nil {
+		mapped := approvalDTO.ToApprovalDTO(*e.LatestApproval)
+		latestApproval = &mapped
+	}
+
+	return ExpenseListDTO{
+		ExpenseBaseDTO: ToExpenseBaseDTO(&e),
+		CreatedUser:    createdUser,
+		CreatedAt:      e.CreatedAt,
+		UpdatedAt:      e.UpdatedAt,
+		LatestApproval: latestApproval,
+	}
+}
+
+func ToExpenseListDTOs(expenses []entity.Expense) []ExpenseListDTO {
+	result := make([]ExpenseListDTO, len(expenses))
+	for i, expense := range expenses {
+		result[i] = ToExpenseListDTO(expense)
+	}
+	return result
+}
+
+func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO {
+	var documents []DocumentDTO
+	var realizationDocs []DocumentDTO
+	var createdUser *userDTO.UserRelationDTO
+	if e.CreatedUser != nil && e.CreatedUser.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(*e.CreatedUser)
+		createdUser = &mapped
+	}
+
+	var latestApproval *approvalDTO.ApprovalRelationDTO
+	if e.LatestApproval != nil {
+		mapped := approvalDTO.ToApprovalDTO(*e.LatestApproval)
+		latestApproval = &mapped
+	}
+
+	var pengajuans []ExpenseNonstockDTO
+	var realisasi []ExpenseRealizationDTO
+
+	if e.DocumentPath.Valid && e.DocumentPath.String != "" {
+		json.Unmarshal([]byte(e.DocumentPath.String), &documents)
+	}
+
+	if e.RealizationDocumentPath.Valid && e.RealizationDocumentPath.String != "" {
+		json.Unmarshal([]byte(e.RealizationDocumentPath.String), &realizationDocs)
+	}
+
+	if len(e.Nonstocks) > 0 {
+		pengajuans = make([]ExpenseNonstockDTO, 0)
+		realisasi = make([]ExpenseRealizationDTO, 0)
+
+		for _, ns := range e.Nonstocks {
+			pengajuanDTO := ToExpenseNonstockDTO(ns)
+			pengajuans = append(pengajuans, pengajuanDTO)
+
+			if ns.Realization != nil {
+				var nonstock *nonstockDTO.NonstockRelationDTO
+				if ns.Nonstock != nil && ns.Nonstock.Id != 0 {
+					mapped := nonstockDTO.ToNonstockRelationDTO(*ns.Nonstock)
+					nonstock = &mapped
+				}
+
+				realisasiDTO := ExpenseRealizationDTO{
+					Id:                ns.Realization.Id,
+					ExpenseNonstockId: ns.Realization.ExpenseNonstockId,
+					Qty:               ns.Realization.Qty,
+					Price:             ns.Realization.Price,
+					Notes:             ns.Realization.Notes,
+					Nonstock:          nonstock,
+					CreatedAt:         ns.Realization.CreatedAt,
+				}
+				realisasi = append(realisasi, realisasiDTO)
+			}
+		}
+	}
+
+	var totalPengajuan float64
+	for _, p := range pengajuans {
+		totalPengajuan += p.Qty * p.Price
+	}
+
+	var totalRealisasi float64
+	for _, r := range realisasi {
+		totalRealisasi += r.Qty * r.Price
+	}
+	kandangs := ToKandangGroupDTO(pengajuans, realisasi, e.Nonstocks)
+
+	return ExpenseDetailDTO{
+		ExpenseBaseDTO:  ToExpenseBaseDTO(e),
+		Documents:       documents,
+		RealizationDocs: realizationDocs,
+		CreatedUser:     createdUser,
+		Kandangs:        kandangs,
+		TotalPengajuan:  totalPengajuan,
+		TotalRealisasi:  totalRealisasi,
+		CreatedAt:       e.CreatedAt,
+		UpdatedAt:       e.UpdatedAt,
+		LatestApproval:  latestApproval,
+	}
+}
+
+func ToExpenseNonstockDTO(ns entity.ExpenseNonstock) ExpenseNonstockDTO {
+	var nonstock *nonstockDTO.NonstockRelationDTO
+	if ns.Nonstock != nil && ns.Nonstock.Id != 0 {
+		mapped := nonstockDTO.ToNonstockRelationDTO(*ns.Nonstock)
+		nonstock = &mapped
+	}
+
+	return ExpenseNonstockDTO{
+		Id:                    ns.Id,
+		ExpenseId:             ns.ExpenseId,
+		ProjectFlockKandangId: ns.ProjectFlockKandangId,
+		KandangId:             ns.KandangId,
+		NonstockId:            ns.NonstockId,
+		Qty:                   ns.Qty,
+		Price:                 ns.Price,
+		Notes:                 ns.Notes,
+		Nonstock:              nonstock,
+		CreatedAt:             ns.CreatedAt,
+	}
+}
+
+func ToKandangGroupDTO(pengajuans []ExpenseNonstockDTO, realisasi []ExpenseRealizationDTO, nonstocks []entity.ExpenseNonstock) []KandangGroupDTO {
+	kandangMap := make(map[uint64]*KandangGroupDTO)
+
+	for _, p := range pengajuans {
+		var kandangId uint64
+		var kandangName string
+
+		if p.KandangId != nil {
+			kandangId = *p.KandangId
+			for _, ns := range nonstocks {
+				if ns.Id == p.Id && ns.Kandang != nil {
+					kandangName = ns.Kandang.Name
+					break
+				}
+			}
+		}
+
+		if kandangId > 0 {
+			if kandangMap[kandangId] == nil {
+				kandangMap[kandangId] = &KandangGroupDTO{
+					Id:         kandangId,
+					KandangId:  kandangId,
+					Name:       kandangName,
+					Pengajuans: []ExpenseNonstockDTO{},
+					Realisasi:  []ExpenseRealizationDTO{},
+				}
+			}
+			kandangMap[kandangId].Pengajuans = append(kandangMap[kandangId].Pengajuans, p)
+		}
+	}
+
+	for _, r := range realisasi {
+		var kandangId uint64
+		var kandangName string
+
+		for _, ns := range nonstocks {
+			if ns.Realization != nil && ns.Realization.Id == r.Id && ns.Kandang != nil {
+				kandangId = uint64(ns.Kandang.Id)
+				kandangName = ns.Kandang.Name
+				break
+			}
+		}
+
+		if kandangId > 0 {
+			if kandangMap[kandangId] == nil {
+				kandangMap[kandangId] = &KandangGroupDTO{
+					Id:         kandangId,
+					KandangId:  kandangId,
+					Name:       kandangName,
+					Pengajuans: []ExpenseNonstockDTO{},
+					Realisasi:  []ExpenseRealizationDTO{},
+				}
+			}
+			kandangMap[kandangId].Realisasi = append(kandangMap[kandangId].Realisasi, r)
+		}
+	}
+
+	var kandangs []KandangGroupDTO
+	for _, k := range kandangMap {
+		kandangs = append(kandangs, *k)
+	}
+
+	return kandangs
+}

internal/modules/expenses/module.go

@@ -0,0 +1,47 @@
+package expenses
+
+import (
+	"fmt"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	rExpense "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
+	sExpense "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/services"
+
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+
+	rNonstock "gitlab.com/mbugroup/lti-api.git/internal/modules/master/nonstocks/repositories"
+	rSupplier "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/repositories"
+	rProjectFlockKandang "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
+
+type ExpenseModule struct{}
+
+func (ExpenseModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	expenseRepo := rExpense.NewExpenseRepository(db)
+	userRepo := rUser.NewUserRepository(db)
+	supplierRepo := rSupplier.NewSupplierRepository(db)
+	nonstockRepo := rNonstock.NewNonstockRepository(db)
+	approvalRepo := commonRepo.NewApprovalRepository(db)
+	realizationRepo := rExpense.NewExpenseRealizationRepository(db)
+	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
+
+	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
+
+	// Register workflow steps for EXPENSES approval
+	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowExpense, utils.ExpenseApprovalSteps); err != nil {
+		panic(fmt.Sprintf("failed to register expense approval workflow: %v", err))
+	}
+
+	expenseService := sExpense.NewExpenseService(expenseRepo, supplierRepo, nonstockRepo, approvalSvc, realizationRepo, projectFlockKandangRepo, validate)
+	userService := sUser.NewUserService(userRepo, validate)
+
+	ExpenseRoutes(router, userService, expenseService)
+}

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

@@ -0,0 +1,51 @@
+package repository
+
+import (
+	"context"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type ExpenseRepository interface {
+	repository.BaseRepository[entity.Expense]
+	IdExists(ctx context.Context, id uint) (bool, error)
+	GetNextSequence(ctx context.Context) (int, error)
+	GetWithSupplier(ctx context.Context, id uint64) (*entity.Expense, error)
+}
+
+type ExpenseRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.Expense]
+}
+
+func NewExpenseRepository(db *gorm.DB) ExpenseRepository {
+	return &ExpenseRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.Expense](db),
+	}
+}
+
+func (r *ExpenseRepositoryImpl) IdExists(ctx context.Context, id uint) (bool, error) {
+	return repository.Exists[entity.Expense](ctx, r.DB(), id)
+}
+
+func (r *ExpenseRepositoryImpl) GetNextSequence(ctx context.Context) (int, error) {
+	var sequence int
+	err := r.DB().Raw("SELECT nextval('expenses_ref_seq')").Scan(&sequence).Error
+	if err != nil {
+		return 0, err
+	}
+	return sequence, nil
+}
+
+func (r *ExpenseRepositoryImpl) GetWithSupplier(ctx context.Context, id uint64) (*entity.Expense, error) {
+	var expense entity.Expense
+	err := r.DB().WithContext(ctx).
+		Where("id = ?", id).
+		Preload("Supplier").
+		First(&expense).Error
+	if err != nil {
+		return nil, err
+	}
+	return &expense, nil
+}

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

@@ -0,0 +1,55 @@
+package repository
+
+import (
+	"context"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type ExpenseNonstockRepository interface {
+	repository.BaseRepository[entity.ExpenseNonstock]
+	IdExists(ctx context.Context, id uint64) (bool, error)
+	GetByExpenseID(ctx context.Context, expenseID uint64, id uint64) (bool, error)
+	GetWithRelations(ctx context.Context, id uint64) (*entity.ExpenseNonstock, error)
+}
+
+type ExpenseNonstockRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.ExpenseNonstock]
+}
+
+func NewExpenseNonstockRepository(db *gorm.DB) ExpenseNonstockRepository {
+	return &ExpenseNonstockRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.ExpenseNonstock](db),
+	}
+}
+
+func (r *ExpenseNonstockRepositoryImpl) IdExists(ctx context.Context, id uint64) (bool, error) {
+	return repository.Exists[entity.ExpenseNonstock](ctx, r.DB(), uint(id))
+}
+
+func (r *ExpenseNonstockRepositoryImpl) GetByExpenseID(ctx context.Context, expenseID uint64, id uint64) (bool, error) {
+	var count int64
+	err := r.DB().WithContext(ctx).Model(&entity.ExpenseNonstock{}).
+		Where("id = ? AND expense_id = ?", id, expenseID).
+		Count(&count).Error
+	if err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func (r *ExpenseNonstockRepositoryImpl) GetWithRelations(ctx context.Context, id uint64) (*entity.ExpenseNonstock, error) {
+	var expenseNonstock entity.ExpenseNonstock
+	err := r.DB().WithContext(ctx).
+		Where("id = ?", id).
+		Preload("Nonstock", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("Suppliers")
+		}).
+		First(&expenseNonstock).Error
+	if err != nil {
+		return nil, err
+	}
+	return &expenseNonstock, nil
+}

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

@@ -0,0 +1,40 @@
+package repository
+
+import (
+	"context"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type ExpenseRealizationRepository interface {
+	repository.BaseRepository[entity.ExpenseRealization]
+	IdExists(ctx context.Context, id uint64) (bool, error)
+	GetByExpenseNonstockID(ctx context.Context, expenseNonstockID uint64) (*entity.ExpenseRealization, error)
+}
+
+type ExpenseRealizationRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.ExpenseRealization]
+}
+
+func NewExpenseRealizationRepository(db *gorm.DB) ExpenseRealizationRepository {
+	return &ExpenseRealizationRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.ExpenseRealization](db),
+	}
+}
+
+func (r *ExpenseRealizationRepositoryImpl) IdExists(ctx context.Context, id uint64) (bool, error) {
+	return repository.Exists[entity.ExpenseRealization](ctx, r.DB(), uint(id))
+}
+
+func (r *ExpenseRealizationRepositoryImpl) GetByExpenseNonstockID(ctx context.Context, expenseNonstockID uint64) (*entity.ExpenseRealization, error) {
+	var realization entity.ExpenseRealization
+	err := r.DB().WithContext(ctx).
+		Where("expense_nonstock_id = ?", expenseNonstockID).
+		First(&realization).Error
+	if err != nil {
+		return nil, err
+	}
+	return &realization, nil
+}

internal/modules/expenses/route.go

@@ -0,0 +1,35 @@
+package expenses
+
+import (
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/controllers"
+	expense "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/services"
+	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func ExpenseRoutes(v1 fiber.Router, u user.UserService, s expense.ExpenseService) {
+	ctrl := controller.NewExpenseController(s)
+
+	route := v1.Group("/expenses")
+	route.Use(m.Auth(u))
+	// route.Get("/", m.Auth(u), ctrl.GetAll)
+	// route.Post("/", m.Auth(u), ctrl.CreateOne)
+	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
+	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
+	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
+
+	route.Get("/", ctrl.GetAll)
+	route.Post("/", ctrl.CreateOne)
+	route.Get("/:id", ctrl.GetOne)
+	route.Patch("/:id", ctrl.UpdateOne)
+	route.Delete("/:id", ctrl.DeleteOne)
+	route.Post("/approvals/manager", ctrl.Approval)
+	route.Post("/approvals/finance", ctrl.Approval)
+	route.Post("/:id/realizations", ctrl.CreateRealization)
+	route.Patch("/:id/realizations", ctrl.UpdateRealization)
+	route.Post("/:id/complete", ctrl.CompleteExpense)
+	route.Delete("/:id/documents/:documentId", ctrl.DeleteDocument)
+	route.Delete("/:id/realization-documents/:documentId", ctrl.DeleteRealizationDocument)
+}

internal/modules/expenses/validations/expense.validation.go

@@ -0,0 +1,65 @@
+package validation
+
+import (
+	"mime/multipart"
+)
+
+type Create struct {
+	PoNumber         string                   `form:"po_number" json:"po_number" validate:"omitempty,max=50"`
+	TransactionDate  string                   `form:"transaction_date" json:"transaction_date" validate:"required,datetime=2006-01-02"`
+	Category         string                   `form:"category" json:"category" validate:"required,oneof=BOP NON-BOP"`
+	SupplierID       uint64                   `form:"supplier_id" json:"supplier_id" validate:"required,gt=0"`
+	Documents        []*multipart.FileHeader  `form:"documents" json:"documents" validate:"omitempty,dive"`
+	ExpenseNonstocks []ExpenseNonstock       `form:"expense_nonstocks" json:"expense_nonstocks" validate:"required,min=1,dive"`
+}
+
+type ExpenseNonstock struct {
+	KandangID uint64     `form:"kandang_id" json:"kandang_id" validate:"required,gt=0"`
+	CostItems []CostItem `form:"cost_items" json:"cost_items" validate:"required,min=1,dive"`
+}
+
+type CostItem struct {
+	NonstockID uint64  `form:"nonstock_id" json:"nonstock_id" validate:"required,gt=0"`
+	Quantity   float64 `form:"quantity" json:"quantity" validate:"required,gt=0"`
+	Price      float64 `form:"price" json:"price" validate:"required,gt=0"`
+	Notes      string  `form:"notes" json:"notes" validate:"required,max=500"`
+}
+
+type Update struct {
+	TransactionDate  *string                  `form:"transaction_date" json:"transaction_date" validate:"omitempty,datetime=2006-01-02"`
+	Category         *string                  `form:"category" json:"category" validate:"omitempty,oneof=BOP NON-BOP"`
+	SupplierID       *uint64                  `form:"supplier_id" json:"supplier_id" validate:"omitempty,gt=0"`
+	ExpenseNonstocks *[]ExpenseNonstock      `form:"expense_nonstocks" json:"expense_nonstocks" validate:"omitempty,min=1,dive"`
+	Documents        []*multipart.FileHeader  `form:"documents" json:"documents" validate:"omitempty,dive"`
+}
+
+type Query struct {
+	Page   int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search string `query:"search" validate:"omitempty,max=50"`
+}
+
+type CreateRealization struct {
+	RealizationDate string                  `form:"realization_date" json:"realization_date" validate:"required,datetime=2006-01-02"`
+	Documents       []*multipart.FileHeader `form:"documents" json:"documents" validate:"omitempty,dive"`
+	Realizations    []RealizationItem       `form:"realizations" json:"realizations" validate:"required,min=1,dive"`
+}
+
+type UpdateRealization struct {
+	RealizationDate string                  `form:"realization_date" json:"realization_date" validate:"omitempty,datetime=2006-01-02"`
+	Documents       []*multipart.FileHeader `form:"documents" json:"documents" validate:"omitempty,dive"`
+	Realizations    []RealizationItem       `form:"realizations" json:"realizations" validate:"required,min=1,dive"`
+}
+
+type RealizationItem struct {
+	ExpenseNonstockID uint64  `form:"expense_nonstock_id" json:"expense_nonstock_id" validate:"required,gt=0"`
+	Qty               float64 `form:"qty" json:"qty" validate:"required,gt=0"`
+	Price             float64 `form:"price" json:"price" validate:"required,gt=0"`
+	Notes             *string `form:"notes" json:"notes" validate:"omitempty,max=500"`
+}
+
+type ApprovalRequest struct {
+	Action        string  `json:"action" form:"action" validate:"required,oneof=APPROVED REJECTED"`
+	ApprovableIds []uint  `json:"approvable_ids" validate:"required,min=1,dive,gt=0"`
+	Notes         *string `json:"notes" form:"notes"`
+}

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

@@ -10,28 +10,28 @@ import (
 
 // === DTO Structs ===
 
-type ProductBaseDTO struct {
-	Id              uint                                       `json:"id"`
-	Name            string                                     `json:"name"`
-	SKU             string                                     `json:"sku"`
-	ProductCategory *productCategoryDTO.ProductCategoryBaseDTO `json:"product_category,omitempty"`
+type ProductRelationDTO struct {
+	Id              uint                                           `json:"id"`
+	Name            string                                         `json:"name"`
+	SKU             string                                         `json:"sku"`
+	ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
 }
 
-type WarehouseBaseDTO struct {
+type WarehouseRelationDTO struct {
 	Id   uint   `json:"id"`
 	Name string `json:"name"`
 }
 
 type ProductWarehouseDTO struct {
-	Id          uint              `json:"id"`
-	ProductId   uint              `json:"product_id"`
-	WarehouseId uint              `json:"warehouse_id"`
-	Quantity    float64           `json:"quantity"`
-	Product     *ProductBaseDTO   `json:"product,omitempty"`
-	Warehouse   *WarehouseBaseDTO `json:"warehouse,omitempty"`
+	Id          uint                  `json:"id"`
+	ProductId   uint                  `json:"product_id"`
+	WarehouseId uint                  `json:"warehouse_id"`
+	Quantity    float64               `json:"quantity"`
+	Product     *ProductRelationDTO   `json:"product,omitempty"`
+	Warehouse   *WarehouseRelationDTO `json:"warehouse,omitempty"`
 }
 
-type AdjustmentBaseDTO struct {
+type AdjustmentRelationDTO struct {
 	Id                 uint                 `json:"id"`
 	TransactionType    string               `json:"transaction_type"`
 	Quantity           float64              `json:"quantity"`
@@ -43,9 +43,9 @@ type AdjustmentBaseDTO struct {
 }
 
 type AdjustmentListDTO struct {
-	AdjustmentBaseDTO
-	CreatedUser *userDTO.UserBaseDTO `json:"created_user,omitempty"`
-	CreatedAt   time.Time            `json:"created_at"`
+	AdjustmentRelationDTO
+	CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
+	CreatedAt   time.Time                `json:"created_at"`
 }
 
 type AdjustmentDetailDTO struct {
@@ -55,7 +55,7 @@ type AdjustmentDetailDTO struct {
 
 // === Mapper Functions ===
 
-func ToProductBaseDTO(e *entity.Product) *ProductBaseDTO {
+func ToProductRelationDTO(e *entity.Product) *ProductRelationDTO {
 	if e == nil {
 		return nil
 	}
@@ -64,13 +64,13 @@ func ToProductBaseDTO(e *entity.Product) *ProductBaseDTO {
 		sku = *e.Sku
 	}
 
-	var category *productCategoryDTO.ProductCategoryBaseDTO
+	var category *productCategoryDTO.ProductCategoryRelationDTO
 	if e.ProductCategory.Id != 0 {
-		mapped := productCategoryDTO.ToProductCategoryBaseDTO(e.ProductCategory)
+		mapped := productCategoryDTO.ToProductCategoryRelationDTO(e.ProductCategory)
 		category = &mapped
 	}
 
-	return &ProductBaseDTO{
+	return &ProductRelationDTO{
 		Id:              e.Id,
 		Name:            e.Name,
 		SKU:             sku,
@@ -78,11 +78,11 @@ func ToProductBaseDTO(e *entity.Product) *ProductBaseDTO {
 	}
 }
 
-func ToWarehouseBaseDTO(e *entity.Warehouse) *WarehouseBaseDTO {
+func ToWarehouseRelationDTO(e *entity.Warehouse) *WarehouseRelationDTO {
 	if e == nil {
 		return nil
 	}
-	return &WarehouseBaseDTO{
+	return &WarehouseRelationDTO{
 		Id:   e.Id,
 		Name: e.Name,
 	}
@@ -97,13 +97,13 @@ func ToProductWarehouseDTO(e *entity.ProductWarehouse) *ProductWarehouseDTO {
 		ProductId:   e.ProductId,
 		WarehouseId: e.WarehouseId,
 		Quantity:    e.Quantity,
-		Product:     ToProductBaseDTO(&e.Product),
-		Warehouse:   ToWarehouseBaseDTO(&e.Warehouse),
+		Product:     ToProductRelationDTO(&e.Product),
+		Warehouse:   ToWarehouseRelationDTO(&e.Warehouse),
 	}
 }
 
-func ToAdjustmentBaseDTO(e *entity.StockLog) AdjustmentBaseDTO {
-	return AdjustmentBaseDTO{
+func ToAdjustmentRelationDTO(e *entity.StockLog) AdjustmentRelationDTO {
+	return AdjustmentRelationDTO{
 		Id:                 e.Id,
 		TransactionType:    e.TransactionType,
 		Quantity:           e.Quantity,
@@ -116,9 +116,9 @@ func ToAdjustmentBaseDTO(e *entity.StockLog) AdjustmentBaseDTO {
 }
 
 func ToAdjustmentListDTO(e *entity.StockLog) AdjustmentListDTO {
-	var createdUser *userDTO.UserBaseDTO
+	var createdUser *userDTO.UserRelationDTO
 	if e.CreatedUser != nil {
-		createdUser = &userDTO.UserBaseDTO{
+		createdUser = &userDTO.UserRelationDTO{
 			Id:     e.CreatedUser.Id,
 			IdUser: e.CreatedUser.IdUser,
 			Email:  e.CreatedUser.Email,
@@ -127,9 +127,9 @@ func ToAdjustmentListDTO(e *entity.StockLog) AdjustmentListDTO {
 	}
 
 	return AdjustmentListDTO{
-		AdjustmentBaseDTO: ToAdjustmentBaseDTO(e),
-		CreatedUser:       createdUser,
-		CreatedAt:         e.CreatedAt,
+		AdjustmentRelationDTO: ToAdjustmentRelationDTO(e),
+		CreatedUser:           createdUser,
+		CreatedAt:             e.CreatedAt,
 	}
 }
 

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

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	common "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/adjustments/validations"
 	ProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	productRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/repositories"
@@ -78,7 +78,10 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 	ctx := c.Context()
-
+	actorID, err := m.ActorIDFromContext(c)
+	if err != nil {
+		return nil, err
+	}
 	if err := common.EnsureRelations(c.Context(),
 		common.RelationCheck{Name: "Product", ID: &req.ProductID, Exists: s.ProductRepo.IdExists},
 		common.RelationCheck{Name: "Warehouse", ID: &req.WarehouseID, Exists: s.WarehouseRepo.IdExists},
@@ -107,7 +110,7 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			ProductId:   uint(req.ProductID),
 			WarehouseId: uint(req.WarehouseID),
 			Quantity:    0,
-			CreatedBy:   1, // TODO: should Get from auth middleware
+			CreatedBy:   actorID, 
 		}
 
 		if err := s.ProductWarehouseRepo.CreateOne(ctx, newPW, nil); err != nil {
@@ -143,7 +146,7 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			LogId:              0,
 			Note:               req.Note,
 			ProductWarehouseId: productWarehouse.Id,
-			CreatedBy:          1, // TODO: should Get from auth middleware
+			CreatedBy:          actorID,
 		}
 
 		if err := s.StockLogsRepository.WithTx(tx).CreateOne(ctx, newLog, nil); err != nil {

internal/modules/inventory/marketing-delivery-products/repositories/marketing-delivery-products.repository.go

@@ -0,0 +1,51 @@
+package repository
+
+import (
+	"context"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type MarketingDeliveryProductRepository interface {
+	repository.BaseRepository[entity.MarketingDeliveryProduct]
+	GetByMarketingProductID(ctx context.Context, marketingProductID uint) (*entity.MarketingDeliveryProduct, error)
+	GetByMarketingId(ctx context.Context, marketingId uint) ([]entity.MarketingDeliveryProduct, error)
+}
+
+type MarketingDeliveryProductRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.MarketingDeliveryProduct]
+}
+
+func NewMarketingDeliveryProductRepository(db *gorm.DB) MarketingDeliveryProductRepository {
+	return &MarketingDeliveryProductRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.MarketingDeliveryProduct](db),
+	}
+}
+
+func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingProductID(ctx context.Context, marketingProductID uint) (*entity.MarketingDeliveryProduct, error) {
+	var deliveryProduct entity.MarketingDeliveryProduct
+	if err := r.DB().WithContext(ctx).Where("marketing_product_id = ?", marketingProductID).First(&deliveryProduct).Error; err != nil {
+		return nil, err
+	}
+	return &deliveryProduct, nil
+}
+
+func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingId(ctx context.Context, marketingId uint) ([]entity.MarketingDeliveryProduct, error) {
+	var deliveryProducts []entity.MarketingDeliveryProduct
+
+	// Raw query untuk mengambil delivery products berdasarkan marketing ID dengan preload MarketingProduct
+	// Filter: hanya ambil yang sudah memiliki delivery_date (delivery date tidak null)
+	if err := r.DB().WithContext(ctx).
+		Preload("MarketingProduct").
+		Joins("INNER JOIN marketing_products mp ON marketing_delivery_products.marketing_product_id = mp.id").
+		Where("mp.marketing_id = ?", marketingId).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Order("marketing_delivery_products.id ASC").
+		Find(&deliveryProducts).Error; err != nil {
+		return nil, err
+	}
+
+	return deliveryProducts, nil
+}

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

@@ -29,6 +29,7 @@ func (u *ProductWarehouseController) GetAll(c *fiber.Ctx) error {
 		ProductId:   uint(c.QueryInt("product_id", 0)),
 		WarehouseId: uint(c.QueryInt("warehouse_id", 0)),
 		Flags:       c.Query("flags", ""),
+		KandangId:   uint(c.QueryInt("kandang_id", 0)),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

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

@@ -4,27 +4,34 @@ import (
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
 )
 
 // === DTO Structs ===
 
-type ProductWarehouseBaseDTO struct {
+type ProductWarehouseRelationDTO struct {
 	Id          uint    `json:"id"`
 	ProductId   uint    `json:"product_id"`
 	WarehouseId uint    `json:"warehouse_id"`
 	Quantity    float64 `json:"quantity"`
 }
 
-type ProductWarehouseListDTO struct {
-	ProductWarehouseBaseDTO
-	Product     *ProductBaseDTO   `json:"product,omitempty"`
-	Warehouse   *WarehouseBaseDTO `json:"warehouse,omitempty"`
-	CreatedUser *UserBaseDTO      `json:"created_user,omitempty"`
-	CreatedAt   time.Time         `json:"created_at"`
-	UpdatedAt   time.Time         `json:"updated_at"`
+type ProductWarehousNestedDTO struct {
+	Id        uint                           `json:"id"`
+	Product   *productDTO.ProductRelationDTO `json:"product,omitempty"`
+	Warehouse *WarehouseRelationDTO          `json:"warehouse,omitempty"`
 }
 
-type UserBaseDTO struct {
+type ProductWarehouseListDTO struct {
+	ProductWarehouseRelationDTO
+	Product     *productDTO.ProductRelationDTO `json:"product,omitempty"`
+	Warehouse   *WarehouseRelationDTO          `json:"warehouse,omitempty"`
+	CreatedUser *UserRelationDTO               `json:"created_user,omitempty"`
+	CreatedAt   time.Time                      `json:"created_at"`
+	UpdatedAt   time.Time                      `json:"updated_at"`
+}
+
+type UserRelationDTO struct {
 	Id       uint   `json:"id"`
 	Username string `json:"username"`
 }
@@ -34,40 +41,40 @@ type ProductWarehouseDetailDTO struct {
 }
 
 // Nested DTOs for relations
-type ProductBaseDTO struct {
+type ProductRelationDTO struct {
 	Id    uint     `json:"id"`
 	Name  string   `json:"name"`
 	Sku   string   `json:"sku"`
 	Flags []string `json:"flags"`
 }
 
-type WarehouseBaseDTO struct {
-	Id       uint             `json:"id"`
-	Name     string           `json:"name"`
-	Kandang  *KandangBaseDTO  `json:"kandang,omitempty"`
-	Location *LocationBaseDTO `json:"location,omitempty"`
-	Area     *AreaBaseDTO     `json:"area,omitempty"`
+type WarehouseRelationDTO struct {
+	Id       uint                 `json:"id"`
+	Name     string               `json:"name"`
+	Kandang  *KandangRelationDTO  `json:"kandang,omitempty"`
+	Location *LocationRelationDTO `json:"location,omitempty"`
+	Area     *AreaRelationDTO     `json:"area,omitempty"`
 }
 
-type KandangBaseDTO struct {
+type KandangRelationDTO struct {
 	Id   uint   `json:"id"`
 	Name string `json:"name"`
 }
 
-type LocationBaseDTO struct {
+type LocationRelationDTO struct {
 	Id   uint   `json:"id"`
 	Name string `json:"name"`
 }
 
-type AreaBaseDTO struct {
+type AreaRelationDTO struct {
 	Id   uint   `json:"id"`
 	Name string `json:"name"`
 }
 
 // === Mapper Functions ===
 
-func ToProductWarehouseBaseDTO(e entity.ProductWarehouse) ProductWarehouseBaseDTO {
-	return ProductWarehouseBaseDTO{
+func ToProductWarehouseRelationDTO(e entity.ProductWarehouse) ProductWarehouseRelationDTO {
+	return ProductWarehouseRelationDTO{
 		Id:          e.Id,
 		ProductId:   e.ProductId,   // Field yang benar dari entity
 		WarehouseId: e.WarehouseId, // Field yang benar dari entity
@@ -75,53 +82,55 @@ func ToProductWarehouseBaseDTO(e entity.ProductWarehouse) ProductWarehouseBaseDT
 	}
 }
 
+func ToProductWarehouseNestedDTO(e entity.ProductWarehouse) ProductWarehousNestedDTO {
+	product := productDTO.ToProductRelationDTO(e.Product)
+
+	return ProductWarehousNestedDTO{
+		Id:      e.Id,
+		Product: &product,
+		Warehouse: &WarehouseRelationDTO{
+			Id:   e.Warehouse.Id,
+			Name: e.Warehouse.Name,
+		},
+	}
+}
+
 func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDTO {
 	dto := ProductWarehouseListDTO{
-		ProductWarehouseBaseDTO: ToProductWarehouseBaseDTO(e),
-		CreatedAt:               e.CreatedAt,
-		UpdatedAt:               e.UpdatedAt,
+		ProductWarehouseRelationDTO: ToProductWarehouseRelationDTO(e),
+		CreatedAt:                   e.CreatedAt,
+		UpdatedAt:                   e.UpdatedAt,
 	}
 
 	// Map Product relation jika ada
 	if e.Product.Id != 0 {
-		product := ProductBaseDTO{
-			Id:   e.Product.Id,
-			Name: e.Product.Name,
-		}
-		if e.Product.Sku != nil {
-			product.Sku = *e.Product.Sku
-		}
-		if len(e.Product.Flags) > 0 {
-			for _, f := range e.Product.Flags {
-				product.Flags = append(product.Flags, f.Name)
-			}
-		}
+		product := productDTO.ToProductRelationDTO(e.Product)
 		dto.Product = &product
 	}
 
 	// Map Warehouse relation jika ada
 	if e.Warehouse.Id != 0 {
-		warehouse := WarehouseBaseDTO{
+		warehouse := WarehouseRelationDTO{
 			Id:   e.Warehouse.Id,
 			Name: e.Warehouse.Name,
 		}
 		// Map Kandang jika ada
 		if e.Warehouse.Kandang != nil && e.Warehouse.Kandang.Id != 0 {
-			warehouse.Kandang = &KandangBaseDTO{
+			warehouse.Kandang = &KandangRelationDTO{
 				Id:   e.Warehouse.Kandang.Id,
 				Name: e.Warehouse.Kandang.Name,
 			}
 		}
 		// Map Location jika ada
 		if e.Warehouse.Location != nil && e.Warehouse.Location.Id != 0 {
-			warehouse.Location = &LocationBaseDTO{
+			warehouse.Location = &LocationRelationDTO{
 				Id:   e.Warehouse.Location.Id,
 				Name: e.Warehouse.Location.Name,
 			}
 		}
 
-		if &e.Warehouse.Area != nil && e.Warehouse.Area.Id != 0 {
-			warehouse.Area = &AreaBaseDTO{
+		if e.Warehouse.Area.Id != 0 {
+			warehouse.Area = &AreaRelationDTO{
 				Id:   e.Warehouse.Area.Id,
 				Name: e.Warehouse.Area.Name,
 			}
@@ -132,7 +141,7 @@ func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDT
 
 	// Map CreatedUser relation jika ada
 	if e.CreatedUser.Id != 0 {
-		user := UserBaseDTO{
+		user := UserRelationDTO{
 			Id:       e.CreatedUser.Id,
 			Username: e.CreatedUser.Name,
 		}
@@ -156,22 +165,22 @@ func ToProductWarehouseDetailDTO(e entity.ProductWarehouse) ProductWarehouseDeta
 	}
 }
 
-func ToKandangBaseDTO(e entity.Kandang) KandangBaseDTO {
-	return KandangBaseDTO{
+func ToKandangRelationDTO(e entity.Kandang) KandangRelationDTO {
+	return KandangRelationDTO{
 		Id:   e.Id,
 		Name: e.Name,
 	}
 }
 
-func ToLocationBaseDTO(e entity.Location) LocationBaseDTO {
-	return LocationBaseDTO{
+func ToLocationRelationDTO(e entity.Location) LocationRelationDTO {
+	return LocationRelationDTO{
 		Id:   e.Id,
 		Name: e.Name,
 	}
 }
 
-func ToAreaBaseDTO(e entity.Area) AreaBaseDTO {
-	return AreaBaseDTO{
+func ToAreaRelationDTO(e entity.Area) AreaRelationDTO {
+	return AreaRelationDTO{
 		Id:   e.Id,
 		Name: e.Name,
 	}

internal/modules/inventory/product-warehouses/module.go

@@ -7,6 +7,7 @@ import (
 
 	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	sProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/services"
+	rKandang "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
 
 	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -17,8 +18,9 @@ type ProductWarehouseModule struct{}
 func (ProductWarehouseModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
 	userRepo := rUser.NewUserRepository(db)
+	kandangRepo := rKandang.NewKandangRepository(db)
 
-	productWarehouseService := sProductWarehouse.NewProductWarehouseService(productWarehouseRepo, validate)
+	productWarehouseService := sProductWarehouse.NewProductWarehouseService(productWarehouseRepo, validate, kandangRepo)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	ProductWarehouseRoutes(router, userService, productWarehouseService)

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

@@ -25,8 +25,9 @@ type ProductWarehouseRepository interface {
 	ApplyFlagsFilter(db *gorm.DB, flags []string) *gorm.DB
 	AdjustQuantities(ctx context.Context, deltas map[uint]float64, modifier func(*gorm.DB) *gorm.DB) error
 	GetDetailByID(ctx context.Context, id uint) (*entity.ProductWarehouse, error)
+	IdExists(ctx context.Context, id uint) (bool, error)
 	CleanupEmpty(ctx context.Context, affected map[uint]struct{}) error
-	EnsureProductWarehouse(ctx context.Context, productID, warehouseID uint, createdBy uint64) (uint, error)
+	EnsureProductWarehouse(ctx context.Context, productID, warehouseID uint, createdBy uint) (uint, error)
 }
 
 type ProductWarehouseRepositoryImpl struct {
@@ -50,6 +51,10 @@ func (r *ProductWarehouseRepositoryImpl) ExistsByID(ctx context.Context, id uint
 	return repository.Exists[entity.ProductWarehouse](ctx, r.DB(), id)
 }
 
+func (r *ProductWarehouseRepositoryImpl) IdExists(ctx context.Context, id uint) (bool, error) {
+	return repository.Exists[entity.ProductWarehouse](ctx, r.DB(), id)
+}
+
 func (r *ProductWarehouseRepositoryImpl) ProductWarehouseExists(ctx context.Context, productId, warehouseId uint, excludeID *uint) (bool, error) {
 	var count int64
 	query := r.DB().WithContext(ctx).Model(&entity.ProductWarehouse{}).
@@ -194,7 +199,7 @@ func (r *ProductWarehouseRepositoryImpl) EnsureProductWarehouse(
 	ctx context.Context,
 	productID uint,
 	warehouseID uint,
-	createdBy uint64,
+	createdBy uint,
 ) (uint, error) {
 	record, err := r.GetProductWarehouseByProductAndWarehouseID(ctx, productID, warehouseID)
 	if err == nil {
@@ -250,7 +255,7 @@ func (r *ProductWarehouseRepositoryImpl) GetByFlagAndWarehouseID(ctx context.Con
 	var productWarehouses []entity.ProductWarehouse
 	err := r.DB().WithContext(ctx).Model(&entity.ProductWarehouse{}).
 		Joins("JOIN products ON products.id = product_warehouses.product_id").
-		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
 		Where("flags.name = ? AND product_warehouses.warehouse_id = ?", flagName, warehouseId).
 		Order("product_warehouses.created_at DESC").
 		Preload("Product").Preload("Warehouse").
@@ -264,7 +269,7 @@ func (r *ProductWarehouseRepositoryImpl) GetByFlagAndWarehouseID(ctx context.Con
 func (r *ProductWarehouseRepositoryImpl) GetFirstProductByFlag(ctx context.Context, flagName string) (*entity.Product, error) {
 	var product entity.Product
 	err := r.DB().WithContext(ctx).
-		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
 		Where("flags.name = ?", flagName).
 		First(&product).Error
 	if err != nil {

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

@@ -6,6 +6,7 @@ import (
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/validations"
+	kandangrepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	"github.com/go-playground/validator/v10"
@@ -20,16 +21,18 @@ type ProductWarehouseService interface {
 }
 
 type productWarehouseService struct {
-	Log        *logrus.Logger
-	Validate   *validator.Validate
-	Repository repository.ProductWarehouseRepository
+	Log         *logrus.Logger
+	Validate    *validator.Validate
+	Repository  repository.ProductWarehouseRepository
+	KandangRepo kandangrepo.KandangRepository
 }
 
-func NewProductWarehouseService(repo repository.ProductWarehouseRepository, validate *validator.Validate) ProductWarehouseService {
+func NewProductWarehouseService(repo repository.ProductWarehouseRepository, validate *validator.Validate, kandangRepo kandangrepo.KandangRepository) ProductWarehouseService {
 	return &productWarehouseService{
-		Log:        utils.Log,
-		Validate:   validate,
-		Repository: repo,
+		Log:         utils.Log,
+		Validate:    validate,
+		Repository:  repo,
+		KandangRepo: kandangRepo,
 	}
 }
 
@@ -69,6 +72,16 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 		}
 	}
 
+	if params.KandangId > 0 {
+		isKandangExist, err := s.KandangRepo.IdExists(c.Context(), params.KandangId)
+		if err != nil {
+			return nil, 0, err
+		}
+		if !isKandangExist {
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Kandang not found")
+		}
+	}
+
 	offset := (params.Page - 1) * params.Limit
 
 	cleanFlags := utils.ParseFlags(params.Flags)
@@ -80,6 +93,11 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 			db = db.Where("product_id = ?", params.ProductId)
 		}
 
+		if params.KandangId != 0 {
+			db = db.Joins("JOIN warehouses ON product_warehouses.warehouse_id = warehouses.id").
+				Where("warehouses.kandang_id = ?", params.KandangId)
+		}
+
 		if params.WarehouseId != 0 {
 			db = db.Where("warehouse_id = ?", params.WarehouseId)
 		}

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

@@ -18,4 +18,5 @@ type Query struct {
 	ProductId   uint   `query:"product_id" validate:"omitempty,number,min=1"`
 	WarehouseId uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
 	Flags       string `query:"flags" validate:"omitempty"`
+	KandangId   uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
 }

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

@@ -9,7 +9,7 @@ import (
 
 // === DTO Structs ===
 
-type TransferBaseDTO struct {
+type TransferRelationDTO struct {
 	Id                   uint64              `json:"id"`
 	TransferReason       string              `json:"transfer_reason"`
 	TransferDate         string              `json:"transfer_date"`
@@ -51,12 +51,12 @@ type WarehouseDetailDTO struct {
 }
 
 type TransferListDTO struct {
-	TransferBaseDTO
-	CreatedUser *userDTO.UserBaseDTO    `json:"created_user,omitempty"`
-	CreatedAt   time.Time               `json:"created_at"`
-	UpdatedAt   time.Time               `json:"updated_at"`
-	Details     []TransferDetailItemDTO `json:"details"`
-	Deliveries  []TransferDeliveryDTO   `json:"deliveries"`
+	TransferRelationDTO
+	CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
+	CreatedAt   time.Time                `json:"created_at"`
+	UpdatedAt   time.Time                `json:"updated_at"`
+	Details     []TransferDetailItemDTO  `json:"details"`
+	Deliveries  []TransferDeliveryDTO    `json:"deliveries"`
 }
 
 type TransferDetailDTO struct {
@@ -93,7 +93,7 @@ type TransferDeliveryItemDTO struct {
 
 // === Mapper Functions ===
 
-func ToTransferBaseDTO(e entity.StockTransfer) TransferBaseDTO {
+func ToTransferRelationDTO(e entity.StockTransfer) TransferRelationDTO {
 
 	var sourceWarehouse *WarehouseDetailDTO
 	if e.FromWarehouse != nil && e.FromWarehouse.Id != 0 {
@@ -103,7 +103,7 @@ func ToTransferBaseDTO(e entity.StockTransfer) TransferBaseDTO {
 	if e.ToWarehouse != nil && e.ToWarehouse.Id != 0 {
 		destinationWarehouse = toWarehouseDetailDTO(e.ToWarehouse)
 	}
-	return TransferBaseDTO{
+	return TransferRelationDTO{
 		Id:                   e.Id,
 		TransferReason:       e.Reason,
 		TransferDate:         e.CreatedAt.Format("2006-01-02"),
@@ -145,9 +145,9 @@ func toWarehouseDetailDTO(w *entity.Warehouse) *WarehouseDetailDTO {
 }
 
 func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
-	var createdUser *userDTO.UserBaseDTO
+	var createdUser *userDTO.UserRelationDTO
 	if e.CreatedUser != nil {
-		mapped := userDTO.ToUserBaseDTO(*e.CreatedUser)
+		mapped := userDTO.ToUserRelationDTO(*e.CreatedUser)
 		createdUser = &mapped
 	}
 	// Map details
@@ -190,12 +190,12 @@ func ToTransferListDTO(e entity.StockTransfer) TransferListDTO {
 		})
 	}
 	return TransferListDTO{
-		TransferBaseDTO: ToTransferBaseDTO(e),
-		CreatedUser:     createdUser,
-		CreatedAt:       e.CreatedAt,
-		UpdatedAt:       e.UpdatedAt,
-		Details:         details,
-		Deliveries:      deliveries,
+		TransferRelationDTO: ToTransferRelationDTO(e),
+		CreatedUser:         createdUser,
+		CreatedAt:           e.CreatedAt,
+		UpdatedAt:           e.UpdatedAt,
+		Details:             details,
+		Deliveries:          deliveries,
 	}
 }
 

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

@@ -3,15 +3,15 @@ package service
 import (
 	"errors"
 	"fmt"
-	"strings"
-
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	rStockTransfer "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/validations"
 	rSupplier "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/repositories"
 	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -127,6 +127,10 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak cukup", product.ProductID))
 		}
 	}
+	actorID, err := m.ActorIDFromContext(c)
+	if err != nil {
+		return nil, err
+	}
 
 	// validasi total qty harus lebih besar dari atau sama dengan total qty di delivery compare berdasarkan productid
 	deliveryQtyMap := make(map[uint]float64)
@@ -174,7 +178,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		Reason:          req.TransferReason,
 		TransferDate:    transferDate,
 		MovementNumber:  movementNumber,
-		CreatedBy:       1, //todo: get from token
+		CreatedBy:       uint64(actorID),
 	}
 
 	// Save the transfer entity to the database
@@ -277,7 +281,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				LogId:              uint(entityTransfer.Id),
 				Note:               "",
 				ProductWarehouseId: sourcePW.Id,
-				CreatedBy:          1,
+				CreatedBy:          actorID,
 			}
 			if err := s.StockLogsRepository.WithTx(tx).CreateOne(c.Context(), decreaseLog, nil); err != nil {
 				s.Log.Errorf("Failed to create stock log decrease: %+v", err)
@@ -298,7 +302,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 					ProductId:   uint(product.ProductID),
 					WarehouseId: uint(req.DestinationWarehouseID),
 					Quantity:    0,
-					CreatedBy:   1, // TODO: should Get from auth middleware
+					CreatedBy:   actorID,
 				}
 				if err := s.ProductWarehouseRepo.WithTx(tx).CreateOne(c.Context(), destPW, nil); err != nil {
 					s.Log.Errorf("Failed to create destination product warehouse: %+v", err)
@@ -325,7 +329,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				LogId:              uint(entityTransfer.Id),
 				Note:               "",
 				ProductWarehouseId: destPW.Id,
-				CreatedBy:          1,
+				CreatedBy:          actorID,
 			}
 			if err := s.StockLogsRepository.WithTx(tx).CreateOne(c.Context(), increaseLog, nil); err != nil {
 				s.Log.Errorf("Failed to create stock log increase: %+v", err)

internal/modules/marketing/delivery-orderss/controllers/delivery-orders.controller.go

@@ -0,0 +1,124 @@
+package controller
+
+import (
+	"math"
+	"strconv"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/response"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+type DeliveryOrdersController struct {
+	DeliveryOrdersService service.DeliveryOrdersService
+}
+
+func NewDeliveryOrdersController(deliveryOrdersService service.DeliveryOrdersService) *DeliveryOrdersController {
+	return &DeliveryOrdersController{
+		DeliveryOrdersService: deliveryOrdersService,
+	}
+}
+
+func (u *DeliveryOrdersController) GetAll(c *fiber.Ctx) error {
+	query := &validation.Query{
+		Page:        c.QueryInt("page", 1),
+		Limit:       c.QueryInt("limit", 10),
+		MarketingId: uint(c.QueryInt("marketing_id", 0)),
+	}
+
+	if query.Page < 1 || query.Limit < 1 {
+		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
+	}
+
+	result, totalResults, err := u.DeliveryOrdersService.GetAll(c, query)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.SuccessWithPaginate[dto.MarketingListDTO]{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get all deliveryOrderss successfully",
+			Meta: response.Meta{
+				Page:         query.Page,
+				Limit:        query.Limit,
+				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+				TotalResults: totalResults,
+			},
+			Data: result,
+		})
+}
+
+func (u *DeliveryOrdersController) GetOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	result, err := u.DeliveryOrdersService.GetOne(c, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get deliveryOrders successfully",
+			Data:    *result,
+		})
+}
+
+func (u *DeliveryOrdersController) CreateOne(c *fiber.Ctx) error {
+	req := new(validation.Create)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.DeliveryOrdersService.CreateOne(c, req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusCreated).
+		JSON(response.Success{
+			Code:    fiber.StatusCreated,
+			Status:  "success",
+			Message: "Create delivery products successfully",
+			Data:    result,
+		})
+}
+
+func (u *DeliveryOrdersController) UpdateOne(c *fiber.Ctx) error {
+	req := new(validation.Update)
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.DeliveryOrdersService.UpdateOne(c, req, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Update deliveryOrders successfully",
+			Data:    result,
+		})
+}

internal/modules/marketing/delivery-orderss/dto/delivery-orders.dto.go

@@ -0,0 +1,336 @@
+package dto
+
+import (
+	"fmt"
+	"sort"
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	approvalDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/dto"
+	productwarehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/dto"
+	customerDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/dto"
+	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+)
+
+type MarketingRelationDTO struct {
+	Id       uint      `json:"id"`
+	SoNumber string    `json:"so_number"`
+	SoDate   time.Time `json:"so_date"`
+	Notes    string    `json:"notes,omitempty"`
+}
+
+type MarketingListDTO struct {
+	MarketingRelationDTO
+	Customer       customerDTO.CustomerRelationDTO `json:"customer"`
+	SalesPerson    userDTO.UserRelationDTO         `json:"sales_person"`
+	SoDocs         string                          `json:"so_docs"`
+	SalesOrder     []MarketingProductDTO           `json:"sales_order"`
+	CreatedUser    userDTO.UserRelationDTO         `json:"created_user"`
+	CreatedAt      time.Time                       `json:"created_at"`
+	UpdatedAt      time.Time                       `json:"updated_at"`
+	LatestApproval approvalDTO.ApprovalRelationDTO `json:"latest_approval"`
+}
+
+type MarketingDetailDTO struct {
+	MarketingRelationDTO
+	Customer       customerDTO.CustomerRelationDTO `json:"customer"`
+	SalesPerson    userDTO.UserRelationDTO         `json:"sales_person"`
+	SoDocs         string                          `json:"so_docs"`
+	SalesOrder     []MarketingProductDTO           `json:"sales_order"`
+	DeliveryOrder  []DeliveryGroupDTO              `json:"delivery_order"`
+	CreatedUser    userDTO.UserRelationDTO         `json:"created_user"`
+	CreatedAt      time.Time                       `json:"created_at"`
+	UpdatedAt      time.Time                       `json:"updated_at"`
+	LatestApproval approvalDTO.ApprovalRelationDTO `json:"latest_approval"`
+}
+type MarketingDeliveryProductDTO struct {
+	Id                 uint                                          `json:"id"`
+	MarketingProductId uint                                          `json:"marketing_product_id"`
+	Qty                float64                                       `json:"qty"`
+	UnitPrice          float64                                       `json:"unit_price"`
+	TotalWeight        float64                                       `json:"total_weight"`
+	AvgWeight          float64                                       `json:"avg_weight"`
+	TotalPrice         float64                                       `json:"total_price"`
+	DeliveryDate       *time.Time                                    `json:"delivery_date"`
+	VehicleNumber      string                                        `json:"vehicle_number"`
+	ProductWarehouse   *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+}
+
+type DeliveryItemDTO struct {
+	ProductWarehouse *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse"`
+	Qty              float64                                       `json:"qty"`
+	UnitPrice        float64                                       `json:"unit_price"`
+	TotalWeight      float64                                       `json:"total_weight"`
+	AvgWeight        float64                                       `json:"avg_weight"`
+	TotalPrice       float64                                       `json:"total_price"`
+	VehicleNumber    string                                        `json:"vehicle_number"`
+}
+
+type DeliveryGroupDTO struct {
+	DoNumber     string                                    `json:"do_number"`
+	DeliveryDate *time.Time                                `json:"delivery_date"`
+	Warehouse    *productwarehouseDTO.WarehouseRelationDTO `json:"warehouse,omitempty"`
+	Deliveries   []DeliveryItemDTO                         `json:"deliveries"`
+}
+
+type MarketingProductDTO struct {
+	Id                 uint                                          `json:"id"`
+	MarketingId        uint                                          `json:"marketing_id"`
+	ProductWarehouseId uint                                          `json:"product_warehouse_id"`
+	Qty                float64                                       `json:"qty"`
+	UnitPrice          float64                                       `json:"unit_price"`
+	AvgWeight          float64                                       `json:"avg_weight"`
+	TotalWeight        float64                                       `json:"total_weight"`
+	TotalPrice         float64                                       `json:"total_price"`
+	ProductWarehouse   *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+	VehicleNumber      string                                        `json:"vehicle_number,omitempty"`
+}
+
+func ToMarketingRelationDTO(marketing *entity.Marketing) MarketingRelationDTO {
+	return MarketingRelationDTO{
+		Id:       marketing.Id,
+		SoNumber: marketing.SoNumber,
+		SoDate:   marketing.SoDate,
+		Notes:    marketing.Notes,
+	}
+}
+
+func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
+	var productWarehouse *productwarehouseDTO.ProductWarehousNestedDTO
+	if e.ProductWarehouse.Id != 0 {
+		mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(e.ProductWarehouse)
+		productWarehouse = &mapped
+	}
+
+	return MarketingProductDTO{
+		Id:                 e.Id,
+		MarketingId:        e.MarketingId,
+		ProductWarehouseId: e.ProductWarehouseId,
+		Qty:                e.Qty,
+		UnitPrice:          e.UnitPrice,
+		AvgWeight:          e.AvgWeight,
+		TotalWeight:        e.TotalWeight,
+		TotalPrice:         e.TotalPrice,
+		ProductWarehouse:   productWarehouse,
+		VehicleNumber:      getVehicleNumber(e),
+	}
+}
+
+func ToMarketingDeliveryProductDTO(e entity.MarketingDeliveryProduct) MarketingDeliveryProductDTO {
+	return MarketingDeliveryProductDTO{
+		Id:                 e.Id,
+		MarketingProductId: e.MarketingProductId,
+		Qty:                e.Qty,
+		UnitPrice:          e.UnitPrice,
+		TotalWeight:        e.TotalWeight,
+		AvgWeight:          e.AvgWeight,
+		TotalPrice:         e.TotalPrice,
+		DeliveryDate:       e.DeliveryDate,
+		VehicleNumber:      e.VehicleNumber,
+	}
+}
+
+func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.MarketingDeliveryProduct) MarketingListDTO {
+	var createdUser userDTO.UserRelationDTO
+	if marketing.CreatedUser.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(marketing.CreatedUser)
+		createdUser = mapped
+	}
+
+	var customer customerDTO.CustomerRelationDTO
+	if marketing.Customer.Id != 0 {
+		mapped := customerDTO.ToCustomerRelationDTO(marketing.Customer)
+		customer = mapped
+	}
+
+	var salesPerson userDTO.UserRelationDTO
+	if marketing.SalesPerson.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(marketing.SalesPerson)
+		salesPerson = mapped
+	}
+
+	var latestApproval approvalDTO.ApprovalRelationDTO
+	if marketing.LatestApproval != nil {
+		mapped := approvalDTO.ToApprovalDTO(*marketing.LatestApproval)
+		latestApproval = mapped
+	}
+
+	var salesOrderProducts []MarketingProductDTO
+	if len(marketing.Products) > 0 {
+		salesOrderProducts = make([]MarketingProductDTO, len(marketing.Products))
+		for i, product := range marketing.Products {
+			salesOrderProducts[i] = ToMarketingProductDTO(product)
+		}
+	}
+
+	return MarketingListDTO{
+		MarketingRelationDTO: ToMarketingRelationDTO(marketing),
+		Customer:             customer,
+		SalesPerson:          salesPerson,
+		SoDocs:               marketing.SoDocs,
+		SalesOrder:           salesOrderProducts,
+		CreatedUser:          createdUser,
+		CreatedAt:            marketing.CreatedAt,
+		UpdatedAt:            marketing.UpdatedAt,
+		LatestApproval:       latestApproval,
+	}
+}
+
+func ToMarketingDetailDTO(marketing *entity.Marketing, deliveryProducts []entity.MarketingDeliveryProduct) MarketingDetailDTO {
+	var createdUser userDTO.UserRelationDTO
+	if marketing.CreatedUser.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(marketing.CreatedUser)
+		createdUser = mapped
+	}
+
+	var customer customerDTO.CustomerRelationDTO
+	if marketing.Customer.Id != 0 {
+		mapped := customerDTO.ToCustomerRelationDTO(marketing.Customer)
+		customer = mapped
+	}
+
+	var salesPerson userDTO.UserRelationDTO
+	if marketing.SalesPerson.Id != 0 {
+		mapped := userDTO.ToUserRelationDTO(marketing.SalesPerson)
+		salesPerson = mapped
+	}
+
+	var salesOrderProducts []MarketingProductDTO
+	if len(marketing.Products) > 0 {
+		salesOrderProducts = make([]MarketingProductDTO, len(marketing.Products))
+		for i, product := range marketing.Products {
+			salesOrderProducts[i] = ToMarketingProductDTO(product)
+		}
+	}
+
+	var deliveryProductsDTOs []MarketingDeliveryProductDTO
+	if len(deliveryProducts) > 0 {
+		deliveryProductsDTOs = make([]MarketingDeliveryProductDTO, len(deliveryProducts))
+		for i, dp := range deliveryProducts {
+			deliveryProductsDTOs[i] = ToMarketingDeliveryProductDTO(dp)
+		}
+		deliveryProductsDTOs = enrichDeliveryProductDTOsWithWarehouse(deliveryProductsDTOs, marketing)
+	}
+
+	deliveryGroups := groupDeliveryProducts(deliveryProductsDTOs, marketing.SoNumber)
+
+	var latestApproval approvalDTO.ApprovalRelationDTO
+	if marketing.LatestApproval != nil {
+		mapped := approvalDTO.ToApprovalDTO(*marketing.LatestApproval)
+		latestApproval = mapped
+	}
+
+	return MarketingDetailDTO{
+		MarketingRelationDTO: ToMarketingRelationDTO(marketing),
+		SoDocs:               marketing.SoDocs,
+		Customer:             customer,
+		SalesPerson:          salesPerson,
+		SalesOrder:           salesOrderProducts,
+		DeliveryOrder:        deliveryGroups,
+		CreatedUser:          createdUser,
+		CreatedAt:            marketing.CreatedAt,
+		UpdatedAt:            marketing.UpdatedAt,
+		LatestApproval:       latestApproval,
+	}
+}
+
+func ToMarketingListDTOs(marketings []entity.Marketing) []MarketingListDTO {
+	result := make([]MarketingListDTO, len(marketings))
+	for i, m := range marketings {
+		result[i] = ToMarketingListDTO(&m, []entity.MarketingDeliveryProduct{})
+	}
+	return result
+}
+
+func enrichDeliveryProductDTOsWithWarehouse(deliveryProductDTOs []MarketingDeliveryProductDTO, marketing *entity.Marketing) []MarketingDeliveryProductDTO {
+	if len(deliveryProductDTOs) == 0 || marketing == nil || len(marketing.Products) == 0 {
+		return deliveryProductDTOs
+	}
+
+	productMap := make(map[uint]*entity.MarketingProduct)
+	for i := range marketing.Products {
+		productMap[marketing.Products[i].Id] = &marketing.Products[i]
+	}
+
+	for i := range deliveryProductDTOs {
+		if product, exists := productMap[deliveryProductDTOs[i].MarketingProductId]; exists {
+			if product.ProductWarehouse.Id != 0 {
+				mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(product.ProductWarehouse)
+				deliveryProductDTOs[i].ProductWarehouse = &mapped
+			}
+		}
+	}
+
+	return deliveryProductDTOs
+}
+
+func groupDeliveryProducts(products []MarketingDeliveryProductDTO, soNumber string) []DeliveryGroupDTO {
+	groupMap := make(map[string]*DeliveryGroupDTO)
+
+	for _, product := range products {
+		if product.DeliveryDate == nil {
+			continue
+		}
+
+		var warehouseId uint
+		var warehouseName string
+		if product.ProductWarehouse != nil {
+			warehouseId = product.ProductWarehouse.Warehouse.Id
+			warehouseName = product.ProductWarehouse.Warehouse.Name
+		}
+
+		key := fmt.Sprintf("%d_%s", warehouseId, product.DeliveryDate.Format("2006-01-02"))
+
+		group, exists := groupMap[key]
+		if !exists {
+			group = &DeliveryGroupDTO{
+				DeliveryDate: product.DeliveryDate,
+				Warehouse: &productwarehouseDTO.WarehouseRelationDTO{
+					Id:   warehouseId,
+					Name: warehouseName,
+				},
+				Deliveries: []DeliveryItemDTO{},
+			}
+			groupMap[key] = group
+		}
+
+		deliveryItem := DeliveryItemDTO{
+			ProductWarehouse: product.ProductWarehouse,
+			Qty:              product.Qty,
+			UnitPrice:        product.UnitPrice,
+			TotalWeight:      product.TotalWeight,
+			AvgWeight:        product.AvgWeight,
+			TotalPrice:       product.TotalPrice,
+			VehicleNumber:    product.VehicleNumber,
+		}
+		group.Deliveries = append(group.Deliveries, deliveryItem)
+	}
+
+	var groups []DeliveryGroupDTO
+	for _, group := range groupMap {
+		groups = append(groups, *group)
+	}
+
+	sort.Slice(groups, func(i, j int) bool {
+		if groups[i].DeliveryDate == nil || groups[j].DeliveryDate == nil {
+			return false
+		}
+		return groups[i].DeliveryDate.Before(*groups[j].DeliveryDate)
+	})
+
+	for i := range groups {
+		if groups[i].DeliveryDate != nil {
+			dateStr := groups[i].DeliveryDate.Format("20060102")
+			groups[i].DoNumber = fmt.Sprintf("%s-%s-%d", soNumber, dateStr, groups[i].Warehouse.Id)
+		}
+	}
+
+	return groups
+}
+
+func getVehicleNumber(e entity.MarketingProduct) string {
+	if e.DeliveryProduct != nil && e.DeliveryProduct.VehicleNumber != "" {
+		return e.DeliveryProduct.VehicleNumber
+	}
+	return ""
+}

internal/modules/marketing/delivery-orderss/module.go

@@ -0,0 +1,39 @@
+package delivery_orderss
+
+import (
+	"fmt"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	rMarketingDeliveryProduct "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/marketing-delivery-products/repositories"
+	sDeliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
+	rMarketing "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
+
+type DeliveryOrdersModule struct{}
+
+func (DeliveryOrdersModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	marketingRepo := rMarketing.NewMarketingRepository(db)
+	marketingProductRepo := rMarketing.NewMarketingProductRepository(db)
+	marketingDeliveryProductRepo := rMarketingDeliveryProduct.NewMarketingDeliveryProductRepository(db)
+	userRepo := rUser.NewUserRepository(db)
+	approvalRepo := commonRepo.NewApprovalRepository(db)
+	approvalSvc := commonSvc.NewApprovalService(approvalRepo)
+
+	// Register workflow steps for MARKETINGS approval
+	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowMarketing, utils.MarketingApprovalSteps); err != nil {
+		panic(fmt.Sprintf("failed to register marketing approval workflow: %v", err))
+	}
+
+	deliveryOrdersService := sDeliveryOrders.NewDeliveryOrdersService(marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, approvalSvc, validate)
+	userService := sUser.NewUserService(userRepo, validate)
+
+	DeliveryOrdersRoutes(router, userService, deliveryOrdersService)
+}

internal/modules/marketing/delivery-orderss/route.go

@@ -0,0 +1,30 @@
+package delivery_orderss
+
+import (
+	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/controllers"
+	deliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
+	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DeliveryOrdersRoutes(v1 fiber.Router, u user.UserService, s deliveryOrders.DeliveryOrdersService) {
+	ctrl := controller.NewDeliveryOrdersController(s)
+
+	v1.Get("/", ctrl.GetAll)
+	v1.Get("/:id", ctrl.GetOne)
+
+	// Sisanya di group /delivery-orders
+	route := v1.Group("/delivery-orders")
+
+	// route.Get("/", m.Auth(u), ctrl.GetAll)
+	// route.Post("/", m.Auth(u), ctrl.CreateOne)
+	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
+	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
+	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
+
+	route.Post("/", ctrl.CreateOne)
+	route.Patch("/:id", ctrl.UpdateOne)
+
+}

internal/modules/marketing/delivery-orderss/services/delivery-orders.service.go

@@ -0,0 +1,430 @@
+package service
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	marketingDeliveryProductRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/marketing-delivery-products/repositories"
+	productWarehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/dto"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/validations"
+	marketingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"github.com/sirupsen/logrus"
+	"gorm.io/gorm"
+)
+
+type DeliveryOrdersService interface {
+	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]dto.MarketingListDTO, int64, error)
+	GetOne(ctx *fiber.Ctx, id uint) (*dto.MarketingDetailDTO, error)
+	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*dto.MarketingDetailDTO, error)
+	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*dto.MarketingDetailDTO, error)
+}
+
+type deliveryOrdersService struct {
+	Log                          *logrus.Logger
+	Validate                     *validator.Validate
+	MarketingRepo                marketingRepo.MarketingRepository
+	MarketingProductRepo         marketingRepo.MarketingProductRepository
+	MarketingDeliveryProductRepo marketingDeliveryProductRepo.MarketingDeliveryProductRepository
+	ApprovalSvc                  commonSvc.ApprovalService
+}
+
+func NewDeliveryOrdersService(
+	marketingRepo marketingRepo.MarketingRepository,
+	marketingProductRepo marketingRepo.MarketingProductRepository,
+	marketingDeliveryProductRepo marketingDeliveryProductRepo.MarketingDeliveryProductRepository,
+	approvalSvc commonSvc.ApprovalService,
+	validate *validator.Validate,
+) DeliveryOrdersService {
+	return &deliveryOrdersService{
+		Log:                          utils.Log,
+		Validate:                     validate,
+		MarketingRepo:                marketingRepo,
+		MarketingProductRepo:         marketingProductRepo,
+		MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
+		ApprovalSvc:                  approvalSvc,
+	}
+}
+
+func (s deliveryOrdersService) withRelations(db *gorm.DB) *gorm.DB {
+	return db.
+		Preload("CreatedUser").
+		Preload("Customer").
+		Preload("SalesPerson").
+		Preload("Products.ProductWarehouse.Product").
+		Preload("Products.ProductWarehouse.Warehouse").
+		Preload("Products.DeliveryProduct")
+}
+
+func (s deliveryOrdersService) getMarketingWithDeliveries(c *fiber.Ctx, marketingId uint) (*dto.MarketingDetailDTO, error) {
+	marketing, err := s.MarketingRepo.GetByID(c.Context(), marketingId, s.withRelations)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
+	}
+
+	latestApproval, err := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowMarketing, marketingId, nil)
+	if err != nil {
+	}
+	marketing.LatestApproval = latestApproval
+
+	allDeliveryProducts, err := s.MarketingDeliveryProductRepo.GetByMarketingId(c.Context(), marketingId)
+	if err != nil {
+		allDeliveryProducts = []entity.MarketingDeliveryProduct{}
+	}
+
+	responseDTO := dto.ToMarketingDetailDTO(marketing, allDeliveryProducts)
+	return &responseDTO, nil
+}
+
+func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.Query) ([]dto.MarketingListDTO, int64, error) {
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, 0, err
+	}
+
+	offset := (params.Page - 1) * params.Limit
+
+	marketings, total, err := s.MarketingRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
+		db = db.
+			Preload("CreatedUser").
+			Preload("Customer").
+			Preload("SalesPerson").
+			Preload("Products.ProductWarehouse.Product").
+			Preload("Products.ProductWarehouse.Warehouse").
+			Preload("Products.DeliveryProduct")
+
+		if params.MarketingId != 0 {
+			return db.Where("id = ?", params.MarketingId)
+		}
+		return db.Order("created_at DESC").Order("updated_at DESC")
+	})
+
+	if err != nil {
+		s.Log.Errorf("Failed to get marketings: %+v", err)
+		return nil, 0, err
+	}
+	for i := range marketings {
+		latestApproval, err := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowMarketing, marketings[i].Id, func(db *gorm.DB) *gorm.DB {
+			return db.Preload("ActionUser")
+		})
+		if err != nil {
+			s.Log.Warnf("Failed to load approval for marketing %d: %+v", marketings[i].Id, err)
+		}
+		marketings[i].LatestApproval = latestApproval
+	}
+
+	result := make([]dto.MarketingListDTO, len(marketings))
+	for i, marketing := range marketings {
+		result[i] = dto.ToMarketingListDTO(&marketing, []entity.MarketingDeliveryProduct{})
+	}
+
+	return result, total, nil
+}
+
+func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.MarketingDetailDTO, error) {
+
+	marketing, err := s.MarketingRepo.GetByID(c.Context(), id, s.withRelations)
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusNotFound, "Marketing not found")
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	allDeliveryProducts, err := s.MarketingDeliveryProductRepo.GetByMarketingId(c.Context(), id)
+	if err != nil {
+		allDeliveryProducts = []entity.MarketingDeliveryProduct{}
+	}
+
+	if s.ApprovalSvc != nil {
+		approvals, err := s.ApprovalSvc.ListByTarget(c.Context(), utils.ApprovalWorkflowMarketing, marketing.Id, func(db *gorm.DB) *gorm.DB {
+			return db.Preload("ActionUser")
+		})
+		if err != nil {
+
+		} else if len(approvals) > 0 {
+			if marketing.LatestApproval == nil {
+				latest := approvals[len(approvals)-1]
+				marketing.LatestApproval = &latest
+			}
+		} else {
+			marketing.LatestApproval = nil
+		}
+	}
+
+	responseDTO := dto.ToMarketingDetailDTO(marketing, allDeliveryProducts)
+	return &responseDTO, nil
+}
+
+func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*dto.MarketingDetailDTO, error) {
+	if err := s.Validate.Struct(req); err != nil {
+		return nil, err
+	}
+
+	if err := commonSvc.EnsureRelations(c.Context(),
+		commonSvc.RelationCheck{Name: "Marketing", ID: &req.MarketingId, Exists: s.MarketingRepo.IdExists},
+	); err != nil {
+		return nil, err
+	}
+
+	actorID, err := m.ActorIDFromContext(c)
+	if err != nil {
+		return nil, err
+	}
+
+	approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(s.MarketingRepo.DB()))
+
+	latestApproval, err := approvalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowMarketing, req.MarketingId, nil)
+	if err != nil {
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check approval status")
+	}
+	if latestApproval == nil {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing has not been submitted for approval")
+	}
+	if latestApproval.StepNumber < uint16(utils.MarketingStepSalesOrder) {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing must be approved to Sales Order step before creating delivery order")
+	}
+	if latestApproval.StepNumber >= uint16(utils.MarketingDeliveryOrder) {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Delivery order already exists for this marketing")
+	}
+
+	err = s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
+
+		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
+		marketingDeliveryProductRepositoryTx := marketingDeliveryProductRepo.NewMarketingDeliveryProductRepository(dbTransaction)
+		approvalSvcTx := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(dbTransaction))
+
+		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), req.MarketingId)
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("No marketing products found for marketing %d", req.MarketingId))
+			}
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing products")
+		}
+
+		for _, requestedProduct := range req.DeliveryProducts {
+			var foundMarketingProduct *entity.MarketingProduct
+			for i := range allMarketingProducts {
+				if allMarketingProducts[i].Id == requestedProduct.MarketingProductId {
+					foundMarketingProduct = &allMarketingProducts[i]
+					break
+				}
+			}
+			if foundMarketingProduct == nil {
+				return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Marketing product %d not found for this marketing", requestedProduct.MarketingProductId))
+			}
+
+			deliveryProduct, err := marketingDeliveryProductRepositoryTx.GetByMarketingProductID(c.Context(), foundMarketingProduct.Id)
+			if err != nil {
+				if errors.Is(err, gorm.ErrRecordNotFound) {
+					return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Delivery product for marketing product %d not found", requestedProduct.MarketingProductId))
+				}
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
+			}
+
+			var itemDeliveryDate *time.Time
+			if requestedProduct.DeliveryDate != "" {
+				parsedDate, err := utils.ParseDateString(requestedProduct.DeliveryDate)
+				if err != nil {
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid delivery date format for product %d: %v", requestedProduct.MarketingProductId, err))
+				}
+				itemDeliveryDate = &parsedDate
+			}
+
+			deliveryProduct.Qty = requestedProduct.Qty
+			deliveryProduct.UnitPrice = requestedProduct.UnitPrice
+			deliveryProduct.AvgWeight = requestedProduct.AvgWeight
+			deliveryProduct.TotalWeight = requestedProduct.TotalWeight
+			deliveryProduct.TotalPrice = requestedProduct.TotalPrice
+			deliveryProduct.DeliveryDate = itemDeliveryDate
+			deliveryProduct.VehicleNumber = requestedProduct.VehicleNumber
+
+			if requestedProduct.Qty > 0 {
+				if err := s.validateAndReduceProductWarehouse(c.Context(), dbTransaction, foundMarketingProduct, requestedProduct.Qty); err != nil {
+					return err
+				}
+			}
+			if err := marketingDeliveryProductRepositoryTx.UpdateOne(c.Context(), deliveryProduct.Id, deliveryProduct, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
+			}
+
+		}
+
+		
+		approvalAction := entity.ApprovalActionApproved
+		if _, err := approvalSvcTx.CreateApproval(
+			c.Context(),
+			utils.ApprovalWorkflowMarketing,
+			req.MarketingId,
+			utils.MarketingDeliveryOrder,
+			&approvalAction,
+			actorID,
+			nil); err != nil {
+			if !errors.Is(err, gorm.ErrDuplicatedKey) {
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to create delivery order approval")
+			}
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		if fiberErr, ok := err.(*fiber.Error); ok {
+			return nil, fiberErr
+		}
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to create delivery order")
+	}
+
+	return s.getMarketingWithDeliveries(c, req.MarketingId)
+}
+
+func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*dto.MarketingDetailDTO, error) {
+	if err := s.Validate.Struct(req); err != nil {
+		return nil, err
+	}
+
+	if err := commonSvc.EnsureRelations(c.Context(),
+		commonSvc.RelationCheck{Name: "Marketing", ID: &id, Exists: s.MarketingRepo.IdExists},
+	); err != nil {
+		return nil, err
+	}
+
+	err := s.MarketingRepo.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
+
+		marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
+		marketingDeliveryProductRepositoryTx := marketingDeliveryProductRepo.NewMarketingDeliveryProductRepository(dbTransaction)
+
+		allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), id)
+		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+			return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing products")
+		}
+
+		if len(req.DeliveryProducts) > 0 {
+			for _, requestedProduct := range req.DeliveryProducts {
+
+				var foundMarketingProduct *entity.MarketingProduct
+				for i := range allMarketingProducts {
+					if allMarketingProducts[i].Id == requestedProduct.MarketingProductId {
+						foundMarketingProduct = &allMarketingProducts[i]
+						break
+					}
+				}
+				if foundMarketingProduct == nil {
+					return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Marketing product %d not found for this marketing", requestedProduct.MarketingProductId))
+				}
+
+				deliveryProduct, err := marketingDeliveryProductRepositoryTx.GetByMarketingProductID(c.Context(), foundMarketingProduct.Id)
+				if err != nil {
+					if errors.Is(err, gorm.ErrRecordNotFound) {
+						return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Delivery product for marketing product %d not found", requestedProduct.MarketingProductId))
+					}
+					return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
+				}
+
+				var itemDeliveryDate *time.Time
+				if requestedProduct.DeliveryDate != "" {
+					parsedDate, err := utils.ParseDateString(requestedProduct.DeliveryDate)
+					if err != nil {
+						return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid delivery date format for product %d: %v", requestedProduct.MarketingProductId, err))
+					}
+					itemDeliveryDate = &parsedDate
+				} else if deliveryProduct.DeliveryDate != nil {
+					itemDeliveryDate = deliveryProduct.DeliveryDate
+				}
+
+				oldQty := deliveryProduct.Qty
+				deliveryProduct.Qty = requestedProduct.Qty
+				deliveryProduct.UnitPrice = requestedProduct.UnitPrice
+				deliveryProduct.AvgWeight = requestedProduct.AvgWeight
+				deliveryProduct.TotalWeight = requestedProduct.TotalWeight
+				deliveryProduct.TotalPrice = requestedProduct.TotalPrice
+				deliveryProduct.DeliveryDate = itemDeliveryDate
+				deliveryProduct.VehicleNumber = requestedProduct.VehicleNumber
+
+				qtyChange := requestedProduct.Qty - oldQty
+				if qtyChange > 0 {
+					if err := s.validateAndReduceProductWarehouse(c.Context(), dbTransaction, foundMarketingProduct, qtyChange); err != nil {
+						return err
+					}
+				} else if qtyChange < 0 {
+					if err := s.restoreProductWarehouseStock(c.Context(), dbTransaction, foundMarketingProduct, -qtyChange); err != nil {
+						return err
+					}
+				}
+
+				if err := marketingDeliveryProductRepositoryTx.UpdateOne(c.Context(), deliveryProduct.Id, deliveryProduct, nil); err != nil {
+					return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
+				}
+			}
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		if fiberErr, ok := err.(*fiber.Error); ok {
+			return nil, fiberErr
+		}
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery order")
+	}
+
+	return s.getMarketingWithDeliveries(c, id)
+}
+
+func (s deliveryOrdersService) validateAndReduceProductWarehouse(ctx context.Context, tx *gorm.DB, marketingProduct *entity.MarketingProduct, qtyDeliver float64) error {
+	if marketingProduct == nil || marketingProduct.ProductWarehouseId == 0 {
+		return fiber.NewError(fiber.StatusInternalServerError, "Product warehouse not found")
+	}
+
+	pwRepo := productWarehouseRepo.NewProductWarehouseRepository(tx)
+
+	pw, err := pwRepo.GetByID(ctx, marketingProduct.ProductWarehouseId, nil)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return fiber.NewError(fiber.StatusNotFound, "Product warehouse not found")
+		}
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to check stock")
+	}
+
+	if pw.Quantity < qtyDeliver {
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Insufficient stock for warehouse - available: %.2f, requested: %.2f", pw.Quantity, qtyDeliver))
+	}
+
+	pw.Quantity = pw.Quantity - qtyDeliver
+	if err := pwRepo.UpdateOne(ctx, pw.Id, pw, nil); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update stock")
+	}
+	return nil
+}
+
+func (s deliveryOrdersService) restoreProductWarehouseStock(ctx context.Context, tx *gorm.DB, marketingProduct *entity.MarketingProduct, qtyRestore float64) error {
+	if marketingProduct == nil || marketingProduct.ProductWarehouseId == 0 {
+		return fiber.NewError(fiber.StatusInternalServerError, "Product warehouse not found")
+	}
+
+	pwRepo := productWarehouseRepo.NewProductWarehouseRepository(tx)
+	pw, err := pwRepo.GetByID(ctx, marketingProduct.ProductWarehouseId, nil)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return fiber.NewError(fiber.StatusNotFound, "Product warehouse not found")
+		}
+
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to check stock")
+	}
+
+	pw.Quantity = pw.Quantity + qtyRestore
+	if err := pwRepo.UpdateOne(ctx, pw.Id, pw, nil); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update stock")
+	}
+
+	return nil
+}

internal/modules/marketing/delivery-orderss/validations/delivery-orders.validation.go

@@ -0,0 +1,33 @@
+package validation
+
+type DeliveryProduct struct {
+	MarketingProductId uint    `json:"marketing_product_id" validate:"required,gt=0"`
+	Qty                float64 `json:"qty" validate:"omitempty,gte=0"`
+	UnitPrice          float64 `json:"unit_price" validate:"omitempty,gte=0"`
+	AvgWeight          float64 `json:"avg_weight" validate:"omitempty,gte=0"`
+	TotalWeight        float64 `json:"total_weight" validate:"omitempty,gte=0"`
+	TotalPrice         float64 `json:"total_price" validate:"omitempty,gte=0"`
+	DeliveryDate       string  `json:"delivery_date" validate:"omitempty,datetime=2006-01-02"`
+	VehicleNumber      string  `json:"vehicle_number" validate:"omitempty,max=50"`
+}
+
+type Create struct {
+	MarketingId      uint              `json:"marketing_id" validate:"required,gt=0"`
+	DeliveryProducts []DeliveryProduct `json:"delivery_products" validate:"required,min=1,dive"`
+}
+
+type Update struct {
+	DeliveryProducts []DeliveryProduct `json:"delivery_products" validate:"omitempty,min=1,dive"`
+}
+
+type Query struct {
+	Page        int  `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit       int  `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	MarketingId uint `query:"marketing_id" validate:"omitempty,gt=0"`
+}
+
+type Approve struct {
+	Action        string  `json:"action" validate:"required_strict"`
+	ApprovableIds []uint  `json:"approvable_ids" validate:"required_strict,min=1,dive,gt=0"`
+	Notes         *string `json:"notes,omitempty" validate:"omitempty,max=500"`
+}

internal/modules/marketing/module.go

@@ -0,0 +1,13 @@
+package marketing
+
+import (
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+)
+
+type MarketingModule struct{}
+
+func (MarketingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	RegisterRoutes(router, db, validate)
+}

internal/modules/marketing/route.go

@@ -0,0 +1,27 @@
+package marketing
+
+import (
+	"gitlab.com/mbugroup/lti-api.git/internal/modules"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	salesOrderss "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders"
+	deliveryOrderss "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss"
+	// MODULE IMPORTS
+)
+
+func RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	group := router.Group("/marketing")
+
+	allModules := []modules.Module{
+		salesOrderss.SalesOrdersModule{},
+		deliveryOrderss.DeliveryOrdersModule{},
+		// MODULE REGISTRY
+	}
+
+	for _, m := range allModules {
+		m.RegisterRoutes(group, db, validate)
+	}
+}

internal/modules/marketing/sales-orders/controllers/sales-orders.controller.go

@@ -0,0 +1,122 @@
+package controller
+
+import (
+	"strconv"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/dto"
+	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/services"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/response"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+type SalesOrdersController struct {
+	SalesOrdersService service.SalesOrdersService
+}
+
+func NewSalesOrdersController(salesOrdersService service.SalesOrdersService) *SalesOrdersController {
+	return &SalesOrdersController{
+		SalesOrdersService: salesOrdersService,
+	}
+}
+
+func (u *SalesOrdersController) CreateOne(c *fiber.Ctx) error {
+	req := new(validation.Create)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.SalesOrdersService.CreateOne(c, req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusCreated).
+		JSON(response.Success{
+			Code:    fiber.StatusCreated,
+			Status:  "success",
+			Message: "Create salesOrders successfully",
+			Data:    dto.ToSalesOrdersListDTOFromMarketing(*result),
+		})
+}
+
+func (u *SalesOrdersController) UpdateOne(c *fiber.Ctx) error {
+	req := new(validation.Update)
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.SalesOrdersService.UpdateOne(c, req, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Update salesOrders successfully",
+			Data:    dto.ToSalesOrdersListDTOFromMarketing(*result),
+		})
+}
+
+func (u *SalesOrdersController) DeleteOne(c *fiber.Ctx) error {
+	param := c.Params("id")
+
+	id, err := strconv.Atoi(param)
+	if err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+	}
+
+	if err := u.SalesOrdersService.DeleteOne(c, uint(id)); err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Common{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Delete salesOrders successfully",
+		})
+}
+
+func (u *SalesOrdersController) Approval(c *fiber.Ctx) error {
+	req := new(validation.Approve)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	results, err := u.SalesOrdersService.Approval(c, req)
+	if err != nil {
+		return err
+	}
+
+	var (
+		data    interface{}
+		message = "Submit sales order approval successfully"
+	)
+	if len(results) == 1 {
+		data = dto.ToSalesOrdersListDTOFromMarketing(results[0])
+	} else {
+		message = "Submit sales order approvals successfully"
+		data = dto.ToSalesOrdersListDTOsFromMarketing(results)
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: message,
+			Data:    data,
+		})
+}

internal/modules/marketing/sales-orders/dto/sales-orders.dto.go

@@ -0,0 +1,90 @@
+package dto
+
+import (
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	productWarehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/dto"
+)
+
+// === DTO Structs ===
+
+type MarketingProductDTO struct {
+	Id               uint                                          `json:"id"`
+	Qty              float64                                       `json:"qty"`
+	UnitPrice        float64                                       `json:"unit_price"`
+	AvgWeight        float64                                       `json:"avg_weight"`
+	TotalWeight      float64                                       `json:"total_weight"`
+	TotalPrice       float64                                       `json:"total_price"`
+	ProductWarehouse *productWarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
+}
+
+type SalesOrdersListDTO struct {
+	Id         uint                  `json:"id"`
+	SoNumber   string                `json:"so_number"`
+	SoDate     time.Time             `json:"so_date"`
+	Notes      string                `json:"notes,omitempty"`
+	SalesOrder []MarketingProductDTO `json:"sales_order,omitempty"`
+}
+
+// === Mapper Functions ===
+
+func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
+	var productWarehouse *productWarehouseDTO.ProductWarehousNestedDTO
+
+	if e.ProductWarehouse.Id != 0 {
+		mapped := productWarehouseDTO.ToProductWarehouseNestedDTO(e.ProductWarehouse)
+		productWarehouse = &mapped
+	}
+
+	return MarketingProductDTO{
+		Id:               e.Id,
+		Qty:              e.Qty,
+		UnitPrice:        e.UnitPrice,
+		AvgWeight:        e.AvgWeight,
+		TotalWeight:      e.TotalWeight,
+		TotalPrice:       e.TotalPrice,
+		ProductWarehouse: productWarehouse,
+	}
+}
+
+func ToSalesOrdersListDTO(e entity.Marketing) SalesOrdersListDTO {
+	products := make([]MarketingProductDTO, len(e.Products))
+	for i, p := range e.Products {
+		products[i] = ToMarketingProductDTO(p)
+	}
+
+	return SalesOrdersListDTO{
+		Id:         e.Id,
+		SoNumber:   e.SoNumber,
+		SoDate:     e.SoDate,
+		Notes:      e.Notes,
+		SalesOrder: products,
+	}
+}
+
+func ToSalesOrdersListDTOFromMarketing(e entity.Marketing) SalesOrdersListDTO {
+	var salesOrder []MarketingProductDTO
+	if len(e.Products) > 0 {
+		salesOrder = make([]MarketingProductDTO, len(e.Products))
+		for i, product := range e.Products {
+			salesOrder[i] = ToMarketingProductDTO(product)
+		}
+	}
+
+	return SalesOrdersListDTO{
+		Id:         e.Id,
+		SoNumber:   e.SoNumber,
+		SoDate:     e.SoDate,
+		Notes:      e.Notes,
+		SalesOrder: salesOrder,
+	}
+}
+
+func ToSalesOrdersListDTOsFromMarketing(e []entity.Marketing) []SalesOrdersListDTO {
+	result := make([]SalesOrdersListDTO, len(e))
+	for i, r := range e {
+		result[i] = ToSalesOrdersListDTOFromMarketing(r)
+	}
+	return result
+}

internal/modules/marketing/sales-orders/module.go

@@ -0,0 +1,39 @@
+package sales_orders
+
+import (
+	"fmt"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	"gorm.io/gorm"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
+	rSalesOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
+	sSalesOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/services"
+	rCustomer "gitlab.com/mbugroup/lti-api.git/internal/modules/master/customers/repositories"
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
+
+type SalesOrdersModule struct{}
+
+func (SalesOrdersModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
+	marketingRepo := rSalesOrders.NewMarketingRepository(db)
+	userRepo := rUser.NewUserRepository(db)
+	customerRepo := rCustomer.NewCustomerRepository(db)
+	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
+
+	approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(db))
+
+	if err := approvalSvc.RegisterWorkflowSteps(utils.ApprovalWorkflowMarketing, utils.MarketingApprovalSteps); err != nil {
+		panic(fmt.Sprintf("failed to register marketing approval workflow: %v", err))
+	}
+
+	salesOrdersService := sSalesOrders.NewSalesOrdersService(marketingRepo, customerRepo, productWarehouseRepo, userRepo, approvalSvc, validate)
+	userService := sUser.NewUserService(userRepo, validate)
+
+	SalesOrdersRoutes(router, userService, salesOrdersService)
+}

internal/modules/marketing/sales-orders/repositories/marketing-delivery-products.repository.go

@@ -0,0 +1,21 @@
+package repository
+
+import (
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type MarketingDeliveryProductRepository interface {
+	repository.BaseRepository[entity.MarketingDeliveryProduct]
+}
+
+type MarketingDeliveryProductRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.MarketingDeliveryProduct]
+}
+
+func NewMarketingDeliveryProductRepository(db *gorm.DB) MarketingDeliveryProductRepository {
+	return &MarketingDeliveryProductRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.MarketingDeliveryProduct](db),
+	}
+}

internal/modules/marketing/sales-orders/repositories/marketing-products.repository.go

@@ -0,0 +1,40 @@
+package repository
+
+import (
+	"context"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gorm.io/gorm"
+)
+
+type MarketingProductRepository interface {
+	repository.BaseRepository[entity.MarketingProduct]
+	GetByMarketingID(ctx context.Context, marketingID uint) ([]entity.MarketingProduct, error)
+	IdExists(ctx context.Context, id uint) (bool, error)
+}
+
+type MarketingProductRepositoryImpl struct {
+	*repository.BaseRepositoryImpl[entity.MarketingProduct]
+}
+
+func NewMarketingProductRepository(db *gorm.DB) MarketingProductRepository {
+	return &MarketingProductRepositoryImpl{
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.MarketingProduct](db),
+	}
+}
+
+func (r *MarketingProductRepositoryImpl) GetByMarketingID(ctx context.Context, marketingID uint) ([]entity.MarketingProduct, error) {
+	var products []entity.MarketingProduct
+	if err := r.DB().WithContext(ctx).Where("marketing_id = ?", marketingID).Find(&products).Error; err != nil {
+		return nil, err
+	}
+	if len(products) == 0 {
+		return products, gorm.ErrRecordNotFound
+	}
+	return products, nil
+}
+
+func (r *MarketingProductRepositoryImpl) IdExists(ctx context.Context, id uint) (bool, error) {
+	return repository.Exists[entity.MarketingProduct](ctx, r.DB(), id)
+}