fix: error checking id exists

cmd/adjust-quantity-product-warehouse-from-purchase/main.go

@@ -1,297 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"log"
-	"math"
-	"os"
-	"strings"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-const (
-	levelAllNoFlagProducts = 1
-	levelProductName       = 2
-	levelProductWarehouse  = 3
-	qtyEpsilon             = 1e-6
-)
-
-type targetRow struct {
-	ProductWarehouseID uint    `gorm:"column:product_warehouse_id"`
-	ProductID          uint    `gorm:"column:product_id"`
-	ProductName        string  `gorm:"column:product_name"`
-	CurrentQty         float64 `gorm:"column:current_qty"`
-	ComputedQty        float64 `gorm:"column:computed_qty"`
-}
-
-func main() {
-	var (
-		level              int
-		productName        string
-		productWarehouseID uint
-		apply              bool
-	)
-
-	flag.IntVar(
-		&level,
-		"level",
-		levelAllNoFlagProducts,
-		"CLI level: 1=all products without flags, 2=specific product name (with flags), 3=specific product warehouse id",
-	)
-	flag.StringVar(&productName, "product-name", "", "Product name (required for level 2)")
-	flag.UintVar(&productWarehouseID, "product-warehouse-id", 0, "Product warehouse id (required for level 3)")
-	flag.BoolVar(&apply, "apply", false, "Apply changes. If false, run as dry-run")
-	flag.Parse()
-
-	productName = strings.TrimSpace(productName)
-	if err := validateFlags(level, productName, productWarehouseID); err != nil {
-		log.Fatalf("invalid flags: %v", err)
-	}
-
-	ctx := context.Background()
-	db := database.Connect(config.DBHost, config.DBName)
-
-	targets, err := loadTargets(ctx, db, level, productName, productWarehouseID)
-	if err != nil {
-		log.Fatalf("failed to load target product warehouses: %v", err)
-	}
-
-	fmt.Printf("Mode: %s\n", modeLabel(apply))
-	fmt.Printf("Level: %d (%s)\n", level, levelLabel(level))
-	if productName != "" {
-		fmt.Printf("Filter product_name: %s\n", productName)
-	}
-	if productWarehouseID > 0 {
-		fmt.Printf("Filter product_warehouse_id: %d\n", productWarehouseID)
-	}
-	fmt.Printf("Targets found: %d\n\n", len(targets))
-
-	if len(targets) == 0 {
-		fmt.Println("No matching product warehouse rows to process")
-		return
-	}
-
-	for _, row := range targets {
-		fmt.Printf(
-			"PLAN pw=%d product_id=%d product=%q current_qty=%.3f computed_qty=%.3f delta=%.3f\n",
-			row.ProductWarehouseID,
-			row.ProductID,
-			row.ProductName,
-			row.CurrentQty,
-			row.ComputedQty,
-			row.ComputedQty-row.CurrentQty,
-		)
-	}
-
-	if !apply {
-		fmt.Println()
-		fmt.Printf("Summary: planned=%d updated=0 skipped=0 failed=0\n", len(targets))
-		return
-	}
-
-	updated := 0
-	skipped := 0
-	err = db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		for _, row := range targets {
-			if nearlyEqual(row.CurrentQty, row.ComputedQty) {
-				fmt.Printf(
-					"SKIP pw=%d reason=no_change current_qty=%.3f computed_qty=%.3f\n",
-					row.ProductWarehouseID,
-					row.CurrentQty,
-					row.ComputedQty,
-				)
-				skipped++
-				continue
-			}
-
-			if err := tx.Table("product_warehouses").
-				Where("id = ?", row.ProductWarehouseID).
-				Update("qty", row.ComputedQty).Error; err != nil {
-				return fmt.Errorf("update qty for product_warehouse_id=%d: %w", row.ProductWarehouseID, err)
-			}
-
-			fmt.Printf(
-				"DONE pw=%d product_id=%d product=%q old_qty=%.3f new_qty=%.3f\n",
-				row.ProductWarehouseID,
-				row.ProductID,
-				row.ProductName,
-				row.CurrentQty,
-				row.ComputedQty,
-			)
-			updated++
-		}
-		return nil
-	})
-	if err != nil {
-		fmt.Println()
-		fmt.Printf("Summary: planned=%d updated=%d skipped=%d failed=1\n", len(targets), updated, skipped)
-		log.Printf("error: %v", err)
-		os.Exit(1)
-	}
-
-	fmt.Println()
-	fmt.Printf("Summary: planned=%d updated=%d skipped=%d failed=0\n", len(targets), updated, skipped)
-}
-
-func validateFlags(level int, productName string, productWarehouseID uint) error {
-	switch level {
-	case levelAllNoFlagProducts:
-		if productName != "" {
-			return errors.New("--product-name cannot be used on level 1")
-		}
-		if productWarehouseID > 0 {
-			return errors.New("--product-warehouse-id cannot be used on level 1")
-		}
-	case levelProductName:
-		if productName == "" {
-			return errors.New("--product-name is required on level 2")
-		}
-		if productWarehouseID > 0 {
-			return errors.New("--product-warehouse-id cannot be used on level 2")
-		}
-	case levelProductWarehouse:
-		if productWarehouseID == 0 {
-			return errors.New("--product-warehouse-id is required on level 3")
-		}
-		if productName != "" {
-			return errors.New("--product-name cannot be used on level 3")
-		}
-	default:
-		return fmt.Errorf("unsupported --level=%d (allowed: 1, 2, 3)", level)
-	}
-
-	return nil
-}
-
-func loadTargets(
-	ctx context.Context,
-	db *gorm.DB,
-	level int,
-	productName string,
-	productWarehouseID uint,
-) ([]targetRow, error) {
-	switch level {
-	case levelAllNoFlagProducts:
-		return loadTargetsLevel1ByProductWithoutFlags(ctx, db)
-	case levelProductName:
-		return loadTargetsLevel2ByProductWarehouseWithFlags(ctx, db, productName)
-	case levelProductWarehouse:
-		return loadTargetByProductWarehouseID(ctx, db, productWarehouseID)
-	default:
-		return nil, fmt.Errorf("unsupported level %d", level)
-	}
-}
-
-func loadTargetsLevel1ByProductWithoutFlags(ctx context.Context, db *gorm.DB) ([]targetRow, error) {
-	rows := make([]targetRow, 0)
-	if err := db.WithContext(ctx).
-		Table("product_warehouses pw").
-		Select(`
-			pw.id AS product_warehouse_id,
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			COALESCE(pw.qty, 0) AS current_qty,
-			COALESCE(SUM(pi.total_qty), 0) AS computed_qty
-		`).
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("p.deleted_at IS NULL").
-		Where("f.id IS NULL").
-		Group("pw.id, pw.product_id, p.name, pw.qty").
-		Order("pw.id ASC").
-		Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func loadTargetsLevel2ByProductWarehouseWithFlags(
-	ctx context.Context,
-	db *gorm.DB,
-	productName string,
-) ([]targetRow, error) {
-	rows := make([]targetRow, 0)
-	if err := db.WithContext(ctx).
-		Table("product_warehouses pw").
-		Select(`
-			pw.id AS product_warehouse_id,
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			COALESCE(pw.qty, 0) AS current_qty,
-			COALESCE(SUM(pi.total_qty), 0) AS computed_qty
-		`).
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("p.deleted_at IS NULL").
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM flags f
-				WHERE f.flagable_id = p.id
-				  AND f.flagable_type = ?
-			)
-		`, entity.FlagableTypeProduct).
-		Where("LOWER(p.name) = LOWER(?)", productName).
-		Group("pw.id, pw.product_id, p.name, pw.qty").
-		Order("pw.id ASC").
-		Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func loadTargetByProductWarehouseID(ctx context.Context, db *gorm.DB, productWarehouseID uint) ([]targetRow, error) {
-	rows := make([]targetRow, 0)
-	if err := db.WithContext(ctx).
-		Table("product_warehouses pw").
-		Select(`
-			pw.id AS product_warehouse_id,
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			COALESCE(pw.qty, 0) AS current_qty,
-			COALESCE(SUM(pi.total_qty), 0) AS computed_qty
-		`).
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.product_warehouse_id = pw.id").
-		Where("pw.id = ?", productWarehouseID).
-		Group("pw.id, pw.product_id, p.name, pw.qty").
-		Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func modeLabel(apply bool) string {
-	if apply {
-		return "APPLY"
-	}
-	return "DRY-RUN"
-}
-
-func levelLabel(level int) string {
-	switch level {
-	case levelAllNoFlagProducts:
-		return "all products without flags (source: purchase_items by product_warehouse_id)"
-	case levelProductName:
-		return "specific product name with flags (source: purchase_items by product_warehouse_id)"
-	case levelProductWarehouse:
-		return "specific product_warehouse_id (source: purchase_items by product_warehouse_id)"
-	default:
-		return "unknown"
-	}
-}
-
-func nearlyEqual(a, b float64) bool {
-	return math.Abs(a-b) <= qtyEpsilon
-}

cmd/api-key/main.go

@@ -1,132 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/apikeys"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-)
-
-func main() {
-	if len(os.Args) < 2 {
-		usage()
-		os.Exit(1)
-	}
-
-	db := database.Connect(config.DBHost, config.DBName)
-	service := apikeys.NewService(db)
-	ctx := context.Background()
-
-	switch os.Args[1] {
-	case "create":
-		fs := flag.NewFlagSet("create", flag.ExitOnError)
-		name := fs.String("name", "dashboard-read-api", "integration client name")
-		environment := fs.String("env", config.AppEnv, "environment label")
-		permissions := fs.String("permissions", "", "comma separated permission codes")
-		allArea := fs.Bool("all-area", true, "grant all areas")
-		areaIDs := fs.String("area-ids", "", "comma separated area ids")
-		allLocation := fs.Bool("all-location", true, "grant all locations")
-		locationIDs := fs.String("location-ids", "", "comma separated location ids")
-		fs.Parse(os.Args[2:])
-
-		permissionCodes := apikeys.DefaultDashboardPermissions()
-		if strings.TrimSpace(*permissions) != "" {
-			permissionCodes = splitCSV(*permissions)
-		}
-
-		issued, err := service.Create(ctx, apikeys.CreateInput{
-			Name:            *name,
-			Environment:     *environment,
-			PermissionCodes: permissionCodes,
-			AllArea:         *allArea,
-			AreaIDs:         parseUintCSV(*areaIDs),
-			AllLocation:     *allLocation,
-			LocationIDs:     parseUintCSV(*locationIDs),
-		})
-		if err != nil {
-			panic(err)
-		}
-
-		fmt.Printf("name: %s\n", issued.Record.Name)
-		fmt.Printf("environment: %s\n", issued.Record.Environment)
-		fmt.Printf("prefix: %s\n", issued.Record.KeyPrefix)
-		fmt.Printf("status: %s\n", issued.Record.Status)
-		fmt.Printf("api_key: %s\n", issued.Key)
-	case "list":
-		fs := flag.NewFlagSet("list", flag.ExitOnError)
-		environment := fs.String("env", "", "filter by environment")
-		fs.Parse(os.Args[2:])
-
-		records, err := service.List(ctx, *environment)
-		if err != nil {
-			panic(err)
-		}
-
-		for _, record := range records {
-			fmt.Printf("%s\t%s\t%s\t%s\tareas=%t\tlocations=%t\n",
-				record.Environment,
-				record.KeyPrefix,
-				record.Status,
-				record.Name,
-				record.AllArea,
-				record.AllLocation,
-			)
-		}
-	case "revoke":
-		fs := flag.NewFlagSet("revoke", flag.ExitOnError)
-		environment := fs.String("env", config.AppEnv, "environment label")
-		prefix := fs.String("prefix", "", "key prefix to revoke")
-		fs.Parse(os.Args[2:])
-
-		if err := service.Revoke(ctx, *environment, *prefix); err != nil {
-			panic(err)
-		}
-		fmt.Printf("revoked %s/%s\n", *environment, *prefix)
-	default:
-		usage()
-		os.Exit(1)
-	}
-}
-
-func usage() {
-	fmt.Println("usage:")
-	fmt.Println("  go run ./cmd/api-key create [flags]")
-	fmt.Println("  go run ./cmd/api-key list [flags]")
-	fmt.Println("  go run ./cmd/api-key revoke -env <environment> -prefix <prefix>")
-}
-
-func splitCSV(raw string) []string {
-	if strings.TrimSpace(raw) == "" {
-		return nil
-	}
-	parts := strings.Split(raw, ",")
-	out := make([]string, 0, len(parts))
-	for _, part := range parts {
-		part = strings.TrimSpace(part)
-		if part != "" {
-			out = append(out, part)
-		}
-	}
-	return out
-}
-
-func parseUintCSV(raw string) []uint {
-	parts := splitCSV(raw)
-	if len(parts) == 0 {
-		return nil
-	}
-
-	values := make([]uint, 0, len(parts))
-	for _, part := range parts {
-		var value uint
-		if _, err := fmt.Sscanf(part, "%d", &value); err == nil && value > 0 {
-			values = append(values, value)
-		}
-	}
-	return values
-}

cmd/api/main.go

@@ -9,14 +9,12 @@ import (
 	"syscall"
 	"time"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/apikeys"
 	"gitlab.com/mbugroup/lti-api.git/internal/cache"
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	"gitlab.com/mbugroup/lti-api.git/internal/database"
 	"gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
 	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
-	"gitlab.com/mbugroup/lti-api.git/internal/readapi"
 	"gitlab.com/mbugroup/lti-api.git/internal/route"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
@@ -133,7 +131,6 @@ func setupDatabase() *gorm.DB {
 }
 
 func setupRoutes(app *fiber.App, db *gorm.DB, rdb *redis.Client) {
-	middleware.SetAPIKeyAuthenticator(apikeys.NewService(db))
 
 	// route.Routes(app, db)
 	// app.Use(utils.NotFoundHandler)
@@ -172,8 +169,6 @@ func setupRoutes(app *fiber.App, db *gorm.DB, rdb *redis.Client) {
 		return c.Status(status).JSON(body)
 	})
 
-	readAPIRoutes := app.Group("/api")
-	readapi.RegisterRoutes(readAPIRoutes)
 	route.Routes(app, db)
 	app.Use(utils.NotFoundHandler)
 }

cmd/generate-read-api/main.go

@@ -1,74 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/cache"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/readapi"
-	"gitlab.com/mbugroup/lti-api.git/internal/route"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/redis/go-redis/v9"
-)
-
-func main() {
-	root, err := findRepoRoot()
-	if err != nil {
-		panic(err)
-	}
-
-	readapi.PrimeBuildConfig()
-	cache.SetRedis(redis.NewClient(&redis.Options{Addr: "127.0.0.1:6379"}))
-	app := fiber.New(config.FiberConfig())
-	app.Get("/healthz", func(c *fiber.Ctx) error {
-		return c.JSON(fiber.Map{"status": "ok", "service": "api", "version": config.Version})
-	})
-	app.Get("/readyz", func(c *fiber.Ctx) error {
-		return c.JSON(fiber.Map{"status": "ok", "db": "up", "redis": "up"})
-	})
-	route.Routes(app, nil)
-
-	artifacts, err := readapi.BuildArtifactsFromApp(app)
-	if err != nil {
-		panic(err)
-	}
-
-	files := map[string][]byte{
-		filepath.Join(root, "docs", "openapi", "read-api.json"):             artifacts.OpenAPIJSON,
-		filepath.Join(root, "docs", "openapi", "read-api.yaml"):             artifacts.OpenAPIYAML,
-		filepath.Join(root, "docs", "postman", "read-api.collection.json"):  artifacts.PostmanCollectionJSON,
-		filepath.Join(root, "docs", "postman", "read-api.environment.json"): artifacts.PostmanEnvironmentJSON,
-	}
-
-	for path, body := range files {
-		if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-			panic(err)
-		}
-		if err := os.WriteFile(path, body, 0o644); err != nil {
-			panic(err)
-		}
-		fmt.Printf("wrote %s\n", path)
-	}
-}
-
-func findRepoRoot() (string, error) {
-	wd, err := os.Getwd()
-	if err != nil {
-		return "", err
-	}
-
-	current := wd
-	for {
-		if _, err := os.Stat(filepath.Join(current, "go.mod")); err == nil {
-			return current, nil
-		}
-		parent := filepath.Dir(current)
-		if parent == current {
-			return "", fmt.Errorf("go.mod not found from %s", wd)
-		}
-		current = parent
-	}
-}

cmd/migrate-legacy-egg-adjustment-stock-to-farm/main_test.go

@@ -1,212 +0,0 @@
-package main
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	fifoStockV2 "gitlab.com/mbugroup/lti-api.git/internal/common/service/fifo_stock_v2"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	transferSvc "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/services"
-)
-
-func TestValidateAdjustmentGatherAgainstAllowedIDsEligible(t *testing.T) {
-	result := validateAdjustmentGatherAgainstAllowedIDs(100, []uint{11, 12}, []commonSvc.FifoStockV2GatherRow{
-		{SourceTable: "adjustment_stocks", SourceID: 11, AvailableQuantity: 70},
-		{SourceTable: "adjustment_stocks", SourceID: 12, AvailableQuantity: 40},
-	})
-
-	if result.Status != "eligible" {
-		t.Fatalf("expected eligible, got %+v", result)
-	}
-	if result.VerifiedQty != 100 {
-		t.Fatalf("expected verified qty 100, got %v", result.VerifiedQty)
-	}
-}
-
-func TestValidateAdjustmentGatherAgainstAllowedIDsRejectsMixedSource(t *testing.T) {
-	result := validateAdjustmentGatherAgainstAllowedIDs(100, []uint{11}, []commonSvc.FifoStockV2GatherRow{
-		{SourceTable: "adjustment_stocks", SourceID: 11, AvailableQuantity: 60},
-		{SourceTable: "recording_eggs", SourceID: 21, AvailableQuantity: 50},
-	})
-
-	if result.Status != "skipped" {
-		t.Fatalf("expected skipped, got %+v", result)
-	}
-	if result.Reason != "mixed_fifo_source_recording_eggs" {
-		t.Fatalf("unexpected reason: %+v", result)
-	}
-}
-
-func TestBuildAdjustmentMigrationPlanUsesValidator(t *testing.T) {
-	opts := &adjustmentCommandOptions{RunID: "egg-adjustment-cutover-test"}
-	farmID := uint(25)
-	farmName := "Gudang Farm Jamali"
-	rows := []adjustmentLegacyEggRow{
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			FarmWarehouseID:     &farmID,
-			FarmWarehouseName:   &farmName,
-			ProductWarehouseID:  101,
-			ProductID:           8,
-			ProductName:         "Telur Utuh",
-			RemainingQty:        120,
-			CurrentPWQty:        150,
-			AdjustmentIDs:       []uint{1},
-		},
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			FarmWarehouseID:     &farmID,
-			FarmWarehouseName:   &farmName,
-			ProductWarehouseID:  102,
-			ProductID:           9,
-			ProductName:         "Telur Putih",
-			RemainingQty:        20,
-			CurrentPWQty:        40,
-			AdjustmentIDs:       []uint{2},
-		},
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			ProductWarehouseID:  103,
-			ProductID:           10,
-			ProductName:         "Telur Pecah",
-			RemainingQty:        10,
-			CurrentPWQty:        10,
-			AdjustmentIDs:       []uint{3},
-		},
-	}
-	validator := &fakeAdjustmentCandidateValidator{
-		byProduct: map[string]adjustmentCandidateValidation{
-			"Telur Utuh":  {Status: "eligible", VerifiedQty: 120},
-			"Telur Putih": {Status: "skipped", Reason: "mixed_fifo_source_recording_eggs", VerifiedQty: 10},
-		},
-	}
-
-	reportRows, groups := buildAdjustmentMigrationPlan(context.Background(), opts, map[uint]adjustmentLocationTiming{
-		16: {LocationID: 16, LocationName: "Jamali", Status: "CLEAN_CUTOVER"},
-	}, rows, validator)
-
-	if len(reportRows) != 3 {
-		t.Fatalf("expected 3 report rows, got %d", len(reportRows))
-	}
-	if len(groups) != 1 || len(groups[0].Rows) != 1 {
-		t.Fatalf("expected only one eligible grouped row, got %+v", groups)
-	}
-	if reportRows[0].Status != "eligible" || reportRows[0].VerifiedQty != 120 {
-		t.Fatalf("unexpected first row: %+v", reportRows[0])
-	}
-	if reportRows[1].Reason != "mixed_fifo_source_recording_eggs" {
-		t.Fatalf("unexpected second row reason: %+v", reportRows[1])
-	}
-	if reportRows[2].Reason != "missing_farm_warehouse" {
-		t.Fatalf("expected missing farm warehouse skip, got %+v", reportRows[2])
-	}
-}
-
-func TestExecuteAdjustmentApplyRevalidatesRowsAndAppliesSubset(t *testing.T) {
-	opts := &adjustmentCommandOptions{
-		RunID:       "egg-adjustment-cutover-apply",
-		CutoverDate: time.Date(2026, 4, 7, 0, 0, 0, 0, time.UTC),
-		ActorID:     99,
-	}
-	group := adjustmentTransferGroup{
-		LocationID:          16,
-		LocationName:        "Jamali",
-		SourceWarehouseID:   46,
-		SourceWarehouseName: "Gudang Jamali 1",
-		FarmWarehouseID:     25,
-		FarmWarehouseName:   "Gudang Farm Jamali",
-		Rows: []*adjustmentMigrationReportRow{
-			{LocationID: 16, LocationName: "Jamali", SourceWarehouseID: 46, SourceWarehouseName: "Gudang Jamali 1", FarmWarehouseID: uintPtr(25), FarmWarehouseName: strPtr("Gudang Farm Jamali"), ProductWarehouseID: 101, ProductID: 8, ProductName: "Telur Utuh", RemainingQty: 120, CurrentPWQty: 150, AdjustmentIDs: []uint{1}, Status: "eligible"},
-			{LocationID: 16, LocationName: "Jamali", SourceWarehouseID: 46, SourceWarehouseName: "Gudang Jamali 1", FarmWarehouseID: uintPtr(25), FarmWarehouseName: strPtr("Gudang Farm Jamali"), ProductWarehouseID: 102, ProductID: 9, ProductName: "Telur Putih", RemainingQty: 20, CurrentPWQty: 40, AdjustmentIDs: []uint{2}, Status: "eligible"},
-		},
-	}
-	validator := &fakeAdjustmentCandidateValidator{
-		byProduct: map[string]adjustmentCandidateValidation{
-			"Telur Utuh":  {Status: "eligible", VerifiedQty: 120},
-			"Telur Putih": {Status: "skipped", Reason: "mixed_fifo_source_recording_eggs", VerifiedQty: 10},
-		},
-	}
-	executor := &fakeAdjustmentSystemTransferExecutor{
-		createResponses: []*entity.StockTransfer{
-			{Id: 1001, MovementNumber: "PND-LTI-1001"},
-		},
-	}
-
-	summary, err := executeAdjustmentApply(context.Background(), executor, validator, opts, []adjustmentTransferGroup{group})
-	if err != nil {
-		t.Fatalf("expected no fatal apply error, got %v", err)
-	}
-	if summary.GroupsApplied != 1 {
-		t.Fatalf("expected 1 applied group, got %+v", summary)
-	}
-	if summary.RowsApplied != 1 || summary.RowsFailed != 1 {
-		t.Fatalf("unexpected summary: %+v", summary)
-	}
-	if len(executor.createRequests) != 1 {
-		t.Fatalf("expected 1 create request, got %d", len(executor.createRequests))
-	}
-	if len(executor.createRequests[0].Products) != 1 || executor.createRequests[0].Products[0].ProductID != 8 {
-		t.Fatalf("expected only Telur Utuh to be transferred, got %+v", executor.createRequests[0].Products)
-	}
-}
-
-type fakeAdjustmentCandidateValidator struct {
-	byProduct    map[string]adjustmentCandidateValidation
-	errByProduct map[string]error
-}
-
-func (f *fakeAdjustmentCandidateValidator) ValidateCandidate(ctx context.Context, row adjustmentLegacyEggRow) (adjustmentCandidateValidation, error) {
-	if err, ok := f.errByProduct[row.ProductName]; ok {
-		return adjustmentCandidateValidation{}, err
-	}
-	if result, ok := f.byProduct[row.ProductName]; ok {
-		return result, nil
-	}
-	return adjustmentCandidateValidation{Status: "eligible", VerifiedQty: row.RemainingQty}, nil
-}
-
-type fakeAdjustmentSystemTransferExecutor struct {
-	createRequests     []*transferSvc.SystemTransferRequest
-	createResponses    []*entity.StockTransfer
-	createErrors       []error
-	deletedTransferIDs []uint
-	deleteErrors       map[uint]error
-}
-
-func (f *fakeAdjustmentSystemTransferExecutor) CreateSystemTransfer(ctx context.Context, req *transferSvc.SystemTransferRequest) (*entity.StockTransfer, error) {
-	f.createRequests = append(f.createRequests, req)
-	idx := len(f.createRequests) - 1
-	if idx < len(f.createErrors) && f.createErrors[idx] != nil {
-		return nil, f.createErrors[idx]
-	}
-	if idx < len(f.createResponses) && f.createResponses[idx] != nil {
-		return f.createResponses[idx], nil
-	}
-	return &entity.StockTransfer{Id: uint64(1000 + idx), MovementNumber: "PND-LTI-DEFAULT"}, nil
-}
-
-func (f *fakeAdjustmentSystemTransferExecutor) DeleteSystemTransfer(ctx context.Context, id uint, actorID uint) error {
-	f.deletedTransferIDs = append(f.deletedTransferIDs, id)
-	if f.deleteErrors == nil {
-		return nil
-	}
-	return f.deleteErrors[id]
-}
-
-func uintPtr(v uint) *uint    { return &v }
-func strPtr(v string) *string { return &v }
-
-var _ adjustmentCandidateValidator = (*fakeAdjustmentCandidateValidator)(nil)
-var _ adjustmentSystemTransferExecutor = (*fakeAdjustmentSystemTransferExecutor)(nil)
-var _ commonSvc.FifoStockV2Lane = fifoStockV2.LaneStockable

cmd/migrate-legacy-egg-stock-to-farm/main.go

@@ -1,825 +0,0 @@
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"sort"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/go-playground/validator/v10"
-	"github.com/sirupsen/logrus"
-	"gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	pwRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	transferRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/repositories"
-	transferSvc "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/services"
-	warehouseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/repositories"
-	pfkRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
-	stockLogRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
-	"gorm.io/gorm"
-)
-
-const (
-	cutoverReasonPrefix = "EGG_FARM_CUTOVER"
-	outputModeTable     = "table"
-	outputModeJSON      = "json"
-)
-
-type commandOptions struct {
-	Apply          bool
-	DryRun         bool
-	RollbackRunID  string
-	LocationID     uint
-	LocationName   string
-	CutoverDate    time.Time
-	CutoverDateRaw string
-	IncludeOverlap bool
-	Output         string
-	ActorID        uint
-	RunID          string
-}
-
-type locationTiming struct {
-	LocationID       uint
-	LocationName     string
-	FirstKandangDate *time.Time
-	LastKandangDate  *time.Time
-	FirstFarmDate    *time.Time
-	LastFarmDate     *time.Time
-	Status           string
-}
-
-type legacyEggStockRow struct {
-	LocationID          uint
-	LocationName        string
-	SourceWarehouseID   uint
-	SourceWarehouseName string
-	FarmWarehouseID     *uint
-	FarmWarehouseName   *string
-	ProductWarehouseID  uint
-	ProductID           uint
-	ProductName         string
-	OnHandQty           float64
-}
-
-type migrationReportRow struct {
-	RunID               string  `json:"run_id"`
-	LocationID          uint    `json:"location_id"`
-	LocationName        string  `json:"location_name"`
-	SourceWarehouseID   uint    `json:"source_warehouse_id"`
-	SourceWarehouseName string  `json:"source_warehouse_name"`
-	FarmWarehouseID     *uint   `json:"farm_warehouse_id,omitempty"`
-	FarmWarehouseName   *string `json:"farm_warehouse_name,omitempty"`
-	ProductWarehouseID  uint    `json:"product_warehouse_id"`
-	ProductID           uint    `json:"product_id"`
-	ProductName         string  `json:"product_name"`
-	Qty                 float64 `json:"qty"`
-	LocationStatus      string  `json:"location_status"`
-	Status              string  `json:"status"`
-	Reason              string  `json:"reason,omitempty"`
-	TransferID          *uint64 `json:"transfer_id,omitempty"`
-	MovementNumber      *string `json:"movement_number,omitempty"`
-}
-
-type applySummary struct {
-	RowsPlanned   int `json:"rows_planned"`
-	RowsApplied   int `json:"rows_applied"`
-	RowsSkipped   int `json:"rows_skipped"`
-	RowsFailed    int `json:"rows_failed"`
-	GroupsPlanned int `json:"groups_planned"`
-	GroupsApplied int `json:"groups_applied"`
-}
-
-type rollbackDetailRow struct {
-	RunID               string  `json:"run_id"`
-	TransferID          uint64  `json:"transfer_id"`
-	MovementNumber      string  `json:"movement_number"`
-	LocationName        string  `json:"location_name"`
-	SourceWarehouseName string  `json:"source_warehouse_name"`
-	FarmWarehouseName   string  `json:"farm_warehouse_name"`
-	ProductName         string  `json:"product_name"`
-	Qty                 float64 `json:"qty"`
-	Status              string  `json:"status"`
-	Reason              string  `json:"reason,omitempty"`
-}
-
-type systemTransferExecutor interface {
-	CreateSystemTransfer(ctx context.Context, req *transferSvc.SystemTransferRequest) (*entity.StockTransfer, error)
-	DeleteSystemTransfer(ctx context.Context, id uint, actorID uint) error
-}
-
-type transferGroup struct {
-	LocationID          uint
-	LocationName        string
-	SourceWarehouseID   uint
-	SourceWarehouseName string
-	FarmWarehouseID     uint
-	FarmWarehouseName   string
-	Rows                []*migrationReportRow
-}
-
-func main() {
-	opts, err := parseFlags()
-	if err != nil {
-		log.Fatalf("invalid flags: %v", err)
-	}
-
-	db := database.Connect(config.DBHost, config.DBName)
-	ctx := context.Background()
-
-	if strings.TrimSpace(opts.RollbackRunID) != "" {
-		rows, err := loadRollbackDetails(ctx, db, opts.RollbackRunID)
-		if err != nil {
-			log.Fatalf("failed to load rollback details: %v", err)
-		}
-		if !opts.Apply {
-			for i := range rows {
-				rows[i].Status = "eligible"
-			}
-			renderRollbackReport(opts.Output, rows)
-			return
-		}
-		if err := executeRollback(ctx, newSystemTransferService(db), rows, opts.ActorID); err != nil {
-			log.Fatalf("rollback failed: %v", err)
-		}
-		renderRollbackReport(opts.Output, rows)
-		return
-	}
-
-	timings, err := loadLocationTimings(ctx, db, opts)
-	if err != nil {
-		log.Fatalf("failed to load location timings: %v", err)
-	}
-	legacyRows, err := loadLegacyEggStocks(ctx, db, opts)
-	if err != nil {
-		log.Fatalf("failed to load legacy egg stocks: %v", err)
-	}
-
-	reportRows, groups := buildMigrationPlan(opts, timings, legacyRows)
-	if !opts.Apply {
-		renderMigrationReport(opts.Output, reportRows, summarizeApply(reportRows, groups, 0))
-		return
-	}
-
-	summary, err := executeApply(ctx, newSystemTransferService(db), opts, groups)
-	if err != nil {
-		log.Fatalf("apply failed: %v", err)
-	}
-	finalRows := flattenGroups(groups, reportRows)
-	summary = summarizeApply(finalRows, groups, summary.GroupsApplied)
-	renderMigrationReport(opts.Output, finalRows, summary)
-}
-
-func parseFlags() (*commandOptions, error) {
-	var opts commandOptions
-	flag.BoolVar(&opts.Apply, "apply", false, "Apply migration. If false, run as dry-run")
-	flag.BoolVar(&opts.DryRun, "dry-run", true, "Run as dry-run")
-	flag.StringVar(&opts.RollbackRunID, "rollback-run-id", "", "Rollback all transfers created by the provided run id")
-	flag.UintVar(&opts.LocationID, "location-id", 0, "Filter by location id")
-	flag.StringVar(&opts.LocationName, "location-name", "", "Filter by exact location name")
-	flag.StringVar(&opts.CutoverDateRaw, "cutover-date", "", "Cutover date in YYYY-MM-DD format")
-	flag.BoolVar(&opts.IncludeOverlap, "include-overlap", false, "Include overlap locations in plan/apply")
-	flag.StringVar(&opts.Output, "output", outputModeTable, "Output format: table or json")
-	flag.UintVar(&opts.ActorID, "actor-id", 1, "Actor id used for created/deleted transfers")
-	flag.Parse()
-
-	opts.LocationName = strings.TrimSpace(opts.LocationName)
-	opts.RollbackRunID = strings.TrimSpace(opts.RollbackRunID)
-	opts.Output = strings.ToLower(strings.TrimSpace(opts.Output))
-	if opts.Output == "" {
-		opts.Output = outputModeTable
-	}
-	if opts.Output != outputModeTable && opts.Output != outputModeJSON {
-		return nil, fmt.Errorf("unsupported --output=%s", opts.Output)
-	}
-	if opts.Apply {
-		opts.DryRun = false
-	}
-	if opts.LocationID > 0 && opts.LocationName != "" {
-		return nil, errors.New("use either --location-id or --location-name, not both")
-	}
-	if opts.RollbackRunID != "" {
-		if opts.LocationID > 0 || opts.LocationName != "" {
-			return nil, errors.New("location filters are not supported with --rollback-run-id")
-		}
-		if opts.CutoverDateRaw != "" {
-			return nil, errors.New("--cutover-date is not used with --rollback-run-id")
-		}
-	} else if opts.Apply {
-		if opts.LocationID == 0 && opts.LocationName == "" {
-			return nil, errors.New("apply mode requires --location-id or --location-name for safety")
-		}
-		if strings.TrimSpace(opts.CutoverDateRaw) == "" {
-			return nil, errors.New("--cutover-date is required in apply mode")
-		}
-	}
-
-	if strings.TrimSpace(opts.CutoverDateRaw) == "" {
-		opts.CutoverDate = normalizeDateOnly(time.Now().In(time.FixedZone("Asia/Jakarta", 7*3600)))
-	} else {
-		t, err := time.Parse("2006-01-02", opts.CutoverDateRaw)
-		if err != nil {
-			return nil, fmt.Errorf("invalid --cutover-date: %w", err)
-		}
-		opts.CutoverDate = normalizeDateOnly(t)
-	}
-
-	opts.RunID = buildRunID()
-	return &opts, nil
-}
-
-func newSystemTransferService(db *gorm.DB) systemTransferExecutor {
-	validate := validator.New()
-	stockTransferRepo := transferRepo.NewStockTransferRepository(db)
-	stockTransferDetailRepo := transferRepo.NewStockTransferDetailRepository(db)
-	stockTransferDeliveryRepo := transferRepo.NewStockTransferDeliveryRepository(db)
-	stockTransferDeliveryItemRepo := transferRepo.NewStockTransferDeliveryItemRepository(db)
-	stockLogsRepo := stockLogRepo.NewStockLogRepository(db)
-	productWarehouseRepo := pwRepo.NewProductWarehouseRepository(db)
-	warehouseRepository := warehouseRepo.NewWarehouseRepository(db)
-	projectFlockKandangRepo := pfkRepo.NewProjectFlockKandangRepository(db)
-	projectFlockPopulationRepo := pfkRepo.NewProjectFlockPopulationRepository(db)
-	fifoSvc := service.NewFifoStockV2Service(db, logrus.StandardLogger())
-
-	return transferSvc.NewTransferService(
-		validate,
-		stockTransferRepo,
-		stockTransferDetailRepo,
-		stockTransferDeliveryRepo,
-		stockTransferDeliveryItemRepo,
-		stockLogsRepo,
-		productWarehouseRepo,
-		nil,
-		warehouseRepository,
-		projectFlockKandangRepo,
-		projectFlockPopulationRepo,
-		nil,
-		fifoSvc,
-		nil,
-	)
-}
-
-func loadLocationTimings(ctx context.Context, db *gorm.DB, opts *commandOptions) (map[uint]locationTiming, error) {
-	type row struct {
-		LocationID       uint       `gorm:"column:location_id"`
-		LocationName     string     `gorm:"column:location_name"`
-		FirstKandangDate *time.Time `gorm:"column:first_kandang_date"`
-		LastKandangDate  *time.Time `gorm:"column:last_kandang_date"`
-		FirstFarmDate    *time.Time `gorm:"column:first_farm_date"`
-		LastFarmDate     *time.Time `gorm:"column:last_farm_date"`
-	}
-
-	query := db.WithContext(ctx).
-		Table("recording_eggs re").
-		Select(`
-			pf.location_id AS location_id,
-			l.name AS location_name,
-			MIN(CASE WHEN w.type = 'KANDANG' THEN DATE(r.record_datetime) END) AS first_kandang_date,
-			MAX(CASE WHEN w.type = 'KANDANG' THEN DATE(r.record_datetime) END) AS last_kandang_date,
-			MIN(CASE WHEN w.type = 'LOKASI' THEN DATE(r.record_datetime) END) AS first_farm_date,
-			MAX(CASE WHEN w.type = 'LOKASI' THEN DATE(r.record_datetime) END) AS last_farm_date
-		`).
-		Joins("JOIN recordings r ON r.id = re.recording_id").
-		Joins("JOIN project_flock_kandangs pk ON pk.id = COALESCE(re.project_flock_kandang_id, r.project_flock_kandangs_id)").
-		Joins("JOIN project_flocks pf ON pf.id = pk.project_flock_id").
-		Joins("JOIN locations l ON l.id = pf.location_id").
-		Joins("JOIN product_warehouses pw ON pw.id = re.product_warehouse_id").
-		Joins("JOIN warehouses w ON w.id = pw.warehouse_id").
-		Group("pf.location_id, l.name")
-	query = applyTimingLocationFilter(query, opts)
-
-	var rows []row
-	if err := query.Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	result := make(map[uint]locationTiming, len(rows))
-	for _, row := range rows {
-		status := "KANDANG_ONLY"
-		if row.FirstFarmDate != nil {
-			status = "OVERLAP"
-			if row.LastKandangDate == nil || row.FirstFarmDate.After(normalizeDateOnly(*row.LastKandangDate)) {
-				status = "CLEAN_CUTOVER"
-			}
-		}
-		result[row.LocationID] = locationTiming{
-			LocationID:       row.LocationID,
-			LocationName:     row.LocationName,
-			FirstKandangDate: normalizeDatePtr(row.FirstKandangDate),
-			LastKandangDate:  normalizeDatePtr(row.LastKandangDate),
-			FirstFarmDate:    normalizeDatePtr(row.FirstFarmDate),
-			LastFarmDate:     normalizeDatePtr(row.LastFarmDate),
-			Status:           status,
-		}
-	}
-
-	return result, nil
-}
-
-func loadLegacyEggStocks(ctx context.Context, db *gorm.DB, opts *commandOptions) ([]legacyEggStockRow, error) {
-	type row struct {
-		LocationID          uint    `gorm:"column:location_id"`
-		LocationName        string  `gorm:"column:location_name"`
-		SourceWarehouseID   uint    `gorm:"column:source_warehouse_id"`
-		SourceWarehouseName string  `gorm:"column:source_warehouse_name"`
-		FarmWarehouseID     *uint   `gorm:"column:farm_warehouse_id"`
-		FarmWarehouseName   *string `gorm:"column:farm_warehouse_name"`
-		ProductWarehouseID  uint    `gorm:"column:product_warehouse_id"`
-		ProductID           uint    `gorm:"column:product_id"`
-		ProductName         string  `gorm:"column:product_name"`
-		OnHandQty           float64 `gorm:"column:on_hand_qty"`
-	}
-
-	firstFarmSub := db.WithContext(ctx).
-		Table("warehouses fw").
-		Select("fw.location_id AS location_id, MIN(fw.id) AS farm_warehouse_id").
-		Where("fw.deleted_at IS NULL").
-		Where("fw.type = ?", "LOKASI").
-		Group("fw.location_id")
-
-	query := db.WithContext(ctx).
-		Table("product_warehouses pw").
-		Select(`
-			kw.location_id AS location_id,
-			l.name AS location_name,
-			kw.id AS source_warehouse_id,
-			kw.name AS source_warehouse_name,
-			fw.id AS farm_warehouse_id,
-			fw.name AS farm_warehouse_name,
-			pw.id AS product_warehouse_id,
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			COALESCE(pw.qty, 0) AS on_hand_qty
-		`).
-		Joins("JOIN warehouses kw ON kw.id = pw.warehouse_id AND kw.deleted_at IS NULL").
-		Joins("JOIN locations l ON l.id = kw.location_id").
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN product_categories pc ON pc.id = p.product_category_id").
-		Joins("LEFT JOIN (?) ff ON ff.location_id = kw.location_id", firstFarmSub).
-		Joins("LEFT JOIN warehouses fw ON fw.id = ff.farm_warehouse_id").
-		Where("kw.type = ?", "KANDANG").
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM recording_eggs re
-				WHERE re.product_warehouse_id = pw.id
-			)
-		`).
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM flags f
-				WHERE f.flagable_type = ?
-				  AND f.flagable_id = p.id
-				  AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-			)
-			OR (
-				NOT EXISTS (
-					SELECT 1
-					FROM flags f_any
-					WHERE f_any.flagable_type = ?
-					  AND f_any.flagable_id = p.id
-				)
-				AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-			)
-		`, entity.FlagableTypeProduct, entity.FlagableTypeProduct).
-		Order("l.name ASC, kw.name ASC, p.name ASC")
-	query = applyLegacyStockLocationFilter(query, opts)
-
-	var rows []row
-	if err := query.Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	result := make([]legacyEggStockRow, 0, len(rows))
-	for _, row := range rows {
-		result = append(result, legacyEggStockRow{
-			LocationID:          row.LocationID,
-			LocationName:        row.LocationName,
-			SourceWarehouseID:   row.SourceWarehouseID,
-			SourceWarehouseName: row.SourceWarehouseName,
-			FarmWarehouseID:     row.FarmWarehouseID,
-			FarmWarehouseName:   row.FarmWarehouseName,
-			ProductWarehouseID:  row.ProductWarehouseID,
-			ProductID:           row.ProductID,
-			ProductName:         row.ProductName,
-			OnHandQty:           row.OnHandQty,
-		})
-	}
-
-	return result, nil
-}
-
-func buildMigrationPlan(
-	opts *commandOptions,
-	timings map[uint]locationTiming,
-	rows []legacyEggStockRow,
-) ([]migrationReportRow, []transferGroup) {
-	reportRows := make([]migrationReportRow, 0, len(rows))
-	groupMap := make(map[string]*transferGroup)
-
-	for _, row := range rows {
-		locationStatus := "UNKNOWN"
-		if timing, ok := timings[row.LocationID]; ok {
-			locationStatus = timing.Status
-		}
-
-		report := migrationReportRow{
-			RunID:               opts.RunID,
-			LocationID:          row.LocationID,
-			LocationName:        row.LocationName,
-			SourceWarehouseID:   row.SourceWarehouseID,
-			SourceWarehouseName: row.SourceWarehouseName,
-			FarmWarehouseID:     row.FarmWarehouseID,
-			FarmWarehouseName:   row.FarmWarehouseName,
-			ProductWarehouseID:  row.ProductWarehouseID,
-			ProductID:           row.ProductID,
-			ProductName:         row.ProductName,
-			Qty:                 row.OnHandQty,
-			LocationStatus:      locationStatus,
-			Status:              "eligible",
-		}
-
-		switch {
-		case row.FarmWarehouseID == nil || row.FarmWarehouseName == nil:
-			report.Status = "skipped"
-			report.Reason = "missing_farm_warehouse"
-		case row.OnHandQty <= 0:
-			report.Status = "skipped"
-			report.Reason = "non_positive_qty"
-		case locationStatus == "OVERLAP" && !opts.IncludeOverlap:
-			report.Status = "skipped"
-			report.Reason = "overlap_location"
-		}
-
-		reportRows = append(reportRows, report)
-		if report.Status != "eligible" {
-			continue
-		}
-
-		groupKey := fmt.Sprintf("%d:%d", row.SourceWarehouseID, *row.FarmWarehouseID)
-		group := groupMap[groupKey]
-		if group == nil {
-			group = &transferGroup{
-				LocationID:          row.LocationID,
-				LocationName:        row.LocationName,
-				SourceWarehouseID:   row.SourceWarehouseID,
-				SourceWarehouseName: row.SourceWarehouseName,
-				FarmWarehouseID:     *row.FarmWarehouseID,
-				FarmWarehouseName:   derefString(row.FarmWarehouseName),
-			}
-			groupMap[groupKey] = group
-		}
-		group.Rows = append(group.Rows, &reportRows[len(reportRows)-1])
-	}
-
-	groups := make([]transferGroup, 0, len(groupMap))
-	for _, group := range groupMap {
-		sort.Slice(group.Rows, func(i, j int) bool {
-			return group.Rows[i].ProductName < group.Rows[j].ProductName
-		})
-		groups = append(groups, *group)
-	}
-	sort.Slice(groups, func(i, j int) bool {
-		if groups[i].LocationName == groups[j].LocationName {
-			return groups[i].SourceWarehouseName < groups[j].SourceWarehouseName
-		}
-		return groups[i].LocationName < groups[j].LocationName
-	})
-
-	return reportRows, groups
-}
-
-func executeApply(
-	ctx context.Context,
-	svc systemTransferExecutor,
-	opts *commandOptions,
-	groups []transferGroup,
-) (applySummary, error) {
-	summary := applySummary{GroupsPlanned: len(groups)}
-	for _, group := range groups {
-		products := make([]transferSvc.SystemTransferProduct, 0, len(group.Rows))
-		for _, row := range group.Rows {
-			products = append(products, transferSvc.SystemTransferProduct{
-				ProductID:  row.ProductID,
-				ProductQty: row.Qty,
-			})
-		}
-		reason := buildCutoverReason(opts.RunID, group.LocationName, opts.CutoverDate)
-		transfer, err := svc.CreateSystemTransfer(ctx, &transferSvc.SystemTransferRequest{
-			TransferReason:         reason,
-			TransferDate:           opts.CutoverDate,
-			SourceWarehouseID:      group.SourceWarehouseID,
-			DestinationWarehouseID: group.FarmWarehouseID,
-			Products:               products,
-			ActorID:                opts.ActorID,
-			StockLogNotes:          reason,
-		})
-		if err != nil {
-			for _, row := range group.Rows {
-				row.Status = "failed"
-				row.Reason = err.Error()
-				summary.RowsFailed++
-			}
-			continue
-		}
-
-		summary.GroupsApplied++
-		for _, row := range group.Rows {
-			row.Status = "applied"
-			row.TransferID = &transfer.Id
-			row.MovementNumber = &transfer.MovementNumber
-			summary.RowsApplied++
-		}
-	}
-
-	for _, group := range groups {
-		summary.RowsPlanned += len(group.Rows)
-	}
-	return summary, nil
-}
-
-func executeRollback(
-	ctx context.Context,
-	svc systemTransferExecutor,
-	rows []rollbackDetailRow,
-	actorID uint,
-) error {
-	if actorID == 0 {
-		return fmt.Errorf("actor id is required for rollback")
-	}
-
-	byTransfer := make(map[uint64][]int)
-	for idx, row := range rows {
-		byTransfer[row.TransferID] = append(byTransfer[row.TransferID], idx)
-	}
-
-	transferIDs := make([]uint64, 0, len(byTransfer))
-	for transferID := range byTransfer {
-		transferIDs = append(transferIDs, transferID)
-	}
-	sort.Slice(transferIDs, func(i, j int) bool { return transferIDs[i] > transferIDs[j] })
-
-	var firstErr error
-	for _, transferID := range transferIDs {
-		err := svc.DeleteSystemTransfer(ctx, uint(transferID), actorID)
-		for _, idx := range byTransfer[transferID] {
-			if err != nil {
-				rows[idx].Status = "failed"
-				rows[idx].Reason = err.Error()
-			} else {
-				rows[idx].Status = "rolled_back"
-			}
-		}
-		if err != nil && firstErr == nil {
-			firstErr = err
-		}
-	}
-
-	return firstErr
-}
-
-func loadRollbackDetails(ctx context.Context, db *gorm.DB, runID string) ([]rollbackDetailRow, error) {
-	type row struct {
-		TransferID          uint64  `gorm:"column:transfer_id"`
-		MovementNumber      string  `gorm:"column:movement_number"`
-		LocationName        string  `gorm:"column:location_name"`
-		SourceWarehouseName string  `gorm:"column:source_warehouse_name"`
-		FarmWarehouseName   string  `gorm:"column:farm_warehouse_name"`
-		ProductName         string  `gorm:"column:product_name"`
-		Qty                 float64 `gorm:"column:qty"`
-	}
-
-	needle := buildRunReasonMatcher(runID)
-	var dbRows []row
-	err := db.WithContext(ctx).
-		Table("stock_transfers st").
-		Select(`
-			st.id AS transfer_id,
-			st.movement_number AS movement_number,
-			COALESCE(loc.name, '') AS location_name,
-			ws.name AS source_warehouse_name,
-			wd.name AS farm_warehouse_name,
-			p.name AS product_name,
-			COALESCE(std.total_qty, std.usage_qty, 0) AS qty
-		`).
-		Joins("JOIN warehouses ws ON ws.id = st.from_warehouse_id").
-		Joins("JOIN warehouses wd ON wd.id = st.to_warehouse_id").
-		Joins("LEFT JOIN locations loc ON loc.id = COALESCE(ws.location_id, wd.location_id)").
-		Joins("JOIN stock_transfer_details std ON std.stock_transfer_id = st.id AND std.deleted_at IS NULL").
-		Joins("JOIN products p ON p.id = std.product_id").
-		Where("st.deleted_at IS NULL").
-		Where("st.reason LIKE ?", needle).
-		Order("st.id DESC, std.id ASC").
-		Scan(&dbRows).Error
-	if err != nil {
-		return nil, err
-	}
-
-	rows := make([]rollbackDetailRow, 0, len(dbRows))
-	for _, row := range dbRows {
-		rows = append(rows, rollbackDetailRow{
-			RunID:               runID,
-			TransferID:          row.TransferID,
-			MovementNumber:      row.MovementNumber,
-			LocationName:        row.LocationName,
-			SourceWarehouseName: row.SourceWarehouseName,
-			FarmWarehouseName:   row.FarmWarehouseName,
-			ProductName:         row.ProductName,
-			Qty:                 row.Qty,
-		})
-	}
-
-	return rows, nil
-}
-
-func applyTimingLocationFilter(db *gorm.DB, opts *commandOptions) *gorm.DB {
-	if opts == nil {
-		return db
-	}
-	switch {
-	case opts.LocationID > 0:
-		return db.Where("pf.location_id = ?", opts.LocationID)
-	case opts.LocationName != "":
-		return db.Where("LOWER(l.name) = LOWER(?)", opts.LocationName)
-	default:
-		return db
-	}
-}
-
-func applyLegacyStockLocationFilter(db *gorm.DB, opts *commandOptions) *gorm.DB {
-	if opts == nil {
-		return db
-	}
-	switch {
-	case opts.LocationID > 0:
-		return db.Where("kw.location_id = ?", opts.LocationID)
-	case opts.LocationName != "":
-		return db.Where("LOWER(l.name) = LOWER(?)", opts.LocationName)
-	default:
-		return db
-	}
-}
-
-func buildCutoverReason(runID, locationName string, cutoverDate time.Time) string {
-	locationName = strings.ReplaceAll(strings.TrimSpace(locationName), "|", "/")
-	return fmt.Sprintf("%s|run_id=%s|location=%s|cutover_date=%s", cutoverReasonPrefix, runID, locationName, cutoverDate.Format("2006-01-02"))
-}
-
-func buildRunReasonMatcher(runID string) string {
-	return fmt.Sprintf("%s|run_id=%s|%%", cutoverReasonPrefix, strings.TrimSpace(runID))
-}
-
-func buildRunID() string {
-	return fmt.Sprintf("egg-cutover-%s", time.Now().UTC().Format("20060102T150405.000000000Z"))
-}
-
-func normalizeDateOnly(value time.Time) time.Time {
-	return time.Date(value.Year(), value.Month(), value.Day(), 0, 0, 0, 0, time.UTC)
-}
-
-func normalizeDatePtr(value *time.Time) *time.Time {
-	if value == nil {
-		return nil
-	}
-	normalized := normalizeDateOnly(*value)
-	return &normalized
-}
-
-func derefString(value *string) string {
-	if value == nil {
-		return ""
-	}
-	return *value
-}
-
-func summarizeApply(rows []migrationReportRow, groups []transferGroup, appliedGroups int) applySummary {
-	summary := applySummary{
-		GroupsPlanned: len(groups),
-		GroupsApplied: appliedGroups,
-	}
-	for _, row := range rows {
-		switch row.Status {
-		case "eligible":
-			summary.RowsPlanned++
-		case "applied":
-			summary.RowsPlanned++
-			summary.RowsApplied++
-		case "failed":
-			summary.RowsPlanned++
-			summary.RowsFailed++
-		case "skipped":
-			summary.RowsSkipped++
-		}
-	}
-	return summary
-}
-
-func flattenGroups(groups []transferGroup, fallback []migrationReportRow) []migrationReportRow {
-	if len(groups) == 0 {
-		return fallback
-	}
-	rows := make([]migrationReportRow, 0, len(fallback))
-	for _, group := range groups {
-		for _, row := range group.Rows {
-			rows = append(rows, *row)
-		}
-	}
-	for _, row := range fallback {
-		if row.Status == "skipped" {
-			rows = append(rows, row)
-		}
-	}
-	sort.Slice(rows, func(i, j int) bool {
-		if rows[i].LocationName == rows[j].LocationName {
-			if rows[i].SourceWarehouseName == rows[j].SourceWarehouseName {
-				return rows[i].ProductName < rows[j].ProductName
-			}
-			return rows[i].SourceWarehouseName < rows[j].SourceWarehouseName
-		}
-		return rows[i].LocationName < rows[j].LocationName
-	})
-	return rows
-}
-
-func renderMigrationReport(mode string, rows []migrationReportRow, summary applySummary) {
-	if mode == outputModeJSON {
-		payload := map[string]any{
-			"rows":    rows,
-			"summary": summary,
-		}
-		enc := json.NewEncoder(os.Stdout)
-		enc.SetIndent("", "  ")
-		_ = enc.Encode(payload)
-		return
-	}
-
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintln(w, "RUN_ID\tLOCATION\tSOURCE_WAREHOUSE\tFARM_WAREHOUSE\tPRODUCT\tQTY\tLOCATION_STATUS\tSTATUS\tREASON\tTRANSFER_ID\tMOVEMENT_NUMBER")
-	for _, row := range rows {
-		transferID := "-"
-		if row.TransferID != nil {
-			transferID = fmt.Sprintf("%d", *row.TransferID)
-		}
-		movementNumber := "-"
-		if row.MovementNumber != nil {
-			movementNumber = *row.MovementNumber
-		}
-		fmt.Fprintf(
-			w,
-			"%s\t%s\t%s\t%s\t%s\t%.3f\t%s\t%s\t%s\t%s\t%s\n",
-			row.RunID,
-			row.LocationName,
-			row.SourceWarehouseName,
-			derefString(row.FarmWarehouseName),
-			row.ProductName,
-			row.Qty,
-			row.LocationStatus,
-			row.Status,
-			row.Reason,
-			transferID,
-			movementNumber,
-		)
-	}
-	_ = w.Flush()
-	fmt.Printf("\nSummary: rows_planned=%d rows_applied=%d rows_skipped=%d rows_failed=%d groups_planned=%d groups_applied=%d\n",
-		summary.RowsPlanned, summary.RowsApplied, summary.RowsSkipped, summary.RowsFailed, summary.GroupsPlanned, summary.GroupsApplied)
-}
-
-func renderRollbackReport(mode string, rows []rollbackDetailRow) {
-	if mode == outputModeJSON {
-		enc := json.NewEncoder(os.Stdout)
-		enc.SetIndent("", "  ")
-		_ = enc.Encode(map[string]any{"rows": rows})
-		return
-	}
-
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintln(w, "RUN_ID\tTRANSFER_ID\tMOVEMENT_NUMBER\tLOCATION\tSOURCE_WAREHOUSE\tFARM_WAREHOUSE\tPRODUCT\tQTY\tSTATUS\tREASON")
-	for _, row := range rows {
-		fmt.Fprintf(
-			w,
-			"%s\t%d\t%s\t%s\t%s\t%s\t%s\t%.3f\t%s\t%s\n",
-			row.RunID,
-			row.TransferID,
-			row.MovementNumber,
-			row.LocationName,
-			row.SourceWarehouseName,
-			row.FarmWarehouseName,
-			row.ProductName,
-			row.Qty,
-			row.Status,
-			row.Reason,
-		)
-	}
-	_ = w.Flush()
-}

cmd/migrate-legacy-egg-stock-to-farm/main_test.go

@@ -1,251 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"strings"
-	"testing"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	transferSvc "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/services"
-)
-
-func TestBuildMigrationPlanSkipsOverlapAndGroupsEligibleRows(t *testing.T) {
-	opts := &commandOptions{
-		RunID:          "egg-cutover-test",
-		IncludeOverlap: false,
-	}
-	timings := map[uint]locationTiming{
-		16: {LocationID: 16, LocationName: "Jamali", Status: "CLEAN_CUTOVER"},
-		17: {LocationID: 17, LocationName: "Cijangkar", Status: "OVERLAP"},
-	}
-	farmID := uint(25)
-	farmName := "Gudang Farm Jamali"
-
-	rows := []legacyEggStockRow{
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			FarmWarehouseID:     &farmID,
-			FarmWarehouseName:   &farmName,
-			ProductWarehouseID:  101,
-			ProductID:           8,
-			ProductName:         "Telur Utuh",
-			OnHandQty:           120,
-		},
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			FarmWarehouseID:     &farmID,
-			FarmWarehouseName:   &farmName,
-			ProductWarehouseID:  102,
-			ProductID:           9,
-			ProductName:         "Telur Putih",
-			OnHandQty:           20,
-		},
-		{
-			LocationID:          17,
-			LocationName:        "Cijangkar",
-			SourceWarehouseID:   51,
-			SourceWarehouseName: "Gudang Cijangkar 1",
-			FarmWarehouseID:     &farmID,
-			FarmWarehouseName:   &farmName,
-			ProductWarehouseID:  103,
-			ProductID:           10,
-			ProductName:         "Telur Jumbo",
-			OnHandQty:           10,
-		},
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			ProductWarehouseID:  104,
-			ProductID:           11,
-			ProductName:         "Telur Papacal",
-			OnHandQty:           50,
-		},
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			FarmWarehouseID:     &farmID,
-			FarmWarehouseName:   &farmName,
-			ProductWarehouseID:  105,
-			ProductID:           12,
-			ProductName:         "Telur Retak",
-			OnHandQty:           0,
-		},
-	}
-
-	reportRows, groups := buildMigrationPlan(opts, timings, rows)
-
-	if len(reportRows) != 5 {
-		t.Fatalf("expected 5 report rows, got %d", len(reportRows))
-	}
-	if len(groups) != 1 {
-		t.Fatalf("expected 1 eligible transfer group, got %d", len(groups))
-	}
-	if len(groups[0].Rows) != 2 {
-		t.Fatalf("expected 2 eligible products in the transfer group, got %d", len(groups[0].Rows))
-	}
-
-	statusByProduct := make(map[string]string, len(reportRows))
-	reasonByProduct := make(map[string]string, len(reportRows))
-	for _, row := range reportRows {
-		statusByProduct[row.ProductName] = row.Status
-		reasonByProduct[row.ProductName] = row.Reason
-	}
-
-	if statusByProduct["Telur Utuh"] != "eligible" || statusByProduct["Telur Putih"] != "eligible" {
-		t.Fatalf("expected Jamali egg rows to stay eligible, got statuses %+v", statusByProduct)
-	}
-	if reasonByProduct["Telur Jumbo"] != "overlap_location" {
-		t.Fatalf("expected overlap location skip, got %q", reasonByProduct["Telur Jumbo"])
-	}
-	if reasonByProduct["Telur Papacal"] != "missing_farm_warehouse" {
-		t.Fatalf("expected missing farm warehouse skip, got %q", reasonByProduct["Telur Papacal"])
-	}
-	if reasonByProduct["Telur Retak"] != "non_positive_qty" {
-		t.Fatalf("expected non positive qty skip, got %q", reasonByProduct["Telur Retak"])
-	}
-}
-
-func TestExecuteApplyBuildsTaggedSystemTransfersAndSummaries(t *testing.T) {
-	opts := &commandOptions{
-		RunID:       "egg-cutover-apply",
-		CutoverDate: time.Date(2026, 4, 7, 0, 0, 0, 0, time.UTC),
-		ActorID:     99,
-	}
-	groups := []transferGroup{
-		{
-			LocationID:          16,
-			LocationName:        "Jamali",
-			SourceWarehouseID:   46,
-			SourceWarehouseName: "Gudang Jamali 1",
-			FarmWarehouseID:     25,
-			FarmWarehouseName:   "Gudang Farm Jamali",
-			Rows: []*migrationReportRow{
-				{ProductID: 8, ProductName: "Telur Utuh", Qty: 120},
-				{ProductID: 9, ProductName: "Telur Putih", Qty: 20},
-			},
-		},
-		{
-			LocationID:          18,
-			LocationName:        "Tamansari",
-			SourceWarehouseID:   91,
-			SourceWarehouseName: "Gudang Tamansari 1",
-			FarmWarehouseID:     31,
-			FarmWarehouseName:   "Gudang Farm Tamansari",
-			Rows: []*migrationReportRow{
-				{ProductID: 10, ProductName: "Telur Jumbo", Qty: 10},
-			},
-		},
-	}
-
-	executor := &fakeSystemTransferExecutor{
-		createResponses: []*entity.StockTransfer{
-			{Id: 1001, MovementNumber: "PND-LTI-1001"},
-		},
-		createErrors: []error{
-			nil,
-			errors.New("destination warehouse locked"),
-		},
-	}
-
-	summary, err := executeApply(context.Background(), executor, opts, groups)
-	if err != nil {
-		t.Fatalf("expected no fatal apply error, got %v", err)
-	}
-	if summary.GroupsPlanned != 2 || summary.GroupsApplied != 1 {
-		t.Fatalf("unexpected group summary: %+v", summary)
-	}
-	if summary.RowsApplied != 2 || summary.RowsFailed != 1 {
-		t.Fatalf("unexpected row summary: %+v", summary)
-	}
-	if len(executor.createRequests) != 2 {
-		t.Fatalf("expected 2 create requests, got %d", len(executor.createRequests))
-	}
-	if !strings.Contains(executor.createRequests[0].TransferReason, "EGG_FARM_CUTOVER|run_id=egg-cutover-apply|location=Jamali|cutover_date=2026-04-07") {
-		t.Fatalf("unexpected transfer reason: %s", executor.createRequests[0].TransferReason)
-	}
-	if executor.createRequests[0].MovementNumber != "" {
-		t.Fatalf("apply path should let transfer service generate movement number, got %q", executor.createRequests[0].MovementNumber)
-	}
-	if groups[0].Rows[0].Status != "applied" || groups[0].Rows[1].Status != "applied" {
-		t.Fatalf("expected first group rows to be applied, got %+v", groups[0].Rows)
-	}
-	if groups[1].Rows[0].Status != "failed" {
-		t.Fatalf("expected second group row to fail, got %+v", groups[1].Rows[0])
-	}
-	if groups[0].Rows[0].TransferID == nil || *groups[0].Rows[0].TransferID != 1001 {
-		t.Fatalf("expected first row to keep created transfer id, got %+v", groups[0].Rows[0].TransferID)
-	}
-}
-
-func TestExecuteRollbackDeletesTransfersDescendingAndMarksFailures(t *testing.T) {
-	executor := &fakeSystemTransferExecutor{
-		deleteErrors: map[uint]error{
-			101: errors.New("already consumed downstream"),
-		},
-	}
-	rows := []rollbackDetailRow{
-		{TransferID: 100, ProductName: "Telur Utuh"},
-		{TransferID: 101, ProductName: "Telur Jumbo"},
-		{TransferID: 100, ProductName: "Telur Putih"},
-	}
-
-	err := executeRollback(context.Background(), executor, rows, 99)
-	if err == nil {
-		t.Fatal("expected rollback to return the first transfer error")
-	}
-	if err.Error() != "already consumed downstream" {
-		t.Fatalf("unexpected rollback error: %v", err)
-	}
-	if len(executor.deletedTransferIDs) != 2 {
-		t.Fatalf("expected 2 delete calls, got %d", len(executor.deletedTransferIDs))
-	}
-	if executor.deletedTransferIDs[0] != 101 || executor.deletedTransferIDs[1] != 100 {
-		t.Fatalf("expected delete order [101 100], got %v", executor.deletedTransferIDs)
-	}
-	if rows[0].Status != "rolled_back" || rows[2].Status != "rolled_back" {
-		t.Fatalf("expected transfer 100 rows to be rolled back, got %+v", rows)
-	}
-	if rows[1].Status != "failed" {
-		t.Fatalf("expected transfer 101 row to fail, got %+v", rows[1])
-	}
-}
-
-type fakeSystemTransferExecutor struct {
-	createRequests     []*transferSvc.SystemTransferRequest
-	createResponses    []*entity.StockTransfer
-	createErrors       []error
-	deletedTransferIDs []uint
-	deleteErrors       map[uint]error
-}
-
-func (f *fakeSystemTransferExecutor) CreateSystemTransfer(ctx context.Context, req *transferSvc.SystemTransferRequest) (*entity.StockTransfer, error) {
-	f.createRequests = append(f.createRequests, req)
-	idx := len(f.createRequests) - 1
-	if idx < len(f.createErrors) && f.createErrors[idx] != nil {
-		return nil, f.createErrors[idx]
-	}
-	if idx < len(f.createResponses) && f.createResponses[idx] != nil {
-		return f.createResponses[idx], nil
-	}
-	return &entity.StockTransfer{Id: uint64(1000 + idx), MovementNumber: "PND-LTI-DEFAULT"}, nil
-}
-
-func (f *fakeSystemTransferExecutor) DeleteSystemTransfer(ctx context.Context, id uint, actorID uint) error {
-	f.deletedTransferIDs = append(f.deletedTransferIDs, id)
-	if f.deleteErrors == nil {
-		return nil
-	}
-	return f.deleteErrors[id]
-}

cmd/normalize-data-egg-mass-and-hen-house/main.go

@@ -1,380 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-	"math"
-	"os"
-	"strings"
-	"time"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	recordingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
-	"gorm.io/gorm"
-)
-
-const metricEpsilon = 1e-9
-
-type normalizeOptions struct {
-	Apply                 bool
-	RecordingID           uint
-	ProjectFlockKandangID uint
-	From                  *time.Time
-	To                    *time.Time
-	BatchSize             int
-	Limit                 int
-}
-
-type normalizeStats struct {
-	Processed int
-	Changed   int
-	Updated   int
-	Skipped   int
-	Failed    int
-}
-
-type recordingMetricRow struct {
-	ID                    uint      `gorm:"column:id"`
-	ProjectFlockKandangID uint      `gorm:"column:project_flock_kandangs_id"`
-	RecordDatetime        time.Time `gorm:"column:record_datetime"`
-	HenHouse              *float64  `gorm:"column:hen_house"`
-	EggMass               *float64  `gorm:"column:egg_mass"`
-}
-
-func main() {
-	var (
-		apply                 bool
-		recordingID           uint
-		projectFlockKandangID uint
-		fromRaw               string
-		toRaw                 string
-		batchSize             int
-		limit                 int
-	)
-
-	flag.BoolVar(&apply, "apply", false, "Apply update. If false, run as dry-run")
-	flag.UintVar(&recordingID, "recording-id", 0, "Target a single recording ID")
-	flag.UintVar(&projectFlockKandangID, "project-flock-kandang-id", 0, "Filter by project_flock_kandangs_id")
-	flag.StringVar(&fromRaw, "from", "", "Lower bound record_datetime (RFC3339 / YYYY-MM-DD)")
-	flag.StringVar(&toRaw, "to", "", "Upper bound record_datetime (RFC3339 / YYYY-MM-DD)")
-	flag.IntVar(&batchSize, "batch-size", 200, "Batch size when scanning recordings")
-	flag.IntVar(&limit, "limit", 0, "Max recordings to process (0 = no limit)")
-	flag.Parse()
-
-	if batchSize <= 0 {
-		log.Fatal("--batch-size must be > 0")
-	}
-	if limit < 0 {
-		log.Fatal("--limit cannot be negative")
-	}
-
-	from, err := parseTimeBound(strings.TrimSpace(fromRaw), false)
-	if err != nil {
-		log.Fatalf("invalid --from: %v", err)
-	}
-	to, err := parseTimeBound(strings.TrimSpace(toRaw), true)
-	if err != nil {
-		log.Fatalf("invalid --to: %v", err)
-	}
-	if from != nil && to != nil && to.Before(*from) {
-		log.Fatal("--to cannot be before --from")
-	}
-
-	opts := normalizeOptions{
-		Apply:                 apply,
-		RecordingID:           recordingID,
-		ProjectFlockKandangID: projectFlockKandangID,
-		From:                  from,
-		To:                    to,
-		BatchSize:             batchSize,
-		Limit:                 limit,
-	}
-
-	ctx := context.Background()
-	db := database.Connect(config.DBHost, config.DBName)
-	repo := recordingRepo.NewRecordingRepository(db)
-
-	fmt.Printf("Mode: %s\n", modeLabel(opts.Apply))
-	fmt.Printf("Filter recording_id: %s\n", displayUint(opts.RecordingID))
-	fmt.Printf("Filter project_flock_kandangs_id: %s\n", displayUint(opts.ProjectFlockKandangID))
-	fmt.Printf("Filter from: %s\n", displayTime(opts.From))
-	fmt.Printf("Filter to: %s\n", displayTime(opts.To))
-	fmt.Printf("Batch size: %d\n", opts.BatchSize)
-	fmt.Printf("Limit: %d\n\n", opts.Limit)
-
-	stats, err := normalizeRecordings(ctx, db, repo, opts)
-	if err != nil {
-		log.Fatalf("normalize failed: %v", err)
-	}
-
-	fmt.Println()
-	fmt.Printf(
-		"Summary: processed=%d changed=%d updated=%d skipped=%d failed=%d\n",
-		stats.Processed,
-		stats.Changed,
-		stats.Updated,
-		stats.Skipped,
-		stats.Failed,
-	)
-
-	if stats.Failed > 0 {
-		os.Exit(1)
-	}
-}
-
-func normalizeRecordings(
-	ctx context.Context,
-	db *gorm.DB,
-	repo recordingRepo.RecordingRepository,
-	opts normalizeOptions,
-) (normalizeStats, error) {
-	stats := normalizeStats{}
-	lastID := uint(0)
-	initialChickCache := make(map[uint]float64)
-
-	for {
-		batchLimit := opts.BatchSize
-		if opts.Limit > 0 {
-			remaining := opts.Limit - stats.Processed
-			if remaining <= 0 {
-				break
-			}
-			if remaining < batchLimit {
-				batchLimit = remaining
-			}
-		}
-
-		rows, err := loadRecordingBatch(ctx, db, opts, lastID, batchLimit)
-		if err != nil {
-			return stats, err
-		}
-		if len(rows) == 0 {
-			break
-		}
-
-		for _, row := range rows {
-			stats.Processed++
-			lastID = row.ID
-
-			initialChick, ok := initialChickCache[row.ProjectFlockKandangID]
-			if !ok {
-				initialChick, err = repo.GetTotalChickinByProjectFlockKandang(db.WithContext(ctx), row.ProjectFlockKandangID)
-				if err != nil {
-					fmt.Printf("FAIL rec=%d error=getTotalChickinByProjectFlockKandang: %v\n", row.ID, err)
-					stats.Failed++
-					continue
-				}
-				initialChickCache[row.ProjectFlockKandangID] = initialChick
-			}
-
-			_, totalEggWeightGrams, err := repo.GetEggSummaryByRecording(db.WithContext(ctx), row.ID)
-			if err != nil {
-				fmt.Printf("FAIL rec=%d error=getEggSummaryByRecording: %v\n", row.ID, err)
-				stats.Failed++
-				continue
-			}
-
-			cumulativeEggQty, err := repo.GetCumulativeEggQtyByProjectFlockKandang(db.WithContext(ctx), row.ProjectFlockKandangID, row.RecordDatetime)
-			if err != nil {
-				fmt.Printf("FAIL rec=%d error=getCumulativeEggQtyByProjectFlockKandang: %v\n", row.ID, err)
-				stats.Failed++
-				continue
-			}
-
-			newHenHouse, newEggMass := computeNormalizedMetrics(initialChick, cumulativeEggQty, totalEggWeightGrams)
-			henHouseChanged := metricChanged(row.HenHouse, newHenHouse)
-			eggMassChanged := metricChanged(row.EggMass, newEggMass)
-
-			if !henHouseChanged && !eggMassChanged {
-				stats.Skipped++
-				continue
-			}
-
-			stats.Changed++
-			fmt.Printf(
-				"PLAN rec=%d pfk=%d at=%s hen_house:%s->%s egg_mass:%s->%s\n",
-				row.ID,
-				row.ProjectFlockKandangID,
-				row.RecordDatetime.UTC().Format(time.RFC3339),
-				displayFloat(row.HenHouse),
-				displayFloat(newHenHouse),
-				displayFloat(row.EggMass),
-				displayFloat(newEggMass),
-			)
-
-			if !opts.Apply {
-				continue
-			}
-
-			if err := updateRecordingMetrics(ctx, db, row.ID, newHenHouse, newEggMass); err != nil {
-				fmt.Printf("FAIL rec=%d error=updateRecordingMetrics: %v\n", row.ID, err)
-				stats.Failed++
-				continue
-			}
-
-			fmt.Printf(
-				"DONE rec=%d hen_house=%s egg_mass=%s\n",
-				row.ID,
-				displayFloat(newHenHouse),
-				displayFloat(newEggMass),
-			)
-			stats.Updated++
-		}
-
-		if opts.RecordingID > 0 {
-			break
-		}
-	}
-
-	return stats, nil
-}
-
-func loadRecordingBatch(
-	ctx context.Context,
-	db *gorm.DB,
-	opts normalizeOptions,
-	lastID uint,
-	limit int,
-) ([]recordingMetricRow, error) {
-	query := db.WithContext(ctx).
-		Table("recordings").
-		Select("id, project_flock_kandangs_id, record_datetime, hen_house, egg_mass").
-		Where("recordings.deleted_at IS NULL")
-
-	if opts.RecordingID > 0 {
-		query = query.Where("recordings.id = ?", opts.RecordingID)
-	}
-	if opts.ProjectFlockKandangID > 0 {
-		query = query.Where("recordings.project_flock_kandangs_id = ?", opts.ProjectFlockKandangID)
-	}
-	if opts.From != nil {
-		query = query.Where("recordings.record_datetime >= ?", *opts.From)
-	}
-	if opts.To != nil {
-		query = query.Where("recordings.record_datetime <= ?", *opts.To)
-	}
-	if opts.RecordingID == 0 && lastID > 0 {
-		query = query.Where("recordings.id > ?", lastID)
-	}
-
-	var rows []recordingMetricRow
-	err := query.
-		Order("recordings.id ASC").
-		Limit(limit).
-		Scan(&rows).Error
-	return rows, err
-}
-
-func computeNormalizedMetrics(initialChick, cumulativeEggQty, totalEggWeightGrams float64) (*float64, *float64) {
-	var henHouse *float64
-	if initialChick > 0 && cumulativeEggQty >= 0 {
-		value := cumulativeEggQty / initialChick
-		henHouse = &value
-	}
-
-	var eggMass *float64
-	if initialChick > 0 && totalEggWeightGrams > 0 {
-		value := totalEggWeightGrams / initialChick
-		eggMass = &value
-	}
-
-	return henHouse, eggMass
-}
-
-func updateRecordingMetrics(ctx context.Context, db *gorm.DB, recordingID uint, henHouse, eggMass *float64) error {
-	updates := map[string]any{}
-	if henHouse == nil {
-		updates["hen_house"] = gorm.Expr("NULL")
-	} else {
-		updates["hen_house"] = *henHouse
-	}
-	if eggMass == nil {
-		updates["egg_mass"] = gorm.Expr("NULL")
-	} else {
-		updates["egg_mass"] = *eggMass
-	}
-
-	return db.WithContext(ctx).
-		Table("recordings").
-		Where("id = ?", recordingID).
-		Updates(updates).Error
-}
-
-func metricChanged(oldValue, newValue *float64) bool {
-	if oldValue == nil && newValue == nil {
-		return false
-	}
-	if oldValue == nil || newValue == nil {
-		return true
-	}
-	return !nearlyEqual(*oldValue, *newValue)
-}
-
-func nearlyEqual(a, b float64) bool {
-	scale := math.Max(1, math.Max(math.Abs(a), math.Abs(b)))
-	return math.Abs(a-b) <= metricEpsilon*scale
-}
-
-func parseTimeBound(raw string, isUpper bool) (*time.Time, error) {
-	if raw == "" {
-		return nil, nil
-	}
-
-	layouts := []string{
-		time.RFC3339Nano,
-		time.RFC3339,
-		"2006-01-02 15:04:05",
-		"2006-01-02",
-	}
-
-	for _, layout := range layouts {
-		parsed, err := time.Parse(layout, raw)
-		if err != nil {
-			continue
-		}
-		if layout == "2006-01-02" {
-			if isUpper {
-				endOfDay := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 23, 59, 59, int(time.Second-time.Nanosecond), time.UTC)
-				return &endOfDay, nil
-			}
-			startOfDay := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 0, 0, 0, 0, time.UTC)
-			return &startOfDay, nil
-		}
-
-		t := parsed.UTC()
-		return &t, nil
-	}
-
-	return nil, fmt.Errorf("unsupported format %q", raw)
-}
-
-func modeLabel(apply bool) string {
-	if apply {
-		return "APPLY"
-	}
-	return "DRY-RUN"
-}
-
-func displayFloat(v *float64) string {
-	if v == nil {
-		return "NULL"
-	}
-	return fmt.Sprintf("%.6f", *v)
-}
-
-func displayTime(v *time.Time) string {
-	if v == nil {
-		return "<nil>"
-	}
-	return v.UTC().Format(time.RFC3339)
-}
-
-func displayUint(v uint) string {
-	if v == 0 {
-		return "<all>"
-	}
-	return fmt.Sprintf("%d", v)
-}

cmd/reflow-quantity-product-warehouse-from-stock-allocation/main.go

@@ -1,282 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"log"
-	"math"
-	"os"
-	"strings"
-
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
-	"gitlab.com/mbugroup/lti-api.git/internal/database"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-const qtyEpsilon = 1e-6
-
-const (
-	levelAll                = 1
-	levelByProductName      = 2
-	levelByProductWarehouse = 3
-)
-
-type reflowRow struct {
-	ProductWarehouseID uint    `gorm:"column:product_warehouse_id"`
-	ProductID          uint    `gorm:"column:product_id"`
-	ProductName        string  `gorm:"column:product_name"`
-	CurrentQty         float64 `gorm:"column:current_qty"`
-	SumTotalQty        float64 `gorm:"column:sum_total_qty"`
-	SumAllocatedQty    float64 `gorm:"column:sum_allocated_qty"`
-	ComputedQty        float64 `gorm:"column:computed_qty"`
-}
-
-func main() {
-	var (
-		apply              bool
-		level              int
-		productName        string
-		productWarehouseID uint
-	)
-
-	flag.BoolVar(&apply, "apply", false, "Apply changes. If false, run as dry-run")
-	flag.IntVar(&level, "level", levelAll, "CLI level: 1=all product_warehouse scope, 2=product name scope, 3=product_warehouse_id scope")
-	flag.StringVar(&productName, "product-name", "", "Product name (required for level 2)")
-	flag.UintVar(&productWarehouseID, "product-warehouse-id", 0, "Product warehouse id (required for level 3)")
-	flag.Parse()
-
-	productName = strings.TrimSpace(productName)
-	if err := validateFlags(level, productName, productWarehouseID); err != nil {
-		log.Fatalf("invalid flags: %v", err)
-	}
-
-	ctx := context.Background()
-	db := database.Connect(config.DBHost, config.DBName)
-
-	rows, err := loadReflowRows(ctx, db, level, productName, productWarehouseID)
-	if err != nil {
-		log.Fatalf("failed to calculate reflow qty: %v", err)
-	}
-
-	fmt.Printf("Mode: %s\n", modeLabel(apply))
-	fmt.Printf("Level: %d (%s)\n", level, levelLabel(level))
-	if productName != "" {
-		fmt.Printf("Filter product_name: %s\n", productName)
-	}
-	if productWarehouseID > 0 {
-		fmt.Printf("Filter product_warehouse_id: %d\n", productWarehouseID)
-	}
-	fmt.Printf("Targets found: %d\n\n", len(rows))
-
-	if len(rows) == 0 {
-		fmt.Println("No product warehouse found from purchase_items scope")
-		return
-	}
-
-	negativePlan := 0
-	for _, row := range rows {
-		if row.ComputedQty < 0 {
-			negativePlan++
-		}
-
-		fmt.Printf(
-			"PLAN pw=%d product_id=%d product=%q current_qty=%.3f total_qty=%.3f allocated_qty=%.3f computed_qty=%.3f delta=%.3f\n",
-			row.ProductWarehouseID,
-			row.ProductID,
-			row.ProductName,
-			row.CurrentQty,
-			row.SumTotalQty,
-			row.SumAllocatedQty,
-			row.ComputedQty,
-			row.ComputedQty-row.CurrentQty,
-		)
-	}
-
-	if !apply {
-		fmt.Println()
-		fmt.Printf("Summary: planned=%d updated=0 skipped=0 failed=0 negative_plan=%d\n", len(rows), negativePlan)
-		return
-	}
-
-	updated := 0
-	skipped := 0
-	negativeUpdated := 0
-
-	err = db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		for _, row := range rows {
-			if nearlyEqual(row.CurrentQty, row.ComputedQty) {
-				fmt.Printf(
-					"SKIP pw=%d reason=no_change current_qty=%.3f computed_qty=%.3f\n",
-					row.ProductWarehouseID,
-					row.CurrentQty,
-					row.ComputedQty,
-				)
-				skipped++
-				continue
-			}
-
-			if err := tx.Table("product_warehouses").
-				Where("id = ?", row.ProductWarehouseID).
-				Update("qty", row.ComputedQty).Error; err != nil {
-				return fmt.Errorf("update qty for product_warehouse_id=%d: %w", row.ProductWarehouseID, err)
-			}
-
-			if row.ComputedQty < 0 {
-				negativeUpdated++
-			}
-
-			fmt.Printf(
-				"DONE pw=%d product_id=%d product=%q old_qty=%.3f new_qty=%.3f\n",
-				row.ProductWarehouseID,
-				row.ProductID,
-				row.ProductName,
-				row.CurrentQty,
-				row.ComputedQty,
-			)
-			updated++
-		}
-
-		return nil
-	})
-	if err != nil {
-		fmt.Println()
-		fmt.Printf(
-			"Summary: planned=%d updated=%d skipped=%d failed=1 negative_plan=%d negative_updated=%d\n",
-			len(rows),
-			updated,
-			skipped,
-			negativePlan,
-			negativeUpdated,
-		)
-		log.Printf("error: %v", err)
-		os.Exit(1)
-	}
-
-	fmt.Println()
-	fmt.Printf(
-		"Summary: planned=%d updated=%d skipped=%d failed=0 negative_plan=%d negative_updated=%d\n",
-		len(rows),
-		updated,
-		skipped,
-		negativePlan,
-		negativeUpdated,
-	)
-}
-
-func validateFlags(level int, productName string, productWarehouseID uint) error {
-	switch level {
-	case levelAll:
-		if productName != "" {
-			return errors.New("--product-name cannot be used on level 1")
-		}
-		if productWarehouseID > 0 {
-			return errors.New("--product-warehouse-id cannot be used on level 1")
-		}
-	case levelByProductName:
-		if productName == "" {
-			return errors.New("--product-name is required on level 2")
-		}
-		if productWarehouseID > 0 {
-			return errors.New("--product-warehouse-id cannot be used on level 2")
-		}
-	case levelByProductWarehouse:
-		if productWarehouseID == 0 {
-			return errors.New("--product-warehouse-id is required on level 3")
-		}
-		if productName != "" {
-			return errors.New("--product-name cannot be used on level 3")
-		}
-	default:
-		return fmt.Errorf("unsupported --level=%d (allowed: 1, 2, 3)", level)
-	}
-
-	return nil
-}
-
-func loadReflowRows(
-	ctx context.Context,
-	db *gorm.DB,
-	level int,
-	productName string,
-	productWarehouseID uint,
-) ([]reflowRow, error) {
-	allocSub := db.WithContext(ctx).
-		Table("stock_allocations sa").
-		Select(`
-			sa.stockable_id,
-			COALESCE(SUM(sa.qty), 0) AS used_qty
-		`).
-		Where("sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.deleted_at IS NULL").
-		Group("sa.stockable_id")
-
-	calcSub := db.WithContext(ctx).
-		Table("purchase_items pi").
-		Select(`
-			pi.product_warehouse_id,
-			COALESCE(SUM(pi.total_qty), 0) AS sum_total_qty,
-			COALESCE(SUM(COALESCE(alloc.used_qty, 0)), 0) AS sum_allocated_qty,
-			COALESCE(SUM(COALESCE(pi.total_qty, 0) - COALESCE(alloc.used_qty, 0)), 0) AS computed_qty
-		`).
-		Joins("LEFT JOIN (?) alloc ON alloc.stockable_id = pi.id", allocSub).
-		Where("pi.product_warehouse_id IS NOT NULL").
-		Group("pi.product_warehouse_id")
-
-	query := db.WithContext(ctx).
-		Table("product_warehouses pw").
-		Select(`
-			pw.id AS product_warehouse_id,
-			pw.product_id AS product_id,
-			p.name AS product_name,
-			COALESCE(pw.qty, 0) AS current_qty,
-			calc.sum_total_qty,
-			calc.sum_allocated_qty,
-			calc.computed_qty
-		`).
-		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("JOIN (?) calc ON calc.product_warehouse_id = pw.id", calcSub).
-		Order("pw.id ASC")
-
-	switch level {
-	case levelByProductName:
-		query = query.Where("LOWER(p.name) = LOWER(?)", productName)
-	case levelByProductWarehouse:
-		query = query.Where("pw.id = ?", productWarehouseID)
-	}
-
-	rows := make([]reflowRow, 0)
-	if err := query.Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func modeLabel(apply bool) string {
-	if apply {
-		return "APPLY"
-	}
-	return "DRY-RUN"
-}
-
-func levelLabel(level int) string {
-	switch level {
-	case levelAll:
-		return "all product_warehouse from purchase_items"
-	case levelByProductName:
-		return "specific product name"
-	case levelByProductWarehouse:
-		return "specific product_warehouse_id"
-	default:
-		return "unknown"
-	}
-}
-
-func nearlyEqual(a, b float64) bool {
-	return math.Abs(a-b) <= qtyEpsilon
-}

docs/farm_stock_attribution_design.md

@@ -1,31 +0,0 @@
-# Farm Stock Attribution Design Note
-
-## Goal
-
-Allow farm-level physical stock to be used directly by kandang-level operations without forcing transfers, while keeping kandang attribution, FIFO-v2 compatibility, traceability, and HPP/COGS intact.
-
-## Core Model
-
-- Physical stock stays on the real `product_warehouse_id` that was consumed or received.
-- Kandang attribution comes from the transaction or allocation path, not from `product_warehouses.project_flock_kandang_id`.
-- Existing kandang-bound warehouses remain valid for historical and current kandang-only flows.
-- Shared farm warehouses must stay shareable; application code must stop silently converting them into kandang-owned warehouses.
-
-## Attribution Rules
-
-- `recording_stocks`: consumer kandang is the parent `recordings.project_flock_kandangs_id`; physical stock source remains `recording_stocks.product_warehouse_id`.
-- `recording_depletions`: source kandang is the recording kandang and is stored explicitly for compatibility; physical source remains `source_product_warehouse_id`, destination stock remains `product_warehouse_id`.
-- `recording_eggs`: producer kandang is the recording kandang and is stored explicitly for compatibility; physical stock remains `product_warehouse_id`, which may be a farm warehouse.
-- `marketing_delivery_products`: outbound kandang attribution comes from active `stock_allocations` to `PROJECT_FLOCK_POPULATION`, `RECORDING_DEPLETION`, or `RECORDING_EGG`, with product-warehouse kandang ownership only as a fallback for historical/non-FIFO rows.
-
-## Reporting and HPP
-
-- Feed and OVK cost attribution should continue to follow recording-level consumption plus FIFO allocations to incoming stock.
-- Egg and live-bird sales attribution should be derived from `stock_allocations` back to the originating kandang transactions or populations.
-- Queries that filter or group by kandang must use explicit transaction attribution or FIFO allocation provenance, not warehouse ownership, when pooled farm stock is involved.
-
-## Live-Data Safety
-
-- Schema changes are additive and nullable.
-- Historical rows are backfilled only when attribution is deterministic from existing rows.
-- No FIFO-v2 route-rule behavior is changed unless the current code is only resyncing or constraining allocation metadata around already-created FIFO allocations.

docs/legacy_egg_farm_cutover_runbook.md

@@ -1,286 +0,0 @@
-# Runbook Cutover Stok Telur Historis Kandang ke Gudang Farm
-
-## Tujuan
-
-Runbook ini dipakai untuk memindahkan **stok telur historis yang masih on-hand di gudang kandang** ke **gudang farm** secara aman, audit-able, dan reversible.
-
-Cutover dilakukan dengan **transfer stok eksplisit**, bukan dengan mengubah `recording_eggs.product_warehouse_id` historis.
-
-## Scope
-
-Runbook ini hanya untuk:
-- stok telur historis kandang-level yang masih punya saldo on-hand
-- lokasi yang masuk kategori **clean cutover**
-- lokasi yang sudah punya gudang farm
-
-Runbook ini **tidak** dipakai untuk:
-- lokasi overlap seperti `Cijangkar`
-- koreksi histori `recording_eggs`
-- migrasi stok non-telur
-
-## Kebijakan yang Dikunci
-
-- Sumber qty yang dipindah adalah **`product_warehouses.qty` saat cutover**
-- Perintah dijalankan **per lokasi**
-- Wajib mulai dari `dry-run`
-- `--apply` hanya boleh dijalankan setelah review dry-run dan SQL checklist
-- Lokasi overlap tidak ikut otomatis kecuali ada approval khusus dan `--include-overlap`
-- Rollback hanya boleh dilakukan jika transfer hasil cutover belum dipakai transaksi turunan
-
-## Lokasi Fase 1
-
-Lokasi yang boleh dieksekusi pada fase pertama:
-- `Jamali`
-- `Cantilan`
-- `Darawati`
-- `Tamansari`
-
-Lokasi yang harus ditahan:
-- `Cijangkar`
-
-## Prasyarat
-
-Sebelum eksekusi, pastikan:
-- backend sudah ter-deploy dengan command [main.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/cmd/migrate-legacy-egg-stock-to-farm/main.go)
-- reusable transfer core sudah ikut ter-deploy:
-  - [transfer.service.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/internal/modules/inventory/transfers/services/transfer.service.go)
-  - [system_transfer.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/internal/modules/inventory/transfers/services/system_transfer.go)
-- migrasi farm stock attribution sebelumnya sudah terpasang
-- akses database target sudah tersedia
-- environment target memakai SSL bila RDS mewajibkan, contoh:
-  - `DB_SSLMODE=require`
-
-## Catatan Output Command
-
-Mode `--output table` adalah mode operasional yang direkomendasikan.
-
-Mode `--output json` bisa dipakai, tetapi pada environment saat ini output JSON masih dapat didahului log bootstrap aplikasi atau SQL logger. Untuk review manual gunakan `table`. Untuk parsing otomatis, filter payload mulai dari `{`.
-
-## Format Command
-
-### Dry-run
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --location-name Jamali \
-  --output table
-```
-
-### Apply
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --location-name Jamali \
-  --cutover-date 2026-04-07 \
-  --apply \
-  --output table
-```
-
-### Rollback Preview
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --rollback-run-id <run_id> \
-  --output table
-```
-
-### Rollback Apply
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --rollback-run-id <run_id> \
-  --apply \
-  --output table
-```
-
-## Arti `run_id`
-
-Setiap dry-run/apply menghasilkan `run_id`, misalnya:
-
-```text
-egg-cutover-20260407T130344.220407000Z
-```
-
-`run_id` ini wajib disimpan karena dipakai untuk:
-- audit hasil cutover
-- query verifikasi
-- rollback
-
-## Prosedur Eksekusi Per Lokasi
-
-### 1. Persiapan
-
-Tentukan:
-- `location_name`
-- `cutover_date`
-- operator yang bertanggung jawab
-
-Contoh:
-- lokasi: `Jamali`
-- cutover date: `2026-04-07`
-
-### 2. Jalankan Dry-run
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --location-name Jamali \
-  --output table
-```
-
-Yang harus dicek pada hasil dry-run:
-- status lokasi `CLEAN_CUTOVER`
-- semua baris yang akan dipindah punya `status=eligible`
-- gudang tujuan adalah gudang farm lokasi tersebut
-- qty yang dipindah masuk akal dan sesuai saldo on-hand aktual
-- tidak ada `missing_farm_warehouse`
-- tidak ada `overlap_location`
-
-### 3. Jalankan Checklist SQL Before
-
-Gunakan file:
-- [legacy_egg_cutover_verification_checklist.sql](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/docs/sql/legacy_egg_cutover_verification_checklist.sql)
-
-Minimal pastikan:
-- lokasi memang clean cutover
-- stok telur kandang positif masih ada
-- gudang farm ada
-- belum ada transfer `EGG_FARM_CUTOVER` aktif untuk lokasi yang sama pada run yang akan dipakai
-
-### 4. Simpan Evidence Sebelum Apply
-
-Simpan:
-- output dry-run
-- hasil query before
-- nama operator
-- waktu eksekusi
-
-Disarankan simpan dalam ticket / change record.
-
-### 5. Jalankan Apply
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --location-name Jamali \
-  --cutover-date 2026-04-07 \
-  --apply \
-  --output table
-```
-
-Setelah apply, simpan:
-- `run_id`
-- seluruh row dengan `transfer_id`
-- movement number yang terbentuk
-
-### 6. Jalankan Checklist SQL After
-
-Masih menggunakan file:
-- [legacy_egg_cutover_verification_checklist.sql](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/docs/sql/legacy_egg_cutover_verification_checklist.sql)
-
-Minimal pastikan:
-- transfer header/detail tercatat untuk `run_id`
-- qty source berkurang sesuai transfer
-- qty farm bertambah sesuai transfer
-- total gabungan source+dest per produk per lokasi tetap sama
-- stok eligible tidak lagi tersedia di gudang kandang
-- stok telur sekarang tersedia di gudang farm
-
-### 7. Smoke Test UI
-
-Lakukan minimal:
-- buka product stock farm untuk lokasi tersebut
-- pastikan produk telur hasil migrasi muncul
-- buat SO farm-level dan pastikan opsi produk telur tersedia
-- pastikan recording telur baru setelah cutover tetap langsung masuk ke gudang farm
-
-### 8. Tutup Eksekusi
-
-Catat hasil akhir:
-- sukses/gagal
-- `run_id`
-- lokasi
-- tanggal cutover
-- operator
-- link ke evidence SQL/UI
-
-## Kriteria Go / No-Go
-
-### Boleh lanjut apply bila:
-
-- dry-run menunjukkan hanya row yang memang expected
-- lokasi `CLEAN_CUTOVER`
-- gudang farm valid
-- query before menunjukkan tidak ada anomaly blocking
-
-### Wajib stop bila:
-
-- lokasi terdeteksi `OVERLAP`
-- ada qty aneh atau tidak sesuai data lapangan
-- gudang farm tidak ada
-- ada transfer lama serupa yang belum direkonsiliasi
-- setelah apply terjadi selisih total source+dest
-
-## Rollback Runbook
-
-### Kapan rollback boleh dilakukan
-
-Rollback boleh jika:
-- transfer hasil cutover belum dipakai transaksi turunan
-- verifikasi after menunjukkan issue yang membuat hasil cutover tidak dapat diterima
-
-### Langkah rollback
-
-1. Preview rollback:
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --rollback-run-id <run_id> \
-  --output table
-```
-
-2. Jalankan query rollback readiness pada file audit/helper SQL.
-3. Jika aman, apply rollback:
-
-```bash
-DB_SSLMODE=require go run ./cmd/migrate-legacy-egg-stock-to-farm \
-  --rollback-run-id <run_id> \
-  --apply \
-  --output table
-```
-
-4. Jalankan ulang query verifikasi after rollback.
-
-### Kapan rollback akan gagal by design
-
-Rollback memang harus gagal jika:
-- transfer hasil cutover sudah dipakai sales/recording/transaksi turunan
-- sudah ada `stock_allocations` consume aktif terhadap `STOCK_TRANSFER_IN`
-
-## Urutan Rollout yang Direkomendasikan
-
-### Dev
-
-1. Dry-run per lokasi
-2. Review SQL before
-3. Apply per lokasi
-4. SQL after
-5. Smoke UI
-6. Simpan `run_id`
-
-### Production
-
-1. Freeze operasional lokasi target bila perlu
-2. Dry-run
-3. Review by dev + ops + finance/stock owner
-4. Apply
-5. SQL after
-6. Smoke UI
-7. Release lokasi berikutnya
-
-## Referensi
-
-- Command cutover: [main.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/cmd/migrate-legacy-egg-stock-to-farm/main.go)
-- Test command: [main_test.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/cmd/migrate-legacy-egg-stock-to-farm/main_test.go)
-- Core reusable transfer: [system_transfer.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/internal/modules/inventory/transfers/services/system_transfer.go)
-- Transfer service refactor: [transfer.service.go](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/internal/modules/inventory/transfers/services/transfer.service.go)
-- Checklist SQL: [legacy_egg_cutover_verification_checklist.sql](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/docs/sql/legacy_egg_cutover_verification_checklist.sql)
-- Helper query audit: [legacy_egg_cutover_audit_queries.sql](/Users/macbookair/Documents/coding/projects/LTI-ERP/lti-api/docs/sql/legacy_egg_cutover_audit_queries.sql)

docs/postman/read-api.environment.json

@@ -1,174 +0,0 @@
-{
-  "_postman_exported_at": "2026-04-14T00:00:00Z",
-  "_postman_exported_using": "Codex",
-  "_postman_variable_scope": "environment",
-  "id": "lti-read-api-local",
-  "name": "LTI ERP Read API.local",
-  "values": [
-    {
-      "enabled": true,
-      "key": "adjustment_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "api_key",
-      "value": ""
-    },
-    {
-      "enabled": true,
-      "key": "area_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "bank_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "base_url",
-      "value": "http://localhost:8081"
-    },
-    {
-      "enabled": true,
-      "key": "bearer_token",
-      "value": ""
-    },
-    {
-      "enabled": true,
-      "key": "chickin_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "customer_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "employee_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "expense_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "flock_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "idDailyChecklist",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "idProjectFlockKandang",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "initial_balance_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "injection_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "location_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "nonstock_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "payment_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "product_category_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "product_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "projectFlockId",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "project_flock_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "project_flock_kandang_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "purchase_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "recording_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "supplier_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "transaction_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "transfer_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "uniformity_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "uom_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "user_id",
-      "value": "1"
-    },
-    {
-      "enabled": true,
-      "key": "warehouse_id",
-      "value": "1"
-    }
-  ]
-}

docs/qa_farm_stock_test_cases.csv

@@ -1,45 +0,0 @@
-ID;Kategori;Area;Judul;Tipe;Prioritas;Setup/Precondition;Langkah Uji;Hasil yang Diharapkan
-TC-A01;Migrasi dan Keamanan Data;Database;Migrasi aman pada DB tidak kosong;Integration;High;Gunakan snapshot DB staging yang sudah berisi recording, depletion, telur, penjualan, dan closing.;1. Jalankan migrasi 20260330110000_add_recording_attribution_fields_for_farm_stock.up.sql. 2. Inspect schema hasil migrasi.;Kolom recording_depletions.source_project_flock_kandang_id dan recording_eggs.project_flock_kandang_id tersedia dan nullable, index dan FK tersedia, tidak ada data historis yang terhapus atau berubah destruktif.
-TC-A02;Migrasi dan Keamanan Data;Database;Backfill deterministik berjalan;Integration;High;Ada data historis recording dengan recordings.project_flock_kandangs_id yang valid.;1. Query recording_depletions dan recording_eggs yang lama. 2. Bandingkan dengan kandang pada parent recording.;source_project_flock_kandang_id dan project_flock_kandang_id terisi sama dengan kandang parent recording untuk row yang sebelumnya null.
-TC-A03;Migrasi dan Keamanan Data;Reporting;Report historis kandang-only tidak berubah;Regression;High;Gunakan snapshot yang hanya memiliki data stok historis milik kandang, tanpa pooled stock farm-level.;1. Jalankan closing/report/HPP sebelum deploy. 2. Jalankan lagi sesudah deploy pada snapshot yang sama. 3. Bandingkan hasil.;Total dan hasil report tetap sama untuk skenario historis kandang-only.
-TC-B01;Purchase dan Warehouse;Purchase;Purchase pakan langsung ke gudang farm;UAT;High;Tersedia PO atau purchase request untuk produk Pakan Starter.;1. Buat purchase ke Gudang Farm A. 2. Approve dan receive purchase.;Stok masuk ke product_warehouse level farm, tidak perlu transfer paksa ke kandang, FIFO/HPP purchase tetap benar.
-TC-B02;Purchase dan Warehouse;Purchase;Purchase pakan langsung ke gudang kandang;Regression;High;Tersedia PO atau purchase request untuk produk Pakan Starter.;1. Buat purchase ke Gudang Kandang A1. 2. Approve dan receive purchase.;Stok masuk ke gudang kandang dan perilaku tetap sama seperti flow lama.
-TC-B03;Purchase dan Warehouse;Purchase;Purchase OVK langsung ke gudang farm;UAT;High;Tersedia PO atau purchase request untuk produk OVK A.;1. Buat purchase ke Gudang Farm A. 2. Approve dan receive purchase.;Stok OVK masuk ke gudang farm dan bisa dipakai kemudian pada recording.
-TC-B04;Purchase dan Warehouse;Product Warehouse;Gudang farm shared tidak diubah diam-diam menjadi milik kandang;Regression;High;Sudah ada row product_warehouse level farm untuk Pakan Starter di Gudang Farm A.;1. Trigger flow yang memanggil ensure/find product warehouse untuk produk yang sama. 2. Inspect row existing.;Row farm-level tetap farm-level, project_flock_kandang_id tidak dibackfill diam-diam, row khusus kandang dibuat terpisah bila memang diperlukan.
-TC-C01;Recording Stock Consumption;Recording;Recording kandang memakai pakan dari gudang kandang;Regression;High;Stok pakan tersedia di Gudang Kandang A1.;1. Buka recording untuk Kandang A1. 2. Pilih pakan dari gudang kandang. 3. Submit dan approve.;Recording berhasil, stok keluar dari product_warehouse kandang, atribusi kandang tetap A1, HPP pemakaian muncul di closing/HPP A1.
-TC-C02;Recording Stock Consumption;Recording;Recording kandang memakai pakan dari gudang farm;UAT;High;Stok pakan hanya tersedia di Gudang Farm A.;1. Buka recording untuk Kandang A1. 2. Pilih stok pakan farm-level. 3. Submit dan approve.;Recording berhasil tanpa transfer ke kandang, stok fisik berkurang dari gudang farm, usage/HPP tetap teratribusi ke Kandang A1, closing farm dan kandang tetap bisa dihitung.
-TC-C03;Recording Stock Consumption;Recording;Recording kandang memakai OVK dari gudang farm;UAT;High;Stok OVK hanya tersedia di Gudang Farm A.;1. Buka recording untuk Kandang A1. 2. Pilih stok OVK farm-level. 3. Submit dan approve.;Stok OVK keluar dari gudang farm dan biaya pemakaian teratribusi ke kandang yang dipilih.
-TC-C04;Recording Stock Consumption;Frontend Recording;Selector recording menampilkan opsi stok farm dan kandang dengan jelas;UI Regression;Medium;Produk yang sama tersedia di Gudang Farm A dan Gudang Kandang A1.;1. Buka form recording untuk A1. 2. Buka selector pakan.;Kedua opsi terlihat, label membedakan gudang atau scope dengan jelas, farm stock tidak tersembunyi secara salah.
-TC-C05;Recording Stock Consumption;Recording;Recording A1 tidak boleh memakai stok kandang A2;Negative;High;Pakan Starter tersedia di Gudang Kandang A2.;1. Buka recording untuk A1. 2. Periksa opsi stok yang bisa dipilih.;Opsi Gudang Kandang A2 tidak bisa dipilih, stok farm tetap bisa dipilih.
-TC-C06;Recording Stock Consumption;Recording;Perilaku pending stock dan usage lama tetap berjalan;Regression;Medium;Tidak ada setup khusus selain data recording yang valid.;1. Buat usage stock. 2. Buka kembali halaman edit dan detail.;Tampilan dan perhitungan pending atau usage tetap benar, tidak ada regresi pada route FIFO-v2.
-TC-D01;Recording Telur dan Atribusi;Recording;Recording telur ke gudang kandang tetap berjalan;Regression;High;Kandang A1 aktif dan gudang telur kandang tersedia.;1. Record telur untuk A1 ke Gudang Kandang A1. 2. Approve.;Stok telur di gudang kandang bertambah dan asal kandang tetap A1.
-TC-D02;Recording Telur dan Atribusi;Recording;Recording telur di kandang menyimpan stok ke gudang farm;UAT;High;Egg product warehouse tersedia di Gudang Farm A.;1. Record telur untuk A1. 2. Pilih Gudang Farm A sebagai gudang telur. 3. Submit dan approve.;Stok telur fisik masuk ke gudang farm, recording_eggs.project_flock_kandang_id bernilai A1, tidak ada transfer paksa ke kandang.
-TC-D03;Recording Telur dan Atribusi;Reporting;Stok telur pooled di farm tetap punya jejak asal kandang;Integration;High;A1 record 100 telur ke gudang farm dan A2 record 150 telur ke gudang farm yang sama.;1. Inspect row telur yang tersimpan. 2. Inspect hasil costing atau report setelahnya.;Stok fisik pooled di gudang farm, tetapi asal kandang tetap bisa dibedakan per row atau allocation, HPP per kandang tetap dapat dihitung.
-TC-D04;Recording Telur dan Atribusi;Recording Detail;Known gap pada detail recording dipahami;Known Limitation;Low;Sudah menjalankan TC-D02.;1. Buka detail recording setelah transaksi telur ke gudang farm.;Logika bisnis tetap berjalan, tetapi detail API atau UI mungkin belum menampilkan egg-origin secara eksplisit karena detail DTO belum diperluas.
-TC-E01;Depletion dan Atribusi Populasi;Recording;Depletion dari gudang ayam milik kandang normal;Regression;High;A1 memiliki populasi ayam di gudang kandang.;1. Buat depletion. 2. Approve.;Depletion berhasil, alokasi populasi ter-resolve ke A1, HPP atau usage tetap benar.
-TC-E02;Depletion dan Atribusi Populasi;Recording;Depletion dari sumber ayam fisik farm-level dengan source kandang A1;UAT;High;Stok ayam secara fisik ada di gudang farm dan punya jejak sumber ke A1.;1. Buat depletion untuk A1. 2. Gunakan path source atau farm-level yang didukung backend. 3. Approve.;source_product_warehouse_id menunjuk ke sumber fisik yang benar, source_project_flock_kandang_id bernilai A1, alokasi populasi berhasil tanpa mengasumsikan gudang fisik milik A1.
-TC-E03;Depletion dan Atribusi Populasi;Recording;Depletion gagal bila sumber populasi tidak dapat diatribusikan;Negative;High;Buat kasus stok ayam farm-level tanpa source kandang yang valid.;1. Coba approve depletion.;Backend menolak dengan error yang jelas dan tidak ada silent misattribution.
-TC-F01;Marketing dan Penjualan;Sales Order;Sales order dari gudang kandang tetap berjalan;Regression;High;Stok produk tersedia di Gudang Kandang A1.;1. Buat SO dari Gudang Kandang A1. 2. Lakukan delivery.;Perilaku lama tetap berjalan normal.
-TC-F02;Marketing dan Penjualan;Sales Order;Sales order dari gudang farm untuk telur;UAT;High;Stok telur farm-level tersedia dan berasal dari A1.;1. Buat SO menggunakan Gudang Farm A. 2. Lakukan delivery.;SO dan DO berhasil, stok fisik berkurang dari gudang farm, HPP dan COGS telur tetap teratribusi ke kandang penghasil melalui allocation.
-TC-F03;Marketing dan Penjualan;Sales Order;Sales order dari gudang farm untuk telur pooled A1 dan A2;Integration;High;Stok telur pooled tersedia di gudang farm dari A1 dan A2.;1. Buat penjualan. 2. Lakukan delivery. 3. Inspect closing atau report.;Stok fisik berkurang sekali dari gudang farm, revenue dan HPP terbagi benar ke A1 dan A2, tidak bergantung pada pw.project_flock_kandang_id.
-TC-F04;Marketing dan Penjualan;Sales Order;Sales order dari gudang farm untuk ayam atau culling;UAT;High;Stok ayam atau culling farm-level tersedia dengan jejak sumber dari A1 dan A2.;1. Buat SO dari gudang farm. 2. Buat DO dan approve.;allocatePopulationForMarketingDelivery menurunkan atribusi kandang dari source groups atau allocation, tidak gagal karena gudang jual tidak punya project_flock_kandang_id, HPP dan COGS teratribusi ke kandang sumber.
-TC-F05;Marketing dan Penjualan;Frontend Marketing;UI sales menampilkan semantik Gudang Fisik;UI Regression;Medium;Tidak ada setup khusus selain akses ke form SO.;1. Buka form SO. 2. Periksa label selector gudang dan label tabel produk.;UI menggunakan label Gudang Fisik, bukan Kandang yang menyesatkan, dan label produk memuat detail produk serta gudang atau scope.
-TC-F06;Marketing dan Penjualan;Delivery Order;Layar delivery order tetap kompatibel;Regression;Medium;Sudah ada SO dari gudang farm.;1. Lakukan delivery untuk SO farm-level. 2. Periksa tabel dan detail DO.;Tidak ada masalah payload, gudang fisik tampil dengan benar, dan tidak ada kebingungan akibat wording lama berbasis kandang.
-TC-G01;Report, Closing, dan HPP;Daily Marketing Report;Daily marketing report untuk penjualan telur farm-level;UAT;Medium;Sudah menjalankan TC-F02.;1. Jalankan daily marketing report. 2. Uji export.;Row muncul pada gudang fisik yang benar, report tidak menyiratkan gudang sama dengan kandang, export berjalan.
-TC-G02;Report, Closing, dan HPP;Closing Sales;Closing sales untuk penjualan pooled farm-level;UAT;High;Ada penjualan pooled telur atau ayam dari gudang farm.;1. Buka closing sales.;Penjualan bisa tampil teratribusi per kandang, label menunjukkan Kandang Atribusi, HPP dan revenue tetap benar secara matematis.
-TC-G03;Report, Closing, dan HPP;HPP per Kandang;HPP per kandang mencakup konsumsi pakan atau OVK dari gudang farm;UAT;High;A1 sudah memakai pakan atau OVK dari gudang farm.;1. Jalankan report HPP per kandang.;Biaya usage muncul di A1 dan tidak hilang walaupun gudang fisiknya level farm.
-TC-G04;Report, Closing, dan HPP;Closing Sapronak;Outgoing sapronak menampilkan gudang fisik dengan benar;UI Regression;Medium;Ada data outgoing sapronak yang valid.;1. Buka tabel closing outgoing sapronak.;Header jelas menunjukkan Gudang Asal (Fisik) dan Gudang Tujuan (Fisik).
-TC-G05;Report, Closing, dan HPP;Compatibility;Data historis kandang-owned dan pooled data baru dapat coexist;Regression;High;Dalam satu date range ada transaksi lama kandang-owned dan transaksi baru pooled farm-level.;1. Jalankan closing. 2. Jalankan report. 3. Jalankan HPP.;Kedua jenis data diproses dengan benar, tidak ada double count dan tidak ada atribusi yang hilang.
-TC-H01;FIFO-v2 dan Integritas Allocation;FIFO-v2;Kontrak FIFO-v2 tidak berubah;Integration;High;Gunakan data uji yang mencakup recording stock, depletion, egg, dan marketing.;1. Verifikasi route FIFO untuk RECORDING_STOCK_OUT, RECORDING_DEPLETION_OUT, RECORDING_DEPLETION_IN, RECORDING_EGG_IN, dan MARKETING_OUT. 2. Bandingkan dengan RFC.md dan seed config FIFO-v2.;Tidak ada perubahan semantik route yang tidak disengaja.
-TC-H02;FIFO-v2 dan Integritas Allocation;Stock Allocation;Stock allocation tetap konsisten untuk pakan dari gudang farm;Integration;High;Sudah menjalankan TC-C02.;1. Inspect stock_allocations setelah transaksi.;Allocation consume terbentuk dengan benar dan tidak ada row allocation yatim atau rusak.
-TC-H03;FIFO-v2 dan Integritas Allocation;Stock Allocation;Stock allocation tetap konsisten untuk penjualan telur pooled;Integration;High;Sudah menjalankan TC-F03.;1. Inspect stock_allocations. 2. Inspect row atribusi turunannya.;Allocation mendukung atribusi HPP kembali ke kandang sumber.
-TC-H04;FIFO-v2 dan Integritas Allocation;Population Allocation;Population allocation tetap konsisten untuk penjualan ayam pooled;Integration;High;Sudah menjalankan TC-F04.;1. Inspect population allocations.;Penggunaan kandang sumber teralokasi dengan benar dan tidak fallback ke atribusi null saat source tersedia.
-TC-I01;Negative dan Guard Cases;Recording;Recording dari stok farm-level dengan qty tidak cukup;Negative;High;Stok farm-level tersedia tetapi qty lebih kecil dari pemakaian yang diinput.;1. Buat recording dengan qty melebihi stok. 2. Submit atau approve.;Muncul validation atau business error dan tidak ada korupsi parsial.
-TC-I02;Negative dan Guard Cases;Marketing;Marketing dari stok farm-level dengan qty tidak cukup;Negative;High;Stok farm-level tersedia tetapi qty lebih kecil dari qty penjualan.;1. Buat SO atau DO dengan qty melebihi stok. 2. Submit atau approve.;Delivery atau approval diblok dan stok tetap konsisten.
-TC-I03;Negative dan Guard Cases;Frontend Selector;Opsi produk sama di gudang berbeda tidak salah terpilih;UI Regression;Medium;Produk yang sama tersedia di gudang farm dan gudang kandang.;1. Pilih masing-masing opsi secara eksplisit di UI. 2. Save. 3. Buka kembali edit atau detail.;Opsi yang terpilih jelas dan tetap stabil setelah save atau edit.
-TC-I04;Negative dan Guard Cases;Product Warehouse;Row gudang shared tidak diatribusikan ulang oleh flow maintenance;Regression;High;Ada row shared farm warehouse yang sudah aktif.;1. Jalankan flow yang menyentuh logic ensure/find product warehouse. 2. Cek ulang row farm shared.;Tidak ada mutasi diam-diam pada project_flock_kandang_id.
-TC-J01;Regression Frontend dan UX;Recording Form;Form recording menampilkan opsi stok farm dan kandang hanya dalam scope farm yang sama;UI Regression;Medium;Ada stok di gudang farm, gudang kandang saat ini, dan gudang kandang lain.;1. Buka form recording untuk kandang tertentu. 2. Periksa opsi stock selector.;Gudang farm dan gudang kandang saat ini terlihat, gudang kandang lain tersembunyi.
-TC-J02;Regression Frontend dan UX;Recording Form;Selector recording telur mengizinkan gudang farm;UI Regression;Medium;Egg warehouse tersedia di gudang farm.;1. Buka form recording telur. 2. Buka selector tujuan telur.;Gudang farm terlihat sebagai opsi tujuan telur.
-TC-J03;Regression Frontend dan UX;Sales Form;Form sales memakai semantik gudang secara konsisten;UI Regression;Medium;Akses ke halaman marketing tersedia.;1. Buka form sales. 2. Periksa label selector dan summary table.;Label menggunakan Gudang Fisik secara konsisten dan tidak ada wording Kandang yang menyesatkan untuk stok fisik.
-TC-J04;Regression Frontend dan UX;Marketing Modal;Modal list marketing menampilkan label gudang fisik;UI Regression;Low;Akses ke modal product list tersedia.;1. Buka modal product list di marketing.;Kolom menampilkan label Gudang Fisik.
-TC-K01;Known Limitation;Recording Detail;Detail recording belum menampilkan source atau origin attribution baru;Known Limitation;Low;Sudah ada recording telur farm-level dan depletion dengan source attribution.;1. Buat transaksi. 2. Buka detail recording.;Transaksi berjalan dan atribusi tersimpan di DB, tetapi detail API atau UI mungkin belum menampilkan field source atau origin tersebut

docs/sql/legacy_egg_cutover_audit_queries.sql

@@ -1,343 +0,0 @@
--- Legacy Egg Cutover Audit Helper Queries
--- Ad-hoc query pack for investigation, audit, dry-run review, and rollback readiness.
-
--- =====================================================================
--- AUDIT-01 All locations classified by kandang/farm egg posting timing
--- =====================================================================
-WITH timing AS (
-  SELECT
-    pf.location_id AS location_id,
-    l.name AS location_name,
-    MIN(CASE WHEN w.type = 'KANDANG' THEN DATE(r.record_datetime) END) AS first_kandang_date,
-    MAX(CASE WHEN w.type = 'KANDANG' THEN DATE(r.record_datetime) END) AS last_kandang_date,
-    MIN(CASE WHEN w.type = 'LOKASI' THEN DATE(r.record_datetime) END) AS first_farm_date,
-    MAX(CASE WHEN w.type = 'LOKASI' THEN DATE(r.record_datetime) END) AS last_farm_date
-  FROM recording_eggs re
-  JOIN recordings r ON r.id = re.recording_id
-  JOIN project_flock_kandangs pk ON pk.id = COALESCE(re.project_flock_kandang_id, r.project_flock_kandangs_id)
-  JOIN project_flocks pf ON pf.id = pk.project_flock_id
-  JOIN locations l ON l.id = pf.location_id
-  JOIN product_warehouses pw ON pw.id = re.product_warehouse_id
-  JOIN warehouses w ON w.id = pw.warehouse_id
-  GROUP BY pf.location_id, l.name
-)
-SELECT
-  location_id,
-  location_name,
-  first_kandang_date,
-  last_kandang_date,
-  first_farm_date,
-  last_farm_date,
-  CASE
-    WHEN first_farm_date IS NULL THEN 'KANDANG_ONLY'
-    WHEN last_kandang_date IS NULL OR first_farm_date > last_kandang_date THEN 'CLEAN_CUTOVER'
-    ELSE 'OVERLAP'
-  END AS location_status
-FROM timing
-ORDER BY location_name;
-
--- =====================================================================
--- AUDIT-02 All legacy kandang egg product warehouses with positive on-hand
--- =====================================================================
-WITH first_farm AS (
-  SELECT location_id, MIN(id) AS farm_warehouse_id
-  FROM warehouses
-  WHERE type = 'LOKASI'
-    AND deleted_at IS NULL
-  GROUP BY location_id
-)
-SELECT
-  l.id AS location_id,
-  l.name AS location_name,
-  kw.id AS source_warehouse_id,
-  kw.name AS source_warehouse_name,
-  fw.id AS farm_warehouse_id,
-  fw.name AS farm_warehouse_name,
-  pw.id AS product_warehouse_id,
-  p.id AS product_id,
-  p.name AS product_name,
-  COALESCE(pw.qty, 0) AS on_hand_qty
-FROM product_warehouses pw
-JOIN warehouses kw
-  ON kw.id = pw.warehouse_id
- AND kw.type = 'KANDANG'
- AND kw.deleted_at IS NULL
-JOIN locations l ON l.id = kw.location_id
-JOIN products p ON p.id = pw.product_id
-LEFT JOIN product_categories pc ON pc.id = p.product_category_id
-LEFT JOIN first_farm ff ON ff.location_id = kw.location_id
-LEFT JOIN warehouses fw ON fw.id = ff.farm_warehouse_id
-WHERE EXISTS (
-    SELECT 1 FROM recording_eggs re WHERE re.product_warehouse_id = pw.id
-  )
-  AND (
-    EXISTS (
-      SELECT 1 FROM flags f
-      WHERE f.flagable_type = 'products'
-        AND f.flagable_id = p.id
-        AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-    )
-    OR (
-      NOT EXISTS (
-        SELECT 1 FROM flags f_any
-        WHERE f_any.flagable_type = 'products'
-          AND f_any.flagable_id = p.id
-      )
-      AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-    )
-  )
-  AND COALESCE(pw.qty, 0) > 0
-ORDER BY l.name, kw.name, p.name;
-
--- =====================================================================
--- AUDIT-03 Totals per location for phase sizing
--- =====================================================================
-WITH candidates AS (
-  SELECT
-    l.name AS location_name,
-    COALESCE(pw.qty, 0) AS on_hand_qty
-  FROM product_warehouses pw
-  JOIN warehouses kw
-    ON kw.id = pw.warehouse_id
-   AND kw.type = 'KANDANG'
-   AND kw.deleted_at IS NULL
-  JOIN locations l ON l.id = kw.location_id
-  JOIN products p ON p.id = pw.product_id
-  LEFT JOIN product_categories pc ON pc.id = p.product_category_id
-  WHERE EXISTS (
-      SELECT 1 FROM recording_eggs re WHERE re.product_warehouse_id = pw.id
-    )
-    AND (
-      EXISTS (
-        SELECT 1 FROM flags f
-        WHERE f.flagable_type = 'products'
-          AND f.flagable_id = p.id
-          AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-      )
-      OR (
-        NOT EXISTS (
-          SELECT 1 FROM flags f_any
-          WHERE f_any.flagable_type = 'products'
-            AND f_any.flagable_id = p.id
-        )
-        AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-      )
-    )
-    AND COALESCE(pw.qty, 0) > 0
-)
-SELECT
-  location_name,
-  COUNT(*) AS positive_rows,
-  SUM(on_hand_qty) AS total_on_hand_qty
-FROM candidates
-GROUP BY location_name
-ORDER BY location_name;
-
--- =====================================================================
--- AUDIT-04 Locations missing farm warehouse
--- =====================================================================
-SELECT
-  l.id AS location_id,
-  l.name AS location_name
-FROM locations l
-WHERE EXISTS (
-    SELECT 1
-    FROM warehouses kw
-    WHERE kw.location_id = l.id
-      AND kw.type = 'KANDANG'
-      AND kw.deleted_at IS NULL
-  )
-  AND NOT EXISTS (
-    SELECT 1
-    FROM warehouses fw
-    WHERE fw.location_id = l.id
-      AND fw.type = 'LOKASI'
-      AND fw.deleted_at IS NULL
-  )
-ORDER BY l.name;
-
--- =====================================================================
--- AUDIT-05 Legacy recording_eggs still pointing to kandang warehouse
--- =====================================================================
-SELECT
-  l.name AS location_name,
-  kw.name AS kandang_warehouse_name,
-  p.name AS product_name,
-  COUNT(*) AS recording_rows
-FROM recording_eggs re
-JOIN product_warehouses pw ON pw.id = re.product_warehouse_id
-JOIN warehouses kw ON kw.id = pw.warehouse_id
-JOIN locations l ON l.id = kw.location_id
-JOIN products p ON p.id = pw.product_id
-WHERE kw.type = 'KANDANG'
-GROUP BY l.name, kw.name, p.name
-ORDER BY l.name, kw.name, p.name;
-
--- =====================================================================
--- AUDIT-06 Farm-level recording_eggs already present
--- =====================================================================
-SELECT
-  l.name AS location_name,
-  fw.name AS farm_warehouse_name,
-  p.name AS product_name,
-  COUNT(*) AS recording_rows
-FROM recording_eggs re
-JOIN product_warehouses pw ON pw.id = re.product_warehouse_id
-JOIN warehouses fw ON fw.id = pw.warehouse_id
-JOIN locations l ON l.id = fw.location_id
-JOIN products p ON p.id = pw.product_id
-WHERE fw.type = 'LOKASI'
-GROUP BY l.name, fw.name, p.name
-ORDER BY l.name, fw.name, p.name;
-
--- =====================================================================
--- AUDIT-07 Transfers created by cutover reason, grouped by run_id
--- =====================================================================
-SELECT
-  SPLIT_PART(SPLIT_PART(st.reason, '|run_id=', 2), '|', 1) AS run_id,
-  COUNT(DISTINCT st.id) AS transfer_count,
-  COUNT(std.id) AS detail_count,
-  SUM(COALESCE(std.total_qty, std.usage_qty, 0)) AS total_moved_qty,
-  MIN(st.transfer_date) AS first_transfer_date,
-  MAX(st.transfer_date) AS last_transfer_date
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-WHERE st.reason LIKE 'EGG_FARM_CUTOVER|run_id=%'
-GROUP BY 1
-ORDER BY first_transfer_date DESC, run_id DESC;
-
--- =====================================================================
--- AUDIT-08 Detailed summary per run_id
--- Replace <run_id> before running.
--- =====================================================================
-SELECT
-  st.id AS transfer_id,
-  st.movement_number,
-  st.transfer_date,
-  ws.name AS source_warehouse_name,
-  wd.name AS farm_warehouse_name,
-  p.name AS product_name,
-  COALESCE(std.total_qty, std.usage_qty, 0) AS moved_qty,
-  st.deleted_at
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-JOIN warehouses ws ON ws.id = st.from_warehouse_id
-JOIN warehouses wd ON wd.id = st.to_warehouse_id
-WHERE st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id, p.name;
-
--- =====================================================================
--- AUDIT-09 Downstream consumption check per run_id
--- Replace <run_id> before running.
--- =====================================================================
-SELECT
-  st.id AS transfer_id,
-  st.movement_number,
-  p.name AS product_name,
-  sa.usable_type,
-  sa.usable_id,
-  sa.qty,
-  sa.function_code,
-  sa.flag_group_code
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-JOIN stock_allocations sa
-  ON sa.stockable_type = 'STOCK_TRANSFER_IN'
- AND sa.stockable_id = std.id
- AND sa.status = 'ACTIVE'
- AND sa.allocation_purpose = 'CONSUME'
- AND sa.deleted_at IS NULL
-WHERE st.deleted_at IS NULL
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id, p.name, sa.usable_type, sa.usable_id;
-
--- =====================================================================
--- AUDIT-10 Stock log reconciliation per cutover transfer detail
--- Replace <run_id> before running.
--- =====================================================================
-SELECT
-  st.id AS transfer_id,
-  st.movement_number,
-  p.name AS product_name,
-  std.id AS transfer_detail_id,
-  COALESCE(std.total_qty, std.usage_qty, 0) AS moved_qty,
-  SUM(CASE WHEN sl.decrease > 0 THEN sl.decrease ELSE 0 END) AS total_logged_out,
-  SUM(CASE WHEN sl.increase > 0 THEN sl.increase ELSE 0 END) AS total_logged_in
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-LEFT JOIN stock_logs sl
-  ON sl.loggable_type = 'TRANSFER'
- AND sl.loggable_id = std.id
-WHERE st.deleted_at IS NULL
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-GROUP BY st.id, st.movement_number, p.name, std.id, COALESCE(std.total_qty, std.usage_qty, 0)
-ORDER BY st.id, p.name;
-
--- =====================================================================
--- AUDIT-11 New recording eggs still posting to kandang after cutoff date
--- Replace values before running.
--- =====================================================================
-SELECT
-  DATE(r.record_datetime) AS record_date,
-  l.name AS location_name,
-  kw.name AS kandang_warehouse_name,
-  p.name AS product_name,
-  re.qty
-FROM recording_eggs re
-JOIN recordings r ON r.id = re.recording_id
-JOIN product_warehouses pw ON pw.id = re.product_warehouse_id
-JOIN warehouses kw ON kw.id = pw.warehouse_id
-JOIN locations l ON l.id = kw.location_id
-JOIN products p ON p.id = pw.product_id
-WHERE kw.type = 'KANDANG'
-  AND LOWER(l.name) = LOWER('<location_name>')
-  AND DATE(r.record_datetime) >= DATE('<cutover_date>')
-ORDER BY r.record_datetime ASC, kw.name, p.name;
-
--- Expectation:
--- - after deploy and cutover, this should ideally return 0 rows for the location
-
--- =====================================================================
--- AUDIT-12 Combined kandang + farm egg stock per location after cutover
--- Replace <location_name> before running.
--- =====================================================================
-SELECT
-  l.name AS location_name,
-  w.type AS warehouse_type,
-  p.name AS product_name,
-  SUM(COALESCE(pw.qty, 0)) AS total_qty
-FROM product_warehouses pw
-JOIN warehouses w ON w.id = pw.warehouse_id
-JOIN locations l ON l.id = w.location_id
-JOIN products p ON p.id = pw.product_id
-LEFT JOIN product_categories pc ON pc.id = p.product_category_id
-WHERE LOWER(l.name) = LOWER('<location_name>')
-  AND (
-    EXISTS (
-      SELECT 1 FROM flags f
-      WHERE f.flagable_type = 'products'
-        AND f.flagable_id = p.id
-        AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-    )
-    OR (
-      NOT EXISTS (
-        SELECT 1 FROM flags f_any
-        WHERE f_any.flagable_type = 'products'
-          AND f_any.flagable_id = p.id
-      )
-      AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-    )
-  )
-GROUP BY l.name, w.type, p.name
-ORDER BY w.type, p.name;

docs/sql/legacy_egg_cutover_verification_checklist.sql

@@ -1,400 +0,0 @@
--- Legacy Egg Cutover Verification Checklist
--- Usage:
--- 1. Replace the values below before executing.
--- 2. Run section BEFORE before --apply.
--- 3. Run section AFTER after --apply.
--- 4. Run rollback checks if needed.
-
--- =====================================================================
--- PARAMETERS
--- =====================================================================
-
--- Replace manually before running.
--- Example:
---   location_name = Jamali
---   cutover_date  = 2026-04-07
---   run_id        = egg-cutover-20260407T130344.220407000Z
-
--- =====================================================================
--- BEFORE APPLY
--- =====================================================================
-
--- [BEFORE-01] Identify target location and farm warehouse
-SELECT
-  l.id AS location_id,
-  l.name AS location_name,
-  fw.id AS farm_warehouse_id,
-  fw.name AS farm_warehouse_name
-FROM locations l
-LEFT JOIN warehouses fw
-  ON fw.location_id = l.id
- AND fw.type = 'LOKASI'
- AND fw.deleted_at IS NULL
-WHERE LOWER(l.name) = LOWER('<location_name>')
-ORDER BY fw.id ASC;
-
--- Expectation:
--- - exactly one target location
--- - at least one farm warehouse exists
-
--- [BEFORE-02] Verify location timing status (must be CLEAN_CUTOVER for phase 1)
-WITH timing AS (
-  SELECT
-    pf.location_id AS location_id,
-    l.name AS location_name,
-    MIN(CASE WHEN w.type = 'KANDANG' THEN DATE(r.record_datetime) END) AS first_kandang_date,
-    MAX(CASE WHEN w.type = 'KANDANG' THEN DATE(r.record_datetime) END) AS last_kandang_date,
-    MIN(CASE WHEN w.type = 'LOKASI' THEN DATE(r.record_datetime) END) AS first_farm_date,
-    MAX(CASE WHEN w.type = 'LOKASI' THEN DATE(r.record_datetime) END) AS last_farm_date
-  FROM recording_eggs re
-  JOIN recordings r ON r.id = re.recording_id
-  JOIN project_flock_kandangs pk ON pk.id = COALESCE(re.project_flock_kandang_id, r.project_flock_kandangs_id)
-  JOIN project_flocks pf ON pf.id = pk.project_flock_id
-  JOIN locations l ON l.id = pf.location_id
-  JOIN product_warehouses pw ON pw.id = re.product_warehouse_id
-  JOIN warehouses w ON w.id = pw.warehouse_id
-  WHERE LOWER(l.name) = LOWER('<location_name>')
-  GROUP BY pf.location_id, l.name
-)
-SELECT
-  location_id,
-  location_name,
-  first_kandang_date,
-  last_kandang_date,
-  first_farm_date,
-  last_farm_date,
-  CASE
-    WHEN first_farm_date IS NULL THEN 'KANDANG_ONLY'
-    WHEN last_kandang_date IS NULL OR first_farm_date > last_kandang_date THEN 'CLEAN_CUTOVER'
-    ELSE 'OVERLAP'
-  END AS location_status
-FROM timing;
-
--- Expectation:
--- - phase 1 location must be CLEAN_CUTOVER
-
--- [BEFORE-03] Candidate source rows that should be migrated
-WITH first_farm AS (
-  SELECT location_id, MIN(id) AS farm_warehouse_id
-  FROM warehouses
-  WHERE type = 'LOKASI'
-    AND deleted_at IS NULL
-  GROUP BY location_id
-)
-SELECT
-  l.id AS location_id,
-  l.name AS location_name,
-  kw.id AS source_warehouse_id,
-  kw.name AS source_warehouse_name,
-  fw.id AS farm_warehouse_id,
-  fw.name AS farm_warehouse_name,
-  pw.id AS product_warehouse_id,
-  p.id AS product_id,
-  p.name AS product_name,
-  COALESCE(pw.qty, 0) AS on_hand_qty
-FROM product_warehouses pw
-JOIN warehouses kw
-  ON kw.id = pw.warehouse_id
- AND kw.type = 'KANDANG'
- AND kw.deleted_at IS NULL
-JOIN locations l ON l.id = kw.location_id
-JOIN products p ON p.id = pw.product_id
-LEFT JOIN product_categories pc ON pc.id = p.product_category_id
-LEFT JOIN first_farm ff ON ff.location_id = kw.location_id
-LEFT JOIN warehouses fw ON fw.id = ff.farm_warehouse_id
-WHERE LOWER(l.name) = LOWER('<location_name>')
-  AND EXISTS (
-    SELECT 1
-    FROM recording_eggs re
-    WHERE re.product_warehouse_id = pw.id
-  )
-  AND (
-    EXISTS (
-      SELECT 1
-      FROM flags f
-      WHERE f.flagable_type = 'products'
-        AND f.flagable_id = p.id
-        AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-    )
-    OR (
-      NOT EXISTS (
-        SELECT 1
-        FROM flags f_any
-        WHERE f_any.flagable_type = 'products'
-          AND f_any.flagable_id = p.id
-      )
-      AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-    )
-  )
-  AND COALESCE(pw.qty, 0) > 0
-ORDER BY kw.name, p.name;
-
--- Expectation:
--- - every row here should match dry-run eligible rows
-
--- [BEFORE-04] Totals per source warehouse and product
-WITH candidates AS (
-  SELECT
-    kw.name AS source_warehouse_name,
-    p.name AS product_name,
-    COALESCE(pw.qty, 0) AS on_hand_qty
-  FROM product_warehouses pw
-  JOIN warehouses kw
-    ON kw.id = pw.warehouse_id
-   AND kw.type = 'KANDANG'
-   AND kw.deleted_at IS NULL
-  JOIN locations l ON l.id = kw.location_id
-  JOIN products p ON p.id = pw.product_id
-  LEFT JOIN product_categories pc ON pc.id = p.product_category_id
-  WHERE LOWER(l.name) = LOWER('<location_name>')
-    AND EXISTS (
-      SELECT 1 FROM recording_eggs re WHERE re.product_warehouse_id = pw.id
-    )
-    AND (
-      EXISTS (
-        SELECT 1 FROM flags f
-        WHERE f.flagable_type = 'products'
-          AND f.flagable_id = p.id
-          AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-      )
-      OR (
-        NOT EXISTS (
-          SELECT 1 FROM flags f_any
-          WHERE f_any.flagable_type = 'products'
-            AND f_any.flagable_id = p.id
-        )
-        AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-      )
-    )
-    AND COALESCE(pw.qty, 0) > 0
-)
-SELECT
-  source_warehouse_name,
-  product_name,
-  SUM(on_hand_qty) AS total_qty
-FROM candidates
-GROUP BY source_warehouse_name, product_name
-ORDER BY source_warehouse_name, product_name;
-
--- [BEFORE-05] Current farm egg stock before cutover
-SELECT
-  fw.name AS farm_warehouse_name,
-  p.name AS product_name,
-  COALESCE(pw.qty, 0) AS farm_on_hand_qty
-FROM warehouses fw
-JOIN locations l ON l.id = fw.location_id
-JOIN product_warehouses pw ON pw.warehouse_id = fw.id
-JOIN products p ON p.id = pw.product_id
-LEFT JOIN product_categories pc ON pc.id = p.product_category_id
-WHERE LOWER(l.name) = LOWER('<location_name>')
-  AND fw.type = 'LOKASI'
-  AND fw.deleted_at IS NULL
-  AND (
-    EXISTS (
-      SELECT 1 FROM flags f
-      WHERE f.flagable_type = 'products'
-        AND f.flagable_id = p.id
-        AND (UPPER(f.name) = 'TELUR' OR UPPER(f.name) LIKE 'TELUR-%')
-    )
-    OR (
-      NOT EXISTS (
-        SELECT 1 FROM flags f_any
-        WHERE f_any.flagable_type = 'products'
-          AND f_any.flagable_id = p.id
-      )
-      AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-    )
-  )
-ORDER BY p.name;
-
--- [BEFORE-06] Existing cutover transfers for this location
-SELECT
-  st.id,
-  st.movement_number,
-  st.transfer_date,
-  st.reason,
-  ws.name AS source_warehouse_name,
-  wd.name AS farm_warehouse_name,
-  st.deleted_at
-FROM stock_transfers st
-JOIN warehouses ws ON ws.id = st.from_warehouse_id
-JOIN warehouses wd ON wd.id = st.to_warehouse_id
-LEFT JOIN locations l ON l.id = COALESCE(ws.location_id, wd.location_id)
-WHERE LOWER(COALESCE(l.name, '')) = LOWER('<location_name>')
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|%'
-ORDER BY st.id DESC;
-
--- Expectation:
--- - no unexpected older active cutover transfers for the same location
-
--- =====================================================================
--- AFTER APPLY
--- =====================================================================
-
--- [AFTER-01] Transfer headers created by run_id
-SELECT
-  st.id,
-  st.movement_number,
-  st.transfer_date,
-  st.reason,
-  ws.name AS source_warehouse_name,
-  wd.name AS farm_warehouse_name,
-  st.deleted_at
-FROM stock_transfers st
-JOIN warehouses ws ON ws.id = st.from_warehouse_id
-JOIN warehouses wd ON wd.id = st.to_warehouse_id
-WHERE st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id ASC;
-
--- [AFTER-02] Transfer detail rows created by run_id
-SELECT
-  st.id AS transfer_id,
-  st.movement_number,
-  ws.name AS source_warehouse_name,
-  wd.name AS farm_warehouse_name,
-  p.name AS product_name,
-  COALESCE(std.total_qty, std.usage_qty, 0) AS moved_qty,
-  std.source_product_warehouse_id,
-  std.dest_product_warehouse_id
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-JOIN warehouses ws ON ws.id = st.from_warehouse_id
-JOIN warehouses wd ON wd.id = st.to_warehouse_id
-WHERE st.deleted_at IS NULL
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id, p.name;
-
--- [AFTER-03] Stock logs created by run_id transfer details
-SELECT
-  st.id AS transfer_id,
-  st.movement_number,
-  p.name AS product_name,
-  sl.product_warehouse_id,
-  sl.increase,
-  sl.decrease,
-  sl.stock,
-  sl.created_at
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-JOIN stock_logs sl
-  ON sl.loggable_type = 'TRANSFER'
- AND sl.loggable_id = std.id
-WHERE st.deleted_at IS NULL
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id, p.name, sl.id;
-
--- Expectation:
--- - every detail has one stock log decrease from source and one stock log increase to destination
-
--- [AFTER-04] Source rows after cutover
-SELECT
-  kw.name AS source_warehouse_name,
-  p.name AS product_name,
-  COALESCE(pw.qty, 0) AS source_qty_after
-FROM product_warehouses pw
-JOIN warehouses kw ON kw.id = pw.warehouse_id
-JOIN locations l ON l.id = kw.location_id
-JOIN products p ON p.id = pw.product_id
-WHERE LOWER(l.name) = LOWER('<location_name>')
-  AND kw.type = 'KANDANG'
-  AND EXISTS (
-    SELECT 1 FROM recording_eggs re WHERE re.product_warehouse_id = pw.id
-  )
-ORDER BY kw.name, p.name;
-
--- Expectation:
--- - rows that were transferred should now be 0 or no longer available for use
-
--- [AFTER-05] Farm rows after cutover
-SELECT
-  fw.name AS farm_warehouse_name,
-  p.name AS product_name,
-  COALESCE(pw.qty, 0) AS farm_qty_after
-FROM product_warehouses pw
-JOIN warehouses fw ON fw.id = pw.warehouse_id
-JOIN locations l ON l.id = fw.location_id
-JOIN products p ON p.id = pw.product_id
-WHERE LOWER(l.name) = LOWER('<location_name>')
-  AND fw.type = 'LOKASI'
-ORDER BY fw.name, p.name;
-
--- Expectation:
--- - farm qty increases by the moved amount
-
--- [AFTER-06] Reconciliation: total moved by run
-SELECT
-  p.name AS product_name,
-  SUM(COALESCE(std.total_qty, std.usage_qty, 0)) AS total_moved_qty
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-WHERE st.deleted_at IS NULL
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-GROUP BY p.name
-ORDER BY p.name;
-
--- [AFTER-07] Farm stock available for SO after cutover
-SELECT
-  fw.name AS farm_warehouse_name,
-  p.name AS product_name,
-  COALESCE(pw.qty, 0) AS available_qty
-FROM product_warehouses pw
-JOIN warehouses fw ON fw.id = pw.warehouse_id
-JOIN locations l ON l.id = fw.location_id
-JOIN products p ON p.id = pw.product_id
-WHERE LOWER(l.name) = LOWER('<location_name>')
-  AND fw.type = 'LOKASI'
-  AND COALESCE(pw.qty, 0) > 0
-ORDER BY p.name;
-
--- =====================================================================
--- ROLLBACK CHECKS
--- =====================================================================
-
--- [ROLLBACK-01] Check downstream consumption guard before rollback
-SELECT
-  st.id AS transfer_id,
-  st.movement_number,
-  p.name AS product_name,
-  sa.usable_type,
-  sa.usable_id,
-  sa.qty,
-  sa.function_code,
-  sa.flag_group_code
-FROM stock_transfers st
-JOIN stock_transfer_details std
-  ON std.stock_transfer_id = st.id
- AND std.deleted_at IS NULL
-JOIN products p ON p.id = std.product_id
-JOIN stock_allocations sa
-  ON sa.stockable_type = 'STOCK_TRANSFER_IN'
- AND sa.stockable_id = std.id
- AND sa.status = 'ACTIVE'
- AND sa.allocation_purpose = 'CONSUME'
- AND sa.deleted_at IS NULL
-WHERE st.deleted_at IS NULL
-  AND st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id, p.name, sa.usable_type, sa.usable_id;
-
--- Expectation:
--- - rollback only safe if this query returns 0 rows
-
--- [ROLLBACK-02] Verify run is fully rolled back
-SELECT
-  st.id,
-  st.movement_number,
-  st.deleted_at
-FROM stock_transfers st
-WHERE st.reason LIKE 'EGG_FARM_CUTOVER|run_id=<run_id>|%'
-ORDER BY st.id;
-
--- Expectation:
--- - after rollback, deleted_at should be filled for all transfers in the run

internal/apikeys/defaults.go

@@ -1,92 +0,0 @@
-package apikeys
-
-func DefaultDashboardPermissions() []string {
-	return []string{
-		"lti.approval.list",
-		"lti.closing.list",
-		"lti.closing.detail",
-		"lti.daily_checklist.create",
-		"lti.daily_checklist.dashboard.list",
-		"lti.daily_checklist.detail",
-		"lti.daily_checklist.list",
-		"lti.daily_checklist.master_data.activity",
-		"lti.daily_checklist.master_data.configuration",
-		"lti.daily_checklist.master_data.employee",
-		"lti.daily_checklist.reports",
-		"lti.dashboard.list",
-		"lti.expense.detail",
-		"lti.expense.list",
-		"lti.finance.initial_balances.detail",
-		"lti.finance.injections.detail",
-		"lti.finance.payments.detail",
-		"lti.finance.transactions.detail",
-		"lti.finance.transactions.list",
-		"lti.inventory.detail",
-		"lti.inventory.list",
-		"lti.inventory.product_stock.detail",
-		"lti.inventory.product_stock.list",
-		"lti.inventory.product_warehouses.detail",
-		"lti.inventory.product_warehouses.list",
-		"lti.inventory.transfer.detail",
-		"lti.inventory.transfer.list",
-		"lti.marketing.delivery_order.detail",
-		"lti.marketing.delivery_order.list",
-		"lti.master.area.detail",
-		"lti.master.area.list",
-		"lti.master.banks.detail",
-		"lti.master.banks.list",
-		"lti.master.customer.detail",
-		"lti.master.customer.list",
-		"lti.master.fcr.detail",
-		"lti.master.fcr.list",
-		"lti.master.flocks.detail",
-		"lti.master.flocks.list",
-		"lti.master.kandangs.detail",
-		"lti.master.kandangs.list",
-		"lti.master.locations.detail",
-		"lti.master.locations.list",
-		"lti.master.nonstocks.detail",
-		"lti.master.nonstocks.list",
-		"lti.master.product_categories.detail",
-		"lti.master.product_categories.list",
-		"lti.master.products.detail",
-		"lti.master.products.list",
-		"lti.master.production_standards.detail",
-		"lti.master.production_standards.list",
-		"lti.master.suppliers.detail",
-		"lti.master.suppliers.list",
-		"lti.master.uoms.detail",
-		"lti.master.uoms.list",
-		"lti.master.warehouses.detail",
-		"lti.master.warehouses.list",
-		"lti.production.chickins.detail",
-		"lti.production.project_flock_kandangs.closing.detail",
-		"lti.production.project_flock_kandangs.detail",
-		"lti.production.project_flock_kandangs.list",
-		"lti.production.project_flocks.detail",
-		"lti.production.project_flocks.list",
-		"lti.production.project_flocks.lookup",
-		"lti.production.project_flocks.next_period",
-		"lti.production.recording.detail",
-		"lti.production.recording.list",
-		"lti.production.recording.next_day",
-		"lti.production.transfer_to_laying.create",
-		"lti.production.transfer_to_laying.detail",
-		"lti.production.transfer_to_laying.getavailableqty",
-		"lti.production.transfer_to_laying.list",
-		"lti.production.uniformity.detail",
-		"lti.production.uniformity.list",
-		"lti.purchase.detail",
-		"lti.purchase.list",
-		"lti.repport.customerpayment.list",
-		"lti.repport.debtsupplier.list",
-		"lti.repport.delivery.list",
-		"lti.repport.expense.list",
-		"lti.repport.gethppperkandang.list",
-		"lti.repport.production_result.list",
-		"lti.repport.purchasesupplier.list",
-		"lti.users.detail",
-		"lti.users.list",
-		"lti.daily_checklist.master_data.kandang",
-	}
-}

internal/apikeys/repository.go

@@ -1,107 +0,0 @@
-package apikeys
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-type Repository interface {
-	Create(ctx context.Context, record *entity.IntegrationAPIKey) error
-	GetByEnvironmentAndPrefix(ctx context.Context, environment, prefix string) (*entity.IntegrationAPIKey, error)
-	List(ctx context.Context, environment string) ([]entity.IntegrationAPIKey, error)
-	Revoke(ctx context.Context, environment, prefix string, revokedAt time.Time) error
-	TouchLastUsed(ctx context.Context, id uint, usedAt time.Time, usedFrom string) error
-}
-
-type repository struct {
-	db *gorm.DB
-}
-
-func NewRepository(db *gorm.DB) Repository {
-	return &repository{db: db}
-}
-
-func (r *repository) Create(ctx context.Context, record *entity.IntegrationAPIKey) error {
-	if r.db == nil {
-		return errors.New("database not configured")
-	}
-	return r.db.WithContext(ctx).Create(record).Error
-}
-
-func (r *repository) GetByEnvironmentAndPrefix(ctx context.Context, environment, prefix string) (*entity.IntegrationAPIKey, error) {
-	if r.db == nil {
-		return nil, errors.New("database not configured")
-	}
-
-	var record entity.IntegrationAPIKey
-	if err := r.db.WithContext(ctx).
-		Where("environment = ?", environment).
-		Where("key_prefix = ?", prefix).
-		First(&record).Error; err != nil {
-		return nil, err
-	}
-
-	return &record, nil
-}
-
-func (r *repository) List(ctx context.Context, environment string) ([]entity.IntegrationAPIKey, error) {
-	if r.db == nil {
-		return nil, errors.New("database not configured")
-	}
-
-	query := r.db.WithContext(ctx).Model(&entity.IntegrationAPIKey{})
-	if environment != "" {
-		query = query.Where("environment = ?", environment)
-	}
-
-	var records []entity.IntegrationAPIKey
-	if err := query.Order("environment ASC").Order("name ASC").Find(&records).Error; err != nil {
-		return nil, err
-	}
-
-	return records, nil
-}
-
-func (r *repository) Revoke(ctx context.Context, environment, prefix string, revokedAt time.Time) error {
-	if r.db == nil {
-		return errors.New("database not configured")
-	}
-
-	updates := map[string]any{
-		"status":     entity.IntegrationAPIKeyStatusRevoked,
-		"revoked_at": revokedAt,
-		"updated_at": revokedAt,
-	}
-
-	result := r.db.WithContext(ctx).
-		Model(&entity.IntegrationAPIKey{}).
-		Where("environment = ?", environment).
-		Where("key_prefix = ?", prefix).
-		Updates(updates)
-	if result.Error != nil {
-		return result.Error
-	}
-	if result.RowsAffected == 0 {
-		return gorm.ErrRecordNotFound
-	}
-	return nil
-}
-
-func (r *repository) TouchLastUsed(ctx context.Context, id uint, usedAt time.Time, usedFrom string) error {
-	if r.db == nil {
-		return errors.New("database not configured")
-	}
-
-	return r.db.WithContext(ctx).
-		Model(&entity.IntegrationAPIKey{}).
-		Where("id = ?", id).
-		Updates(map[string]any{
-			"last_used_at":   usedAt,
-			"last_used_from": usedFrom,
-			"updated_at":     usedAt,
-		}).Error
-}

internal/apikeys/service.go

@@ -1,233 +0,0 @@
-package apikeys
-
-import (
-	"context"
-	"crypto/rand"
-	"encoding/base32"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/secure"
-	"gorm.io/gorm"
-)
-
-var (
-	ErrInvalidAPIKey = errors.New("invalid api key")
-	ErrInactiveKey   = errors.New("inactive api key")
-)
-
-type Principal struct {
-	ID          uint
-	Name        string
-	Environment string
-	Permissions []string
-	AllArea     bool
-	AreaIDs     []uint
-	AllLocation bool
-	LocationIDs []uint
-}
-
-type Authenticator interface {
-	Authenticate(ctx context.Context, rawKey, source string) (*Principal, error)
-}
-
-type Service interface {
-	Authenticator
-	Create(ctx context.Context, input CreateInput) (*IssuedKey, error)
-	List(ctx context.Context, environment string) ([]entity.IntegrationAPIKey, error)
-	Revoke(ctx context.Context, environment, prefix string) error
-}
-
-type CreateInput struct {
-	Name            string
-	Environment     string
-	PermissionCodes []string
-	AllArea         bool
-	AreaIDs         []uint
-	AllLocation     bool
-	LocationIDs     []uint
-}
-
-type IssuedKey struct {
-	Key    string
-	Record *entity.IntegrationAPIKey
-}
-
-type service struct {
-	repo Repository
-	now  func() time.Time
-}
-
-func NewService(db *gorm.DB) Service {
-	return &service{
-		repo: NewRepository(db),
-		now:  time.Now,
-	}
-}
-
-func (s *service) Authenticate(ctx context.Context, rawKey, source string) (*Principal, error) {
-	environment, prefix, secret, err := parseRawKey(rawKey)
-	if err != nil {
-		return nil, ErrInvalidAPIKey
-	}
-
-	record, err := s.repo.GetByEnvironmentAndPrefix(ctx, environment, prefix)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, ErrInvalidAPIKey
-		}
-		return nil, err
-	}
-
-	if !strings.EqualFold(record.Status, entity.IntegrationAPIKeyStatusActive) || record.RevokedAt != nil {
-		return nil, ErrInactiveKey
-	}
-	if !secure.Verify(record.KeyHash, secret) {
-		return nil, ErrInvalidAPIKey
-	}
-
-	usedAt := s.now().UTC()
-	if err := s.repo.TouchLastUsed(ctx, record.ID, usedAt, strings.TrimSpace(source)); err != nil {
-		utils.Log.WithError(err).Warn("api key: failed to update last_used fields")
-	}
-
-	return &Principal{
-		ID:          record.ID,
-		Name:        record.Name,
-		Environment: record.Environment,
-		Permissions: canonicalPermissions(record.PermissionCodes),
-		AllArea:     record.AllArea,
-		AreaIDs:     uniqueUint(record.AreaIDs),
-		AllLocation: record.AllLocation,
-		LocationIDs: uniqueUint(record.LocationIDs),
-	}, nil
-}
-
-func (s *service) Create(ctx context.Context, input CreateInput) (*IssuedKey, error) {
-	name := strings.TrimSpace(input.Name)
-	environment := strings.ToLower(strings.TrimSpace(input.Environment))
-	if name == "" || environment == "" {
-		return nil, fmt.Errorf("name and environment are required")
-	}
-
-	prefix, err := randomToken(10)
-	if err != nil {
-		return nil, err
-	}
-	secret, err := randomToken(24)
-	if err != nil {
-		return nil, err
-	}
-
-	hash, err := secure.Hash(secret, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	record := &entity.IntegrationAPIKey{
-		Name:            name,
-		Environment:     environment,
-		Status:          entity.IntegrationAPIKeyStatusActive,
-		KeyPrefix:       prefix,
-		KeyHash:         hash,
-		PermissionCodes: canonicalPermissions(input.PermissionCodes),
-		AllArea:         input.AllArea,
-		AreaIDs:         uniqueUint(input.AreaIDs),
-		AllLocation:     input.AllLocation,
-		LocationIDs:     uniqueUint(input.LocationIDs),
-	}
-
-	if err := s.repo.Create(ctx, record); err != nil {
-		return nil, err
-	}
-
-	return &IssuedKey{
-		Key:    fmt.Sprintf("lti_%s_%s_%s", environment, prefix, secret),
-		Record: record,
-	}, nil
-}
-
-func (s *service) List(ctx context.Context, environment string) ([]entity.IntegrationAPIKey, error) {
-	return s.repo.List(ctx, strings.ToLower(strings.TrimSpace(environment)))
-}
-
-func (s *service) Revoke(ctx context.Context, environment, prefix string) error {
-	environment = strings.ToLower(strings.TrimSpace(environment))
-	prefix = strings.TrimSpace(prefix)
-	if environment == "" || prefix == "" {
-		return fmt.Errorf("environment and prefix are required")
-	}
-	return s.repo.Revoke(ctx, environment, prefix, s.now().UTC())
-}
-
-func parseRawKey(rawKey string) (environment string, prefix string, secret string, err error) {
-	rawKey = strings.TrimSpace(rawKey)
-	parts := strings.Split(rawKey, "_")
-	if len(parts) != 4 || parts[0] != "lti" {
-		return "", "", "", ErrInvalidAPIKey
-	}
-
-	environment = strings.ToLower(strings.TrimSpace(parts[1]))
-	prefix = strings.TrimSpace(parts[2])
-	secret = strings.TrimSpace(parts[3])
-	if environment == "" || prefix == "" || secret == "" {
-		return "", "", "", ErrInvalidAPIKey
-	}
-
-	return environment, prefix, secret, nil
-}
-
-func randomToken(size int) (string, error) {
-	buf := make([]byte, size)
-	if _, err := rand.Read(buf); err != nil {
-		return "", err
-	}
-
-	encoder := base32.StdEncoding.WithPadding(base32.NoPadding)
-	return strings.ToLower(encoder.EncodeToString(buf)), nil
-}
-
-func canonicalPermissions(perms []string) []string {
-	if len(perms) == 0 {
-		return []string{}
-	}
-
-	seen := make(map[string]struct{}, len(perms))
-	result := make([]string, 0, len(perms))
-	for _, perm := range perms {
-		perm = strings.ToLower(strings.TrimSpace(perm))
-		if perm == "" {
-			continue
-		}
-		if _, ok := seen[perm]; ok {
-			continue
-		}
-		seen[perm] = struct{}{}
-		result = append(result, perm)
-	}
-	return result
-}
-
-func uniqueUint(values []uint) []uint {
-	if len(values) == 0 {
-		return []uint{}
-	}
-
-	seen := make(map[uint]struct{}, len(values))
-	result := make([]uint, 0, len(values))
-	for _, value := range values {
-		if value == 0 {
-			continue
-		}
-		if _, ok := seen[value]; ok {
-			continue
-		}
-		seen[value] = struct{}{}
-		result = append(result, value)
-	}
-	return result
-}

internal/common/repository/marketing_delivery_attribution.repository.go

@@ -1,224 +0,0 @@
-package repository
-
-import (
-	"fmt"
-
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-type MarketingDeliveryAttributionRow struct {
-	MarketingDeliveryProductID uint    `gorm:"column:marketing_delivery_product_id"`
-	ProjectFlockKandangID      uint    `gorm:"column:project_flock_kandang_id"`
-	ProjectFlockID             uint    `gorm:"column:project_flock_id"`
-	ProjectFlockCategory       string  `gorm:"column:project_flock_category"`
-	AllocatedQty               float64 `gorm:"column:allocated_qty"`
-}
-
-func MarketingDeliveryAttributionRowsQuery(db *gorm.DB) *gorm.DB {
-	sql := `
-WITH mapped AS (
-	SELECT
-		sa.usable_id AS marketing_delivery_product_id,
-		pc.project_flock_kandang_id AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		SUM(sa.qty) AS allocated_qty
-	FROM stock_allocations sa
-	JOIN project_flock_populations pfp
-		ON pfp.id = sa.stockable_id
-		AND sa.stockable_type = ?
-	JOIN project_chickins pc ON pc.id = pfp.project_chickin_id
-	JOIN project_flock_kandangs pfk ON pfk.id = pc.project_flock_kandang_id
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	WHERE sa.usable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-	GROUP BY sa.usable_id, pc.project_flock_kandang_id, pfk.project_flock_id, pf.category
-
-	UNION ALL
-
-	SELECT
-		sa.usable_id AS marketing_delivery_product_id,
-		COALESCE(re.project_flock_kandang_id, r.project_flock_kandangs_id) AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		SUM(sa.qty) AS allocated_qty
-	FROM stock_allocations sa
-	JOIN recording_eggs re
-		ON re.id = sa.stockable_id
-		AND sa.stockable_type = ?
-	LEFT JOIN recordings r ON r.id = re.recording_id
-	JOIN project_flock_kandangs pfk ON pfk.id = COALESCE(re.project_flock_kandang_id, r.project_flock_kandangs_id)
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	WHERE sa.usable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-	GROUP BY sa.usable_id, COALESCE(re.project_flock_kandang_id, r.project_flock_kandangs_id), pfk.project_flock_id, pf.category
-
-	UNION ALL
-
-	SELECT
-		sa.usable_id AS marketing_delivery_product_id,
-		COALESCE(rd.source_project_flock_kandang_id, r.project_flock_kandangs_id) AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		SUM(sa.qty) AS allocated_qty
-	FROM stock_allocations sa
-	JOIN recording_depletions rd
-		ON rd.id = sa.stockable_id
-		AND sa.stockable_type = ?
-	LEFT JOIN recordings r ON r.id = rd.recording_id
-	JOIN project_flock_kandangs pfk ON pfk.id = COALESCE(rd.source_project_flock_kandang_id, r.project_flock_kandangs_id)
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	WHERE sa.usable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-	GROUP BY sa.usable_id, COALESCE(rd.source_project_flock_kandang_id, r.project_flock_kandangs_id), pfk.project_flock_id, pf.category
-
-	UNION ALL
-
-	SELECT
-		sa.usable_id AS marketing_delivery_product_id,
-		pi.project_flock_kandang_id AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		SUM(sa.qty) AS allocated_qty
-	FROM stock_allocations sa
-	JOIN purchase_items pi
-		ON pi.id = sa.stockable_id
-		AND sa.stockable_type = ?
-	JOIN project_flock_kandangs pfk ON pfk.id = pi.project_flock_kandang_id
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	WHERE sa.usable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-		AND pi.project_flock_kandang_id IS NOT NULL
-	GROUP BY sa.usable_id, pi.project_flock_kandang_id, pfk.project_flock_id, pf.category
-
-	UNION ALL
-
-	SELECT
-		sa.usable_id AS marketing_delivery_product_id,
-		source_pw.project_flock_kandang_id AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		SUM(sa.qty) AS allocated_qty
-	FROM stock_allocations sa
-	JOIN stock_transfer_details std
-		ON std.id = sa.stockable_id
-		AND sa.stockable_type = ?
-	JOIN product_warehouses source_pw ON source_pw.id = std.source_product_warehouse_id
-	JOIN project_flock_kandangs pfk ON pfk.id = source_pw.project_flock_kandang_id
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	WHERE sa.usable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-		AND source_pw.project_flock_kandang_id IS NOT NULL
-	GROUP BY sa.usable_id, source_pw.project_flock_kandang_id, pfk.project_flock_id, pf.category
-
-	UNION ALL
-
-	SELECT
-		sa.usable_id AS marketing_delivery_product_id,
-		ltt.target_project_flock_kandang_id AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		SUM(sa.qty) AS allocated_qty
-	FROM stock_allocations sa
-	JOIN laying_transfer_targets ltt
-		ON ltt.id = sa.stockable_id
-		AND sa.stockable_type = ?
-	JOIN project_flock_kandangs pfk ON pfk.id = ltt.target_project_flock_kandang_id
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	WHERE sa.usable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-	GROUP BY sa.usable_id, ltt.target_project_flock_kandang_id, pfk.project_flock_id, pf.category
-)
-SELECT
-	src.marketing_delivery_product_id,
-	src.project_flock_kandang_id,
-	src.project_flock_id,
-	src.project_flock_category,
-	SUM(src.allocated_qty) AS allocated_qty
-FROM (
-	SELECT
-		mapped.marketing_delivery_product_id,
-		mapped.project_flock_kandang_id,
-		mapped.project_flock_id,
-		mapped.project_flock_category,
-		mapped.allocated_qty
-	FROM mapped
-
-	UNION ALL
-
-	SELECT
-		mdp.id AS marketing_delivery_product_id,
-		pw.project_flock_kandang_id AS project_flock_kandang_id,
-		pfk.project_flock_id AS project_flock_id,
-		pf.category AS project_flock_category,
-		COALESCE(mdp.usage_qty, 0) AS allocated_qty
-	FROM marketing_delivery_products mdp
-	JOIN marketing_products mp ON mp.id = mdp.marketing_product_id
-	JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
-	JOIN project_flock_kandangs pfk ON pfk.id = pw.project_flock_kandang_id
-	JOIN project_flocks pf ON pf.id = pfk.project_flock_id
-	LEFT JOIN mapped ON mapped.marketing_delivery_product_id = mdp.id
-	WHERE mapped.marketing_delivery_product_id IS NULL
-		AND pw.project_flock_kandang_id IS NOT NULL
-		AND COALESCE(mdp.usage_qty, 0) > 0
-) src
-GROUP BY
-	src.marketing_delivery_product_id,
-	src.project_flock_kandang_id,
-	src.project_flock_id,
-	src.project_flock_category
-`
-
-	return db.Raw(
-		sql,
-		fifo.StockableKeyProjectFlockPopulation.String(),
-		fifo.UsableKeyMarketingDelivery.String(),
-		entity.StockAllocationStatusActive,
-		entity.StockAllocationPurposeConsume,
-		fifo.StockableKeyRecordingEgg.String(),
-		fifo.UsableKeyMarketingDelivery.String(),
-		entity.StockAllocationStatusActive,
-		entity.StockAllocationPurposeConsume,
-		fifo.StockableKeyRecordingDepletion.String(),
-		fifo.UsableKeyMarketingDelivery.String(),
-		entity.StockAllocationStatusActive,
-		entity.StockAllocationPurposeConsume,
-		fifo.StockableKeyPurchaseItems.String(),
-		fifo.UsableKeyMarketingDelivery.String(),
-		entity.StockAllocationStatusActive,
-		entity.StockAllocationPurposeConsume,
-		fifo.StockableKeyStockTransferIn.String(),
-		fifo.UsableKeyMarketingDelivery.String(),
-		entity.StockAllocationStatusActive,
-		entity.StockAllocationPurposeConsume,
-		fifo.StockableKeyTransferToLayingIn.String(),
-		fifo.UsableKeyMarketingDelivery.String(),
-		entity.StockAllocationStatusActive,
-		entity.StockAllocationPurposeConsume,
-	)
-}
-
-func MarketingDeliverySingleAttributionQuery(db *gorm.DB) *gorm.DB {
-	return db.
-		Table("(?) AS mda", MarketingDeliveryAttributionRowsQuery(db)).
-		Select(`
-			mda.marketing_delivery_product_id,
-			CASE
-				WHEN COUNT(DISTINCT mda.project_flock_kandang_id) = 1 THEN MIN(mda.project_flock_kandang_id)
-				ELSE NULL
-			END AS attributed_project_flock_kandang_id
-		`).
-		Group("mda.marketing_delivery_product_id")
-}
-
-func MarketingDeliveryAttributionFilterSQL(column string) string {
-	return fmt.Sprintf("EXISTS (SELECT 1 FROM (?) AS mda WHERE mda.marketing_delivery_product_id = %s)", column)
-}

internal/common/repository/marketing_delivery_attribution.repository_test.go

@@ -1,147 +0,0 @@
-package repository
-
-import (
-	"testing"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-)
-
-func TestMarketingDeliveryAttributionRowsQueryIncludesMappedAndFallbackRows(t *testing.T) {
-	db := setupMarketingAttributionTestDB(t)
-
-	statements := []string{
-		`INSERT INTO project_flocks (id, category) VALUES (1, 'LAYING')`,
-		`INSERT INTO project_flock_kandangs (id, project_flock_id) VALUES (101, 1), (102, 1)`,
-		`INSERT INTO project_chickins (id, project_flock_kandang_id) VALUES (201, 101), (202, 102)`,
-		`INSERT INTO project_flock_populations (id, project_chickin_id) VALUES (301, 201), (302, 202)`,
-		`INSERT INTO product_warehouses (id, project_flock_kandang_id) VALUES (401, NULL), (402, 101)`,
-		`INSERT INTO marketing_products (id, product_warehouse_id) VALUES (501, 401), (502, 402), (503, 401)`,
-		`INSERT INTO marketing_delivery_products (id, marketing_product_id, usage_qty) VALUES (601, 501, 100), (602, 502, 25), (603, 503, 12)`,
-		`INSERT INTO recording_eggs (id, recording_id, project_flock_kandang_id) VALUES (701, NULL, 101)`,
-		`INSERT INTO stock_allocations (id, product_warehouse_id, stockable_type, stockable_id, usable_type, usable_id, qty, status, allocation_purpose) VALUES
-			(1, 401, 'PROJECT_FLOCK_POPULATION', 301, 'MARKETING_DELIVERY', 601, 60, 'ACTIVE', 'CONSUME'),
-			(2, 401, 'PROJECT_FLOCK_POPULATION', 302, 'MARKETING_DELIVERY', 601, 40, 'ACTIVE', 'CONSUME'),
-			(3, 401, 'RECORDING_EGG', 701, 'MARKETING_DELIVERY', 603, 12, 'ACTIVE', 'CONSUME')`,
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed seeding fixtures: %v", err)
-		}
-	}
-
-	var rows []MarketingDeliveryAttributionRow
-	if err := db.Table("(?) AS mda", MarketingDeliveryAttributionRowsQuery(db)).
-		Order("mda.marketing_delivery_product_id ASC, mda.project_flock_kandang_id ASC").
-		Scan(&rows).Error; err != nil {
-		t.Fatalf("failed scanning attribution rows: %v", err)
-	}
-
-	if len(rows) != 4 {
-		t.Fatalf("expected 4 attribution rows, got %d", len(rows))
-	}
-	if rows[0].MarketingDeliveryProductID != 601 || rows[0].ProjectFlockKandangID != 101 || rows[0].AllocatedQty != 60 {
-		t.Fatalf("unexpected first attribution row: %+v", rows[0])
-	}
-	if rows[1].MarketingDeliveryProductID != 601 || rows[1].ProjectFlockKandangID != 102 || rows[1].AllocatedQty != 40 {
-		t.Fatalf("unexpected second attribution row: %+v", rows[1])
-	}
-	if rows[2].MarketingDeliveryProductID != 602 || rows[2].ProjectFlockKandangID != 101 || rows[2].AllocatedQty != 25 {
-		t.Fatalf("unexpected fallback attribution row: %+v", rows[2])
-	}
-	if rows[3].MarketingDeliveryProductID != 603 || rows[3].ProjectFlockKandangID != 101 || rows[3].AllocatedQty != 12 {
-		t.Fatalf("unexpected egg attribution row: %+v", rows[3])
-	}
-}
-
-func TestMarketingDeliverySingleAttributionQueryOnlyReturnsSingleSourceRows(t *testing.T) {
-	db := setupMarketingAttributionTestDB(t)
-
-	statements := []string{
-		`INSERT INTO project_flocks (id, category) VALUES (1, 'LAYING')`,
-		`INSERT INTO project_flock_kandangs (id, project_flock_id) VALUES (101, 1), (102, 1)`,
-		`INSERT INTO project_chickins (id, project_flock_kandang_id) VALUES (201, 101), (202, 102)`,
-		`INSERT INTO project_flock_populations (id, project_chickin_id) VALUES (301, 201), (302, 202)`,
-		`INSERT INTO product_warehouses (id, project_flock_kandang_id) VALUES (401, NULL), (402, 101)`,
-		`INSERT INTO marketing_products (id, product_warehouse_id) VALUES (501, 401), (502, 402), (503, 401)`,
-		`INSERT INTO marketing_delivery_products (id, marketing_product_id, usage_qty) VALUES (601, 501, 100), (602, 502, 25), (603, 503, 12)`,
-		`INSERT INTO recording_eggs (id, recording_id, project_flock_kandang_id) VALUES (701, NULL, 101)`,
-		`INSERT INTO stock_allocations (id, product_warehouse_id, stockable_type, stockable_id, usable_type, usable_id, qty, status, allocation_purpose) VALUES
-			(1, 401, 'PROJECT_FLOCK_POPULATION', 301, 'MARKETING_DELIVERY', 601, 60, 'ACTIVE', 'CONSUME'),
-			(2, 401, 'PROJECT_FLOCK_POPULATION', 302, 'MARKETING_DELIVERY', 601, 40, 'ACTIVE', 'CONSUME'),
-			(3, 401, 'RECORDING_EGG', 701, 'MARKETING_DELIVERY', 603, 12, 'ACTIVE', 'CONSUME')`,
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed seeding fixtures: %v", err)
-		}
-	}
-
-	type singleRow struct {
-		MarketingDeliveryProductID      uint  `gorm:"column:marketing_delivery_product_id"`
-		AttributedProjectFlockKandangID *uint `gorm:"column:attributed_project_flock_kandang_id"`
-	}
-
-	var rows []singleRow
-	if err := db.Table("(?) AS mda", MarketingDeliverySingleAttributionQuery(db)).
-		Order("mda.marketing_delivery_product_id ASC").
-		Scan(&rows).Error; err != nil {
-		t.Fatalf("failed scanning single attribution rows: %v", err)
-	}
-
-	if len(rows) != 3 {
-		t.Fatalf("expected 3 rows, got %d", len(rows))
-	}
-	if rows[0].MarketingDeliveryProductID != 601 || rows[0].AttributedProjectFlockKandangID != nil {
-		t.Fatalf("expected pooled delivery 601 to have nil single attribution, got %+v", rows[0])
-	}
-	if rows[1].MarketingDeliveryProductID != 602 || rows[1].AttributedProjectFlockKandangID == nil || *rows[1].AttributedProjectFlockKandangID != 101 {
-		t.Fatalf("expected fallback delivery 602 to map to kandang 101, got %+v", rows[1])
-	}
-	if rows[2].MarketingDeliveryProductID != 603 || rows[2].AttributedProjectFlockKandangID == nil || *rows[2].AttributedProjectFlockKandangID != 101 {
-		t.Fatalf("expected egg delivery 603 to map to kandang 101, got %+v", rows[2])
-	}
-}
-
-func setupMarketingAttributionTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=private"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	statements := []string{
-		`CREATE TABLE stock_allocations (
-			id INTEGER PRIMARY KEY,
-			product_warehouse_id INTEGER,
-			stockable_type TEXT,
-			stockable_id INTEGER,
-			usable_type TEXT,
-			usable_id INTEGER,
-			qty NUMERIC(15,3),
-			status TEXT,
-			allocation_purpose TEXT
-		)`,
-		`CREATE TABLE project_flock_populations (id INTEGER PRIMARY KEY, project_chickin_id INTEGER)`,
-		`CREATE TABLE project_chickins (id INTEGER PRIMARY KEY, project_flock_kandang_id INTEGER)`,
-		`CREATE TABLE project_flock_kandangs (id INTEGER PRIMARY KEY, project_flock_id INTEGER)`,
-		`CREATE TABLE project_flocks (id INTEGER PRIMARY KEY, category TEXT)`,
-		`CREATE TABLE marketing_delivery_products (id INTEGER PRIMARY KEY, marketing_product_id INTEGER, usage_qty NUMERIC(15,3))`,
-		`CREATE TABLE marketing_products (id INTEGER PRIMARY KEY, product_warehouse_id INTEGER)`,
-		`CREATE TABLE product_warehouses (id INTEGER PRIMARY KEY, project_flock_kandang_id INTEGER NULL)`,
-		`CREATE TABLE recording_eggs (id INTEGER PRIMARY KEY, recording_id INTEGER, project_flock_kandang_id INTEGER NULL)`,
-		`CREATE TABLE recordings (id INTEGER PRIMARY KEY, project_flock_kandangs_id INTEGER NULL)`,
-		`CREATE TABLE recording_depletions (id INTEGER PRIMARY KEY, recording_id INTEGER, source_project_flock_kandang_id INTEGER NULL)`,
-		`CREATE TABLE purchase_items (id INTEGER PRIMARY KEY, project_flock_kandang_id INTEGER NULL)`,
-		`CREATE TABLE stock_transfer_details (id INTEGER PRIMARY KEY, source_product_warehouse_id INTEGER NULL)`,
-		`CREATE TABLE laying_transfer_targets (id INTEGER PRIMARY KEY, target_project_flock_kandang_id INTEGER NULL)`,
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed preparing schema: %v", err)
-		}
-	}
-
-	return db
-}

internal/common/service/fifo_pending_policy.go

@@ -1,104 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"strings"
-
-	"gorm.io/gorm"
-)
-
-type FifoPendingPolicyInput struct {
-	Lane          string
-	FlagGroupCode string
-	FunctionCode  string
-	LegacyTypeKey string
-}
-
-type FifoPendingPolicyResult struct {
-	AllowPending bool
-	RuleSource   string
-	Found        bool
-}
-
-func ResolveFifoPendingPolicy(ctx context.Context, tx *gorm.DB, input FifoPendingPolicyInput) (*FifoPendingPolicyResult, error) {
-	if tx == nil {
-		return nil, gorm.ErrInvalidDB
-	}
-
-	lane := strings.ToUpper(strings.TrimSpace(input.Lane))
-	flagGroupCode := strings.ToUpper(strings.TrimSpace(input.FlagGroupCode))
-	functionCode := strings.ToUpper(strings.TrimSpace(input.FunctionCode))
-	legacyTypeKey := strings.ToUpper(strings.TrimSpace(input.LegacyTypeKey))
-	if lane == "" {
-		return &FifoPendingPolicyResult{
-			AllowPending: false,
-			RuleSource:   "SAFE_DEFAULT_BLOCK",
-			Found:        false,
-		}, nil
-	}
-
-	type overconsumeRuleRow struct {
-		Allow bool `gorm:"column:allow_overconsume"`
-	}
-	var overconsume overconsumeRuleRow
-	overconsumeErr := tx.WithContext(ctx).
-		Table("fifo_stock_v2_overconsume_rules").
-		Select("allow_overconsume").
-		Where("is_active = TRUE").
-		Where("lane = ?", lane).
-		Where("(flag_group_code IS NULL OR flag_group_code = ?)", flagGroupCode).
-		Where("(function_code IS NULL OR function_code = ?)", functionCode).
-		Order("CASE WHEN flag_group_code IS NULL THEN 1 ELSE 0 END ASC").
-		Order("CASE WHEN function_code IS NULL THEN 1 ELSE 0 END ASC").
-		Order("priority ASC, id ASC").
-		Limit(1).
-		Take(&overconsume).Error
-	if overconsumeErr == nil {
-		return &FifoPendingPolicyResult{
-			AllowPending: overconsume.Allow,
-			RuleSource:   "OVERCONSUME_RULE",
-			Found:        true,
-		}, nil
-	}
-	if !errors.Is(overconsumeErr, gorm.ErrRecordNotFound) {
-		return nil, overconsumeErr
-	}
-
-	type routeRuleRow struct {
-		AllowPendingDefault bool `gorm:"column:allow_pending_default"`
-	}
-	var routeRule routeRuleRow
-	routeQuery := tx.WithContext(ctx).
-		Table("fifo_stock_v2_route_rules").
-		Select("allow_pending_default").
-		Where("is_active = TRUE").
-		Where("lane = ?", lane).
-		Where("flag_group_code = ?", flagGroupCode)
-	if legacyTypeKey != "" {
-		routeQuery = routeQuery.Where("legacy_type_key = ?", legacyTypeKey)
-	}
-	if functionCode != "" {
-		routeQuery = routeQuery.Where("function_code = ?", functionCode)
-	}
-	routeErr := routeQuery.
-		Order("id ASC").
-		Limit(1).
-		Take(&routeRule).Error
-	if routeErr == nil {
-		return &FifoPendingPolicyResult{
-			AllowPending: routeRule.AllowPendingDefault,
-			RuleSource:   "ROUTE_RULE_DEFAULT",
-			Found:        true,
-		}, nil
-	}
-	if !errors.Is(routeErr, gorm.ErrRecordNotFound) {
-		return nil, routeErr
-	}
-
-	return &FifoPendingPolicyResult{
-		AllowPending: false,
-		RuleSource:   "SAFE_DEFAULT_BLOCK",
-		Found:        false,
-	}, nil
-}

internal/common/service/fifo_stock_v2/allocate.go

@@ -220,9 +220,6 @@ func shouldSkipStockableForUsable(req AllocateRequest, stockableType string) boo
 	if (usableType == "PROJECT_CHICKIN" || functionCode == "CHICKIN_OUT") && stockable == "PROJECT_FLOCK_POPULATION" {
 		return true
 	}
-	if (usableType == "STOCK_TRANSFER_OUT" || functionCode == "STOCK_TRANSFER_OUT") && stockable == "PROJECT_FLOCK_POPULATION" {
-		return true
-	}
 
 	return false
 }
@@ -499,6 +496,10 @@ func (s *fifoStockV2Service) Reflow(ctx context.Context, req ReflowRequest) (*Re
 			if len(rollbackRes.Details) > 0 {
 				result.Rollback.Details = append(result.Rollback.Details, rollbackRes.Details...)
 			}
+			minDesired := rollbackRes.ReleasedQty + usableRow.PendingQuantity
+			if desiredQty < minDesired {
+				desiredQty = minDesired
+			}
 
 			if desiredQty <= 0 {
 				continue
@@ -701,17 +702,16 @@ func (s *fifoStockV2Service) resolveRollbackFlagGroup(ctx context.Context, tx *g
 		FlagGroupCode string `gorm:"column:flag_group_code"`
 	}
 	var latest row
-	latestQuery := tx.WithContext(ctx).
+	err := tx.WithContext(ctx).
 		Table("stock_allocations").
 		Select("flag_group_code").
 		Where("usable_type = ? AND usable_id = ?", req.Usable.LegacyTypeKey, req.Usable.ID).
 		Where("engine_version = 'v2'").
 		Where("allocation_purpose = ?", defaultAllocationPurpose()).
-		Where("flag_group_code IS NOT NULL AND flag_group_code <> ''")
+		Where("flag_group_code IS NOT NULL AND flag_group_code <> ''").
-	if code := strings.TrimSpace(req.Usable.FunctionCode); code != "" {
+		Order("id DESC").
-		latestQuery = latestQuery.Where("function_code = ?", code)
+		Limit(1).
-	}
+		Take(&latest).Error
-	err := latestQuery.Order("id DESC").Limit(1).Take(&latest).Error
 	if err == nil && strings.TrimSpace(latest.FlagGroupCode) != "" {
 		return latest.FlagGroupCode, nil
 	}
@@ -719,56 +719,19 @@ func (s *fifoStockV2Service) resolveRollbackFlagGroup(ctx context.Context, tx *g
 		return "", err
 	}
 
-	rulesQuery := tx.WithContext(ctx).
+	var rules []routeRule
+	err = tx.WithContext(ctx).
 		Table("fifo_stock_v2_route_rules").
 		Where("is_active = TRUE").
 		Where("lane = ?", string(LaneUsable)).
-		Where("legacy_type_key = ?", req.Usable.LegacyTypeKey)
+		Where("legacy_type_key = ?", req.Usable.LegacyTypeKey).
-	if code := strings.TrimSpace(req.Usable.FunctionCode); code != "" {
+		Find(&rules).Error
-		rulesQuery = rulesQuery.Where("function_code = ?", code)
-	}
-
-	var rules []routeRule
-	err = rulesQuery.Find(&rules).Error
 	if err != nil {
 		return "", err
 	}
 	if len(rules) == 0 {
 		return "", fmt.Errorf("cannot resolve flag group for usable type %s", req.Usable.LegacyTypeKey)
 	}
-	if len(rules) > 1 && req.ProductWarehouseID != 0 {
-		type candidateRow struct {
-			FlagGroupCode string `gorm:"column:flag_group_code"`
-		}
-		var candidates []candidateRow
-		byProductQuery := tx.WithContext(ctx).
-			Table("fifo_stock_v2_route_rules rr").
-			Select("DISTINCT rr.flag_group_code").
-			Joins("JOIN fifo_stock_v2_flag_groups fg ON fg.code = rr.flag_group_code AND fg.is_active = TRUE").
-			Where("rr.is_active = TRUE").
-			Where("rr.lane = ?", string(LaneUsable)).
-			Where("rr.legacy_type_key = ?", req.Usable.LegacyTypeKey).
-			Where(`
-				EXISTS (
-					SELECT 1
-					FROM product_warehouses pw
-					JOIN flags f ON f.flagable_id = pw.product_id
-					JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-					WHERE pw.id = ?
-					  AND f.flagable_type = 'products'
-					  AND fm.flag_group_code = rr.flag_group_code
-				)
-			`, req.ProductWarehouseID)
-		if code := strings.TrimSpace(req.Usable.FunctionCode); code != "" {
-			byProductQuery = byProductQuery.Where("rr.function_code = ?", code)
-		}
-		if err := byProductQuery.Order("rr.flag_group_code ASC").Scan(&candidates).Error; err != nil {
-			return "", err
-		}
-		if len(candidates) == 1 {
-			return strings.TrimSpace(candidates[0].FlagGroupCode), nil
-		}
-	}
 	if len(rules) > 1 {
 		return "", fmt.Errorf("ambiguous rollback flag group for usable type %s", req.Usable.LegacyTypeKey)
 	}

internal/config/config.go

@@ -23,7 +23,6 @@ type SSOClientConfig struct {
 
 var (
 	IsProd                         bool
-	AppEnv                         string
 	AppHost                        string
 	Version                        string
 	LogLevel                       string
@@ -85,8 +84,7 @@ func init() {
 	loadConfig()
 
 	// server configuration
-	AppEnv = defaultString(strings.TrimSpace(viper.GetString("APP_ENV")), "development")
+	IsProd = viper.GetString("APP_ENV") == "prod"
-	IsProd = AppEnv == "prod"
 	AppHost = viper.GetString("APP_HOST")
 	AppPort = viper.GetInt("APP_PORT")
 	Version = viper.GetString("VERSION")
@@ -113,7 +111,7 @@ func init() {
 	// Cors
 	CORSAllowOrigins = parseList("CORS_ALLOW_ORIGINS")
 	CORSAllowMethods = parseListWithDefault("CORS_ALLOW_METHODS", "GET,POST,PUT,PATCH,DELETE,OPTIONS")
-	CORSAllowHeaders = parseListWithDefault("CORS_ALLOW_HEADERS", "Content-Type,Authorization,X-API-Key,X-Requested-With")
+	CORSAllowHeaders = parseListWithDefault("CORS_ALLOW_HEADERS", "Content-Type,Authorization,X-Requested-With")
 	CORSExposeHeaders = parseList("CORS_EXPOSE_HEADERS")
 	CORSAllowCredentials = viper.GetBool("CORS_ALLOW_CREDENTIALS")
 	CORSMaxAge = viper.GetInt("CORS_MAX_AGE")
@@ -263,10 +261,6 @@ func defaultString(v, def string) string {
 	return v
 }
 
-func LayingWeekStart() int {
-	return TransferToLayingGrowingMaxWeek
-}
-
 func joinPath(parts ...string) string {
 	out := make([]string, 0, len(parts))
 	for _, part := range parts {

internal/database/migrations/20251018120649_create_project_chick_ins_table.up.sql

@@ -1,57 +0,0 @@
-CREATE TABLE IF NOT EXISTS project_chickins (
-    id BIGSERIAL PRIMARY KEY,
-    project_flock_kandang_id BIGINT NOT NULL,
-    product_warehouse_id BIGINT NOT NULL,
-    chick_in_date DATE NOT NULL,
-    usage_qty NUMERIC(15, 3) NOT NULL,
-    pending_usage_qty NUMERIC(15, 3) DEFAULT 0,
-    notes TEXT,
-    created_by BIGINT NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT now(),
-    updated_at TIMESTAMPTZ DEFAULT now(),
-    deleted_at TIMESTAMPTZ
-);
-
-DO $$
-BEGIN
-    IF to_regclass('project_flock_kandangs') IS NOT NULL THEN
-        ALTER TABLE project_chickins
-            ADD CONSTRAINT fk_project_chickins_kandang
-            FOREIGN KEY (project_flock_kandang_id)
-            REFERENCES project_flock_kandangs(id)
-            ON DELETE RESTRICT ON UPDATE CASCADE;
-    END IF;
-
-    IF to_regclass('product_warehouses') IS NOT NULL THEN
-        ALTER TABLE project_chickins
-            ADD CONSTRAINT fk_project_chickins_warehouse
-            FOREIGN KEY (product_warehouse_id)
-            REFERENCES product_warehouses(id)
-            ON DELETE CASCADE ON UPDATE CASCADE;
-    END IF;
-
-    IF to_regclass('users') IS NOT NULL THEN
-        ALTER TABLE project_chickins
-            ADD CONSTRAINT fk_project_chickins_created_by
-            FOREIGN KEY (created_by)
-            REFERENCES users(id)
-            ON DELETE RESTRICT ON UPDATE CASCADE;
-    END IF;
-END $$;
-
-CREATE INDEX IF NOT EXISTS idx_chickins_kandang_id ON project_chickins (project_flock_kandang_id)
-WHERE
-    deleted_at IS NULL;
-
-CREATE INDEX IF NOT EXISTS idx_chickins_warehouse_id ON project_chickins (product_warehouse_id)
-WHERE
-    deleted_at IS NULL;
-
-CREATE INDEX IF NOT EXISTS idx_chickins_created_by ON project_chickins (created_by);
-
-CREATE INDEX IF NOT EXISTS idx_chickins_kandang_deleted ON project_chickins (
-    project_flock_kandang_id,
-    deleted_at
-);
-
-CREATE INDEX IF NOT EXISTS idx_chickins_deleted_at ON project_chickins (deleted_at);

internal/database/migrations/20251020022357_create_project_flock_populations_table.up.sql

@@ -1,60 +0,0 @@
-CREATE TABLE IF NOT EXISTS project_flock_populations (
-    id BIGSERIAL PRIMARY KEY,
-    project_chickin_id BIGINT NOT NULL,
-    product_warehouse_id BIGINT NOT NULL,
-    total_qty NUMERIC(15, 3) NOT NULL,
-    total_used_qty NUMERIC(15, 3) DEFAULT 0,
-    notes TEXT,
-    created_by BIGINT NOT NULL,
-    created_at TIMESTAMPTZ DEFAULT now(),
-    updated_at TIMESTAMPTZ DEFAULT now(),
-    deleted_at TIMESTAMPTZ
-);
-
-DO $$
-BEGIN
-    IF to_regclass('project_chickins') IS NOT NULL THEN
-        ALTER TABLE project_flock_populations
-            ADD CONSTRAINT fk_project_flock_populations_chickin
-            FOREIGN KEY (project_chickin_id)
-            REFERENCES project_chickins(id)
-            ON DELETE RESTRICT ON UPDATE CASCADE;
-    END IF;
-
-    IF to_regclass('product_warehouses') IS NOT NULL THEN
-        ALTER TABLE project_flock_populations
-            ADD CONSTRAINT fk_project_flock_populations_warehouse
-            FOREIGN KEY (product_warehouse_id)
-            REFERENCES product_warehouses(id)
-            ON DELETE RESTRICT ON UPDATE CASCADE;
-    END IF;
-
-    IF to_regclass('users') IS NOT NULL THEN
-        ALTER TABLE project_flock_populations
-            ADD CONSTRAINT fk_project_flock_populations_created_by
-            FOREIGN KEY (created_by)
-            REFERENCES users(id)
-            ON DELETE RESTRICT ON UPDATE CASCADE;
-    END IF;
-END $$;
-
-CREATE INDEX IF NOT EXISTS idx_populations_chickin_id ON project_flock_populations (project_chickin_id)
-WHERE
-    deleted_at IS NULL;
-
-CREATE INDEX IF NOT EXISTS idx_populations_warehouse_id ON project_flock_populations (product_warehouse_id)
-WHERE
-    deleted_at IS NULL;
-
-CREATE INDEX IF NOT EXISTS idx_populations_created_by ON project_flock_populations (created_by);
-
-CREATE INDEX IF NOT EXISTS idx_populations_chickin_deleted ON project_flock_populations (
-    project_chickin_id,
-    deleted_at
-);
-
-CREATE INDEX IF NOT EXISTS idx_populations_deleted_at ON project_flock_populations (deleted_at);
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_populations_chickin_unique ON project_flock_populations (project_chickin_id)
-WHERE
-    deleted_at IS NULL;

internal/database/migrations/20251022024829_create_project_chickin_details.up.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS project_chickin_details (
 
 DO $$
 BEGIN
-    IF to_regclass('project_chickins') IS NOT NULL THEN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'project_chickins') THEN
         ALTER TABLE project_chickin_details
             ADD CONSTRAINT fk_project_chickin_id
             FOREIGN KEY (project_chickin_id)
@@ -20,7 +20,7 @@ BEGIN
             ON DELETE CASCADE ON UPDATE CASCADE;
     END IF;
 
-    IF to_regclass('product_warehouses') IS NOT NULL THEN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'product_warehouses') THEN
         ALTER TABLE project_chickin_details
             ADD CONSTRAINT fk_product_warehouse_id
             FOREIGN KEY (product_warehouse_id)
@@ -28,7 +28,7 @@ BEGIN
             ON DELETE RESTRICT ON UPDATE CASCADE;
     END IF;
 
-    IF to_regclass('users') IS NOT NULL THEN
+    IF EXISTS (SELECT 1 FROM pg_tables WHERE tablename = 'users') THEN
         ALTER TABLE project_chickin_details
             ADD CONSTRAINT fk_created_by
             FOREIGN KEY (created_by)
@@ -42,4 +42,4 @@ CREATE INDEX IF NOT EXISTS idx_project_chickin_details_project_chickin_id ON pro
 
 CREATE INDEX IF NOT EXISTS idx_project_chickin_details_product_warehouse_id ON project_chickin_details (product_warehouse_id);
 
-CREATE INDEX IF NOT EXISTS idx_project_chickin_details_created_by ON project_chickin_details (created_by);
+CREATE INDEX IF NOT EXISTS idx_project_chickin_details_created_by ON project_chickin_details (created_by);

internal/database/migrations/20260313061525_adjust_marketing_out_overconsume_to_ayam_only.down.sql

@@ -1,118 +0,0 @@
-BEGIN;
-
--- MARKETING_OUT: if AYAM-only rule exists, convert back to global rule.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    flag_group_code = NULL,
-    allow_overconsume = FALSE,
-    priority = 20,
-    reason = 'fifo_v2_exception_marketing_block',
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'MARKETING_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_marketing_block_ayam_only';
-
--- MARKETING_OUT: if global row already exists, keep it active.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    allow_overconsume = FALSE,
-    priority = 20,
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'MARKETING_OUT'
-  AND flag_group_code IS NULL
-  AND reason = 'fifo_v2_exception_marketing_block';
-
--- MARKETING_OUT: insert global rule if still missing.
-INSERT INTO fifo_stock_v2_overconsume_rules(
-    flag_group_code,
-    function_code,
-    lane,
-    allow_overconsume,
-    priority,
-    reason,
-    is_active
-)
-SELECT NULL, 'MARKETING_OUT', 'USABLE', FALSE, 20, 'fifo_v2_exception_marketing_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1
-    FROM fifo_stock_v2_overconsume_rules
-    WHERE lane = 'USABLE'
-      AND function_code = 'MARKETING_OUT'
-      AND flag_group_code IS NULL
-      AND reason = 'fifo_v2_exception_marketing_block'
-);
-
--- MARKETING_OUT: deactivate AYAM-only duplicates if any remain.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    is_active = FALSE
-WHERE lane = 'USABLE'
-  AND function_code = 'MARKETING_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_marketing_block_ayam_only';
-
--- STOCK_TRANSFER_OUT: if AYAM-only rule exists, convert back to global rule.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    flag_group_code = NULL,
-    allow_overconsume = FALSE,
-    priority = 30,
-    reason = 'fifo_v2_exception_transfer_block',
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'STOCK_TRANSFER_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_transfer_block_ayam_only';
-
--- STOCK_TRANSFER_OUT: if global row already exists, keep it active.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    allow_overconsume = FALSE,
-    priority = 30,
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'STOCK_TRANSFER_OUT'
-  AND flag_group_code IS NULL
-  AND reason = 'fifo_v2_exception_transfer_block';
-
--- STOCK_TRANSFER_OUT: insert global rule if still missing.
-INSERT INTO fifo_stock_v2_overconsume_rules(
-    flag_group_code,
-    function_code,
-    lane,
-    allow_overconsume,
-    priority,
-    reason,
-    is_active
-)
-SELECT NULL, 'STOCK_TRANSFER_OUT', 'USABLE', FALSE, 30, 'fifo_v2_exception_transfer_block', TRUE
-WHERE NOT EXISTS (
-    SELECT 1
-    FROM fifo_stock_v2_overconsume_rules
-    WHERE lane = 'USABLE'
-      AND function_code = 'STOCK_TRANSFER_OUT'
-      AND flag_group_code IS NULL
-      AND reason = 'fifo_v2_exception_transfer_block'
-);
-
--- STOCK_TRANSFER_OUT: deactivate AYAM-only duplicates if any remain.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    is_active = FALSE
-WHERE lane = 'USABLE'
-  AND function_code = 'STOCK_TRANSFER_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_transfer_block_ayam_only';
-
--- CHICKIN_OUT: rollback AYAM-only hard-block added by up migration.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    is_active = FALSE
-WHERE lane = 'USABLE'
-  AND function_code = 'CHICKIN_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_chickin_block_ayam_only';
-
-COMMIT;

internal/database/migrations/20260313061525_adjust_marketing_out_overconsume_to_ayam_only.up.sql

@@ -1,139 +0,0 @@
-BEGIN;
-
--- MARKETING_OUT: if global rule exists, convert to AYAM-specific.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    flag_group_code = 'AYAM',
-    allow_overconsume = FALSE,
-    priority = 20,
-    reason = 'fifo_v2_exception_marketing_block_ayam_only',
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'MARKETING_OUT'
-  AND flag_group_code IS NULL
-  AND reason = 'fifo_v2_exception_marketing_block';
-
--- MARKETING_OUT: if AYAM-specific row already exists, enforce desired value.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    allow_overconsume = FALSE,
-    priority = 20,
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'MARKETING_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_marketing_block_ayam_only';
-
--- MARKETING_OUT: insert AYAM-specific if no suitable row exists.
-INSERT INTO fifo_stock_v2_overconsume_rules(
-    flag_group_code,
-    function_code,
-    lane,
-    allow_overconsume,
-    priority,
-    reason,
-    is_active
-)
-SELECT 'AYAM', 'MARKETING_OUT', 'USABLE', FALSE, 20, 'fifo_v2_exception_marketing_block_ayam_only', TRUE
-WHERE NOT EXISTS (
-    SELECT 1
-    FROM fifo_stock_v2_overconsume_rules
-    WHERE lane = 'USABLE'
-      AND function_code = 'MARKETING_OUT'
-      AND flag_group_code = 'AYAM'
-      AND reason = 'fifo_v2_exception_marketing_block_ayam_only'
-);
-
--- MARKETING_OUT: deactivate remaining global rule (if any duplicate row exists).
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    is_active = FALSE
-WHERE lane = 'USABLE'
-  AND function_code = 'MARKETING_OUT'
-  AND flag_group_code IS NULL
-  AND reason = 'fifo_v2_exception_marketing_block';
-
--- STOCK_TRANSFER_OUT: if global rule exists, convert to AYAM-specific.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    flag_group_code = 'AYAM',
-    allow_overconsume = FALSE,
-    priority = 30,
-    reason = 'fifo_v2_exception_transfer_block_ayam_only',
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'STOCK_TRANSFER_OUT'
-  AND flag_group_code IS NULL
-  AND reason = 'fifo_v2_exception_transfer_block';
-
--- STOCK_TRANSFER_OUT: if AYAM-specific row already exists, enforce desired value.
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    allow_overconsume = FALSE,
-    priority = 30,
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'STOCK_TRANSFER_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_transfer_block_ayam_only';
-
--- STOCK_TRANSFER_OUT: insert AYAM-specific if no suitable row exists.
-INSERT INTO fifo_stock_v2_overconsume_rules(
-    flag_group_code,
-    function_code,
-    lane,
-    allow_overconsume,
-    priority,
-    reason,
-    is_active
-)
-SELECT 'AYAM', 'STOCK_TRANSFER_OUT', 'USABLE', FALSE, 30, 'fifo_v2_exception_transfer_block_ayam_only', TRUE
-WHERE NOT EXISTS (
-    SELECT 1
-    FROM fifo_stock_v2_overconsume_rules
-    WHERE lane = 'USABLE'
-      AND function_code = 'STOCK_TRANSFER_OUT'
-      AND flag_group_code = 'AYAM'
-      AND reason = 'fifo_v2_exception_transfer_block_ayam_only'
-);
-
--- STOCK_TRANSFER_OUT: deactivate remaining global rule (if any duplicate row exists).
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    is_active = FALSE
-WHERE lane = 'USABLE'
-  AND function_code = 'STOCK_TRANSFER_OUT'
-  AND flag_group_code IS NULL
-  AND reason = 'fifo_v2_exception_transfer_block';
-
--- CHICKIN_OUT: enforce AYAM-specific hard-block (cannot pending).
-UPDATE fifo_stock_v2_overconsume_rules
-SET
-    allow_overconsume = FALSE,
-    priority = 25,
-    is_active = TRUE
-WHERE lane = 'USABLE'
-  AND function_code = 'CHICKIN_OUT'
-  AND flag_group_code = 'AYAM'
-  AND reason = 'fifo_v2_exception_chickin_block_ayam_only';
-
-INSERT INTO fifo_stock_v2_overconsume_rules(
-    flag_group_code,
-    function_code,
-    lane,
-    allow_overconsume,
-    priority,
-    reason,
-    is_active
-)
-SELECT 'AYAM', 'CHICKIN_OUT', 'USABLE', FALSE, 25, 'fifo_v2_exception_chickin_block_ayam_only', TRUE
-WHERE NOT EXISTS (
-    SELECT 1
-    FROM fifo_stock_v2_overconsume_rules
-    WHERE lane = 'USABLE'
-      AND function_code = 'CHICKIN_OUT'
-      AND flag_group_code = 'AYAM'
-      AND reason = 'fifo_v2_exception_chickin_block_ayam_only'
-);
-
-COMMIT;

internal/database/migrations/20260316080836_add_paired_adjustment_id_to_adjustment_stocks.down.sql

@@ -1,14 +0,0 @@
-BEGIN;
-
-ALTER TABLE adjustment_stocks
-    DROP CONSTRAINT IF EXISTS chk_adjustment_stocks_paired_not_self;
-
-ALTER TABLE adjustment_stocks
-    DROP CONSTRAINT IF EXISTS fk_adjustment_stocks_paired_adjustment_id;
-
-DROP INDEX IF EXISTS idx_adjustment_stocks_paired_adjustment_id;
-
-ALTER TABLE adjustment_stocks
-    DROP COLUMN IF EXISTS paired_adjustment_id;
-
-COMMIT;

internal/database/migrations/20260316080836_add_paired_adjustment_id_to_adjustment_stocks.up.sql

@@ -1,86 +0,0 @@
-BEGIN;
-
-ALTER TABLE adjustment_stocks
-    ADD COLUMN IF NOT EXISTS paired_adjustment_id BIGINT NULL;
-
-DO $$
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1 FROM pg_constraint WHERE conname = 'fk_adjustment_stocks_paired_adjustment_id'
-    ) THEN
-        ALTER TABLE adjustment_stocks
-            ADD CONSTRAINT fk_adjustment_stocks_paired_adjustment_id
-            FOREIGN KEY (paired_adjustment_id)
-            REFERENCES adjustment_stocks(id)
-            ON DELETE SET NULL
-            ON UPDATE CASCADE;
-    END IF;
-END $$;
-
-ALTER TABLE adjustment_stocks
-    DROP CONSTRAINT IF EXISTS chk_adjustment_stocks_paired_not_self;
-
-ALTER TABLE adjustment_stocks
-    ADD CONSTRAINT chk_adjustment_stocks_paired_not_self
-    CHECK (paired_adjustment_id IS NULL OR paired_adjustment_id <> id);
-
-CREATE INDEX IF NOT EXISTS idx_adjustment_stocks_paired_adjustment_id
-    ON adjustment_stocks(paired_adjustment_id);
-
--- Backfill pairing untuk depletion-out <-> depletion-in existing records.
-WITH candidates AS (
-    SELECT
-        src.id AS src_id,
-        dst.id AS dst_id,
-        ABS(EXTRACT(EPOCH FROM (dst.created_at - src.created_at))) AS ts_diff,
-        ABS(dst.id - src.id) AS id_diff,
-        ROW_NUMBER() OVER (
-            PARTITION BY src.id
-            ORDER BY ABS(EXTRACT(EPOCH FROM (dst.created_at - src.created_at))) ASC,
-                     ABS(dst.id - src.id) ASC,
-                     dst.id ASC
-        ) AS rn_src,
-        ROW_NUMBER() OVER (
-            PARTITION BY dst.id
-            ORDER BY ABS(EXTRACT(EPOCH FROM (dst.created_at - src.created_at))) ASC,
-                     ABS(dst.id - src.id) ASC,
-                     src.id ASC
-        ) AS rn_dst
-    FROM adjustment_stocks src
-    JOIN adjustment_stocks dst
-      ON dst.id <> src.id
-     AND dst.transaction_type = src.transaction_type
-     AND dst.function_code = 'RECORDING_DEPLETION_IN'
-     AND src.function_code = 'RECORDING_DEPLETION_OUT'
-     AND dst.paired_adjustment_id IS NULL
-     AND src.paired_adjustment_id IS NULL
-     AND ABS((COALESCE(src.usage_qty, 0) + COALESCE(src.pending_qty, 0)) - COALESCE(dst.total_qty, 0)) < 0.0001
-     AND COALESCE(src.price, 0) = COALESCE(dst.price, 0)
-     AND COALESCE(src.grand_total, 0) = COALESCE(dst.grand_total, 0)
-     AND ABS(EXTRACT(EPOCH FROM (dst.created_at - src.created_at))) <= 120
-),
-chosen AS (
-    SELECT src_id, dst_id
-    FROM candidates
-    WHERE rn_src = 1
-      AND rn_dst = 1
-)
-UPDATE adjustment_stocks src
-SET paired_adjustment_id = c.dst_id
-FROM chosen c
-WHERE src.id = c.src_id
-  AND src.paired_adjustment_id IS NULL;
-
-WITH chosen AS (
-    SELECT a.id AS src_id, a.paired_adjustment_id AS dst_id
-    FROM adjustment_stocks a
-    WHERE a.function_code = 'RECORDING_DEPLETION_OUT'
-      AND a.paired_adjustment_id IS NOT NULL
-)
-UPDATE adjustment_stocks dst
-SET paired_adjustment_id = c.src_id
-FROM chosen c
-WHERE dst.id = c.dst_id
-  AND dst.paired_adjustment_id IS NULL;
-
-COMMIT;

internal/database/migrations/20260330110000_add_recording_attribution_fields_for_farm_stock.down.sql

@@ -1,18 +0,0 @@
-BEGIN;
-
-DROP INDEX IF EXISTS idx_recording_depletions_source_project_flock_kandang_id;
-DROP INDEX IF EXISTS idx_recording_eggs_project_flock_kandang_id;
-
-ALTER TABLE recording_depletions
-    DROP CONSTRAINT IF EXISTS fk_recording_depletions_source_project_flock_kandang_id;
-
-ALTER TABLE recording_eggs
-    DROP CONSTRAINT IF EXISTS fk_recording_eggs_project_flock_kandang_id;
-
-ALTER TABLE recording_depletions
-    DROP COLUMN IF EXISTS source_project_flock_kandang_id;
-
-ALTER TABLE recording_eggs
-    DROP COLUMN IF EXISTS project_flock_kandang_id;
-
-COMMIT;

internal/database/migrations/20260330110000_add_recording_attribution_fields_for_farm_stock.up.sql

@@ -1,61 +0,0 @@
-BEGIN;
-
-ALTER TABLE recording_depletions
-    ADD COLUMN IF NOT EXISTS source_project_flock_kandang_id BIGINT NULL;
-
-ALTER TABLE recording_eggs
-    ADD COLUMN IF NOT EXISTS project_flock_kandang_id BIGINT NULL;
-
-DO $$
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1
-        FROM pg_constraint
-        WHERE conname = 'fk_recording_depletions_source_project_flock_kandang_id'
-    ) THEN
-        ALTER TABLE recording_depletions
-            ADD CONSTRAINT fk_recording_depletions_source_project_flock_kandang_id
-            FOREIGN KEY (source_project_flock_kandang_id)
-            REFERENCES project_flock_kandangs(id)
-            ON DELETE SET NULL
-            ON UPDATE CASCADE;
-    END IF;
-END $$;
-
-DO $$
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1
-        FROM pg_constraint
-        WHERE conname = 'fk_recording_eggs_project_flock_kandang_id'
-    ) THEN
-        ALTER TABLE recording_eggs
-            ADD CONSTRAINT fk_recording_eggs_project_flock_kandang_id
-            FOREIGN KEY (project_flock_kandang_id)
-            REFERENCES project_flock_kandangs(id)
-            ON DELETE SET NULL
-            ON UPDATE CASCADE;
-    END IF;
-END $$;
-
-CREATE INDEX IF NOT EXISTS idx_recording_depletions_source_project_flock_kandang_id
-    ON recording_depletions(source_project_flock_kandang_id);
-
-CREATE INDEX IF NOT EXISTS idx_recording_eggs_project_flock_kandang_id
-    ON recording_eggs(project_flock_kandang_id);
-
-UPDATE recording_depletions rd
-SET source_project_flock_kandang_id = r.project_flock_kandangs_id
-FROM recordings r
-WHERE r.id = rd.recording_id
-  AND rd.source_project_flock_kandang_id IS NULL
-  AND r.project_flock_kandangs_id IS NOT NULL;
-
-UPDATE recording_eggs re
-SET project_flock_kandang_id = r.project_flock_kandangs_id
-FROM recordings r
-WHERE r.id = re.recording_id
-  AND re.project_flock_kandang_id IS NULL
-  AND r.project_flock_kandangs_id IS NOT NULL;
-
-COMMIT;

internal/database/migrations/20260402075043_adjust_daily_checklist_unique_for_rejected.down.sql

@@ -1,9 +0,0 @@
-BEGIN;
-
-DROP INDEX IF EXISTS idx_daily_checklists_unique_non_rejected;
-
-ALTER TABLE daily_checklists
-    ADD CONSTRAINT daily_checklists_date_kandang_category_key
-    UNIQUE (date, kandang_id, category);
-
-COMMIT;

internal/database/migrations/20260402075043_adjust_daily_checklist_unique_for_rejected.up.sql

@@ -1,10 +0,0 @@
-BEGIN;
-
-ALTER TABLE daily_checklists
-    DROP CONSTRAINT IF EXISTS daily_checklists_date_kandang_category_key;
-
-CREATE UNIQUE INDEX IF NOT EXISTS idx_daily_checklists_unique_non_rejected
-    ON daily_checklists (date, kandang_id, category)
-    WHERE (status IS NULL OR status <> 'REJECTED');
-
-COMMIT;

internal/database/migrations/20260414064542_add_field_weight_per_convertion.down.sql

@@ -1,3 +0,0 @@
--- Remove convertion fields from marketing_delivery_products table
-ALTER TABLE marketing_delivery_products
-DROP COLUMN IF EXISTS weight_per_convertion;

internal/database/migrations/20260414064542_add_field_weight_per_convertion.up.sql

@@ -1,4 +0,0 @@
--- Add convertion fields to marketing_delivery_products table
-ALTER TABLE marketing_delivery_products 
-ADD COLUMN IF NOT EXISTS weight_per_convertion NUMERIC(15, 3);
-

internal/database/migrations/20260414082821_create_integration_api_keys.down.sql

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

internal/database/migrations/20260414082821_create_integration_api_keys.up.sql

@@ -1,23 +0,0 @@
-CREATE TABLE IF NOT EXISTS integration_api_keys (
-    id BIGSERIAL PRIMARY KEY,
-    name VARCHAR(100) NOT NULL,
-    environment VARCHAR(50) NOT NULL,
-    status VARCHAR(20) NOT NULL DEFAULT 'active',
-    key_prefix VARCHAR(64) NOT NULL,
-    key_hash TEXT NOT NULL,
-    permission_codes JSONB NOT NULL DEFAULT '[]'::jsonb,
-    all_area BOOLEAN NOT NULL DEFAULT FALSE,
-    area_ids JSONB NOT NULL DEFAULT '[]'::jsonb,
-    all_location BOOLEAN NOT NULL DEFAULT FALSE,
-    location_ids JSONB NOT NULL DEFAULT '[]'::jsonb,
-    last_used_at TIMESTAMPTZ NULL,
-    last_used_from VARCHAR(128) NULL,
-    revoked_at TIMESTAMPTZ NULL,
-    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
-    deleted_at TIMESTAMPTZ NULL,
-    CONSTRAINT uq_integration_api_keys_environment_prefix UNIQUE (environment, key_prefix)
-);
-
-CREATE INDEX idx_integration_api_keys_status ON integration_api_keys (status);
-CREATE INDEX idx_integration_api_keys_deleted_at ON integration_api_keys (deleted_at);

internal/entities/adjustment_stock.go

@@ -5,7 +5,6 @@ import "time"
 type AdjustmentStock struct {
 	Id                 uint      `gorm:"primaryKey"`
 	ProductWarehouseId uint      `gorm:"column:product_warehouse_id;not null"`
-	PairedAdjustmentId *uint     `gorm:"column:paired_adjustment_id"`
 	TransactionType    string    `gorm:"column:transaction_type;type:varchar(100);not null;default:LEGACY"`
 	FunctionCode       string    `gorm:"column:function_code;type:varchar(64)"`
 	TotalQty           float64   `gorm:"column:total_qty;default:0"`
@@ -19,6 +18,5 @@ type AdjustmentStock struct {
 	AdjNumber          string    `gorm:"column:adj_number;uniqueIndex;not null"`
 
 	ProductWarehouse *ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
-	PairedAdjustment *AdjustmentStock  `gorm:"foreignKey:PairedAdjustmentId;references:Id"`
 	StockLog         *StockLog         `gorm:"polymorphic:Loggable;polymorphicType:LoggableType;polymorphicId:LoggableId;polymorphicValue:ADJUSTMENT"`
 }

internal/entities/integration_api_key.go

@@ -1,36 +0,0 @@
-package entities
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-const (
-	IntegrationAPIKeyStatusActive  = "active"
-	IntegrationAPIKeyStatusRevoked = "revoked"
-)
-
-type IntegrationAPIKey struct {
-	ID              uint     `gorm:"primaryKey"`
-	Name            string   `gorm:"type:varchar(100);not null"`
-	Environment     string   `gorm:"type:varchar(50);not null;uniqueIndex:idx_integration_api_keys_env_prefix,priority:1"`
-	Status          string   `gorm:"type:varchar(20);not null;default:active;index"`
-	KeyPrefix       string   `gorm:"type:varchar(64);not null;uniqueIndex:idx_integration_api_keys_env_prefix,priority:2"`
-	KeyHash         string   `gorm:"type:text;not null"`
-	PermissionCodes []string `gorm:"type:jsonb;serializer:json;not null"`
-	AllArea         bool     `gorm:"not null;default:false"`
-	AreaIDs         []uint   `gorm:"type:jsonb;serializer:json;not null"`
-	AllLocation     bool     `gorm:"not null;default:false"`
-	LocationIDs     []uint   `gorm:"type:jsonb;serializer:json;not null"`
-	LastUsedAt      *time.Time
-	LastUsedFrom    string `gorm:"type:varchar(128)"`
-	RevokedAt       *time.Time
-	CreatedAt       time.Time      `gorm:"autoCreateTime"`
-	UpdatedAt       time.Time      `gorm:"autoUpdateTime"`
-	DeletedAt       gorm.DeletedAt `gorm:"index" json:"-"`
-}
-
-func (IntegrationAPIKey) TableName() string {
-	return "integration_api_keys"
-}

internal/entities/marketing_delivery_product.go

@@ -5,23 +5,20 @@ import (
 )
 
 type MarketingDeliveryProduct struct {
-	Id                              uint       `gorm:"primaryKey;autoIncrement"`
+	Id                   uint       `gorm:"primaryKey;autoIncrement"`
-	MarketingProductId              uint       `gorm:"uniqueIndex;not null"`
+	MarketingProductId   uint       `gorm:"uniqueIndex;not null"`
-	ProductWarehouseId              uint       `gorm:"not null"`
+	ProductWarehouseId   uint       `gorm:"not null"`
-	AttributedProjectFlockKandangId *uint      `gorm:"->;column:attributed_project_flock_kandang_id"`
+	UnitPrice            float64    `gorm:"type:numeric(15,3)"`
-	UnitPrice                       float64    `gorm:"type:numeric(15,3)"`
+	TotalWeight          float64    `gorm:"type:numeric(15,3)"`
-	TotalWeight                     float64    `gorm:"type:numeric(15,3)"`
+	AvgWeight            float64    `gorm:"type:numeric(15,3)"`
-	AvgWeight                       float64    `gorm:"type:numeric(15,3)"`
+	TotalPrice           float64    `gorm:"type:numeric(15,3)"`
-	WeightPerConvertion             *float64   `gorm:"type:numeric(15,3)"`
+	DeliveryDate         *time.Time `gorm:"type:timestamptz"`
-	TotalPrice                      float64    `gorm:"type:numeric(15,3)"`
+	VehicleNumber        string     `gorm:"type:varchar(50)"`
-	DeliveryDate                    *time.Time `gorm:"type:timestamptz"`
-	VehicleNumber                   string     `gorm:"type:varchar(50)"`
 
 	// FIFO Fields
 	UsageQty   float64    `gorm:"type:numeric(15,3);default:0;not null"`
 	PendingQty float64    `gorm:"type:numeric(15,3);default:0;not null"`
 	CreatedAt  *time.Time `gorm:"type:timestamptz;not null"`
 
-	MarketingProduct              MarketingProduct     `gorm:"foreignKey:MarketingProductId;references:Id"`
+	MarketingProduct MarketingProduct `gorm:"foreignKey:MarketingProductId;references:Id"`
-	AttributedProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:AttributedProjectFlockKandangId;references:Id"`
 }

internal/entities/product_warehouse.go

@@ -1,12 +1,11 @@
 package entities
 
 type ProductWarehouse struct {
-	Id                    uint     `gorm:"primaryKey;column:id"`
+	Id                    uint    `gorm:"primaryKey;column:id"`
-	ProductId             uint     `gorm:"column:product_id;not null"`
+	ProductId             uint    `gorm:"column:product_id;not null"`
-	WarehouseId           uint     `gorm:"column:warehouse_id;not null"`
+	WarehouseId           uint    `gorm:"column:warehouse_id;not null"`
-	ProjectFlockKandangId *uint    `gorm:"column:project_flock_kandang_id"`
+	ProjectFlockKandangId *uint   `gorm:"column:project_flock_kandang_id"`
-	Quantity              float64  `gorm:"column:qty;type:numeric(15,3);default:0"`
+	Quantity              float64 `gorm:"column:qty;type:numeric(15,3);default:0"`
-	AvailableQty          *float64 `gorm:"-"`
 
 	// Relations
 	Product             Product              `gorm:"foreignKey:ProductId;references:Id"`

internal/entities/recording.go

@@ -45,6 +45,4 @@ type Recording struct {
 	StandardFcr          *float64 `gorm:"-"`
 	PopulationCanChange  *bool    `gorm:"-"`
 	TransferExecuted     *bool    `gorm:"-"`
-	IsTransition         *bool    `gorm:"-"`
-	IsLaying             *bool    `gorm:"-"`
 }

internal/entities/recording_depletion.go

@@ -1,16 +1,14 @@
 package entities
 
 type RecordingDepletion struct {
-	Id                          uint    `gorm:"primaryKey"`
+	Id                       uint    `gorm:"primaryKey"`
-	RecordingId                 uint    `gorm:"column:recording_id;not null;index"`
+	RecordingId              uint    `gorm:"column:recording_id;not null;index"`
-	ProductWarehouseId          uint    `gorm:"column:product_warehouse_id;not null"`
+	ProductWarehouseId       uint    `gorm:"column:product_warehouse_id;not null"`
-	SourceProductWarehouseId    *uint   `gorm:"column:source_product_warehouse_id"`
+	SourceProductWarehouseId *uint   `gorm:"column:source_product_warehouse_id"`
-	SourceProjectFlockKandangId *uint   `gorm:"column:source_project_flock_kandang_id"`
+	Qty                      float64 `gorm:"column:qty;not null"`
-	Qty                         float64 `gorm:"column:qty;not null"`
+	UsageQty                 float64 `gorm:"column:usage_qty"`
-	UsageQty                    float64 `gorm:"column:usage_qty"`
+	PendingQty               float64 `gorm:"column:pending_qty"`
-	PendingQty                  float64 `gorm:"column:pending_qty"`
 
-	Recording                 Recording            `gorm:"foreignKey:RecordingId;references:Id"`
+	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
-	ProductWarehouse          ProductWarehouse     `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
-	SourceProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:SourceProjectFlockKandangId;references:Id"`
 }

internal/entities/recording_egg.go

@@ -3,20 +3,18 @@ package entities
 import "time"
 
 type RecordingEgg struct {
-	Id                    uint                 `gorm:"primaryKey"`
+	Id                 uint             `gorm:"primaryKey"`
-	RecordingId           uint                 `gorm:"column:recording_id;not null;index"`
+	RecordingId        uint             `gorm:"column:recording_id;not null;index"`
-	ProductWarehouseId    uint                 `gorm:"column:product_warehouse_id;not null"`
+	ProductWarehouseId uint             `gorm:"column:product_warehouse_id;not null"`
-	ProjectFlockKandangId *uint                `gorm:"column:project_flock_kandang_id"`
+	Qty                int              `gorm:"column:qty;not null"`
-	Qty                   int                  `gorm:"column:qty;not null"`
+	TotalQty           float64          `gorm:"column:total_qty"`
-	TotalQty              float64              `gorm:"column:total_qty"`
+	TotalUsed          float64          `gorm:"column:total_used"`
-	TotalUsed             float64              `gorm:"column:total_used"`
+	Weight             *float64         `gorm:"column:weight"`
-	Weight                *float64             `gorm:"column:weight"`
+	CreatedBy          uint             `gorm:"column:created_by"`
-	CreatedBy             uint                 `gorm:"column:created_by"`
+	CreatedAt          time.Time        `gorm:"autoCreateTime"`
-	CreatedAt             time.Time            `gorm:"autoCreateTime"`
+	UpdatedAt          time.Time        `gorm:"autoUpdateTime"`
-	UpdatedAt             time.Time            `gorm:"autoUpdateTime"`
+	ProductWarehouse   ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
-	ProductWarehouse      ProductWarehouse     `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	ProductFlagName    *string          `gorm:"->;column:product_flag_name" json:"-"`
-	ProjectFlockKandang   *ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
+	CreatedUser        *User            `gorm:"foreignKey:CreatedBy;references:Id"`
-	ProductFlagName       *string              `gorm:"->;column:product_flag_name" json:"-"`
+	Recording          Recording        `gorm:"foreignKey:RecordingId;references:Id"`
-	CreatedUser           *User                `gorm:"foreignKey:CreatedBy;references:Id"`
-	Recording             Recording            `gorm:"foreignKey:RecordingId;references:Id"`
 }

internal/middleware/auth.go

@@ -1,13 +1,9 @@
 package middleware
 
 import (
-	"context"
-	"errors"
 	"strings"
-	"sync"
 
 	"github.com/gofiber/fiber/v2"
-	"gitlab.com/mbugroup/lti-api.git/internal/apikeys"
 	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/sso/session"
@@ -21,21 +17,11 @@ const (
 	authUserLocalsKey    = "auth.user"
 )
 
-var (
-	verifyAccessTokenFunc = sso.VerifyAccessToken
-	fetchProfileFunc      = sso.FetchProfile
-
-	apiKeyAuthMu        sync.RWMutex
-	apiKeyAuthenticator apikeys.Authenticator
-)
-
 // AuthContext keeps authentication details captured by the middleware.
 type AuthContext struct {
 	Token           string
 	Verification    *sso.VerificationResult
 	User            *entity.User
-	PrincipalType   string
-	PrincipalName   string
 	Roles           []sso.Role
 	Permissions     map[string]struct{}
 	UserAreaIDs     []uint
@@ -44,13 +30,6 @@ type AuthContext struct {
 	UserAllLocation bool
 }
 
-func SetAPIKeyAuthenticator(authenticator apikeys.Authenticator) {
-	apiKeyAuthMu.Lock()
-	defer apiKeyAuthMu.Unlock()
-
-	apiKeyAuthenticator = authenticator
-}
-
 // Auth validates the incoming request against the central SSO access token and
 // loads the corresponding local user. Optional scopes can be provided to enforce
 // fine-grained authorization using the SSO access token scopes.
@@ -83,20 +62,10 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 			}
 		}
 		if token == "" {
-			if c.Method() == fiber.MethodGet {
-				if err := authenticateAPIKey(c); err == nil {
-					if len(requiredScopes) > 0 {
-						return fiber.NewError(fiber.StatusForbidden, "Insufficient scope")
-					}
-					return c.Next()
-				} else if err != nil && !errors.Is(err, apikeys.ErrInvalidAPIKey) && !errors.Is(err, apikeys.ErrInactiveKey) {
-					return err
-				}
-			}
 			return fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
 		}
 
-		verification, err := verifyAccessTokenFunc(token)
+		verification, err := sso.VerifyAccessToken(token)
 		if err != nil {
 			if sso.IsSignatureError(err) {
 				logSignatureError("auth", tokenSource, token, err)
@@ -130,7 +99,7 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 		permissions := make(map[string]struct{})
 		var profile *sso.UserProfile
 		if verification.UserID != 0 {
-			if p, err := fetchProfileFunc(c.Context(), token, verification); err != nil {
+			if p, err := sso.FetchProfile(c.Context(), token, verification); err != nil {
 				utils.Log.WithError(err).Warn("auth: failed to fetch sso profile")
 			} else {
 				profile = p
@@ -149,8 +118,6 @@ func Auth(userService service.UserService, requiredScopes ...string) fiber.Handl
 			Token:           token,
 			Verification:    verification,
 			User:            user,
-			PrincipalType:   "user",
-			PrincipalName:   user.Name,
 			Roles:           roles,
 			Permissions:     permissions,
 			UserAreaIDs:     nil,
@@ -252,57 +219,6 @@ func bearerToken(c *fiber.Ctx) string {
 	return ""
 }
 
-func authenticateAPIKey(c *fiber.Ctx) error {
-	rawKey := strings.TrimSpace(c.Get("X-API-Key"))
-	if rawKey == "" {
-		return apikeys.ErrInvalidAPIKey
-	}
-
-	authenticator := currentAPIKeyAuthenticator()
-	if authenticator == nil {
-		return apikeys.ErrInvalidAPIKey
-	}
-
-	principal, err := authenticator.Authenticate(context.Background(), rawKey, c.IP())
-	if err != nil {
-		if errors.Is(err, apikeys.ErrInvalidAPIKey) || errors.Is(err, apikeys.ErrInactiveKey) {
-			return apikeys.ErrInvalidAPIKey
-		}
-		utils.Log.WithError(err).Warn("auth: api key authentication failed")
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to authenticate request")
-	}
-
-	permissions := make(map[string]struct{}, len(principal.Permissions))
-	for _, perm := range principal.Permissions {
-		if canonical := canonicalPermission(perm); canonical != "" {
-			permissions[canonical] = struct{}{}
-		}
-	}
-
-	c.Locals(authContextLocalsKey, &AuthContext{
-		Token:           "",
-		Verification:    nil,
-		User:            nil,
-		PrincipalType:   "api_key",
-		PrincipalName:   principal.Name,
-		Roles:           nil,
-		Permissions:     permissions,
-		UserAreaIDs:     principal.AreaIDs,
-		UserLocationIDs: principal.LocationIDs,
-		UserAllArea:     principal.AllArea,
-		UserAllLocation: principal.AllLocation,
-	})
-	c.Locals(authUserLocalsKey, nil)
-	return nil
-}
-
-func currentAPIKeyAuthenticator() apikeys.Authenticator {
-	apiKeyAuthMu.RLock()
-	defer apiKeyAuthMu.RUnlock()
-
-	return apiKeyAuthenticator
-}
-
 func hasAllScopes(have, required []string) bool {
 	if len(required) == 0 {
 		return true

internal/middleware/auth_apikey_test.go

@@ -1,239 +0,0 @@
-package middleware
-
-import (
-	"context"
-	"errors"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/golang-jwt/jwt/v5"
-	"gitlab.com/mbugroup/lti-api.git/internal/apikeys"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	sso "gitlab.com/mbugroup/lti-api.git/internal/modules/sso/verifier"
-	userValidation "gitlab.com/mbugroup/lti-api.git/internal/modules/users/validations"
-)
-
-type stubUserService struct {
-	user *entity.User
-	err  error
-}
-
-func (s *stubUserService) GetAll(_ *fiber.Ctx, _ *userValidation.Query) ([]entity.User, int64, error) {
-	return nil, 0, nil
-}
-
-func (s *stubUserService) GetOne(_ *fiber.Ctx, _ uint) (*entity.User, error) {
-	return s.user, s.err
-}
-
-func (s *stubUserService) CreateOne(_ *fiber.Ctx, _ *userValidation.Create) (*entity.User, error) {
-	return nil, nil
-}
-
-func (s *stubUserService) UpdateOne(_ *fiber.Ctx, _ *userValidation.Update, _ uint) (*entity.User, error) {
-	return nil, nil
-}
-
-func (s *stubUserService) DeleteOne(_ *fiber.Ctx, _ uint) error {
-	return nil
-}
-
-func (s *stubUserService) GetBySSOUserID(_ *fiber.Ctx, _ uint) (*entity.User, error) {
-	return s.user, s.err
-}
-
-type stubAPIKeyAuthenticator struct {
-	principal *apikeys.Principal
-	err       error
-}
-
-func (s *stubAPIKeyAuthenticator) Authenticate(_ context.Context, _ string, _ string) (*apikeys.Principal, error) {
-	return s.principal, s.err
-}
-
-func TestAuthAllowsAPIKeyOnGet(t *testing.T) {
-	SetAPIKeyAuthenticator(&stubAPIKeyAuthenticator{
-		principal: &apikeys.Principal{
-			Name:        "dashboard",
-			Permissions: []string{"perm.read"},
-			LocationIDs: []uint{3, 5},
-		},
-	})
-	defer SetAPIKeyAuthenticator(nil)
-
-	app := fiber.New()
-	app.Get("/reports", Auth(&stubUserService{}), RequirePermissions("perm.read"), func(c *fiber.Ctx) error {
-		scope, err := ResolveLocationScope(c, nil)
-		if err != nil {
-			return err
-		}
-		return c.JSON(fiber.Map{
-			"principal": c.Locals(authContextLocalsKey).(*AuthContext).PrincipalType,
-			"restrict":  scope.Restrict,
-			"ids":       scope.IDs,
-		})
-	})
-
-	req := httptest.NewRequest(fiber.MethodGet, "/reports", nil)
-	req.Header.Set("X-API-Key", "lti_dev_prefix_secret")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusOK {
-		t.Fatalf("expected 200, got %d", resp.StatusCode)
-	}
-}
-
-func TestAuthRejectsAPIKeyOnPost(t *testing.T) {
-	SetAPIKeyAuthenticator(&stubAPIKeyAuthenticator{
-		principal: &apikeys.Principal{
-			Name:        "dashboard",
-			Permissions: []string{"perm.write"},
-		},
-	})
-	defer SetAPIKeyAuthenticator(nil)
-
-	app := fiber.New()
-	app.Post("/reports", Auth(&stubUserService{}), RequirePermissions("perm.write"), func(c *fiber.Ctx) error {
-		return c.SendStatus(fiber.StatusOK)
-	})
-
-	req := httptest.NewRequest(fiber.MethodPost, "/reports", nil)
-	req.Header.Set("X-API-Key", "lti_dev_prefix_secret")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusUnauthorized {
-		t.Fatalf("expected 401, got %d", resp.StatusCode)
-	}
-}
-
-func TestAuthRejectsInvalidAPIKey(t *testing.T) {
-	SetAPIKeyAuthenticator(&stubAPIKeyAuthenticator{err: apikeys.ErrInvalidAPIKey})
-	defer SetAPIKeyAuthenticator(nil)
-
-	app := fiber.New()
-	app.Get("/reports", Auth(&stubUserService{}), func(c *fiber.Ctx) error {
-		return c.SendStatus(fiber.StatusOK)
-	})
-
-	req := httptest.NewRequest(fiber.MethodGet, "/reports", nil)
-	req.Header.Set("X-API-Key", "lti_dev_prefix_secret")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusUnauthorized {
-		t.Fatalf("expected 401, got %d", resp.StatusCode)
-	}
-}
-
-func TestAuthRejectsInactiveAPIKey(t *testing.T) {
-	SetAPIKeyAuthenticator(&stubAPIKeyAuthenticator{err: apikeys.ErrInactiveKey})
-	defer SetAPIKeyAuthenticator(nil)
-
-	app := fiber.New()
-	app.Get("/reports", Auth(&stubUserService{}), func(c *fiber.Ctx) error {
-		return c.SendStatus(fiber.StatusOK)
-	})
-
-	req := httptest.NewRequest(fiber.MethodGet, "/reports", nil)
-	req.Header.Set("X-API-Key", "lti_dev_prefix_secret")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusUnauthorized {
-		t.Fatalf("expected 401, got %d", resp.StatusCode)
-	}
-}
-
-func TestAuthRejectsMissingPermission(t *testing.T) {
-	SetAPIKeyAuthenticator(&stubAPIKeyAuthenticator{
-		principal: &apikeys.Principal{
-			Name:        "dashboard",
-			Permissions: []string{"perm.other"},
-		},
-	})
-	defer SetAPIKeyAuthenticator(nil)
-
-	app := fiber.New()
-	app.Get("/reports", Auth(&stubUserService{}), RequirePermissions("perm.read"), func(c *fiber.Ctx) error {
-		return c.SendStatus(fiber.StatusOK)
-	})
-
-	req := httptest.NewRequest(fiber.MethodGet, "/reports", nil)
-	req.Header.Set("X-API-Key", "lti_dev_prefix_secret")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusForbidden {
-		t.Fatalf("expected 403, got %d", resp.StatusCode)
-	}
-}
-
-func TestAuthAllowsBearerOnGet(t *testing.T) {
-	previousVerify := verifyAccessTokenFunc
-	previousProfile := fetchProfileFunc
-	defer func() {
-		verifyAccessTokenFunc = previousVerify
-		fetchProfileFunc = previousProfile
-	}()
-
-	verifyAccessTokenFunc = func(_ string) (*sso.VerificationResult, error) {
-		return &sso.VerificationResult{
-			UserID: 1,
-			Claims: &sso.AccessTokenClaims{
-				RegisteredClaims: jwt.RegisteredClaims{
-					IssuedAt: jwt.NewNumericDate(time.Now().UTC()),
-				},
-			},
-		}, nil
-	}
-	fetchProfileFunc = func(_ context.Context, _ string, _ *sso.VerificationResult) (*sso.UserProfile, error) {
-		return &sso.UserProfile{
-			Permissions: []sso.Permission{{Name: "perm.read"}},
-			LocationIDs: []uint{7},
-		}, nil
-	}
-
-	app := fiber.New()
-	app.Get("/reports", Auth(&stubUserService{user: &entity.User{Id: 9, Name: "API User"}}), RequirePermissions("perm.read"), func(c *fiber.Ctx) error {
-		return c.JSON(fiber.Map{"principal": c.Locals(authContextLocalsKey).(*AuthContext).PrincipalType})
-	})
-
-	req := httptest.NewRequest(fiber.MethodGet, "/reports", nil)
-	req.Header.Set("Authorization", "Bearer test-token")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusOK {
-		t.Fatalf("expected 200, got %d", resp.StatusCode)
-	}
-}
-
-func TestAuthReturnsServerErrorWhenAPIKeyVerifierFailsUnexpectedly(t *testing.T) {
-	SetAPIKeyAuthenticator(&stubAPIKeyAuthenticator{err: errors.New("boom")})
-	defer SetAPIKeyAuthenticator(nil)
-
-	app := fiber.New()
-	app.Get("/reports", Auth(&stubUserService{}), func(c *fiber.Ctx) error {
-		return c.SendStatus(fiber.StatusOK)
-	})
-
-	req := httptest.NewRequest(fiber.MethodGet, "/reports", nil)
-	req.Header.Set("X-API-Key", "lti_dev_prefix_secret")
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusInternalServerError {
-		t.Fatalf("expected 500, got %d", resp.StatusCode)
-	}
-}

internal/middleware/permissions.go

@@ -38,10 +38,9 @@ const (
 	P_ExpenseDocumentRealizations      = "lti.expense.document.realization"
 )
 const (
-	P_AdjustmentGetAll    = "lti.inventory.list"
+	P_AdjustmentGetAll = "lti.inventory.list"
-	P_AdjustmentCreate    = "lti.inventory.create"
+	P_AdjustmentCreate = "lti.inventory.create"
-	P_AdjustmentGetOne    = "lti.inventory.detail"
+	P_AdjustmentGetOne = "lti.inventory.detail"
-	P_AdjustmentDeleteOne = "lti.inventory.delete"
 )
 const (
 	P_ApprovalGetAll = "lti.approval.list"
@@ -71,7 +70,6 @@ const (
 	P_TransferGetAll    = "lti.inventory.transfer.list"
 	P_TransferGetOne    = "lti.inventory.transfer.detail"
 	P_TransferCreateOne = "lti.inventory.transfer.create"
-	P_TransferDeleteOne = "lti.inventory.transfer.delete"
 )
 
 const (

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

@@ -44,7 +44,6 @@ type PenjualanRealisasiResponseDTO struct {
 // === Mapper Functions ===
 
 func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
-	projectFlockKandang := resolveMarketingDeliveryProjectFlockKandang(e)
 
 	productFlags := make([]string, len(e.MarketingProduct.ProductWarehouse.Product.Flags))
 	for i, f := range e.MarketingProduct.ProductWarehouse.Product.Flags {
@@ -52,11 +51,11 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	}
 
 	var category string
-	if projectFlockKandang != nil {
+	if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil {
-		category = projectFlockKandang.ProjectFlock.Category
+		category = e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.ProjectFlock.Category
 	}
 
-	ageInDay, ageInWeeks := calculateAgeFromChickin(projectFlockKandang, e.DeliveryDate, productFlags, category)
+	ageInDay, ageInWeeks := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate, productFlags, category)
 
 	var product *productDTO.ProductRelationDTO
 	if e.MarketingProduct.ProductWarehouse.Product.Id != 0 {
@@ -71,8 +70,8 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	}
 
 	var kandang *kandangDTO.KandangRelationDTO
-	if projectFlockKandang != nil && projectFlockKandang.Kandang.Id != 0 {
+	if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil && e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang.Id != 0 {
-		mapped := kandangDTO.ToKandangRelationDTO(projectFlockKandang.Kandang)
+		mapped := kandangDTO.ToKandangRelationDTO(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang)
 		kandang = &mapped
 	}
 
@@ -103,7 +102,6 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 }
 
 func ToSalesAgeDTO(e entity.MarketingDeliveryProduct) SalesDTO {
-	projectFlockKandang := resolveMarketingDeliveryProjectFlockKandang(e)
 
 	productFlags := make([]string, len(e.MarketingProduct.ProductWarehouse.Product.Flags))
 	for i, f := range e.MarketingProduct.ProductWarehouse.Product.Flags {
@@ -111,11 +109,11 @@ func ToSalesAgeDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 	}
 
 	var category string
-	if projectFlockKandang != nil {
+	if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil {
-		category = projectFlockKandang.ProjectFlock.Category
+		category = e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.ProjectFlock.Category
 	}
 
-	ageInDay, _ := calculateAgeFromChickin(projectFlockKandang, e.DeliveryDate, productFlags, category)
+	ageInDay, _ := calculateAgeFromChickin(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang, e.DeliveryDate, productFlags, category)
 
 	return SalesDTO{
 		Age: ageInDay,
@@ -166,13 +164,6 @@ func ToPenjualanRealisasiResponseDTO(e []entity.MarketingDeliveryProduct) Penjua
 	}
 }
 
-func resolveMarketingDeliveryProjectFlockKandang(e entity.MarketingDeliveryProduct) *entity.ProjectFlockKandang {
-	if e.AttributedProjectFlockKandang != nil {
-		return e.AttributedProjectFlockKandang
-	}
-	return e.MarketingProduct.ProductWarehouse.ProjectFlockKandang
-}
-
 func calculateAgeFromChickin(projectFlockKandang *entity.ProjectFlockKandang, deliveryDate *time.Time, productFlags []string, category string) (int, int) {
 	if projectFlockKandang == nil || deliveryDate == nil || len(projectFlockKandang.Chickins) == 0 {
 		return 0, 0

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

@@ -25,8 +25,8 @@ type ClosingRepository interface {
 	SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error)
 	SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error)
 	GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error)
-	FetchSapronakIncoming(ctx context.Context, projectFlockKandangID uint, kandangID uint, start, end *time.Time) ([]SapronakIncomingRow, error)
+	FetchSapronakIncoming(ctx context.Context, kandangID uint, start, end *time.Time) ([]SapronakIncomingRow, error)
-	FetchSapronakIncomingDetails(ctx context.Context, projectFlockKandangID uint, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
+	FetchSapronakIncomingDetails(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakUsage(ctx context.Context, pfkID uint, start, end *time.Time) ([]SapronakUsageRow, error)
 	FetchSapronakUsageDetails(ctx context.Context, pfkID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakChickinUsage(ctx context.Context, pfkID uint, start, end *time.Time) ([]SapronakUsageRow, error)
@@ -90,23 +90,6 @@ type SapronakQueryParams struct {
 	EndDate                *time.Time
 }
 
-func sapronakIncomingPurchaseQueryParts(params SapronakQueryParams) (string, []any) {
-	if len(params.ProjectFlockKandangIDs) > 0 {
-		return sapronakIncomingPurchasesScopedSQL(), []any{
-			fifo.UsableKeyRecordingStock.String(),
-			fifo.UsableKeyProjectChickin.String(),
-			fifo.StockableKeyPurchaseItems.String(),
-			entity.StockAllocationStatusActive,
-			entity.StockAllocationPurposeConsume,
-			params.ProjectFlockKandangIDs,
-			params.ProjectFlockKandangIDs,
-			params.WarehouseIDs,
-		}
-	}
-
-	return sapronakIncomingPurchasesSQL, []any{params.WarehouseIDs}
-}
-
 func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params SapronakQueryParams) ([]SapronakRow, int64, error) {
 	db := r.DB().WithContext(ctx)
 
@@ -120,10 +103,8 @@ func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params Sapronak
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakRow{}, 0, nil
 		}
-		purchasesSQL, purchaseArgs := sapronakIncomingPurchaseQueryParts(params)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
-		unionParts = append(unionParts, purchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
-		args = append(args, purchaseArgs...)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
@@ -212,10 +193,8 @@ func (r *ClosingRepositoryImpl) GetSapronakSummary(ctx context.Context, params S
 		if len(params.WarehouseIDs) == 0 {
 			return []SapronakSummaryRow{}, nil
 		}
-		purchasesSQL, purchaseArgs := sapronakIncomingPurchaseQueryParts(params)
+		unionParts = append(unionParts, sapronakIncomingPurchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
-		unionParts = append(unionParts, purchasesSQL, sapronakIncomingTransfersSQL, sapronakIncomingAdjustmentsSQL)
+		args = append(args, params.WarehouseIDs, params.WarehouseIDs, params.WarehouseIDs)
-		args = append(args, purchaseArgs...)
-		args = append(args, params.WarehouseIDs, params.WarehouseIDs)
 	case validation.SapronakTypeOutgoing:
 		if len(params.WarehouseIDs) > 0 {
 			unionParts = append(unionParts, sapronakOutgoingTransfersSQL, sapronakOutgoingAdjustmentsSQL)
@@ -319,11 +298,10 @@ func (r *ClosingRepositoryImpl) SumFeedPurchaseAndUsedByProjectFlockKandangIDs(c
 
 	err = r.DB().WithContext(ctx).
 		Table("recording_stocks rs").
-		Joins("JOIN recordings rec ON rec.id = rs.recording_id").
 		Joins("JOIN product_warehouses pw ON pw.id = rs.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
-		Where("rec.project_flock_kandangs_id IN ?", projectFlockKandangIDs).
+		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name = ?", "PAKAN").
 		Select("COALESCE(SUM(COALESCE(rs.usage_qty, 0) + COALESCE(rs.pending_qty, 0)), 0) AS total_used").
 		Scan(&usageAgg).Error
@@ -362,11 +340,10 @@ func (r *ClosingRepositoryImpl) SumClaimCullingByProjectFlockKandangIDs(ctx cont
 
 	err := r.DB().WithContext(ctx).
 		Table("recording_depletions rd").
-		Joins("JOIN recordings rec ON rec.id = rd.recording_id").
 		Joins("JOIN product_warehouses pw ON pw.id = rd.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
-		Where("COALESCE(rd.source_project_flock_kandang_id, rec.project_flock_kandangs_id) IN ?", projectFlockKandangIDs).
+		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name = ?", utils.FlagAyamCulling).
 		Select("COALESCE(SUM(rd.qty), 0) AS total_culling").
 		Scan(&agg).Error
@@ -381,14 +358,52 @@ func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDs
 	if len(projectFlockKandangIDs) == 0 {
 		return 0, 0, 0, nil
 	}
-	return r.sumMarketingAttributedByProjectFlockKandangIDs(ctx, projectFlockKandangIDs, nil)
+
+	var agg struct {
+		TotalWeight float64 `gorm:"column:total_weight"`
+		TotalQty    float64 `gorm:"column:total_qty"`
+		TotalPrice  float64 `gorm:"column:total_price"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("marketing_products mp").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
+		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Select("COALESCE(SUM(mp.total_weight), 0) AS total_weight, COALESCE(SUM(mp.qty), 0) AS total_qty, COALESCE(SUM(mp.total_price), 0) AS total_price").
+		Scan(&agg).Error
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return agg.TotalWeight, agg.TotalQty, agg.TotalPrice, nil
 }
 
 func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error) {
 	if len(projectFlockKandangIDs) == 0 || len(flagNames) == 0 {
 		return 0, 0, 0, nil
 	}
-	return r.sumMarketingAttributedByProjectFlockKandangIDs(ctx, projectFlockKandangIDs, flagNames)
+
+	var agg struct {
+		TotalWeight float64 `gorm:"column:total_weight"`
+		TotalQty    float64 `gorm:"column:total_qty"`
+		TotalPrice  float64 `gorm:"column:total_price"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("marketing_products mp").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
+		Joins("JOIN products prod ON prod.id = pw.product_id").
+		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
+		Joins("JOIN marketing_delivery_products mdp ON mdp.marketing_product_id = mp.id").
+		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Where("f.name IN ?", flagNames).
+		Select("COALESCE(SUM(mdp.total_weight), 0) AS total_weight, COALESCE(SUM(mdp.usage_qty), 0) AS total_qty, COALESCE(SUM(mdp.total_price), 0) AS total_price").
+		Scan(&agg).Error
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return agg.TotalWeight, agg.TotalQty, agg.TotalPrice, nil
 }
 
 func (r *ClosingRepositoryImpl) SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error) {
@@ -402,11 +417,10 @@ func (r *ClosingRepositoryImpl) SumRecordingEggQtyByProjectFlockKandangIDsAndFla
 
 	err := r.DB().WithContext(ctx).
 		Table("recording_eggs re").
-		Joins("JOIN recordings rec ON rec.id = re.recording_id").
 		Joins("JOIN product_warehouses pw ON pw.id = re.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
-		Where("COALESCE(re.project_flock_kandang_id, rec.project_flock_kandangs_id) IN ?", projectFlockKandangIDs).
+		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name IN ?", flagNames).
 		Select("COALESCE(SUM(re.qty), 0) AS total_qty").
 		Scan(&agg).Error
@@ -803,52 +817,6 @@ type SapronakDetailRow struct {
 
 func (r *ClosingRepositoryImpl) withCtx(ctx context.Context) *gorm.DB { return r.DB().WithContext(ctx) }
 
-func (r *ClosingRepositoryImpl) sumMarketingAttributedByProjectFlockKandangIDs(
-	ctx context.Context,
-	projectFlockKandangIDs []uint,
-	flagNames []string,
-) (float64, float64, float64, error) {
-	var agg struct {
-		TotalWeight float64 `gorm:"column:total_weight"`
-		TotalQty    float64 `gorm:"column:total_qty"`
-		TotalPrice  float64 `gorm:"column:total_price"`
-	}
-
-	query := r.withCtx(ctx).
-		Table("(?) AS mda", repository.MarketingDeliveryAttributionRowsQuery(r.withCtx(ctx))).
-		Joins("JOIN marketing_delivery_products mdp ON mdp.id = mda.marketing_delivery_product_id").
-		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
-		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
-		Joins("JOIN products prod ON prod.id = pw.product_id").
-		Where("mda.project_flock_kandang_id IN ?", projectFlockKandangIDs).
-		Where("mdp.delivery_date IS NOT NULL")
-
-	if len(flagNames) > 0 {
-		query = query.
-			Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-			Where("f.name IN ?", flagNames)
-	}
-
-	err := query.
-		Select(`
-			COALESCE(SUM(CASE
-				WHEN COALESCE(mdp.usage_qty, 0) > 0 THEN mdp.total_weight * (mda.allocated_qty / mdp.usage_qty)
-				ELSE 0
-			END), 0) AS total_weight,
-			COALESCE(SUM(mda.allocated_qty), 0) AS total_qty,
-			COALESCE(SUM(CASE
-				WHEN COALESCE(mdp.usage_qty, 0) > 0 THEN mdp.total_price * (mda.allocated_qty / mdp.usage_qty)
-				ELSE 0
-			END), 0) AS total_price
-		`).
-		Scan(&agg).Error
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	return agg.TotalWeight, agg.TotalQty, agg.TotalPrice, nil
-}
-
 func applyDateRange(db *gorm.DB, column string, start, end *time.Time) *gorm.DB {
 	if start != nil {
 		db = db.Where(column+"::date >= ?", start)
@@ -876,140 +844,6 @@ func sapronakFlags(flags ...utils.FlagType) []string {
 	return out
 }
 
-func sapronakLegacyFlagByProductCategoryCase(categoryCodeExpr string) string {
-	return fmt.Sprintf(
-		`CASE
-			WHEN UPPER(%s) = 'DOC' THEN '%s'
-			WHEN UPPER(%s) = 'PLT' THEN '%s'
-			WHEN UPPER(%s) IN ('RAW', 'PST', 'STR', 'FSR') THEN '%s'
-			WHEN UPPER(%s) IN ('OBT', 'VTM', 'KMA') THEN '%s'
-			ELSE NULL
-		END`,
-		categoryCodeExpr, utils.FlagDOC,
-		categoryCodeExpr, utils.FlagPullet,
-		categoryCodeExpr, utils.FlagPakan,
-		categoryCodeExpr, utils.FlagOVK,
-	)
-}
-
-func sapronakIncomingPurchasesScopedSQL() string {
-	return `
-WITH scoped_farm_allocations AS (
-	SELECT
-		sa.stockable_id AS purchase_item_id,
-		COALESCE(SUM(sa.qty), 0) AS allocated_qty
-	FROM stock_allocations sa
-	LEFT JOIN recording_stocks rs ON rs.id = sa.usable_id AND sa.usable_type = ?
-	LEFT JOIN recordings rec ON rec.id = rs.recording_id AND rec.deleted_at IS NULL
-	LEFT JOIN project_chickins pc ON pc.id = sa.usable_id AND sa.usable_type = ?
-	WHERE sa.stockable_type = ?
-		AND sa.status = ?
-		AND sa.allocation_purpose = ?
-		AND COALESCE(rec.project_flock_kandangs_id, pc.project_flock_kandang_id) IN ?
-	GROUP BY sa.stockable_id
-)
-SELECT
-	CAST(pi.id AS BIGINT) AS id,
-	COALESCE(pi.received_date, '1970-01-01') AS sort_date,
-	COALESCE(TO_CHAR(pi.received_date, 'DD-Mon-YYYY'), '') AS date_text,
-	COALESCE(p.po_number, '') AS reference_number,
-	'Pembelian' AS transaction_type,
-	prod.name AS product_name,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_category,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_sub_category,
-	'-' AS source_warehouse,
-	w.name AS destination_warehouse,
-	'' AS destination,
-	pi.total_qty AS quantity,
-	u.id AS unit_id,
-	u.name AS unit,
-	COALESCE(p.notes, '') AS notes
-FROM purchase_items pi
-JOIN purchases p ON p.id = pi.purchase_id
-JOIN products prod ON prod.id = pi.product_id
-JOIN uoms u ON u.id = prod.uom_id
-JOIN warehouses w ON w.id = pi.warehouse_id
-WHERE w.kandang_id IS NOT NULL
-	AND (
-		pi.project_flock_kandang_id IN ?
-		OR (pi.project_flock_kandang_id IS NULL AND pi.warehouse_id IN ?)
-	)
-UNION ALL
-SELECT
-	CAST(pi.id AS BIGINT) AS id,
-	COALESCE(pi.received_date, '1970-01-01') AS sort_date,
-	COALESCE(TO_CHAR(pi.received_date, 'DD-Mon-YYYY'), '') AS date_text,
-	COALESCE(p.po_number, '') AS reference_number,
-	'Pembelian' AS transaction_type,
-	prod.name AS product_name,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_category,
-	COALESCE((
-		SELECT string_agg(
-			f.name,
-			' ' ORDER BY
-				CASE
-					WHEN UPPER(f.name) IN ('DOC', 'PAKAN', 'OVK', 'PULLET') THEN 0
-					ELSE 1
-				END,
-				f.name
-		)
-		FROM flags f
-		WHERE f.flagable_type = 'products' AND f.flagable_id = prod.id
-	), '') AS product_sub_category,
-	'-' AS source_warehouse,
-	w.name AS destination_warehouse,
-	'' AS destination,
-	sfa.allocated_qty AS quantity,
-	u.id AS unit_id,
-	u.name AS unit,
-	COALESCE(p.notes, '') AS notes
-FROM purchase_items pi
-JOIN purchases p ON p.id = pi.purchase_id
-JOIN products prod ON prod.id = pi.product_id
-JOIN uoms u ON u.id = prod.uom_id
-JOIN warehouses w ON w.id = pi.warehouse_id
-JOIN scoped_farm_allocations sfa ON sfa.purchase_item_id = pi.id
-WHERE w.kandang_id IS NULL
-	AND COALESCE(sfa.allocated_qty, 0) > 0
-`
-}
-
 var (
 	sapronakFlagsAll     = sapronakFlags(utils.FlagDOC, utils.FlagPakan, utils.FlagOVK, utils.FlagPullet)
 	sapronakFlagsUsage   = sapronakFlags(utils.FlagPakan, utils.FlagOVK)
@@ -1017,44 +851,18 @@ var (
 )
 
 func (r *ClosingRepositoryImpl) joinSapronakProductFlag(db *gorm.DB, productAlias string) *gorm.DB {
-	actualFlags := r.DB().
-		Table("flags").
-		Select(`
-			flagable_id,
-			MIN(CASE
-				WHEN UPPER(name) = 'DOC' THEN 1
-				WHEN UPPER(name) = 'PULLET' THEN 2
-				WHEN UPPER(name) = 'PAKAN' THEN 3
-				WHEN UPPER(name) = 'OVK' THEN 4
-				ELSE 5
-			END) AS priority
-		`).
-		Where("flagable_type = ?", entity.FlagableTypeProduct).
-		Where("UPPER(name) IN ?", sapronakFlagsAll).
-		Group("flagable_id")
-
-	legacyFlagExpr := sapronakLegacyFlagByProductCategoryCase("pc.code")
 	subquery := r.DB().
-		Table("products AS sapronak_products").
+		Table("flags").
-		Select(fmt.Sprintf(`
+		Select("DISTINCT ON (flagable_id) flagable_id, name").
-			sapronak_products.id AS flagable_id,
+		Where("flagable_type = ?", entity.FlagableTypeProduct).
-			CASE
+		Where("name IN ?", sapronakFlagsAll).
-				WHEN actual_flags.priority = 1 THEN '%s'
+		Order(fmt.Sprintf(
-				WHEN actual_flags.priority = 2 THEN '%s'
+			"flagable_id, CASE WHEN name = '%s' THEN 1 WHEN name = '%s' THEN 2 WHEN name = '%s' THEN 3 WHEN name = '%s' THEN 4 ELSE 5 END",
-				WHEN actual_flags.priority = 3 THEN '%s'
-				WHEN actual_flags.priority = 4 THEN '%s'
-				ELSE %s
-			END AS name
-		`,
 			utils.FlagDOC,
 			utils.FlagPullet,
 			utils.FlagPakan,
 			utils.FlagOVK,
-			legacyFlagExpr,
+		))
-		)).
-		Joins("LEFT JOIN (?) AS actual_flags ON actual_flags.flagable_id = sapronak_products.id", actualFlags).
-		Joins("LEFT JOIN product_categories pc ON pc.id = sapronak_products.product_category_id").
-		Where("actual_flags.priority IS NOT NULL OR " + legacyFlagExpr + " IS NOT NULL")
 
 	return db.Joins("JOIN (?) f ON f.flagable_id = "+productAlias+".id", subquery)
 }
@@ -1313,111 +1121,22 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 	return scanAndGroupDetails(query)
 }
 
-func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, projectFlockKandangID uint, kandangID uint, start, end *time.Time) *gorm.DB {
+func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandangID uint, start, end *time.Time) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table("purchase_items AS pi").
 		Joins("JOIN purchases po ON po.id = pi.purchase_id AND po.deleted_at IS NULL").
 		Joins("JOIN products p ON p.id = pi.product_id").
 		Joins("JOIN warehouses w ON w.id = pi.warehouse_id").
-		Where("f.name IN ?", sapronakFlagsAll).
+		Where("w.kandang_id = ?", kandangID).
-		Where("pi.received_date IS NOT NULL")
-	if projectFlockKandangID > 0 {
-		db = db.Where(
-			"w.kandang_id = ? AND (pi.project_flock_kandang_id = ? OR pi.project_flock_kandang_id IS NULL)",
-			kandangID,
-			projectFlockKandangID,
-		)
-	} else {
-		db = db.Where("w.kandang_id = ?", kandangID)
-	}
-	db = applyDateRange(db, "pi.received_date", start, end)
-	return r.joinSapronakProductFlag(db, "p")
-}
-
-func (r *ClosingRepositoryImpl) incomingFarmPurchaseAllocationBase(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) *gorm.DB {
-	db := r.withCtx(ctx).
-		Table("stock_allocations AS sa").
-		Joins("JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Joins("JOIN purchases po ON po.id = pi.purchase_id AND po.deleted_at IS NULL").
-		Joins("JOIN products p ON p.id = pi.product_id").
-		Joins("JOIN warehouses w ON w.id = pi.warehouse_id").
-		Joins("LEFT JOIN recording_stocks rs ON rs.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyRecordingStock.String()).
-		Joins("LEFT JOIN recordings rec ON rec.id = rs.recording_id AND rec.deleted_at IS NULL").
-		Joins("LEFT JOIN project_chickins pc ON pc.id = sa.usable_id AND sa.usable_type = ?", fifo.UsableKeyProjectChickin.String()).
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
-		Where("w.kandang_id IS NULL").
-		Where("COALESCE(rec.project_flock_kandangs_id, pc.project_flock_kandang_id) = ?", projectFlockKandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where("pi.received_date IS NOT NULL")
 	db = applyDateRange(db, "pi.received_date", start, end)
 	return r.joinSapronakProductFlag(db, "p")
 }
 
-func mergeSapronakIncomingRows(primary []SapronakIncomingRow, extra []SapronakIncomingRow) []SapronakIncomingRow {
+func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, kandangID uint, start, end *time.Time) ([]SapronakIncomingRow, error) {
-	if len(extra) == 0 {
-		return primary
-	}
-
-	type key struct {
-		productID uint
-		flag      string
-	}
-
-	merged := make(map[key]*SapronakIncomingRow, len(primary)+len(extra))
-	order := make([]key, 0, len(primary)+len(extra))
-
-	add := func(rows []SapronakIncomingRow) {
-		for _, row := range rows {
-			k := key{productID: row.ProductID, flag: row.Flag}
-			if existing, ok := merged[k]; ok {
-				existing.Qty += row.Qty
-				existing.Value += row.Value
-				if existing.ProductName == "" {
-					existing.ProductName = row.ProductName
-				}
-				if existing.DefaultPrice == 0 {
-					existing.DefaultPrice = row.DefaultPrice
-				}
-				continue
-			}
-
-			copyRow := row
-			merged[k] = &copyRow
-			order = append(order, k)
-		}
-	}
-
-	add(primary)
-	add(extra)
-
-	result := make([]SapronakIncomingRow, 0, len(order))
-	for _, k := range order {
-		result = append(result, *merged[k])
-	}
-	return result
-}
-
-func mergeSapronakDetailMaps(primary map[uint][]SapronakDetailRow, extra map[uint][]SapronakDetailRow) map[uint][]SapronakDetailRow {
-	if len(primary) == 0 && len(extra) == 0 {
-		return map[uint][]SapronakDetailRow{}
-	}
-	if len(extra) == 0 {
-		return primary
-	}
-	if len(primary) == 0 {
-		return extra
-	}
-
-	for productID, rows := range extra {
-		primary[productID] = append(primary[productID], rows...)
-	}
-	return primary
-}
-
-func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, projectFlockKandangID uint, kandangID uint, start, end *time.Time) ([]SapronakIncomingRow, error) {
 	rows := make([]SapronakIncomingRow, 0)
-	db := r.incomingPurchaseBase(ctx, projectFlockKandangID, kandangID, start, end).Select(`
+	db := r.incomingPurchaseBase(ctx, kandangID, start, end).Select(`
 		pi.product_id AS product_id,
 		p.name AS product_name,
 		f.name AS flag,
@@ -1428,68 +1147,22 @@ func (r *ClosingRepositoryImpl) FetchSapronakIncoming(ctx context.Context, proje
 	if err := db.Group("pi.product_id, p.name, f.name, p.product_price").Scan(&rows).Error; err != nil {
 		return nil, err
 	}
-
+	return rows, nil
-	if projectFlockKandangID == 0 {
-		return rows, nil
-	}
-
-	farmRows := make([]SapronakIncomingRow, 0)
-	farmDB := r.incomingFarmPurchaseAllocationBase(ctx, projectFlockKandangID, start, end).Select(`
-		pi.product_id AS product_id,
-		p.name AS product_name,
-		f.name AS flag,
-		COALESCE(SUM(sa.qty), 0) AS qty,
-		COALESCE(SUM(sa.qty * pi.price), 0) AS value,
-		COALESCE(p.product_price, 0) AS default_price
-	`)
-	if err := farmDB.Group("pi.product_id, p.name, f.name, p.product_price").Scan(&farmRows).Error; err != nil {
-		return nil, err
-	}
-
-	return mergeSapronakIncomingRows(rows, farmRows), nil
 }
 
-func (r *ClosingRepositoryImpl) FetchSapronakIncomingDetails(ctx context.Context, projectFlockKandangID uint, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
+func (r *ClosingRepositoryImpl) FetchSapronakIncomingDetails(ctx context.Context, kandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
-	rows, err := scanAndGroupDetails(
+	return scanAndGroupDetails(
-		r.incomingPurchaseBase(ctx, projectFlockKandangID, kandangID, start, end).Select(`
+		r.incomingPurchaseBase(ctx, kandangID, start, end).Select(`
 			pi.product_id AS product_id,
 			p.name AS product_name,
 			f.name AS flag,
 			pi.received_date AS date,
 			COALESCE(po.po_number, '') AS reference,
 			COALESCE(pi.total_qty,0) AS qty_in,
-			0 AS qty_out,
-				COALESCE(pi.price,0) AS price
-			`),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	if projectFlockKandangID == 0 {
-		return rows, nil
-	}
-
-	farmRows, err := scanAndGroupDetails(
-		r.incomingFarmPurchaseAllocationBase(ctx, projectFlockKandangID, start, end).Select(`
-			pi.product_id AS product_id,
-			p.name AS product_name,
-			f.name AS flag,
-			pi.received_date AS date,
-			COALESCE(po.po_number, '') AS reference,
-			COALESCE(SUM(sa.qty),0) AS qty_in,
 			0 AS qty_out,
 			COALESCE(pi.price,0) AS price
-		`).Group(`
-			pi.id, pi.product_id, p.name, f.name,
-			pi.received_date, po.po_number, pi.price
 		`),
 	)
-	if err != nil {
-		return nil, err
-	}
-
-	return mergeSapronakDetailMaps(rows, farmRows), nil
 }
 
 type stockLogSapronakRow struct {
@@ -1780,16 +1453,6 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 }
 
 func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectFlockKandangID uint, start, end *time.Time) (map[uint][]SapronakDetailRow, error) {
-	attributedProjectFlockKandangExpr := `
-		COALESCE(
-			pc.project_flock_kandang_id,
-			pi.project_flock_kandang_id,
-			source_pw.project_flock_kandang_id,
-			ltt.target_project_flock_kandang_id,
-			pw.project_flock_kandang_id
-		)
-	`
-
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(`
@@ -1807,15 +1470,9 @@ func (r *ClosingRepositoryImpl) FetchSapronakSales(ctx context.Context, projectF
 		Joins("JOIN marketings m ON m.id = mp.marketing_id").
 		Joins("JOIN product_warehouses pw ON pw.id = sa.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
-		Joins("LEFT JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Joins("LEFT JOIN product_warehouses source_pw ON source_pw.id = std.source_product_warehouse_id").
-		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
-		Joins("LEFT JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Joins("LEFT JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
-		Where(attributedProjectFlockKandangExpr+" = ?", projectFlockKandangID).
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group("mdp.id, pw.product_id, p.name, f.name, mdp.delivery_date, mdp.created_at, m.so_number, mdp.unit_price, mp.unit_price")
 
@@ -1891,16 +1548,6 @@ func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.C
 		END
 	`, pfpType)
 
-	attributedProjectFlockKandangExpr := `
-		COALESCE(
-			pc.project_flock_kandang_id,
-			pi.project_flock_kandang_id,
-			source_pw.project_flock_kandang_id,
-			ltt.target_project_flock_kandang_id,
-			pw_sales.project_flock_kandang_id
-		)
-	`
-
 	query := r.withCtx(ctx).
 		Table("stock_allocations AS sa").
 		Select(fmt.Sprintf(`
@@ -1953,7 +1600,6 @@ func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.C
 		Joins("LEFT JOIN purchases po ON po.id = pi.purchase_id").
 		Joins("LEFT JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
 		Joins("LEFT JOIN stock_transfers st ON st.id = std.stock_transfer_id").
-		Joins("LEFT JOIN product_warehouses source_pw ON source_pw.id = std.source_product_warehouse_id").
 		Joins("LEFT JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
 		Joins("LEFT JOIN laying_transfers lt ON lt.id = ltt.laying_transfer_id").
 		Joins("LEFT JOIN product_warehouses pw_ltt ON pw_ltt.id = ltt.product_warehouse_id").
@@ -1973,7 +1619,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakSalesAllocatedDetails(ctx context.C
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Where(attributedProjectFlockKandangExpr+" = ?", projectFlockKandangID).
+		Where("pw.project_flock_kandang_id = ?", projectFlockKandangID).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Group(`
 			p_resolve.id, p_resolve.name, f.name,

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

@@ -1,208 +0,0 @@
-package repository
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/glebarez/sqlite"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-func TestSapronakIncomingPurchaseQueryPartsUsesAttributedPurchasesWhenProjectFlockKandangIDsProvided(t *testing.T) {
-	sql, args := sapronakIncomingPurchaseQueryParts(SapronakQueryParams{
-		WarehouseIDs:           []uint{46},
-		ProjectFlockKandangIDs: []uint{101},
-	})
-
-	if sql != sapronakIncomingPurchasesScopedSQL() {
-		t.Fatalf("expected scoped purchase SQL, got %q", sql)
-	}
-	if len(args) != 8 {
-		t.Fatalf("expected 8 argument groups, got %d", len(args))
-	}
-}
-
-func TestFetchSapronakIncomingIncludesAttributedFarmPurchasesAndHistoricalWarehouseFallback(t *testing.T) {
-	db := setupClosingRepositoryTestDB(t)
-	repo := NewClosingRepository(db)
-	ctx := context.Background()
-
-	receivedAt := time.Date(2026, 4, 1, 4, 0, 0, 0, time.UTC)
-	statements := []string{
-		`INSERT INTO warehouses (id, kandang_id) VALUES (1, NULL), (2, 59), (3, 88)`,
-		`INSERT INTO product_categories (id, code) VALUES (1, 'OBT'), (2, 'RAW')`,
-		`INSERT INTO products (id, name, product_category_id, product_price) VALUES
-			(10, 'MEFISTO @1 LITER', 1, 261700),
-			(20, 'PAKAN GROWING CRUMBLE MALINDO', 2, 15000)`,
-		`INSERT INTO flags (id, flagable_id, flagable_type, name) VALUES
-			(1, 10, 'products', 'OVK'),
-			(2, 10, 'products', 'OBAT')`,
-		`INSERT INTO purchases (id, po_number, deleted_at) VALUES (1, 'PO-LTI-0005', NULL)`,
-		`INSERT INTO recordings (id, project_flock_kandangs_id, deleted_at) VALUES (11, 101, NULL), (12, 999, NULL)`,
-		`INSERT INTO recording_stocks (id, recording_id, product_warehouse_id, usage_qty) VALUES (21, 11, 501, 150), (22, 12, 502, 10)`,
-		`INSERT INTO purchase_items (id, purchase_id, product_id, warehouse_id, project_flock_kandang_id, total_qty, price, received_date) VALUES
-			(1, 1, 10, 1, NULL, 100, 261700, '` + receivedAt.Format(time.RFC3339) + `'),
-			(2, 1, 20, 1, NULL, 50, 15000, '` + receivedAt.Format(time.RFC3339) + `'),
-			(3, 1, 20, 2, NULL, 25, 12000, '` + receivedAt.Format(time.RFC3339) + `'),
-			(4, 1, 10, 3, 999, 10, 261700, '` + receivedAt.Format(time.RFC3339) + `'),
-			(5, 1, 20, 1, NULL, 40, 15000, '` + receivedAt.Format(time.RFC3339) + `')`,
-		fmt.Sprintf(`INSERT INTO stock_allocations (id, product_warehouse_id, stockable_type, stockable_id, usable_type, usable_id, qty, allocation_purpose, status) VALUES
-			(1, 701, '%s', 1, '%s', 21, 100, 'CONSUME', 'ACTIVE'),
-			(2, 702, '%s', 2, '%s', 21, 50, 'CONSUME', 'ACTIVE'),
-			(3, 703, '%s', 5, '%s', 22, 40, 'CONSUME', 'ACTIVE')`,
-			fifo.StockableKeyPurchaseItems.String(),
-			fifo.UsableKeyRecordingStock.String(),
-			fifo.StockableKeyPurchaseItems.String(),
-			fifo.UsableKeyRecordingStock.String(),
-			fifo.StockableKeyPurchaseItems.String(),
-			fifo.UsableKeyRecordingStock.String(),
-		),
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed seeding schema: %v", err)
-		}
-	}
-
-	rows, err := repo.FetchSapronakIncoming(ctx, 101, 59, nil, nil)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(rows) != 2 {
-		t.Fatalf("expected 2 sapronak rows, got %d", len(rows))
-	}
-
-	byProduct := make(map[uint]SapronakIncomingRow, len(rows))
-	for _, row := range rows {
-		byProduct[row.ProductID] = row
-	}
-
-	if got := byProduct[10]; got.ProductID == 0 || got.Flag != "OVK" || got.Qty != 100 {
-		t.Fatalf("expected OVK farm purchase qty 100 for product 10, got %+v", got)
-	}
-
-	if got := byProduct[20]; got.ProductID == 0 || got.Flag != "PAKAN" || got.Qty != 75 {
-		t.Fatalf("expected PAKAN total qty 75 including farm allocated qty 50 and kandang receipt qty 25, got %+v", got)
-	}
-}
-
-func setupClosingRepositoryTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=private"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	statements := []string{
-		`CREATE TABLE warehouses (
-			id INTEGER PRIMARY KEY,
-			kandang_id INTEGER NULL
-		)`,
-		`CREATE TABLE product_categories (
-			id INTEGER PRIMARY KEY,
-			code TEXT NOT NULL
-		)`,
-		`CREATE TABLE uoms (
-			id INTEGER PRIMARY KEY,
-			name TEXT NOT NULL
-		)`,
-		`CREATE TABLE products (
-			id INTEGER PRIMARY KEY,
-			name TEXT NOT NULL,
-			product_category_id INTEGER NULL,
-			uom_id INTEGER NULL,
-			product_price NUMERIC(15,3) NOT NULL DEFAULT 0
-		)`,
-		`CREATE TABLE flags (
-			id INTEGER PRIMARY KEY,
-			flagable_id INTEGER NOT NULL,
-			flagable_type TEXT NOT NULL,
-			name TEXT NOT NULL
-		)`,
-		`CREATE TABLE purchases (
-			id INTEGER PRIMARY KEY,
-			po_number TEXT NULL,
-			notes TEXT NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE purchase_items (
-			id INTEGER PRIMARY KEY,
-			purchase_id INTEGER NOT NULL,
-			product_id INTEGER NOT NULL,
-			warehouse_id INTEGER NOT NULL,
-			project_flock_kandang_id INTEGER NULL,
-			total_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
-			price NUMERIC(15,3) NOT NULL DEFAULT 0,
-			received_date TIMESTAMP NULL
-		)`,
-		`CREATE TABLE recordings (
-			id INTEGER PRIMARY KEY,
-			project_flock_kandangs_id INTEGER NOT NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE recording_stocks (
-			id INTEGER PRIMARY KEY,
-			recording_id INTEGER NOT NULL,
-			product_warehouse_id INTEGER NOT NULL,
-			usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0
-		)`,
-		`CREATE TABLE project_chickins (
-			id INTEGER PRIMARY KEY,
-			project_flock_kandang_id INTEGER NOT NULL
-		)`,
-		`CREATE TABLE stock_allocations (
-			id INTEGER PRIMARY KEY,
-			product_warehouse_id INTEGER NOT NULL,
-			stockable_type TEXT NOT NULL,
-			stockable_id INTEGER NOT NULL,
-			usable_type TEXT NOT NULL,
-			usable_id INTEGER NOT NULL,
-			qty NUMERIC(15,3) NOT NULL DEFAULT 0,
-			allocation_purpose TEXT NOT NULL,
-			status TEXT NOT NULL
-		)`,
-		`CREATE TABLE product_warehouses (
-			id INTEGER PRIMARY KEY,
-			product_id INTEGER NOT NULL,
-			warehouse_id INTEGER NOT NULL,
-			project_flock_kandang_id INTEGER NULL
-		)`,
-		`CREATE TABLE stock_transfers (
-			id INTEGER PRIMARY KEY,
-			from_warehouse_id INTEGER NULL,
-			to_warehouse_id INTEGER NULL,
-			transfer_date TIMESTAMP NULL,
-			movement_number TEXT NULL,
-			reason TEXT NULL
-		)`,
-		`CREATE TABLE stock_transfer_details (
-			id INTEGER PRIMARY KEY,
-			stock_transfer_id INTEGER NOT NULL,
-			product_id INTEGER NOT NULL,
-			dest_product_warehouse_id INTEGER NULL,
-			source_product_warehouse_id INTEGER NULL,
-			total_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
-			usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0
-		)`,
-		`CREATE TABLE adjustment_stocks (
-			id INTEGER PRIMARY KEY,
-			product_warehouse_id INTEGER NOT NULL,
-			total_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
-			usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
-			adj_number TEXT NULL,
-			created_at TIMESTAMP NULL
-		)`,
-	}
-
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed preparing schema: %v", err)
-		}
-	}
-
-	return db
-}

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

@@ -383,7 +383,7 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 	var projectFlockKandangIDs []uint
 	if params.KandangID != nil && *params.KandangID > 0 {
 		projectFlockKandangIDs = []uint{*params.KandangID}
-	} else {
+	} else if params.Type == validation.SapronakTypeOutgoing {
 		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
 		if err != nil {
 			s.Log.Errorf("Failed to fetch project flock kandang IDs for project flock %d: %+v", projectFlockID, err)
@@ -474,7 +474,7 @@ func (s closingService) GetClosingSapronakSummary(c *fiber.Ctx, projectFlockID u
 	var projectFlockKandangIDs []uint
 	if params.KandangID != nil && *params.KandangID > 0 {
 		projectFlockKandangIDs = []uint{*params.KandangID}
-	} else {
+	} else if params.Type == validation.SapronakTypeOutgoing {
 		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
 		if err != nil {
 			s.Log.Errorf("Failed to fetch project flock kandang IDs for project flock %d: %+v", projectFlockID, err)
@@ -1156,7 +1156,7 @@ func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint
 		chickenDepletion = 0
 	}
 
-	chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age)
+chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age)
 	if fcrActFromRecording != nil {
 		chickenPerformance.FcrAct = *fcrActFromRecording
 	}

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

@@ -382,11 +382,11 @@ func buildSapronakDetails(
 func (s sapronakService) buildSapronakItems(ctx context.Context, pfk entity.ProjectFlockKandang, flagFilter string) ([]dto.SapronakItemDTO, []dto.SapronakGroupDTO, float64, float64, error) {
 	// Filter by project flock period (start = first chickin or pfk created_at, end = closed_at if any).
 	startDate, endDate := sapronakPeriodRange(pfk)
-	incomingRows, err := s.Repository.FetchSapronakIncoming(ctx, pfk.Id, pfk.KandangId, startDate, endDate)
+	incomingRows, err := s.Repository.FetchSapronakIncoming(ctx, pfk.KandangId, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}
-	incomingDetailsRows, err := s.Repository.FetchSapronakIncomingDetails(ctx, pfk.Id, pfk.KandangId, startDate, endDate)
+	incomingDetailsRows, err := s.Repository.FetchSapronakIncomingDetails(ctx, pfk.KandangId, startDate, endDate)
 	if err != nil {
 		return nil, nil, 0, 0, err
 	}

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

@@ -261,11 +261,8 @@ func (s dailyChecklistService) GetAll(c *fiber.Ctx, params *validation.Query) ([
 
 	if params.Search != "" {
 		re := regexp.MustCompile("[^a-zA-Z0-9]")
-		normalizedSearch := re.ReplaceAllString(params.Search, "")
+		like := re.ReplaceAll([]byte("%"+params.Search+"%"), []byte(""))
-		if normalizedSearch != "" {
+		db = db.Where("(regexp_replace(k.name, '[^a-zA-Z0-9]', '', 'g') ILIKE ? OR regexp_replace(dc.category::text, '[^a-zA-Z0-9]', '', 'g') ILIKE ?)", string(like), string(like))
-			like := "%" + normalizedSearch + "%"
-			db = db.Where("(regexp_replace(k.name, '[^a-zA-Z0-9]', '', 'g') ILIKE ? OR regexp_replace(dc.category::text, '[^a-zA-Z0-9]', '', 'g') ILIKE ?)", like, like)
-		}
 	}
 
 	countDB := db.Session(&gorm.Session{})
@@ -507,66 +504,24 @@ func (s *dailyChecklistService) CreateOne(c *fiber.Ctx, req *validation.Create)
 
 	status := req.Status
 	category := req.Category
-	targetID := uint(0)
 
-	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
+	createBody := &entity.DailyChecklist{
-		existing := new(entity.DailyChecklist)
+		KandangId: req.KandangId,
-		err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
+		Date:      date,
-			Where("date = ? AND kandang_id = ? AND category = ? AND (status IS NULL OR status <> ?)", date, req.KandangId, category, "REJECTED").
+		Category:  category,
-			Take(existing).Error
+		Status:    &status,
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	}
-			return err
-		}
 
-		if err == nil {
+	err = s.Repository.DB().WithContext(c.Context()).Clauses(clause.OnConflict{
-			if err := tx.Model(&entity.DailyChecklist{}).
+		Columns:   []clause.Column{{Name: "date"}, {Name: "kandang_id"}, {Name: "category"}},
-				Where("id = ?", existing.Id).
+		DoUpdates: clause.Assignments(map[string]any{"updated_at": time.Now()}),
-				Update("updated_at", time.Now()).Error; err != nil {
+	}).Create(createBody).Error
-				return err
-			}
-
-			targetID = existing.Id
-			return nil
-		}
-
-		createStatus := status
-		var rejectedCount int64
-		if err := tx.Model(&entity.DailyChecklist{}).
-			Where("date = ? AND kandang_id = ? AND category = ? AND status = ?", date, req.KandangId, category, "REJECTED").
-			Count(&rejectedCount).Error; err != nil {
-			return err
-		}
-		if rejectedCount > 0 {
-			createStatus = "DRAFT"
-		}
-
-		createBody := &entity.DailyChecklist{
-			KandangId: req.KandangId,
-			Date:      date,
-			Category:  category,
-			Status:    &createStatus,
-		}
-
-		if err := tx.Create(createBody).Error; err != nil {
-			// Handle concurrent insert for active checklist with same key.
-			if findErr := tx.
-				Where("date = ? AND kandang_id = ? AND category = ? AND (status IS NULL OR status <> ?)", date, req.KandangId, category, "REJECTED").
-				Take(existing).Error; findErr == nil {
-				targetID = existing.Id
-				return nil
-			}
-			return err
-		}
-
-		targetID = createBody.Id
-		return nil
-	})
 	if err != nil {
-		s.Log.Errorf("Failed to create/upsert dailyChecklist: %+v", err)
+		s.Log.Errorf("Failed to upsert dailyChecklist: %+v", err)
 		return nil, err
 	}
 
-	return s.GetOne(c, targetID)
+	return s.GetOne(c, createBody.Id)
 }
 
 func (s dailyChecklistService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.DailyChecklist, error) {

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

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/dashboards/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -36,7 +35,6 @@ type UniformityWeeklyMetric struct {
 	Week          int
 	Uniformity    float64
 	AverageWeight float64
-	UniformDate   time.Time
 }
 
 type StandardWeeklyMetric struct {
@@ -106,15 +104,6 @@ func applyDashboardFilters(db *gorm.DB, filters *validation.DashboardFilter) *go
 	return db
 }
 
-func dashboardUniformityWeekExpr() string {
-	return fmt.Sprintf(`CASE
-		WHEN u.uniform_date IS NULL OR pc.chick_in_date IS NULL THEN 0
-		WHEN u.uniform_date::date < pc.chick_in_date THEN 0
-		WHEN UPPER(pf.category) = 'LAYING' THEN (((u.uniform_date::date - pc.chick_in_date)::int) / 7) + %d
-		ELSE (((u.uniform_date::date - pc.chick_in_date)::int) / 7) + 1
-	END`, config.LayingWeekStart())
-}
-
 func (r *DashboardRepositoryImpl) GetRecordingWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]RecordingWeeklyMetric, error) {
 	var rows []RecordingWeeklyMetric
 
@@ -150,29 +139,20 @@ func (r *DashboardRepositoryImpl) GetRecordingWeeklyMetrics(ctx context.Context,
 
 func (r *DashboardRepositoryImpl) GetUniformityWeeklyMetrics(ctx context.Context, start, end time.Time, filters *validation.DashboardFilter) ([]UniformityWeeklyMetric, error) {
 	var rows []UniformityWeeklyMetric
-	weekExpr := dashboardUniformityWeekExpr()
 
 	db := r.DB().WithContext(ctx).
 		Table("project_flock_kandang_uniformity AS u").
-		Select(fmt.Sprintf(`%s AS week,
+		Select(`u.week AS week,
 			COALESCE(AVG(u.uniformity), 0) AS uniformity,
-			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`, weekExpr)).
+			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = u.project_flock_kandang_id").
-		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
-		Joins(`JOIN (
-			SELECT project_flock_kandang_id, MIN(chick_in_date)::date AS chick_in_date
-			FROM project_chickins
-			WHERE deleted_at IS NULL
-			GROUP BY project_flock_kandang_id
-		) AS pc ON pc.project_flock_kandang_id = u.project_flock_kandang_id`).
 		Where("u.uniform_date IS NOT NULL").
-		Where("u.uniform_date >= ? AND u.uniform_date < ?", start, end).
+		Where("u.uniform_date >= ? AND u.uniform_date < ?", start, end)
-		Where("u.uniform_date::date >= pc.chick_in_date")
 
 	db = applyDashboardFilters(db, filters)
 
-	if err := db.Group("week").Order("week ASC").Scan(&rows).Error; err != nil {
+	if err := db.Group("u.week").Order("u.week ASC").Scan(&rows).Error; err != nil {
 		return nil, err
 	}
 
@@ -538,31 +518,23 @@ func (r *DashboardRepositoryImpl) GetComparisonWeeklyUniformityMetrics(ctx conte
 	}
 
 	var rows []ComparisonUniformityMetric
-	weekExpr := dashboardUniformityWeekExpr()
 	db := r.DB().WithContext(ctx).
 		Table("project_flock_kandang_uniformity AS u").
-		Select(fmt.Sprintf(`%s AS week,
+		Select(fmt.Sprintf(`u.week AS week,
 			%s AS series_id,
 			COALESCE(AVG(u.uniformity), 0) AS uniformity,
-			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`, weekExpr, seriesExpr)).
+			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`, seriesExpr)).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = u.project_flock_kandang_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN project_flocks AS pf ON pf.id = pfk.project_flock_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
-		Joins(`JOIN (
-			SELECT project_flock_kandang_id, MIN(chick_in_date)::date AS chick_in_date
-			FROM project_chickins
-			WHERE deleted_at IS NULL
-			GROUP BY project_flock_kandang_id
-		) AS pc ON pc.project_flock_kandang_id = u.project_flock_kandang_id`).
 		Where("u.uniform_date IS NOT NULL").
-		Where("u.uniform_date >= ? AND u.uniform_date < ?", start, end).
+		Where("u.uniform_date >= ? AND u.uniform_date < ?", start, end)
-		Where("u.uniform_date::date >= pc.chick_in_date")
 
 	db = applyDashboardFilters(db, filters)
 
-	groupBy := fmt.Sprintf("week, %s", groupExpr)
+	groupBy := fmt.Sprintf("u.week, %s", groupExpr)
-	orderBy := fmt.Sprintf("week ASC, %s", orderExpr)
+	orderBy := fmt.Sprintf("u.week ASC, %s", orderExpr)
 	if err := db.Group(groupBy).Order(orderBy).Scan(&rows).Error; err != nil {
 		return nil, err
 	}

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

@@ -265,7 +265,6 @@ func (s dashboardService) buildPerformanceCharts(ctx context.Context, params *va
 	}
 
 	bodyWeightDataset := make([]map[string]interface{}, 0, len(weeks))
-	bodyWeightDatasetIndexByWeek := make(map[int]int, len(weeks))
 	performanceDataset := make([]map[string]interface{}, 0, len(weeks))
 	fcrDataset := make([]map[string]interface{}, 0, len(weeks))
 	deplesiDataset := make([]map[string]interface{}, 0, len(weeks))
@@ -275,10 +274,10 @@ func (s dashboardService) buildPerformanceCharts(ctx context.Context, params *va
 	cumFeed := 0.0
 
 	for _, week := range weeks {
-		rec, hasRec := recordingMap[week]
+		rec := recordingMap[week]
-		uni, hasUni := uniformityMap[week]
+		uni := uniformityMap[week]
-		std, hasStd := standardMap[week]
+		std := standardMap[week]
-		stdFcr, hasStdFcr := standardFcrMap[week]
+		stdFcr := standardFcrMap[week]
 		weekEgg := weeklyEggMap[week]
 		weekFeed := weeklyFeedMap[week]
 
@@ -294,80 +293,39 @@ func (s dashboardService) buildPerformanceCharts(ctx context.Context, params *va
 			actFcrCum = cumFeed / cumEgg
 		}
 
-		bodyWeightRow := map[string]interface{}{
+		bodyWeightDataset = append(bodyWeightDataset, map[string]interface{}{
-			"week": week,
+			"week":            week,
-		}
+			"body_weight":     roundTo(uni.AverageWeight, 2),
-		if hasUni {
+			"std_body_weight": roundTo(std.StdBodyWeight, 2),
-			bodyWeightRow["body_weight"] = roundTo(uni.AverageWeight, 2)
+		})
-		}
-		if hasStd {
-			bodyWeightRow["std_body_weight"] = roundTo(std.StdBodyWeight, 2)
-		}
-		if len(bodyWeightRow) > 1 {
-			bodyWeightDataset = append(bodyWeightDataset, bodyWeightRow)
-		}
 
-		performanceRow := map[string]interface{}{
+		performanceDataset = append(performanceDataset, map[string]interface{}{
-			"week": week,
+			"week":            week,
-		}
+			"act_laying":      roundTo(rec.HenDay, 2),
-		if hasRec {
+			"std_laying":      roundTo(std.StdLaying, 2),
-			performanceRow["act_laying"] = roundTo(rec.HenDay, 2)
+			"act_egg_weight":  roundTo(rec.EggWeight, 2),
-			performanceRow["act_egg_weight"] = roundTo(rec.EggWeight, 2)
+			"std_egg_weight":  roundTo(std.StdEggWeight, 2),
-			performanceRow["act_feed_intake"] = roundTo(rec.FeedIntake, 2)
+			"act_feed_intake": roundTo(rec.FeedIntake, 2),
-		}
+			"std_feed_intake": roundTo(std.StdFeedIntake, 2),
-		if hasUni {
+			"act_uniformity":  roundTo(uni.Uniformity, 2),
-			performanceRow["act_uniformity"] = roundTo(uni.Uniformity, 2)
+			"std_uniformity":  roundTo(std.StdUniformity, 2),
-		}
+		})
-		if hasStd {
-			performanceRow["std_laying"] = roundTo(std.StdLaying, 2)
-			performanceRow["std_egg_weight"] = roundTo(std.StdEggWeight, 2)
-			performanceRow["std_feed_intake"] = roundTo(std.StdFeedIntake, 2)
-			performanceRow["std_uniformity"] = roundTo(std.StdUniformity, 2)
-		}
-		if len(performanceRow) > 1 {
-			performanceDataset = append(performanceDataset, performanceRow)
-		}
 
-		fcrRow := map[string]interface{}{
+		fcrDataset = append(fcrDataset, map[string]interface{}{
-			"week": week,
+			"week":        week,
-		}
+			"act_fcr":     roundTo(actFcr, 2),
-		if weekEgg > 0 && weekFeed > 0 {
+			"std_fcr":     roundTo(stdFcr, 2),
-			fcrRow["act_fcr"] = roundTo(actFcr, 2)
+			"act_fcr_cum": roundTo(actFcrCum, 2),
-		}
+			"std_fcr_cum": roundTo(stdFcr, 2),
-		if cumEgg > 0 && cumFeed > 0 {
+		})
-			fcrRow["act_fcr_cum"] = roundTo(actFcrCum, 2)
-		}
-		if hasStdFcr {
-			fcrRow["std_fcr"] = roundTo(stdFcr, 2)
-			fcrRow["std_fcr_cum"] = roundTo(stdFcr, 2)
-		}
-		if len(fcrRow) > 1 {
-			fcrDataset = append(fcrDataset, fcrRow)
-		}
 
-		deplesiRow := map[string]interface{}{
+		deplesiDataset = append(deplesiDataset, map[string]interface{}{
-			"week": week,
+			"week":        week,
-		}
+			"act_deplesi": roundTo(rec.CumDepletionRate, 2),
-		if hasRec {
+			"std_deplesi": roundTo(std.StdDepletion, 2),
-			deplesiRow["act_deplesi"] = roundTo(rec.CumDepletionRate, 2)
+		})
-		}
-		if hasStd {
-			deplesiRow["std_deplesi"] = roundTo(std.StdDepletion, 2)
-		}
-		if len(deplesiRow) > 1 {
-			deplesiDataset = append(deplesiDataset, deplesiRow)
-		}
 	}
 
-	bodyWeightDataset = extendBodyWeightDatasetUntilEndDate(
-		bodyWeightDataset,
-		bodyWeightDatasetIndexByWeek,
-		uniformities,
-		uniformityMap,
-		standardMap,
-		params.PeriodEnd,
-	)
-
 	qualityRows, err := s.Repository.GetEggQualityWeeklyMetrics(ctx, startDate, endExclusive, filter)
 	if err != nil {
 		return nil, err
@@ -1091,69 +1049,6 @@ func (s dashboardService) avgSellingPrice(ctx context.Context, filter *validatio
 	return result.TotalPrice / result.TotalWeight, nil
 }
 
-func extendBodyWeightDatasetUntilEndDate(
-	dataset []map[string]interface{},
-	indexByWeek map[int]int,
-	uniformities []repository.UniformityWeeklyMetric,
-	uniformityMap map[int]repository.UniformityWeeklyMetric,
-	standardMap map[int]repository.StandardWeeklyMetric,
-	periodEnd time.Time,
-) []map[string]interface{} {
-	latestUniformityWeek := 0
-	var latestUniformityDate time.Time
-	for _, row := range uniformities {
-		if row.Week <= 0 || row.UniformDate.IsZero() {
-			continue
-		}
-		if latestUniformityDate.IsZero() || row.UniformDate.After(latestUniformityDate) || (row.UniformDate.Equal(latestUniformityDate) && row.Week > latestUniformityWeek) {
-			latestUniformityDate = row.UniformDate
-			latestUniformityWeek = row.Week
-		}
-	}
-
-	if latestUniformityWeek <= 0 || latestUniformityDate.IsZero() || periodEnd.IsZero() || !periodEnd.After(latestUniformityDate) {
-		return dataset
-	}
-
-	additionalWeeks := int(math.Ceil(periodEnd.Sub(latestUniformityDate).Hours() / (24 * 7)))
-	if additionalWeeks <= 0 {
-		return dataset
-	}
-
-	lastUniformity := uniformityMap[latestUniformityWeek]
-	lastStandard := standardMap[latestUniformityWeek]
-	latestBodyWeight := roundTo(lastUniformity.AverageWeight, 2)
-	latestStdBodyWeight := roundTo(lastStandard.StdBodyWeight, 2)
-
-	targetWeek := latestUniformityWeek + additionalWeeks
-	for week := latestUniformityWeek + 1; week <= targetWeek; week++ {
-		row := map[string]interface{}{
-			"week":            week,
-			"body_weight":     latestBodyWeight,
-			"std_body_weight": latestStdBodyWeight,
-		}
-
-		if idx, ok := indexByWeek[week]; ok {
-			dataset[idx] = row
-			continue
-		}
-
-		dataset = append(dataset, row)
-		indexByWeek[week] = len(dataset) - 1
-	}
-
-	sort.Slice(dataset, func(i, j int) bool {
-		return datasetWeek(dataset[i]) < datasetWeek(dataset[j])
-	})
-
-	return dataset
-}
-
-func datasetWeek(row map[string]interface{}) int {
-	week, _ := row["week"].(int)
-	return week
-}
-
 func feedUsageToGrams(rows []repository.FeedUsageByUom) float64 {
 	total := 0.0
 	for _, row := range rows {

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

@@ -103,22 +103,3 @@ func (u *AdjustmentController) GetOne(c *fiber.Ctx) error {
 			Data:    dto.ToAdjustmentDetailDTO(stockLog),
 		})
 }
-
-func (u *AdjustmentController) 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.AdjustmentService.DeleteOne(c, uint(id)); err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Common{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Delete adjustment successfully",
-		})
-}

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

@@ -5,7 +5,6 @@ import (
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	productCategoryDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/product-categories/dto"
-	uomDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/uoms/dto"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 )
 
@@ -15,7 +14,6 @@ type ProductRelationDTO struct {
 	Id              uint                                           `json:"id"`
 	Name            string                                         `json:"name"`
 	SKU             string                                         `json:"sku"`
-	Uom             *uomDTO.UomRelationDTO                         `json:"uom,omitempty"`
 	ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
 }
 
@@ -91,17 +89,11 @@ func ToProductRelationDTO(e *entity.Product) *ProductRelationDTO {
 		mapped := productCategoryDTO.ToProductCategoryRelationDTO(e.ProductCategory)
 		category = &mapped
 	}
-	var uom *uomDTO.UomRelationDTO
-	if e.Uom.Id != 0 {
-		mapped := uomDTO.ToUomRelationDTO(e.Uom)
-		uom = &mapped
-	}
 
 	return &ProductRelationDTO{
 		Id:              e.Id,
 		Name:            e.Name,
 		SKU:             sku,
-		Uom:             uom,
 		ProductCategory: category,
 	}
 }

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

@@ -2,12 +2,12 @@ package repositories
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
@@ -15,19 +15,9 @@ import (
 type AdjustmentStockRepository interface {
 	CreateOne(ctx context.Context, data *entity.AdjustmentStock, modifier func(*gorm.DB) *gorm.DB) error
 	GetByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.AdjustmentStock, error)
-	GetByIDForUpdate(ctx context.Context, id uint) (*entity.AdjustmentStock, error)
 	FindKandangIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (uint, error)
-	FindProductIDByProductWarehouseID(ctx context.Context, productWarehouseID uint) (uint, error)
 	FindRoutesByFunctionCode(ctx context.Context, productID uint, functionCode string) ([]AdjustmentRouteResolution, error)
-	LoadDownstreamDependencies(ctx context.Context, stockableType string, stockableIDs []uint) ([]AdjustmentDownstreamDependency, error)
+	FindOverconsumeRule(ctx context.Context, lane, flagGroupCode, functionCode string) (*bool, error)
-	FindAyamSourceProductWarehouse(ctx context.Context, warehouseID uint, projectFlockKandangID uint) (*entity.ProductWarehouse, error)
-	IsAyamProduct(ctx context.Context, productID uint) (bool, error)
-	CountActiveConsumeAllocationsByUsable(ctx context.Context, usableType string, usableID uint) (int64, error)
-	UpdateTotalQty(ctx context.Context, id uint, qty float64) error
-	UpdatePairedAdjustmentID(ctx context.Context, id uint, pairedID uint) error
-	DeleteStockLogsByAdjustmentID(ctx context.Context, adjustmentID uint) error
-	DeleteAdjustmentByID(ctx context.Context, id uint) error
-	ResyncProjectFlockPopulationUsage(ctx context.Context, projectFlockKandangID uint) error
 	FindHistory(ctx context.Context, filter AdjustmentHistoryFilter, modifier func(*gorm.DB) *gorm.DB) ([]*entity.AdjustmentStock, int64, error)
 	WithTx(tx *gorm.DB) AdjustmentStockRepository
 	DB() *gorm.DB
@@ -54,13 +44,6 @@ type AdjustmentHistoryFilter struct {
 	Limit           int
 }
 
-type AdjustmentDownstreamDependency struct {
-	UsableType    string `gorm:"column:usable_type"`
-	UsableID      uint64 `gorm:"column:usable_id"`
-	FunctionCode  string `gorm:"column:function_code"`
-	FlagGroupCode string `gorm:"column:flag_group_code"`
-}
-
 type adjustmentStockRepositoryImpl struct {
 	db *gorm.DB
 }
@@ -90,17 +73,6 @@ func (r *adjustmentStockRepositoryImpl) GetByID(ctx context.Context, id uint, mo
 	return &record, nil
 }
 
-func (r *adjustmentStockRepositoryImpl) GetByIDForUpdate(ctx context.Context, id uint) (*entity.AdjustmentStock, error) {
-	var record entity.AdjustmentStock
-	if err := r.db.WithContext(ctx).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Where("id = ?", id).
-		Take(&record).Error; err != nil {
-		return nil, err
-	}
-	return &record, nil
-}
-
 func (r *adjustmentStockRepositoryImpl) FindKandangIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangID uint) (uint, error) {
 	type pfkRow struct {
 		KandangID uint `gorm:"column:kandang_id"`
@@ -119,21 +91,6 @@ func (r *adjustmentStockRepositoryImpl) FindKandangIDByProjectFlockKandangID(ctx
 	return pfk.KandangID, nil
 }
 
-func (r *adjustmentStockRepositoryImpl) FindProductIDByProductWarehouseID(ctx context.Context, productWarehouseID uint) (uint, error) {
-	type productRow struct {
-		ProductID uint `gorm:"column:product_id"`
-	}
-	var row productRow
-	if err := r.db.WithContext(ctx).
-		Table("product_warehouses").
-		Select("product_id").
-		Where("id = ?", productWarehouseID).
-		Take(&row).Error; err != nil {
-		return 0, err
-	}
-	return row.ProductID, nil
-}
-
 func (r *adjustmentStockRepositoryImpl) FindRoutesByFunctionCode(
 	ctx context.Context,
 	productID uint,
@@ -165,183 +122,37 @@ func (r *adjustmentStockRepositoryImpl) FindRoutesByFunctionCode(
 	return rows, nil
 }
 
-func (r *adjustmentStockRepositoryImpl) LoadDownstreamDependencies(
+func (r *adjustmentStockRepositoryImpl) FindOverconsumeRule(
 	ctx context.Context,
-	stockableType string,
+	lane string,
-	stockableIDs []uint,
+	flagGroupCode string,
-) ([]AdjustmentDownstreamDependency, error) {
+	functionCode string,
-	if strings.TrimSpace(stockableType) == "" || len(stockableIDs) == 0 {
+) (*bool, error) {
-		return nil, nil
+	type selectedRow struct {
+		AllowOverconsume bool `gorm:"column:allow_overconsume"`
 	}
 
-	var rows []AdjustmentDownstreamDependency
+	var selected selectedRow
 	err := r.db.WithContext(ctx).
-		Table("stock_allocations").
+		Table("fifo_stock_v2_overconsume_rules").
-		Select("usable_type, usable_id, COALESCE(function_code,'') AS function_code, COALESCE(flag_group_code,'') AS flag_group_code").
+		Select("allow_overconsume").
-		Where("stockable_type = ?", strings.ToUpper(strings.TrimSpace(stockableType))).
+		Where("is_active = TRUE").
-		Where("stockable_id IN ?", stockableIDs).
+		Where("lane = ?", lane).
-		Where("status = ?", entity.StockAllocationStatusActive).
+		Where("(flag_group_code IS NULL OR flag_group_code = ?)", flagGroupCode).
-		Where("allocation_purpose = ?", entity.StockAllocationPurposeConsume).
+		Where("(function_code IS NULL OR function_code = ?)", functionCode).
-		Where("deleted_at IS NULL").
+		Order("CASE WHEN flag_group_code IS NULL THEN 1 ELSE 0 END ASC").
-		Where(
+		Order("CASE WHEN function_code IS NULL THEN 1 ELSE 0 END ASC").
-			"(usable_type <> ? OR EXISTS (SELECT 1 FROM project_chickins pc WHERE pc.id = stock_allocations.usable_id AND pc.deleted_at IS NULL))",
+		Order("priority ASC, id ASC").
-			"PROJECT_CHICKIN",
+		Limit(1).
-		).
+		Take(&selected).Error
-		Group("usable_type, usable_id, function_code, flag_group_code").
-		Scan(&rows).Error
 	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
 		return nil, err
 	}
 
-	return rows, nil
+	return &selected.AllowOverconsume, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) FindAyamSourceProductWarehouse(
-	ctx context.Context,
-	warehouseID uint,
-	projectFlockKandangID uint,
-) (*entity.ProductWarehouse, error) {
-	var sourcePW entity.ProductWarehouse
-	err := r.db.WithContext(ctx).
-		Model(&entity.ProductWarehouse{}).
-		Where("project_flock_kandang_id = ?", projectFlockKandangID).
-		Where(`
-			EXISTS (
-				SELECT 1
-				FROM flags f
-				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-				WHERE f.flagable_type = ?
-				  AND f.flagable_id = product_warehouses.product_id
-				  AND fm.flag_group_code = ?
-			)
-		`, entity.FlagableTypeProduct, "AYAM").
-		Order(gorm.Expr("CASE WHEN warehouse_id = ? THEN 0 ELSE 1 END ASC", warehouseID)).
-		Order("id ASC").
-		Take(&sourcePW).Error
-	if err != nil {
-		return nil, err
-	}
-	return &sourcePW, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) IsAyamProduct(ctx context.Context, productID uint) (bool, error) {
-	if productID == 0 {
-		return false, nil
-	}
-
-	var count int64
-	if err := r.db.WithContext(ctx).
-		Table("flags f").
-		Joins("JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.flag_group_code = ? AND fm.is_active = TRUE", "AYAM").
-		Where("f.flagable_type = ?", entity.FlagableTypeProduct).
-		Where("f.flagable_id = ?", productID).
-		Count(&count).Error; err != nil {
-		return false, err
-	}
-
-	return count > 0, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) CountActiveConsumeAllocationsByUsable(
-	ctx context.Context,
-	usableType string,
-	usableID uint,
-) (int64, error) {
-	if strings.TrimSpace(usableType) == "" || usableID == 0 {
-		return 0, nil
-	}
-
-	var count int64
-	err := r.db.WithContext(ctx).
-		Table("stock_allocations").
-		Where("usable_type = ?", strings.ToUpper(strings.TrimSpace(usableType))).
-		Where("usable_id = ?", usableID).
-		Where("status = ?", entity.StockAllocationStatusActive).
-		Where("allocation_purpose = ?", entity.StockAllocationPurposeConsume).
-		Where("deleted_at IS NULL").
-		Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-
-	return count, nil
-}
-
-func (r *adjustmentStockRepositoryImpl) UpdateTotalQty(ctx context.Context, id uint, qty float64) error {
-	return r.db.WithContext(ctx).
-		Model(&entity.AdjustmentStock{}).
-		Where("id = ?", id).
-		Update("total_qty", qty).Error
-}
-
-func (r *adjustmentStockRepositoryImpl) UpdatePairedAdjustmentID(ctx context.Context, id uint, pairedID uint) error {
-	return r.db.WithContext(ctx).
-		Model(&entity.AdjustmentStock{}).
-		Where("id = ?", id).
-		Update("paired_adjustment_id", pairedID).Error
-}
-
-func (r *adjustmentStockRepositoryImpl) DeleteStockLogsByAdjustmentID(ctx context.Context, adjustmentID uint) error {
-	return r.db.WithContext(ctx).
-		Where("loggable_type = ? AND loggable_id = ?", string(utils.StockLogTypeAdjustment), adjustmentID).
-		Delete(&entity.StockLog{}).Error
-}
-
-func (r *adjustmentStockRepositoryImpl) DeleteAdjustmentByID(ctx context.Context, id uint) error {
-	return r.db.WithContext(ctx).
-		Where("id = ?", id).
-		Delete(&entity.AdjustmentStock{}).Error
-}
-
-func (r *adjustmentStockRepositoryImpl) ResyncProjectFlockPopulationUsage(ctx context.Context, projectFlockKandangID uint) error {
-	if projectFlockKandangID == 0 {
-		return nil
-	}
-
-	idsSubquery := `
-		SELECT pfp.id
-		FROM project_flock_populations pfp
-		JOIN project_chickins pc ON pc.id = pfp.project_chickin_id
-		WHERE pc.project_flock_kandang_id = ?
-	`
-
-	updateWithAlloc := `
-		UPDATE project_flock_populations p
-		SET total_used_qty = COALESCE(a.used, 0)
-		FROM (
-			SELECT stockable_id, SUM(qty) AS used
-			FROM stock_allocations
-			WHERE stockable_type = 'PROJECT_FLOCK_POPULATION'
-			  AND status = 'ACTIVE'
-			  AND allocation_purpose = 'CONSUME'
-			GROUP BY stockable_id
-		) a
-		WHERE p.id = a.stockable_id
-		  AND p.id IN (` + idsSubquery + `)
-	`
-
-	resetMissing := `
-		UPDATE project_flock_populations p
-		SET total_used_qty = 0
-		WHERE p.id IN (` + idsSubquery + `)
-			AND NOT EXISTS (
-				SELECT 1
-				FROM stock_allocations sa
-				WHERE sa.stockable_type = 'PROJECT_FLOCK_POPULATION'
-				  AND sa.status = 'ACTIVE'
-				  AND sa.allocation_purpose = 'CONSUME'
-				  AND sa.stockable_id = p.id
-			)
-	`
-
-	db := r.db.WithContext(ctx)
-	if err := db.Exec(updateWithAlloc, projectFlockKandangID).Error; err != nil {
-		return err
-	}
-	if err := db.Exec(resetMissing, projectFlockKandangID).Error; err != nil {
-		return err
-	}
-	return nil
 }
 
 func (r *adjustmentStockRepositoryImpl) FindHistory(

internal/modules/inventory/adjustments/route.go

@@ -15,9 +15,8 @@ func AdjustmentRoutes(v1 fiber.Router, u user.UserService, s adjustment.Adjustme
 	route := v1.Group("/adjustments")
 	route.Use(m.Auth(u))
 	// Standard CRUD routes following master data pattern
-	route.Get("/", m.RequirePermissions(m.P_AdjustmentGetAll), ctrl.AdjustmentHistory) // Get all with pagination and filters
+	route.Get("/",m.RequirePermissions(m.P_AdjustmentGetAll), ctrl.AdjustmentHistory) // Get all with pagination and filters
-	route.Post("/", m.RequirePermissions(m.P_AdjustmentCreate), ctrl.Adjustment)       // Create adjustment
+	route.Post("/",m.RequirePermissions(m.P_AdjustmentCreate), ctrl.Adjustment)       // Create adjustment
-	route.Get("/:id", m.RequirePermissions(m.P_AdjustmentGetOne), ctrl.GetOne)
+	route.Get("/:id",m.RequirePermissions(m.P_AdjustmentGetOne), ctrl.GetOne)
-	route.Delete("/:id", m.RequirePermissions(m.P_AdjustmentDeleteOne), ctrl.DeleteOne)
 
 }

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

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"sort"
 	"strings"
 
 	"github.com/go-playground/validator/v10"
@@ -30,7 +29,6 @@ import (
 type AdjustmentService interface {
 	Adjustment(ctx *fiber.Ctx, req *validation.Create) (*entity.AdjustmentStock, error)
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.AdjustmentStock, error)
-	DeleteOne(ctx *fiber.Ctx, id uint) error
 	AdjustmentHistory(ctx *fiber.Ctx, query *validation.Query) ([]*entity.AdjustmentStock, int64, error)
 }
 
@@ -50,6 +48,7 @@ type adjustmentService struct {
 const (
 	adjustmentLaneStockable = "STOCKABLE"
 	adjustmentLaneUsable    = "USABLE"
+	flagGroupAyam           = "AYAM"
 )
 
 func NewAdjustmentService(
@@ -77,21 +76,23 @@ func NewAdjustmentService(
 	}
 }
 
+func (s *adjustmentService) withRelations(db *gorm.DB) *gorm.DB {
+	return db.
+		Preload("ProductWarehouse").
+		Preload("ProductWarehouse.Product").
+		Preload("ProductWarehouse.Warehouse").
+		Preload("ProductWarehouse.Warehouse.Location").
+		Preload("ProductWarehouse.ProjectFlockKandang").
+		Preload("ProductWarehouse.ProjectFlockKandang.ProjectFlock").
+		Preload("StockLog.CreatedUser")
+}
+
 func (s *adjustmentService) GetOne(c *fiber.Ctx, id uint) (*entity.AdjustmentStock, error) {
 	if err := m.EnsureStockLogAccess(c, s.StockLogsRepository.DB(), id); err != nil {
 		return nil, err
 	}
 
-	adjustmentStock, err := s.AdjustmentStockRepository.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
+	adjustmentStock, err := s.AdjustmentStockRepository.GetByID(c.Context(), id, s.withRelations)
-		return db.
-			Preload("ProductWarehouse").
-			Preload("ProductWarehouse.Product").
-			Preload("ProductWarehouse.Warehouse").
-			Preload("ProductWarehouse.Warehouse.Location").
-			Preload("ProductWarehouse.ProjectFlockKandang").
-			Preload("ProductWarehouse.ProjectFlockKandang.ProjectFlock").
-			Preload("StockLog.CreatedUser")
-	})
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fiber.NewError(fiber.StatusNotFound, "Adjustment not found")
@@ -103,250 +104,6 @@ func (s *adjustmentService) GetOne(c *fiber.Ctx, id uint) (*entity.AdjustmentSto
 	return adjustmentStock, nil
 }
 
-func (s *adjustmentService) DeleteOne(c *fiber.Ctx, id uint) error {
-	if id == 0 {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid adjustment id")
-	}
-	if s.FifoStockV2Svc == nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
-	}
-	if err := m.EnsureStockLogAccess(c, s.StockLogsRepository.DB(), id); err != nil {
-		return err
-	}
-
-	ctx := c.Context()
-	actorID, err := m.ActorIDFromContext(c)
-	if err != nil {
-		return err
-	}
-
-	return s.StockLogsRepository.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		adjustments, err := s.collectAdjustmentsForDelete(ctx, tx, id)
-		if err != nil {
-			return err
-		}
-		for _, item := range adjustments {
-			if err := s.deleteSingleAdjustmentInTx(ctx, tx, item, actorID); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-func (s *adjustmentService) collectAdjustmentsForDelete(ctx context.Context, tx *gorm.DB, id uint) ([]entity.AdjustmentStock, error) {
-	repoTx := s.AdjustmentStockRepository.WithTx(tx)
-	adjustment, err := repoTx.GetByIDForUpdate(ctx, id)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fiber.NewError(fiber.StatusNotFound, "Adjustment not found")
-		}
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to load adjustment")
-	}
-
-	adjustments := []entity.AdjustmentStock{*adjustment}
-	leftPairCode := utils.NormalizeUpper(adjustment.FunctionCode)
-	isDepletionCode := leftPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn) ||
-		leftPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut)
-	if !isDepletionCode {
-		return adjustments, nil
-	}
-	if adjustment.PairedAdjustmentId == nil || *adjustment.PairedAdjustmentId == 0 {
-		return nil, fiber.NewError(
-			fiber.StatusBadRequest,
-			"Adjustment depletion tidak memiliki pasangan valid. Data harus diperbaiki terlebih dahulu untuk mencegah orphan.",
-		)
-	}
-
-	pair, err := repoTx.GetByIDForUpdate(ctx, *adjustment.PairedAdjustmentId)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fiber.NewError(
-				fiber.StatusBadRequest,
-				fmt.Sprintf("Pasangan adjustment depletion (%d) tidak ditemukan. Data harus diperbaiki terlebih dahulu untuk mencegah orphan.", *adjustment.PairedAdjustmentId),
-			)
-		}
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to load paired adjustment")
-	}
-	rightPairCode := utils.NormalizeUpper(pair.FunctionCode)
-	isPairDepletionCode := rightPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn) ||
-		rightPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut)
-	if !isPairDepletionCode {
-		return nil, fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf("Pasangan adjustment %d bukan depletion pair yang valid", pair.Id),
-		)
-	}
-	if pair.PairedAdjustmentId == nil || *pair.PairedAdjustmentId != adjustment.Id {
-		return nil, fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf("Pasangan adjustment depletion tidak konsisten (%d <-> %d). Perbaiki pairing terlebih dahulu.", adjustment.Id, pair.Id),
-		)
-	}
-	isValidPair := (leftPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn) &&
-		rightPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut)) ||
-		(leftPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionOut) &&
-			rightPairCode == string(utils.AdjustmentTransactionSubtypeRecordingDepletionIn))
-	if !isValidPair {
-		return nil, fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf("Pasangan function_code depletion tidak valid (%s <-> %s)", adjustment.FunctionCode, pair.FunctionCode),
-		)
-	}
-
-	adjustments = append(adjustments, *pair)
-	sort.Slice(adjustments, func(i, j int) bool {
-		return adjustments[i].Id < adjustments[j].Id
-	})
-	return adjustments, nil
-}
-
-func (s *adjustmentService) deleteSingleAdjustmentInTx(
-	ctx context.Context,
-	tx *gorm.DB,
-	adjustment entity.AdjustmentStock,
-	actorID uint,
-) error {
-	repoTx := s.AdjustmentStockRepository.WithTx(tx)
-	productID, err := repoTx.FindProductIDByProductWarehouseID(ctx, adjustment.ProductWarehouseId)
-	if err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to load product warehouse context")
-	}
-
-	routeMeta, err := s.resolveRouteByFunctionCode(ctx, productID, adjustment.FunctionCode)
-	if err != nil {
-		return err
-	}
-	isAyamProduct, err := repoTx.IsAyamProduct(ctx, productID)
-	if err != nil {
-		s.Log.Errorf("Failed to resolve AYAM flag for product %d: %+v", productID, err)
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to validate product flag")
-	}
-
-	stockLogRepoTx := stockLogsRepo.NewStockLogRepository(tx)
-	notes := fmt.Sprintf("ADJUSTMENT DELETE#%s", utils.NormalizeTrim(adjustment.AdjNumber))
-
-	switch routeMeta.Lane {
-	case adjustmentLaneStockable:
-		deps, allowPending, err := s.resolveAdjustmentDependenciesAndPolicy(
-			ctx,
-			tx,
-			fifo.StockableKeyAdjustmentIn.String(),
-			[]uint{adjustment.Id},
-		)
-		if err != nil {
-			return err
-		}
-		if len(deps) > 0 && isAyamProduct {
-			return fiber.NewError(
-				fiber.StatusBadRequest,
-				fmt.Sprintf(
-					"Adjustment tidak dapat dihapus karena produk AYAM sudah dipakai transaksi turunan. Dependensi aktif: %s. Alasan block: produk AYAM yang sudah terpakai tidak dapat dihapus.",
-					formatAdjustmentDependencySummary(deps),
-				),
-			)
-		}
-		if len(deps) > 0 && !allowPending {
-			return fiber.NewError(
-				fiber.StatusBadRequest,
-				fmt.Sprintf(
-					"Adjustment tidak dapat dihapus karena stok adjustment sudah dipakai transaksi turunan. Dependensi aktif: %s. Alasan block: pending disabled by config.",
-					formatAdjustmentDependencySummary(deps),
-				),
-			)
-		}
-
-		oldQty := adjustment.TotalQty
-		if oldQty > 0 {
-			if err := repoTx.UpdateTotalQty(ctx, adjustment.Id, 0); err != nil {
-				return err
-			}
-			asOf := adjustment.CreatedAt
-			if _, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
-				FlagGroupCode:      routeMeta.FlagGroupCode,
-				ProductWarehouseID: adjustment.ProductWarehouseId,
-				AsOf:               &asOf,
-				Tx:                 tx,
-			}); err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to reflow stock via FIFO v2: %v", err))
-			}
-			if err := s.createAdjustmentStockLog(
-				ctx,
-				stockLogRepoTx,
-				adjustment.Id,
-				adjustment.ProductWarehouseId,
-				notes,
-				actorID,
-				0,
-				oldQty,
-			); err != nil {
-				return err
-			}
-		}
-	case adjustmentLaneUsable:
-		activeBeforeRollback, err := repoTx.CountActiveConsumeAllocationsByUsable(ctx, fifo.UsableKeyAdjustmentOut.String(), adjustment.Id)
-		if err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to validate adjustment allocations before rollback")
-		}
-		rollbackRes, err := s.FifoStockV2Svc.Rollback(ctx, common.FifoStockV2RollbackRequest{
-			ProductWarehouseID: adjustment.ProductWarehouseId,
-			Usable: common.FifoStockV2Ref{
-				ID:            adjustment.Id,
-				LegacyTypeKey: fifo.UsableKeyAdjustmentOut.String(),
-			},
-			Reason: notes,
-			Tx:     tx,
-		})
-		if err != nil {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Failed to rollback FIFO v2 adjustment: %v", err))
-		}
-		activeAfterRollback, err := repoTx.CountActiveConsumeAllocationsByUsable(ctx, fifo.UsableKeyAdjustmentOut.String(), adjustment.Id)
-		if err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Failed to validate adjustment allocations after rollback")
-		}
-		if activeAfterRollback > 0 {
-			return fiber.NewError(
-				fiber.StatusBadRequest,
-				fmt.Sprintf(
-					"Adjustment tidak dapat dihapus karena masih ada alokasi aktif ADJUSTMENT_OUT=%d (sebelum rollback=%d, sesudah rollback=%d).",
-					adjustment.Id,
-					activeBeforeRollback,
-					activeAfterRollback,
-				),
-			)
-		}
-
-		releasedQty := 0.0
-		if rollbackRes != nil {
-			releasedQty = rollbackRes.ReleasedQty
-		}
-		if releasedQty > 0 {
-			if err := s.createAdjustmentStockLog(
-				ctx,
-				stockLogRepoTx,
-				adjustment.Id,
-				adjustment.ProductWarehouseId,
-				notes,
-				actorID,
-				releasedQty,
-				0,
-			); err != nil {
-				return err
-			}
-		}
-	default:
-		return fiber.NewError(fiber.StatusBadRequest, "Unsupported adjustment lane")
-	}
-
-	if err := repoTx.DeleteStockLogsByAdjustmentID(ctx, adjustment.Id); err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to delete adjustment stock logs")
-	}
-	if err := repoTx.DeleteAdjustmentByID(ctx, adjustment.Id); err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to delete adjustment")
-	}
-	return nil
-}
-
 func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*entity.AdjustmentStock, error) {
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
@@ -365,12 +122,12 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Quantity must be greater than zero")
 	}
 
-	functionCode := utils.NormalizeUpper(req.TransactionSubtype)
+	functionCode := strings.ToUpper(strings.TrimSpace(req.TransactionSubtype))
 	if functionCode == "" {
-		functionCode = utils.NormalizeUpper(req.TransactionSubType)
+		functionCode = strings.ToUpper(strings.TrimSpace(req.TransactionSubType))
 	}
 	if functionCode == "" {
-		functionCode = utils.NormalizeUpper(req.FunctionCode)
+		functionCode = strings.ToUpper(strings.TrimSpace(req.FunctionCode))
 	}
 	if functionCode == "" {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "Transaction subtype is required")
@@ -387,9 +144,9 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 		return nil, err
 	}
 
-	note := utils.NormalizeTrim(req.Notes)
+	note := strings.TrimSpace(req.Notes)
 	if note == "" {
-		note = utils.NormalizeTrim(req.Note)
+		note = strings.TrimSpace(req.Note)
 	}
 	grandTotal := math.Round((qty*req.Price)*1000) / 1000
 
@@ -471,11 +228,8 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 				return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
 			}
 
-			sourcePW, err := adjustmentStockRepoTX.FindAyamSourceProductWarehouse(ctx, warehouseID, *projectFlockKandangID)
+			sourcePW, err := s.resolveAyamSourceProductWarehouse(ctx, tx, warehouseID, *projectFlockKandangID)
 			if err != nil {
-				if errors.Is(err, gorm.ErrRecordNotFound) {
-					return fiber.NewError(fiber.StatusBadRequest, "Produk sumber AYAM pada project flock kandang yang sama tidak ditemukan")
-				}
 				return err
 			}
 			if err := common.EnsureProjectFlockNotClosedForProductWarehouses(
@@ -531,14 +285,6 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 			if err := adjustmentStockRepoTX.CreateOne(ctx, destinationAdjustment, nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Failed to create depletion destination adjustment stock record")
 			}
-			if err := adjustmentStockRepoTX.UpdatePairedAdjustmentID(ctx, sourceAdjustment.Id, destinationAdjustment.Id); err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to link depletion source adjustment pair")
-			}
-			if err := adjustmentStockRepoTX.UpdatePairedAdjustmentID(ctx, destinationAdjustment.Id, sourceAdjustment.Id); err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to link depletion destination adjustment pair")
-			}
-			sourceAdjustment.PairedAdjustmentId = &destinationAdjustment.Id
-			destinationAdjustment.PairedAdjustmentId = &sourceAdjustment.Id
 
 			sourceAsOf := sourceAdjustment.CreatedAt
 			if _, err := s.FifoStockV2Svc.Reflow(ctx, common.FifoStockV2ReflowRequest{
@@ -580,7 +326,7 @@ func (s *adjustmentService) Adjustment(c *fiber.Ctx, req *validation.Create) (*e
 				); err != nil {
 					return err
 				}
-				if err := adjustmentStockRepoTX.ResyncProjectFlockPopulationUsage(ctx, *projectFlockKandangID); err != nil {
+				if err := s.resyncProjectFlockPopulationUsage(ctx, tx, *projectFlockKandangID); err != nil {
 					return fiber.NewError(fiber.StatusInternalServerError, "Failed to resync project flock population usage")
 				}
 			}
@@ -756,80 +502,29 @@ func (s *adjustmentService) resolveRouteByFunctionCode(
 	}
 }
 
-func (s *adjustmentService) resolveAdjustmentDependenciesAndPolicy(
+func (s *adjustmentService) resolveOverconsumePolicy(
 	ctx context.Context,
-	tx *gorm.DB,
+	route *adjustmentStockRepo.AdjustmentRouteResolution,
-	stockableType string,
+) (bool, error) {
-	stockableIDs []uint,
+	if route == nil {
-) ([]adjustmentStockRepo.AdjustmentDownstreamDependency, bool, error) {
+		return false, fmt.Errorf("route is required")
-	deps, err := s.AdjustmentStockRepository.WithTx(tx).LoadDownstreamDependencies(ctx, stockableType, stockableIDs)
+	}
+
+	defaultValue := route.AllowPendingDefault
+	selected, err := s.AdjustmentStockRepository.FindOverconsumeRule(
+		ctx,
+		route.Lane,
+		route.FlagGroupCode,
+		route.FunctionCode,
+	)
 	if err != nil {
-		s.Log.Errorf("Failed to load downstream adjustment dependencies: %+v", err)
+		return false, err
-		return nil, false, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate downstream adjustment dependencies")
 	}
-	if len(deps) == 0 {
+	if selected == nil {
-		return nil, true, nil
+		return defaultValue, nil
 	}
 
-	allowPending := true
+	return *selected, nil
-	for _, dep := range deps {
-		policy, policyErr := common.ResolveFifoPendingPolicy(ctx, tx, common.FifoPendingPolicyInput{
-			Lane:          adjustmentLaneUsable,
-			FlagGroupCode: dep.FlagGroupCode,
-			FunctionCode:  dep.FunctionCode,
-			LegacyTypeKey: dep.UsableType,
-		})
-		if policyErr != nil {
-			s.Log.Errorf("Failed to resolve FIFO pending policy for adjustment dependency: %+v", policyErr)
-			return nil, false, fiber.NewError(fiber.StatusInternalServerError, "Failed to read FIFO v2 configuration")
-		}
-		if !policy.Found || !policy.AllowPending {
-			allowPending = false
-			break
-		}
-	}
-
-	return deps, allowPending, nil
-}
-
-func formatAdjustmentDependencySummary(rows []adjustmentStockRepo.AdjustmentDownstreamDependency) string {
-	if len(rows) == 0 {
-		return "-"
-	}
-
-	grouped := make(map[string]map[uint64]struct{})
-	for _, row := range rows {
-		label := utils.NormalizeUpper(row.UsableType)
-		if label == "" {
-			label = "UNKNOWN"
-		}
-		if _, ok := grouped[label]; !ok {
-			grouped[label] = make(map[uint64]struct{})
-		}
-		grouped[label][row.UsableID] = struct{}{}
-	}
-
-	labels := make([]string, 0, len(grouped))
-	for label := range grouped {
-		labels = append(labels, label)
-	}
-	sort.Strings(labels)
-
-	parts := make([]string, 0, len(labels))
-	for _, label := range labels {
-		ids := make([]uint64, 0, len(grouped[label]))
-		for id := range grouped[label] {
-			ids = append(ids, id)
-		}
-		sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] })
-		idParts := make([]string, 0, len(ids))
-		for _, id := range ids {
-			idParts = append(idParts, fmt.Sprintf("%d", id))
-		}
-		parts = append(parts, fmt.Sprintf("%s=%s", label, strings.Join(idParts, "|")))
-	}
-
-	return strings.Join(parts, ", ")
 }
 
 func (s *adjustmentService) getActiveProjectFlockKandangID(ctx context.Context, warehouseID uint) (uint, error) {
@@ -858,6 +553,46 @@ func (s *adjustmentService) getActiveProjectFlockKandangID(ctx context.Context,
 	return uint(projectFlockKandang.Id), nil
 }
 
+func (s *adjustmentService) resolveAyamSourceProductWarehouse(
+	ctx context.Context,
+	tx *gorm.DB,
+	warehouseID uint,
+	projectFlockKandangID uint,
+) (*entity.ProductWarehouse, error) {
+	if tx == nil {
+		return nil, fmt.Errorf("transaction is required")
+	}
+	if projectFlockKandangID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id tidak valid untuk depletion conversion")
+	}
+
+	var sourcePW entity.ProductWarehouse
+	err := tx.WithContext(ctx).
+		Model(&entity.ProductWarehouse{}).
+		Where("project_flock_kandang_id = ?", projectFlockKandangID).
+		Where(`
+			EXISTS (
+				SELECT 1
+				FROM flags f
+				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
+				WHERE f.flagable_type = ?
+				  AND f.flagable_id = product_warehouses.product_id
+				  AND fm.flag_group_code = ?
+				)
+			`, entity.FlagableTypeProduct, flagGroupAyam).
+		Order(gorm.Expr("CASE WHEN warehouse_id = ? THEN 0 ELSE 1 END ASC", warehouseID)).
+		Order("id ASC").
+		Take(&sourcePW).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Produk sumber AYAM pada project flock kandang yang sama tidak ditemukan")
+		}
+		return nil, err
+	}
+
+	return &sourcePW, nil
+}
+
 func (s *adjustmentService) createAdjustmentStockLog(
 	ctx context.Context,
 	stockLogRepo stockLogsRepo.StockLogRepository,
@@ -941,6 +676,57 @@ func (s *adjustmentService) allocatePopulationForDepletionAdjustment(
 	)
 }
 
+func (s *adjustmentService) resyncProjectFlockPopulationUsage(ctx context.Context, tx *gorm.DB, projectFlockKandangID uint) error {
+	if tx == nil || projectFlockKandangID == 0 {
+		return nil
+	}
+
+	idsSubquery := `
+		SELECT pfp.id
+		FROM project_flock_populations pfp
+		JOIN project_chickins pc ON pc.id = pfp.project_chickin_id
+		WHERE pc.project_flock_kandang_id = ?
+	`
+
+	updateWithAlloc := `
+		UPDATE project_flock_populations p
+		SET total_used_qty = COALESCE(a.used, 0)
+		FROM (
+			SELECT stockable_id, SUM(qty) AS used
+			FROM stock_allocations
+			WHERE stockable_type = 'PROJECT_FLOCK_POPULATION'
+			  AND status = 'ACTIVE'
+			  AND allocation_purpose = 'CONSUME'
+			GROUP BY stockable_id
+		) a
+		WHERE p.id = a.stockable_id
+		  AND p.id IN (` + idsSubquery + `)
+	`
+
+	resetMissing := `
+		UPDATE project_flock_populations p
+		SET total_used_qty = 0
+		WHERE p.id IN (` + idsSubquery + `)
+			AND NOT EXISTS (
+				SELECT 1
+				FROM stock_allocations sa
+				WHERE sa.stockable_type = 'PROJECT_FLOCK_POPULATION'
+				  AND sa.status = 'ACTIVE'
+				  AND sa.allocation_purpose = 'CONSUME'
+				  AND sa.stockable_id = p.id
+			)
+	`
+
+	db := tx.WithContext(ctx)
+	if err := db.Exec(updateWithAlloc, projectFlockKandangID).Error; err != nil {
+		return err
+	}
+	if err := db.Exec(resetMissing, projectFlockKandangID).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
 func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Query) ([]*entity.AdjustmentStock, int64, error) {
 	if err := s.Validate.Struct(query); err != nil {
 		return nil, 0, err
@@ -953,24 +739,25 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 	}
 	offset := (query.Page - 1) * query.Limit
 
-	var isProductsExist bool
+	if query.WarehouseID > 0 {
-	isWarehousesExist, err := s.WarehouseRepo.IdExists(c.Context(), uint(query.WarehouseID))
+		isWarehouseExist, err := s.WarehouseRepo.IdExists(c.Context(), query.WarehouseID)
-
+		if err != nil {
-	if err != nil {
+			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate warehouse")
-		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate warehouse")
+		}
-	}
+		if !isWarehouseExist {
-	if query.WarehouseID > 0 && !isWarehousesExist {
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
-		return nil, 0, fiber.NewError(fiber.StatusNotFound, "Warehouse not found")
+		}
 	}
 
-	isProductsExist, err = s.ProductRepo.IdExists(c.Context(), uint(query.ProductID))
+	if query.ProductID > 0 {
-
+		isProductExist, err := s.ProductRepo.IdExists(c.Context(), query.ProductID)
-	if err != nil {
+		if err != nil {
-		s.Log.Errorf("Failed to check product existence: %+v", err)
+			s.Log.Errorf("Failed to check product existence: %+v", err)
-		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate product")
+			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate product")
-	}
+		}
-	if query.ProductID > 0 && !isProductsExist {
+		if !isProductExist {
-		return nil, 0, fiber.NewError(fiber.StatusNotFound, "Product not found")
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "Product not found")
+		}
 	}
 
 	scope, scopeErr := m.ResolveLocationScope(c, s.AdjustmentStockRepository.DB())
@@ -983,11 +770,11 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 		}
 	}
 
-	functionCode := utils.NormalizeUpper(query.TransactionSubtype)
+	functionCode := strings.ToUpper(strings.TrimSpace(query.TransactionSubtype))
 	if functionCode == "" {
-		functionCode = utils.NormalizeUpper(query.FunctionCode)
+		functionCode = strings.ToUpper(strings.TrimSpace(query.FunctionCode))
 	}
-	transactionType := utils.NormalizeUpper(query.TransactionType)
+	transactionType := strings.ToUpper(strings.TrimSpace(query.TransactionType))
 
 	adjustmentStocks, total, err := s.AdjustmentStockRepository.FindHistory(
 		c.Context(),

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

@@ -3,7 +3,6 @@ package controller
 import (
 	"math"
 	"strconv"
-	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/services"
@@ -28,15 +27,11 @@ func (u *ProductWarehouseController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
 		Page:            c.QueryInt("page", 1),
 		Limit:           c.QueryInt("limit", 10),
-		Search:          c.Query("search", ""),
 		ProductId:       uint(c.QueryInt("product_id", 0)),
 		WarehouseId:     uint(c.QueryInt("warehouse_id", 0)),
-		LocationId:      uint(c.QueryInt("location_id", 0)),
 		Flags:           c.Query("flags", ""),
 		KandangId:       uint(c.QueryInt("kandang_id", 0)),
-		AvailableOnly:   parseBoolQuery(c.Query("available_only", "")),
 		TransferContext: c.Query(utils.TransferContextKey, ""),
-		StockMode:       c.Query("stock_mode", ""),
 		Type:            c.Query("type", ""),
 	}
 
@@ -64,15 +59,6 @@ func (u *ProductWarehouseController) GetAll(c *fiber.Ctx) error {
 		})
 }
 
-func parseBoolQuery(raw string) bool {
-	switch strings.TrimSpace(strings.ToLower(raw)) {
-	case "1", "true", "yes", "y":
-		return true
-	default:
-		return false
-	}
-}
-
 func (u *ProductWarehouseController) GetOne(c *fiber.Ctx) error {
 	param := c.Params("id")
 

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

@@ -1,70 +0,0 @@
-package controller
-
-import (
-	"errors"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/go-playground/validator/v10"
-	"github.com/gofiber/fiber/v2"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	service "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/services"
-	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/validations"
-	"gorm.io/gorm"
-)
-
-type stubProductWarehouseService struct {
-	lastQuery *validation.Query
-}
-
-func (s *stubProductWarehouseService) GetAll(_ *fiber.Ctx, params *validation.Query) ([]entity.ProductWarehouse, int64, error) {
-	s.lastQuery = params
-	return []entity.ProductWarehouse{}, 0, nil
-}
-
-func (s *stubProductWarehouseService) GetOne(_ *fiber.Ctx, _ uint) (*entity.ProductWarehouse, error) {
-	return nil, gorm.ErrRecordNotFound
-}
-
-var _ service.ProductWarehouseService = (*stubProductWarehouseService)(nil)
-
-func TestGetAllParsesLocationID(t *testing.T) {
-	app := fiber.New()
-	stub := &stubProductWarehouseService{}
-	ctrl := NewProductWarehouseController(stub)
-	app.Get("/product-warehouses", ctrl.GetAll)
-
-	req := httptest.NewRequest("GET", "/product-warehouses?location_id=16&kandang_id=59&limit=25&search=tektrol&available_only=true", nil)
-	resp, err := app.Test(req)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if resp.StatusCode != fiber.StatusOK {
-		t.Fatalf("expected status 200, got %d", resp.StatusCode)
-	}
-	if stub.lastQuery == nil {
-		t.Fatalf("expected service to receive query")
-	}
-	if stub.lastQuery.LocationId != 16 {
-		t.Fatalf("expected location_id 16, got %d", stub.lastQuery.LocationId)
-	}
-	if stub.lastQuery.KandangId != 59 {
-		t.Fatalf("expected kandang_id 59, got %d", stub.lastQuery.KandangId)
-	}
-	if stub.lastQuery.Limit != 25 {
-		t.Fatalf("expected limit 25, got %d", stub.lastQuery.Limit)
-	}
-	if stub.lastQuery.Search != "tektrol" {
-		t.Fatalf("expected search tektrol, got %s", stub.lastQuery.Search)
-	}
-	if !stub.lastQuery.AvailableOnly {
-		t.Fatalf("expected available_only true")
-	}
-}
-
-func TestStubImplementsServiceContract(t *testing.T) {
-	validate := validator.New()
-	if validate == nil {
-		t.Fatal(errors.New("validator should not be nil"))
-	}
-}

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

@@ -12,11 +12,10 @@ import (
 // === DTO Structs ===
 
 type ProductWarehouseRelationDTO struct {
-	Id                   uint     `json:"id"`
+	Id          uint    `json:"id"`
-	ProductId            uint     `json:"product_id"`
+	ProductId   uint    `json:"product_id"`
-	WarehouseId          uint     `json:"warehouse_id"`
+	WarehouseId uint    `json:"warehouse_id"`
-	Quantity             float64  `json:"quantity"`
+	Quantity    float64 `json:"quantity"`
-	TransferAvailableQty *float64 `json:"transfer_available_qty,omitempty"`
 }
 
 type ProductWarehouseListDTO struct {
@@ -62,11 +61,10 @@ type ProjectFlockRelationDTO struct {
 
 func ToProductWarehouseRelationDTO(e entity.ProductWarehouse) ProductWarehouseRelationDTO {
 	return ProductWarehouseRelationDTO{
-		Id:                   e.Id,
+		Id:          e.Id,
-		ProductId:            e.ProductId,   // Field yang benar dari entity
+		ProductId:   e.ProductId,   // Field yang benar dari entity
-		WarehouseId:          e.WarehouseId, // Field yang benar dari entity
+		WarehouseId: e.WarehouseId, // Field yang benar dari entity
-		Quantity:             e.Quantity,
+		Quantity:    e.Quantity,
-		TransferAvailableQty: e.AvailableQty,
 	}
 }
 

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

@@ -7,7 +7,6 @@ import (
 
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	"gorm.io/gorm"
 )
 
@@ -85,28 +84,31 @@ func (r *ProductWarehouseRepositoryImpl) ProductWarehouseExistByProductAndWareho
 }
 
 func (r *ProductWarehouseRepositoryImpl) GetProductWarehouseByProductAndWarehouseID(ctx context.Context, productId, warehouseId uint) (*entity.ProductWarehouse, error) {
-	warehouseIsKandang, err := r.isKandangWarehouse(ctx, warehouseId)
+	var productWarehouse entity.ProductWarehouse
+
+	err := r.DB().WithContext(ctx).
+		Where("product_id = ? AND warehouse_id = ? AND project_flock_kandang_id IS NOT NULL", productId, warehouseId).
+		Order("id DESC").
+		Preload("ProjectFlockKandang").
+		First(&productWarehouse).Error
+
+	if err == nil {
+
+		if productWarehouse.ProjectFlockKandang.ClosedAt == nil {
+			return &productWarehouse, nil
+		}
+
+	}
+
+	err = r.DB().WithContext(ctx).
+		Where("product_id = ? AND warehouse_id = ? AND project_flock_kandang_id IS NULL", productId, warehouseId).
+		First(&productWarehouse).Error
+
 	if err != nil {
 		return nil, err
 	}
 
-	if warehouseIsKandang {
+	return &productWarehouse, nil
-		if productWarehouse, err := r.findOpenKandangOwnedWarehouse(ctx, productId, warehouseId); err == nil {
-			return productWarehouse, nil
-		} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, err
-		}
-
-		return r.findSharedWarehouse(ctx, productId, warehouseId)
-	}
-
-	if productWarehouse, err := r.findSharedWarehouse(ctx, productId, warehouseId); err == nil {
-		return productWarehouse, nil
-	} else if !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, err
-	}
-
-	return r.findOpenKandangOwnedWarehouse(ctx, productId, warehouseId)
 }
 
 func (r *ProductWarehouseRepositoryImpl) FindByProductWarehouseAndPfk(ctx context.Context, productID uint, warehouseID uint, projectFlockKandangID *uint) (*entity.ProductWarehouse, error) {
@@ -165,42 +167,10 @@ func (r *ProductWarehouseRepositoryImpl) ApplyFlagsFilter(db *gorm.DB, flags []s
 		return db
 	}
 
-	fallbackCategoryCodes := utils.LegacyProductCategoryCodesForFlags(flags)
-
-	db = db.
-		Joins("JOIN products p_flag ON p_flag.id = product_warehouses.product_id").
-		Joins("LEFT JOIN product_categories pc_flag ON pc_flag.id = p_flag.product_category_id")
-
-	actualFlagFilter := `
-		EXISTS (
-			SELECT 1
-			FROM flags f_flag
-			WHERE f_flag.flagable_id = p_flag.id
-			  AND f_flag.flagable_type = ?
-			  AND f_flag.name IN ?
-		)
-	`
-
-	if len(fallbackCategoryCodes) == 0 {
-		return db.Where(actualFlagFilter, entity.FlagableTypeProduct, flags).Distinct()
-	}
-
 	return db.
-		Where(
+		Joins("JOIN products p_flag ON p_flag.id = product_warehouses.product_id").
-			`(`+actualFlagFilter+`) OR (
+		Joins("JOIN flags f_flag ON f_flag.flagable_id = p_flag.id AND f_flag.flagable_type = ?", "products").
-				NOT EXISTS (
+		Where("f_flag.name IN ?", flags).
-					SELECT 1
-					FROM flags f_any
-					WHERE f_any.flagable_id = p_flag.id
-					  AND f_any.flagable_type = ?
-				)
-				AND pc_flag.code IN ?
-			)`,
-			entity.FlagableTypeProduct,
-			flags,
-			entity.FlagableTypeProduct,
-			fallbackCategoryCodes,
-		).
 		Distinct()
 }
 
@@ -296,8 +266,18 @@ func (r *ProductWarehouseRepositoryImpl) EnsureProductWarehouse(
 	projectFlockKandangID *uint,
 	createdBy uint,
 ) (uint, error) {
-	record, err := r.FindByProductWarehouseAndPfk(ctx, productID, warehouseID, projectFlockKandangID)
+	record, err := r.GetProductWarehouseByProductAndWarehouseID(ctx, productID, warehouseID)
 	if err == nil {
+		// Backfill project_flock_kandang_id when it's missing and caller provides one.
+		if projectFlockKandangID != nil && (record.ProjectFlockKandangId == nil || *record.ProjectFlockKandangId == 0) {
+			if err := r.DB().WithContext(ctx).
+				Model(&entity.ProductWarehouse{}).
+				Where("id = ?", record.Id).
+				Update("project_flock_kandang_id", *projectFlockKandangID).Error; err != nil {
+				return 0, err
+			}
+			record.ProjectFlockKandangId = projectFlockKandangID
+		}
 		return record.Id, nil
 	}
 	if !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -321,45 +301,6 @@ func (r *ProductWarehouseRepositoryImpl) EnsureProductWarehouse(
 	return entity.Id, nil
 }
 
-func (r *ProductWarehouseRepositoryImpl) isKandangWarehouse(ctx context.Context, warehouseID uint) (bool, error) {
-	var kandangID *uint
-	if err := r.DB().WithContext(ctx).
-		Table("warehouses").
-		Select("kandang_id").
-		Where("id = ?", warehouseID).
-		Scan(&kandangID).Error; err != nil {
-		return false, err
-	}
-	return kandangID != nil && *kandangID != 0, nil
-}
-
-func (r *ProductWarehouseRepositoryImpl) findOpenKandangOwnedWarehouse(ctx context.Context, productID uint, warehouseID uint) (*entity.ProductWarehouse, error) {
-	var productWarehouse entity.ProductWarehouse
-	err := r.DB().WithContext(ctx).
-		Where("product_id = ? AND warehouse_id = ? AND project_flock_kandang_id IS NOT NULL", productID, warehouseID).
-		Order("id DESC").
-		Preload("ProjectFlockKandang").
-		First(&productWarehouse).Error
-	if err != nil {
-		return nil, err
-	}
-	if productWarehouse.ProjectFlockKandang != nil && productWarehouse.ProjectFlockKandang.ClosedAt == nil {
-		return &productWarehouse, nil
-	}
-	return nil, gorm.ErrRecordNotFound
-}
-
-func (r *ProductWarehouseRepositoryImpl) findSharedWarehouse(ctx context.Context, productID uint, warehouseID uint) (*entity.ProductWarehouse, error) {
-	var productWarehouse entity.ProductWarehouse
-	if err := r.DB().WithContext(ctx).
-		Where("product_id = ? AND warehouse_id = ? AND project_flock_kandang_id IS NULL", productID, warehouseID).
-		Preload("ProjectFlockKandang").
-		First(&productWarehouse).Error; err != nil {
-		return nil, err
-	}
-	return &productWarehouse, nil
-}
-
 func (r *ProductWarehouseRepositoryImpl) GetByProductWarehouseAndProjectFlockKandang(
 	ctx context.Context,
 	productId uint,

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

@@ -1,190 +0,0 @@
-package repository
-
-import (
-	"context"
-	"testing"
-
-	"github.com/glebarez/sqlite"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-func TestGetProductWarehouseByProductAndWarehouseIDPrefersSharedForFarmWarehouse(t *testing.T) {
-	db := setupProductWarehouseRepoTestDB(t)
-	repo := NewProductWarehouseRepository(db)
-	ctx := context.Background()
-
-	insertProductWarehouseTestFixtures(t, db)
-
-	got, err := repo.GetProductWarehouseByProductAndWarehouseID(ctx, 1, 1)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if got.Id != 2 {
-		t.Fatalf("expected shared farm warehouse id 2, got %d", got.Id)
-	}
-}
-
-func TestGetProductWarehouseByProductAndWarehouseIDPrefersOpenKandangOwnedForKandangWarehouse(t *testing.T) {
-	db := setupProductWarehouseRepoTestDB(t)
-	repo := NewProductWarehouseRepository(db)
-	ctx := context.Background()
-
-	insertProductWarehouseTestFixtures(t, db)
-
-	got, err := repo.GetProductWarehouseByProductAndWarehouseID(ctx, 1, 2)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if got.Id != 3 {
-		t.Fatalf("expected kandang-owned warehouse id 3, got %d", got.Id)
-	}
-}
-
-func TestEnsureProductWarehouseDoesNotBackfillSharedWarehouse(t *testing.T) {
-	db := setupProductWarehouseRepoTestDB(t)
-	repo := NewProductWarehouseRepository(db)
-	ctx := context.Background()
-
-	insertProductWarehouseTestFixtures(t, db)
-
-	projectFlockKandangID := uint(101)
-	createdID, err := repo.EnsureProductWarehouse(ctx, 1, 1, &projectFlockKandangID, 9)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if createdID == 2 {
-		t.Fatalf("expected new kandang-attributed row instead of reusing shared row")
-	}
-
-	var sharedPfkID *uint
-	if err := db.WithContext(ctx).
-		Table("product_warehouses").
-		Select("project_flock_kandang_id").
-		Where("id = ?", 2).
-		Scan(&sharedPfkID).Error; err != nil {
-		t.Fatalf("failed to load shared warehouse row: %v", err)
-	}
-	if sharedPfkID != nil {
-		t.Fatalf("expected shared row attribution to stay nil, got %v", *sharedPfkID)
-	}
-}
-
-func setupProductWarehouseRepoTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=private"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	statements := []string{
-		`CREATE TABLE warehouses (id INTEGER PRIMARY KEY, kandang_id INTEGER NULL)`,
-		`CREATE TABLE project_flock_kandangs (id INTEGER PRIMARY KEY, closed_at TIMESTAMP NULL)`,
-		`CREATE TABLE product_warehouses (
-			id INTEGER PRIMARY KEY,
-			product_id INTEGER NOT NULL,
-			warehouse_id INTEGER NOT NULL,
-			project_flock_kandang_id INTEGER NULL,
-			qty NUMERIC(15,3) NOT NULL DEFAULT 0
-		)`,
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed preparing schema: %v", err)
-		}
-	}
-
-	return db
-}
-
-func insertProductWarehouseTestFixtures(t *testing.T, db *gorm.DB) {
-	t.Helper()
-
-	statements := []string{
-		`INSERT INTO warehouses (id, kandang_id) VALUES (1, NULL), (2, 7)`,
-		`INSERT INTO project_flock_kandangs (id, closed_at) VALUES (101, NULL)`,
-		`INSERT INTO product_warehouses (id, product_id, warehouse_id, project_flock_kandang_id, qty) VALUES
-			(1, 1, 1, 101, 10),
-			(2, 1, 1, NULL, 20),
-			(3, 1, 2, 101, 30),
-			(4, 1, 2, NULL, 40)`,
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed seeding fixtures: %v", err)
-		}
-	}
-}
-
-func TestApplyFlagsFilterIncludesLegacyCategoryFallback(t *testing.T) {
-	db := setupProductWarehouseFlagFilterTestDB(t)
-	repo := NewProductWarehouseRepository(db)
-	ctx := context.Background()
-
-	var ids []uint
-	err := repo.ApplyFlagsFilter(
-		db.WithContext(ctx).Model(&entity.ProductWarehouse{}),
-		[]string{"PAKAN"},
-	).Order("product_warehouses.id").Pluck("product_warehouses.id", &ids).Error
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if len(ids) != 2 || ids[0] != 1 || ids[1] != 2 {
-		t.Fatalf("expected flagged and legacy RAW rows to match, got %v", ids)
-	}
-}
-
-func TestApplyFlagsFilterDoesNotFallbackWhenProductAlreadyHasDifferentFlags(t *testing.T) {
-	db := setupProductWarehouseFlagFilterTestDB(t)
-	repo := NewProductWarehouseRepository(db)
-	ctx := context.Background()
-
-	var ids []uint
-	err := repo.ApplyFlagsFilter(
-		db.WithContext(ctx).Model(&entity.ProductWarehouse{}),
-		[]string{"PAKAN"},
-	).Where("product_warehouses.id = ?", 3).Pluck("product_warehouses.id", &ids).Error
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if len(ids) != 0 {
-		t.Fatalf("expected OVK-flagged product not to match PAKAN fallback, got %v", ids)
-	}
-}
-
-func setupProductWarehouseFlagFilterTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=private"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	statements := []string{
-		`CREATE TABLE product_categories (id INTEGER PRIMARY KEY, code TEXT NOT NULL)`,
-		`CREATE TABLE products (id INTEGER PRIMARY KEY, product_category_id INTEGER NOT NULL)`,
-		`CREATE TABLE flags (id INTEGER PRIMARY KEY, flagable_id INTEGER NOT NULL, flagable_type TEXT NOT NULL, name TEXT NOT NULL)`,
-		`CREATE TABLE product_warehouses (id INTEGER PRIMARY KEY, product_id INTEGER NOT NULL, warehouse_id INTEGER NOT NULL, project_flock_kandang_id INTEGER NULL, qty NUMERIC(15,3) NOT NULL DEFAULT 0)`,
-		`INSERT INTO product_categories (id, code) VALUES (1, 'STR'), (2, 'RAW'), (3, 'OBT')`,
-		`INSERT INTO products (id, product_category_id) VALUES (10, 1), (20, 2), (30, 2), (40, 3)`,
-		`INSERT INTO flags (id, flagable_id, flagable_type, name) VALUES
-			(1, 10, 'products', 'PAKAN'),
-			(2, 10, 'products', 'STARTER'),
-			(3, 40, 'products', 'OVK'),
-			(4, 40, 'products', 'OBAT')`,
-		`INSERT INTO product_warehouses (id, product_id, warehouse_id, project_flock_kandang_id, qty) VALUES
-			(1, 10, 1, NULL, 10),
-			(2, 20, 1, NULL, 20),
-			(3, 40, 1, NULL, 30)`,
-	}
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed preparing schema: %v", err)
-		}
-	}
-
-	return db
-}

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

@@ -2,7 +2,6 @@ package service
 
 import (
 	"errors"
-	"strings"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
@@ -28,8 +27,6 @@ type productWarehouseService struct {
 	KandangRepo kandangrepo.KandangRepository
 }
 
-const stockModeExcludeChickin = "exclude_chickin"
-
 func NewProductWarehouseService(repo repository.ProductWarehouseRepository, validate *validator.Validate, kandangRepo kandangrepo.KandangRepository) ProductWarehouseService {
 	return &productWarehouseService{
 		Log:         utils.Log,
@@ -53,31 +50,6 @@ func (s productWarehouseService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("ProjectFlockKandang.Chickins")
 }
 
-func applyWarehouseSelectionFilter(db *gorm.DB, kandangID, locationID uint) *gorm.DB {
-	switch {
-	case kandangID != 0 && locationID != 0:
-		return db.Where(
-			"w_scope.location_id = ? AND (w_scope.type = ? OR w_scope.kandang_id = ?)",
-			locationID,
-			"LOKASI",
-			kandangID,
-		)
-	case kandangID != 0:
-		return db.Where("w_scope.kandang_id = ?", kandangID)
-	case locationID != 0:
-		return db.Where("w_scope.location_id = ?", locationID)
-	default:
-		return db
-	}
-}
-
-func applyAvailableOnlyFilter(db *gorm.DB, availableOnly bool) *gorm.DB {
-	if !availableOnly {
-		return db
-	}
-	return db.Where("COALESCE(product_warehouses.qty, 0) > 0")
-}
-
 func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProductWarehouse, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -158,31 +130,15 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 			db = db.Where("product_id = ?", params.ProductId)
 		}
 
-		db = applyAvailableOnlyFilter(db, params.AvailableOnly)
+		if params.KandangId != 0 {
-
+			db = db.Joins("JOIN warehouses ON product_warehouses.warehouse_id = warehouses.id").
-		db = applyWarehouseSelectionFilter(db, params.KandangId, params.LocationId)
+				Where("warehouses.kandang_id = ?", params.KandangId)
+		}
 
 		if params.WarehouseId != 0 {
 			db = db.Where("warehouse_id = ?", params.WarehouseId)
 		}
 
-		if strings.TrimSpace(params.Search) != "" {
-			searchPattern := "%" + strings.TrimSpace(params.Search) + "%"
-			db = db.Where(
-				`(
-					EXISTS (
-						SELECT 1
-						FROM products p_search
-						WHERE p_search.id = product_warehouses.product_id
-						  AND p_search.name ILIKE ?
-					)
-					OR w_scope.name ILIKE ?
-				)`,
-				searchPattern,
-				searchPattern,
-			)
-		}
-
 		if len(marketingTypes) > 0 {
 			flagSet := make(map[string]struct{})
 			for _, t := range marketingTypes {
@@ -233,11 +189,6 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 		s.Log.Errorf("Failed to get productWarehouses: %+v", err)
 		return nil, 0, err
 	}
-
-	productWarehouses, err = s.applyTransferAvailableQty(c, params, productWarehouses)
-	if err != nil {
-		return nil, 0, err
-	}
 	return productWarehouses, total, nil
 }
 
@@ -278,80 +229,3 @@ func (s productWarehouseService) GetOne(c *fiber.Ctx, id uint) (*entity.ProductW
 	}
 	return productWarehouse, nil
 }
-
-func (s productWarehouseService) applyTransferAvailableQty(c *fiber.Ctx, params *validation.Query, rows []entity.ProductWarehouse) ([]entity.ProductWarehouse, error) {
-	if len(rows) == 0 {
-		return rows, nil
-	}
-	if params == nil ||
-		params.TransferContext != utils.TransferContextInventoryTransfer ||
-		params.StockMode != stockModeExcludeChickin {
-		return rows, nil
-	}
-
-	ayamPWIDs := make([]uint, 0)
-	for i := range rows {
-		if isAyamProductByFlags(rows[i].Product.Flags) {
-			ayamPWIDs = append(ayamPWIDs, rows[i].Id)
-		}
-	}
-	if len(ayamPWIDs) == 0 {
-		return rows, nil
-	}
-
-	type populationRemainingRow struct {
-		ProductWarehouseID uint    `gorm:"column:product_warehouse_id"`
-		RemainingQty       float64 `gorm:"column:remaining_qty"`
-	}
-
-	var populationRows []populationRemainingRow
-	if err := s.Repository.DB().WithContext(c.Context()).
-		Table("project_flock_populations pfp").
-		Select("pfp.product_warehouse_id, COALESCE(SUM(GREATEST(pfp.total_qty - pfp.total_used_qty, 0)), 0) AS remaining_qty").
-		Joins("JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
-		Where("pfp.product_warehouse_id IN ?", ayamPWIDs).
-		Where("pfp.deleted_at IS NULL").
-		Where("pc.deleted_at IS NULL").
-		Group("pfp.product_warehouse_id").
-		Scan(&populationRows).Error; err != nil {
-		s.Log.Errorf("Failed to resolve chickin population remaining for transfer stock filter: %+v", err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve transfer stock availability")
-	}
-
-	populationRemainingByPW := make(map[uint]float64, len(populationRows))
-	for _, row := range populationRows {
-		populationRemainingByPW[row.ProductWarehouseID] = row.RemainingQty
-	}
-
-	filtered := make([]entity.ProductWarehouse, 0, len(rows))
-	for i := range rows {
-		row := rows[i]
-		if !isAyamProductByFlags(row.Product.Flags) {
-			filtered = append(filtered, row)
-			continue
-		}
-
-		available := row.Quantity - populationRemainingByPW[row.Id]
-		if available < 0 {
-			available = 0
-		}
-		row.AvailableQty = &available
-
-		if available <= 0 {
-			continue
-		}
-
-		filtered = append(filtered, row)
-	}
-
-	return filtered, nil
-}
-
-func isAyamProductByFlags(flags []entity.Flag) bool {
-	for _, flag := range flags {
-		if utils.CanonicalFlagType(strings.TrimSpace(flag.Name)) == utils.FlagAyam {
-			return true
-		}
-	}
-	return false
-}

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

@@ -1,126 +0,0 @@
-package service
-
-import (
-	"testing"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-)
-
-func TestApplyWarehouseSelectionFilterIncludesFarmAndSelectedKandangInLocation(t *testing.T) {
-	db := setupProductWarehouseServiceTestDB(t)
-
-	var ids []uint
-	err := applyWarehouseSelectionFilter(baseProductWarehouseSelectionQuery(db), 11, 101).
-		Order("product_warehouses.id").
-		Pluck("product_warehouses.id", &ids).Error
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	assertUintIDs(t, ids, []uint{1, 2})
-}
-
-func TestApplyWarehouseSelectionFilterPreservesKandangOnlyBehavior(t *testing.T) {
-	db := setupProductWarehouseServiceTestDB(t)
-
-	var ids []uint
-	err := applyWarehouseSelectionFilter(baseProductWarehouseSelectionQuery(db), 11, 0).
-		Order("product_warehouses.id").
-		Pluck("product_warehouses.id", &ids).Error
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	assertUintIDs(t, ids, []uint{1})
-}
-
-func TestApplyWarehouseSelectionFilterSupportsLocationOnlyQuery(t *testing.T) {
-	db := setupProductWarehouseServiceTestDB(t)
-
-	var ids []uint
-	err := applyWarehouseSelectionFilter(baseProductWarehouseSelectionQuery(db), 0, 101).
-		Order("product_warehouses.id").
-		Pluck("product_warehouses.id", &ids).Error
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	assertUintIDs(t, ids, []uint{1, 2, 3})
-}
-
-func TestApplyAvailableOnlyFilterRemovesZeroQtyRows(t *testing.T) {
-	db := setupProductWarehouseServiceTestDB(t)
-
-	var ids []uint
-	err := applyAvailableOnlyFilter(baseProductWarehouseSelectionQuery(db), true).
-		Order("product_warehouses.id").
-		Pluck("product_warehouses.id", &ids).Error
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	assertUintIDs(t, ids, []uint{1, 2, 4})
-}
-
-func setupProductWarehouseServiceTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=private"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	statements := []string{
-		`CREATE TABLE warehouses (
-			id INTEGER PRIMARY KEY,
-			type TEXT NOT NULL,
-			location_id INTEGER NULL,
-			kandang_id INTEGER NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE product_warehouses (
-			id INTEGER PRIMARY KEY,
-			warehouse_id INTEGER NOT NULL,
-			qty NUMERIC NULL
-		)`,
-		`INSERT INTO warehouses (id, type, location_id, kandang_id, deleted_at) VALUES
-			(1, 'KANDANG', 101, 11, NULL),
-			(2, 'LOKASI', 101, NULL, NULL),
-			(3, 'KANDANG', 101, 12, NULL),
-			(4, 'LOKASI', 102, NULL, NULL)`,
-		`INSERT INTO product_warehouses (id, warehouse_id, qty) VALUES
-			(1, 1, 10),
-			(2, 2, 20),
-			(3, 3, 0),
-			(4, 4, 15)`,
-	}
-
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed preparing schema: %v", err)
-		}
-	}
-
-	return db
-}
-
-func baseProductWarehouseSelectionQuery(db *gorm.DB) *gorm.DB {
-	return db.Table("product_warehouses").
-		Joins("JOIN warehouses w_scope ON product_warehouses.warehouse_id = w_scope.id").
-		Where("w_scope.deleted_at IS NULL")
-}
-
-func assertUintIDs(t *testing.T, got []uint, want []uint) {
-	t.Helper()
-
-	if len(got) != len(want) {
-		t.Fatalf("expected ids %v, got %v", want, got)
-	}
-
-	for i := range want {
-		if got[i] != want[i] {
-			t.Fatalf("expected ids %v, got %v", want, got)
-		}
-	}
-}

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

@@ -15,14 +15,10 @@ type Update struct {
 type Query struct {
 	Page            int    `query:"page" validate:"omitempty,number,min=1"`
 	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	Search          string `query:"search" validate:"omitempty"`
 	ProductId       uint   `query:"product_id" validate:"omitempty,number,min=1"`
 	WarehouseId     uint   `query:"warehouse_id" validate:"omitempty,number,min=1"`
-	LocationId      uint   `query:"location_id" validate:"omitempty,number,min=1"`
 	Flags           string `query:"flags" validate:"omitempty"`
 	KandangId       uint   `query:"kandang_id" validate:"omitempty,number,min=1"`
-	AvailableOnly   bool   `query:"available_only"`
 	TransferContext string `query:"transfer_context" validate:"omitempty,oneof=inventory_transfer"`
-	StockMode       string `query:"stock_mode" validate:"omitempty,oneof=exclude_chickin"`
 	Type            string `query:"type" validate:"omitempty"`
 }

internal/modules/inventory/transfers/controllers/transfer.controller.go

@@ -109,23 +109,3 @@ func (u *TransferController) CreateOne(c *fiber.Ctx) error {
 			Data:    dto.ToTransferDetailDTO(*result),
 		})
 }
-
-func (u *TransferController) 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.TransferService.DeleteOne(c, uint(id)); err != nil {
-		return err
-	}
-
-	return c.Status(fiber.StatusOK).
-		JSON(response.Common{
-			Code:    fiber.StatusOK,
-			Status:  "success",
-			Message: "Delete transfer successfully",
-		})
-}

internal/modules/inventory/transfers/route.go

@@ -18,6 +18,5 @@ func TransferRoutes(v1 fiber.Router, u user.UserService, s transfer.TransferServ
 	route.Get("/", m.RequirePermissions(m.P_TransferGetAll), ctrl.GetAll)
 	route.Post("/", m.RequirePermissions(m.P_TransferCreateOne), ctrl.CreateOne)
 	route.Get("/:id", m.RequirePermissions(m.P_TransferGetOne), ctrl.GetOne)
-	route.Delete("/:id", m.RequirePermissions(m.P_TransferDeleteOne), ctrl.DeleteOne)
 
 }

internal/modules/inventory/transfers/services/system_transfer.go

@@ -1,548 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/gofiber/fiber/v2"
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-func (s *transferService) CreateSystemTransfer(ctx context.Context, req *SystemTransferRequest) (*entity.StockTransfer, error) {
-	if req == nil {
-		return nil, fmt.Errorf("system transfer request is required")
-	}
-	if strings.TrimSpace(req.TransferReason) == "" {
-		return nil, fmt.Errorf("transfer reason is required")
-	}
-	if req.TransferDate.IsZero() {
-		return nil, fmt.Errorf("transfer date is required")
-	}
-	if req.SourceWarehouseID == 0 || req.DestinationWarehouseID == 0 {
-		return nil, fmt.Errorf("source and destination warehouse are required")
-	}
-	if req.SourceWarehouseID == req.DestinationWarehouseID {
-		return nil, fmt.Errorf("source and destination warehouse must be different")
-	}
-	if req.ActorID == 0 {
-		return nil, fmt.Errorf("actor id is required")
-	}
-
-	if err := s.validateTransferWarehousesAndProducts(ctx, req.SourceWarehouseID, req.DestinationWarehouseID, req.Products); err != nil {
-		return nil, err
-	}
-
-	var result *entity.StockTransfer
-	err := s.StockTransferRepo.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		movementResult, err := s.createTransferMovement(ctx, tx, req)
-		if err != nil {
-			return err
-		}
-		result = movementResult.Transfer
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (s *transferService) DeleteSystemTransfer(ctx context.Context, id uint, actorID uint) error {
-	if id == 0 {
-		return fmt.Errorf("transfer id is required")
-	}
-	if actorID == 0 {
-		return fmt.Errorf("actor id is required")
-	}
-
-	var deletedDetails []entity.StockTransferDetail
-	err := s.StockTransferRepo.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		var err error
-		deletedDetails, err = s.deleteTransferCore(ctx, tx, uint64(id), actorID)
-		return err
-	})
-	if err != nil {
-		return err
-	}
-
-	if len(deletedDetails) > 0 && s.ExpenseBridge != nil {
-		if err := s.ExpenseBridge.OnItemsDeleted(ctx, uint64(id), deletedDetails); err != nil {
-			s.Log.Errorf("Failed to cleanup transfer expense link for transfer_id=%d: %+v", id, err)
-			return fiber.NewError(fiber.StatusInternalServerError, "Transfer berhasil dihapus, namun sinkronisasi expense gagal. Silakan cek modul expense")
-		}
-	}
-
-	return nil
-}
-
-func (s *transferService) validateTransferWarehousesAndProducts(
-	ctx context.Context,
-	sourceWarehouseID uint,
-	destinationWarehouseID uint,
-	products []SystemTransferProduct,
-) error {
-	if len(products) == 0 {
-		return fmt.Errorf("transfer products are required")
-	}
-
-	pwIDs := make([]uint, 0, len(products))
-	for _, product := range products {
-		if product.ProductID == 0 {
-			return fmt.Errorf("product id is required")
-		}
-		if product.ProductQty <= 0 {
-			return fmt.Errorf("product qty must be greater than 0 for product %d", product.ProductID)
-		}
-
-		sourcePW, err := s.ProductWarehouseRepo.GetProductWarehouseByProductAndWarehouseID(
-			ctx, product.ProductID, sourceWarehouseID,
-		)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk dengan ID %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, sourceWarehouseID))
-			}
-			s.Log.Errorf("Failed to fetch product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, sourceWarehouseID, err)
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengecek stok produk")
-		}
-		if sourcePW.Quantity < product.ProductQty {
-			return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak mencukupi. Tersedia: %.2f, Diminta: %.2f", product.ProductID, sourcePW.Quantity, product.ProductQty))
-		}
-		pwIDs = append(pwIDs, sourcePW.Id)
-	}
-
-	if err := commonSvc.EnsureProjectFlockNotClosedForProductWarehouses(ctx, s.StockTransferRepo.DB(), pwIDs); err != nil {
-		return err
-	}
-
-	destPfkID, err := s.getActiveProjectFlockKandangID(ctx, destinationWarehouseID)
-	if err != nil {
-		return err
-	}
-	if destPfkID == 0 {
-		return nil
-	}
-
-	projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(ctx, destPfkID)
-	if err != nil {
-		s.Log.Errorf("Failed to fetch project flock kandang by ID %d: %+v", destPfkID, err)
-		return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock")
-	}
-	if projectFlockKandang.ClosedAt != nil {
-		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Project flock untuk gudang tujuan sudah ditutup (closing) pada %s", projectFlockKandang.ClosedAt.Format("2006-01-02")))
-	}
-
-	return nil
-}
-
-func (s *transferService) createTransferMovement(
-	ctx context.Context,
-	tx *gorm.DB,
-	req *SystemTransferRequest,
-) (*transferMovementResult, error) {
-	if tx == nil {
-		return nil, fmt.Errorf("transaction is required")
-	}
-
-	stockTransferRepoTX := s.StockTransferRepo.WithTx(tx)
-	stockTransferDetailRepoTX := s.StockTransferDetailRepo.WithTx(tx)
-	productWarehouseRepoTX := rProductWarehouse.NewProductWarehouseRepository(tx)
-	stockLogsRepoTX := rStockLogs.NewStockLogRepository(tx)
-
-	movementNumber := strings.TrimSpace(req.MovementNumber)
-	if movementNumber == "" {
-		var err error
-		movementNumber, err = s.StockTransferRepo.GenerateMovementNumber(ctx)
-		if err != nil {
-			s.Log.Errorf("Failed to generate movement number: %+v", err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat nomor transfer")
-		}
-	}
-
-	entityTransfer := &entity.StockTransfer{
-		FromWarehouseId: uint64(req.SourceWarehouseID),
-		ToWarehouseId:   uint64(req.DestinationWarehouseID),
-		Reason:          req.TransferReason,
-		TransferDate:    req.TransferDate,
-		MovementNumber:  movementNumber,
-		CreatedBy:       uint64(req.ActorID),
-	}
-	if err := stockTransferRepoTX.CreateOne(ctx, entityTransfer, nil); err != nil {
-		return nil, err
-	}
-
-	details := make([]*entity.StockTransferDetail, 0, len(req.Products))
-	detailMap := make(map[uint64]*entity.StockTransferDetail, len(req.Products))
-	for _, product := range req.Products {
-		sourcePW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
-			ctx, product.ProductID, req.SourceWarehouseID,
-		)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
-			}
-			s.Log.Errorf("Failed to fetch source product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang asal")
-		}
-
-		destPW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
-			ctx, product.ProductID, req.DestinationWarehouseID,
-		)
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-			s.Log.Errorf("Failed to fetch dest product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang tujuan")
-		}
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			projectFlockKandangID, err := s.getActiveProjectFlockKandangID(ctx, req.DestinationWarehouseID)
-			if err != nil {
-				return nil, err
-			}
-
-			var pfkID *uint
-			if projectFlockKandangID > 0 {
-				pfkID = &projectFlockKandangID
-			}
-
-			destPW = &entity.ProductWarehouse{
-				ProductId:             product.ProductID,
-				WarehouseId:           req.DestinationWarehouseID,
-				Quantity:              0,
-				ProjectFlockKandangId: pfkID,
-			}
-			if err := productWarehouseRepoTX.CreateOne(ctx, destPW, nil); err != nil {
-				s.Log.Errorf("Failed to create product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
-				return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat data stok gudang tujuan")
-			}
-		}
-
-		detail := &entity.StockTransferDetail{
-			StockTransferId: entityTransfer.Id,
-			ProductId:       uint64(product.ProductID),
-			SourceProductWarehouseID: func() *uint64 {
-				id := uint64(sourcePW.Id)
-				return &id
-			}(),
-			UsageQty:   0,
-			PendingQty: 0,
-			DestProductWarehouseID: func() *uint64 {
-				id := uint64(destPW.Id)
-				return &id
-			}(),
-			TotalQty:  0,
-			TotalUsed: 0,
-		}
-		details = append(details, detail)
-		detailMap[uint64(product.ProductID)] = detail
-	}
-
-	if err := stockTransferDetailRepoTX.CreateMany(ctx, details, nil); err != nil {
-		return nil, err
-	}
-
-	flagGroupByProduct := make(map[uint]string, len(req.Products))
-	for _, product := range req.Products {
-		detail := detailMap[uint64(product.ProductID)]
-		if detail == nil || detail.SourceProductWarehouseID == nil || detail.DestProductWarehouseID == nil {
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Data transfer detail tidak valid")
-		}
-
-		flagGroupCode, ok := flagGroupByProduct[product.ProductID]
-		if !ok {
-			var err error
-			flagGroupCode, err = s.resolveTransferFlagGroup(ctx, tx, product.ProductID)
-			if err != nil {
-				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("FIFO v2 route tidak ditemukan untuk produk %d: %v", product.ProductID, err))
-			}
-			flagGroupByProduct[product.ProductID] = flagGroupCode
-		}
-
-		if err := tx.Model(&entity.StockTransferDetail{}).
-			Where("id = ?", detail.Id).
-			Updates(map[string]interface{}{
-				"usage_qty":   product.ProductQty,
-				"pending_qty": 0,
-				"total_qty":   product.ProductQty,
-			}).Error; err != nil {
-			s.Log.Errorf("Failed to update transfer detail seed fields for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
-		}
-
-		asOf := req.TransferDate
-		if _, err := s.FifoStockV2Svc.Reflow(ctx, commonSvc.FifoStockV2ReflowRequest{
-			FlagGroupCode:      flagGroupCode,
-			ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-			AsOf:               &asOf,
-			Tx:                 tx,
-		}); err != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
-		}
-		if _, err := s.FifoStockV2Svc.Reflow(ctx, commonSvc.FifoStockV2ReflowRequest{
-			FlagGroupCode:      flagGroupCode,
-			ProductWarehouseID: uint(*detail.DestProductWarehouseID),
-			AsOf:               &asOf,
-			Tx:                 tx,
-		}); err != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal reflow stok tujuan untuk produk %d. Error: %v", product.ProductID, err))
-		}
-
-		type usageSnapshot struct {
-			UsageQty   float64 `gorm:"column:usage_qty"`
-			PendingQty float64 `gorm:"column:pending_qty"`
-		}
-		var usage usageSnapshot
-		if err := tx.WithContext(ctx).
-			Table("stock_transfer_details").
-			Select("usage_qty, pending_qty").
-			Where("id = ?", detail.Id).
-			Take(&usage).Error; err != nil {
-			s.Log.Errorf("Failed to read transfer usage snapshot detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data tracking")
-		}
-		outUsageQty := usage.UsageQty
-		outPendingQty := usage.PendingQty
-		if outPendingQty > 1e-6 {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal", product.ProductID))
-		}
-
-		stockLogDecrease := &entity.StockLog{
-			ProductWarehouseId: uint(*detail.SourceProductWarehouseID),
-			CreatedBy:          req.ActorID,
-			Increase:           0,
-			Decrease:           outUsageQty,
-			LoggableType:       string(utils.StockLogTypeTransfer),
-			LoggableId:         uint(detail.Id),
-			Notes:              req.StockLogNotes,
-		}
-		stockLogs, err := stockLogsRepoTX.GetByProductWarehouse(ctx, uint(*detail.SourceProductWarehouseID), 1)
-		if err != nil {
-			s.Log.Errorf("Failed to get stock logs: %+v", err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-		}
-		if len(stockLogs) > 0 {
-			latestStockLog := stockLogs[0]
-			stockLogDecrease.Stock = latestStockLog.Stock - stockLogDecrease.Decrease
-		} else {
-			stockLogDecrease.Stock -= stockLogDecrease.Decrease
-		}
-		if err := stockLogsRepoTX.CreateOne(ctx, stockLogDecrease, nil); err != nil {
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
-		}
-
-		stockLogIncrease := &entity.StockLog{
-			ProductWarehouseId: uint(*detail.DestProductWarehouseID),
-			CreatedBy:          req.ActorID,
-			Increase:           outUsageQty,
-			Decrease:           0,
-			LoggableType:       string(utils.StockLogTypeTransfer),
-			LoggableId:         uint(detail.Id),
-			Notes:              req.StockLogNotes,
-		}
-		stockLogs, err = stockLogsRepoTX.GetByProductWarehouse(ctx, uint(*detail.DestProductWarehouseID), 1)
-		if err != nil {
-			s.Log.Errorf("Failed to get stock logs: %+v", err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-		}
-		if len(stockLogs) > 0 {
-			latestStockLog := stockLogs[0]
-			stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
-		} else {
-			stockLogIncrease.Stock += stockLogIncrease.Increase
-		}
-		if err := stockLogsRepoTX.CreateOne(ctx, stockLogIncrease, nil); err != nil {
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
-		}
-	}
-
-	return &transferMovementResult{
-		Transfer:    entityTransfer,
-		DetailByPID: detailMap,
-	}, nil
-}
-
-func (s *transferService) deleteTransferCore(
-	ctx context.Context,
-	tx *gorm.DB,
-	transferID uint64,
-	actorID uint,
-) ([]entity.StockTransferDetail, error) {
-	stockLogRepoTx := rStockLogs.NewStockLogRepository(tx)
-
-	var transfer entity.StockTransfer
-	if err := tx.WithContext(ctx).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Where("id = ?", transferID).
-		Where("deleted_at IS NULL").
-		Take(&transfer).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Transfer dengan ID %d tidak ditemukan", transferID))
-		}
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data transfer")
-	}
-
-	var details []entity.StockTransferDetail
-	if err := tx.WithContext(ctx).
-		Clauses(clause.Locking{Strength: "UPDATE"}).
-		Where("stock_transfer_id = ?", transfer.Id).
-		Where("deleted_at IS NULL").
-		Order("id ASC").
-		Find(&details).Error; err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil detail transfer")
-	}
-	if len(details) == 0 {
-		return nil, fiber.NewError(fiber.StatusBadRequest, "Transfer tidak memiliki detail produk")
-	}
-
-	detailIDs := make([]uint64, 0, len(details))
-	for _, detail := range details {
-		detailIDs = append(detailIDs, detail.Id)
-	}
-	if err := s.ensureDeletePolicyForDownstreamConsumption(ctx, tx, detailIDs); err != nil {
-		return nil, err
-	}
-
-	type reflowKey struct {
-		flagGroupCode      string
-		productWarehouseID uint
-	}
-	destReflows := make(map[reflowKey]struct{})
-
-	for _, detail := range details {
-		if detail.SourceProductWarehouseID == nil || *detail.SourceProductWarehouseID == 0 {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Detail transfer %d tidak memiliki source product warehouse valid", detail.Id))
-		}
-		if detail.DestProductWarehouseID == nil || *detail.DestProductWarehouseID == 0 {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Detail transfer %d tidak memiliki destination product warehouse valid", detail.Id))
-		}
-
-		flagGroupCode, err := s.resolveTransferFlagGroup(ctx, tx, uint(detail.ProductId))
-		if err != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("FIFO v2 route tidak ditemukan untuk produk %d: %v", detail.ProductId, err))
-		}
-
-		rollbackRes, err := s.FifoStockV2Svc.Rollback(ctx, commonSvc.FifoStockV2RollbackRequest{
-			ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-			Usable: commonSvc.FifoStockV2Ref{
-				ID:            uint(detail.Id),
-				LegacyTypeKey: fifo.UsableKeyStockTransferOut.String(),
-				FunctionCode:  "STOCK_TRANSFER_OUT",
-			},
-			Reason: fmt.Sprintf("transfer delete #%s", transfer.MovementNumber),
-			Tx:     tx,
-		})
-		if err != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal rollback FIFO v2 transfer detail %d: %v", detail.Id, err))
-		}
-
-		releasedQty := 0.0
-		if rollbackRes != nil {
-			releasedQty = rollbackRes.ReleasedQty
-		}
-		if detail.UsageQty > 1e-6 && releasedQty < detail.UsageQty-1e-6 {
-			return nil, fiber.NewError(
-				fiber.StatusBadRequest,
-				fmt.Sprintf("Rollback FIFO v2 source transfer detail %d tidak lengkap. Dibutuhkan %.3f, terlepas %.3f", detail.Id, detail.UsageQty, releasedQty),
-			)
-		}
-
-		if releasedQty > 1e-6 {
-			if err := s.appendStockLog(
-				ctx,
-				stockLogRepoTx,
-				uint(*detail.SourceProductWarehouseID),
-				actorID,
-				releasedQty,
-				0,
-				uint(detail.Id),
-				fmt.Sprintf("TRANSFER DELETE #%s", transfer.MovementNumber),
-			); err != nil {
-				return nil, err
-			}
-		}
-
-		destDecreaseQty := detail.TotalQty
-		if destDecreaseQty <= 1e-6 {
-			destDecreaseQty = detail.UsageQty
-		}
-		if destDecreaseQty > 1e-6 {
-			if err := s.appendStockLog(
-				ctx,
-				stockLogRepoTx,
-				uint(*detail.DestProductWarehouseID),
-				actorID,
-				0,
-				destDecreaseQty,
-				uint(detail.Id),
-				fmt.Sprintf("TRANSFER DELETE #%s", transfer.MovementNumber),
-			); err != nil {
-				return nil, err
-			}
-		}
-
-		destReflows[reflowKey{
-			flagGroupCode:      flagGroupCode,
-			productWarehouseID: uint(*detail.DestProductWarehouseID),
-		}] = struct{}{}
-	}
-
-	now := time.Now().UTC()
-	if err := tx.WithContext(ctx).
-		Where("stock_transfer_detail_id IN ?", detailIDs).
-		Delete(&entity.StockTransferDeliveryItem{}).Error; err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus item delivery transfer")
-	}
-	if err := tx.WithContext(ctx).
-		Model(&entity.StockTransferDelivery{}).
-		Where("stock_transfer_id = ?", transfer.Id).
-		Where("deleted_at IS NULL").
-		Updates(map[string]any{
-			"deleted_at": now,
-			"updated_at": now,
-		}).Error; err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus delivery transfer")
-	}
-	if err := tx.WithContext(ctx).
-		Model(&entity.StockTransferDetail{}).
-		Where("id IN ?", detailIDs).
-		Where("deleted_at IS NULL").
-		Updates(map[string]any{
-			"deleted_at": now,
-			"updated_at": now,
-		}).Error; err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus detail transfer")
-	}
-
-	asOf := transfer.TransferDate
-	for key := range destReflows {
-		if _, err := s.FifoStockV2Svc.Reflow(ctx, commonSvc.FifoStockV2ReflowRequest{
-			FlagGroupCode:      key.flagGroupCode,
-			ProductWarehouseID: key.productWarehouseID,
-			AsOf:               &asOf,
-			Tx:                 tx,
-		}); err != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal reflow stok tujuan saat delete transfer: %v", err))
-		}
-	}
-
-	if err := tx.WithContext(ctx).
-		Model(&entity.StockTransfer{}).
-		Where("id = ?", transfer.Id).
-		Where("deleted_at IS NULL").
-		Updates(map[string]any{
-			"deleted_at": now,
-			"updated_at": now,
-		}).Error; err != nil {
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus transfer")
-	}
-
-	return details, nil
-}

internal/modules/inventory/transfers/services/system_transfer_test.go

@@ -1,481 +0,0 @@
-package service
-
-import (
-	"context"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/glebarez/sqlite"
-	"github.com/go-playground/validator/v10"
-	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	rTransfer "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/transfers/repositories"
-	rWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/repositories"
-	rStockLogs "gitlab.com/mbugroup/lti-api.git/internal/modules/shared/repositories"
-	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
-	"gorm.io/gorm"
-)
-
-func TestCreateSystemTransferCreatesAuditableMovement(t *testing.T) {
-	db := setupSystemTransferTestDB(t)
-	svc, fifoStub := newSystemTransferTestService(t, db)
-
-	transferDate := time.Date(2026, 4, 7, 0, 0, 0, 0, time.UTC)
-	result, err := svc.CreateSystemTransfer(context.Background(), &SystemTransferRequest{
-		TransferReason:         "EGG_FARM_CUTOVER|run_id=test-1|location=Jamali|cutover_date=2026-04-07",
-		TransferDate:           transferDate,
-		SourceWarehouseID:      1,
-		DestinationWarehouseID: 2,
-		Products: []SystemTransferProduct{
-			{ProductID: 8, ProductQty: 50},
-		},
-		ActorID:        99,
-		MovementNumber: "PND-LTI-TEST-0001",
-		StockLogNotes:  "EGG_FARM_CUTOVER|run_id=test-1|location=Jamali|cutover_date=2026-04-07",
-	})
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-	if result == nil {
-		t.Fatal("expected transfer result")
-	}
-	if result.MovementNumber != "PND-LTI-TEST-0001" {
-		t.Fatalf("expected movement number to be preserved, got %s", result.MovementNumber)
-	}
-
-	var transfer entity.StockTransfer
-	if err := db.WithContext(context.Background()).First(&transfer, result.Id).Error; err != nil {
-		t.Fatalf("failed to load created transfer: %v", err)
-	}
-
-	var detail entity.StockTransferDetail
-	if err := db.WithContext(context.Background()).
-		Where("stock_transfer_id = ?", transfer.Id).
-		First(&detail).Error; err != nil {
-		t.Fatalf("failed to load transfer detail: %v", err)
-	}
-	if detail.UsageQty != 50 {
-		t.Fatalf("expected usage qty 50, got %v", detail.UsageQty)
-	}
-	if detail.TotalQty != 50 {
-		t.Fatalf("expected total qty 50, got %v", detail.TotalQty)
-	}
-	if detail.SourceProductWarehouseID == nil || *detail.SourceProductWarehouseID != 10 {
-		t.Fatalf("expected source product warehouse 10, got %+v", detail.SourceProductWarehouseID)
-	}
-	if detail.DestProductWarehouseID == nil {
-		t.Fatal("expected destination product warehouse to be created")
-	}
-
-	var destPW entity.ProductWarehouse
-	if err := db.WithContext(context.Background()).
-		First(&destPW, *detail.DestProductWarehouseID).Error; err != nil {
-		t.Fatalf("failed to load destination product warehouse: %v", err)
-	}
-	if destPW.WarehouseId != 2 {
-		t.Fatalf("expected destination warehouse id 2, got %d", destPW.WarehouseId)
-	}
-	if destPW.ProductId != 8 {
-		t.Fatalf("expected destination product id 8, got %d", destPW.ProductId)
-	}
-	if destPW.ProjectFlockKandangId != nil {
-		t.Fatalf("expected destination product warehouse to stay shared, got %+v", destPW.ProjectFlockKandangId)
-	}
-
-	var stockLogs []entity.StockLog
-	if err := db.WithContext(context.Background()).
-		Order("id ASC").
-		Find(&stockLogs).Error; err != nil {
-		t.Fatalf("failed to load stock logs: %v", err)
-	}
-	if len(stockLogs) != 3 {
-		t.Fatalf("expected 3 stock logs (seed + out + in), got %d", len(stockLogs))
-	}
-	if stockLogs[1].ProductWarehouseId != 10 || stockLogs[1].Decrease != 50 || stockLogs[1].Stock != 0 {
-		t.Fatalf("unexpected source stock log after transfer: %+v", stockLogs[1])
-	}
-	if stockLogs[2].ProductWarehouseId != destPW.Id || stockLogs[2].Increase != 50 || stockLogs[2].Stock != 50 {
-		t.Fatalf("unexpected destination stock log after transfer: %+v", stockLogs[2])
-	}
-
-	if len(fifoStub.reflowCalls) != 2 {
-		t.Fatalf("expected 2 reflow calls, got %d", len(fifoStub.reflowCalls))
-	}
-	if fifoStub.reflowCalls[0].ProductWarehouseID != 10 {
-		t.Fatalf("expected first reflow on source pw 10, got %d", fifoStub.reflowCalls[0].ProductWarehouseID)
-	}
-	if fifoStub.reflowCalls[1].ProductWarehouseID != destPW.Id {
-		t.Fatalf("expected second reflow on destination pw %d, got %d", destPW.Id, fifoStub.reflowCalls[1].ProductWarehouseID)
-	}
-}
-
-func TestDeleteSystemTransferRollsBackTransferWhenUnused(t *testing.T) {
-	db := setupSystemTransferTestDB(t)
-	svc, fifoStub := newSystemTransferTestService(t, db)
-
-	created, err := svc.CreateSystemTransfer(context.Background(), &SystemTransferRequest{
-		TransferReason:         "EGG_FARM_CUTOVER|run_id=test-rollback|location=Jamali|cutover_date=2026-04-07",
-		TransferDate:           time.Date(2026, 4, 7, 0, 0, 0, 0, time.UTC),
-		SourceWarehouseID:      1,
-		DestinationWarehouseID: 2,
-		Products:               []SystemTransferProduct{{ProductID: 8, ProductQty: 50}},
-		ActorID:                99,
-		MovementNumber:         "PND-LTI-TEST-ROLLBACK",
-		StockLogNotes:          "EGG_FARM_CUTOVER|run_id=test-rollback|location=Jamali|cutover_date=2026-04-07",
-	})
-	if err != nil {
-		t.Fatalf("failed to create transfer: %v", err)
-	}
-
-	var detail entity.StockTransferDetail
-	if err := db.WithContext(context.Background()).
-		Where("stock_transfer_id = ?", created.Id).
-		First(&detail).Error; err != nil {
-		t.Fatalf("failed to load transfer detail: %v", err)
-	}
-	fifoStub.rollbackReleasedQty[detail.Id] = detail.UsageQty
-
-	if err := svc.DeleteSystemTransfer(context.Background(), uint(created.Id), 99); err != nil {
-		t.Fatalf("expected delete to succeed, got %v", err)
-	}
-
-	var deletedTransfer entity.StockTransfer
-	if err := db.WithContext(context.Background()).Unscoped().First(&deletedTransfer, created.Id).Error; err != nil {
-		t.Fatalf("failed to load deleted transfer: %v", err)
-	}
-	if deletedTransfer.DeletedAt == nil {
-		t.Fatal("expected transfer to be soft deleted")
-	}
-
-	var deletedDetail entity.StockTransferDetail
-	if err := db.WithContext(context.Background()).Unscoped().First(&deletedDetail, detail.Id).Error; err != nil {
-		t.Fatalf("failed to load deleted transfer detail: %v", err)
-	}
-	if deletedDetail.DeletedAt == nil {
-		t.Fatal("expected transfer detail to be soft deleted")
-	}
-
-	var stockLogs []entity.StockLog
-	if err := db.WithContext(context.Background()).
-		Order("id ASC").
-		Find(&stockLogs).Error; err != nil {
-		t.Fatalf("failed to load stock logs: %v", err)
-	}
-	if len(stockLogs) != 5 {
-		t.Fatalf("expected 5 stock logs (seed + create out/in + delete in/out), got %d", len(stockLogs))
-	}
-	if stockLogs[3].ProductWarehouseId != 10 || stockLogs[3].Increase != 50 || stockLogs[3].Stock != 50 {
-		t.Fatalf("unexpected rollback source stock log: %+v", stockLogs[3])
-	}
-	if stockLogs[4].Decrease != 50 || stockLogs[4].Stock != 0 {
-		t.Fatalf("unexpected rollback destination stock log: %+v", stockLogs[4])
-	}
-	if len(fifoStub.rollbackCalls) != 1 {
-		t.Fatalf("expected 1 rollback call, got %d", len(fifoStub.rollbackCalls))
-	}
-	if len(fifoStub.reflowCalls) != 3 {
-		t.Fatalf("expected 3 reflow calls (2 create + 1 delete), got %d", len(fifoStub.reflowCalls))
-	}
-}
-
-func TestDeleteSystemTransferRejectsRollbackWhenDownstreamConsumptionExists(t *testing.T) {
-	db := setupSystemTransferTestDB(t)
-	svc, fifoStub := newSystemTransferTestService(t, db)
-
-	created, err := svc.CreateSystemTransfer(context.Background(), &SystemTransferRequest{
-		TransferReason:         "EGG_FARM_CUTOVER|run_id=test-guard|location=Jamali|cutover_date=2026-04-07",
-		TransferDate:           time.Date(2026, 4, 7, 0, 0, 0, 0, time.UTC),
-		SourceWarehouseID:      1,
-		DestinationWarehouseID: 2,
-		Products:               []SystemTransferProduct{{ProductID: 8, ProductQty: 50}},
-		ActorID:                99,
-		MovementNumber:         "PND-LTI-TEST-GUARD",
-		StockLogNotes:          "EGG_FARM_CUTOVER|run_id=test-guard|location=Jamali|cutover_date=2026-04-07",
-	})
-	if err != nil {
-		t.Fatalf("failed to create transfer: %v", err)
-	}
-
-	var detail entity.StockTransferDetail
-	if err := db.WithContext(context.Background()).
-		Where("stock_transfer_id = ?", created.Id).
-		First(&detail).Error; err != nil {
-		t.Fatalf("failed to load transfer detail: %v", err)
-	}
-
-	if err := db.Exec(`
-		INSERT INTO stock_allocations (
-			id, product_warehouse_id, stockable_type, stockable_id, usable_type, usable_id, qty,
-			allocation_purpose, status, function_code, flag_group_code, deleted_at
-		) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL)
-	`, 1, *detail.DestProductWarehouseID, fifo.StockableKeyStockTransferIn.String(), detail.Id, fifo.UsableKeyRecordingStock.String(), 9001, 10,
-		entity.StockAllocationPurposeConsume, entity.StockAllocationStatusActive, "RECORDING_STOCK_OUT", "EGG").Error; err != nil {
-		t.Fatalf("failed to seed stock allocation: %v", err)
-	}
-
-	err = svc.DeleteSystemTransfer(context.Background(), uint(created.Id), 99)
-	if err == nil {
-		t.Fatal("expected delete to be blocked by downstream consumption")
-	}
-	if !strings.Contains(err.Error(), "tidak dapat dihapus") {
-		t.Fatalf("expected downstream guard error, got %v", err)
-	}
-	if len(fifoStub.rollbackCalls) != 0 {
-		t.Fatalf("expected rollback not to be called, got %d calls", len(fifoStub.rollbackCalls))
-	}
-
-	var transfer entity.StockTransfer
-	if err := db.WithContext(context.Background()).First(&transfer, created.Id).Error; err != nil {
-		t.Fatalf("failed to reload transfer: %v", err)
-	}
-	if transfer.DeletedAt != nil {
-		t.Fatal("expected transfer to remain active after guard failure")
-	}
-}
-
-type fifoStockV2Stub struct {
-	reflowCalls         []commonSvc.FifoStockV2ReflowRequest
-	rollbackCalls       []commonSvc.FifoStockV2RollbackRequest
-	rollbackReleasedQty map[uint64]float64
-}
-
-func (f *fifoStockV2Stub) Gather(ctx context.Context, req commonSvc.FifoStockV2GatherRequest) ([]commonSvc.FifoStockV2GatherRow, error) {
-	return nil, nil
-}
-
-func (f *fifoStockV2Stub) Allocate(ctx context.Context, req commonSvc.FifoStockV2AllocateRequest) (*commonSvc.FifoStockV2AllocateResult, error) {
-	return nil, nil
-}
-
-func (f *fifoStockV2Stub) Rollback(ctx context.Context, req commonSvc.FifoStockV2RollbackRequest) (*commonSvc.FifoStockV2RollbackResult, error) {
-	f.rollbackCalls = append(f.rollbackCalls, req)
-	return &commonSvc.FifoStockV2RollbackResult{
-		ReleasedQty: f.rollbackReleasedQty[uint64(req.Usable.ID)],
-	}, nil
-}
-
-func (f *fifoStockV2Stub) Reflow(ctx context.Context, req commonSvc.FifoStockV2ReflowRequest) (*commonSvc.FifoStockV2ReflowResult, error) {
-	f.reflowCalls = append(f.reflowCalls, req)
-	return &commonSvc.FifoStockV2ReflowResult{}, nil
-}
-
-func (f *fifoStockV2Stub) Recalculate(ctx context.Context, req commonSvc.FifoStockV2RecalculateRequest) (*commonSvc.FifoStockV2RecalculateResult, error) {
-	return &commonSvc.FifoStockV2RecalculateResult{}, nil
-}
-
-func newSystemTransferTestService(t *testing.T, db *gorm.DB) (TransferService, *fifoStockV2Stub) {
-	t.Helper()
-
-	fifoStub := &fifoStockV2Stub{rollbackReleasedQty: make(map[uint64]float64)}
-	return NewTransferService(
-		validator.New(),
-		rTransfer.NewStockTransferRepository(db),
-		rTransfer.NewStockTransferDetailRepository(db),
-		rTransfer.NewStockTransferDeliveryRepository(db),
-		rTransfer.NewStockTransferDeliveryItemRepository(db),
-		rStockLogs.NewStockLogRepository(db),
-		rProductWarehouse.NewProductWarehouseRepository(db),
-		nil,
-		rWarehouse.NewWarehouseRepository(db),
-		nil,
-		nil,
-		nil,
-		fifoStub,
-		nil,
-	), fifoStub
-}
-
-func setupSystemTransferTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=shared"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	statements := []string{
-		`CREATE TABLE warehouses (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			name TEXT NOT NULL,
-			type TEXT NOT NULL,
-			area_id INTEGER NOT NULL DEFAULT 1,
-			location_id INTEGER NULL,
-			kandang_id INTEGER NULL,
-			created_by INTEGER NOT NULL DEFAULT 1,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE product_categories (
-			id INTEGER PRIMARY KEY,
-			name TEXT NULL,
-			code TEXT NOT NULL,
-			created_by INTEGER NOT NULL DEFAULT 1,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE products (
-			id INTEGER PRIMARY KEY,
-			name TEXT NOT NULL,
-			brand TEXT NOT NULL DEFAULT '',
-			sku TEXT NULL,
-			uom_id INTEGER NOT NULL DEFAULT 1,
-			product_category_id INTEGER NULL,
-			product_price NUMERIC NOT NULL DEFAULT 0,
-			selling_price NUMERIC NULL,
-			tax NUMERIC NULL,
-			expiry_period INTEGER NULL,
-			created_by INTEGER NOT NULL DEFAULT 1,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL,
-			is_visible BOOLEAN NOT NULL DEFAULT 1
-		)`,
-		`CREATE TABLE product_warehouses (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			product_id INTEGER NOT NULL,
-			warehouse_id INTEGER NOT NULL,
-			project_flock_kandang_id INTEGER NULL,
-			qty NUMERIC NOT NULL DEFAULT 0
-		)`,
-		`CREATE TABLE flags (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			name TEXT NOT NULL,
-			flagable_id INTEGER NOT NULL,
-			flagable_type TEXT NOT NULL
-		)`,
-		`CREATE TABLE fifo_stock_v2_flag_groups (
-			code TEXT PRIMARY KEY,
-			is_active BOOLEAN NOT NULL
-		)`,
-		`CREATE TABLE fifo_stock_v2_flag_members (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			flag_name TEXT NOT NULL,
-			flag_group_code TEXT NOT NULL,
-			is_active BOOLEAN NOT NULL
-		)`,
-		`CREATE TABLE fifo_stock_v2_route_rules (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			lane TEXT NOT NULL,
-			function_code TEXT NOT NULL,
-			source_table TEXT NOT NULL,
-			flag_group_code TEXT NOT NULL,
-			legacy_type_key TEXT NULL,
-			allow_pending_default BOOLEAN NOT NULL DEFAULT 0,
-			is_active BOOLEAN NOT NULL
-		)`,
-		`CREATE TABLE fifo_stock_v2_overconsume_rules (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			lane TEXT NOT NULL,
-			flag_group_code TEXT NULL,
-			function_code TEXT NULL,
-			allow_overconsume BOOLEAN NOT NULL DEFAULT 0,
-			is_active BOOLEAN NOT NULL DEFAULT 1,
-			priority INTEGER NOT NULL DEFAULT 1
-		)`,
-		`CREATE TABLE stock_transfers (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			movement_number TEXT NOT NULL,
-			from_warehouse_id INTEGER NOT NULL,
-			to_warehouse_id INTEGER NOT NULL,
-			transfer_date TIMESTAMP NOT NULL,
-			reason TEXT,
-			created_by INTEGER NOT NULL,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE stock_transfer_details (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			stock_transfer_id INTEGER NOT NULL,
-			product_id INTEGER NOT NULL,
-			source_product_warehouse_id INTEGER NULL,
-			usage_qty NUMERIC NOT NULL DEFAULT 0,
-			pending_qty NUMERIC NOT NULL DEFAULT 0,
-			dest_product_warehouse_id INTEGER NULL,
-			total_qty NUMERIC NOT NULL DEFAULT 0,
-			total_used NUMERIC NOT NULL DEFAULT 0,
-			expense_nonstock_id INTEGER NULL,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE stock_transfer_deliveries (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			stock_transfer_id INTEGER NOT NULL,
-			supplier_id INTEGER NULL,
-			vehicle_plate TEXT NULL,
-			driver_name TEXT NULL,
-			shipping_cost_item NUMERIC NULL,
-			shipping_cost_total NUMERIC NULL,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE stock_transfer_delivery_items (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			stock_transfer_delivery_id INTEGER NOT NULL,
-			stock_transfer_detail_id INTEGER NOT NULL,
-			quantity NUMERIC NOT NULL DEFAULT 0,
-			created_at TIMESTAMP NULL,
-			updated_at TIMESTAMP NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE stock_logs (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			product_warehouse_id INTEGER NOT NULL,
-			created_by INTEGER NOT NULL,
-			increase NUMERIC NOT NULL DEFAULT 0,
-			decrease NUMERIC NOT NULL DEFAULT 0,
-			stock NUMERIC NOT NULL DEFAULT 0,
-			loggable_type TEXT NOT NULL,
-			loggable_id INTEGER NOT NULL,
-			notes TEXT NULL,
-			created_at TIMESTAMP NULL
-		)`,
-		`CREATE TABLE stock_allocations (
-			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			product_warehouse_id INTEGER NOT NULL,
-			stockable_type TEXT NOT NULL,
-			stockable_id INTEGER NOT NULL,
-			usable_type TEXT NOT NULL,
-			usable_id INTEGER NOT NULL,
-			qty NUMERIC NOT NULL DEFAULT 0,
-			allocation_purpose TEXT NOT NULL,
-			status TEXT NOT NULL,
-			function_code TEXT NULL,
-			flag_group_code TEXT NULL,
-			deleted_at TIMESTAMP NULL
-		)`,
-		`INSERT INTO warehouses (id, name, type, area_id, location_id, kandang_id, created_by, created_at, updated_at, deleted_at) VALUES
-			(1, 'Gudang Kandang Legacy', 'LOKASI', 1, 16, NULL, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL),
-			(2, 'Gudang Farm Jamali', 'LOKASI', 1, 16, NULL, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL)`,
-		`INSERT INTO product_categories (id, name, code, created_by, created_at, updated_at, deleted_at) VALUES (1, 'Egg', 'EGG', 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL)`,
-		`INSERT INTO products (
-			id, name, brand, sku, uom_id, product_category_id, product_price, selling_price, tax,
-			expiry_period, created_by, created_at, updated_at, deleted_at, is_visible
-		) VALUES (
-			8, 'Telur Utuh', '', NULL, 1, 1, 0, NULL, NULL, NULL, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, 1
-		)`,
-		`INSERT INTO product_warehouses (id, product_id, warehouse_id, project_flock_kandang_id, qty) VALUES
-			(10, 8, 1, NULL, 50)`,
-		`INSERT INTO flags (name, flagable_id, flagable_type) VALUES ('TELUR', 8, 'products')`,
-		`INSERT INTO fifo_stock_v2_flag_groups (code, is_active) VALUES ('EGG', 1)`,
-		`INSERT INTO fifo_stock_v2_flag_members (flag_name, flag_group_code, is_active) VALUES ('TELUR', 'EGG', 1)`,
-		`INSERT INTO fifo_stock_v2_route_rules (lane, function_code, source_table, flag_group_code, legacy_type_key, allow_pending_default, is_active) VALUES
-			('USABLE', 'STOCK_TRANSFER_OUT', 'stock_transfer_details', 'EGG', 'STOCK_TRANSFER_OUT', 0, 1)`,
-		`INSERT INTO stock_logs (id, product_warehouse_id, created_by, increase, decrease, stock, loggable_type, loggable_id, notes, created_at) VALUES
-			(1, 10, 1, 50, 0, 50, 'PURCHASE', 1, 'seed', CURRENT_TIMESTAMP)`,
-	}
-
-	for _, stmt := range statements {
-		if err := db.Exec(stmt).Error; err != nil {
-			t.Fatalf("failed preparing test schema: %v\nstatement: %s", err, stmt)
-		}
-	}
-
-	return db
-}

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

@@ -5,14 +5,13 @@ import (
 	"errors"
 	"fmt"
 	"mime/multipart"
-	"sort"
 	"strings"
-	"time"
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"github.com/sirupsen/logrus"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	fifoV2 "gitlab.com/mbugroup/lti-api.git/internal/common/service/fifo_stock_v2"
 	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"
@@ -32,9 +31,6 @@ type TransferService interface {
 	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.StockTransfer, int64, error)
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.StockTransfer, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.TransferRequest, files []*multipart.FileHeader) (*entity.StockTransfer, error)
-	DeleteOne(ctx *fiber.Ctx, id uint) error
-	CreateSystemTransfer(ctx context.Context, req *SystemTransferRequest) (*entity.StockTransfer, error)
-	DeleteSystemTransfer(ctx context.Context, id uint, actorID uint) error
 }
 
 type transferService struct {
@@ -55,36 +51,6 @@ type transferService struct {
 	ExpenseBridge                 TransferExpenseBridge
 }
 
-const transferDeleteDownstreamGuardMessage = "Transfer stock tidak dapat dihapus karena stok transfer sudah dipakai transaksi turunan. Hapus dependensi terkait secara manual terlebih dahulu."
-
-type downstreamDependency struct {
-	UsableType    string `gorm:"column:usable_type"`
-	UsableID      uint64 `gorm:"column:usable_id"`
-	FunctionCode  string `gorm:"column:function_code"`
-	FlagGroupCode string `gorm:"column:flag_group_code"`
-}
-
-type SystemTransferProduct struct {
-	ProductID  uint
-	ProductQty float64
-}
-
-type SystemTransferRequest struct {
-	TransferReason         string
-	TransferDate           time.Time
-	SourceWarehouseID      uint
-	DestinationWarehouseID uint
-	Products               []SystemTransferProduct
-	ActorID                uint
-	MovementNumber         string
-	StockLogNotes          string
-}
-
-type transferMovementResult struct {
-	Transfer    *entity.StockTransfer
-	DetailByPID map[uint64]*entity.StockTransferDetail
-}
-
 func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTransfer.StockTransferRepository, stockTransferDetailRepo rStockTransfer.StockTransferDetailRepository, stockTransferDeliveryRepo rStockTransfer.StockTransferDeliveryRepository, stockTransferDeliveryItemRepo rStockTransfer.StockTransferDeliveryItemRepository, stockLogsRepo rStockLogs.StockLogRepository, productWarehouseRepo rProductWarehouse.ProductWarehouseRepository, supplierRepo rSupplier.SupplierRepository, warehouseRepo warehouseRepo.WarehouseRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, projectFlockPopulationRepo projectFlockKandangRepo.ProjectFlockPopulationRepository, documentSvc commonSvc.DocumentService, fifoStockV2Svc commonSvc.FifoStockV2Service, expenseBridge TransferExpenseBridge) TransferService {
 	return &transferService{
 		Log:                           utils.Log,
@@ -140,7 +106,6 @@ func (s transferService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 
 	transfers, total, err := s.StockTransferRepo.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
-		db = db.Where("stock_transfers.deleted_at IS NULL")
 		if scope.Restrict {
 			if len(scope.IDs) == 0 {
 				return db.Where("1 = 0")
@@ -182,7 +147,6 @@ func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, e
 			Joins("JOIN warehouses w_from ON w_from.id = stock_transfers.from_warehouse_id").
 			Joins("JOIN warehouses w_to ON w_to.id = stock_transfers.to_warehouse_id").
 			Where("stock_transfers.id = ?", id).
-			Where("stock_transfers.deleted_at IS NULL").
 			Where("w_from.location_id IN ? OR w_to.location_id IN ?", scope.IDs, scope.IDs).
 			Count(&count).Error; err != nil {
 			return nil, err
@@ -193,7 +157,7 @@ func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, e
 	}
 
 	transferPtr, err := s.StockTransferRepo.GetByID(c.Context(), id, func(db *gorm.DB) *gorm.DB {
-		return s.withRelations(db).Where("stock_transfers.deleted_at IS NULL")
+		return s.withRelations(db)
 	})
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -207,17 +171,50 @@ func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, e
 }
 
 func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferRequest, files []*multipart.FileHeader) (*entity.StockTransfer, error) {
-	products := make([]SystemTransferProduct, 0, len(req.Products))
+
+	pwIDs := make([]uint, 0, len(req.Products))
+
 	for _, product := range req.Products {
-		products = append(products, SystemTransferProduct{
+		sourcePW, err := s.ProductWarehouseRepo.GetProductWarehouseByProductAndWarehouseID(
-			ProductID:  uint(product.ProductID),
+			c.Context(), uint(product.ProductID), uint(req.SourceWarehouseID),
-			ProductQty: product.ProductQty,
+		)
-		})
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk dengan ID %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
+			}
+			s.Log.Errorf("Failed to fetch product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengecek stok produk")
+		}
+		if sourcePW.Quantity < product.ProductQty {
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak mencukupi. Tersedia: %.2f, Diminta: %.2f", product.ProductID, sourcePW.Quantity, product.ProductQty))
+		}
+		pwIDs = append(pwIDs, sourcePW.Id)
 	}
-	if err := s.validateTransferWarehousesAndProducts(c.Context(), uint(req.SourceWarehouseID), uint(req.DestinationWarehouseID), products); err != nil {
+
+	if err := commonSvc.EnsureProjectFlockNotClosedForProductWarehouses(
+		c.Context(),
+		s.StockTransferRepo.DB(),
+		pwIDs,
+	); err != nil {
 		return nil, err
 	}
 
+	destPfkID, err := s.getActiveProjectFlockKandangID(c.Context(), uint(req.DestinationWarehouseID))
+	if err != nil {
+		return nil, err
+	}
+
+	if destPfkID > 0 {
+		projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), destPfkID)
+		if err != nil {
+			s.Log.Errorf("Failed to fetch project flock kandang by ID %d: %+v", destPfkID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock")
+		}
+		if projectFlockKandang.ClosedAt != nil {
+			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Project flock untuk gudang tujuan sudah ditutup (closing) pada %s", projectFlockKandang.ClosedAt.Format("2006-01-02")))
+		}
+	}
+
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -238,9 +235,11 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	}
 
 	for _, delivery := range req.Deliveries {
+
 		if delivery.SupplierID == 0 {
 			continue
 		}
+
 		if delivery.VehiclePlate == "" {
 			return nil, fiber.NewError(fiber.StatusBadRequest, "Vehicle plate wajib diisi ketika supplier dipilih")
 		}
@@ -267,28 +266,104 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		}
 	}
 
+	movementNumber, err := s.StockTransferRepo.GenerateMovementNumber(c.Context())
+	if err != nil {
+		s.Log.Errorf("Failed to generate movement number: %+v", err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat nomor transfer")
+	}
+
 	transferDate, _ := utils.ParseDateString(req.TransferDate)
+
+	entityTransfer := &entity.StockTransfer{
+		FromWarehouseId: uint64(req.SourceWarehouseID),
+		ToWarehouseId:   uint64(req.DestinationWarehouseID),
+		Reason:          req.TransferReason,
+		TransferDate:    transferDate,
+		MovementNumber:  movementNumber,
+		CreatedBy:       uint64(actorID),
+	}
+
 	expensePayloads := make([]TransferExpenseReceivingPayload, 0)
-	var detailMap map[uint64]*entity.StockTransferDetail
-	var createdTransfer *entity.StockTransfer
 
 	err = s.StockTransferRepo.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
+
+		stockTransferRepoTX := s.StockTransferRepo.WithTx(tx)
+		stockTransferDetailRepoTX := s.StockTransferDetailRepo.WithTx(tx)
 		stockTransferDeliveryRepoTX := s.StockTransferDeliveryRepo.WithTx(tx)
 		stockTransferDeliveryItemRepoTX := s.StockTransferDeliveryItemRepo.WithTx(tx)
+		productWarehouseRepoTX := rProductWarehouse.NewProductWarehouseRepository(tx)
+		stocklogsRepoTx := s.StockLogsRepository.WithTx(tx)
 
-		movementResult, err := s.createTransferMovement(c.Context(), tx, &SystemTransferRequest{
+		if err := stockTransferRepoTX.CreateOne(c.Context(), entityTransfer, nil); err != nil {
-			TransferReason:         req.TransferReason,
+			return err
-			TransferDate:           transferDate,
+		}
-			SourceWarehouseID:      uint(req.SourceWarehouseID),
+
-			DestinationWarehouseID: uint(req.DestinationWarehouseID),
+		details := make([]*entity.StockTransferDetail, 0, len(req.Products))
-			Products:               products,
+		detailMap := make(map[uint64]*entity.StockTransferDetail)
-			ActorID:                actorID,
+
-		})
+		for _, product := range req.Products {
-		if err != nil {
+
+			sourcePW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
+				c.Context(), uint(product.ProductID), uint(req.SourceWarehouseID),
+			)
+			if err != nil {
+				if errors.Is(err, gorm.ErrRecordNotFound) {
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
+				}
+				s.Log.Errorf("Failed to fetch source product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang asal")
+			}
+
+			destPW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
+				c.Context(), uint(product.ProductID), uint(req.DestinationWarehouseID),
+			)
+			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+				s.Log.Errorf("Failed to fetch dest product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang tujuan")
+			}
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				ctx := c.Context()
+				projectFlockKandangID, err := s.getActiveProjectFlockKandangID(ctx, uint(req.DestinationWarehouseID))
+				if err != nil {
+					return err
+				}
+
+				var pfkID *uint
+				if projectFlockKandangID > 0 {
+					pfkID = &projectFlockKandangID
+				}
+
+				destPW = &entity.ProductWarehouse{
+					ProductId:             uint(product.ProductID),
+					WarehouseId:           uint(req.DestinationWarehouseID),
+					Quantity:              0,
+					ProjectFlockKandangId: pfkID,
+				}
+				if err := productWarehouseRepoTX.CreateOne(c.Context(), destPW, nil); err != nil {
+					s.Log.Errorf("Failed to create product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
+					return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat data stok gudang tujuan")
+				}
+			}
+
+			detail := &entity.StockTransferDetail{
+				StockTransferId: entityTransfer.Id,
+				ProductId:       uint64(product.ProductID),
+
+				SourceProductWarehouseID: func() *uint64 { id := uint64(sourcePW.Id); return &id }(),
+				UsageQty:                 0,
+				PendingQty:               0,
+
+				DestProductWarehouseID: func() *uint64 { id := uint64(destPW.Id); return &id }(),
+				TotalQty:               0,
+				TotalUsed:              0,
+			}
+			details = append(details, detail)
+			detailMap[uint64(product.ProductID)] = detail
+		}
+
+		if err := stockTransferDetailRepoTX.CreateMany(c.Context(), details, nil); err != nil {
 			return err
 		}
-		detailMap = movementResult.DetailByPID
-		createdTransfer = movementResult.Transfer
 
 		var deliveries []*entity.StockTransferDelivery
 		for _, delivery := range req.Deliveries {
@@ -300,7 +375,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				return nil
 			}()
 			deliveries = append(deliveries, &entity.StockTransferDelivery{
-				StockTransferId:   createdTransfer.Id,
+				StockTransferId:   entityTransfer.Id,
 				SupplierId:        supplierId,
 				VehiclePlate:      delivery.VehiclePlate,
 				DriverName:        delivery.DriverName,
@@ -313,6 +388,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		}
 
 		var deliveryItems []*entity.StockTransferDeliveryItem
+
 		for i, delivery := range deliveries {
 			item := req.Deliveries[i]
 			for _, prod := range item.Products {
@@ -332,11 +408,14 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		}
 
 		if s.DocumentSvc != nil && len(files) > 0 {
+
 			for deliveryIdx, delivery := range deliveries {
 				reqDelivery := req.Deliveries[deliveryIdx]
+
 				if reqDelivery.DocumentIndex < 0 {
 					continue
 				}
+
 				if reqDelivery.DocumentIndex >= len(files) {
 					return fiber.NewError(fiber.StatusBadRequest,
 						fmt.Sprintf("DocumentIndex %d untuk delivery %d melebihi jumlah file yang diupload (%d)",
@@ -344,11 +423,14 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				}
 
 				file := files[reqDelivery.DocumentIndex]
-				documentFiles := []commonSvc.DocumentFile{{
+
-					File:  file,
+				documentFiles := []commonSvc.DocumentFile{
-					Type:  string(utils.DocumentTypeTransfer),
+					{
-					Index: &reqDelivery.DocumentIndex,
+						File:  file,
-				}}
+						Type:  string(utils.DocumentTypeTransfer),
+						Index: &reqDelivery.DocumentIndex,
+					},
+				}
 				_, err := s.DocumentSvc.UploadDocuments(c.Context(), commonSvc.DocumentUploadRequest{
 					DocumentableType: string(utils.DocumentableTypeTransfer),
 					DocumentableID:   delivery.Id,
@@ -363,31 +445,172 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			}
 		}
 
-		for _, delivery := range req.Deliveries {
+		if s.FifoStockV2Svc == nil {
-			if delivery.SupplierID == 0 {
+			return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
-				continue
+		}
+		flagGroupByProduct := make(map[uint]string, len(req.Products))
+
+		for _, product := range req.Products {
+			detail := detailMap[uint64(product.ProductID)]
+			if detail == nil || detail.SourceProductWarehouseID == nil || detail.DestProductWarehouseID == nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Data transfer detail tidak valid")
 			}
-			for _, prod := range delivery.Products {
+
-				detail := detailMap[uint64(prod.ProductID)]
+			flagGroupCode, ok := flagGroupByProduct[uint(product.ProductID)]
-				if detail == nil {
+			if !ok {
+				flagGroupCode, err = s.resolveTransferFlagGroup(c.Context(), tx, uint(product.ProductID))
+				if err != nil {
+					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("FIFO v2 route tidak ditemukan untuk produk %d: %v", product.ProductID, err))
+				}
+				flagGroupByProduct[uint(product.ProductID)] = flagGroupCode
+			}
+
+			if err := tx.Model(&entity.StockTransferDetail{}).
+				Where("id = ?", detail.Id).
+				Updates(map[string]interface{}{
+					"usage_qty":   product.ProductQty,
+					"pending_qty": 0,
+					"total_qty":   product.ProductQty,
+				}).Error; err != nil {
+				s.Log.Errorf("Failed to update transfer detail seed fields for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
+			}
+
+			asOf := transferDate
+			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
+				FlagGroupCode:      flagGroupCode,
+				ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
+				AsOf:               &asOf,
+				Tx:                 tx,
+			}); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
+			}
+			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
+				FlagGroupCode:      flagGroupCode,
+				ProductWarehouseID: uint(*detail.DestProductWarehouseID),
+				AsOf:               &asOf,
+				Tx:                 tx,
+			}); err != nil {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal reflow stok tujuan untuk produk %d. Error: %v", product.ProductID, err))
+			}
+
+			type usageSnapshot struct {
+				UsageQty   float64 `gorm:"column:usage_qty"`
+				PendingQty float64 `gorm:"column:pending_qty"`
+			}
+			var usage usageSnapshot
+			if err := tx.WithContext(c.Context()).
+				Table("stock_transfer_details").
+				Select("usage_qty, pending_qty").
+				Where("id = ?", detail.Id).
+				Take(&usage).Error; err != nil {
+				s.Log.Errorf("Failed to read transfer usage snapshot detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data tracking")
+			}
+			outUsageQty := usage.UsageQty
+			outPendingQty := usage.PendingQty
+			if outPendingQty > 1e-6 {
+				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal", product.ProductID))
+			}
+
+			if strings.EqualFold(flagGroupCode, "AYAM") && outUsageQty > 0 {
+				if err := s.allocatePopulationForStockTransferOut(
+					c.Context(),
+					tx,
+					detail,
+					uint(*detail.SourceProductWarehouseID),
+					outUsageQty,
+				); err != nil {
+					return err
+				}
+			}
+
+			stockLogDecrease := &entity.StockLog{
+				ProductWarehouseId: uint(*detail.SourceProductWarehouseID),
+				CreatedBy:          uint(actorID),
+				Increase:           0,
+				Decrease:           outUsageQty,
+				LoggableType:       string(utils.StockLogTypeTransfer),
+				LoggableId:         uint(detail.Id),
+				Notes:              "",
+			}
+			stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.SourceProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogDecrease.Stock = latestStockLog.Stock - stockLogDecrease.Decrease
+			} else {
+				stockLogDecrease.Stock -= stockLogDecrease.Decrease
+			}
+
+			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogDecrease, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
+			}
+
+			inAddedQty := outUsageQty
+
+			stockLogIncrease := &entity.StockLog{
+				ProductWarehouseId: uint(*detail.DestProductWarehouseID),
+				CreatedBy:          uint(actorID),
+				Increase:           inAddedQty,
+				Decrease:           0,
+				LoggableType:       string(utils.StockLogTypeTransfer),
+				LoggableId:         uint(detail.Id),
+				Notes:              "",
+			}
+			stockLogs, err = s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.DestProductWarehouseID), 1)
+			if err != nil {
+				s.Log.Errorf("Failed to get stock logs: %+v", err)
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
+			}
+			if len(stockLogs) > 0 {
+				latestStockLog := stockLogs[0]
+				stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
+			} else {
+				stockLogIncrease.Stock += stockLogIncrease.Increase
+			}
+			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogIncrease, nil); err != nil {
+				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
+			}
+		}
+
+		if len(req.Deliveries) > 0 {
+			for _, delivery := range req.Deliveries {
+				// Skip adding to expensePayloads if SupplierID is 0 (optional)
+				if delivery.SupplierID == 0 {
 					continue
 				}
-				warehouseID := uint(req.DestinationWarehouseID)
+
-				supplierID := uint(delivery.SupplierID)
+				for _, prod := range delivery.Products {
-				deliveredDate := transferDate
+					detail := detailMap[uint64(prod.ProductID)]
-				expensePayloads = append(expensePayloads, TransferExpenseReceivingPayload{
+					if detail == nil {
-					TransferDetailID: detail.Id,
+						continue
-					ProductID:        uint64(prod.ProductID),
+					}
-					WarehouseID:      uint64(warehouseID),
+
-					SupplierID:       uint64(supplierID),
+					warehouseID := uint(req.DestinationWarehouseID)
-					DeliveredQty:     prod.ProductQty,
+					supplierID := uint(delivery.SupplierID)
-					DeliveredDate:    &deliveredDate,
+					deliveredDate := transferDate
-				})
+					deliveredQty := prod.ProductQty
+
+					payload := TransferExpenseReceivingPayload{
+						TransferDetailID: detail.Id,
+						ProductID:        uint64(prod.ProductID),
+						WarehouseID:      uint64(warehouseID),
+						SupplierID:       uint64(supplierID),
+						DeliveredQty:     deliveredQty,
+						DeliveredDate:    &deliveredDate,
+					}
+					expensePayloads = append(expensePayloads, payload)
+				}
 			}
 		}
 
 		return nil
 	})
+
 	if err != nil {
 		if fiberErr, ok := err.(*fiber.Error); ok {
 			return nil, fiberErr
@@ -395,13 +618,14 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Internal server error")
 	}
 
-	result, err := s.GetOne(c, uint(createdTransfer.Id))
+	result, err := s.GetOne(c, uint(entityTransfer.Id))
 	if err != nil {
 		return nil, err
 	}
+
 	if len(expensePayloads) > 0 {
-		if err := s.notifyExpenseItemsDelivered(c, createdTransfer.Id, expensePayloads); err != nil {
+		if err := s.notifyExpenseItemsDelivered(c, entityTransfer.Id, expensePayloads); err != nil {
-			s.Log.Errorf("Failed to sync expense for transfer_id=%d, movement_number=%s: %+v", createdTransfer.Id, createdTransfer.MovementNumber, err)
+			s.Log.Errorf("Failed to sync expense for transfer_id=%d, movement_number=%s: %+v", entityTransfer.Id, entityTransfer.MovementNumber, err)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal sinkronisasi data expense. Silakan cek manual di module expense")
 		}
 	}
@@ -409,40 +633,55 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	return result, nil
 }
 
-func (s *transferService) DeleteOne(c *fiber.Ctx, id uint) error {
+func (s *transferService) allocatePopulationForStockTransferOut(
-	if err := s.ensureTransferAccess(c.Context(), id, c); err != nil {
+	ctx context.Context,
-		return err
+	tx *gorm.DB,
+	detail *entity.StockTransferDetail,
+	sourceProductWarehouseID uint,
+	consumeQty float64,
+) error {
+	if consumeQty <= 0 {
+		return nil
 	}
-	if s.FifoStockV2Svc == nil {
+	if tx == nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
+		return errors.New("transaction is required")
+	}
+	if detail == nil || detail.Id == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Data transfer detail tidak valid")
+	}
+	if sourceProductWarehouseID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Gudang sumber tidak valid")
 	}
 
-	actorID, err := m.ActorIDFromContext(c)
+	pw, err := s.ProductWarehouseRepo.WithTx(tx).GetByID(ctx, sourceProductWarehouseID, nil)
 	if err != nil {
 		return err
 	}
+	if pw.ProjectFlockKandangId == nil || *pw.ProjectFlockKandangId == 0 {
+		return nil
+	}
 
-	var deletedDetails []entity.StockTransferDetail
+	populations, err := s.ProjectFlockPopulationRepo.WithTx(tx).GetByProjectFlockKandangIDAndProductWarehouseID(
-	err = s.StockTransferRepo.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
+		ctx,
-		var err error
+		*pw.ProjectFlockKandangId,
-		deletedDetails, err = s.deleteTransferCore(c.Context(), tx, uint64(id), actorID)
+		sourceProductWarehouseID,
-		return err
+	)
-	})
 	if err != nil {
-		if fiberErr, ok := err.(*fiber.Error); ok {
+		return err
-			return fiberErr
+	}
-		}
+	if len(populations) == 0 {
-		return fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus transfer")
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan untuk transfer")
 	}
 
-	if len(deletedDetails) > 0 && s.ExpenseBridge != nil {
+	return fifoV2.AllocatePopulationConsumption(
-		if err := s.ExpenseBridge.OnItemsDeleted(c.Context(), uint64(id), deletedDetails); err != nil {
+		ctx,
-			s.Log.Errorf("Failed to cleanup transfer expense link for transfer_id=%d: %+v", id, err)
+		tx,
-			return fiber.NewError(fiber.StatusInternalServerError, "Transfer berhasil dihapus, namun sinkronisasi expense gagal. Silakan cek modul expense")
+		populations,
-		}
+		sourceProductWarehouseID,
-	}
+		fifo.UsableKeyStockTransferOut.String(),
-
+		uint(detail.Id),
-	return nil
+		consumeQty,
+	)
 }
 
 func (s *transferService) resolveTransferFlagGroup(
@@ -469,31 +708,13 @@ func (s *transferService) resolveTransferFlagGroup(
 		Where(`
 			EXISTS (
 				SELECT 1
-				FROM products p
+				FROM flags f
-				LEFT JOIN product_categories pc ON pc.id = p.product_category_id
+				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-				WHERE p.id = ?
+				WHERE f.flagable_type = ?
-				  AND (
+				  AND f.flagable_id = ?
-					EXISTS (
+				  AND fm.flag_group_code = rr.flag_group_code
-						SELECT 1
-						FROM flags f
-						JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-						WHERE f.flagable_type = ?
-						  AND f.flagable_id = p.id
-						  AND fm.flag_group_code = rr.flag_group_code
-					)
-					OR (
-						NOT EXISTS (
-							SELECT 1
-							FROM flags f_any
-							WHERE f_any.flagable_type = ?
-							  AND f_any.flagable_id = p.id
-						)
-						AND rr.flag_group_code = ?
-						AND UPPER(COALESCE(pc.code, '')) = 'EGG'
-					)
-				  )
 			)
-		`, productID, entity.FlagableTypeProduct, entity.FlagableTypeProduct, utils.LegacyFlagGroupCodeByProductCategoryCode("EGG")).
+		`, entity.FlagableTypeProduct, productID).
 		Order("rr.id ASC").
 		Limit(1).
 		Take(&selected).Error
@@ -536,264 +757,3 @@ func (s *transferService) getActiveProjectFlockKandangID(ctx context.Context, wa
 
 	return uint(projectFlockKandang.Id), nil
 }
-
-func (s *transferService) ensureTransferAccess(ctx context.Context, id uint, c *fiber.Ctx) error {
-	scope, err := m.ResolveLocationScope(c, s.StockTransferRepo.DB())
-	if err != nil {
-		return err
-	}
-	if !scope.Restrict {
-		return nil
-	}
-	if len(scope.IDs) == 0 {
-		return fiber.NewError(fiber.StatusNotFound, "Transfer not found")
-	}
-
-	var count int64
-	if err := s.StockTransferRepo.DB().WithContext(ctx).
-		Table("stock_transfers").
-		Joins("JOIN warehouses w_from ON w_from.id = stock_transfers.from_warehouse_id").
-		Joins("JOIN warehouses w_to ON w_to.id = stock_transfers.to_warehouse_id").
-		Where("stock_transfers.id = ?", id).
-		Where("stock_transfers.deleted_at IS NULL").
-		Where("w_from.location_id IN ? OR w_to.location_id IN ?", scope.IDs, scope.IDs).
-		Count(&count).Error; err != nil {
-		return err
-	}
-	if count == 0 {
-		return fiber.NewError(fiber.StatusNotFound, "Transfer not found")
-	}
-
-	return nil
-}
-
-func (s *transferService) ensureDeletePolicyForDownstreamConsumption(ctx context.Context, tx *gorm.DB, detailIDs []uint64) error {
-	dependencies, err := s.loadActiveTransferDownstreamDependencies(ctx, tx, detailIDs)
-	if err != nil {
-		s.Log.Errorf("Failed to load downstream stock transfer consumption: %+v", err)
-		return fiber.NewError(fiber.StatusInternalServerError, "Gagal memvalidasi transaksi turunan transfer stock")
-	}
-	if len(dependencies) == 0 {
-		return nil
-	}
-	ayamDependency, err := s.hasAyamDownstreamConsumption(ctx, tx, detailIDs)
-	if err != nil {
-		s.Log.Errorf("Failed to validate AYAM downstream dependency for transfer delete: %+v", err)
-		return fiber.NewError(fiber.StatusInternalServerError, "Gagal memvalidasi dependensi AYAM pada transfer stock")
-	}
-	if ayamDependency {
-		return fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf(
-				"%s Dependensi aktif: %s. Alasan block: produk AYAM yang sudah terpakai tidak dapat dihapus.",
-				transferDeleteDownstreamGuardMessage,
-				formatDownstreamDependencySummary(dependencies),
-			),
-		)
-	}
-
-	denyReason := ""
-	for _, dep := range dependencies {
-		policy, policyErr := commonSvc.ResolveFifoPendingPolicy(ctx, tx, commonSvc.FifoPendingPolicyInput{
-			Lane:          "USABLE",
-			FlagGroupCode: dep.FlagGroupCode,
-			FunctionCode:  dep.FunctionCode,
-			LegacyTypeKey: dep.UsableType,
-		})
-		if policyErr != nil {
-			s.Log.Errorf("Failed to resolve FIFO pending policy for transfer dependency: %+v", policyErr)
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal membaca konfigurasi FIFO v2")
-		}
-		if !policy.Found || !policy.AllowPending {
-			denyReason = "pending disabled by config"
-			break
-		}
-	}
-	if denyReason == "" {
-		return nil
-	}
-
-	return fiber.NewError(
-		fiber.StatusBadRequest,
-		fmt.Sprintf(
-			"%s Dependensi aktif: %s. Alasan block: %s.",
-			transferDeleteDownstreamGuardMessage,
-			formatDownstreamDependencySummary(dependencies),
-			denyReason,
-		),
-	)
-}
-
-func (s *transferService) loadActiveTransferDownstreamDependencies(
-	ctx context.Context,
-	tx *gorm.DB,
-	detailIDs []uint64,
-) ([]downstreamDependency, error) {
-	if len(detailIDs) == 0 {
-		return nil, nil
-	}
-
-	db := s.StockTransferRepo.DB().WithContext(ctx)
-	if tx != nil {
-		db = tx.WithContext(ctx)
-	}
-
-	var rows []downstreamDependency
-	err := db.Table("stock_allocations").
-		Select("usable_type, usable_id, COALESCE(function_code,'') AS function_code, COALESCE(flag_group_code,'') AS flag_group_code").
-		Where("stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Where("stockable_id IN ?", detailIDs).
-		Where("status = ?", entity.StockAllocationStatusActive).
-		Where("allocation_purpose = ?", entity.StockAllocationPurposeConsume).
-		Where("deleted_at IS NULL").
-		Group("usable_type, usable_id, function_code, flag_group_code").
-		Scan(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func formatDownstreamDependencySummary(rows []downstreamDependency) string {
-	if len(rows) == 0 {
-		return "-"
-	}
-
-	dependencyMap := make(map[string]map[uint64]struct{})
-	for _, row := range rows {
-		label := mapTransferDownstreamUsableLabel(row.UsableType)
-		if _, ok := dependencyMap[label]; !ok {
-			dependencyMap[label] = make(map[uint64]struct{})
-		}
-		dependencyMap[label][row.UsableID] = struct{}{}
-	}
-
-	labels := make([]string, 0, len(dependencyMap))
-	for label := range dependencyMap {
-		labels = append(labels, label)
-	}
-	sort.Strings(labels)
-
-	details := make([]string, 0, len(labels))
-	for _, label := range labels {
-		ids := sortedUint64Keys(dependencyMap[label])
-		details = append(details, fmt.Sprintf("%s=%s", label, joinUint64(ids)))
-	}
-
-	return strings.Join(details, ", ")
-}
-
-func (s *transferService) hasAyamDownstreamConsumption(ctx context.Context, tx *gorm.DB, detailIDs []uint64) (bool, error) {
-	if len(detailIDs) == 0 {
-		return false, nil
-	}
-
-	db := s.StockTransferRepo.DB().WithContext(ctx)
-	if tx != nil {
-		db = tx.WithContext(ctx)
-	}
-
-	var found int64
-	err := db.Table("stock_allocations sa").
-		Joins("JOIN stock_transfer_details std ON std.id = sa.stockable_id AND std.deleted_at IS NULL").
-		Joins("JOIN flags f ON f.flagable_type = ? AND f.flagable_id = std.product_id", entity.FlagableTypeProduct).
-		Joins("JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.flag_group_code = ? AND fm.is_active = TRUE", "AYAM").
-		Where("sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Where("sa.stockable_id IN ?", detailIDs).
-		Where("sa.status = ?", entity.StockAllocationStatusActive).
-		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
-		Where("sa.deleted_at IS NULL").
-		Count(&found).Error
-	if err != nil {
-		return false, err
-	}
-
-	return found > 0, nil
-}
-
-func mapTransferDownstreamUsableLabel(usableType string) string {
-	switch strings.ToUpper(strings.TrimSpace(usableType)) {
-	case fifo.UsableKeyRecordingStock.String(), fifo.UsableKeyRecordingDepletion.String():
-		return "Recording"
-	case fifo.UsableKeyProjectChickin.String():
-		return "Chickin"
-	case fifo.UsableKeyMarketingDelivery.String():
-		return "Marketing"
-	case fifo.UsableKeyTransferToLayingOut.String():
-		return "TransferToLaying"
-	case fifo.UsableKeyStockTransferOut.String():
-		return "TransferStock"
-	case fifo.UsableKeyAdjustmentOut.String():
-		return "Adjustment"
-	default:
-		return strings.ToUpper(strings.TrimSpace(usableType))
-	}
-}
-
-func sortedUint64Keys(input map[uint64]struct{}) []uint64 {
-	if len(input) == 0 {
-		return nil
-	}
-	out := make([]uint64, 0, len(input))
-	for id := range input {
-		if id == 0 {
-			continue
-		}
-		out = append(out, id)
-	}
-	sort.Slice(out, func(i, j int) bool { return out[i] < out[j] })
-	return out
-}
-
-func joinUint64(values []uint64) string {
-	if len(values) == 0 {
-		return "-"
-	}
-	parts := make([]string, 0, len(values))
-	for _, value := range values {
-		parts = append(parts, fmt.Sprintf("%d", value))
-	}
-	return strings.Join(parts, "|")
-}
-
-func (s *transferService) appendStockLog(
-	ctx context.Context,
-	stockLogRepo rStockLogs.StockLogRepository,
-	productWarehouseID uint,
-	actorID uint,
-	increase float64,
-	decrease float64,
-	loggableID uint,
-	notes string,
-) error {
-	if productWarehouseID == 0 || (increase <= 1e-6 && decrease <= 1e-6) {
-		return nil
-	}
-
-	stockLog := &entity.StockLog{
-		ProductWarehouseId: productWarehouseID,
-		CreatedBy:          actorID,
-		Increase:           increase,
-		Decrease:           decrease,
-		LoggableType:       string(utils.StockLogTypeTransfer),
-		LoggableId:         loggableID,
-		Notes:              notes,
-	}
-
-	stockLogs, err := stockLogRepo.GetByProductWarehouse(ctx, productWarehouseID, 1)
-	if err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-	}
-	if len(stockLogs) > 0 {
-		latestStockLog := stockLogs[0]
-		stockLog.Stock = latestStockLog.Stock + increase - decrease
-	} else {
-		stockLog.Stock = increase - decrease
-	}
-	if err := stockLogRepo.CreateOne(ctx, stockLog, nil); err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat stock log saat delete transfer")
-	}
-
-	return nil
-}

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

@@ -49,30 +49,26 @@ type MarketingDetailDTO struct {
 }
 
 type MarketingDeliveryProductDTO struct {
-	Id                  uint                                          `json:"id"`
+	Id                 uint                                          `json:"id"`
-	MarketingProductId  uint                                          `json:"marketing_product_id"`
+	MarketingProductId uint                                          `json:"marketing_product_id"`
-	Qty                 float64                                       `json:"qty"`
+	Qty                float64                                       `json:"qty"`
-	UnitPrice           float64                                       `json:"unit_price"`
+	UnitPrice          float64                                       `json:"unit_price"`
-	TotalWeight         float64                                       `json:"total_weight"`
+	TotalWeight        float64                                       `json:"total_weight"`
-	AvgWeight           float64                                       `json:"avg_weight"`
+	AvgWeight          float64                                       `json:"avg_weight"`
-	TotalPrice          float64                                       `json:"total_price"`
+	TotalPrice         float64                                       `json:"total_price"`
-	DeliveryDate        *time.Time                                    `json:"delivery_date"`
+	DeliveryDate       *time.Time                                    `json:"delivery_date"`
-	VehicleNumber       string                                        `json:"vehicle_number"`
+	VehicleNumber      string                                        `json:"vehicle_number"`
-	ConvertionUnit      *string                                       `json:"-"`
+	ProductWarehouse   *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
-	WeightPerConvertion *float64                                      `json:"-"`
-	ProductWarehouse    *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse,omitempty"`
 }
 
 type DeliveryItemDTO struct {
-	ProductWarehouse    *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse"`
+	ProductWarehouse *productwarehouseDTO.ProductWarehousNestedDTO `json:"product_warehouse"`
-	Qty                 float64                                       `json:"qty"`
+	Qty              float64                                       `json:"qty"`
-	UnitPrice           float64                                       `json:"unit_price"`
+	UnitPrice        float64                                       `json:"unit_price"`
-	TotalWeight         float64                                       `json:"total_weight"`
+	TotalWeight      float64                                       `json:"total_weight"`
-	AvgWeight           float64                                       `json:"avg_weight"`
+	AvgWeight        float64                                       `json:"avg_weight"`
-	WeightPerConvertion *float64                                      `json:"weight_per_convertion"`
+	TotalPrice       float64                                       `json:"total_price"`
-	TotalPeti           *float64                                      `json:"total_peti"`
+	VehicleNumber    string                                        `json:"vehicle_number"`
-	TotalPrice          float64                                       `json:"total_price"`
-	VehicleNumber       string                                        `json:"vehicle_number"`
 }
 
 type DeliveryGroupDTO struct {
@@ -151,16 +147,15 @@ func ToDeliveryMarketingProductDTO(e entity.MarketingProduct, marketingType stri
 
 func ToMarketingDeliveryProductDTO(e entity.MarketingDeliveryProduct) MarketingDeliveryProductDTO {
 	return MarketingDeliveryProductDTO{
-		Id:                  e.Id,
+		Id:                 e.Id,
-		MarketingProductId:  e.MarketingProductId,
+		MarketingProductId: e.MarketingProductId,
-		Qty:                 e.UsageQty,
+		Qty:                e.UsageQty,
-		UnitPrice:           e.UnitPrice,
+		UnitPrice:          e.UnitPrice,
-		TotalWeight:         e.TotalWeight,
+		TotalWeight:        e.TotalWeight,
-		AvgWeight:           e.AvgWeight,
+		AvgWeight:          e.AvgWeight,
-		TotalPrice:          e.TotalPrice,
+		TotalPrice:         e.TotalPrice,
-		DeliveryDate:        e.DeliveryDate,
+		DeliveryDate:       e.DeliveryDate,
-		VehicleNumber:       e.VehicleNumber,
+		VehicleNumber:      e.VehicleNumber,
-		WeightPerConvertion: e.WeightPerConvertion,
 	}
 }
 
@@ -290,7 +285,6 @@ func enrichDeliveryProductDTOsWithWarehouse(deliveryProductDTOs []MarketingDeliv
 				mapped := productwarehouseDTO.ToProductWarehouseNestedDTO(product.ProductWarehouse)
 				deliveryProductDTOs[i].ProductWarehouse = &mapped
 			}
-			deliveryProductDTOs[i].ConvertionUnit = product.ConvertionUnit
 		}
 	}
 
@@ -328,21 +322,13 @@ func groupDeliveryProducts(products []MarketingDeliveryProductDTO, soNumber stri
 		}
 
 		deliveryItem := DeliveryItemDTO{
-			ProductWarehouse:    product.ProductWarehouse,
+			ProductWarehouse: product.ProductWarehouse,
-			Qty:                 product.Qty,
+			Qty:              product.Qty,
-			UnitPrice:           product.UnitPrice,
+			UnitPrice:        product.UnitPrice,
-			TotalWeight:         product.TotalWeight,
+			TotalWeight:      product.TotalWeight,
-			AvgWeight:           product.AvgWeight,
+			AvgWeight:        product.AvgWeight,
-			WeightPerConvertion: product.WeightPerConvertion,
+			TotalPrice:       product.TotalPrice,
-			TotalPrice:          product.TotalPrice,
+			VehicleNumber:    product.VehicleNumber,
-			VehicleNumber:       product.VehicleNumber,
-		}
-		if product.ConvertionUnit != nil &&
-			strings.EqualFold(*product.ConvertionUnit, "PETI") &&
-			product.WeightPerConvertion != nil &&
-			*product.WeightPerConvertion > 0 {
-			totalPeti := product.TotalWeight / *product.WeightPerConvertion
-			deliveryItem.TotalPeti = &totalPeti
 		}
 		group.Deliveries = append(group.Deliveries, deliveryItem)
 	}

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

@@ -2,10 +2,9 @@ package repository
 
 import (
 	"context"
-	"sort"
 	"strings"
 
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -13,7 +12,7 @@ import (
 )
 
 type MarketingDeliveryProductRepository interface {
-	commonRepo.BaseRepository[entity.MarketingDeliveryProduct]
+	repository.BaseRepository[entity.MarketingDeliveryProduct]
 	GetDeliveryProductsByProjectFlockID(ctx context.Context, projectFlockID uint, callback func(*gorm.DB) *gorm.DB) ([]entity.MarketingDeliveryProduct, error)
 	GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
 	GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error)
@@ -24,30 +23,27 @@ type MarketingDeliveryProductRepository interface {
 	GetUsageQty(ctx context.Context, id uint) (float64, error)
 	ResetFifoFields(ctx context.Context, id uint) error
 	GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error)
-	GetAttributionRowsByDeliveryProductIDs(ctx context.Context, deliveryProductIDs []uint) ([]commonRepo.MarketingDeliveryAttributionRow, error)
 }
 
 type MarketingDeliveryProductRepositoryImpl struct {
-	*commonRepo.BaseRepositoryImpl[entity.MarketingDeliveryProduct]
+	*repository.BaseRepositoryImpl[entity.MarketingDeliveryProduct]
 }
 
-const marketingDeliveryProductSelectWithNullAttributed = "marketing_delivery_products.*, NULL AS attributed_project_flock_kandang_id"
-
 func NewMarketingDeliveryProductRepository(db *gorm.DB) MarketingDeliveryProductRepository {
 	return &MarketingDeliveryProductRepositoryImpl{
-		BaseRepositoryImpl: commonRepo.NewBaseRepository[entity.MarketingDeliveryProduct](db),
+		BaseRepositoryImpl: repository.NewBaseRepository[entity.MarketingDeliveryProduct](db),
 	}
 }
 
 func (r *MarketingDeliveryProductRepositoryImpl) GetDeliveryProductsByProjectFlockID(ctx context.Context, projectFlockID uint, callback func(*gorm.DB) *gorm.DB) ([]entity.MarketingDeliveryProduct, error) {
 	var deliveryProducts []entity.MarketingDeliveryProduct
 
-	attributionQuery := commonRepo.MarketingDeliveryAttributionRowsQuery(r.DB().WithContext(ctx))
-
 	db := r.DB().WithContext(ctx).
-		Select("DISTINCT "+marketingDeliveryProductSelectWithNullAttributed).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
-		Joins("JOIN (?) AS mda ON mda.marketing_delivery_product_id = marketing_delivery_products.id", attributionQuery).
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
-		Where("mda.project_flock_id = ?", projectFlockID)
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Distinct("marketing_delivery_products.*")
 
 	if callback != nil {
 		db = callback(db)
@@ -61,50 +57,139 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetDeliveryProductsByProjectFlo
 }
 
 func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualan(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
-	attributionRows, err := r.getClosingAttributionRows(ctx, projectFlockID, projectFlockKandangID, nil)
+	var deliveryProducts []entity.MarketingDeliveryProduct
-	if err != nil {
+
+	db := r.DB().WithContext(ctx).
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Uom").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.Warehouse").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Preload("MarketingProduct.Marketing").
+		Preload("MarketingProduct.Marketing.Customer").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
 		return nil, err
 	}
-	return r.fetchClosingDeliveryProducts(ctx, attributionRows, projectFlockKandangID)
+
+	return deliveryProducts, nil
 }
 
 func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanForAgeChickDataProduction(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]entity.MarketingDeliveryProduct, error) {
-	attributionRows, err := r.getClosingAttributionRows(ctx, projectFlockID, projectFlockKandangID, []string{
+	var deliveryProducts []entity.MarketingDeliveryProduct
-		string(utils.FlagAyamAfkir),
+
-		string(utils.FlagAyamCulling),
+	db := r.DB().WithContext(ctx).
-		string(utils.FlagPullet),
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
-		string(utils.FlagLayer),
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
-	})
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
-	if err != nil {
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("flags.name IN (?)", []string{
+			string(utils.FlagAyamAfkir),
+			string(utils.FlagAyamCulling),
+			string(utils.FlagPullet),
+			string(utils.FlagLayer),
+		}).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
+	}
+
+	db = db.
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
 		return nil, err
 	}
-	return r.fetchClosingDeliveryProducts(ctx, attributionRows, projectFlockKandangID)
+
+	return deliveryProducts, nil
 }
 
 func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanByCategory(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint, category string) ([]entity.MarketingDeliveryProduct, error) {
-	flagNames := []string{
+	var deliveryProducts []entity.MarketingDeliveryProduct
-		string(utils.FlagDOC),
+
-		string(utils.FlagPullet),
+	db := r.DB().WithContext(ctx).
-		string(utils.FlagLayer),
+		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
-		string(utils.FlagAyamAfkir),
+		Joins("JOIN product_warehouses ON product_warehouses.id = marketing_products.product_warehouse_id").
-		string(utils.FlagAyamCulling),
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
-		string(utils.FlagAyamMati),
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = 'products'").
+		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
+		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
+		Where("marketing_delivery_products.delivery_date IS NOT NULL").
+		Distinct("marketing_delivery_products.*")
+
+	if projectFlockKandangID != nil {
+		db = db.Where("product_warehouses.project_flock_kandang_id = ?", *projectFlockKandangID)
 	}
+
 	if category == string(utils.ProjectFlockCategoryLaying) {
-		flagNames = []string{
+		db = db.Where("flags.name IN (?)", []string{
 			string(utils.FlagTelur),
 			string(utils.FlagTelurUtuh),
 			string(utils.FlagTelurPecah),
 			string(utils.FlagTelurPutih),
 			string(utils.FlagTelurRetak),
-		}
+		})
+	} else {
+		db = db.Where("flags.name IN (?)", []string{
+			string(utils.FlagDOC),
+			string(utils.FlagPullet),
+			string(utils.FlagLayer),
+			string(utils.FlagAyamAfkir),
+			string(utils.FlagAyamCulling),
+			string(utils.FlagAyamMati),
+		})
 	}
 
-	attributionRows, err := r.getClosingAttributionRows(ctx, projectFlockID, projectFlockKandangID, flagNames)
+	db = db.
-	if err != nil {
+		Preload("MarketingProduct").
+		Preload("MarketingProduct.ProductWarehouse").
+		Preload("MarketingProduct.ProductWarehouse.Product").
+		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
+		Preload("MarketingProduct.ProductWarehouse.Product.Uom").
+		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
+		Preload("MarketingProduct.ProductWarehouse.Warehouse").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang").
+		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
+		Preload("MarketingProduct.Marketing").
+		Preload("MarketingProduct.Marketing.Customer").
+		Order("marketing_delivery_products.delivery_date DESC")
+
+	if err := db.Find(&deliveryProducts).Error; err != nil {
 		return nil, err
 	}
-	return r.fetchClosingDeliveryProducts(ctx, attributionRows, projectFlockKandangID)
+
+	return deliveryProducts, nil
 }
 
 func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingId(ctx context.Context, marketingId uint) ([]entity.MarketingDeliveryProduct, error) {
@@ -112,7 +197,6 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingId(ctx context.Co
 
 	// JOIN untuk filter by marketing_id yang ada di related table
 	db := r.DB().WithContext(ctx).
-		Select(marketingDeliveryProductSelectWithNullAttributed).
 		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
 		Where("marketing_products.marketing_id = ?", marketingId)
 
@@ -127,8 +211,6 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingProductID(ctx con
 	var deliveryProduct entity.MarketingDeliveryProduct
 
 	if err := r.DB().WithContext(ctx).
-		Model(&entity.MarketingDeliveryProduct{}).
-		Select(marketingDeliveryProductSelectWithNullAttributed).
 		Where("marketing_product_id = ?", marketingProductID).
 		First(&deliveryProduct).Error; err != nil {
 		return nil, err
@@ -137,221 +219,12 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingProductID(ctx con
 	return &deliveryProduct, nil
 }
 
-func (r *MarketingDeliveryProductRepositoryImpl) GetByID(
-	ctx context.Context,
-	id uint,
-	modifier func(*gorm.DB) *gorm.DB,
-) (*entity.MarketingDeliveryProduct, error) {
-	var deliveryProduct entity.MarketingDeliveryProduct
-
-	q := r.DB().WithContext(ctx).
-		Model(&entity.MarketingDeliveryProduct{}).
-		Select(marketingDeliveryProductSelectWithNullAttributed)
-	if modifier != nil {
-		q = modifier(q)
-	}
-
-	if err := q.First(&deliveryProduct, id).Error; err != nil {
-		return nil, err
-	}
-
-	return &deliveryProduct, nil
-}
-
-func (r *MarketingDeliveryProductRepositoryImpl) GetAttributionRowsByDeliveryProductIDs(ctx context.Context, deliveryProductIDs []uint) ([]commonRepo.MarketingDeliveryAttributionRow, error) {
-	if len(deliveryProductIDs) == 0 {
-		return []commonRepo.MarketingDeliveryAttributionRow{}, nil
-	}
-
-	var rows []commonRepo.MarketingDeliveryAttributionRow
-	query := r.DB().WithContext(ctx).
-		Table("(?) AS mda", commonRepo.MarketingDeliveryAttributionRowsQuery(r.DB().WithContext(ctx))).
-		Where("mda.marketing_delivery_product_id IN ?", deliveryProductIDs).
-		Order("mda.marketing_delivery_product_id ASC, mda.project_flock_kandang_id ASC")
-
-	if err := query.Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func (r *MarketingDeliveryProductRepositoryImpl) getClosingAttributionRows(
-	ctx context.Context,
-	projectFlockID uint,
-	projectFlockKandangID *uint,
-	flagNames []string,
-) ([]commonRepo.MarketingDeliveryAttributionRow, error) {
-	var rows []commonRepo.MarketingDeliveryAttributionRow
-
-	attributionQuery := commonRepo.MarketingDeliveryAttributionRowsQuery(r.DB().WithContext(ctx))
-	query := r.DB().WithContext(ctx).
-		Table("(?) AS mda", attributionQuery).
-		Joins("JOIN marketing_delivery_products mdp ON mdp.id = mda.marketing_delivery_product_id").
-		Joins("JOIN marketing_products mp ON mp.id = mdp.marketing_product_id").
-		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
-		Joins("JOIN products prod ON prod.id = pw.product_id").
-		Where("mda.project_flock_id = ?", projectFlockID).
-		Where("mdp.delivery_date IS NOT NULL")
-
-	if projectFlockKandangID != nil {
-		query = query.Where("mda.project_flock_kandang_id = ?", *projectFlockKandangID)
-	}
-	if len(flagNames) > 0 {
-		query = query.
-			Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-			Where("f.name IN ?", flagNames)
-	}
-
-	query = query.
-		Select(`
-			mda.marketing_delivery_product_id,
-			mda.project_flock_kandang_id,
-			mda.project_flock_id,
-			mda.project_flock_category,
-			SUM(mda.allocated_qty) AS allocated_qty
-		`).
-		Group(`
-			mda.marketing_delivery_product_id,
-			mda.project_flock_kandang_id,
-			mda.project_flock_id,
-			mda.project_flock_category
-		`).
-		Order("mda.marketing_delivery_product_id ASC, mda.project_flock_kandang_id ASC")
-
-	if err := query.Scan(&rows).Error; err != nil {
-		return nil, err
-	}
-
-	return rows, nil
-}
-
-func (r *MarketingDeliveryProductRepositoryImpl) fetchClosingDeliveryProducts(
-	ctx context.Context,
-	attributionRows []commonRepo.MarketingDeliveryAttributionRow,
-	projectFlockKandangID *uint,
-) ([]entity.MarketingDeliveryProduct, error) {
-	deliveryIDs := orderedDeliveryProductIDs(attributionRows)
-	if len(deliveryIDs) == 0 {
-		return []entity.MarketingDeliveryProduct{}, nil
-	}
-
-	query := r.closingDeliveryProductsQuery(ctx).
-		Select(marketingDeliveryProductSelectWithNullAttributed).
-		Where("marketing_delivery_products.id IN ?", deliveryIDs).
-		Order("marketing_delivery_products.delivery_date DESC")
-
-	if projectFlockKandangID == nil {
-		query = query.Joins(
-			"LEFT JOIN (?) AS mda_single ON mda_single.marketing_delivery_product_id = marketing_delivery_products.id",
-			commonRepo.MarketingDeliverySingleAttributionQuery(r.DB().WithContext(ctx)),
-		).Select("marketing_delivery_products.*, mda_single.attributed_project_flock_kandang_id")
-	}
-
-	var deliveryProducts []entity.MarketingDeliveryProduct
-	if err := query.Find(&deliveryProducts).Error; err != nil {
-		return nil, err
-	}
-
-	if projectFlockKandangID == nil {
-		return deliveryProducts, nil
-	}
-
-	return scaleDeliveryProductsByAttribution(deliveryProducts, attributionRows, *projectFlockKandangID), nil
-}
-
-func (r *MarketingDeliveryProductRepositoryImpl) closingDeliveryProductsQuery(ctx context.Context) *gorm.DB {
-	return r.DB().WithContext(ctx).
-		Model(&entity.MarketingDeliveryProduct{}).
-		Preload("MarketingProduct").
-		Preload("MarketingProduct.ProductWarehouse").
-		Preload("MarketingProduct.ProductWarehouse.Product").
-		Preload("MarketingProduct.ProductWarehouse.Product.ProductCategory").
-		Preload("MarketingProduct.ProductWarehouse.Product.Uom").
-		Preload("MarketingProduct.ProductWarehouse.Product.Flags").
-		Preload("MarketingProduct.ProductWarehouse.Warehouse").
-		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang").
-		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.ProjectFlock").
-		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang").
-		Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Chickins").
-		Preload("MarketingProduct.Marketing").
-		Preload("MarketingProduct.Marketing.Customer").
-		Preload("AttributedProjectFlockKandang").
-		Preload("AttributedProjectFlockKandang.ProjectFlock").
-		Preload("AttributedProjectFlockKandang.Kandang").
-		Preload("AttributedProjectFlockKandang.Chickins")
-}
-
-func orderedDeliveryProductIDs(rows []commonRepo.MarketingDeliveryAttributionRow) []uint {
-	seen := make(map[uint]struct{}, len(rows))
-	ids := make([]uint, 0, len(rows))
-	for _, row := range rows {
-		if row.MarketingDeliveryProductID == 0 {
-			continue
-		}
-		if _, ok := seen[row.MarketingDeliveryProductID]; ok {
-			continue
-		}
-		seen[row.MarketingDeliveryProductID] = struct{}{}
-		ids = append(ids, row.MarketingDeliveryProductID)
-	}
-	sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] })
-	return ids
-}
-
-func scaleDeliveryProductsByAttribution(
-	deliveryProducts []entity.MarketingDeliveryProduct,
-	rows []commonRepo.MarketingDeliveryAttributionRow,
-	projectFlockKandangID uint,
-) []entity.MarketingDeliveryProduct {
-	if len(deliveryProducts) == 0 || projectFlockKandangID == 0 {
-		return deliveryProducts
-	}
-
-	totalByDelivery := make(map[uint]float64, len(rows))
-	selectedByDelivery := make(map[uint]float64, len(rows))
-	for _, row := range rows {
-		totalByDelivery[row.MarketingDeliveryProductID] += row.AllocatedQty
-		if row.ProjectFlockKandangID == projectFlockKandangID {
-			selectedByDelivery[row.MarketingDeliveryProductID] += row.AllocatedQty
-		}
-	}
-
-	filtered := make([]entity.MarketingDeliveryProduct, 0, len(deliveryProducts))
-	for _, delivery := range deliveryProducts {
-		selectedQty := selectedByDelivery[delivery.Id]
-		totalQty := totalByDelivery[delivery.Id]
-		if selectedQty <= 0 {
-			continue
-		}
-
-		share := 1.0
-		if totalQty > 0 {
-			share = selectedQty / totalQty
-		}
-
-		cloned := delivery
-		cloned.AttributedProjectFlockKandangId = &projectFlockKandangID
-		cloned.UsageQty = selectedQty
-		cloned.PendingQty = 0
-		cloned.TotalWeight = delivery.TotalWeight * share
-		cloned.TotalPrice = delivery.TotalPrice * share
-		filtered = append(filtered, cloned)
-	}
-
-	return filtered
-}
-
 func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.Context, offset, limit int, filters *validation.MarketingQuery) ([]entity.MarketingDeliveryProduct, int64, error) {
 	var deliveryProducts []entity.MarketingDeliveryProduct
 	var total int64
 
-	baseDB := r.DB().WithContext(ctx)
-	singleAttributionQuery := commonRepo.MarketingDeliverySingleAttributionQuery(baseDB)
 	db := r.DB().WithContext(ctx).
 		Model(&entity.MarketingDeliveryProduct{}).
-		Select("marketing_delivery_products.*, mda_single.attributed_project_flock_kandang_id").
-		Joins("LEFT JOIN (?) AS mda_single ON mda_single.marketing_delivery_product_id = marketing_delivery_products.id", singleAttributionQuery).
 		Preload("MarketingProduct", func(db *gorm.DB) *gorm.DB {
 			return db.
 				Preload("Marketing").
@@ -364,9 +237,6 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 				Preload("ProductWarehouse.ProjectFlockKandang").
 				Preload("ProductWarehouse.ProjectFlockKandang.ProjectFlock")
 		}).
-		Preload("AttributedProjectFlockKandang").
-		Preload("AttributedProjectFlockKandang.ProjectFlock").
-		Preload("AttributedProjectFlockKandang.Kandang").
 		Joins("JOIN marketing_products ON marketing_products.id = marketing_delivery_products.marketing_product_id").
 		Joins("JOIN marketings ON marketings.id = marketing_products.marketing_id").
 		Where("marketing_delivery_products.delivery_date IS NOT NULL")
@@ -422,27 +292,22 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 	}
 
 	if filters.AreaId > 0 || filters.LocationId > 0 || filters.AllowedAreaIDs != nil || filters.AllowedLocationIDs != nil {
-		buildAttrFilter := func() *gorm.DB {
+		db = db.Joins("LEFT JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
-			return r.DB().WithContext(ctx).
+			Joins("LEFT JOIN project_flocks ON project_flocks.id = project_flock_kandangs.project_flock_id")
-				Table("(?) AS mda", commonRepo.MarketingDeliveryAttributionRowsQuery(r.DB().WithContext(ctx))).
+
-				Select("1").
-				Joins("JOIN project_flock_kandangs pfk ON pfk.id = mda.project_flock_kandang_id").
-				Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
-				Where("mda.marketing_delivery_product_id = marketing_delivery_products.id")
-		}
 		if filters.AreaId > 0 {
-			db = db.Where("EXISTS (?)", buildAttrFilter().Where("pf.area_id = ?", filters.AreaId))
+			db = db.Where("project_flocks.area_id = ?", filters.AreaId)
 		}
 
 		if filters.LocationId > 0 {
-			db = db.Where("EXISTS (?)", buildAttrFilter().Where("pf.location_id = ?", filters.LocationId))
+			db = db.Where("project_flocks.location_id = ?", filters.LocationId)
 		}
 
 		if filters.AllowedAreaIDs != nil {
 			if len(filters.AllowedAreaIDs) == 0 {
 				db = db.Where("1 = 0")
 			} else {
-				db = db.Where("EXISTS (?)", buildAttrFilter().Where("pf.area_id IN ?", filters.AllowedAreaIDs))
+				db = db.Where("project_flocks.area_id IN ?", filters.AllowedAreaIDs)
 			}
 		}
 
@@ -450,7 +315,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 			if len(filters.AllowedLocationIDs) == 0 {
 				db = db.Where("1 = 0")
 			} else {
-				db = db.Where("EXISTS (?)", buildAttrFilter().Where("pf.location_id IN ?", filters.AllowedLocationIDs))
+				db = db.Where("project_flocks.location_id IN ?", filters.AllowedLocationIDs)
 			}
 		}
 	}

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

@@ -1,42 +0,0 @@
-package repository
-
-import (
-	"testing"
-
-	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-)
-
-func TestScaleDeliveryProductsByAttribution(t *testing.T) {
-	projectFlockKandangID := uint(101)
-
-	deliveryProducts := []entity.MarketingDeliveryProduct{
-		{
-			Id:          55,
-			UsageQty:    100,
-			TotalWeight: 180,
-			TotalPrice:  3600,
-		},
-	}
-	attributionRows := []commonRepo.MarketingDeliveryAttributionRow{
-		{MarketingDeliveryProductID: 55, ProjectFlockKandangID: 101, AllocatedQty: 60},
-		{MarketingDeliveryProductID: 55, ProjectFlockKandangID: 102, AllocatedQty: 40},
-	}
-
-	got := scaleDeliveryProductsByAttribution(deliveryProducts, attributionRows, projectFlockKandangID)
-	if len(got) != 1 {
-		t.Fatalf("expected 1 scaled delivery, got %d", len(got))
-	}
-	if got[0].UsageQty != 60 {
-		t.Fatalf("expected usage qty 60, got %.2f", got[0].UsageQty)
-	}
-	if got[0].TotalWeight != 108 {
-		t.Fatalf("expected total weight 108, got %.2f", got[0].TotalWeight)
-	}
-	if got[0].TotalPrice != 2160 {
-		t.Fatalf("expected total price 2160, got %.2f", got[0].TotalPrice)
-	}
-	if got[0].AttributedProjectFlockKandangId == nil || *got[0].AttributedProjectFlockKandangId != projectFlockKandangID {
-		t.Fatalf("expected attributed kandang id %d, got %+v", projectFlockKandangID, got[0].AttributedProjectFlockKandangId)
-	}
-}

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

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math"
 	"strings"
 	"time"
 
@@ -376,12 +375,11 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 				itemDeliveryDate = &parsedDate
 			}
 
-			totalWeight, totalPrice := s.resolveDeliveryTotals(marketing.MarketingType, requestedProduct, foundMarketingProduct)
+			totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
 
 			deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 			deliveryProduct.UnitPrice = requestedProduct.UnitPrice
 			deliveryProduct.AvgWeight = requestedProduct.AvgWeight
-			deliveryProduct.WeightPerConvertion = requestedProduct.WeightPerConvertion
 			deliveryProduct.TotalWeight = totalWeight
 			deliveryProduct.TotalPrice = totalPrice
 			deliveryProduct.DeliveryDate = itemDeliveryDate
@@ -500,12 +498,11 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					itemDeliveryDate = deliveryProduct.DeliveryDate
 				}
 
-				totalWeight, totalPrice := s.resolveDeliveryTotals(marketing.MarketingType, requestedProduct, foundMarketingProduct)
+				totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
 
 				deliveryProduct.ProductWarehouseId = foundMarketingProduct.ProductWarehouseId
 				deliveryProduct.UnitPrice = requestedProduct.UnitPrice
 				deliveryProduct.AvgWeight = requestedProduct.AvgWeight
-				deliveryProduct.WeightPerConvertion = requestedProduct.WeightPerConvertion
 				deliveryProduct.TotalWeight = totalWeight
 				deliveryProduct.TotalPrice = totalPrice
 				deliveryProduct.DeliveryDate = itemDeliveryDate
@@ -544,53 +541,20 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 	return s.getMarketingWithDeliveries(c, id)
 }
 
-func (s *deliveryOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int, convertionUnit *string, _ *float64) (totalWeight, totalPrice float64) {
+func (s *deliveryOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
 	if marketingType == string(utils.MarketingTypeTrading) {
 		totalWeight = 0
-		totalPrice = math.Round(qty*unitPrice*100) / 100
+		totalPrice = qty * unitPrice
 	} else if marketingType == string(utils.MarketingTypeAyamPullet) && week != nil && *week > 0 {
-		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalWeight = qty * avgWeight
-		totalPrice = math.Round(unitPrice*float64(*week)*qty*100) / 100
+		totalPrice = unitPrice * float64(*week) * qty
 	} else {
-		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalWeight = qty * avgWeight
-
+		totalPrice = totalWeight * unitPrice
-		if marketingType == string(utils.MarketingTypeTelur) && convertionUnit != nil {
-			switch *convertionUnit {
-			case string(utils.ConvertionUnitQty):
-				totalPrice = math.Round(qty*unitPrice*100) / 100
-				return totalWeight, totalPrice
-			case string(utils.ConvertionUnitPeti):
-				totalPrice = math.Round(totalWeight*unitPrice*100) / 100
-				return totalWeight, totalPrice
-			}
-		}
-
-		totalPrice = math.Round(totalWeight*unitPrice*100) / 100
 	}
 	return totalWeight, totalPrice
 }
 
-func (s *deliveryOrdersService) resolveDeliveryTotals(marketingType string, requestedProduct validation.DeliveryProduct, marketingProduct *entity.MarketingProduct) (totalWeight, totalPrice float64) {
-	totalWeight, totalPrice = s.calculatePriceByMarketingType(
-		marketingType,
-		requestedProduct.Qty,
-		requestedProduct.AvgWeight,
-		requestedProduct.UnitPrice,
-		marketingProduct.Week,
-		marketingProduct.ConvertionUnit,
-		marketingProduct.WeightPerConvertion,
-	)
-
-	if requestedProduct.TotalWeight != nil {
-		totalWeight = *requestedProduct.TotalWeight
-	}
-	if requestedProduct.TotalPrice != nil {
-		totalPrice = *requestedProduct.TotalPrice
-	}
-
-	return totalWeight, totalPrice
-}
-
 func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gorm.DB, deliveryProduct *entity.MarketingDeliveryProduct, marketingProduct *entity.MarketingProduct, requestedQty float64, actorID uint) error {
 	if marketingProduct == nil || marketingProduct.ProductWarehouseId == 0 {
 		return fiber.NewError(fiber.StatusInternalServerError, "Product warehouse not found")
@@ -679,11 +643,6 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 		return nil
 	}
 
-	affectedKandangIDs, err := s.marketingPopulationKandangIDsFromActiveAllocations(ctx, tx, deliveryProduct.Id)
-	if err != nil {
-		return err
-	}
-
 	deliveryProduct.UsageQty = 0
 	deliveryProduct.PendingQty = 0
 	if err := deliveryProductRepo.UpdateOne(ctx, deliveryProduct.Id, deliveryProduct, nil); err != nil {
@@ -711,9 +670,6 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 	if err := fifoV2.ReleasePopulationConsumptionByUsable(ctx, tx, fifo.UsableKeyMarketingDelivery.String(), deliveryProduct.Id); err != nil {
 		return err
 	}
-	if err := s.resyncPopulationUsageByKandangIDs(ctx, tx, affectedKandangIDs); err != nil {
-		return err
-	}
 
 	releasedUsage := currentUsage - deliveryProduct.UsageQty
 	if actorID > 0 && releasedUsage > 0 {
@@ -769,378 +725,29 @@ func (s deliveryOrdersService) allocatePopulationForMarketingDelivery(
 		return nil
 	}
 
-	exactAllocations, err := s.findDirectPopulationAllocationsForMarketing(ctx, tx, deliveryProduct.Id)
+	pw, err := s.ProductWarehouseRepo.WithTx(tx).GetByID(ctx, productWarehouseID, nil)
 	if err != nil {
 		return err
 	}
-	if len(exactAllocations) > 0 {
+	if pw.ProjectFlockKandangId == nil || *pw.ProjectFlockKandangId == 0 {
-		if err := fifoV2.ReleasePopulationConsumptionByUsable(ctx, tx, fifo.UsableKeyMarketingDelivery.String(), deliveryProduct.Id); err != nil {
+		return nil
-			return err
-		}
-		if err := s.applyDirectPopulationAllocationsForMarketing(ctx, tx, productWarehouseID, deliveryProduct.Id, exactAllocations); err != nil {
-			return err
-		}
-		return s.resyncPopulationUsageByKandangIDs(ctx, tx, marketingAllocationKandangIDs(exactAllocations))
 	}
 
-	sourceGroups, err := s.findPopulationSourceGroupsForMarketing(ctx, tx, deliveryProduct.Id, productWarehouseID)
+	populations, err := s.ProjectFlockPopulationRepo.WithTx(tx).GetByProjectFlockKandangIDAndProductWarehouseID(ctx, *pw.ProjectFlockKandangId, productWarehouseID)
 	if err != nil {
 		return err
 	}
-	if len(sourceGroups) == 0 {
+	if len(populations) == 0 {
-		return nil
+		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan untuk delivery")
 	}
-	if err := fifoV2.ReleasePopulationConsumptionByUsable(ctx, tx, fifo.UsableKeyMarketingDelivery.String(), deliveryProduct.Id); err != nil {
+
-		return err
+	return fifoV2.AllocatePopulationConsumption(
-	}
+		ctx,
-	for _, group := range sourceGroups {
+		tx,
-		populations, err := s.ProjectFlockPopulationRepo.WithTx(tx).GetByProjectFlockKandangIDAndProductWarehouseID(
+		populations,
-			ctx,
+		productWarehouseID,
-			group.ProjectFlockKandangID,
+		fifo.UsableKeyMarketingDelivery.String(),
-			group.ProductWarehouseID,
+		deliveryProduct.Id,
-		)
+		deliveryProduct.UsageQty,
-		if err != nil {
+	)
-			return err
-		}
-		if len(populations) == 0 {
-			return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak ditemukan untuk delivery")
-		}
-		if err := s.allocatePopulationConsumptionWithoutRelease(
-			ctx,
-			tx,
-			populations,
-			productWarehouseID,
-			deliveryProduct.Id,
-			group.Qty,
-		); err != nil {
-			return err
-		}
-	}
-	return s.resyncPopulationUsageByKandangIDs(ctx, tx, marketingSourceGroupKandangIDs(sourceGroups))
-}
-
-type marketingPopulationAllocation struct {
-	ProjectFlockPopulationID uint    `gorm:"column:project_flock_population_id"`
-	ProjectFlockKandangID    uint    `gorm:"column:project_flock_kandang_id"`
-	Qty                      float64 `gorm:"column:qty"`
-}
-
-type marketingPopulationSourceGroup struct {
-	ProjectFlockKandangID uint    `gorm:"column:project_flock_kandang_id"`
-	ProductWarehouseID    uint    `gorm:"column:product_warehouse_id"`
-	Qty                   float64 `gorm:"column:qty"`
-}
-
-func (s deliveryOrdersService) findDirectPopulationAllocationsForMarketing(
-	ctx context.Context,
-	tx *gorm.DB,
-	deliveryProductID uint,
-) ([]marketingPopulationAllocation, error) {
-	var rows []marketingPopulationAllocation
-	err := tx.WithContext(ctx).
-		Table("stock_allocations sa").
-		Select(`
-			pfp.id AS project_flock_population_id,
-			pc.project_flock_kandang_id AS project_flock_kandang_id,
-			SUM(sa.qty) AS qty
-		`).
-		Joins("JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Joins("JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
-		Where("sa.usable_type = ? AND sa.usable_id = ? AND sa.status = ? AND sa.allocation_purpose = ?",
-			fifo.UsableKeyMarketingDelivery.String(),
-			deliveryProductID,
-			entity.StockAllocationStatusActive,
-			entity.StockAllocationPurposeConsume,
-		).
-		Group("pfp.id, pc.project_flock_kandang_id").
-		Order("pfp.id ASC").
-		Scan(&rows).Error
-	return rows, err
-}
-
-func (s deliveryOrdersService) findPopulationSourceGroupsForMarketing(
-	ctx context.Context,
-	tx *gorm.DB,
-	deliveryProductID uint,
-	productWarehouseID uint,
-) ([]marketingPopulationSourceGroup, error) {
-	groups := make(map[string]marketingPopulationSourceGroup)
-
-	appendGroup := func(projectFlockKandangID uint, sourceProductWarehouseID uint, qty float64) {
-		if projectFlockKandangID == 0 || sourceProductWarehouseID == 0 || qty <= 0 {
-			return
-		}
-		key := fmt.Sprintf("%d:%d", projectFlockKandangID, sourceProductWarehouseID)
-		current := groups[key]
-		current.ProjectFlockKandangID = projectFlockKandangID
-		current.ProductWarehouseID = sourceProductWarehouseID
-		current.Qty += qty
-		groups[key] = current
-	}
-
-	var transferRows []marketingPopulationSourceGroup
-	if err := tx.WithContext(ctx).
-		Table("stock_allocations sa").
-		Select(`
-			source_pw.project_flock_kandang_id AS project_flock_kandang_id,
-			std.source_product_warehouse_id AS product_warehouse_id,
-			SUM(sa.qty) AS qty
-		`).
-		Joins("JOIN stock_transfer_details std ON std.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyStockTransferIn.String()).
-		Joins("JOIN product_warehouses source_pw ON source_pw.id = std.source_product_warehouse_id").
-		Where("sa.usable_type = ? AND sa.usable_id = ? AND sa.status = ? AND sa.allocation_purpose = ?",
-			fifo.UsableKeyMarketingDelivery.String(),
-			deliveryProductID,
-			entity.StockAllocationStatusActive,
-			entity.StockAllocationPurposeConsume,
-		).
-		Where("source_pw.project_flock_kandang_id IS NOT NULL").
-		Group("source_pw.project_flock_kandang_id, std.source_product_warehouse_id").
-		Scan(&transferRows).Error; err != nil {
-		return nil, err
-	}
-	for _, row := range transferRows {
-		appendGroup(row.ProjectFlockKandangID, row.ProductWarehouseID, row.Qty)
-	}
-
-	var purchaseRows []marketingPopulationSourceGroup
-	if err := tx.WithContext(ctx).
-		Table("stock_allocations sa").
-		Select(`
-			pi.project_flock_kandang_id AS project_flock_kandang_id,
-			pi.product_warehouse_id AS product_warehouse_id,
-			SUM(sa.qty) AS qty
-		`).
-		Joins("JOIN purchase_items pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyPurchaseItems.String()).
-		Where("sa.usable_type = ? AND sa.usable_id = ? AND sa.status = ? AND sa.allocation_purpose = ?",
-			fifo.UsableKeyMarketingDelivery.String(),
-			deliveryProductID,
-			entity.StockAllocationStatusActive,
-			entity.StockAllocationPurposeConsume,
-		).
-		Where("pi.project_flock_kandang_id IS NOT NULL").
-		Where("pi.product_warehouse_id IS NOT NULL").
-		Group("pi.project_flock_kandang_id, pi.product_warehouse_id").
-		Scan(&purchaseRows).Error; err != nil {
-		return nil, err
-	}
-	for _, row := range purchaseRows {
-		appendGroup(row.ProjectFlockKandangID, row.ProductWarehouseID, row.Qty)
-	}
-
-	var layingRows []marketingPopulationSourceGroup
-	if err := tx.WithContext(ctx).
-		Table("stock_allocations sa").
-		Select(`
-			ltt.target_project_flock_kandang_id AS project_flock_kandang_id,
-			ltt.product_warehouse_id AS product_warehouse_id,
-			SUM(sa.qty) AS qty
-		`).
-		Joins("JOIN laying_transfer_targets ltt ON ltt.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyTransferToLayingIn.String()).
-		Where("sa.usable_type = ? AND sa.usable_id = ? AND sa.status = ? AND sa.allocation_purpose = ?",
-			fifo.UsableKeyMarketingDelivery.String(),
-			deliveryProductID,
-			entity.StockAllocationStatusActive,
-			entity.StockAllocationPurposeConsume,
-		).
-		Where("ltt.product_warehouse_id IS NOT NULL").
-		Group("ltt.target_project_flock_kandang_id, ltt.product_warehouse_id").
-		Scan(&layingRows).Error; err != nil {
-		return nil, err
-	}
-	for _, row := range layingRows {
-		appendGroup(row.ProjectFlockKandangID, row.ProductWarehouseID, row.Qty)
-	}
-
-	if len(groups) == 0 {
-		pw, err := s.ProductWarehouseRepo.WithTx(tx).GetByID(ctx, productWarehouseID, nil)
-		if err != nil {
-			return nil, err
-		}
-		if pw.ProjectFlockKandangId != nil && *pw.ProjectFlockKandangId != 0 {
-			appendGroup(*pw.ProjectFlockKandangId, productWarehouseID, 0)
-		}
-	}
-
-	result := make([]marketingPopulationSourceGroup, 0, len(groups))
-	for _, group := range groups {
-		if group.Qty == 0 {
-			group.Qty = s.resolveMarketingRequestedUsageQty(ctx, tx, deliveryProductID)
-		}
-		if group.Qty > 0 {
-			result = append(result, group)
-		}
-	}
-
-	return result, nil
-}
-
-func (s deliveryOrdersService) applyDirectPopulationAllocationsForMarketing(
-	ctx context.Context,
-	tx *gorm.DB,
-	productWarehouseID uint,
-	deliveryProductID uint,
-	allocations []marketingPopulationAllocation,
-) error {
-	stockAllocationRepo := commonRepo.NewStockAllocationRepository(tx)
-	for _, allocation := range allocations {
-		if allocation.ProjectFlockPopulationID == 0 || allocation.Qty <= 0 {
-			continue
-		}
-		record := &entity.StockAllocation{
-			ProductWarehouseId: productWarehouseID,
-			StockableType:      fifo.StockableKeyProjectFlockPopulation.String(),
-			StockableId:        allocation.ProjectFlockPopulationID,
-			UsableType:         fifo.UsableKeyMarketingDelivery.String(),
-			UsableId:           deliveryProductID,
-			Qty:                allocation.Qty,
-			Status:             entity.StockAllocationStatusActive,
-			AllocationPurpose:  entity.StockAllocationPurposeConsume,
-		}
-		if err := stockAllocationRepo.CreateOne(ctx, record, nil); err != nil {
-			return err
-		}
-		if err := tx.WithContext(ctx).
-			Model(&entity.ProjectFlockPopulation{}).
-			Where("id = ?", allocation.ProjectFlockPopulationID).
-			Update("total_used_qty", gorm.Expr("total_used_qty + ?", allocation.Qty)).Error; err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (s deliveryOrdersService) allocatePopulationConsumptionWithoutRelease(
-	ctx context.Context,
-	tx *gorm.DB,
-	populations []entity.ProjectFlockPopulation,
-	productWarehouseID uint,
-	deliveryProductID uint,
-	consumeQty float64,
-) error {
-	if consumeQty <= 0 {
-		return nil
-	}
-	remaining := consumeQty
-	stockAllocationRepo := commonRepo.NewStockAllocationRepository(tx)
-	for _, population := range populations {
-		available := population.TotalQty - population.TotalUsedQty
-		if available <= 0 {
-			continue
-		}
-		portion := available
-		if remaining < portion {
-			portion = remaining
-		}
-		if portion <= 0 {
-			continue
-		}
-
-		record := &entity.StockAllocation{
-			ProductWarehouseId: productWarehouseID,
-			StockableType:      fifo.StockableKeyProjectFlockPopulation.String(),
-			StockableId:        population.Id,
-			UsableType:         fifo.UsableKeyMarketingDelivery.String(),
-			UsableId:           deliveryProductID,
-			Qty:                portion,
-			Status:             entity.StockAllocationStatusActive,
-			AllocationPurpose:  entity.StockAllocationPurposeConsume,
-		}
-		if err := stockAllocationRepo.CreateOne(ctx, record, nil); err != nil {
-			return err
-		}
-		if err := tx.WithContext(ctx).
-			Model(&entity.ProjectFlockPopulation{}).
-			Where("id = ?", population.Id).
-			Update("total_used_qty", gorm.Expr("total_used_qty + ?", portion)).Error; err != nil {
-			return err
-		}
-
-		remaining -= portion
-		if remaining <= 0.000001 {
-			break
-		}
-	}
-
-	if remaining > 0.000001 {
-		return fiber.NewError(fiber.StatusBadRequest, "Populasi tidak mencukupi")
-	}
-	return nil
-}
-
-func (s deliveryOrdersService) marketingPopulationKandangIDsFromActiveAllocations(
-	ctx context.Context,
-	tx *gorm.DB,
-	deliveryProductID uint,
-) ([]uint, error) {
-	var ids []uint
-	err := tx.WithContext(ctx).
-		Table("stock_allocations sa").
-		Distinct("pc.project_flock_kandang_id").
-		Joins("JOIN project_flock_populations pfp ON pfp.id = sa.stockable_id AND sa.stockable_type = ?", fifo.StockableKeyProjectFlockPopulation.String()).
-		Joins("JOIN project_chickins pc ON pc.id = pfp.project_chickin_id").
-		Where("sa.usable_type = ? AND sa.usable_id = ? AND sa.status = ? AND sa.allocation_purpose = ?",
-			fifo.UsableKeyMarketingDelivery.String(),
-			deliveryProductID,
-			entity.StockAllocationStatusActive,
-			entity.StockAllocationPurposeConsume,
-		).
-		Pluck("pc.project_flock_kandang_id", &ids).Error
-	return ids, err
-}
-
-func (s deliveryOrdersService) resyncPopulationUsageByKandangIDs(ctx context.Context, tx *gorm.DB, kandangIDs []uint) error {
-	for _, kandangID := range uniqueUintIDs(kandangIDs) {
-		if kandangID == 0 {
-			continue
-		}
-		if err := s.ProjectFlockPopulationRepo.WithTx(tx).ResyncUsageByProjectFlockKandangID(ctx, tx, kandangID); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (s deliveryOrdersService) resolveMarketingRequestedUsageQty(ctx context.Context, tx *gorm.DB, deliveryProductID uint) float64 {
-	var usageQty float64
-	if err := tx.WithContext(ctx).
-		Table("marketing_delivery_products").
-		Select("usage_qty").
-		Where("id = ?", deliveryProductID).
-		Scan(&usageQty).Error; err != nil {
-		return 0
-	}
-	return usageQty
-}
-
-func marketingAllocationKandangIDs(rows []marketingPopulationAllocation) []uint {
-	ids := make([]uint, 0, len(rows))
-	for _, row := range rows {
-		ids = append(ids, row.ProjectFlockKandangID)
-	}
-	return ids
-}
-
-func marketingSourceGroupKandangIDs(rows []marketingPopulationSourceGroup) []uint {
-	ids := make([]uint, 0, len(rows))
-	for _, row := range rows {
-		ids = append(ids, row.ProjectFlockKandangID)
-	}
-	return ids
-}
-
-func uniqueUintIDs(ids []uint) []uint {
-	seen := make(map[uint]struct{}, len(ids))
-	result := make([]uint, 0, len(ids))
-	for _, id := range ids {
-		if id == 0 {
-			continue
-		}
-		if _, ok := seen[id]; ok {
-			continue
-		}
-		seen[id] = struct{}{}
-		result = append(result, id)
-	}
-	return result
 }

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

@@ -141,12 +141,6 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
 		if item.ConvertionUnit != nil && !utils.IsValidConvertionUnit(*item.ConvertionUnit) {
 			return nil, fiber.NewError(fiber.StatusBadRequest, "Unit konversi tidak valid")
 		}
-		if item.MarketingType == string(utils.MarketingTypeTelur) &&
-			item.ConvertionUnit != nil &&
-			*item.ConvertionUnit == string(utils.ConvertionUnitPeti) &&
-			(item.WeightPerConvertion == nil || *item.WeightPerConvertion <= 0) {
-			return nil, fiber.NewError(fiber.StatusBadRequest, "weight_per_convertion wajib diisi dan > 0 untuk TELUR dengan convertion_unit PETI")
-		}
 		if err := m.EnsureProductWarehouseAccess(c, s.MarketingRepo.DB(), item.ProductWarehouseId); err != nil {
 			return nil, err
 		}
@@ -314,12 +308,6 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 			if item.ConvertionUnit != nil && !utils.IsValidConvertionUnit(*item.ConvertionUnit) {
 				return nil, fiber.NewError(fiber.StatusBadRequest, "Unit konversi tidak valid")
 			}
-			if item.MarketingType == string(utils.MarketingTypeTelur) &&
-				item.ConvertionUnit != nil &&
-				*item.ConvertionUnit == string(utils.ConvertionUnitPeti) &&
-				(item.WeightPerConvertion == nil || *item.WeightPerConvertion <= 0) {
-				return nil, fiber.NewError(fiber.StatusBadRequest, "weight_per_convertion wajib diisi dan > 0 untuk TELUR dengan convertion_unit PETI")
-			}
 			if err := m.EnsureProductWarehouseAccess(c, s.MarketingRepo.DB(), item.ProductWarehouseId); err != nil {
 				return nil, err
 			}
@@ -398,15 +386,7 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 			for _, rp := range req.MarketingProducts {
 				if old, ok := oldByPW[rp.ProductWarehouseId]; ok {
 
-					totalWeight, totalPrice := s.calculatePriceByMarketingType(
+					totalWeight, totalPrice := s.calculatePriceByMarketingType(rp.MarketingType, rp.Qty, rp.AvgWeight, rp.UnitPrice, rp.Week)
-						rp.MarketingType,
-						rp.Qty,
-						rp.AvgWeight,
-						rp.UnitPrice,
-						rp.Week,
-						rp.ConvertionUnit,
-						rp.WeightPerConvertion,
-					)
 
 					deliveryProduct, err := invDeliveryRepoTx.GetByMarketingProductID(c.Context(), old.Id)
 					if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -770,15 +750,7 @@ func (s salesOrdersService) Approval(c *fiber.Ctx, req *validation.Approve) ([]e
 
 func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Context, marketingId uint, marketingType string, rp validation.CreateMarketingProduct, marketingProductRepo repository.MarketingProductRepository, invDeliveryRepo repository.MarketingDeliveryProductRepository) error {
 
-	totalWeight, totalPrice := s.calculatePriceByMarketingType(
+	totalWeight, totalPrice := s.calculatePriceByMarketingType(marketingType, rp.Qty, rp.AvgWeight, rp.UnitPrice, rp.Week)
-		marketingType,
-		rp.Qty,
-		rp.AvgWeight,
-		rp.UnitPrice,
-		rp.Week,
-		rp.ConvertionUnit,
-		rp.WeightPerConvertion,
-	)
 
 	marketingProduct := &entity.MarketingProduct{
 		MarketingId:         marketingId,
@@ -815,7 +787,7 @@ func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Cont
 	return nil
 }
 
-func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int, convertionUnit *string, _ *float64) (totalWeight, totalPrice float64) {
+func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
 	if marketingType == string(utils.MarketingTypeTrading) {
 		totalWeight = 0
 		totalPrice = math.Round(qty*unitPrice*100) / 100
@@ -824,18 +796,6 @@ func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string,
 		totalPrice = math.Round(unitPrice*float64(*week)*qty*100) / 100
 	} else {
 		totalWeight = math.Round(qty*avgWeight*100) / 100
-
-		if marketingType == string(utils.MarketingTypeTelur) && convertionUnit != nil {
-			switch *convertionUnit {
-			case string(utils.ConvertionUnitQty):
-				totalPrice = math.Round(qty*unitPrice*100) / 100
-				return totalWeight, totalPrice
-			case string(utils.ConvertionUnitPeti):
-				totalPrice = math.Round(totalWeight*unitPrice*100) / 100
-				return totalWeight, totalPrice
-			}
-		}
-
 		totalPrice = math.Round(totalWeight*unitPrice*100) / 100
 	}
 	return totalWeight, totalPrice

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

@@ -1,15 +1,12 @@
 package validation
 
 type DeliveryProduct struct {
-	MarketingProductId  uint     `json:"marketing_product_id" validate:"required,gt=0"`
+	MarketingProductId uint    `json:"marketing_product_id" validate:"required,gt=0"`
-	Qty                 float64  `json:"qty" validate:"omitempty,gte=0"`
+	Qty                float64 `json:"qty" validate:"omitempty,gte=0"`
-	UnitPrice           float64  `json:"unit_price" validate:"omitempty,gte=0"`
+	UnitPrice          float64 `json:"unit_price" validate:"omitempty,gte=0"`
-	AvgWeight           float64  `json:"avg_weight" validate:"omitempty,gte=0"`
+	AvgWeight          float64 `json:"avg_weight" validate:"omitempty,gte=0"`
-	WeightPerConvertion *float64 `json:"weight_per_convertion" validate:"omitempty,gt=0"`
+	DeliveryDate       string  `json:"delivery_date" validate:"omitempty,datetime=2006-01-02"`
-	TotalWeight         *float64 `json:"total_weight" validate:"omitempty,gte=0"`
+	VehicleNumber      string  `json:"vehicle_number" validate:"omitempty,max=50"`
-	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 DeliveryOrderCreate struct {

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

@@ -55,9 +55,9 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
 		db = s.withRelations(db)
 		db, scopeErr = m.ApplyAreaScope(c, db, "id")
 		if params.Search != "" {
-			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
+			return db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
-		return db.Order("name ASC").Order("id ASC")
+		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
 	if scopeErr != nil {

internal/modules/master/customers/controllers/customer.controller.go

@@ -33,14 +33,6 @@ func (u *CustomerController) GetAll(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
 	}
 
-	if hasMarketingParam := c.Query("has_marketing", ""); hasMarketingParam != "" {
-		value, err := strconv.ParseBool(hasMarketingParam)
-		if err != nil {
-			return fiber.NewError(fiber.StatusBadRequest, "invalid has_marketing value")
-		}
-		query.HasMarketing = &value
-	}
-
 	result, totalResults, err := u.CustomerService.GetAll(c, query)
 	if err != nil {
 		return err

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

@@ -53,28 +53,7 @@ func (s customerService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 	customers, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
 		if params.Search != "" {
-			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
+			return db.Where("name ILIKE ?", "%"+params.Search+"%")
-			if params.HasMarketing != nil && *params.HasMarketing {
-				db = db.Where(`
-					EXISTS (
-						SELECT 1
-						FROM marketings
-						WHERE marketings.customer_id = customers.id
-							AND marketings.deleted_at IS NULL
-					)
-				`)
-			}
-			return db
-		}
-		if params.HasMarketing != nil && *params.HasMarketing {
-			db = db.Where(`
-				EXISTS (
-					SELECT 1
-					FROM marketings
-					WHERE marketings.customer_id = customers.id
-						AND marketings.deleted_at IS NULL
-				)
-			`)
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})

internal/modules/master/customers/validations/customer.validation.go

@@ -21,8 +21,7 @@ type Update struct {
 }
 
 type Query struct {
-	Page         int    `query:"page" validate:"omitempty,number,min=1"`
+	Page   int    `query:"page" validate:"omitempty,number,min=1"`
-	Limit        int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
+	Limit  int    `query:"limit" validate:"omitempty,number,min=1,max=100"`
-	Search       string `query:"search" validate:"omitempty,max=50"`
+	Search string `query:"search" validate:"omitempty,max=50"`
-	HasMarketing *bool  `query:"has_marketing" validate:"omitempty"`
 }

internal/modules/master/kandang-groups/repositories/kandang_group.repository.go

@@ -2,7 +2,6 @@ package repository
 
 import (
 	"context"
-	"errors"
 
 	"gorm.io/gorm"
 
@@ -15,7 +14,6 @@ type KandangGroupRepository interface {
 	LocationExists(ctx context.Context, locationId uint) (bool, error)
 	PicExists(ctx context.Context, picId uint) (bool, error)
 	NameExists(ctx context.Context, name string, excludeID *uint) (bool, error)
-	HasDailyChecklistRelation(ctx context.Context, kandangGroupId uint) (bool, error)
 }
 
 type KandangGroupRepositoryImpl struct {
@@ -41,20 +39,3 @@ func (r *KandangGroupRepositoryImpl) PicExists(ctx context.Context, picId uint)
 func (r *KandangGroupRepositoryImpl) NameExists(ctx context.Context, name string, excludeID *uint) (bool, error) {
 	return repository.ExistsByName[entity.KandangGroup](ctx, r.db, name, excludeID)
 }
-
-func (r *KandangGroupRepositoryImpl) HasDailyChecklistRelation(ctx context.Context, kandangGroupId uint) (bool, error) {
-	var marker int
-	err := r.db.WithContext(ctx).
-		Model(&entity.DailyChecklist{}).
-		Select("1").
-		Where("kandang_id = ?", kandangGroupId).
-		Limit(1).
-		Take(&marker).Error
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return false, nil
-	}
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}

internal/modules/master/kandang-groups/services/kandang_group.service.go

@@ -226,16 +226,6 @@ func (s kandangGroupService) DeleteOne(c *fiber.Ctx, id uint) error {
 	if err != nil {
 		return err
 	}
-
-	hasDailyChecklistRelation, err := s.Repository.HasDailyChecklistRelation(c.Context(), id)
-	if err != nil {
-		s.Log.Errorf("Failed to check daily checklist relation for kandang group %d: %+v", id, err)
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to check kandang group relation")
-	}
-	if hasDailyChecklistRelation {
-		return fiber.NewError(fiber.StatusConflict, "Kandang group tidak boleh dihapus karena masih memiliki relasi daily checklist")
-	}
-
 	if len(kandangGroup.Kandangs) > 0 {
 		return fiber.NewError(fiber.StatusConflict, "Kandang group tidak boleh dihapus karena masih memiliki relasi kandang")
 	}

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

@@ -71,7 +71,7 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
 				)
 			`, utils.ProjectFlockCategoryLaying)
 		}
-		return db.Order("locations.name ASC").Order("locations.id ASC")
+		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
 
 	if scopeErr != nil {

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

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/production-standards/repositories"
@@ -344,22 +343,17 @@ func (s productionStandardService) EnsureWeekStart(ctx context.Context, standard
 		return nil
 	}
 
-	layingWeekStart := config.LayingWeekStart()
-
 	switch strings.ToUpper(category) {
 	case string(utils.ProjectFlockCategoryLaying):
 		details, err := s.ProductionStandardDetailRepo.GetByProductionStandardID(ctx, standardID)
 		if err != nil {
 			return err
 		}
-		if len(details) == 0 {
+		startWeek := 0
-			return fiber.NewError(
+		if len(details) > 0 {
-				fiber.StatusBadRequest,
+			startWeek = details[0].Week
-				"Standart production tidak tersedia untuk kategori laying",
-			)
 		}
-		startWeek := details[0].Week
+		if startWeek != 18 {
-		if startWeek > layingWeekStart {
 			return fiber.NewError(fiber.StatusBadRequest, "Week tidak sesuai dengan standart kategori project flock")
 		}
 	case string(utils.ProjectFlockCategoryGrowing):
@@ -367,13 +361,10 @@ func (s productionStandardService) EnsureWeekStart(ctx context.Context, standard
 		if err != nil {
 			return err
 		}
-		if len(details) == 0 {
+		startWeek := 0
-			return fiber.NewError(
+		if len(details) > 0 {
-				fiber.StatusBadRequest,
+			startWeek = details[0].Week
-				"Standart production tidak tersedia untuk kategori growing",
-			)
 		}
-		startWeek := details[0].Week
 		if startWeek != 1 {
 			return fiber.NewError(fiber.StatusBadRequest, "Week tidak sesuai dengan standart kategori project flock")
 		}
@@ -390,7 +381,7 @@ func (s productionStandardService) EnsureWeekAvailable(ctx context.Context, stan
 	upperCategory := strings.ToUpper(category)
 	weekBase := 1
 	if upperCategory == string(utils.ProjectFlockCategoryLaying) {
-		weekBase = config.LayingWeekStart()
+		weekBase = 18
 	}
 	week := ((day - 1) / 7) + weekBase
 	if week <= 0 {

internal/modules/master/products/services/product.service.go

@@ -229,17 +229,9 @@ func (s productService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 
 	products, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
-
-		includeAll := params.IncludeAll != nil && *params.IncludeAll
-		if params.IsDepletion != nil && *params.IsDepletion {
-			// Auto-expand visibility for depletion catalog so FE doesn't need include_all=true.
-			includeAll = true
-		}
-
 		// Default: show only visible products.
 		// include_all=true can be used to fetch all records (including hidden/system products).
-		// is_depletion, when provided, is composed as an additional flag filter.
+		if params.IncludeAll == nil || !*params.IncludeAll {
-		if !includeAll {
 			db = db.Where("is_visible = ?", true)
 		}
 		if params.Search != "" {

internal/modules/master/suppliers/dto/supplier_product.dto.go

@@ -30,9 +30,6 @@ func toSupplierProductDTOs(relations []entity.ProductSupplier) []SupplierProduct
 		if product.Id == 0 {
 			continue
 		}
-		if len(product.Flags) == 0 {
-			continue
-		}
 
 		flags := make([]string, len(product.Flags))
 		for i, f := range product.Flags {

internal/modules/master/warehouses/repositories/warehouse.repository.go

@@ -16,7 +16,6 @@ type WarehouseRepository interface {
 	NameExists(ctx context.Context, name string, excludeID *uint) (bool, error)
 	IdExists(ctx context.Context, id uint) (bool, error)
 	GetByKandangID(ctx context.Context, kandangId uint) (*entity.Warehouse, error)
-	GetByKandangIDAndLocationID(ctx context.Context, kandangId uint, locationId uint) (*entity.Warehouse, error)
 	GetLatestByKandangID(ctx context.Context, kandangId uint) (*entity.Warehouse, error)
 }
 
@@ -63,20 +62,6 @@ func (r *WarehouseRepositoryImpl) GetByKandangID(ctx context.Context, kandangId
 	return &warehouse, nil
 }
 
-func (r *WarehouseRepositoryImpl) GetByKandangIDAndLocationID(ctx context.Context, kandangId uint, locationId uint) (*entity.Warehouse, error) {
-	var warehouse entity.Warehouse
-	err := r.db.WithContext(ctx).
-		Where("kandang_id = ?", kandangId).
-		Where("location_id = ?", locationId).
-		Where("deleted_at IS NULL").
-		Order("id ASC").
-		First(&warehouse).Error
-	if err != nil {
-		return nil, err
-	}
-	return &warehouse, nil
-}
-
 func (r *WarehouseRepositoryImpl) GetLatestByKandangID(ctx context.Context, kandangId uint) (*entity.Warehouse, error) {
 	var warehouse entity.Warehouse
 	err := r.db.WithContext(ctx).

internal/modules/master/warehouses/repositories/warehouse.repository_test.go

@@ -1,63 +0,0 @@
-package repository
-
-import (
-	"context"
-	"testing"
-
-	"github.com/glebarez/sqlite"
-	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-	"gorm.io/gorm"
-)
-
-func TestGetByKandangIDAndLocationIDReturnsLocationMatchedWarehouse(t *testing.T) {
-	db := setupWarehouseRepositoryTestDB(t)
-	repo := NewWarehouseRepository(db)
-
-	warehouse, err := repo.GetByKandangIDAndLocationID(context.Background(), 5, 13)
-	if err != nil {
-		t.Fatalf("expected location-matched warehouse, got error: %v", err)
-	}
-	if warehouse.Id != 33 {
-		t.Fatalf("expected warehouse 33, got %d", warehouse.Id)
-	}
-}
-
-func TestGetByKandangIDKeepsLegacyFirstWarehouseBehavior(t *testing.T) {
-	db := setupWarehouseRepositoryTestDB(t)
-	repo := NewWarehouseRepository(db)
-
-	warehouse, err := repo.GetByKandangID(context.Background(), 5)
-	if err != nil {
-		t.Fatalf("expected warehouse, got error: %v", err)
-	}
-	if warehouse.Id != 17 {
-		t.Fatalf("expected legacy first warehouse 17, got %d", warehouse.Id)
-	}
-}
-
-func setupWarehouseRepositoryTestDB(t *testing.T) *gorm.DB {
-	t.Helper()
-
-	db, err := gorm.Open(sqlite.Open("file:"+t.Name()+"?mode=memory&cache=private"), &gorm.Config{})
-	if err != nil {
-		t.Fatalf("failed opening sqlite db: %v", err)
-	}
-
-	if err := db.AutoMigrate(&entity.Warehouse{}); err != nil {
-		t.Fatalf("failed migrating warehouses: %v", err)
-	}
-
-	warehouses := []entity.Warehouse{
-		{Id: 17, Name: "Cijangkar 1", Type: "KANDANG", AreaId: 1, LocationId: uintPtr(1), KandangId: uintPtr(5), CreatedBy: 1},
-		{Id: 33, Name: "Gudang Cijangkar 1", Type: "KANDANG", AreaId: 1, LocationId: uintPtr(13), KandangId: uintPtr(5), CreatedBy: 1},
-	}
-	if err := db.Create(&warehouses).Error; err != nil {
-		t.Fatalf("failed seeding warehouses: %v", err)
-	}
-
-	return db
-}
-
-func uintPtr(v uint) *uint {
-	return &v
-}

internal/modules/production/chickins/controllers/chickin.controller.go

@@ -151,25 +151,25 @@ func (u *ChickinController) GetOne(c *fiber.Ctx) error {
 // 		})
 // }
 
-func (u *ChickinController) DeleteOne(c *fiber.Ctx) error {
+// func (u *ChickinController) DeleteOne(c *fiber.Ctx) error {
-	param := c.Params("id")
+// 	param := c.Params("id")
 
-	id, err := strconv.Atoi(param)
+// 	id, err := strconv.Atoi(param)
-	if err != nil {
+// 	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+// 		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
-	}
+// 	}
 
-	if err := u.ChickinService.DeleteOne(c, uint(id)); err != nil {
+// 	if err := u.ChickinService.DeleteOne(c, uint(id)); err != nil {
-		return err
+// 		return err
-	}
+// 	}
 
-	return c.Status(fiber.StatusOK).
+// 	return c.Status(fiber.StatusOK).
-		JSON(response.Common{
+// 		JSON(response.Common{
-			Code:    fiber.StatusOK,
+// 			Code:    fiber.StatusOK,
-			Status:  "success",
+// 			Status:  "success",
-			Message: "Delete chickin successfully",
+// 			Message: "Delete chickin successfully",
-		})
+// 		})
-}
+// }
 
 func (u *ChickinController) Approval(c *fiber.Ctx) error {
 	req := new(validation.Approve)

internal/modules/production/chickins/dto/chickin.dto.go

@@ -3,7 +3,6 @@ package dto
 import (
 	"time"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/config"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	areaRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/areas/dto"
 	flockRelationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
@@ -36,13 +35,13 @@ type ChickinRelationDTO struct {
 }
 
 type ProjectFlockDTO struct {
-	Id          uint                                     `json:"id"`
+	Id       uint                                     `json:"id"`
-	Period      int                                      `json:"period"`
+	Period   int                                      `json:"period"`
-	Category    string                                   `json:"category"`
+	Category string                                   `json:"category"`
-	Flock       *flockRelationDTO.FlockRelationDTO       `json:"flock"`
+	Flock    *flockRelationDTO.FlockRelationDTO       `json:"flock"`
-	Area        *areaRelationDTO.AreaRelationDTO         `json:"area"`
+	Area     *areaRelationDTO.AreaRelationDTO         `json:"area"`
-	StandardFcr *float64                                 `json:"standard_fcr"`
+	StandardFcr *float64                              `json:"standard_fcr"`
-	Location    *locationRelationDTO.LocationRelationDTO `json:"location"`
+	Location *locationRelationDTO.LocationRelationDTO `json:"location"`
 }
 
 type ProjectFlockKandangDTO struct {
@@ -124,13 +123,13 @@ func ToProjectFlockDTO(pfk entity.ProjectFlockKandang) ProjectFlockDTO {
 		location = &mapped
 	}
 	return ProjectFlockDTO{
-		Id:          e.Id,
+		Id:       e.Id,
-		Period:      pfk.Period,
+		Period:   pfk.Period,
-		Category:    e.Category,
+		Category: e.Category,
-		Flock:       flock,
+		Flock:    flock,
-		Area:        area,
+		Area:     area,
 		StandardFcr: resolveProjectFlockStandardFcr(e),
-		Location:    location,
+		Location: location,
 	}
 }
 
@@ -220,7 +219,7 @@ func resolveProjectFlockStandardFcr(e entity.ProjectFlock) *float64 {
 	}
 	week := 1
 	if e.Category == string(utils.ProjectFlockCategoryLaying) {
-		week = config.LayingWeekStart()
+		week = 18
 	}
 	for _, detail := range e.ProductionStandard.ProductionStandardDetails {
 		if detail.Week == week && detail.StandardFCR != nil {

internal/modules/production/chickins/route.go

@@ -19,6 +19,6 @@ func ChickinRoutes(v1 fiber.Router, u user.UserService, s chickin.ChickinService
 	route.Post("/",m.RequirePermissions(m.P_ChickinsCreateOne), ctrl.CreateOne)
 	route.Get("/:id",m.RequirePermissions(m.P_ChickinsGetOne), ctrl.GetOne)
 	// route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	// route.Delete("/:id", ctrl.DeleteOne)
 	route.Post("/approvals",m.RequirePermissions(m.P_ChickinsApproval), ctrl.Approval)
 }