add command normalize data seed standar and price adjustment stocks

[FIX][BE]: adjust validation limit recording

See merge request mbugroup/lti-api!421

cmd/api-key/main.go

@@ -0,0 +1,132 @@
+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,12 +9,14 @@ 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"
 
@@ -131,6 +133,7 @@ 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)
@@ -169,6 +172,8 @@ 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

@@ -0,0 +1,74 @@
+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/import-adjustment-stock-prices/main.go

@@ -0,0 +1,587 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/xuri/excelize/v2"
+	"gitlab.com/mbugroup/lti-api.git/internal/config"
+	"gitlab.com/mbugroup/lti-api.git/internal/database"
+	"gorm.io/gorm"
+)
+
+type importOptions struct {
+	FilePath string
+	Sheet    string
+	Apply    bool
+}
+
+type headerIndexes struct {
+	AdjustmentID int
+	Weight       int
+}
+
+type adjustmentPriceImportRow struct {
+	RowNumber    int
+	AdjustmentID uint
+	Weight       float64
+}
+
+type validationIssue struct {
+	Row     int
+	Field   string
+	Message string
+}
+
+func (i validationIssue) Error() string {
+	if i.Row > 0 {
+		return fmt.Sprintf("row=%d field=%s message=%s", i.Row, i.Field, i.Message)
+	}
+	return fmt.Sprintf("field=%s message=%s", i.Field, i.Message)
+}
+
+type adjustmentResolver interface {
+	ResolveExistingAdjustmentIDs(ctx context.Context, adjustmentIDs []uint) (map[uint]struct{}, error)
+}
+
+type dbAdjustmentResolver struct {
+	db *gorm.DB
+}
+
+type adjustmentPriceStore interface {
+	UpdatePrice(ctx context.Context, adjustmentID uint, price float64) (bool, error)
+}
+
+type txRunner interface {
+	InTx(ctx context.Context, fn func(store adjustmentPriceStore) error) error
+}
+
+type dbTxRunner struct {
+	db *gorm.DB
+}
+
+type dbAdjustmentPriceStore struct {
+	db *gorm.DB
+}
+
+type applyRowResult struct {
+	RowNumber    int
+	AdjustmentID uint
+	Price        float64
+	Changed      bool
+}
+
+func main() {
+	var opts importOptions
+	flag.StringVar(&opts.FilePath, "file", "", "Path to .xlsx file (required)")
+	flag.StringVar(&opts.Sheet, "sheet", "", "Sheet name (optional, default: first sheet)")
+	flag.BoolVar(&opts.Apply, "apply", false, "Apply changes. If false, run as dry-run")
+	flag.Parse()
+
+	opts.FilePath = strings.TrimSpace(opts.FilePath)
+	opts.Sheet = strings.TrimSpace(opts.Sheet)
+
+	if opts.FilePath == "" {
+		log.Fatal("--file is required")
+	}
+
+	sheetName, rows, parseIssues, err := parseAdjustmentPriceFile(opts.FilePath, opts.Sheet)
+	if err != nil {
+		log.Fatalf("failed reading excel: %v", err)
+	}
+
+	ctx := context.Background()
+	db := database.Connect(config.DBHost, config.DBName)
+	resolver := dbAdjustmentResolver{db: db}
+
+	existingAdjustmentIDs, err := resolver.ResolveExistingAdjustmentIDs(ctx, collectAdjustmentIDs(rows))
+	if err != nil {
+		log.Fatalf("failed checking adjustment_id against adjustment_stocks: %v", err)
+	}
+
+	processableRows, skippedRows := splitRowsByExistingIDs(rows, existingAdjustmentIDs)
+	issues := append([]validationIssue{}, parseIssues...)
+	sortValidationIssues(issues)
+
+	fmt.Printf("Mode: %s\n", modeLabel(opts.Apply))
+	fmt.Printf("File: %s\n", opts.FilePath)
+	fmt.Printf("Sheet: %s\n", sheetName)
+	fmt.Printf("Rows parsed: %d\n", len(rows))
+	fmt.Printf("Rows invalid: %d\n", len(issues))
+	fmt.Printf("Rows processable: %d\n", len(processableRows))
+	fmt.Printf("Rows skipped_missing: %d\n", len(skippedRows))
+	fmt.Println()
+
+	if len(processableRows) > 0 {
+		printPlanRows(processableRows)
+	}
+	if len(skippedRows) > 0 {
+		printSkippedRows(skippedRows)
+	}
+	if len(processableRows) > 0 || len(skippedRows) > 0 {
+		fmt.Println()
+	}
+
+	if len(issues) > 0 {
+		fmt.Println("Validation errors:")
+		for _, issue := range issues {
+			fmt.Printf("ERROR %s\n", issue.Error())
+		}
+		fmt.Println()
+		fmt.Printf(
+			"Summary: planned=%d processable=%d skipped_missing=%d applied=0 failed=%d\n",
+			len(rows),
+			len(processableRows),
+			len(skippedRows),
+			len(issues),
+		)
+		os.Exit(1)
+	}
+
+	if !opts.Apply {
+		fmt.Printf(
+			"Summary: planned=%d processable=%d skipped_missing=%d applied=0 failed=0\n",
+			len(rows),
+			len(processableRows),
+			len(skippedRows),
+		)
+		return
+	}
+
+	results, err := applyIfRequested(ctx, true, dbTxRunner{db: db}, processableRows)
+	if err != nil {
+		log.Fatalf("apply failed: %v", err)
+	}
+
+	for _, result := range results {
+		fmt.Printf(
+			"DONE row=%d adjustment_id=%d price=%.3f status=%s\n",
+			result.RowNumber,
+			result.AdjustmentID,
+			result.Price,
+			applyStatus(result.Changed),
+		)
+	}
+
+	appliedCount := countChangedRows(results)
+	if len(results) > 0 {
+		fmt.Println()
+	}
+	fmt.Printf(
+		"Summary: planned=%d processable=%d skipped_missing=%d applied=%d failed=0\n",
+		len(rows),
+		len(processableRows),
+		len(skippedRows),
+		appliedCount,
+	)
+}
+
+func parseAdjustmentPriceFile(
+	filePath string,
+	requestedSheet string,
+) (string, []adjustmentPriceImportRow, []validationIssue, error) {
+	workbook, err := excelize.OpenFile(filePath)
+	if err != nil {
+		return "", nil, nil, err
+	}
+	defer func() {
+		_ = workbook.Close()
+	}()
+
+	sheetName, err := resolveSheetName(workbook, requestedSheet)
+	if err != nil {
+		return "", nil, nil, err
+	}
+
+	allRows, err := workbook.GetRows(sheetName, excelize.Options{RawCellValue: true})
+	if err != nil {
+		return "", nil, nil, err
+	}
+	if len(allRows) == 0 {
+		return sheetName, nil, []validationIssue{{Field: "header", Message: "sheet is empty"}}, nil
+	}
+
+	indexes, headerIssues := parseHeaderIndexes(allRows[0])
+	if len(headerIssues) > 0 {
+		return sheetName, nil, headerIssues, nil
+	}
+
+	rowsByAdjustmentID := make(map[uint]adjustmentPriceImportRow)
+	issues := make([]validationIssue, 0)
+
+	for idx := 1; idx < len(allRows); idx++ {
+		rowNumber := idx + 1
+		rawRow := allRows[idx]
+
+		if isRowEmpty(rawRow) {
+			continue
+		}
+
+		parsed, rowIssues := parseDataRow(rawRow, rowNumber, indexes)
+		if len(rowIssues) > 0 {
+			issues = append(issues, rowIssues...)
+			continue
+		}
+
+		rowsByAdjustmentID[parsed.AdjustmentID] = *parsed
+	}
+
+	rows := make([]adjustmentPriceImportRow, 0, len(rowsByAdjustmentID))
+	for _, row := range rowsByAdjustmentID {
+		rows = append(rows, row)
+	}
+	sort.Slice(rows, func(i, j int) bool {
+		return rows[i].RowNumber < rows[j].RowNumber
+	})
+
+	if len(rows) == 0 && len(issues) == 0 {
+		issues = append(issues, validationIssue{Field: "rows", Message: "no data rows found"})
+	}
+
+	return sheetName, rows, issues, nil
+}
+
+func resolveSheetName(workbook *excelize.File, requestedSheet string) (string, error) {
+	if workbook == nil {
+		return "", fmt.Errorf("workbook is nil")
+	}
+
+	sheets := workbook.GetSheetList()
+	if len(sheets) == 0 {
+		return "", fmt.Errorf("workbook has no sheets")
+	}
+
+	if requestedSheet == "" {
+		return sheets[0], nil
+	}
+
+	for _, sheet := range sheets {
+		if strings.EqualFold(strings.TrimSpace(sheet), strings.TrimSpace(requestedSheet)) {
+			return sheet, nil
+		}
+	}
+
+	return "", fmt.Errorf("sheet %q not found", requestedSheet)
+}
+
+func parseHeaderIndexes(headerRow []string) (headerIndexes, []validationIssue) {
+	indexes := headerIndexes{AdjustmentID: -1, Weight: -1}
+	issues := make([]validationIssue, 0)
+
+	for idx, raw := range headerRow {
+		header := normalizeHeader(raw)
+		if header == "" {
+			continue
+		}
+
+		switch header {
+		case "adjustment_id":
+			if indexes.AdjustmentID >= 0 {
+				issues = append(issues, validationIssue{Field: "header", Message: "duplicate header adjustment_id"})
+			}
+			indexes.AdjustmentID = idx
+		case "weight":
+			if indexes.Weight >= 0 {
+				issues = append(issues, validationIssue{Field: "header", Message: "duplicate header weight"})
+			}
+			indexes.Weight = idx
+		}
+	}
+
+	if indexes.AdjustmentID < 0 {
+		issues = append(issues, validationIssue{Field: "adjustment_id", Message: "required header is missing"})
+	}
+	if indexes.Weight < 0 {
+		issues = append(issues, validationIssue{Field: "weight", Message: "required header is missing"})
+	}
+
+	return indexes, issues
+}
+
+func parseDataRow(
+	rawRow []string,
+	rowNumber int,
+	indexes headerIndexes,
+) (*adjustmentPriceImportRow, []validationIssue) {
+	issues := make([]validationIssue, 0)
+
+	adjustmentIDRaw := strings.TrimSpace(cellValue(rawRow, indexes.AdjustmentID))
+	adjustmentID, err := parsePositiveUint(adjustmentIDRaw)
+	if err != nil {
+		issues = append(issues, validationIssue{Row: rowNumber, Field: "adjustment_id", Message: err.Error()})
+	}
+
+	weightRaw := strings.TrimSpace(cellValue(rawRow, indexes.Weight))
+	weight, err := parseNonNegativeFloat(weightRaw)
+	if err != nil {
+		issues = append(issues, validationIssue{Row: rowNumber, Field: "weight", Message: err.Error()})
+	}
+
+	if len(issues) > 0 {
+		return nil, issues
+	}
+
+	return &adjustmentPriceImportRow{
+		RowNumber:    rowNumber,
+		AdjustmentID: adjustmentID,
+		Weight:       weight,
+	}, nil
+}
+
+func parsePositiveUint(raw string) (uint, error) {
+	if raw == "" {
+		return 0, fmt.Errorf("is required")
+	}
+
+	uintValue, err := strconv.ParseUint(raw, 10, 64)
+	if err == nil {
+		if uintValue == 0 {
+			return 0, fmt.Errorf("must be greater than 0")
+		}
+		return uint(uintValue), nil
+	}
+
+	floatValue, floatErr := strconv.ParseFloat(raw, 64)
+	if floatErr != nil {
+		return 0, fmt.Errorf("must be a positive integer")
+	}
+	if floatValue <= 0 {
+		return 0, fmt.Errorf("must be greater than 0")
+	}
+	if floatValue != float64(uint(floatValue)) {
+		return 0, fmt.Errorf("must be a positive integer")
+	}
+
+	return uint(floatValue), nil
+}
+
+func parseNonNegativeFloat(raw string) (float64, error) {
+	if raw == "" {
+		return 0, fmt.Errorf("is required")
+	}
+
+	value, err := strconv.ParseFloat(raw, 64)
+	if err != nil {
+		return 0, fmt.Errorf("must be numeric")
+	}
+	if value < 0 {
+		return 0, fmt.Errorf("must be greater than or equal to 0")
+	}
+
+	return value, nil
+}
+
+func isRowEmpty(row []string) bool {
+	for _, cell := range row {
+		if strings.TrimSpace(cell) != "" {
+			return false
+		}
+	}
+	return true
+}
+
+func normalizeHeader(raw string) string {
+	return strings.ToLower(strings.TrimSpace(raw))
+}
+
+func cellValue(row []string, index int) string {
+	if index < 0 || index >= len(row) {
+		return ""
+	}
+	return row[index]
+}
+
+func collectAdjustmentIDs(rows []adjustmentPriceImportRow) []uint {
+	ids := make([]uint, 0, len(rows))
+	seen := make(map[uint]struct{}, len(rows))
+	for _, row := range rows {
+		if row.AdjustmentID == 0 {
+			continue
+		}
+		if _, exists := seen[row.AdjustmentID]; exists {
+			continue
+		}
+		seen[row.AdjustmentID] = struct{}{}
+		ids = append(ids, row.AdjustmentID)
+	}
+	sort.Slice(ids, func(i, j int) bool {
+		return ids[i] < ids[j]
+	})
+	return ids
+}
+
+func (r dbAdjustmentResolver) ResolveExistingAdjustmentIDs(
+	ctx context.Context,
+	adjustmentIDs []uint,
+) (map[uint]struct{}, error) {
+	result := make(map[uint]struct{})
+	if len(adjustmentIDs) == 0 {
+		return result, nil
+	}
+
+	type adjustmentIDRow struct {
+		ID uint `gorm:"column:id"`
+	}
+
+	rows := make([]adjustmentIDRow, 0, len(adjustmentIDs))
+	if err := r.db.WithContext(ctx).
+		Table("adjustment_stocks").
+		Select("id").
+		Where("id IN ?", adjustmentIDs).
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	for _, row := range rows {
+		result[row.ID] = struct{}{}
+	}
+
+	return result, nil
+}
+
+func splitRowsByExistingIDs(
+	rows []adjustmentPriceImportRow,
+	existing map[uint]struct{},
+) ([]adjustmentPriceImportRow, []adjustmentPriceImportRow) {
+	processable := make([]adjustmentPriceImportRow, 0, len(rows))
+	skipped := make([]adjustmentPriceImportRow, 0)
+
+	for _, row := range rows {
+		if _, exists := existing[row.AdjustmentID]; exists {
+			processable = append(processable, row)
+			continue
+		}
+		skipped = append(skipped, row)
+	}
+
+	return processable, skipped
+}
+
+func printPlanRows(rows []adjustmentPriceImportRow) {
+	for _, row := range rows {
+		fmt.Printf(
+			"PLAN row=%d adjustment_id=%d price=%.3f\n",
+			row.RowNumber,
+			row.AdjustmentID,
+			row.Weight,
+		)
+	}
+}
+
+func printSkippedRows(rows []adjustmentPriceImportRow) {
+	for _, row := range rows {
+		fmt.Printf(
+			"SKIP row=%d adjustment_id=%d reason=adjustment_id not found\n",
+			row.RowNumber,
+			row.AdjustmentID,
+		)
+	}
+}
+
+func sortValidationIssues(issues []validationIssue) {
+	sort.Slice(issues, func(i, j int) bool {
+		if issues[i].Row == issues[j].Row {
+			if issues[i].Field == issues[j].Field {
+				return issues[i].Message < issues[j].Message
+			}
+			return issues[i].Field < issues[j].Field
+		}
+		return issues[i].Row < issues[j].Row
+	})
+}
+
+func applyIfRequested(
+	ctx context.Context,
+	apply bool,
+	runner txRunner,
+	rows []adjustmentPriceImportRow,
+) ([]applyRowResult, error) {
+	if !apply || len(rows) == 0 {
+		return nil, nil
+	}
+	return applyImportRows(ctx, runner, rows)
+}
+
+func applyImportRows(
+	ctx context.Context,
+	runner txRunner,
+	rows []adjustmentPriceImportRow,
+) ([]applyRowResult, error) {
+	results := make([]applyRowResult, 0, len(rows))
+
+	err := runner.InTx(ctx, func(store adjustmentPriceStore) error {
+		for _, row := range rows {
+			changed, err := store.UpdatePrice(ctx, row.AdjustmentID, row.Weight)
+			if err != nil {
+				return fmt.Errorf("row %d adjustment_id=%d update failed: %w", row.RowNumber, row.AdjustmentID, err)
+			}
+
+			results = append(results, applyRowResult{
+				RowNumber:    row.RowNumber,
+				AdjustmentID: row.AdjustmentID,
+				Price:        row.Weight,
+				Changed:      changed,
+			})
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return results, nil
+}
+
+func (r dbTxRunner) InTx(ctx context.Context, fn func(store adjustmentPriceStore) error) error {
+	return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		return fn(dbAdjustmentPriceStore{db: tx})
+	})
+}
+
+func (s dbAdjustmentPriceStore) UpdatePrice(
+	ctx context.Context,
+	adjustmentID uint,
+	price float64,
+) (bool, error) {
+	result := s.db.WithContext(ctx).Exec(`
+		UPDATE adjustment_stocks
+		SET price = ?,
+		    updated_at = NOW()
+		WHERE id = ?
+		  AND price IS DISTINCT FROM ?
+	`, price, adjustmentID, price)
+	if result.Error != nil {
+		return false, result.Error
+	}
+	return result.RowsAffected > 0, nil
+}
+
+func modeLabel(apply bool) string {
+	if apply {
+		return "APPLY"
+	}
+	return "DRY-RUN"
+}
+
+func applyStatus(changed bool) string {
+	if changed {
+		return "UPDATED"
+	}
+	return "UNCHANGED"
+}
+
+func countChangedRows(results []applyRowResult) int {
+	count := 0
+	for _, result := range results {
+		if result.Changed {
+			count++
+		}
+	}
+	return count
+}

cmd/import-adjustment-stock-prices/main_test.go

@@ -0,0 +1,362 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/xuri/excelize/v2"
+)
+
+func TestParseAdjustmentPriceFile_ValidSingleRow(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"adjustment_prices",
+		[]string{"adjustment_id", "weight"},
+		[][]string{{"101", "12.345"}},
+	)
+
+	sheet, rows, issues, err := parseAdjustmentPriceFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if sheet != "adjustment_prices" {
+		t.Fatalf("expected selected sheet adjustment_prices, got %q", sheet)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	if rows[0].AdjustmentID != 101 {
+		t.Fatalf("expected adjustment_id 101, got %d", rows[0].AdjustmentID)
+	}
+	if rows[0].Weight != 12.345 {
+		t.Fatalf("expected weight 12.345, got %v", rows[0].Weight)
+	}
+}
+
+func TestParseAdjustmentPriceFile_ValidMultiRow(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"adjustment_prices",
+		[]string{" Adjustment_ID ", "WEIGHT"},
+		[][]string{{"101", "10"}, {"102", "11.5"}},
+	)
+
+	_, rows, issues, err := parseAdjustmentPriceFile(filePath, "adjustment_prices")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 2 {
+		t.Fatalf("expected 2 rows, got %d", len(rows))
+	}
+}
+
+func TestParseAdjustmentPriceFile_MissingRequiredHeader(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"adjustment_prices",
+		[]string{"adjustment_id", "price"},
+		[][]string{{"101", "12"}},
+	)
+
+	_, rows, issues, err := parseAdjustmentPriceFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected 0 parsed rows when header invalid, got %d", len(rows))
+	}
+	if !hasIssue(issues, 0, "weight", "required header is missing") {
+		t.Fatalf("expected missing weight header issue, got %+v", issues)
+	}
+}
+
+func TestParseAdjustmentPriceFile_InvalidAdjustmentID(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"adjustment_prices",
+		[]string{"adjustment_id", "weight"},
+		[][]string{{"abc", "10"}, {"0", "12"}},
+	)
+
+	_, rows, issues, err := parseAdjustmentPriceFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected no valid rows, got %d", len(rows))
+	}
+	if !hasIssue(issues, 2, "adjustment_id", "must be a positive integer") {
+		t.Fatalf("expected non numeric adjustment_id issue, got %+v", issues)
+	}
+	if !hasIssue(issues, 3, "adjustment_id", "must be greater than 0") {
+		t.Fatalf("expected adjustment_id >0 issue, got %+v", issues)
+	}
+}
+
+func TestParseAdjustmentPriceFile_InvalidWeight(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"adjustment_prices",
+		[]string{"adjustment_id", "weight"},
+		[][]string{{"101", "abc"}, {"102", "-1"}},
+	)
+
+	_, rows, issues, err := parseAdjustmentPriceFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected no valid rows, got %d", len(rows))
+	}
+	if !hasIssue(issues, 2, "weight", "must be numeric") {
+		t.Fatalf("expected weight numeric issue, got %+v", issues)
+	}
+	if !hasIssue(issues, 3, "weight", "must be greater than or equal to 0") {
+		t.Fatalf("expected weight >=0 issue, got %+v", issues)
+	}
+}
+
+func TestParseAdjustmentPriceFile_DuplicateAdjustmentID_LastRowWins(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"adjustment_prices",
+		[]string{"adjustment_id", "weight"},
+		[][]string{{"101", "10"}, {"102", "20"}, {"101", "30"}},
+	)
+
+	_, rows, issues, err := parseAdjustmentPriceFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 2 {
+		t.Fatalf("expected 2 deduped rows, got %d", len(rows))
+	}
+
+	row101, ok := findRowByAdjustmentID(rows, 101)
+	if !ok {
+		t.Fatalf("expected adjustment_id 101 to exist, got %+v", rows)
+	}
+	if row101.Weight != 30 {
+		t.Fatalf("expected duplicate adjustment_id to keep last weight 30, got %v", row101.Weight)
+	}
+	if row101.RowNumber != 4 {
+		t.Fatalf("expected duplicate adjustment_id to keep last row number 4, got %d", row101.RowNumber)
+	}
+}
+
+func TestSplitRowsByExistingIDs_SkipMissing(t *testing.T) {
+	rows := []adjustmentPriceImportRow{
+		{RowNumber: 2, AdjustmentID: 101, Weight: 10},
+		{RowNumber: 3, AdjustmentID: 102, Weight: 11},
+		{RowNumber: 4, AdjustmentID: 103, Weight: 12},
+	}
+	existing := map[uint]struct{}{101: {}, 103: {}}
+
+	processable, skipped := splitRowsByExistingIDs(rows, existing)
+	if len(processable) != 2 {
+		t.Fatalf("expected 2 processable rows, got %d", len(processable))
+	}
+	if len(skipped) != 1 {
+		t.Fatalf("expected 1 skipped row, got %d", len(skipped))
+	}
+	if skipped[0].AdjustmentID != 102 {
+		t.Fatalf("expected adjustment_id 102 skipped, got %+v", skipped)
+	}
+}
+
+func TestApplyIfRequested_DryRunDoesNotWrite(t *testing.T) {
+	runner := &fakeTransactionRunner{}
+	rows := []adjustmentPriceImportRow{{RowNumber: 2, AdjustmentID: 101, Weight: 10}}
+
+	results, err := applyIfRequested(context.Background(), false, runner, rows)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if results != nil {
+		t.Fatalf("expected nil results on dry-run, got %+v", results)
+	}
+	if runner.txCalls != 0 {
+		t.Fatalf("expected no transaction call during dry-run, got %d", runner.txCalls)
+	}
+}
+
+func TestApplyImportRows_Success(t *testing.T) {
+	runner := &fakeTransactionRunner{
+		changedByID: map[uint]bool{101: true, 102: false},
+	}
+	rows := []adjustmentPriceImportRow{
+		{RowNumber: 2, AdjustmentID: 101, Weight: 10},
+		{RowNumber: 3, AdjustmentID: 102, Weight: 11},
+	}
+
+	results, err := applyImportRows(context.Background(), runner, rows)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if runner.txCalls != 1 {
+		t.Fatalf("expected 1 transaction call, got %d", runner.txCalls)
+	}
+	if len(runner.committedCalls) != 2 {
+		t.Fatalf("expected 2 committed updates, got %d", len(runner.committedCalls))
+	}
+	if len(results) != 2 {
+		t.Fatalf("expected 2 row results, got %d", len(results))
+	}
+	if !results[0].Changed || results[1].Changed {
+		t.Fatalf("unexpected changed flags: %+v", results)
+	}
+}
+
+func TestApplyImportRows_RollbackOnError(t *testing.T) {
+	runner := &fakeTransactionRunner{
+		errByID: map[uint]error{102: errors.New("boom")},
+	}
+	rows := []adjustmentPriceImportRow{
+		{RowNumber: 2, AdjustmentID: 101, Weight: 10},
+		{RowNumber: 3, AdjustmentID: 102, Weight: 11},
+	}
+
+	_, err := applyImportRows(context.Background(), runner, rows)
+	if err == nil {
+		t.Fatal("expected error due to update failure")
+	}
+	if !strings.Contains(err.Error(), "row 3 adjustment_id=102 update failed") {
+		t.Fatalf("unexpected error message: %v", err)
+	}
+	if runner.txCalls != 1 {
+		t.Fatalf("expected 1 transaction call, got %d", runner.txCalls)
+	}
+	if len(runner.committedCalls) != 0 {
+		t.Fatalf("expected no committed updates on rollback, got %d", len(runner.committedCalls))
+	}
+}
+
+func createWorkbook(t *testing.T, sheetName string, headers []string, rows [][]string) string {
+	t.Helper()
+
+	f := excelize.NewFile()
+	defaultSheet := f.GetSheetName(f.GetActiveSheetIndex())
+	if sheetName == "" {
+		sheetName = defaultSheet
+	} else if sheetName != defaultSheet {
+		f.SetSheetName(defaultSheet, sheetName)
+	}
+
+	for idx, header := range headers {
+		cell, err := excelize.CoordinatesToCellName(idx+1, 1)
+		if err != nil {
+			t.Fatalf("failed resolving header cell: %v", err)
+		}
+		if err := f.SetCellValue(sheetName, cell, header); err != nil {
+			t.Fatalf("failed setting header cell: %v", err)
+		}
+	}
+
+	for rowIdx, row := range rows {
+		for colIdx, value := range row {
+			cell, err := excelize.CoordinatesToCellName(colIdx+1, rowIdx+2)
+			if err != nil {
+				t.Fatalf("failed resolving data cell: %v", err)
+			}
+			if err := f.SetCellValue(sheetName, cell, value); err != nil {
+				t.Fatalf("failed setting data cell: %v", err)
+			}
+		}
+	}
+
+	path := filepath.Join(t.TempDir(), "adjustment_prices.xlsx")
+	if err := f.SaveAs(path); err != nil {
+		t.Fatalf("failed saving workbook: %v", err)
+	}
+	if err := f.Close(); err != nil {
+		t.Fatalf("failed closing workbook: %v", err)
+	}
+
+	return path
+}
+
+func hasIssue(issues []validationIssue, row int, field, messageContains string) bool {
+	for _, issue := range issues {
+		if issue.Row != row {
+			continue
+		}
+		if issue.Field != field {
+			continue
+		}
+		if strings.Contains(issue.Message, messageContains) {
+			return true
+		}
+	}
+	return false
+}
+
+func findRowByAdjustmentID(rows []adjustmentPriceImportRow, adjustmentID uint) (adjustmentPriceImportRow, bool) {
+	for _, row := range rows {
+		if row.AdjustmentID == adjustmentID {
+			return row, true
+		}
+	}
+	return adjustmentPriceImportRow{}, false
+}
+
+type updateCall struct {
+	adjustmentID uint
+	price        float64
+}
+
+type fakeAdjustmentPriceStore struct {
+	changedByID map[uint]bool
+	errByID     map[uint]error
+	calls       []updateCall
+}
+
+func (s *fakeAdjustmentPriceStore) UpdatePrice(_ context.Context, adjustmentID uint, price float64) (bool, error) {
+	s.calls = append(s.calls, updateCall{adjustmentID: adjustmentID, price: price})
+	if err, exists := s.errByID[adjustmentID]; exists {
+		return false, fmt.Errorf("forced update failure for adjustment_id=%d: %w", adjustmentID, err)
+	}
+	if changed, exists := s.changedByID[adjustmentID]; exists {
+		return changed, nil
+	}
+	return true, nil
+}
+
+type fakeTransactionRunner struct {
+	txCalls        int
+	changedByID    map[uint]bool
+	errByID        map[uint]error
+	committedCalls []updateCall
+}
+
+func (r *fakeTransactionRunner) InTx(ctx context.Context, fn func(store adjustmentPriceStore) error) error {
+	r.txCalls++
+
+	txStore := &fakeAdjustmentPriceStore{
+		changedByID: r.changedByID,
+		errByID:     r.errByID,
+		calls:       make([]updateCall, 0),
+	}
+
+	if err := fn(txStore); err != nil {
+		return err
+	}
+
+	r.committedCalls = append(r.committedCalls, txStore.calls...)
+	return nil
+}
+
+var _ txRunner = (*fakeTransactionRunner)(nil)
+var _ adjustmentPriceStore = (*fakeAdjustmentPriceStore)(nil)

cmd/import-farm-depreciation-manual-inputs/main.go

@@ -0,0 +1,632 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/xuri/excelize/v2"
+	"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"
+	repportRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/repositories"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"gorm.io/gorm"
+)
+
+const dateLayout = "2006-01-02"
+
+type importOptions struct {
+	FilePath string
+	Sheet    string
+	Apply    bool
+}
+
+type headerIndexes struct {
+	ProjectFlockID int
+	TotalCost      int
+	CutoverDate    int
+	Note           int
+}
+
+type manualInputImportRow struct {
+	RowNumber      int
+	ProjectFlockID uint
+	TotalCost      float64
+	CutoverDate    time.Time
+	Note           *string
+}
+
+type validationIssue struct {
+	Row     int
+	Field   string
+	Message string
+}
+
+func (i validationIssue) Error() string {
+	if i.Row > 0 {
+		return fmt.Sprintf("row=%d field=%s message=%s", i.Row, i.Field, i.Message)
+	}
+	return fmt.Sprintf("field=%s message=%s", i.Field, i.Message)
+}
+
+type farmResolver interface {
+	ResolveActiveLayingFarms(ctx context.Context, projectFlockIDs []uint) (map[uint]string, error)
+}
+
+type dbFarmResolver struct {
+	db *gorm.DB
+}
+
+type manualInputStore interface {
+	UpsertManualInput(ctx context.Context, row *entity.FarmDepreciationManualInput) error
+	DeleteSnapshotsFromDate(ctx context.Context, fromDate time.Time, farmIDs []uint) error
+}
+
+type txRunner interface {
+	InTx(ctx context.Context, fn func(store manualInputStore) error) error
+}
+
+type dbTxRunner struct {
+	db *gorm.DB
+}
+
+type expenseDepreciationStore struct {
+	repo repportRepo.ExpenseDepreciationRepository
+}
+
+type farmIdentityRow struct {
+	ID       uint   `gorm:"column:id"`
+	FarmName string `gorm:"column:farm_name"`
+}
+
+func main() {
+	var opts importOptions
+	flag.StringVar(&opts.FilePath, "file", "", "Path to .xlsx file (required)")
+	flag.StringVar(&opts.Sheet, "sheet", "", "Sheet name (optional, default: first sheet)")
+	flag.BoolVar(&opts.Apply, "apply", false, "Apply changes. If false, run as dry-run")
+	flag.Parse()
+
+	opts.FilePath = strings.TrimSpace(opts.FilePath)
+	opts.Sheet = strings.TrimSpace(opts.Sheet)
+
+	if opts.FilePath == "" {
+		log.Fatal("--file is required")
+	}
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		log.Fatalf("failed to load timezone Asia/Jakarta: %v", err)
+	}
+
+	sheetName, rows, parseIssues, err := parseManualInputFile(opts.FilePath, opts.Sheet, location)
+	if err != nil {
+		log.Fatalf("failed reading excel: %v", err)
+	}
+
+	ctx := context.Background()
+	db := database.Connect(config.DBHost, config.DBName)
+	resolver := dbFarmResolver{db: db}
+
+	farmNameByID, err := resolver.ResolveActiveLayingFarms(ctx, collectProjectFlockIDs(rows))
+	if err != nil {
+		log.Fatalf("failed validating project_flock_id against project_flocks: %v", err)
+	}
+
+	issues := append([]validationIssue{}, parseIssues...)
+	issues = append(issues, buildMissingFarmIssues(rows, farmNameByID)...)
+	sortValidationIssues(issues)
+
+	fmt.Printf("Mode: %s\n", modeLabel(opts.Apply))
+	fmt.Printf("File: %s\n", opts.FilePath)
+	fmt.Printf("Sheet: %s\n", sheetName)
+	fmt.Printf("Rows parsed: %d\n", len(rows))
+	fmt.Printf("Rows invalid: %d\n", len(issues))
+	fmt.Println()
+
+	if len(rows) > 0 {
+		printPlanRows(rows, farmNameByID)
+		fmt.Println()
+	}
+
+	if len(issues) > 0 {
+		fmt.Println("Validation errors:")
+		for _, issue := range issues {
+			fmt.Printf("ERROR %s\n", issue.Error())
+		}
+		fmt.Println()
+		fmt.Printf("Summary: planned=%d applied=0 failed=%d\n", len(rows), len(issues))
+		os.Exit(1)
+	}
+
+	if !opts.Apply {
+		fmt.Printf("Summary: planned=%d applied=0 failed=0\n", len(rows))
+		return
+	}
+
+	if len(rows) == 0 {
+		fmt.Println("Summary: planned=0 applied=0 failed=0")
+		return
+	}
+
+	if err := applyIfRequested(ctx, true, dbTxRunner{db: db}, rows); err != nil {
+		log.Fatalf("apply failed: %v", err)
+	}
+
+	for _, row := range rows {
+		fmt.Printf(
+			"DONE row=%d project_flock_id=%d cutover_date=%s\n",
+			row.RowNumber,
+			row.ProjectFlockID,
+			row.CutoverDate.In(location).Format(dateLayout),
+		)
+	}
+
+	fmt.Println()
+	fmt.Printf("Summary: planned=%d applied=%d failed=0\n", len(rows), len(rows))
+}
+
+func parseManualInputFile(
+	filePath string,
+	requestedSheet string,
+	location *time.Location,
+) (string, []manualInputImportRow, []validationIssue, error) {
+	workbook, err := excelize.OpenFile(filePath)
+	if err != nil {
+		return "", nil, nil, err
+	}
+	defer func() {
+		_ = workbook.Close()
+	}()
+
+	sheetName, err := resolveSheetName(workbook, requestedSheet)
+	if err != nil {
+		return "", nil, nil, err
+	}
+
+	allRows, err := workbook.GetRows(sheetName, excelize.Options{RawCellValue: true})
+	if err != nil {
+		return "", nil, nil, err
+	}
+	if len(allRows) == 0 {
+		return sheetName, nil, []validationIssue{
+			{Field: "header", Message: "sheet is empty"},
+		}, nil
+	}
+
+	indexes, headerIssues := parseHeaderIndexes(allRows[0])
+	if len(headerIssues) > 0 {
+		return sheetName, nil, headerIssues, nil
+	}
+
+	rows := make([]manualInputImportRow, 0, len(allRows)-1)
+	issues := make([]validationIssue, 0)
+	seenProjectFlockIDs := make(map[uint]int)
+
+	for idx := 1; idx < len(allRows); idx++ {
+		rowNumber := idx + 1
+		rawRow := allRows[idx]
+
+		if isRowEmpty(rawRow) {
+			continue
+		}
+
+		parsed, rowIssues := parseDataRow(rawRow, rowNumber, indexes, location, seenProjectFlockIDs)
+		if len(rowIssues) > 0 {
+			issues = append(issues, rowIssues...)
+			continue
+		}
+
+		rows = append(rows, *parsed)
+	}
+
+	if len(rows) == 0 && len(issues) == 0 {
+		issues = append(issues, validationIssue{
+			Field:   "rows",
+			Message: "no data rows found",
+		})
+	}
+
+	return sheetName, rows, issues, nil
+}
+
+func resolveSheetName(workbook *excelize.File, requestedSheet string) (string, error) {
+	if workbook == nil {
+		return "", fmt.Errorf("workbook is nil")
+	}
+
+	sheets := workbook.GetSheetList()
+	if len(sheets) == 0 {
+		return "", fmt.Errorf("workbook has no sheets")
+	}
+
+	if requestedSheet == "" {
+		return sheets[0], nil
+	}
+
+	for _, sheet := range sheets {
+		if strings.EqualFold(strings.TrimSpace(sheet), strings.TrimSpace(requestedSheet)) {
+			return sheet, nil
+		}
+	}
+
+	return "", fmt.Errorf("sheet %q not found", requestedSheet)
+}
+
+func parseHeaderIndexes(headerRow []string) (headerIndexes, []validationIssue) {
+	indexes := headerIndexes{
+		ProjectFlockID: -1,
+		TotalCost:      -1,
+		CutoverDate:    -1,
+		Note:           -1,
+	}
+	issues := make([]validationIssue, 0)
+
+	for idx, raw := range headerRow {
+		header := normalizeHeader(raw)
+		if header == "" {
+			continue
+		}
+
+		switch header {
+		case "project_flock_id":
+			if indexes.ProjectFlockID >= 0 {
+				issues = append(issues, validationIssue{
+					Field:   "header",
+					Message: "duplicate header project_flock_id",
+				})
+			}
+			indexes.ProjectFlockID = idx
+		case "total_cost":
+			if indexes.TotalCost >= 0 {
+				issues = append(issues, validationIssue{
+					Field:   "header",
+					Message: "duplicate header total_cost",
+				})
+			}
+			indexes.TotalCost = idx
+		case "cutover_date":
+			if indexes.CutoverDate >= 0 {
+				issues = append(issues, validationIssue{
+					Field:   "header",
+					Message: "duplicate header cutover_date",
+				})
+			}
+			indexes.CutoverDate = idx
+		case "note":
+			if indexes.Note >= 0 {
+				issues = append(issues, validationIssue{
+					Field:   "header",
+					Message: "duplicate header note",
+				})
+			}
+			indexes.Note = idx
+		}
+	}
+
+	if indexes.ProjectFlockID < 0 {
+		issues = append(issues, validationIssue{
+			Field:   "project_flock_id",
+			Message: "required header is missing",
+		})
+	}
+	if indexes.TotalCost < 0 {
+		issues = append(issues, validationIssue{
+			Field:   "total_cost",
+			Message: "required header is missing",
+		})
+	}
+	if indexes.CutoverDate < 0 {
+		issues = append(issues, validationIssue{
+			Field:   "cutover_date",
+			Message: "required header is missing",
+		})
+	}
+
+	return indexes, issues
+}
+
+func parseDataRow(
+	rawRow []string,
+	rowNumber int,
+	indexes headerIndexes,
+	location *time.Location,
+	seenProjectFlockIDs map[uint]int,
+) (*manualInputImportRow, []validationIssue) {
+	issues := make([]validationIssue, 0)
+
+	projectFlockIDRaw := strings.TrimSpace(cellValue(rawRow, indexes.ProjectFlockID))
+	projectFlockID, err := parsePositiveUint(projectFlockIDRaw)
+	if err != nil {
+		issues = append(issues, validationIssue{
+			Row:     rowNumber,
+			Field:   "project_flock_id",
+			Message: err.Error(),
+		})
+	}
+
+	totalCostRaw := strings.TrimSpace(cellValue(rawRow, indexes.TotalCost))
+	totalCost, err := parseNonNegativeFloat(totalCostRaw)
+	if err != nil {
+		issues = append(issues, validationIssue{
+			Row:     rowNumber,
+			Field:   "total_cost",
+			Message: err.Error(),
+		})
+	}
+
+	cutoverDateRaw := strings.TrimSpace(cellValue(rawRow, indexes.CutoverDate))
+	cutoverDate, err := parseDateOnlyInLocation(cutoverDateRaw, location)
+	if err != nil {
+		issues = append(issues, validationIssue{
+			Row:     rowNumber,
+			Field:   "cutover_date",
+			Message: err.Error(),
+		})
+	}
+
+	var note *string
+	noteRaw := strings.TrimSpace(cellValue(rawRow, indexes.Note))
+	if noteRaw != "" {
+		if len([]rune(noteRaw)) > 1000 {
+			issues = append(issues, validationIssue{
+				Row:     rowNumber,
+				Field:   "note",
+				Message: "must have at most 1000 characters",
+			})
+		} else {
+			note = &noteRaw
+		}
+	}
+
+	if projectFlockID > 0 {
+		if previousRow, exists := seenProjectFlockIDs[projectFlockID]; exists {
+			issues = append(issues, validationIssue{
+				Row:     rowNumber,
+				Field:   "project_flock_id",
+				Message: fmt.Sprintf("duplicate value %d (already used in row %d)", projectFlockID, previousRow),
+			})
+		} else {
+			seenProjectFlockIDs[projectFlockID] = rowNumber
+		}
+	}
+
+	if len(issues) > 0 {
+		return nil, issues
+	}
+
+	return &manualInputImportRow{
+		RowNumber:      rowNumber,
+		ProjectFlockID: projectFlockID,
+		TotalCost:      totalCost,
+		CutoverDate:    cutoverDate,
+		Note:           note,
+	}, nil
+}
+
+func parsePositiveUint(raw string) (uint, error) {
+	if raw == "" {
+		return 0, fmt.Errorf("is required")
+	}
+
+	uintValue, err := strconv.ParseUint(raw, 10, 64)
+	if err == nil {
+		if uintValue == 0 {
+			return 0, fmt.Errorf("must be greater than 0")
+		}
+		return uint(uintValue), nil
+	}
+
+	floatValue, floatErr := strconv.ParseFloat(raw, 64)
+	if floatErr != nil {
+		return 0, fmt.Errorf("must be a positive integer")
+	}
+	if floatValue <= 0 {
+		return 0, fmt.Errorf("must be greater than 0")
+	}
+	if floatValue != float64(uint(floatValue)) {
+		return 0, fmt.Errorf("must be a positive integer")
+	}
+
+	return uint(floatValue), nil
+}
+
+func parseNonNegativeFloat(raw string) (float64, error) {
+	if raw == "" {
+		return 0, fmt.Errorf("is required")
+	}
+
+	value, err := strconv.ParseFloat(raw, 64)
+	if err != nil {
+		return 0, fmt.Errorf("must be numeric")
+	}
+	if value < 0 {
+		return 0, fmt.Errorf("must be greater than or equal to 0")
+	}
+
+	return value, nil
+}
+
+func parseDateOnlyInLocation(raw string, location *time.Location) (time.Time, error) {
+	if raw == "" {
+		return time.Time{}, fmt.Errorf("is required")
+	}
+	value, err := time.ParseInLocation(dateLayout, raw, location)
+	if err != nil {
+		return time.Time{}, fmt.Errorf("must follow format YYYY-MM-DD")
+	}
+	return value, nil
+}
+
+func isRowEmpty(row []string) bool {
+	for _, cell := range row {
+		if strings.TrimSpace(cell) != "" {
+			return false
+		}
+	}
+	return true
+}
+
+func normalizeHeader(raw string) string {
+	return strings.ToLower(strings.TrimSpace(raw))
+}
+
+func cellValue(row []string, index int) string {
+	if index < 0 || index >= len(row) {
+		return ""
+	}
+	return row[index]
+}
+
+func collectProjectFlockIDs(rows []manualInputImportRow) []uint {
+	ids := make([]uint, 0, len(rows))
+	seen := make(map[uint]struct{}, len(rows))
+	for _, row := range rows {
+		if row.ProjectFlockID == 0 {
+			continue
+		}
+		if _, exists := seen[row.ProjectFlockID]; exists {
+			continue
+		}
+		seen[row.ProjectFlockID] = struct{}{}
+		ids = append(ids, row.ProjectFlockID)
+	}
+	sort.Slice(ids, func(i, j int) bool {
+		return ids[i] < ids[j]
+	})
+	return ids
+}
+
+func (r dbFarmResolver) ResolveActiveLayingFarms(
+	ctx context.Context,
+	projectFlockIDs []uint,
+) (map[uint]string, error) {
+	result := make(map[uint]string)
+	if len(projectFlockIDs) == 0 {
+		return result, nil
+	}
+
+	rows := make([]farmIdentityRow, 0, len(projectFlockIDs))
+	if err := r.db.WithContext(ctx).
+		Table("project_flocks").
+		Select("id, flock_name AS farm_name").
+		Where("id IN ?", projectFlockIDs).
+		Where("deleted_at IS NULL").
+		Where("category = ?", utils.ProjectFlockCategoryLaying).
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	for _, row := range rows {
+		result[row.ID] = row.FarmName
+	}
+
+	return result, nil
+}
+
+func buildMissingFarmIssues(rows []manualInputImportRow, farmNameByID map[uint]string) []validationIssue {
+	issues := make([]validationIssue, 0)
+	for _, row := range rows {
+		if _, exists := farmNameByID[row.ProjectFlockID]; exists {
+			continue
+		}
+		issues = append(issues, validationIssue{
+			Row:     row.RowNumber,
+			Field:   "project_flock_id",
+			Message: fmt.Sprintf("value %d must reference an active LAYING project_flock", row.ProjectFlockID),
+		})
+	}
+	return issues
+}
+
+func printPlanRows(rows []manualInputImportRow, farmNameByID map[uint]string) {
+	for _, row := range rows {
+		farmName := farmNameByID[row.ProjectFlockID]
+		fmt.Printf(
+			"PLAN row=%d project_flock_id=%d farm_name=%q total_cost=%.3f cutover_date=%s note=%q\n",
+			row.RowNumber,
+			row.ProjectFlockID,
+			farmName,
+			row.TotalCost,
+			row.CutoverDate.Format(dateLayout),
+			derefString(row.Note),
+		)
+	}
+}
+
+func sortValidationIssues(issues []validationIssue) {
+	sort.Slice(issues, func(i, j int) bool {
+		if issues[i].Row == issues[j].Row {
+			if issues[i].Field == issues[j].Field {
+				return issues[i].Message < issues[j].Message
+			}
+			return issues[i].Field < issues[j].Field
+		}
+		return issues[i].Row < issues[j].Row
+	})
+}
+
+func applyIfRequested(ctx context.Context, apply bool, runner txRunner, rows []manualInputImportRow) error {
+	if !apply || len(rows) == 0 {
+		return nil
+	}
+	return applyImportRows(ctx, runner, rows)
+}
+
+func applyImportRows(ctx context.Context, runner txRunner, rows []manualInputImportRow) error {
+	return runner.InTx(ctx, func(store manualInputStore) error {
+		for _, row := range rows {
+			payload := entity.FarmDepreciationManualInput{
+				ProjectFlockId: row.ProjectFlockID,
+				TotalCost:      row.TotalCost,
+				CutoverDate:    row.CutoverDate,
+				Note:           row.Note,
+			}
+
+			if err := store.UpsertManualInput(ctx, &payload); err != nil {
+				return fmt.Errorf("row %d project_flock_id=%d upsert failed: %w", row.RowNumber, row.ProjectFlockID, err)
+			}
+
+			if err := store.DeleteSnapshotsFromDate(ctx, row.CutoverDate, []uint{row.ProjectFlockID}); err != nil {
+				return fmt.Errorf("row %d project_flock_id=%d snapshot invalidation failed: %w", row.RowNumber, row.ProjectFlockID, err)
+			}
+		}
+		return nil
+	})
+}
+
+func (r dbTxRunner) InTx(ctx context.Context, fn func(store manualInputStore) error) error {
+	return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		repo := repportRepo.NewExpenseDepreciationRepository(tx)
+		store := expenseDepreciationStore{repo: repo}
+		return fn(store)
+	})
+}
+
+func (s expenseDepreciationStore) UpsertManualInput(ctx context.Context, row *entity.FarmDepreciationManualInput) error {
+	return s.repo.UpsertManualInput(ctx, row)
+}
+
+func (s expenseDepreciationStore) DeleteSnapshotsFromDate(ctx context.Context, fromDate time.Time, farmIDs []uint) error {
+	return s.repo.DeleteSnapshotsFromDate(ctx, fromDate, farmIDs)
+}
+
+func modeLabel(apply bool) string {
+	if apply {
+		return "APPLY"
+	}
+	return "DRY-RUN"
+}
+
+func derefString(value *string) string {
+	if value == nil {
+		return ""
+	}
+	return *value
+}

cmd/import-farm-depreciation-manual-inputs/main_test.go

@@ -0,0 +1,563 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/xuri/excelize/v2"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+)
+
+func TestParseManualInputFile_ValidSingleRow(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "total_cost", "cutover_date", "note"},
+		[][]string{
+			{"101", "12345.678", "2026-06-01", "manual seed"},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	sheet, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if sheet != "manual_inputs" {
+		t.Fatalf("expected selected sheet manual_inputs, got %q", sheet)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	if rows[0].ProjectFlockID != 101 {
+		t.Fatalf("expected project_flock_id 101, got %d", rows[0].ProjectFlockID)
+	}
+	if rows[0].TotalCost != 12345.678 {
+		t.Fatalf("expected total_cost 12345.678, got %v", rows[0].TotalCost)
+	}
+	if rows[0].CutoverDate.Format(dateLayout) != "2026-06-01" {
+		t.Fatalf("expected cutover_date 2026-06-01, got %s", rows[0].CutoverDate.Format(dateLayout))
+	}
+	if rows[0].Note == nil || *rows[0].Note != "manual seed" {
+		t.Fatalf("expected note manual seed, got %+v", rows[0].Note)
+	}
+}
+
+func TestParseManualInputFile_ValidMultiRow(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{" Project_Flock_ID ", "TOTAL_COST", "cutover_date", "NOTE"},
+		[][]string{
+			{"101", "1200", "2026-06-01", ""},
+			{"102", "1300.5", "2026-06-02", "second"},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "manual_inputs", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 2 {
+		t.Fatalf("expected 2 rows, got %d", len(rows))
+	}
+	if rows[0].Note != nil {
+		t.Fatalf("expected first row note nil, got %+v", rows[0].Note)
+	}
+	if rows[1].Note == nil || *rows[1].Note != "second" {
+		t.Fatalf("expected second row note second, got %+v", rows[1].Note)
+	}
+}
+
+func TestParseManualInputFile_MissingRequiredHeader(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "totalcost", "cutover_date", "note"},
+		[][]string{
+			{"101", "1200", "2026-06-01", ""},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected 0 parsed rows when header invalid, got %d", len(rows))
+	}
+	if !hasIssue(issues, 0, "total_cost", "required header is missing") {
+		t.Fatalf("expected missing total_cost header issue, got %+v", issues)
+	}
+}
+
+func TestParseManualInputFile_InvalidProjectFlockID(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "total_cost", "cutover_date", "note"},
+		[][]string{
+			{"abc", "1200", "2026-06-01", ""},
+			{"0", "1300", "2026-06-02", ""},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected no valid rows, got %d", len(rows))
+	}
+	if !hasIssue(issues, 2, "project_flock_id", "must be a positive integer") {
+		t.Fatalf("expected non numeric project_flock_id issue, got %+v", issues)
+	}
+	if !hasIssue(issues, 3, "project_flock_id", "must be greater than 0") {
+		t.Fatalf("expected project_flock_id >0 issue, got %+v", issues)
+	}
+}
+
+func TestParseManualInputFile_InvalidTotalCost(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "total_cost", "cutover_date", "note"},
+		[][]string{
+			{"101", "abc", "2026-06-01", ""},
+			{"102", "-1", "2026-06-02", ""},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected no valid rows, got %d", len(rows))
+	}
+	if !hasIssue(issues, 2, "total_cost", "must be numeric") {
+		t.Fatalf("expected total_cost numeric issue, got %+v", issues)
+	}
+	if !hasIssue(issues, 3, "total_cost", "must be greater than or equal to 0") {
+		t.Fatalf("expected total_cost >=0 issue, got %+v", issues)
+	}
+}
+
+func TestParseManualInputFile_InvalidCutoverDate(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "total_cost", "cutover_date", "note"},
+		[][]string{
+			{"101", "1200", "06-01-2026", ""},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected no valid rows, got %d", len(rows))
+	}
+	if !hasIssue(issues, 2, "cutover_date", "must follow format YYYY-MM-DD") {
+		t.Fatalf("expected cutover_date format issue, got %+v", issues)
+	}
+}
+
+func TestParseManualInputFile_DuplicateProjectFlockID(t *testing.T) {
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "total_cost", "cutover_date", "note"},
+		[][]string{
+			{"101", "1200", "2026-06-01", ""},
+			{"101", "1300", "2026-06-02", ""},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected first row valid and second row invalid, got %d rows", len(rows))
+	}
+	if !hasIssue(issues, 3, "project_flock_id", "duplicate value 101") {
+		t.Fatalf("expected duplicate project_flock_id issue, got %+v", issues)
+	}
+}
+
+func TestParseManualInputFile_NoteValidation(t *testing.T) {
+	longNote := strings.Repeat("a", 1001)
+	filePath := createManualInputWorkbook(
+		t,
+		"manual_inputs",
+		[]string{"project_flock_id", "total_cost", "cutover_date", "note"},
+		[][]string{
+			{"101", "1200", "2026-06-01", ""},
+			{"102", "1300", "2026-06-02", longNote},
+		},
+	)
+
+	location := mustJakartaLocation(t)
+	_, rows, issues, err := parseManualInputFile(filePath, "", location)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected only first row valid, got %d", len(rows))
+	}
+	if rows[0].Note != nil {
+		t.Fatalf("expected first row note nil, got %+v", rows[0].Note)
+	}
+	if !hasIssue(issues, 3, "note", "at most 1000 characters") {
+		t.Fatalf("expected note length issue, got %+v", issues)
+	}
+}
+
+func TestApplyImportRows_Success(t *testing.T) {
+	location := mustJakartaLocation(t)
+	runner := &fakeTransactionRunner{}
+	rows := []manualInputImportRow{
+		{
+			RowNumber:      2,
+			ProjectFlockID: 101,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+		{
+			RowNumber:      3,
+			ProjectFlockID: 102,
+			TotalCost:      2000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-02", location),
+		},
+	}
+
+	err := applyImportRows(context.Background(), runner, rows)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if runner.txCalls != 1 {
+		t.Fatalf("expected 1 transaction call, got %d", runner.txCalls)
+	}
+	if len(runner.committedUpserts) != 2 {
+		t.Fatalf("expected 2 committed upserts, got %d", len(runner.committedUpserts))
+	}
+	if len(runner.committedInvalidations) != 2 {
+		t.Fatalf("expected 2 committed invalidations, got %d", len(runner.committedInvalidations))
+	}
+	if runner.committedInvalidations[0].farmIDs[0] != 101 || runner.committedInvalidations[1].farmIDs[0] != 102 {
+		t.Fatalf("unexpected invalidation farm IDs: %+v", runner.committedInvalidations)
+	}
+}
+
+func TestApplyImportRows_RollbackOnError(t *testing.T) {
+	location := mustJakartaLocation(t)
+	runner := &fakeTransactionRunner{
+		failUpsertOnProjectFlockID: 102,
+	}
+	rows := []manualInputImportRow{
+		{
+			RowNumber:      2,
+			ProjectFlockID: 101,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+		{
+			RowNumber:      3,
+			ProjectFlockID: 102,
+			TotalCost:      2000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-02", location),
+		},
+	}
+
+	err := applyImportRows(context.Background(), runner, rows)
+	if err == nil {
+		t.Fatal("expected error due to upsert failure")
+	}
+	if runner.txCalls != 1 {
+		t.Fatalf("expected 1 transaction call, got %d", runner.txCalls)
+	}
+	if len(runner.committedUpserts) != 0 {
+		t.Fatalf("expected no committed upserts on rollback, got %d", len(runner.committedUpserts))
+	}
+	if len(runner.committedInvalidations) != 0 {
+		t.Fatalf("expected no committed invalidations on rollback, got %d", len(runner.committedInvalidations))
+	}
+}
+
+func TestApplyIfRequested_DryRunDoesNotWrite(t *testing.T) {
+	location := mustJakartaLocation(t)
+	runner := &fakeTransactionRunner{}
+	rows := []manualInputImportRow{
+		{
+			RowNumber:      2,
+			ProjectFlockID: 101,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+	}
+
+	err := applyIfRequested(context.Background(), false, runner, rows)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if runner.txCalls != 0 {
+		t.Fatalf("expected no transaction call during dry-run, got %d", runner.txCalls)
+	}
+}
+
+func createManualInputWorkbook(t *testing.T, sheetName string, headers []string, rows [][]string) string {
+	t.Helper()
+
+	f := excelize.NewFile()
+	defaultSheet := f.GetSheetName(f.GetActiveSheetIndex())
+	if sheetName == "" {
+		sheetName = defaultSheet
+	} else if sheetName != defaultSheet {
+		f.SetSheetName(defaultSheet, sheetName)
+	}
+
+	for idx, header := range headers {
+		cell, err := excelize.CoordinatesToCellName(idx+1, 1)
+		if err != nil {
+			t.Fatalf("failed resolving header cell: %v", err)
+		}
+		if err := f.SetCellValue(sheetName, cell, header); err != nil {
+			t.Fatalf("failed setting header cell: %v", err)
+		}
+	}
+
+	for rowIdx, row := range rows {
+		for colIdx, value := range row {
+			cell, err := excelize.CoordinatesToCellName(colIdx+1, rowIdx+2)
+			if err != nil {
+				t.Fatalf("failed resolving data cell: %v", err)
+			}
+			if err := f.SetCellValue(sheetName, cell, value); err != nil {
+				t.Fatalf("failed setting data cell: %v", err)
+			}
+		}
+	}
+
+	path := filepath.Join(t.TempDir(), "manual_inputs.xlsx")
+	if err := f.SaveAs(path); err != nil {
+		t.Fatalf("failed saving workbook: %v", err)
+	}
+	if err := f.Close(); err != nil {
+		t.Fatalf("failed closing workbook: %v", err)
+	}
+
+	return path
+}
+
+func mustJakartaLocation(t *testing.T) *time.Location {
+	t.Helper()
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		t.Fatalf("failed loading Asia/Jakarta location: %v", err)
+	}
+	return location
+}
+
+func mustDateInLocation(t *testing.T, raw string, location *time.Location) time.Time {
+	t.Helper()
+	value, err := time.ParseInLocation(dateLayout, raw, location)
+	if err != nil {
+		t.Fatalf("failed parsing date %q: %v", raw, err)
+	}
+	return value
+}
+
+func hasIssue(issues []validationIssue, row int, field, messageContains string) bool {
+	for _, issue := range issues {
+		if issue.Row != row {
+			continue
+		}
+		if issue.Field != field {
+			continue
+		}
+		if strings.Contains(issue.Message, messageContains) {
+			return true
+		}
+	}
+	return false
+}
+
+type fakeInvalidation struct {
+	fromDate time.Time
+	farmIDs  []uint
+}
+
+type fakeManualInputStore struct {
+	failUpsertOnProjectFlockID uint
+	failDeleteOnProjectFlockID uint
+	upserts                    []entity.FarmDepreciationManualInput
+	invalidations              []fakeInvalidation
+}
+
+func (s *fakeManualInputStore) UpsertManualInput(_ context.Context, row *entity.FarmDepreciationManualInput) error {
+	if row == nil {
+		return nil
+	}
+	if s.failUpsertOnProjectFlockID > 0 && row.ProjectFlockId == s.failUpsertOnProjectFlockID {
+		return fmt.Errorf("forced upsert failure for project_flock_id=%d", row.ProjectFlockId)
+	}
+	cloned := *row
+	s.upserts = append(s.upserts, cloned)
+	return nil
+}
+
+func (s *fakeManualInputStore) DeleteSnapshotsFromDate(_ context.Context, fromDate time.Time, farmIDs []uint) error {
+	if s.failDeleteOnProjectFlockID > 0 {
+		for _, farmID := range farmIDs {
+			if farmID == s.failDeleteOnProjectFlockID {
+				return fmt.Errorf("forced delete failure for project_flock_id=%d", farmID)
+			}
+		}
+	}
+	copiedFarmIDs := append([]uint{}, farmIDs...)
+	s.invalidations = append(s.invalidations, fakeInvalidation{
+		fromDate: fromDate,
+		farmIDs:  copiedFarmIDs,
+	})
+	return nil
+}
+
+type fakeTransactionRunner struct {
+	txCalls                    int
+	failUpsertOnProjectFlockID uint
+	failDeleteOnProjectFlockID uint
+	committedUpserts           []entity.FarmDepreciationManualInput
+	committedInvalidations     []fakeInvalidation
+}
+
+func (r *fakeTransactionRunner) InTx(ctx context.Context, fn func(store manualInputStore) error) error {
+	r.txCalls++
+
+	txStore := &fakeManualInputStore{
+		failUpsertOnProjectFlockID: r.failUpsertOnProjectFlockID,
+		failDeleteOnProjectFlockID: r.failDeleteOnProjectFlockID,
+	}
+
+	if err := fn(txStore); err != nil {
+		return err
+	}
+
+	r.committedUpserts = append(r.committedUpserts, txStore.upserts...)
+	r.committedInvalidations = append(r.committedInvalidations, txStore.invalidations...)
+	return nil
+}
+
+var _ txRunner = (*fakeTransactionRunner)(nil)
+var _ manualInputStore = (*fakeManualInputStore)(nil)
+
+func TestBuildMissingFarmIssues(t *testing.T) {
+	location := mustJakartaLocation(t)
+	rows := []manualInputImportRow{
+		{
+			RowNumber:      2,
+			ProjectFlockID: 101,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+		{
+			RowNumber:      3,
+			ProjectFlockID: 102,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+	}
+
+	issues := buildMissingFarmIssues(rows, map[uint]string{
+		101: "Farm A",
+	})
+	if len(issues) != 1 {
+		t.Fatalf("expected 1 issue, got %+v", issues)
+	}
+	if issues[0].Row != 3 || issues[0].Field != "project_flock_id" {
+		t.Fatalf("unexpected issue: %+v", issues[0])
+	}
+}
+
+func TestApplyImportRows_PropagatesDeleteError(t *testing.T) {
+	location := mustJakartaLocation(t)
+	runner := &fakeTransactionRunner{
+		failDeleteOnProjectFlockID: 101,
+	}
+	rows := []manualInputImportRow{
+		{
+			RowNumber:      2,
+			ProjectFlockID: 101,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+	}
+
+	err := applyImportRows(context.Background(), runner, rows)
+	if err == nil {
+		t.Fatal("expected delete failure")
+	}
+	if !strings.Contains(err.Error(), "snapshot invalidation failed") {
+		t.Fatalf("expected snapshot invalidation error message, got %v", err)
+	}
+}
+
+func TestResolveSheetName_ErrorWhenSheetNotFound(t *testing.T) {
+	workbook := excelize.NewFile()
+	defer func() {
+		_ = workbook.Close()
+	}()
+
+	_, err := resolveSheetName(workbook, "unknown")
+	if err == nil {
+		t.Fatal("expected error when sheet is missing")
+	}
+}
+
+func TestApplyIfRequested_ApplyUsesRunnerError(t *testing.T) {
+	location := mustJakartaLocation(t)
+	rows := []manualInputImportRow{
+		{
+			RowNumber:      2,
+			ProjectFlockID: 101,
+			TotalCost:      1000,
+			CutoverDate:    mustDateInLocation(t, "2026-06-01", location),
+		},
+	}
+	runner := &errorTxRunner{err: errors.New("tx failed")}
+
+	err := applyIfRequested(context.Background(), true, runner, rows)
+	if err == nil {
+		t.Fatal("expected transaction error")
+	}
+	if err.Error() != "tx failed" {
+		t.Fatalf("unexpected error: %v", err)
+	}
+}
+
+type errorTxRunner struct {
+	err error
+}
+
+func (r *errorTxRunner) InTx(_ context.Context, _ func(store manualInputStore) error) error {
+	return r.err
+}

cmd/import-kandang-house-types/main.go

@@ -0,0 +1,602 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+
+	"github.com/xuri/excelize/v2"
+	"gitlab.com/mbugroup/lti-api.git/internal/config"
+	"gitlab.com/mbugroup/lti-api.git/internal/database"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"gorm.io/gorm"
+)
+
+type importOptions struct {
+	FilePath string
+	Sheet    string
+	Apply    bool
+}
+
+type headerIndexes struct {
+	KandangID   int
+	KandangName int
+	HouseType   int
+}
+
+type kandangHouseTypeImportRow struct {
+	RowNumber   int
+	KandangID   uint
+	KandangName string
+	HouseType   string
+}
+
+type validationIssue struct {
+	Row     int
+	Field   string
+	Message string
+}
+
+func (i validationIssue) Error() string {
+	if i.Row > 0 {
+		return fmt.Sprintf("row=%d field=%s message=%s", i.Row, i.Field, i.Message)
+	}
+	return fmt.Sprintf("field=%s message=%s", i.Field, i.Message)
+}
+
+type kandangResolver interface {
+	ResolveActiveKandangs(ctx context.Context, kandangIDs []uint) (map[uint]string, error)
+}
+
+type dbKandangResolver struct {
+	db *gorm.DB
+}
+
+type txRunner interface {
+	InTx(ctx context.Context, fn func(store kandangHouseTypeStore) error) error
+}
+
+type dbTxRunner struct {
+	db *gorm.DB
+}
+
+type kandangHouseTypeStore interface {
+	UpdateKandangHouseType(ctx context.Context, kandangID uint, houseType string) (bool, error)
+	NormalizeNullHouseType(ctx context.Context) (int64, error)
+}
+
+type dbKandangHouseTypeStore struct {
+	db *gorm.DB
+}
+
+type kandangIdentityRow struct {
+	ID   uint   `gorm:"column:id"`
+	Name string `gorm:"column:name"`
+}
+
+type applyRowResult struct {
+	RowNumber int
+	KandangID uint
+	HouseType string
+	Changed   bool
+}
+
+func main() {
+	var opts importOptions
+	flag.StringVar(&opts.FilePath, "file", "", "Path to .xlsx file (required)")
+	flag.StringVar(&opts.Sheet, "sheet", "", "Sheet name (optional, default: first sheet)")
+	flag.BoolVar(&opts.Apply, "apply", false, "Apply changes. If false, run as dry-run")
+	flag.Parse()
+
+	opts.FilePath = strings.TrimSpace(opts.FilePath)
+	opts.Sheet = strings.TrimSpace(opts.Sheet)
+
+	if opts.FilePath == "" {
+		log.Fatal("--file is required")
+	}
+
+	sheetName, rows, parseIssues, err := parseKandangHouseTypeFile(opts.FilePath, opts.Sheet)
+	if err != nil {
+		log.Fatalf("failed reading excel: %v", err)
+	}
+
+	ctx := context.Background()
+	db := database.Connect(config.DBHost, config.DBName)
+	resolver := dbKandangResolver{db: db}
+
+	kandangNameByID, err := resolver.ResolveActiveKandangs(ctx, collectKandangIDs(rows))
+	if err != nil {
+		log.Fatalf("failed validating kandang_id against kandangs: %v", err)
+	}
+
+	issues := append([]validationIssue{}, parseIssues...)
+	issues = append(issues, buildMissingKandangIssues(rows, kandangNameByID)...)
+	issues = append(issues, buildNameMismatchIssues(rows, kandangNameByID)...)
+	sortValidationIssues(issues)
+
+	fmt.Printf("Mode: %s\n", modeLabel(opts.Apply))
+	fmt.Printf("File: %s\n", opts.FilePath)
+	fmt.Printf("Sheet: %s\n", sheetName)
+	fmt.Printf("Rows parsed: %d\n", len(rows))
+	fmt.Printf("Rows invalid: %d\n", len(issues))
+	fmt.Println()
+
+	if len(rows) > 0 {
+		printPlanRows(rows, kandangNameByID)
+		fmt.Println()
+	}
+
+	if len(issues) > 0 {
+		fmt.Println("Validation errors:")
+		for _, issue := range issues {
+			fmt.Printf("ERROR %s\n", issue.Error())
+		}
+		fmt.Println()
+		fmt.Printf("Summary: planned=%d applied=0 normalized_null_to_open_house=0 failed=%d\n", len(rows), len(issues))
+		os.Exit(1)
+	}
+
+	if !opts.Apply {
+		fmt.Printf("Summary: planned=%d applied=0 normalized_null_to_open_house=0 failed=0\n", len(rows))
+		return
+	}
+
+	rowResults, normalizedCount, err := applyImportRows(ctx, dbTxRunner{db: db}, rows)
+	if err != nil {
+		log.Fatalf("apply failed: %v", err)
+	}
+
+	for _, result := range rowResults {
+		fmt.Printf(
+			"DONE row=%d kandang_id=%d house_type=%s status=%s\n",
+			result.RowNumber,
+			result.KandangID,
+			result.HouseType,
+			applyStatus(result.Changed),
+		)
+	}
+
+	appliedCount := countChangedRows(rowResults)
+	fmt.Println()
+	fmt.Printf(
+		"Summary: planned=%d applied=%d normalized_null_to_open_house=%d failed=0\n",
+		len(rows),
+		appliedCount,
+		normalizedCount,
+	)
+}
+
+func parseKandangHouseTypeFile(
+	filePath string,
+	requestedSheet string,
+) (string, []kandangHouseTypeImportRow, []validationIssue, error) {
+	workbook, err := excelize.OpenFile(filePath)
+	if err != nil {
+		return "", nil, nil, err
+	}
+	defer func() {
+		_ = workbook.Close()
+	}()
+
+	sheetName, err := resolveSheetName(workbook, requestedSheet)
+	if err != nil {
+		return "", nil, nil, err
+	}
+
+	allRows, err := workbook.GetRows(sheetName, excelize.Options{RawCellValue: true})
+	if err != nil {
+		return "", nil, nil, err
+	}
+	if len(allRows) == 0 {
+		return sheetName, nil, []validationIssue{{Field: "header", Message: "sheet is empty"}}, nil
+	}
+
+	indexes, headerIssues := parseHeaderIndexes(allRows[0])
+	if len(headerIssues) > 0 {
+		return sheetName, nil, headerIssues, nil
+	}
+
+	rows := make([]kandangHouseTypeImportRow, 0, len(allRows)-1)
+	issues := make([]validationIssue, 0)
+	seenKandangIDs := make(map[uint]int)
+
+	for idx := 1; idx < len(allRows); idx++ {
+		rowNumber := idx + 1
+		rawRow := allRows[idx]
+
+		if isRowEmpty(rawRow) {
+			continue
+		}
+
+		parsed, rowIssues := parseDataRow(rawRow, rowNumber, indexes, seenKandangIDs)
+		if len(rowIssues) > 0 {
+			issues = append(issues, rowIssues...)
+			continue
+		}
+
+		rows = append(rows, *parsed)
+	}
+
+	if len(rows) == 0 && len(issues) == 0 {
+		issues = append(issues, validationIssue{Field: "rows", Message: "no data rows found"})
+	}
+
+	return sheetName, rows, issues, nil
+}
+
+func resolveSheetName(workbook *excelize.File, requestedSheet string) (string, error) {
+	if workbook == nil {
+		return "", fmt.Errorf("workbook is nil")
+	}
+
+	sheets := workbook.GetSheetList()
+	if len(sheets) == 0 {
+		return "", fmt.Errorf("workbook has no sheets")
+	}
+
+	if requestedSheet == "" {
+		return sheets[0], nil
+	}
+
+	for _, sheet := range sheets {
+		if strings.EqualFold(strings.TrimSpace(sheet), strings.TrimSpace(requestedSheet)) {
+			return sheet, nil
+		}
+	}
+
+	return "", fmt.Errorf("sheet %q not found", requestedSheet)
+}
+
+func parseHeaderIndexes(headerRow []string) (headerIndexes, []validationIssue) {
+	indexes := headerIndexes{KandangID: -1, KandangName: -1, HouseType: -1}
+	issues := make([]validationIssue, 0)
+
+	for idx, raw := range headerRow {
+		header := normalizeHeader(raw)
+		if header == "" {
+			continue
+		}
+
+		switch header {
+		case "kandang_id":
+			if indexes.KandangID >= 0 {
+				issues = append(issues, validationIssue{Field: "header", Message: "duplicate header kandang_id"})
+			}
+			indexes.KandangID = idx
+		case "kandang_name":
+			if indexes.KandangName >= 0 {
+				issues = append(issues, validationIssue{Field: "header", Message: "duplicate header kandang_name"})
+			}
+			indexes.KandangName = idx
+		case "house_type", "type_house":
+			if indexes.HouseType >= 0 {
+				issues = append(issues, validationIssue{Field: "header", Message: "duplicate header house_type"})
+			}
+			indexes.HouseType = idx
+		}
+	}
+
+	if indexes.KandangID < 0 {
+		issues = append(issues, validationIssue{Field: "kandang_id", Message: "required header is missing"})
+	}
+	if indexes.KandangName < 0 {
+		issues = append(issues, validationIssue{Field: "kandang_name", Message: "required header is missing"})
+	}
+	if indexes.HouseType < 0 {
+		issues = append(issues, validationIssue{Field: "house_type", Message: "required header is missing"})
+	}
+
+	return indexes, issues
+}
+
+func parseDataRow(
+	rawRow []string,
+	rowNumber int,
+	indexes headerIndexes,
+	seenKandangIDs map[uint]int,
+) (*kandangHouseTypeImportRow, []validationIssue) {
+	issues := make([]validationIssue, 0)
+
+	kandangIDRaw := strings.TrimSpace(cellValue(rawRow, indexes.KandangID))
+	kandangID, err := parsePositiveUint(kandangIDRaw)
+	if err != nil {
+		issues = append(issues, validationIssue{Row: rowNumber, Field: "kandang_id", Message: err.Error()})
+	}
+
+	kandangNameRaw := strings.TrimSpace(cellValue(rawRow, indexes.KandangName))
+	if kandangNameRaw == "" {
+		issues = append(issues, validationIssue{Row: rowNumber, Field: "kandang_name", Message: "is required"})
+	}
+
+	houseTypeRaw := strings.TrimSpace(cellValue(rawRow, indexes.HouseType))
+	houseType, err := normalizeHouseType(houseTypeRaw)
+	if err != nil {
+		issues = append(issues, validationIssue{Row: rowNumber, Field: "house_type", Message: err.Error()})
+	}
+
+	if kandangID > 0 {
+		if previousRow, exists := seenKandangIDs[kandangID]; exists {
+			issues = append(issues, validationIssue{
+				Row:     rowNumber,
+				Field:   "kandang_id",
+				Message: fmt.Sprintf("duplicate value %d (already used in row %d)", kandangID, previousRow),
+			})
+		} else {
+			seenKandangIDs[kandangID] = rowNumber
+		}
+	}
+
+	if len(issues) > 0 {
+		return nil, issues
+	}
+
+	return &kandangHouseTypeImportRow{
+		RowNumber:   rowNumber,
+		KandangID:   kandangID,
+		KandangName: kandangNameRaw,
+		HouseType:   houseType,
+	}, nil
+}
+
+func normalizeHouseType(raw string) (string, error) {
+	normalized := strings.ToLower(strings.TrimSpace(raw))
+	if normalized == "" {
+		return string(utils.HouseTypeOpenHouse), nil
+	}
+
+	switch normalized {
+	case string(utils.HouseTypeOpenHouse), string(utils.HouseTypeCloseHouse):
+		return normalized, nil
+	default:
+		return "", fmt.Errorf("must be one of: open_house, close_house (or empty for default open_house)")
+	}
+}
+
+func parsePositiveUint(raw string) (uint, error) {
+	if raw == "" {
+		return 0, fmt.Errorf("is required")
+	}
+
+	uintValue, err := strconv.ParseUint(raw, 10, 64)
+	if err == nil {
+		if uintValue == 0 {
+			return 0, fmt.Errorf("must be greater than 0")
+		}
+		return uint(uintValue), nil
+	}
+
+	floatValue, floatErr := strconv.ParseFloat(raw, 64)
+	if floatErr != nil {
+		return 0, fmt.Errorf("must be a positive integer")
+	}
+	if floatValue <= 0 {
+		return 0, fmt.Errorf("must be greater than 0")
+	}
+	if floatValue != float64(uint(floatValue)) {
+		return 0, fmt.Errorf("must be a positive integer")
+	}
+
+	return uint(floatValue), nil
+}
+
+func isRowEmpty(row []string) bool {
+	for _, cell := range row {
+		if strings.TrimSpace(cell) != "" {
+			return false
+		}
+	}
+	return true
+}
+
+func normalizeHeader(raw string) string {
+	return strings.ToLower(strings.TrimSpace(raw))
+}
+
+func cellValue(row []string, index int) string {
+	if index < 0 || index >= len(row) {
+		return ""
+	}
+	return row[index]
+}
+
+func collectKandangIDs(rows []kandangHouseTypeImportRow) []uint {
+	ids := make([]uint, 0, len(rows))
+	seen := make(map[uint]struct{}, len(rows))
+	for _, row := range rows {
+		if row.KandangID == 0 {
+			continue
+		}
+		if _, exists := seen[row.KandangID]; exists {
+			continue
+		}
+		seen[row.KandangID] = struct{}{}
+		ids = append(ids, row.KandangID)
+	}
+	sort.Slice(ids, func(i, j int) bool { return ids[i] < ids[j] })
+	return ids
+}
+
+func (r dbKandangResolver) ResolveActiveKandangs(ctx context.Context, kandangIDs []uint) (map[uint]string, error) {
+	result := make(map[uint]string)
+	if len(kandangIDs) == 0 {
+		return result, nil
+	}
+
+	rows := make([]kandangIdentityRow, 0, len(kandangIDs))
+	if err := r.db.WithContext(ctx).
+		Table("kandangs").
+		Select("id, name").
+		Where("id IN ?", kandangIDs).
+		Where("deleted_at IS NULL").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	for _, row := range rows {
+		result[row.ID] = row.Name
+	}
+
+	return result, nil
+}
+
+func buildMissingKandangIssues(rows []kandangHouseTypeImportRow, kandangNameByID map[uint]string) []validationIssue {
+	issues := make([]validationIssue, 0)
+	for _, row := range rows {
+		if _, exists := kandangNameByID[row.KandangID]; exists {
+			continue
+		}
+		issues = append(issues, validationIssue{
+			Row:     row.RowNumber,
+			Field:   "kandang_id",
+			Message: fmt.Sprintf("value %d must reference an active kandang", row.KandangID),
+		})
+	}
+	return issues
+}
+
+func buildNameMismatchIssues(rows []kandangHouseTypeImportRow, kandangNameByID map[uint]string) []validationIssue {
+	issues := make([]validationIssue, 0)
+	for _, row := range rows {
+		dbName, exists := kandangNameByID[row.KandangID]
+		if !exists {
+			continue
+		}
+		if strings.EqualFold(strings.TrimSpace(row.KandangName), strings.TrimSpace(dbName)) {
+			continue
+		}
+
+		issues = append(issues, validationIssue{
+			Row:     row.RowNumber,
+			Field:   "kandang_name",
+			Message: fmt.Sprintf("value %q does not match kandang_id %d name %q", row.KandangName, row.KandangID, dbName),
+		})
+	}
+	return issues
+}
+
+func printPlanRows(rows []kandangHouseTypeImportRow, kandangNameByID map[uint]string) {
+	for _, row := range rows {
+		fmt.Printf(
+			"PLAN row=%d kandang_id=%d kandang_name_file=%q kandang_name_db=%q house_type=%q\n",
+			row.RowNumber,
+			row.KandangID,
+			row.KandangName,
+			kandangNameByID[row.KandangID],
+			row.HouseType,
+		)
+	}
+}
+
+func sortValidationIssues(issues []validationIssue) {
+	sort.Slice(issues, func(i, j int) bool {
+		if issues[i].Row == issues[j].Row {
+			if issues[i].Field == issues[j].Field {
+				return issues[i].Message < issues[j].Message
+			}
+			return issues[i].Field < issues[j].Field
+		}
+		return issues[i].Row < issues[j].Row
+	})
+}
+
+func applyImportRows(
+	ctx context.Context,
+	runner txRunner,
+	rows []kandangHouseTypeImportRow,
+) ([]applyRowResult, int64, error) {
+	results := make([]applyRowResult, 0, len(rows))
+	normalizedNullCount := int64(0)
+
+	err := runner.InTx(ctx, func(store kandangHouseTypeStore) error {
+		for _, row := range rows {
+			changed, err := store.UpdateKandangHouseType(ctx, row.KandangID, row.HouseType)
+			if err != nil {
+				return fmt.Errorf("row %d kandang_id=%d update failed: %w", row.RowNumber, row.KandangID, err)
+			}
+
+			results = append(results, applyRowResult{
+				RowNumber: row.RowNumber,
+				KandangID: row.KandangID,
+				HouseType: row.HouseType,
+				Changed:   changed,
+			})
+		}
+
+		normalized, err := store.NormalizeNullHouseType(ctx)
+		if err != nil {
+			return fmt.Errorf("normalize null house_type to open_house failed: %w", err)
+		}
+		normalizedNullCount = normalized
+
+		return nil
+	})
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return results, normalizedNullCount, nil
+}
+
+func (r dbTxRunner) InTx(ctx context.Context, fn func(store kandangHouseTypeStore) error) error {
+	return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		return fn(dbKandangHouseTypeStore{db: tx})
+	})
+}
+
+func (s dbKandangHouseTypeStore) UpdateKandangHouseType(ctx context.Context, kandangID uint, houseType string) (bool, error) {
+	result := s.db.WithContext(ctx).Exec(`
+		UPDATE kandangs
+		SET house_type = ?::house_type_enum,
+		    updated_at = NOW()
+		WHERE id = ?
+		  AND deleted_at IS NULL
+		  AND house_type IS DISTINCT FROM ?::house_type_enum
+	`, houseType, kandangID, houseType)
+	if result.Error != nil {
+		return false, result.Error
+	}
+	return result.RowsAffected > 0, nil
+}
+
+func (s dbKandangHouseTypeStore) NormalizeNullHouseType(ctx context.Context) (int64, error) {
+	result := s.db.WithContext(ctx).Exec(`
+		UPDATE kandangs
+		SET house_type = 'open_house'::house_type_enum,
+		    updated_at = NOW()
+		WHERE deleted_at IS NULL
+		  AND house_type IS NULL
+	`)
+	if result.Error != nil {
+		return 0, result.Error
+	}
+	return result.RowsAffected, nil
+}
+
+func modeLabel(apply bool) string {
+	if apply {
+		return "APPLY"
+	}
+	return "DRY-RUN"
+}
+
+func applyStatus(changed bool) string {
+	if changed {
+		return "UPDATED"
+	}
+	return "UNCHANGED"
+}
+
+func countChangedRows(results []applyRowResult) int {
+	count := 0
+	for _, item := range results {
+		if item.Changed {
+			count++
+		}
+	}
+	return count
+}

cmd/import-kandang-house-types/main_test.go

@@ -0,0 +1,280 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/xuri/excelize/v2"
+)
+
+func TestParseKandangHouseTypeFile_ValidSingleRowAndDefaultHouseType(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"kandang_house_type",
+		[]string{"kandang_id", "kandang_name", "house_type"},
+		[][]string{{"101", "Kandang A1", ""}},
+	)
+
+	sheet, rows, issues, err := parseKandangHouseTypeFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if sheet != "kandang_house_type" {
+		t.Fatalf("expected sheet kandang_house_type, got %q", sheet)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	if rows[0].KandangID != 101 {
+		t.Fatalf("expected kandang_id 101, got %d", rows[0].KandangID)
+	}
+	if rows[0].KandangName != "Kandang A1" {
+		t.Fatalf("expected kandang_name Kandang A1, got %q", rows[0].KandangName)
+	}
+	if rows[0].HouseType != "open_house" {
+		t.Fatalf("expected default house_type open_house, got %q", rows[0].HouseType)
+	}
+}
+
+func TestParseKandangHouseTypeFile_TypeHouseHeaderAlias(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"kandang_house_type",
+		[]string{"kandang_id", "kandang_name", "type_house"},
+		[][]string{{"101", "Kandang A1", "close_house"}},
+	)
+
+	_, rows, issues, err := parseKandangHouseTypeFile(filePath, "kandang_house_type")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(issues) != 0 {
+		t.Fatalf("expected no issues, got %+v", issues)
+	}
+	if len(rows) != 1 || rows[0].HouseType != "close_house" {
+		t.Fatalf("expected parsed close_house row, got %+v", rows)
+	}
+}
+
+func TestParseKandangHouseTypeFile_InvalidHouseType(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"kandang_house_type",
+		[]string{"kandang_id", "kandang_name", "house_type"},
+		[][]string{{"101", "Kandang A1", "semi_house"}},
+	)
+
+	_, rows, issues, err := parseKandangHouseTypeFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 0 {
+		t.Fatalf("expected no valid rows, got %d", len(rows))
+	}
+	if !hasIssue(issues, 2, "house_type", "must be one of") {
+		t.Fatalf("expected invalid house_type issue, got %+v", issues)
+	}
+}
+
+func TestParseKandangHouseTypeFile_DuplicateKandangID(t *testing.T) {
+	filePath := createWorkbook(
+		t,
+		"kandang_house_type",
+		[]string{"kandang_id", "kandang_name", "house_type"},
+		[][]string{
+			{"101", "Kandang A1", "open_house"},
+			{"101", "Kandang A2", "close_house"},
+		},
+	)
+
+	_, rows, issues, err := parseKandangHouseTypeFile(filePath, "")
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected first row valid and second invalid, got %d", len(rows))
+	}
+	if !hasIssue(issues, 3, "kandang_id", "duplicate value 101") {
+		t.Fatalf("expected duplicate kandang_id issue, got %+v", issues)
+	}
+}
+
+func TestBuildNameMismatchIssues(t *testing.T) {
+	rows := []kandangHouseTypeImportRow{{
+		RowNumber:   2,
+		KandangID:   10,
+		KandangName: "Kandang Salah",
+		HouseType:   "open_house",
+	}}
+
+	issues := buildNameMismatchIssues(rows, map[uint]string{10: "Kandang Benar"})
+	if !hasIssue(issues, 2, "kandang_name", "does not match") {
+		t.Fatalf("expected name mismatch issue, got %+v", issues)
+	}
+}
+
+func TestApplyImportRows_Success(t *testing.T) {
+	store := &fakeStore{
+		changedByID:     map[uint]bool{101: true, 102: false},
+		normalizeResult: 3,
+	}
+	runner := &fakeTransactionRunner{store: store}
+
+	rows := []kandangHouseTypeImportRow{
+		{RowNumber: 2, KandangID: 101, HouseType: "open_house"},
+		{RowNumber: 3, KandangID: 102, HouseType: "close_house"},
+	}
+
+	results, normalized, err := applyImportRows(context.Background(), runner, rows)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if runner.txCalls != 1 {
+		t.Fatalf("expected 1 tx call, got %d", runner.txCalls)
+	}
+	if len(results) != 2 {
+		t.Fatalf("expected 2 row results, got %d", len(results))
+	}
+	if normalized != 3 {
+		t.Fatalf("expected normalized count 3, got %d", normalized)
+	}
+	if !results[0].Changed || results[1].Changed {
+		t.Fatalf("unexpected changed flags: %+v", results)
+	}
+	if len(store.updateCalls) != 2 {
+		t.Fatalf("expected 2 update calls, got %d", len(store.updateCalls))
+	}
+}
+
+func TestApplyImportRows_FailOnUpdate(t *testing.T) {
+	store := &fakeStore{
+		updateErrByID: map[uint]error{101: errors.New("boom")},
+	}
+	runner := &fakeTransactionRunner{store: store}
+
+	rows := []kandangHouseTypeImportRow{{RowNumber: 2, KandangID: 101, HouseType: "open_house"}}
+
+	_, _, err := applyImportRows(context.Background(), runner, rows)
+	if err == nil {
+		t.Fatalf("expected error, got nil")
+	}
+	if !strings.Contains(err.Error(), "update failed") {
+		t.Fatalf("expected update failed error, got %v", err)
+	}
+}
+
+func TestCountChangedRows(t *testing.T) {
+	count := countChangedRows([]applyRowResult{{Changed: true}, {Changed: false}, {Changed: true}})
+	if count != 2 {
+		t.Fatalf("expected 2 changed rows, got %d", count)
+	}
+}
+
+type fakeTransactionRunner struct {
+	store   *fakeStore
+	txCalls int
+}
+
+func (f *fakeTransactionRunner) InTx(_ context.Context, fn func(store kandangHouseTypeStore) error) error {
+	f.txCalls++
+	return fn(f.store)
+}
+
+type updateCall struct {
+	kandangID uint
+	houseType string
+}
+
+type fakeStore struct {
+	updateCalls     []updateCall
+	changedByID     map[uint]bool
+	updateErrByID   map[uint]error
+	normalizeResult int64
+	normalizeErr    error
+}
+
+func (f *fakeStore) UpdateKandangHouseType(_ context.Context, kandangID uint, houseType string) (bool, error) {
+	f.updateCalls = append(f.updateCalls, updateCall{kandangID: kandangID, houseType: houseType})
+	if err, exists := f.updateErrByID[kandangID]; exists {
+		return false, err
+	}
+	if changed, exists := f.changedByID[kandangID]; exists {
+		return changed, nil
+	}
+	return true, nil
+}
+
+func (f *fakeStore) NormalizeNullHouseType(_ context.Context) (int64, error) {
+	if f.normalizeErr != nil {
+		return 0, f.normalizeErr
+	}
+	return f.normalizeResult, nil
+}
+
+func createWorkbook(t *testing.T, sheetName string, headers []string, rows [][]string) string {
+	t.Helper()
+
+	f := excelize.NewFile()
+	if sheetName == "" {
+		sheetName = "Sheet1"
+	}
+	defaultSheet := f.GetSheetName(0)
+	if defaultSheet != sheetName {
+		idx, err := f.NewSheet(sheetName)
+		if err != nil {
+			t.Fatalf("failed creating sheet: %v", err)
+		}
+		f.SetActiveSheet(idx)
+		_ = f.DeleteSheet(defaultSheet)
+	}
+
+	for idx, header := range headers {
+		cell, err := excelize.CoordinatesToCellName(idx+1, 1)
+		if err != nil {
+			t.Fatalf("failed computing header cell: %v", err)
+		}
+		if err := f.SetCellValue(sheetName, cell, header); err != nil {
+			t.Fatalf("failed setting header cell: %v", err)
+		}
+	}
+
+	for rowIdx, row := range rows {
+		for colIdx, value := range row {
+			cell, err := excelize.CoordinatesToCellName(colIdx+1, rowIdx+2)
+			if err != nil {
+				t.Fatalf("failed computing row cell: %v", err)
+			}
+			if err := f.SetCellValue(sheetName, cell, value); err != nil {
+				t.Fatalf("failed setting row cell: %v", err)
+			}
+		}
+	}
+
+	path := filepath.Join(t.TempDir(), "kandang_house_type.xlsx")
+	if err := f.SaveAs(path); err != nil {
+		t.Fatalf("failed saving workbook: %v", err)
+	}
+
+	return path
+}
+
+func hasIssue(issues []validationIssue, row int, field string, contains string) bool {
+	for _, issue := range issues {
+		if issue.Row != row {
+			continue
+		}
+		if issue.Field != field {
+			continue
+		}
+		if strings.Contains(issue.Message, contains) {
+			return true
+		}
+	}
+	return false
+}

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

@@ -0,0 +1,380 @@
+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/run-sql-file/main.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/config"
+	"gitlab.com/mbugroup/lti-api.git/internal/database"
+	"gorm.io/gorm"
+)
+
+type options struct {
+	FilePath string
+	Apply    bool
+}
+
+func main() {
+	var opts options
+	flag.StringVar(&opts.FilePath, "file", "", "Path to .sql file (required)")
+	flag.BoolVar(&opts.Apply, "apply", false, "Apply SQL to database. If false, run as dry-run")
+	flag.Parse()
+
+	opts.FilePath = strings.TrimSpace(opts.FilePath)
+	if opts.FilePath == "" {
+		log.Fatal("--file is required")
+	}
+
+	sqlContent, err := readSQLFile(opts.FilePath)
+	if err != nil {
+		log.Fatalf("failed reading sql file: %v", err)
+	}
+
+	mode := "dry-run"
+	if opts.Apply {
+		mode = "apply"
+	}
+	fmt.Printf("Mode: %s\n", mode)
+	fmt.Printf("File: %s\n", opts.FilePath)
+	fmt.Printf("SQL bytes: %d\n", len(sqlContent))
+
+	if !opts.Apply {
+		fmt.Println("Dry-run only. Add --apply to execute the SQL file.")
+		return
+	}
+
+	db := database.Connect(config.DBHost, config.DBName)
+	if err := executeSQL(db, sqlContent); err != nil {
+		log.Fatalf("failed executing sql file: %v", err)
+	}
+
+	fmt.Println("DONE: SQL executed successfully")
+}
+
+func readSQLFile(path string) (string, error) {
+	raw, err := os.ReadFile(path)
+	if err != nil {
+		return "", err
+	}
+
+	sql := strings.TrimSpace(strings.TrimPrefix(string(raw), "\ufeff"))
+	if sql == "" {
+		return "", fmt.Errorf("sql file is empty")
+	}
+
+	return sql, nil
+}
+
+func executeSQL(db *gorm.DB, sql string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+		return tx.Exec(sql).Error
+	})
+}

docs/farm_depreciation_manual_inputs_import.md

@@ -0,0 +1,76 @@
+# Farm Depreciation Manual Inputs Import
+
+Command ini dipakai untuk bulk import data ke tabel `farm_depreciation_manual_inputs` dari file Excel (`.xlsx`).
+
+## Command
+
+```bash
+go run ./cmd/import-farm-depreciation-manual-inputs --file <path.xlsx> [--sheet <name>] [--apply]
+```
+
+## Flags
+
+- `--file` (required): path file `.xlsx`.
+- `--sheet` (optional): nama sheet. Jika tidak diisi, command pakai sheet pertama.
+- `--apply` (optional): default `false` (dry-run). Jika `true`, command menulis ke database.
+
+## Mode
+
+- Dry-run (default):
+  - parsing dan validasi semua baris.
+  - validasi `project_flock_id` terhadap farm aktif kategori `LAYING`.
+  - menampilkan `PLAN` + daftar error.
+  - tidak menulis data.
+
+- Apply (`--apply`):
+  - semua validasi tetap dijalankan dulu.
+  - jika ada 1 error, proses dihentikan.
+  - jika valid, upsert dijalankan dalam 1 transaksi (fail-fast).
+  - setelah upsert, snapshot di `farm_depreciation_snapshots` dihapus mulai `cutover_date` untuk `project_flock_id` terkait.
+
+## Format Excel
+
+Template tersedia di:
+
+- `docs/templates/farm_depreciation_manual_inputs.xlsx`
+
+Header wajib ada di baris 1 (case-insensitive, trim-spaces):
+
+- `project_flock_id` (required, integer > 0)
+- `total_cost` (required, numeric >= 0)
+- `cutover_date` (required, format `YYYY-MM-DD`)
+- `note` (optional, max 1000 karakter)
+
+Catatan:
+
+- Dalam 1 file tidak boleh ada duplikat `project_flock_id`.
+- `project_flock_id` harus mengarah ke `project_flocks` yang `deleted_at IS NULL` dan `category = LAYING`.
+
+## Contoh
+
+Dry-run:
+
+```bash
+env DB_HOST=127.0.0.1 DB_PORT=5432 DB_NAME=lti DB_USER=postgres DB_PASSWORD=postgres \
+go run ./cmd/import-farm-depreciation-manual-inputs \
+  --file docs/templates/farm_depreciation_manual_inputs.xlsx
+```
+
+Apply:
+
+```bash
+env DB_HOST=127.0.0.1 DB_PORT=5432 DB_NAME=lti DB_USER=postgres DB_PASSWORD=postgres \
+go run ./cmd/import-farm-depreciation-manual-inputs \
+  --file /path/to/farm_depreciation_manual_inputs.xlsx \
+  --sheet manual_inputs \
+  --apply
+```
+
+## Error Umum
+
+- `required header is missing`: header wajib tidak ditemukan.
+- `must be a positive integer`: `project_flock_id` bukan integer valid.
+- `must be greater than or equal to 0`: `total_cost` negatif.
+- `must follow format YYYY-MM-DD`: `cutover_date` tidak sesuai format.
+- `duplicate value ...`: `project_flock_id` duplikat dalam file yang sama.
+- `must reference an active LAYING project_flock`: farm tidak valid untuk import ini.

docs/postman/read-api.environment.json

@@ -0,0 +1,174 @@
+{
+  "_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"
+    }
+  ]
+}

internal/apikeys/defaults.go

@@ -0,0 +1,93 @@
+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.expense.depreciation.manage",
+		"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

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

@@ -0,0 +1,233 @@
+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/common.hpp.repository.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -23,6 +24,7 @@ type HppCostRepository interface {
 	GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, startDate *time.Time, endDate *time.Time) (float64, float64, error)
 	GetProjectFlockIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangId uint) (uint, error)
 	GetTransferSourceSummary(ctx context.Context, projectFlockKandangId uint) (uint, float64, error)
+	GetManualDepreciationCostByProjectFlockID(ctx context.Context, projectFlockId uint) (float64, error)
 }
 
 type HppRepositoryImpl struct {
@@ -48,12 +50,32 @@ func (r *HppRepositoryImpl) GetProjectFlockKandangIDs(ctx context.Context, proje
 }
 
 func (r *HppRepositoryImpl) GetDocCost(ctx context.Context, projectFlockKandangIDs []uint) (float64, error) {
+	stockablePurchase := fifo.StockableKeyPurchaseItems.String()
+	stockableAdjustment := fifo.StockableKeyAdjustmentIn.String()
+	usableProjectChickin := fifo.UsableKeyProjectChickin.String()
+
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("project_chickins AS pc").
-		Select("COALESCE(SUM(sa.qty * COALESCE(pi.price, 0)), 0)").
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", fifo.UsableKeyProjectChickin.String(), fifo.StockableKeyPurchaseItems.String(), entity.StockAllocationStatusActive, entity.StockAllocationPurposeTraceChickin).
-		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
+		Select(`
+			COALESCE(SUM(sa.qty * CASE
+				WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
+				WHEN sa.stockable_type = ? THEN COALESCE(ast.price, 0)
+				ELSE 0
+			END), 0)`,
+			stockablePurchase,
+			stockableAdjustment,
+		).
+		Joins(
+			"JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND (sa.stockable_type = ? OR sa.stockable_type = ?) AND sa.status = ? AND sa.allocation_purpose = ?",
+			usableProjectChickin,
+			stockablePurchase,
+			stockableAdjustment,
+			entity.StockAllocationStatusActive,
+			entity.StockAllocationPurposeTraceChickin,
+		).
+		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", stockablePurchase).
+		Joins("LEFT JOIN adjustment_stocks AS ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", stockableAdjustment).
 		Where("pc.project_flock_kandang_id IN (?)", projectFlockKandangIDs).
 		Scan(&total).Error
 	if err != nil {
@@ -85,7 +107,7 @@ func (r *HppRepositoryImpl) GetExpedisionCost(ctx context.Context, projectFlockK
 		Joins("JOIN expense_realizations AS er ON er.expense_nonstock_id = en.id").
 		Joins("JOIN flags AS f ON f.flagable_id = en.nonstock_id AND f.flagable_type = ?", entity.FlagableTypeNonstock).
 		Where("en.project_flock_kandang_id IN (?)", projectFlockKandangIDs).
-		Where("f.name = ?", utils.FlagEkspedisi).
+		// Where("f.name = ?", utils.FlagEkspedisi).
 		Scan(&total).Error
 	if err != nil {
 		return 0, err
@@ -100,15 +122,35 @@ func (r *HppRepositoryImpl) GetFeedUsageCost(ctx context.Context, projectFlockKa
 		date = &now
 	}
 
+	stockablePurchase := fifo.StockableKeyPurchaseItems.String()
+	stockableAdjustment := fifo.StockableKeyAdjustmentIn.String()
+	usableRecordingStock := fifo.UsableKeyRecordingStock.String()
+
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("recordings AS r").
-		Select("COALESCE(SUM(sa.qty * COALESCE(pi.price, 0)), 0)").
+		Select(`
+			COALESCE(SUM(sa.qty * CASE
+				WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
+				WHEN sa.stockable_type = ? THEN COALESCE(ast.price, 0)
+				ELSE 0
+			END), 0)`,
+			stockablePurchase,
+			stockableAdjustment,
+		).
 		Joins("JOIN recording_stocks AS rs ON rs.recording_id = r.id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
 		Joins("JOIN flags AS f ON f.flagable_id = pw.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String(), entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume).
-		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
+		Joins(
+			"JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND (sa.stockable_type = ? OR sa.stockable_type = ?) AND sa.status = ? AND sa.allocation_purpose = ?",
+			usableRecordingStock,
+			stockablePurchase,
+			stockableAdjustment,
+			entity.StockAllocationStatusActive,
+			entity.StockAllocationPurposeConsume,
+		).
+		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", stockablePurchase).
+		Joins("LEFT JOIN adjustment_stocks AS ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", stockableAdjustment).
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
 		Where("r.record_datetime <= ?", *date).
 		Where("f.name = ?", utils.FlagPakan).
@@ -132,15 +174,34 @@ func (r *HppRepositoryImpl) GetOvkUsageCost(ctx context.Context, projectFlockKan
 		utils.FlagVitamin,
 		utils.FlagKimia,
 	}
+	stockablePurchase := fifo.StockableKeyPurchaseItems.String()
+	stockableAdjustment := fifo.StockableKeyAdjustmentIn.String()
+	usableRecordingStock := fifo.UsableKeyRecordingStock.String()
 
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("recordings AS r").
-		Select("COALESCE(SUM(sa.qty * COALESCE(pi.price, 0)), 0)").
+		Select(`
+			COALESCE(SUM(sa.qty * CASE
+				WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
+				WHEN sa.stockable_type = ? THEN COALESCE(ast.price, 0)
+				ELSE 0
+			END), 0)`,
+			stockablePurchase,
+			stockableAdjustment,
+		).
 		Joins("JOIN recording_stocks AS rs ON rs.recording_id = r.id").
 		Joins("JOIN product_warehouses AS pw ON pw.id = rs.product_warehouse_id").
-		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?", fifo.UsableKeyRecordingStock.String(), fifo.StockableKeyPurchaseItems.String(), entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume).
-		Joins("JOIN purchase_items AS pi ON pi.id = sa.stockable_id").
+		Joins(
+			"JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = rs.id AND (sa.stockable_type = ? OR sa.stockable_type = ?) AND sa.status = ? AND sa.allocation_purpose = ?",
+			usableRecordingStock,
+			stockablePurchase,
+			stockableAdjustment,
+			entity.StockAllocationStatusActive,
+			entity.StockAllocationPurposeConsume,
+		).
+		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", stockablePurchase).
+		Joins("LEFT JOIN adjustment_stocks AS ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", stockableAdjustment).
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
 		Where("r.record_datetime <= ?", *date).
 		Where("EXISTS (SELECT 1 FROM flags f WHERE f.flagable_id = pw.product_id AND f.flagable_type = ? AND f.name IN ?)", entity.FlagableTypeProduct, flags).
@@ -169,22 +230,28 @@ func (r *HppRepositoryImpl) GetTotalPopulation(ctx context.Context, projectFlock
 func (r *HppRepositoryImpl) GetPulletCost(ctx context.Context, projectFlockKandangId uint) (float64, error) {
 	stockablePurchase := fifo.StockableKeyPurchaseItems.String()
 	stockableTransferIn := fifo.StockableKeyStockTransferIn.String()
+	stockableAdjustment := fifo.StockableKeyAdjustmentIn.String()
 	usableProjectChickin := fifo.UsableKeyProjectChickin.String()
 
 	var total float64
 	err := r.db.WithContext(ctx).
 		Table("project_chickins AS pc").
 		Select(`
-			COALESCE(SUM(sa.qty * CASE
-				WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
-				WHEN sa.stockable_type = ? THEN COALESCE(tpi.price, 0)
-				ELSE 0
-			END), 0)`,
-			stockablePurchase, stockableTransferIn).
+				COALESCE(SUM(sa.qty * CASE
+					WHEN sa.stockable_type = ? THEN COALESCE(pi.price, 0)
+					WHEN sa.stockable_type = ? THEN COALESCE(tpi.price, 0)
+					WHEN sa.stockable_type = ? THEN COALESCE(ast.price, 0)
+					ELSE 0
+				END), 0)`,
+			stockablePurchase,
+			stockableTransferIn,
+			stockableAdjustment,
+		).
 		Joins("JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = pc.id AND sa.status = ? AND sa.allocation_purpose = ?", usableProjectChickin, entity.StockAllocationStatusActive, entity.StockAllocationPurposeTraceChickin).
 		Joins("LEFT JOIN purchase_items AS pi ON pi.id = sa.stockable_id AND sa.stockable_type = ?", stockablePurchase).
 		Joins("LEFT JOIN stock_allocations AS tsa ON tsa.usable_type = ? AND tsa.usable_id = sa.stockable_id AND sa.stockable_type = ? AND tsa.stockable_type = ? AND tsa.status = ? AND tsa.allocation_purpose = ?", stockableTransferIn, stockableTransferIn, stockablePurchase, entity.StockAllocationStatusActive, entity.StockAllocationPurposeConsume).
 		Joins("LEFT JOIN purchase_items AS tpi ON tpi.id = tsa.stockable_id").
+		Joins("LEFT JOIN adjustment_stocks AS ast ON ast.id = sa.stockable_id AND sa.stockable_type = ?", stockableAdjustment).
 		Where("pc.project_flock_kandang_id = ?", projectFlockKandangId).
 		Scan(&total).Error
 	if err != nil {
@@ -215,6 +282,33 @@ func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandang
 		return 0, 0, err
 	}
 
+	var adjustmentTotalWeight float64
+	adjustmentSubQuery := r.db.WithContext(ctx).
+		Table("recordings AS r").
+		Select("DISTINCT ast.id AS adjustment_id, ast.price AS price").
+		Joins("JOIN recording_eggs AS re ON re.recording_id = r.id").
+		Joins("JOIN stock_transfer_details AS std ON std.dest_product_warehouse_id = re.product_warehouse_id").
+		Joins(
+			"JOIN stock_allocations AS sa ON sa.usable_type = ? AND sa.usable_id = std.id AND sa.stockable_type = ? AND sa.status = ? AND sa.allocation_purpose = ?",
+			fifo.UsableKeyStockTransferOut.String(),
+			fifo.StockableKeyAdjustmentIn.String(),
+			entity.StockAllocationStatusActive,
+			entity.StockAllocationPurposeConsume,
+		).
+		Joins("JOIN adjustment_stocks AS ast ON ast.id = sa.stockable_id AND ast.product_warehouse_id = std.source_product_warehouse_id").
+		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
+		Where("r.record_datetime <= ?", *date)
+
+	err = r.db.WithContext(ctx).
+		Table("(?) AS adjustment_sources", adjustmentSubQuery).
+		Select("COALESCE(SUM(adjustment_sources.price), 0)").
+		Scan(&adjustmentTotalWeight).Error
+	if err != nil {
+		return 0, 0, err
+	}
+
+	totals.TotalWeightKg += adjustmentTotalWeight
+
 	return totals.TotalPieces, totals.TotalWeightKg, nil
 }
 
@@ -311,3 +405,25 @@ func (r *HppRepositoryImpl) GetTransferSourceSummary(ctx context.Context, projec
 
 	return summary.ProjectFlockID, summary.TotalQty, nil
 }
+
+func (r *HppRepositoryImpl) GetManualDepreciationCostByProjectFlockID(ctx context.Context, projectFlockId uint) (float64, error) {
+	type row struct {
+		TotalCost float64
+	}
+
+	var selected row
+	err := r.db.WithContext(ctx).
+		Table("farm_depreciation_manual_inputs").
+		Select("total_cost").
+		Where("project_flock_id = ?", projectFlockId).
+		Limit(1).
+		Take(&selected).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return 0, nil
+	}
+	if err != nil {
+		return 0, err
+	}
+
+	return selected.TotalCost, nil
+}

internal/common/repository/common.hppv2.repository_test.go

@@ -0,0 +1,248 @@
+package repository
+
+import (
+	"context"
+	"math"
+	"testing"
+	"time"
+
+	"github.com/glebarez/sqlite"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
+	"gorm.io/gorm"
+)
+
+func TestHppV2RepositoryGetEggProduksiIncludesTransferredAdjustmentStock(t *testing.T) {
+	db := setupHppV2RepositoryTestDB(t)
+
+	mustExecHppV2(t, db,
+		`INSERT INTO recordings (id, project_flock_kandangs_id, record_datetime) VALUES (1, 101, '2026-04-19 10:00:00')`,
+		`INSERT INTO recording_eggs (id, recording_id, product_warehouse_id, qty, weight, project_flock_kandang_id) VALUES (1, 1, 401, 80, 8, 101)`,
+		`INSERT INTO stock_transfers (id, transfer_date) VALUES (1, '2026-04-18 08:00:00')`,
+		`INSERT INTO stock_transfer_details (id, stock_transfer_id, source_product_warehouse_id, dest_product_warehouse_id) VALUES (1, 1, 301, 401)`,
+		`INSERT INTO stock_allocations (id, usable_type, usable_id, stockable_type, stockable_id, status, allocation_purpose) VALUES (1, 'STOCK_TRANSFER_OUT', 1, 'ADJUSTMENT_IN', 501, 'ACTIVE', 'CONSUME')`,
+		`INSERT INTO adjustment_stocks (id, product_warehouse_id, total_qty, price, created_at) VALUES (501, 301, 20, 2.5, '2026-04-18 07:30:00')`,
+	)
+
+	repo := &HppV2RepositoryImpl{db: db}
+	endDate := mustJakartaTime(t, "2026-04-20 00:00:00")
+
+	totalPieces, totalWeightKg, err := repo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{101}, &endDate)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	assertFloatEquals(t, totalPieces, 100)
+	assertFloatEquals(t, totalWeightKg, 10.5)
+}
+
+func TestHppV2RepositoryGetEggTerjualUsesEndDateForSameDayFarmSales(t *testing.T) {
+	db := setupHppV2RepositoryTestDB(t)
+
+	mustExecHppV2(t, db,
+		`INSERT INTO kandangs (id, location_id) VALUES (1, 10), (2, 10)`,
+		`INSERT INTO project_flock_kandangs (id, kandang_id) VALUES (101, 1), (102, 2)`,
+		`INSERT INTO warehouses (id, type, location_id) VALUES (201, 'LOKASI', 10)`,
+		`INSERT INTO product_warehouses (id, warehouse_id, product_id, project_flock_kandang_id) VALUES (301, 201, 900, NULL)`,
+		`INSERT INTO flags (id, flagable_type, flagable_id, name) VALUES (1, 'products', 900, 'TELUR')`,
+		`INSERT INTO recordings (id, project_flock_kandangs_id, record_datetime, deleted_at) VALUES (1, 101, '2026-04-19 08:00:00', NULL), (2, 102, '2026-04-19 09:00:00', NULL)`,
+		`INSERT INTO recording_eggs (id, recording_id, product_warehouse_id, qty, weight, project_flock_kandang_id) VALUES (1, 1, 301, 60, 6, 101), (2, 2, 301, 40, 4, 102)`,
+		`INSERT INTO marketing_products (id, product_warehouse_id) VALUES (401, 301)`,
+		`INSERT INTO marketing_delivery_products (id, marketing_product_id, usage_qty, total_weight, delivery_date) VALUES (501, 401, 50, 5, '2026-04-19 12:00:00')`,
+	)
+
+	repo := &HppV2RepositoryImpl{db: db}
+	startDate := mustJakartaTime(t, "2026-04-19 00:00:00")
+	endDate := mustJakartaTime(t, "2026-04-20 00:00:00")
+
+	totalPieces, totalWeightKg, err := repo.GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{101}, &startDate, &endDate)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	assertFloatEquals(t, totalPieces, 30)
+	assertFloatEquals(t, totalWeightKg, 3)
+}
+
+func TestHppV2RepositoryGetEggTerjualProratesHistoricalFarmSalesFromAdjustments(t *testing.T) {
+	db := setupHppV2RepositoryTestDB(t)
+
+	mustExecHppV2(t, db,
+		`INSERT INTO kandangs (id, location_id) VALUES (1, 10), (2, 10)`,
+		`INSERT INTO project_flock_kandangs (id, kandang_id) VALUES (101, 1), (102, 2)`,
+		`INSERT INTO warehouses (id, type, location_id) VALUES (201, 'LOKASI', 10), (211, 'KANDANG', 10), (212, 'KANDANG', 10)`,
+		`INSERT INTO product_warehouses (id, warehouse_id, product_id, project_flock_kandang_id) VALUES (301, 201, 900, NULL), (311, 211, 900, 101), (312, 212, 900, 102)`,
+		`INSERT INTO flags (id, flagable_type, flagable_id, name) VALUES (1, 'products', 900, 'TELUR')`,
+		`INSERT INTO stock_transfers (id, transfer_date) VALUES (1, '2026-04-18 08:00:00'), (2, '2026-04-18 08:15:00')`,
+		`INSERT INTO stock_transfer_details (id, stock_transfer_id, source_product_warehouse_id, dest_product_warehouse_id) VALUES (1, 1, 311, 301), (2, 2, 312, 301)`,
+		`INSERT INTO adjustment_stocks (id, product_warehouse_id, usage_qty, price, function_code, transaction_type, created_at) VALUES
+			(801, 311, 70, 7, 'RECORDING_EGG_IN', 'RECORDING', '2026-04-18 07:00:00'),
+			(802, 312, 30, 3, 'RECORDING_EGG_IN', 'RECORDING', '2026-04-18 07:30:00')`,
+		`INSERT INTO marketing_products (id, product_warehouse_id) VALUES (401, 301)`,
+		`INSERT INTO marketing_delivery_products (id, marketing_product_id, usage_qty, total_weight, delivery_date) VALUES (501, 401, 20, 2, '2026-04-19 12:00:00')`,
+	)
+
+	repo := &HppV2RepositoryImpl{db: db}
+	startDate := mustJakartaTime(t, "2026-04-19 00:00:00")
+	endDate := mustJakartaTime(t, "2026-04-20 00:00:00")
+
+	totalPieces, totalWeightKg, err := repo.GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{101}, &startDate, &endDate)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	assertFloatEquals(t, totalPieces, 14)
+	assertFloatEquals(t, totalWeightKg, 1.4)
+}
+
+func setupHppV2RepositoryTestDB(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)
+	}
+
+	mustExecHppV2(t, db,
+		`CREATE TABLE recordings (
+			id INTEGER PRIMARY KEY,
+			project_flock_kandangs_id INTEGER NULL,
+			record_datetime DATETIME NULL,
+			deleted_at DATETIME NULL
+		)`,
+		`CREATE TABLE recording_eggs (
+			id INTEGER PRIMARY KEY,
+			recording_id INTEGER NULL,
+			product_warehouse_id INTEGER NULL,
+			qty NUMERIC(15,3) NULL,
+			weight NUMERIC(15,3) NULL,
+			project_flock_kandang_id INTEGER NULL
+		)`,
+		`CREATE TABLE stock_transfers (
+			id INTEGER PRIMARY KEY,
+			transfer_date DATETIME NULL
+		)`,
+		`CREATE TABLE stock_transfer_details (
+			id INTEGER PRIMARY KEY,
+			stock_transfer_id INTEGER NULL,
+			source_product_warehouse_id INTEGER NULL,
+			dest_product_warehouse_id INTEGER NULL
+		)`,
+		`CREATE TABLE stock_allocations (
+			id INTEGER PRIMARY KEY,
+			usable_type TEXT NULL,
+			usable_id INTEGER NULL,
+			stockable_type TEXT NULL,
+			stockable_id INTEGER NULL,
+			status TEXT NULL,
+			allocation_purpose TEXT NULL,
+			qty NUMERIC(15,3) NULL
+		)`,
+		`CREATE TABLE adjustment_stocks (
+			id INTEGER PRIMARY KEY,
+			product_warehouse_id INTEGER NULL,
+			total_qty NUMERIC(15,3) NULL,
+			usage_qty NUMERIC(15,3) NULL,
+			price NUMERIC(15,3) NULL,
+			grand_total NUMERIC(15,3) NULL,
+			function_code TEXT NULL,
+			transaction_type TEXT NULL,
+			created_at DATETIME NULL
+		)`,
+		`CREATE TABLE kandangs (
+			id INTEGER PRIMARY KEY,
+			location_id INTEGER NULL
+		)`,
+		`CREATE TABLE project_flock_kandangs (
+			id INTEGER PRIMARY KEY,
+			kandang_id INTEGER NULL,
+			project_flock_id INTEGER NULL
+		)`,
+		`CREATE TABLE warehouses (
+			id INTEGER PRIMARY KEY,
+			type TEXT NULL,
+			location_id INTEGER NULL
+		)`,
+		`CREATE TABLE product_warehouses (
+			id INTEGER PRIMARY KEY,
+			warehouse_id INTEGER NULL,
+			product_id INTEGER NULL,
+			project_flock_kandang_id INTEGER NULL
+		)`,
+		`CREATE TABLE marketing_products (
+			id INTEGER PRIMARY KEY,
+			product_warehouse_id INTEGER NULL
+		)`,
+		`CREATE TABLE marketing_delivery_products (
+			id INTEGER PRIMARY KEY,
+			marketing_product_id INTEGER NULL,
+			usage_qty NUMERIC(15,3) NULL,
+			total_weight NUMERIC(15,3) NULL,
+			delivery_date DATETIME NULL
+		)`,
+		`CREATE TABLE flags (
+			id INTEGER PRIMARY KEY,
+			flagable_type TEXT NULL,
+			flagable_id INTEGER NULL,
+			name TEXT NULL
+		)`,
+	)
+
+	return db
+}
+
+func mustExecHppV2(t *testing.T, db *gorm.DB, statements ...string) {
+	t.Helper()
+
+	for _, statement := range statements {
+		if err := db.Exec(statement).Error; err != nil {
+			t.Fatalf("failed executing statement %q: %v", statement, err)
+		}
+	}
+}
+
+func mustJakartaTime(t *testing.T, raw string) time.Time {
+	t.Helper()
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		t.Fatalf("failed loading timezone: %v", err)
+	}
+
+	value, err := time.ParseInLocation("2006-01-02 15:04:05", raw, location)
+	if err != nil {
+		t.Fatalf("failed parsing time %q: %v", raw, err)
+	}
+
+	return value
+}
+
+func assertFloatEquals(t *testing.T, got float64, want float64) {
+	t.Helper()
+
+	if math.Abs(got-want) > 0.000001 {
+		t.Fatalf("expected %.6f, got %.6f", want, got)
+	}
+}
+
+func TestHppV2RepositoryConstantsStayAlignedWithProductionQueries(t *testing.T) {
+	if fifo.UsableKeyStockTransferOut.String() != "STOCK_TRANSFER_OUT" {
+		t.Fatalf("unexpected stock transfer usable key: %s", fifo.UsableKeyStockTransferOut.String())
+	}
+	if fifo.StockableKeyAdjustmentIn.String() != "ADJUSTMENT_IN" {
+		t.Fatalf("unexpected adjustment stockable key: %s", fifo.StockableKeyAdjustmentIn.String())
+	}
+	if entity.StockAllocationStatusActive != "ACTIVE" {
+		t.Fatalf("unexpected active stock allocation status: %s", entity.StockAllocationStatusActive)
+	}
+	if entity.StockAllocationPurposeConsume != "CONSUME" {
+		t.Fatalf("unexpected consume stock allocation purpose: %s", entity.StockAllocationPurposeConsume)
+	}
+	if string(utils.AdjustmentTransactionSubtypeRecordingEggIn) != "RECORDING_EGG_IN" {
+		t.Fatalf("unexpected adjustment function code: %s", utils.AdjustmentTransactionSubtypeRecordingEggIn)
+	}
+	if string(utils.AdjustmentTransactionTypeRecording) != "RECORDING" {
+		t.Fatalf("unexpected adjustment transaction type: %s", utils.AdjustmentTransactionTypeRecording)
+	}
+}

internal/common/service/common.depreciation.service.go

@@ -0,0 +1,104 @@
+package service
+
+import (
+	"strings"
+	"time"
+)
+
+const (
+	depreciationStartAgeDayCloseHouse = 155
+	depreciationStartAgeDayOpenHouse  = 176
+)
+
+func NormalizeDepreciationHouseType(raw string) string {
+	return strings.TrimSpace(strings.ToLower(raw))
+}
+
+func DepreciationStartAgeDay(houseType string) int {
+	switch NormalizeDepreciationHouseType(houseType) {
+	case "close_house":
+		return depreciationStartAgeDayCloseHouse
+	case "open_house":
+		return depreciationStartAgeDayOpenHouse
+	default:
+		return 0
+	}
+}
+
+func FlockAgeDay(originDate time.Time, periodDate time.Time) int {
+	origin := time.Date(originDate.Year(), originDate.Month(), originDate.Day(), 0, 0, 0, 0, originDate.Location())
+	period := time.Date(periodDate.Year(), periodDate.Month(), periodDate.Day(), 0, 0, 0, 0, periodDate.Location())
+	if period.Before(origin) {
+		return 0
+	}
+	return int(period.Sub(origin).Hours()/24) + 1
+}
+
+func DepreciationScheduleDay(originDate time.Time, periodDate time.Time, houseType string) int {
+	ageDay := FlockAgeDay(originDate, periodDate)
+	startAgeDay := DepreciationStartAgeDay(houseType)
+	if ageDay <= 0 || startAgeDay <= 0 || ageDay < startAgeDay {
+		return 0
+	}
+	return ageDay - startAgeDay + 1
+}
+
+func CalculateDepreciationAtDayN(
+	initialPulletCost float64,
+	dayN int,
+	houseType string,
+	percentByHouseType map[string]map[int]float64,
+) (float64, float64, float64) {
+	return CalculateDepreciationFromDayRange(initialPulletCost, 1, dayN, houseType, percentByHouseType)
+}
+
+func CalculateDepreciationFromDayRange(
+	initialPulletCost float64,
+	startDay int,
+	endDay int,
+	houseType string,
+	percentByHouseType map[string]map[int]float64,
+) (float64, float64, float64) {
+	if initialPulletCost <= 0 || endDay <= 0 {
+		return 0, 0, 0
+	}
+	if startDay <= 0 {
+		startDay = 1
+	}
+	if endDay < startDay {
+		return 0, 0, 0
+	}
+
+	normalizedHouseType := NormalizeDepreciationHouseType(houseType)
+	housePercent, exists := percentByHouseType[normalizedHouseType]
+	if !exists {
+		return 0, 0, 0
+	}
+
+	current := initialPulletCost
+	pulletCostDayN := 0.0
+	depreciationValue := 0.0
+	depreciationPercent := 0.0
+	for day := startDay; day <= endDay; day++ {
+		pct := housePercent[day]
+		dep := current * (pct / 100)
+		if day == endDay {
+			pulletCostDayN = current
+			depreciationValue = dep
+			depreciationPercent = pct
+		}
+		current -= dep
+		if current < 0 {
+			current = 0
+		}
+	}
+
+	return pulletCostDayN, depreciationValue, depreciationPercent
+}
+
+func CalculateEffectiveDepreciationPercent(totalDepreciationValue, totalPulletCostDayN float64) float64 {
+	if totalPulletCostDayN <= 0 {
+		return 0
+	}
+	return (totalDepreciationValue / totalPulletCostDayN) * 100
+}

internal/common/service/common.depreciation.service_test.go

@@ -0,0 +1,81 @@
+package service
+
+import (
+	"testing"
+	"time"
+)
+
+func TestDepreciationScheduleDay_UsesHouseTypeOffsets(t *testing.T) {
+	openOrigin := mustDepreciationDate(t, "2026-01-01")
+	if got := DepreciationScheduleDay(openOrigin, mustDepreciationDate(t, "2026-06-24"), "open_house"); got != 0 {
+		t.Fatalf("expected open house day before start to be 0, got %d", got)
+	}
+	if got := DepreciationScheduleDay(openOrigin, mustDepreciationDate(t, "2026-06-25"), "open_house"); got != 1 {
+		t.Fatalf("expected open house start day to map to schedule day 1, got %d", got)
+	}
+
+	closeOrigin := mustDepreciationDate(t, "2026-01-01")
+	if got := DepreciationScheduleDay(closeOrigin, mustDepreciationDate(t, "2026-06-03"), "close_house"); got != 0 {
+		t.Fatalf("expected close house day before start to be 0, got %d", got)
+	}
+	if got := DepreciationScheduleDay(closeOrigin, mustDepreciationDate(t, "2026-06-04"), "close_house"); got != 1 {
+		t.Fatalf("expected close house start day to map to schedule day 1, got %d", got)
+	}
+}
+
+func TestCalculateDepreciationAtDayN_UsesRemainingBasisRecursively(t *testing.T) {
+	percentByHouseType := map[string]map[int]float64{
+		"close_house": {
+			1: 10,
+			2: 20,
+		},
+	}
+
+	pulletCostDayN, depreciationValue, depreciationPercent := CalculateDepreciationAtDayN(1000, 2, "close_house", percentByHouseType)
+	if pulletCostDayN != 900 {
+		t.Fatalf("expected remaining basis entering day 2 to be 900, got %v", pulletCostDayN)
+	}
+	if depreciationValue != 180 {
+		t.Fatalf("expected day 2 depreciation to be 180, got %v", depreciationValue)
+	}
+	if depreciationPercent != 20 {
+		t.Fatalf("expected day 2 depreciation percent to be 20, got %v", depreciationPercent)
+	}
+}
+
+func TestCalculateDepreciationFromDayRange_StartsFromProvidedScheduleDay(t *testing.T) {
+	percentByHouseType := map[string]map[int]float64{
+		"close_house": {
+			1: 10,
+			2: 20,
+			3: 5,
+		},
+	}
+
+	pulletCostDayN, depreciationValue, depreciationPercent := CalculateDepreciationFromDayRange(1000, 2, 3, "close_house", percentByHouseType)
+	if pulletCostDayN != 800 {
+		t.Fatalf("expected remaining basis entering day 3 to be 800, got %v", pulletCostDayN)
+	}
+	if depreciationValue != 40 {
+		t.Fatalf("expected day 3 depreciation to be 40, got %v", depreciationValue)
+	}
+	if depreciationPercent != 5 {
+		t.Fatalf("expected day 3 depreciation percent to be 5, got %v", depreciationPercent)
+	}
+}
+
+func mustDepreciationDate(t *testing.T, raw string) time.Time {
+	t.Helper()
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		t.Fatalf("failed loading timezone: %v", err)
+	}
+
+	value, err := time.ParseInLocation("2006-01-02", raw, location)
+	if err != nil {
+		t.Fatalf("failed parsing date %q: %v", raw, err)
+	}
+
+	return value
+}

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

@@ -46,6 +46,7 @@ func (s *hppService) CalculateHppCost(projectFlockKandangId uint, date *time.Tim
 
 	location, err := time.LoadLocation("Asia/Jakarta")
 	if err != nil {
+
 		return nil, err
 	}
 
@@ -54,16 +55,21 @@ func (s *hppService) CalculateHppCost(projectFlockKandangId uint, date *time.Tim
 
 	depresiasiTransfer, err := s.GetDepresiasiTransfer(projectFlockKandangId, &endOfDay)
 	if err != nil {
+
 		return nil, err
 	}
 
 	totalProductionCost, err := s.GetTotalProductionCost(projectFlockKandangId, &endOfDay, depresiasiTransfer)
 	if err != nil {
+
 		return nil, err
 	}
+	result, err := s.GetHppEstimationDanRealisasi(totalProductionCost, projectFlockKandangId, &startOfDay, &endOfDay)
+	if err != nil {
 
-	return s.GetHppEstimationDanRealisasi(totalProductionCost, projectFlockKandangId, &startOfDay, &endOfDay)
-
+		return nil, err
+	}
+	return result, nil
 }
 
 func (s *hppService) GetTotalDepresiasiFlockGrowing(sourceProjectFlockID uint, date *time.Time) (float64, error) {
@@ -73,40 +79,48 @@ func (s *hppService) GetTotalDepresiasiFlockGrowing(sourceProjectFlockID uint, d
 	}
 
 	if s.hppRepo == nil {
+
 		return 0, nil
 	}
 
 	kandangIDs, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), sourceProjectFlockID)
 	if err != nil {
+
 		return 0, err
 	}
 
 	docCost, err := s.hppRepo.GetDocCost(context.Background(), kandangIDs)
 	if err != nil {
+
 		return 0, err
 	}
 
 	budgetCost, err := s.hppRepo.GetBudgetCostByProjectFlockId(context.Background(), sourceProjectFlockID)
 	if err != nil {
+
 		return 0, err
 	}
 
 	expedisionCost, err := s.hppRepo.GetExpedisionCost(context.Background(), kandangIDs)
 	if err != nil {
+
 		return 0, err
 	}
 
 	feedCost, err := s.hppRepo.GetFeedUsageCost(context.Background(), kandangIDs, date)
 	if err != nil {
+
 		return 0, err
 	}
 
 	ovkCost, err := s.hppRepo.GetOvkUsageCost(context.Background(), kandangIDs, date)
 	if err != nil {
+
 		return 0, err
 	}
 
-	return docCost + budgetCost + expedisionCost + feedCost + ovkCost, nil
+	total := docCost + budgetCost + expedisionCost + feedCost + ovkCost
+	return total, nil
 }
 
 func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, endDate *time.Time, depresiasiTransfer float64) (float64, error) {
@@ -117,30 +131,40 @@ func (s *hppService) GetTotalProductionCost(projectFlockKandangId uint, endDate
 
 	costPullet, err := s.hppRepo.GetPulletCost(context.Background(), projectFlockKandangId)
 	if err != nil {
+
 		return 0, err
 	}
 
 	costFeed, err := s.hppRepo.GetFeedUsageCost(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
+
 		return 0, err
 	}
 
 	costOvk, err := s.hppRepo.GetOvkUsageCost(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
+
 		return 0, err
 	}
 
 	costExpedision, err := s.hppRepo.GetExpedisionCost(context.Background(), []uint{projectFlockKandangId})
 	if err != nil {
+
 		return 0, err
 	}
 
 	costBudget, err := s.GetBudgetKandangLaying(projectFlockKandangId, endDate)
 	if err != nil {
+
 		return 0, err
 	}
 
-	return depresiasiTransfer + costPullet + costFeed + costOvk + costExpedision + costBudget, nil
+	// fmt.Println(costBudget, costExpedision, costOvk, costFeed, costPullet, depresiasiTransfer)
+
+	// depresiasiTransfer = 0
+
+	total := depresiasiTransfer + costPullet + costFeed + costOvk + costExpedision + costBudget
+	return total, nil
 }
 
 func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, endDate *time.Time) (float64, error) {
@@ -150,48 +174,57 @@ func (s *hppService) GetBudgetKandangLaying(projectFlockKandangId uint, endDate
 	// }
 
 	if s.hppRepo == nil {
+
 		return 0, nil
 	}
 
 	projectFlockId, err := s.hppRepo.GetProjectFlockIDByProjectFlockKandangID(context.Background(), projectFlockKandangId)
 	if err != nil {
+
 		return 0, err
 	}
 
 	projectFlockKandangIds, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), projectFlockId)
 	if err != nil {
+
 		return 0, err
 	}
 
 	eggProduksiPiecesFlock, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), projectFlockKandangIds, endDate)
 	if err != nil {
+
 		return 0, err
 	}
 
 	eggProduksiPiecesKandang, _, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
+
 		return 0, err
 	}
 
 	totalBudgetCost, err := s.hppRepo.GetBudgetCostByProjectFlockId(context.Background(), projectFlockId)
 	if err != nil {
+
 		return 0, err
 	}
 
 	if eggProduksiPiecesFlock == 0 {
+
 		return 0, nil
 	}
 
-	return (totalBudgetCost * eggProduksiPiecesKandang) / eggProduksiPiecesFlock, nil
+	result := (totalBudgetCost * eggProduksiPiecesKandang) / eggProduksiPiecesFlock
+	return result, nil
 }
 
 func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, endDate *time.Time) (float64, error) {
-	// if endDate == nil {
-	// 	now := time.Now()
-	// 	endDate = &now
-	// }
+	if endDate == nil {
+		now := time.Now()
+		endDate = &now
+	}
 
 	if s.hppRepo == nil {
+
 		return 0, nil
 	}
 
@@ -199,6 +232,13 @@ func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, endDate *
 	if err != nil {
 		return 0, err
 	}
+	if sourceProjectFlockID == 0 || transferTotalQty <= 0 {
+		result, fallbackErr := s.getManualDepresiasiTransferFallback(projectFlockKandangId)
+		if fallbackErr != nil {
+			return 0, fallbackErr
+		}
+		return result, nil
+	}
 
 	kandangIDsGrowing, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), sourceProjectFlockID)
 	if err != nil {
@@ -218,22 +258,81 @@ func (s *hppService) GetDepresiasiTransfer(projectFlockKandangId uint, endDate *
 		return 0, err
 	}
 
-	return (totalDepresiasiFlockGrowing * transferTotalQty) / totalPopulationFlockGrowing, nil
+	result := (totalDepresiasiFlockGrowing * transferTotalQty) / totalPopulationFlockGrowing
+	return result, nil
+}
+
+func (s *hppService) getManualDepresiasiTransferFallback(projectFlockKandangId uint) (float64, error) {
+	projectFlockID, err := s.hppRepo.GetProjectFlockIDByProjectFlockKandangID(context.Background(), projectFlockKandangId)
+	if err != nil {
+
+		return 0, err
+	}
+	if projectFlockID == 0 {
+
+		return 0, nil
+	}
+
+	manualCost, err := s.hppRepo.GetManualDepreciationCostByProjectFlockID(context.Background(), projectFlockID)
+	if err != nil {
+
+		return 0, err
+	}
+	if manualCost <= 0 {
+
+		return 0, nil
+	}
+
+	kandangIDs, err := s.hppRepo.GetProjectFlockKandangIDs(context.Background(), projectFlockID)
+	if err != nil {
+
+		return 0, err
+	}
+	if len(kandangIDs) == 0 {
+
+		return 0, nil
+	}
+
+	totalUsageQty, err := s.hppRepo.GetTotalPopulation(context.Background(), kandangIDs)
+	if err != nil {
+
+		return 0, err
+	}
+	if totalUsageQty <= 0 {
+
+		return 0, nil
+	}
+
+	kandangUsageQty, err := s.hppRepo.GetTotalPopulation(context.Background(), []uint{projectFlockKandangId})
+	if err != nil {
+
+		return 0, err
+	}
+	if kandangUsageQty <= 0 {
+
+		return 0, nil
+	}
+
+	result := manualCost * (kandangUsageQty / totalUsageQty)
+	return result, nil
 }
 
 func (s *hppService) GetHppEstimationDanRealisasi(totalProductionCost float64, projectFlockKandangId uint, startDate *time.Time, endDate *time.Time) (*HppCostResponse, error) {
 
 	if s.hppRepo == nil {
+
 		return &HppCostResponse{}, nil
 	}
 
 	estimPieces, estimWeightKg, err := s.hppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, endDate)
 	if err != nil {
+
 		return nil, err
 	}
 
 	realPieces, realWeightKg, err := s.hppRepo.GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(context.Background(), []uint{projectFlockKandangId}, startDate, endDate)
 	if err != nil {
+
 		return nil, err
 	}
 
@@ -261,12 +360,21 @@ func (s *hppService) GetHppEstimationDanRealisasi(totalProductionCost float64, p
 		real.HargaButir = roundToTwoDecimals(totalProductionCost / realPieces)
 	}
 
-	return &HppCostResponse{
+	result := &HppCostResponse{
 		Estimation: estimation,
 		Real:       real,
-	}, nil
+	}
+	return result, nil
 }
 
 func roundToTwoDecimals(value float64) float64 {
-	return math.Round(value*100) / 100
+	result := math.Round(value*100) / 100
+	return result
+}
+
+func formatTimePtr(value *time.Time) string {
+	if value == nil {
+		return "<nil>"
+	}
+	return value.Format(time.RFC3339)
 }

internal/common/service/common.hppv2.model.go

@@ -0,0 +1,61 @@
+package service
+
+type HppV2DateWindow struct {
+	Start string `json:"start"`
+	End   string `json:"end"`
+}
+
+type HppV2Proration struct {
+	Basis       string  `json:"basis"`
+	Numerator   float64 `json:"numerator"`
+	Denominator float64 `json:"denominator"`
+	Ratio       float64 `json:"ratio"`
+}
+
+type HppV2Reference struct {
+	Type                  string  `json:"type"`
+	ID                    uint    `json:"id"`
+	StockableType         string  `json:"stockable_type,omitempty"`
+	ProjectFlockKandangID *uint   `json:"project_flock_kandang_id,omitempty"`
+	ProductID             uint    `json:"product_id,omitempty"`
+	ProductName           string  `json:"product_name,omitempty"`
+	Date                  string  `json:"date,omitempty"`
+	Qty                   float64 `json:"qty"`
+	UnitPrice             float64 `json:"unit_price"`
+	Total                 float64 `json:"total"`
+	AppliedTotal          float64 `json:"applied_total"`
+}
+
+type HppV2ComponentPart struct {
+	Code       string           `json:"code"`
+	Title      string           `json:"title"`
+	Scopes     []string         `json:"scopes,omitempty"`
+	Total      float64          `json:"total"`
+	Proration  *HppV2Proration  `json:"proration,omitempty"`
+	Details    map[string]any   `json:"details,omitempty"`
+	References []HppV2Reference `json:"references,omitempty"`
+}
+
+type HppV2Component struct {
+	Code   string               `json:"code"`
+	Title  string               `json:"title"`
+	Scopes []string             `json:"scopes,omitempty"`
+	Total  float64              `json:"total"`
+	Parts  []HppV2ComponentPart `json:"parts"`
+}
+
+type HppV2Breakdown struct {
+	ProjectFlockKandangID uint             `json:"project_flock_kandang_id"`
+	ProjectFlockID        uint             `json:"project_flock_id"`
+	ProjectFlockCategory  string           `json:"project_flock_category,omitempty"`
+	HouseType             string           `json:"house_type,omitempty"`
+	KandangID             uint             `json:"kandang_id,omitempty"`
+	KandangName           string           `json:"kandang_name,omitempty"`
+	LocationID            uint             `json:"location_id,omitempty"`
+	PeriodDate            string           `json:"period_date"`
+	Window                HppV2DateWindow  `json:"window"`
+	TotalPulletCost       float64          `json:"total_pullet_cost"`
+	TotalProductionCost   float64          `json:"total_production_cost"`
+	Components            []HppV2Component `json:"components"`
+	Hpp                   HppCostResponse  `json:"hpp"`
+}

internal/common/service/common.hppv2.service_test.go

@@ -0,0 +1,872 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"sort"
+	"strings"
+	"testing"
+	"time"
+
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
+
+type hppV2RepoStub struct {
+	contextByPFK         map[uint]*commonRepo.HppV2ProjectFlockKandangContext
+	pfkIDsByProject      map[uint][]uint
+	latestTransferByPFK  map[uint]*commonRepo.HppV2LatestTransferInputRow
+	manualInputByProject map[uint]*commonRepo.HppV2ManualDepreciationInputRow
+	snapshotByProjectKey map[string]*commonRepo.HppV2FarmDepreciationSnapshotRow
+	chickInDateByProject map[uint]*time.Time
+	depreciationByHouse  map[string]map[int]float64
+	usageRowsByKey       map[string][]commonRepo.HppV2UsageCostRow
+	adjustRowsByKey      map[string][]commonRepo.HppV2AdjustmentCostRow
+	chickinRowsByKey     map[string][]commonRepo.HppV2ChickinCostRow
+	expenseRowsByPFKKey  map[string][]commonRepo.HppV2ExpenseCostRow
+	expenseRowsByFarmKey map[string][]commonRepo.HppV2ExpenseCostRow
+	totalPopulationByKey map[string]float64
+	transferSummaryByPFK map[uint]struct {
+		projectFlockID uint
+		totalQty       float64
+	}
+	eggProductionByPFK map[uint]struct {
+		pieces float64
+		kg     float64
+	}
+	eggSalesByPFK map[uint]struct {
+		pieces float64
+		kg     float64
+	}
+}
+
+func (s *hppV2RepoStub) GetProjectFlockKandangContext(_ context.Context, projectFlockKandangId uint) (*commonRepo.HppV2ProjectFlockKandangContext, error) {
+	row := s.contextByPFK[projectFlockKandangId]
+	if row == nil {
+		return nil, fmt.Errorf("pfk %d not found", projectFlockKandangId)
+	}
+	return row, nil
+}
+
+func (s *hppV2RepoStub) GetProjectFlockKandangIDs(_ context.Context, projectFlockId uint) ([]uint, error) {
+	return append([]uint{}, s.pfkIDsByProject[projectFlockId]...), nil
+}
+
+func (s *hppV2RepoStub) GetLatestTransferInputByProjectFlockKandangID(_ context.Context, projectFlockKandangId uint, _ time.Time) (*commonRepo.HppV2LatestTransferInputRow, error) {
+	return s.latestTransferByPFK[projectFlockKandangId], nil
+}
+
+func (s *hppV2RepoStub) GetManualDepreciationInputByProjectFlockID(_ context.Context, projectFlockID uint) (*commonRepo.HppV2ManualDepreciationInputRow, error) {
+	return s.manualInputByProject[projectFlockID], nil
+}
+
+func (s *hppV2RepoStub) GetFarmDepreciationSnapshotByProjectFlockIDAndPeriod(_ context.Context, projectFlockID uint, periodDate time.Time) (*commonRepo.HppV2FarmDepreciationSnapshotRow, error) {
+	if s.snapshotByProjectKey == nil {
+		return nil, nil
+	}
+	return s.snapshotByProjectKey[fmt.Sprintf("%d|%s", projectFlockID, periodDate.Format("2006-01-02"))], nil
+}
+
+func (s *hppV2RepoStub) GetEarliestChickInDateByProjectFlockID(_ context.Context, projectFlockID uint) (*time.Time, error) {
+	return s.chickInDateByProject[projectFlockID], nil
+}
+
+func (s *hppV2RepoStub) GetDepreciationPercents(_ context.Context, houseTypes []string, maxDay int) (map[string]map[int]float64, error) {
+	result := make(map[string]map[int]float64)
+	for _, houseType := range houseTypes {
+		source := s.depreciationByHouse[houseType]
+		if len(source) == 0 {
+			continue
+		}
+		result[houseType] = make(map[int]float64)
+		for day, pct := range source {
+			if day <= maxDay {
+				result[houseType][day] = pct
+			}
+		}
+	}
+	return result, nil
+}
+
+func (s *hppV2RepoStub) ListUsageCostRowsByProductFlags(_ context.Context, projectFlockKandangIDs []uint, flagNames []string, _ *time.Time) ([]commonRepo.HppV2UsageCostRow, error) {
+	return append([]commonRepo.HppV2UsageCostRow{}, s.usageRowsByKey[stubKey(projectFlockKandangIDs, flagNames)]...), nil
+}
+
+func (s *hppV2RepoStub) ListAdjustmentCostRowsByProductFlags(_ context.Context, projectFlockKandangIDs []uint, flagNames []string, _ *time.Time) ([]commonRepo.HppV2AdjustmentCostRow, error) {
+	return append([]commonRepo.HppV2AdjustmentCostRow{}, s.adjustRowsByKey[stubKey(projectFlockKandangIDs, flagNames)]...), nil
+}
+
+func (s *hppV2RepoStub) ListExpenseRealizationRowsByProjectFlockKandangIDs(_ context.Context, projectFlockKandangIDs []uint, _ *time.Time, ekspedisi bool) ([]commonRepo.HppV2ExpenseCostRow, error) {
+	return append([]commonRepo.HppV2ExpenseCostRow{}, s.expenseRowsByPFKKey[expenseStubKey(projectFlockKandangIDs, ekspedisi)]...), nil
+}
+
+func (s *hppV2RepoStub) ListExpenseRealizationRowsByProjectFlockID(_ context.Context, projectFlockID uint, _ *time.Time, ekspedisi bool) ([]commonRepo.HppV2ExpenseCostRow, error) {
+	return append([]commonRepo.HppV2ExpenseCostRow{}, s.expenseRowsByFarmKey[expenseFarmKey(projectFlockID, ekspedisi)]...), nil
+}
+
+func (s *hppV2RepoStub) ListChickinCostRowsByProductFlags(_ context.Context, projectFlockKandangIDs []uint, flagNames []string, _ *time.Time, excludeTransferToLaying bool) ([]commonRepo.HppV2ChickinCostRow, error) {
+	return append([]commonRepo.HppV2ChickinCostRow{}, s.chickinRowsByKey[chickinStubKey(projectFlockKandangIDs, flagNames, excludeTransferToLaying)]...), nil
+}
+
+func (s *hppV2RepoStub) GetFeedUsageCost(_ context.Context, _ []uint, _ *time.Time) (float64, error) {
+	return 0, nil
+}
+
+func (s *hppV2RepoStub) GetTotalPopulation(_ context.Context, projectFlockKandangIDs []uint) (float64, error) {
+	return s.totalPopulationByKey[stubKey(projectFlockKandangIDs, nil)], nil
+}
+
+func (s *hppV2RepoStub) GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(_ context.Context, projectFlockKandangIDs []uint, _ *time.Time) (float64, float64, error) {
+	totalPieces := 0.0
+	totalKg := 0.0
+	for _, projectFlockKandangID := range projectFlockKandangIDs {
+		row := s.eggProductionByPFK[projectFlockKandangID]
+		totalPieces += row.pieces
+		totalKg += row.kg
+	}
+	return totalPieces, totalKg, nil
+}
+
+func (s *hppV2RepoStub) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(_ context.Context, projectFlockKandangIDs []uint, _ *time.Time, _ *time.Time) (float64, float64, error) {
+	if len(projectFlockKandangIDs) != 1 {
+		return 0, 0, nil
+	}
+	row := s.eggSalesByPFK[projectFlockKandangIDs[0]]
+	return row.pieces, row.kg, nil
+}
+
+func (s *hppV2RepoStub) GetTransferSourceSummary(_ context.Context, projectFlockKandangId uint) (uint, float64, error) {
+	row := s.transferSummaryByPFK[projectFlockKandangId]
+	return row.projectFlockID, row.totalQty, nil
+}
+
+func TestHppV2CalculateHppBreakdown_ComposesPakanSlices(t *testing.T) {
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			10: {
+				ProjectFlockKandangID: 10,
+				ProjectFlockID:        2,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             100,
+				KandangName:           "Kandang A",
+				LocationID:            16,
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			1: {101, 102},
+		},
+		usageRowsByKey: map[string][]commonRepo.HppV2UsageCostRow{
+			stubKey([]uint{101, 102}, []string{"PAKAN"}): {
+				{StockableType: "purchase_items", StockableID: 9001, SourceProductID: 8, SourceProductName: "Pakan Growing", Qty: 100, UnitPrice: 40, TotalCost: 4000},
+			},
+			stubKey([]uint{10}, []string{"PAKAN"}): {
+				{StockableType: "purchase_items", StockableID: 9002, SourceProductID: 9, SourceProductName: "Pakan Laying", Qty: 50, UnitPrice: 30, TotalCost: 1500},
+			},
+		},
+		adjustRowsByKey: map[string][]commonRepo.HppV2AdjustmentCostRow{
+			stubKey([]uint{101, 102}, []string{"PAKAN-CUTOVER"}): {
+				{AdjustmentID: 8001, ProductID: 11, ProductName: "Pakan Growing Cut-over", Qty: 20, Price: 30, GrandTotal: 600},
+			},
+			stubKey([]uint{10}, []string{"PAKAN-CUTOVER"}): {
+				{AdjustmentID: 8002, ProductID: 12, ProductName: "Pakan Laying Cut-over", Qty: 10, Price: 30, GrandTotal: 300},
+			},
+		},
+		totalPopulationByKey: map[string]float64{
+			stubKey([]uint{101, 102}, nil): 1000,
+		},
+		transferSummaryByPFK: map[uint]struct {
+			projectFlockID uint
+			totalQty       float64
+		}{
+			10: {projectFlockID: 1, totalQty: 250},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			10: {pieces: 100, kg: 10},
+		},
+		eggSalesByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			10: {pieces: 40, kg: 4},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(10, mustDate(t, "2026-04-19"))
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if result == nil {
+		t.Fatal("expected breakdown result")
+	}
+	if got := result.TotalPulletCost; got != 1150 {
+		t.Fatalf("expected total pullet cost 1150, got %v", got)
+	}
+	if got := result.TotalProductionCost; got != 1800 {
+		t.Fatalf("expected total production cost 1800, got %v", got)
+	}
+	if len(result.Components) != 1 {
+		t.Fatalf("expected 1 component, got %d", len(result.Components))
+	}
+	component := result.Components[0]
+	if component.Code != "PAKAN" {
+		t.Fatalf("expected PAKAN component, got %s", component.Code)
+	}
+	partTotals := map[string]float64{}
+	for _, part := range component.Parts {
+		partTotals[part.Code] = part.Total
+	}
+	if partTotals[hppV2PartGrowingNormal] != 1000 {
+		t.Fatalf("expected growing normal 1000, got %v", partTotals[hppV2PartGrowingNormal])
+	}
+	if partTotals[hppV2PartGrowingCutover] != 150 {
+		t.Fatalf("expected growing cutover 150, got %v", partTotals[hppV2PartGrowingCutover])
+	}
+	if partTotals[hppV2PartLayingNormal] != 1500 {
+		t.Fatalf("expected laying normal 1500, got %v", partTotals[hppV2PartLayingNormal])
+	}
+	if partTotals[hppV2PartLayingCutover] != 300 {
+		t.Fatalf("expected laying cutover 300, got %v", partTotals[hppV2PartLayingCutover])
+	}
+	if component.Parts[0].Proration == nil || component.Parts[0].Proration.Ratio != 0.25 {
+		t.Fatalf("expected growing proration ratio 0.25, got %+v", component.Parts[0].Proration)
+	}
+	if result.Hpp.Estimation.HargaKg != 180 {
+		t.Fatalf("expected estimation harga/kg 180, got %v", result.Hpp.Estimation.HargaKg)
+	}
+	if result.Hpp.Real.HargaKg != 450 {
+		t.Fatalf("expected real harga/kg 450, got %v", result.Hpp.Real.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_ManualCutoverUsesLayingSlicesOnly(t *testing.T) {
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			20: {
+				ProjectFlockKandangID: 20,
+				ProjectFlockID:        3,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             200,
+				KandangName:           "Kandang B",
+				LocationID:            17,
+			},
+		},
+		usageRowsByKey: map[string][]commonRepo.HppV2UsageCostRow{
+			stubKey([]uint{20}, []string{"PAKAN"}): {
+				{StockableType: "purchase_items", StockableID: 9100, SourceProductID: 21, SourceProductName: "Pakan Laying", Qty: 20, UnitPrice: 10, TotalCost: 200},
+			},
+		},
+		adjustRowsByKey: map[string][]commonRepo.HppV2AdjustmentCostRow{
+			stubKey([]uint{20}, []string{"PAKAN-CUTOVER"}): {
+				{AdjustmentID: 8100, ProductID: 22, ProductName: "Pakan Laying Cut-over", Qty: 30, Price: 10, GrandTotal: 300},
+			},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			20: {pieces: 50, kg: 5},
+		},
+		eggSalesByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			20: {pieces: 25, kg: 2.5},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(20, mustDate(t, "2026-04-19"))
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if result.TotalProductionCost != 500 {
+		t.Fatalf("expected total production cost 500, got %v", result.TotalProductionCost)
+	}
+	component := result.Components[0]
+	if len(component.Parts) != 2 {
+		t.Fatalf("expected 2 laying parts, got %d", len(component.Parts))
+	}
+	for _, part := range component.Parts {
+		if strings.HasPrefix(part.Code, "growing_") {
+			t.Fatalf("expected no growing parts, got %s", part.Code)
+		}
+	}
+	if result.Hpp.Estimation.HargaKg != 100 {
+		t.Fatalf("expected estimation harga/kg 100, got %v", result.Hpp.Estimation.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_IncludesOvkComponent(t *testing.T) {
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			30: {
+				ProjectFlockKandangID: 30,
+				ProjectFlockID:        4,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             300,
+				KandangName:           "Kandang C",
+				LocationID:            18,
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			5: {301, 302},
+		},
+		usageRowsByKey: map[string][]commonRepo.HppV2UsageCostRow{
+			stubKey([]uint{30}, []string{"PAKAN"}): {
+				{StockableType: "purchase_items", StockableID: 9200, SourceProductID: 31, SourceProductName: "Pakan Laying", Qty: 20, UnitPrice: 25, TotalCost: 500},
+			},
+			stubKey([]uint{301, 302}, []string{string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia)}): {
+				{StockableType: "purchase_items", StockableID: 9201, SourceProductID: 32, SourceProductName: "OVK Growing", Qty: 40, UnitPrice: 10, TotalCost: 400},
+			},
+			stubKey([]uint{30}, []string{string(utils.FlagOVK), string(utils.FlagObat), string(utils.FlagVitamin), string(utils.FlagKimia)}): {
+				{StockableType: "purchase_items", StockableID: 9202, SourceProductID: 33, SourceProductName: "OVK Laying", Qty: 15, UnitPrice: 10, TotalCost: 150},
+			},
+		},
+		adjustRowsByKey: map[string][]commonRepo.HppV2AdjustmentCostRow{
+			stubKey([]uint{301, 302}, []string{"OVK"}): {
+				{AdjustmentID: 8201, ProductID: 34, ProductName: "OVK Growing Cut-over", Qty: 10, Price: 10, GrandTotal: 100},
+			},
+			stubKey([]uint{30}, []string{"OVK"}): {
+				{AdjustmentID: 8202, ProductID: 35, ProductName: "OVK Laying Cut-over", Qty: 5, Price: 10, GrandTotal: 50},
+			},
+		},
+		totalPopulationByKey: map[string]float64{
+			stubKey([]uint{301, 302}, nil): 1000,
+		},
+		transferSummaryByPFK: map[uint]struct {
+			projectFlockID uint
+			totalQty       float64
+		}{
+			30: {projectFlockID: 5, totalQty: 500},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			30: {pieces: 120, kg: 12},
+		},
+		eggSalesByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			30: {pieces: 60, kg: 6},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(30, mustDate(t, "2026-04-19"))
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if result == nil {
+		t.Fatal("expected breakdown result")
+	}
+	if len(result.Components) != 2 {
+		t.Fatalf("expected 2 components, got %d", len(result.Components))
+	}
+
+	componentTotals := map[string]float64{}
+	for _, component := range result.Components {
+		componentTotals[component.Code] = component.Total
+	}
+
+	if componentTotals[hppV2ComponentPakan] != 500 {
+		t.Fatalf("expected pakan total 500, got %v", componentTotals[hppV2ComponentPakan])
+	}
+	if componentTotals[hppV2ComponentOvk] != 450 {
+		t.Fatalf("expected ovk total 450, got %v", componentTotals[hppV2ComponentOvk])
+	}
+	if result.TotalPulletCost != 250 {
+		t.Fatalf("expected total pullet cost 250, got %v", result.TotalPulletCost)
+	}
+	if result.TotalProductionCost != 700 {
+		t.Fatalf("expected total production cost 700, got %v", result.TotalProductionCost)
+	}
+	if result.Hpp.Estimation.HargaKg != 58.33 {
+		t.Fatalf("expected estimation harga/kg 58.33, got %v", result.Hpp.Estimation.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_IncludesDocAndDirectPulletChickin(t *testing.T) {
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			35: {
+				ProjectFlockKandangID: 35,
+				ProjectFlockID:        8,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             350,
+				KandangName:           "Kandang E",
+				LocationID:            20,
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			9: {901, 902},
+		},
+		totalPopulationByKey: map[string]float64{
+			stubKey([]uint{901, 902}, nil): 1000,
+		},
+		transferSummaryByPFK: map[uint]struct {
+			projectFlockID uint
+			totalQty       float64
+		}{
+			35: {projectFlockID: 9, totalQty: 250},
+		},
+		chickinRowsByKey: map[string][]commonRepo.HppV2ChickinCostRow{
+			chickinStubKey([]uint{901, 902}, []string{string(utils.FlagDOC)}, false): {
+				{ProjectChickinID: 1, ProjectFlockKandangID: 901, ChickInDate: mustTime(t, "2026-04-01"), StockableType: "purchase_items", StockableID: 1001, SourceProductID: 77, SourceProductName: "DOC", Qty: 1000, UnitPrice: 2, TotalCost: 2000},
+			},
+			chickinStubKey([]uint{35}, []string{string(utils.FlagPullet), string(utils.FlagLayer)}, true): {
+				{ProjectChickinID: 2, ProjectFlockKandangID: 35, ChickInDate: mustTime(t, "2026-04-15"), StockableType: "purchase_items", StockableID: 1002, SourceProductID: 78, SourceProductName: "Pullet", Qty: 50, UnitPrice: 20, TotalCost: 1000},
+			},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			35: {pieces: 100, kg: 10},
+		},
+		eggSalesByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			35: {pieces: 80, kg: 8},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(35, mustDate(t, "2026-04-19"))
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	componentTotals := map[string]float64{}
+	for _, component := range result.Components {
+		componentTotals[component.Code] = component.Total
+	}
+
+	if componentTotals[hppV2ComponentDocChickin] != 500 {
+		t.Fatalf("expected doc chickin total 500, got %v", componentTotals[hppV2ComponentDocChickin])
+	}
+	if componentTotals[hppV2ComponentDirectPulletPurchase] != 1000 {
+		t.Fatalf("expected direct pullet purchase total 1000, got %v", componentTotals[hppV2ComponentDirectPulletPurchase])
+	}
+	if result.TotalPulletCost != 500 {
+		t.Fatalf("expected total pullet cost 500, got %v", result.TotalPulletCost)
+	}
+	if result.TotalProductionCost != 1000 {
+		t.Fatalf("expected total production cost 1000, got %v", result.TotalProductionCost)
+	}
+	if result.Hpp.Estimation.HargaKg != 100 {
+		t.Fatalf("expected estimation harga/kg 100, got %v", result.Hpp.Estimation.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_IncludesBopRegularAndEkspedisi(t *testing.T) {
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			40: {
+				ProjectFlockKandangID: 40,
+				ProjectFlockID:        6,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             400,
+				KandangName:           "Kandang D",
+				LocationID:            19,
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			6: {40, 41},
+			7: {701, 702},
+		},
+		totalPopulationByKey: map[string]float64{
+			stubKey([]uint{701, 702}, nil): 1000,
+		},
+		transferSummaryByPFK: map[uint]struct {
+			projectFlockID uint
+			totalQty       float64
+		}{
+			40: {projectFlockID: 7, totalQty: 200},
+		},
+		expenseRowsByPFKKey: map[string][]commonRepo.HppV2ExpenseCostRow{
+			expenseStubKey([]uint{701, 702}, false): {
+				{ExpenseRealizationID: 1, NonstockID: 11, NonstockName: "Growing BOP", Qty: 1, Price: 500, TotalCost: 500, RealizationDate: mustTime(t, "2026-04-10")},
+			},
+			expenseStubKey([]uint{40}, false): {
+				{ExpenseRealizationID: 2, NonstockID: 12, NonstockName: "Laying BOP", Qty: 1, Price: 80, TotalCost: 80, RealizationDate: mustTime(t, "2026-04-19")},
+			},
+			expenseStubKey([]uint{701, 702}, true): {
+				{ExpenseRealizationID: 3, NonstockID: 13, NonstockName: "Growing Expedition", Qty: 1, Price: 100, TotalCost: 100, RealizationDate: mustTime(t, "2026-04-11")},
+			},
+			expenseStubKey([]uint{40}, true): {
+				{ExpenseRealizationID: 4, NonstockID: 14, NonstockName: "Laying Expedition", Qty: 1, Price: 40, TotalCost: 40, RealizationDate: mustTime(t, "2026-04-19")},
+			},
+		},
+		expenseRowsByFarmKey: map[string][]commonRepo.HppV2ExpenseCostRow{
+			expenseFarmKey(7, false): {
+				{ExpenseRealizationID: 5, NonstockID: 15, NonstockName: "Growing Farm BOP", Qty: 1, Price: 300, TotalCost: 300, RealizationDate: mustTime(t, "2026-04-12")},
+			},
+			expenseFarmKey(6, false): {
+				{ExpenseRealizationID: 6, NonstockID: 16, NonstockName: "Laying Farm BOP", Qty: 1, Price: 100, TotalCost: 100, RealizationDate: mustTime(t, "2026-04-19")},
+			},
+			expenseFarmKey(7, true): {
+				{ExpenseRealizationID: 7, NonstockID: 17, NonstockName: "Growing Farm Expedition", Qty: 1, Price: 50, TotalCost: 50, RealizationDate: mustTime(t, "2026-04-12")},
+			},
+			expenseFarmKey(6, true): {
+				{ExpenseRealizationID: 8, NonstockID: 18, NonstockName: "Laying Farm Expedition", Qty: 1, Price: 60, TotalCost: 60, RealizationDate: mustTime(t, "2026-04-19")},
+			},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			40: {pieces: 30, kg: 3},
+			41: {pieces: 70, kg: 7},
+		},
+		eggSalesByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			40: {pieces: 50, kg: 5},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(40, mustDate(t, "2026-04-19"))
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	componentTotals := map[string]float64{}
+	for _, component := range result.Components {
+		componentTotals[component.Code] = component.Total
+	}
+
+	if componentTotals[hppV2ComponentBopRegular] != 270 {
+		t.Fatalf("expected regular BOP total 270, got %v", componentTotals[hppV2ComponentBopRegular])
+	}
+	if componentTotals[hppV2ComponentBopEksp] != 88 {
+		t.Fatalf("expected expedition BOP total 88, got %v", componentTotals[hppV2ComponentBopEksp])
+	}
+	if result.TotalPulletCost != 190 {
+		t.Fatalf("expected total pullet cost 190, got %v", result.TotalPulletCost)
+	}
+	if result.TotalProductionCost != 168 {
+		t.Fatalf("expected total production cost 168, got %v", result.TotalProductionCost)
+	}
+	if result.Hpp.Estimation.HargaKg != 56 {
+		t.Fatalf("expected estimation harga/kg 56, got %v", result.Hpp.Estimation.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_AddsDepreciationForNormalTransfer(t *testing.T) {
+	sourceChickIn := mustTime(t, "2026-01-01")
+	reportDate := sourceChickIn.AddDate(0, 0, 154)
+
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			50: {
+				ProjectFlockKandangID: 50,
+				ProjectFlockID:        10,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             500,
+				KandangName:           "Kandang F",
+				LocationID:            21,
+				HouseType:             "close_house",
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			11: {501},
+		},
+		latestTransferByPFK: map[uint]*commonRepo.HppV2LatestTransferInputRow{
+			50: {
+				ProjectFlockKandangID: 50,
+				SourceProjectFlockID:  11,
+				TransferDate:          mustTime(t, "2026-05-20"),
+				TransferQty:           100,
+				TransferID:            701,
+			},
+		},
+		chickInDateByProject: map[uint]*time.Time{
+			11: &sourceChickIn,
+		},
+		depreciationByHouse: map[string]map[int]float64{
+			"close_house": {
+				1: 10,
+			},
+		},
+		usageRowsByKey: map[string][]commonRepo.HppV2UsageCostRow{
+			stubKey([]uint{501}, []string{"PAKAN"}): {
+				{StockableType: "purchase_items", StockableID: 9301, SourceProductID: 41, SourceProductName: "Pakan Growing", Qty: 25, UnitPrice: 40, TotalCost: 1000},
+			},
+		},
+		totalPopulationByKey: map[string]float64{
+			stubKey([]uint{501}, nil): 100,
+		},
+		transferSummaryByPFK: map[uint]struct {
+			projectFlockID uint
+			totalQty       float64
+		}{
+			50: {projectFlockID: 11, totalQty: 100},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			50: {pieces: 20, kg: 10},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(50, &reportDate)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	if result.TotalPulletCost != 1000 {
+		t.Fatalf("expected total pullet cost 1000, got %v", result.TotalPulletCost)
+	}
+	if result.TotalProductionCost != 100 {
+		t.Fatalf("expected total production cost 100, got %v", result.TotalProductionCost)
+	}
+
+	var depreciation *HppV2Component
+	for i := range result.Components {
+		if result.Components[i].Code == hppV2ComponentDepreciation {
+			depreciation = &result.Components[i]
+			break
+		}
+	}
+	if depreciation == nil {
+		t.Fatal("expected depreciation component")
+	}
+	if depreciation.Total != 100 {
+		t.Fatalf("expected depreciation total 100, got %v", depreciation.Total)
+	}
+	if len(depreciation.Parts) != 1 {
+		t.Fatalf("expected single depreciation part, got %d", len(depreciation.Parts))
+	}
+	if depreciation.Parts[0].Details["schedule_day"] != 1 {
+		t.Fatalf("expected schedule day 1, got %+v", depreciation.Parts[0].Details)
+	}
+	if depreciation.Parts[0].Details["origin_date"] != "2026-01-01" {
+		t.Fatalf("expected origin date 2026-01-01, got %+v", depreciation.Parts[0].Details)
+	}
+	if result.Hpp.Estimation.HargaKg != 10 {
+		t.Fatalf("expected estimation harga/kg 10, got %v", result.Hpp.Estimation.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_AddsDepreciationForManualCutoverFromCutoverDate(t *testing.T) {
+	originDate := mustTime(t, "2026-01-01")
+	cutoverDate := originDate.AddDate(0, 0, 155)
+
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			60: {
+				ProjectFlockKandangID: 60,
+				ProjectFlockID:        12,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             600,
+				KandangName:           "Kandang G",
+				LocationID:            22,
+				HouseType:             "close_house",
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			12: {60},
+		},
+		manualInputByProject: map[uint]*commonRepo.HppV2ManualDepreciationInputRow{
+			12: {
+				ID:             801,
+				ProjectFlockID: 12,
+				TotalCost:      1000,
+				CutoverDate:    cutoverDate,
+			},
+		},
+		chickInDateByProject: map[uint]*time.Time{
+			12: &originDate,
+		},
+		depreciationByHouse: map[string]map[int]float64{
+			"close_house": {
+				1: 10,
+				2: 20,
+			},
+		},
+		totalPopulationByKey: map[string]float64{
+			stubKey([]uint{60}, nil): 100,
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			60: {pieces: 20, kg: 10},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(60, &cutoverDate)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	if result.TotalPulletCost != 1000 {
+		t.Fatalf("expected total pullet cost 1000, got %v", result.TotalPulletCost)
+	}
+	if result.TotalProductionCost != 200 {
+		t.Fatalf("expected total production cost 200, got %v", result.TotalProductionCost)
+	}
+
+	componentTotals := map[string]float64{}
+	for _, component := range result.Components {
+		componentTotals[component.Code] = component.Total
+	}
+	if componentTotals[hppV2ComponentManualPulletCost] != 1000 {
+		t.Fatalf("expected manual pullet cost 1000, got %v", componentTotals[hppV2ComponentManualPulletCost])
+	}
+	if componentTotals[hppV2ComponentDepreciation] != 200 {
+		t.Fatalf("expected depreciation 200, got %v", componentTotals[hppV2ComponentDepreciation])
+	}
+
+	var depreciation *HppV2Component
+	for i := range result.Components {
+		if result.Components[i].Code == hppV2ComponentDepreciation {
+			depreciation = &result.Components[i]
+			break
+		}
+	}
+	if depreciation == nil || len(depreciation.Parts) != 1 {
+		t.Fatalf("expected one depreciation part, got %+v", depreciation)
+	}
+	if depreciation.Parts[0].Details["schedule_day"] != 2 {
+		t.Fatalf("expected schedule day 2, got %+v", depreciation.Parts[0].Details)
+	}
+	if depreciation.Parts[0].Details["start_schedule_day"] != 2 {
+		t.Fatalf("expected start schedule day 2, got %+v", depreciation.Parts[0].Details)
+	}
+	if result.Hpp.Estimation.HargaKg != 20 {
+		t.Fatalf("expected estimation harga/kg 20, got %v", result.Hpp.Estimation.HargaKg)
+	}
+}
+
+func TestHppV2CalculateHppBreakdown_UsesFarmSnapshotDepreciationProratedByEggProduction(t *testing.T) {
+	reportDate := mustTime(t, "2026-06-05")
+
+	repo := &hppV2RepoStub{
+		contextByPFK: map[uint]*commonRepo.HppV2ProjectFlockKandangContext{
+			70: {
+				ProjectFlockKandangID: 70,
+				ProjectFlockID:        15,
+				ProjectFlockCategory:  "LAYING",
+				KandangID:             700,
+				KandangName:           "Kandang Snapshot",
+				LocationID:            25,
+				HouseType:             "close_house",
+			},
+		},
+		pfkIDsByProject: map[uint][]uint{
+			15: {70, 71},
+		},
+		snapshotByProjectKey: map[string]*commonRepo.HppV2FarmDepreciationSnapshotRow{
+			"15|2026-06-05": {
+				ID:                           901,
+				ProjectFlockID:               15,
+				PeriodDate:                   reportDate,
+				DepreciationPercentEffective: 10,
+				DepreciationValue:            1000,
+				PulletCostDayNTotal:          10000,
+			},
+		},
+		eggProductionByPFK: map[uint]struct {
+			pieces float64
+			kg     float64
+		}{
+			70: {pieces: 200, kg: 20},
+			71: {pieces: 800, kg: 80},
+		},
+	}
+
+	svc := NewHppV2Service(repo)
+	result, err := svc.CalculateHppBreakdown(70, &reportDate)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if result == nil {
+		t.Fatal("expected breakdown result")
+	}
+
+	var depreciation *HppV2Component
+	for i := range result.Components {
+		if result.Components[i].Code == hppV2ComponentDepreciation {
+			depreciation = &result.Components[i]
+			break
+		}
+	}
+	if depreciation == nil {
+		t.Fatal("expected depreciation component")
+	}
+	if depreciation.Total != 200 {
+		t.Fatalf("expected depreciation total 200, got %v", depreciation.Total)
+	}
+	if result.TotalProductionCost != 200 {
+		t.Fatalf("expected total production cost 200, got %v", result.TotalProductionCost)
+	}
+	if len(depreciation.Parts) != 1 {
+		t.Fatalf("expected one depreciation part, got %d", len(depreciation.Parts))
+	}
+	if depreciation.Parts[0].Code != hppV2PartDepreciationFarmSnapshot {
+		t.Fatalf("expected farm snapshot depreciation part, got %s", depreciation.Parts[0].Code)
+	}
+	if depreciation.Parts[0].Proration == nil || depreciation.Parts[0].Proration.Ratio != 0.2 {
+		t.Fatalf("expected proration ratio 0.2, got %+v", depreciation.Parts[0].Proration)
+	}
+	if depreciation.Parts[0].Details["snapshot_id"] != uint(901) {
+		t.Fatalf("expected snapshot id 901, got %+v", depreciation.Parts[0].Details)
+	}
+}
+
+func stubKey(ids []uint, flags []string) string {
+	idParts := make([]string, 0, len(ids))
+	for _, id := range ids {
+		idParts = append(idParts, fmt.Sprintf("%d", id))
+	}
+	sort.Strings(idParts)
+
+	flagParts := append([]string{}, flags...)
+	sort.Strings(flagParts)
+
+	return strings.Join(idParts, ",") + "|" + strings.Join(flagParts, ",")
+}
+
+func mustDate(t *testing.T, raw string) *time.Time {
+	t.Helper()
+	loc, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		t.Fatalf("failed to load timezone: %v", err)
+	}
+	value, err := time.ParseInLocation("2006-01-02", raw, loc)
+	if err != nil {
+		t.Fatalf("failed to parse date %s: %v", raw, err)
+	}
+	return &value
+}
+
+func mustTime(t *testing.T, raw string) time.Time {
+	t.Helper()
+	value := mustDate(t, raw)
+	return *value
+}
+
+func expenseStubKey(ids []uint, ekspedisi bool) string {
+	return stubKey(ids, []string{fmt.Sprintf("ekspedisi=%t", ekspedisi)})
+}
+
+func expenseFarmKey(projectFlockID uint, ekspedisi bool) string {
+	return fmt.Sprintf("farm=%d|ekspedisi=%t", projectFlockID, ekspedisi)
+}
+
+func chickinStubKey(ids []uint, flags []string, excludeTransferToLaying bool) string {
+	return stubKey(ids, append(append([]string{}, flags...), fmt.Sprintf("exclude_transfer_to_laying=%t", excludeTransferToLaying)))
+}

internal/common/service/depreciation_snapshot_invalidator.service.go

@@ -0,0 +1,103 @@
+package service
+
+import (
+	"context"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+const farmDepreciationSnapshotTable = "farm_depreciation_snapshots"
+
+func NormalizeDateOnlyUTC(value time.Time) time.Time {
+	if value.IsZero() {
+		return value
+	}
+	v := value.UTC()
+	return time.Date(v.Year(), v.Month(), v.Day(), 0, 0, 0, 0, time.UTC)
+}
+
+func MinNonZeroDateOnlyUTC(values ...time.Time) time.Time {
+	var out time.Time
+	for _, value := range values {
+		if value.IsZero() {
+			continue
+		}
+		normalized := NormalizeDateOnlyUTC(value)
+		if out.IsZero() || normalized.Before(out) {
+			out = normalized
+		}
+	}
+	return out
+}
+
+func InvalidateFarmDepreciationSnapshotsFromDate(ctx context.Context, db *gorm.DB, farmIDs []uint, fromDate time.Time) error {
+	if db == nil {
+		return nil
+	}
+	if fromDate.IsZero() {
+		return nil
+	}
+
+	fromDate = NormalizeDateOnlyUTC(fromDate)
+	query := db.WithContext(ctx).
+		Table(farmDepreciationSnapshotTable).
+		Where("period_date >= ?", fromDate)
+	if len(farmIDs) > 0 {
+		query = query.Where("project_flock_id IN ?", farmIDs)
+	}
+	return query.Delete(nil).Error
+}
+
+func ResolveProjectFlockIDsByProjectFlockKandangIDs(ctx context.Context, db *gorm.DB, pfkIDs []uint) ([]uint, error) {
+	if db == nil || len(pfkIDs) == 0 {
+		return []uint{}, nil
+	}
+
+	var projectFlockIDs []uint
+	if err := db.WithContext(ctx).
+		Table("project_flock_kandangs").
+		Distinct("project_flock_id").
+		Where("id IN ?", pfkIDs).
+		Pluck("project_flock_id", &projectFlockIDs).Error; err != nil {
+		return nil, err
+	}
+
+	return projectFlockIDs, nil
+}
+
+func ResolveProjectFlockIDsByExpenseID(ctx context.Context, db *gorm.DB, expenseID uint) ([]uint, error) {
+	if db == nil || expenseID == 0 {
+		return []uint{}, nil
+	}
+
+	query := `
+WITH direct_farms AS (
+	SELECT DISTINCT pfk.project_flock_id
+	FROM expense_nonstocks ens
+	JOIN project_flock_kandangs pfk ON pfk.id = ens.project_flock_kandang_id
+	WHERE ens.expense_id = @expense_id
+),
+json_farms AS (
+	SELECT DISTINCT (jsonb_array_elements_text(e.project_flock_id::jsonb))::bigint AS project_flock_id
+	FROM expenses e
+	WHERE e.id = @expense_id
+	  AND e.project_flock_id IS NOT NULL
+)
+SELECT DISTINCT project_flock_id
+FROM (
+	SELECT project_flock_id FROM direct_farms
+	UNION ALL
+	SELECT project_flock_id FROM json_farms
+) x
+`
+
+	var ids []uint
+	if err := db.WithContext(ctx).Raw(query, map[string]any{
+		"expense_id": expenseID,
+	}).Scan(&ids).Error; err != nil {
+		return nil, err
+	}
+
+	return ids, nil
+}

internal/config/config.go

@@ -23,6 +23,7 @@ type SSOClientConfig struct {
 
 var (
 	IsProd                         bool
+	AppEnv                         string
 	AppHost                        string
 	Version                        string
 	LogLevel                       string
@@ -84,7 +85,8 @@ func init() {
 	loadConfig()
 
 	// server configuration
-	IsProd = viper.GetString("APP_ENV") == "prod"
+	AppEnv = defaultString(strings.TrimSpace(viper.GetString("APP_ENV")), "development")
+	IsProd = AppEnv == "prod"
 	AppHost = viper.GetString("APP_HOST")
 	AppPort = viper.GetInt("APP_PORT")
 	Version = viper.GetString("VERSION")
@@ -111,7 +113,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-Requested-With")
+	CORSAllowHeaders = parseListWithDefault("CORS_ALLOW_HEADERS", "Content-Type,Authorization,X-API-Key,X-Requested-With")
 	CORSExposeHeaders = parseList("CORS_EXPOSE_HEADERS")
 	CORSAllowCredentials = viper.GetBool("CORS_ALLOW_CREDENTIALS")
 	CORSMaxAge = viper.GetInt("CORS_MAX_AGE")

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

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

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

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

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

@@ -0,0 +1,23 @@
+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/database/migrations/20260415050222_create_house_depreciation_standards_and_add_house_type_to_kandangs..down.sql

@@ -0,0 +1,6 @@
+ALTER TABLE kandangs
+    DROP COLUMN IF EXISTS house_type;
+
+DROP TABLE IF EXISTS house_depreciation_standards;
+
+DROP TYPE IF EXISTS house_type_enum;

internal/database/migrations/20260415050222_create_house_depreciation_standards_and_add_house_type_to_kandangs..up.sql

@@ -0,0 +1,18 @@
+CREATE TYPE house_type_enum AS ENUM ('open_house', 'close_house');
+
+CREATE TABLE house_depreciation_standards (
+    id BIGSERIAL PRIMARY KEY,
+    name VARCHAR(100),
+    effective_date DATE,
+    house_type house_type_enum NOT NULL,
+    day INT NOT NULL
+        CHECK (day >= 0),
+    depreciation_percent NUMERIC(15, 6) NOT NULL
+        CHECK (depreciation_percent >= 0 AND depreciation_percent <= 100),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW(),
+    CONSTRAINT house_depreciation_standards_house_type_day_unique UNIQUE (house_type, day)
+);
+
+ALTER TABLE kandangs
+    ADD COLUMN house_type house_type_enum;

internal/database/migrations/20260419134846_create_farm_depreciation_snapshots.down.sql

@@ -0,0 +1,4 @@
+DROP INDEX IF EXISTS idx_farm_depreciation_snapshots_project_flock_id;
+DROP INDEX IF EXISTS idx_farm_depreciation_snapshots_period_date;
+DROP TABLE IF EXISTS farm_depreciation_snapshots;
+

internal/database/migrations/20260419134846_create_farm_depreciation_snapshots.up.sql

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS farm_depreciation_snapshots (
+    id BIGSERIAL PRIMARY KEY,
+    project_flock_id BIGINT NOT NULL
+        REFERENCES project_flocks(id)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    period_date DATE NOT NULL,
+    depreciation_percent_effective NUMERIC(15, 6) NOT NULL DEFAULT 0,
+    depreciation_value NUMERIC(18, 3) NOT NULL DEFAULT 0,
+    pullet_cost_day_n_total NUMERIC(18, 3) NOT NULL DEFAULT 0,
+    components JSONB NOT NULL DEFAULT '{}'::jsonb,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    CONSTRAINT farm_depreciation_snapshots_unique UNIQUE (project_flock_id, period_date)
+);
+
+CREATE INDEX IF NOT EXISTS idx_farm_depreciation_snapshots_period_date
+    ON farm_depreciation_snapshots (period_date);
+
+CREATE INDEX IF NOT EXISTS idx_farm_depreciation_snapshots_project_flock_id
+    ON farm_depreciation_snapshots (project_flock_id);
+

internal/database/migrations/20260419135003_create_farm_depreciation_manual_inputs.down.sql

@@ -0,0 +1,2 @@
+DROP INDEX IF EXISTS idx_farm_depreciation_manual_inputs_project_flock_id;
+DROP TABLE IF EXISTS farm_depreciation_manual_inputs;

internal/database/migrations/20260419135003_create_farm_depreciation_manual_inputs.up.sql

@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS farm_depreciation_manual_inputs (
+    id BIGSERIAL PRIMARY KEY,
+    project_flock_id BIGINT NOT NULL
+        REFERENCES project_flocks(id)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
+    total_cost NUMERIC(18, 3) NOT NULL DEFAULT 0
+        CHECK (total_cost >= 0),
+    note TEXT NULL,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    CONSTRAINT farm_depreciation_manual_inputs_unique UNIQUE (project_flock_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_farm_depreciation_manual_inputs_project_flock_id
+    ON farm_depreciation_manual_inputs (project_flock_id);

internal/database/migrations/20260419135151_add_cutover_date_to_farm_depreciation_manual_inputs..down.sql

@@ -0,0 +1,4 @@
+DROP INDEX IF EXISTS idx_farm_depreciation_manual_inputs_cutover_date;
+
+ALTER TABLE farm_depreciation_manual_inputs
+    DROP COLUMN IF EXISTS cutover_date;

internal/database/migrations/20260419135151_add_cutover_date_to_farm_depreciation_manual_inputs..up.sql

@@ -0,0 +1,12 @@
+ALTER TABLE farm_depreciation_manual_inputs
+    ADD COLUMN IF NOT EXISTS cutover_date DATE;
+
+UPDATE farm_depreciation_manual_inputs
+SET cutover_date = COALESCE(cutover_date, DATE(created_at))
+WHERE cutover_date IS NULL;
+
+ALTER TABLE farm_depreciation_manual_inputs
+    ALTER COLUMN cutover_date SET NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_farm_depreciation_manual_inputs_cutover_date
+    ON farm_depreciation_manual_inputs (cutover_date);

internal/entities/farm_depreciation_manual_input.go

@@ -0,0 +1,18 @@
+package entities
+
+import "time"
+
+type FarmDepreciationManualInput struct {
+	Id             uint         `gorm:"primaryKey"`
+	ProjectFlockId uint         `gorm:"not null;uniqueIndex:idx_farm_depreciation_manual_inputs_unique"`
+	TotalCost      float64      `gorm:"type:numeric(18,3);not null;default:0"`
+	CutoverDate    time.Time    `gorm:"type:date;not null"`
+	Note           *string      `gorm:"type:text"`
+	CreatedAt      time.Time    `gorm:"autoCreateTime"`
+	UpdatedAt      time.Time    `gorm:"autoUpdateTime"`
+	ProjectFlock   ProjectFlock `gorm:"foreignKey:ProjectFlockId;references:Id"`
+}
+
+func (FarmDepreciationManualInput) TableName() string {
+	return "farm_depreciation_manual_inputs"
+}

internal/entities/farm_depreciation_snapshot.go

@@ -0,0 +1,21 @@
+package entities
+
+import (
+	"time"
+)
+
+type FarmDepreciationSnapshot struct {
+	Id                           uint      `gorm:"primaryKey"`
+	ProjectFlockId               uint      `gorm:"not null;uniqueIndex:idx_farm_depreciation_snapshots_unique,priority:1"`
+	PeriodDate                   time.Time `gorm:"type:date;not null;uniqueIndex:idx_farm_depreciation_snapshots_unique,priority:2"`
+	DepreciationPercentEffective float64   `gorm:"type:numeric(15,6);not null;default:0"`
+	DepreciationValue            float64   `gorm:"type:numeric(18,3);not null;default:0"`
+	PulletCostDayNTotal          float64   `gorm:"type:numeric(18,3);not null;default:0"`
+	Components                   []byte    `gorm:"type:jsonb;default:'{}'::jsonb"`
+	CreatedAt                    time.Time `gorm:"autoCreateTime"`
+	UpdatedAt                    time.Time `gorm:"autoUpdateTime"`
+}
+
+func (FarmDepreciationSnapshot) TableName() string {
+	return "farm_depreciation_snapshots"
+}

internal/entities/house_depreciation_standard.go

@@ -0,0 +1,16 @@
+package entities
+
+import "time"
+
+type HouseDepreciationStandard struct {
+	Id                  uint      `gorm:"primaryKey"`
+	HouseType           string    `gorm:"type:house_type_enum;not null;uniqueIndex:house_depreciation_standards_house_type_day_unique,priority:1"`
+	DayNumber           int       `gorm:"column:day;not null;uniqueIndex:house_depreciation_standards_house_type_day_unique,priority:2"`
+	DepreciationPercent float64   `gorm:"type:numeric(15,6);not null"`
+	CreatedAt           time.Time `gorm:"autoCreateTime"`
+	UpdatedAt           time.Time `gorm:"autoUpdateTime"`
+}
+
+func (HouseDepreciationStandard) TableName() string {
+	return "house_depreciation_standards"
+}

internal/entities/integration_api_key.go

@@ -0,0 +1,36 @@
+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/kandang.go

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

internal/entities/marketing_delivery_product.go

@@ -12,6 +12,7 @@ type MarketingDeliveryProduct struct {
 	UnitPrice                       float64    `gorm:"type:numeric(15,3)"`
 	TotalWeight                     float64    `gorm:"type:numeric(15,3)"`
 	AvgWeight                       float64    `gorm:"type:numeric(15,3)"`
+	WeightPerConvertion             *float64   `gorm:"type:numeric(15,3)"`
 	TotalPrice                      float64    `gorm:"type:numeric(15,3)"`
 	DeliveryDate                    *time.Time `gorm:"type:timestamptz"`
 	VehicleNumber                   string     `gorm:"type:varchar(50)"`

internal/middleware/auth.go

@@ -1,9 +1,13 @@
 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"
@@ -17,11 +21,21 @@ 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
@@ -30,6 +44,13 @@ 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.
@@ -62,10 +83,20 @@ 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 := sso.VerifyAccessToken(token)
+		verification, err := verifyAccessTokenFunc(token)
 		if err != nil {
 			if sso.IsSignatureError(err) {
 				logSignatureError("auth", tokenSource, token, err)
@@ -99,7 +130,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 := sso.FetchProfile(c.Context(), token, verification); err != nil {
+			if p, err := fetchProfileFunc(c.Context(), token, verification); err != nil {
 				utils.Log.WithError(err).Warn("auth: failed to fetch sso profile")
 			} else {
 				profile = p
@@ -118,6 +149,8 @@ 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,
@@ -219,6 +252,57 @@ 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

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

@@ -47,13 +47,14 @@ const (
 	P_ApprovalGetAll = "lti.approval.list"
 )
 const (
-	P_ReportExpenseGetAll          = "lti.repport.expense.list"
-	P_ReportDeliveryGetAll         = "lti.repport.delivery.list"
-	P_ReportPurchaseSupplierGetAll = "lti.repport.purchasesupplier.list"
-	P_ReportDebtSupplierGetAll     = "lti.repport.debtsupplier.list"
-	P_ReportHppPerKandangGetAll    = "lti.repport.gethppperkandang.list"
-	P_ReportProductionResultGetAll = "lti.repport.production_result.list"
-	P_ReportCustomerPaymentGetAll  = "lti.repport.customerpayment.list"
+	P_ReportExpenseGetAll             = "lti.repport.expense.list"
+	P_ReportExpenseDepreciationManage = "lti.repport.expense.depreciation.manage"
+	P_ReportDeliveryGetAll            = "lti.repport.delivery.list"
+	P_ReportPurchaseSupplierGetAll    = "lti.repport.purchasesupplier.list"
+	P_ReportDebtSupplierGetAll        = "lti.repport.debtsupplier.list"
+	P_ReportHppPerKandangGetAll       = "lti.repport.gethppperkandang.list"
+	P_ReportProductionResultGetAll    = "lti.repport.production_result.list"
+	P_ReportCustomerPaymentGetAll     = "lti.repport.customerpayment.list"
 )
 
 const (

internal/modules/dashboards/module.go

@@ -18,11 +18,11 @@ type DashboardModule struct{}
 
 func (DashboardModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	dashboardRepo := rDashboard.NewDashboardRepository(db)
-	hppCostRepo := commonRepo.NewHppCostRepository(db)
+	hppV2CostRepo := commonRepo.NewHppV2CostRepository(db)
 	userRepo := rUser.NewUserRepository(db)
 
-	hppSvc := commonService.NewHppService(hppCostRepo)
-	dashboardService := sDashboard.NewDashboardService(dashboardRepo, validate, hppSvc)
+	hppV2Svc := commonService.NewHppV2Service(hppV2CostRepo)
+	dashboardService := sDashboard.NewDashboardService(dashboardRepo, validate, hppV2Svc)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	DashboardRoutes(router, userService, dashboardService)

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

@@ -6,6 +6,7 @@ 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"
@@ -35,6 +36,7 @@ type UniformityWeeklyMetric struct {
 	Week          int
 	Uniformity    float64
 	AverageWeight float64
+	UniformDate   time.Time
 }
 
 type StandardWeeklyMetric struct {
@@ -104,6 +106,15 @@ 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
 
@@ -139,20 +150,29 @@ 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(`u.week AS week,
+		Select(fmt.Sprintf(`%s AS week,
 			COALESCE(AVG(u.uniformity), 0) AS uniformity,
-			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`).
+			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`, weekExpr)).
 		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("u.week").Order("u.week ASC").Scan(&rows).Error; err != nil {
+	if err := db.Group(weekExpr).Order("1 ASC").Scan(&rows).Error; err != nil {
 		return nil, err
 	}
 
@@ -518,23 +538,31 @@ 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(`u.week AS week,
+		Select(fmt.Sprintf(`%s 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`, seriesExpr)).
+			COALESCE(AVG((u.chart_data->'statistics'->>'average_weight')::numeric), 0) AS average_weight`, weekExpr, 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("u.week, %s", groupExpr)
-	orderBy := fmt.Sprintf("u.week ASC, %s", orderExpr)
+	groupBy := fmt.Sprintf("%s, %s", weekExpr, groupExpr)
+	orderBy := fmt.Sprintf("1 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

@@ -30,10 +30,10 @@ type dashboardService struct {
 	Log        *logrus.Logger
 	Validate   *validator.Validate
 	Repository repository.DashboardRepository
-	HppSvc     commonService.HppService
+	HppSvc     commonService.HppV2Service
 }
 
-func NewDashboardService(repo repository.DashboardRepository, validate *validator.Validate, hppSvc commonService.HppService) DashboardService {
+func NewDashboardService(repo repository.DashboardRepository, validate *validator.Validate, hppSvc commonService.HppV2Service) DashboardService {
 	return &dashboardService{
 		Log:        utils.Log,
 		Validate:   validate,
@@ -265,6 +265,7 @@ 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))
@@ -274,10 +275,10 @@ func (s dashboardService) buildPerformanceCharts(ctx context.Context, params *va
 	cumFeed := 0.0
 
 	for _, week := range weeks {
-		rec := recordingMap[week]
-		uni := uniformityMap[week]
-		std := standardMap[week]
-		stdFcr := standardFcrMap[week]
+		rec, hasRec := recordingMap[week]
+		uni, hasUni := uniformityMap[week]
+		std, hasStd := standardMap[week]
+		stdFcr, hasStdFcr := standardFcrMap[week]
 		weekEgg := weeklyEggMap[week]
 		weekFeed := weeklyFeedMap[week]
 
@@ -293,39 +294,80 @@ func (s dashboardService) buildPerformanceCharts(ctx context.Context, params *va
 			actFcrCum = cumFeed / cumEgg
 		}
 
-		bodyWeightDataset = append(bodyWeightDataset, map[string]interface{}{
-			"week":            week,
-			"body_weight":     roundTo(uni.AverageWeight, 2),
-			"std_body_weight": roundTo(std.StdBodyWeight, 2),
-		})
+		bodyWeightRow := map[string]interface{}{
+			"week": week,
+		}
+		if hasUni {
+			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)
+		}
 
-		performanceDataset = append(performanceDataset, map[string]interface{}{
-			"week":            week,
-			"act_laying":      roundTo(rec.HenDay, 2),
-			"std_laying":      roundTo(std.StdLaying, 2),
-			"act_egg_weight":  roundTo(rec.EggWeight, 2),
-			"std_egg_weight":  roundTo(std.StdEggWeight, 2),
-			"act_feed_intake": roundTo(rec.FeedIntake, 2),
-			"std_feed_intake": roundTo(std.StdFeedIntake, 2),
-			"act_uniformity":  roundTo(uni.Uniformity, 2),
-			"std_uniformity":  roundTo(std.StdUniformity, 2),
-		})
+		performanceRow := map[string]interface{}{
+			"week": week,
+		}
+		if hasRec {
+			performanceRow["act_laying"] = roundTo(rec.HenDay, 2)
+			performanceRow["act_egg_weight"] = roundTo(rec.EggWeight, 2)
+			performanceRow["act_feed_intake"] = roundTo(rec.FeedIntake, 2)
+		}
+		if hasUni {
+			performanceRow["act_uniformity"] = roundTo(uni.Uniformity, 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)
+		}
 
-		fcrDataset = append(fcrDataset, map[string]interface{}{
-			"week":        week,
-			"act_fcr":     roundTo(actFcr, 2),
-			"std_fcr":     roundTo(stdFcr, 2),
-			"act_fcr_cum": roundTo(actFcrCum, 2),
-			"std_fcr_cum": roundTo(stdFcr, 2),
-		})
+		fcrRow := map[string]interface{}{
+			"week": week,
+		}
+		if weekEgg > 0 && weekFeed > 0 {
+			fcrRow["act_fcr"] = roundTo(actFcr, 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)
+		}
 
-		deplesiDataset = append(deplesiDataset, map[string]interface{}{
-			"week":        week,
-			"act_deplesi": roundTo(rec.CumDepletionRate, 2),
-			"std_deplesi": roundTo(std.StdDepletion, 2),
-		})
+		deplesiRow := map[string]interface{}{
+			"week": week,
+		}
+		if hasRec {
+			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
@@ -1049,6 +1091,69 @@ 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/expenses/services/expense.service.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"time"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
@@ -358,6 +359,7 @@ func (s *expenseService) CreateOne(c *fiber.Ctx, req *validation.Create) (*expen
 	if err != nil {
 		return nil, err
 	}
+	s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, uint(expense.Id), expenseDate, nil)
 	return responseDTO, nil
 }
 
@@ -385,6 +387,7 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	}
 
 	updateBody := make(map[string]any)
+	var requestedTransactionDate *time.Time
 
 	if req.TransactionDate != nil {
 		expenseDate, err := utils.ParseDateString(*req.TransactionDate)
@@ -392,6 +395,7 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 			return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid transaction_date format")
 		}
 		updateBody["transaction_date"] = expenseDate
+		requestedTransactionDate = &expenseDate
 	}
 
 	if req.Category != nil {
@@ -429,6 +433,8 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		return responseDTO, nil
 	}
 
+	var invalidationFromDate time.Time
+	var invalidationFarmIDs []uint
 	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
 
 		expenseRepoTx := repository.NewExpenseRepository(tx)
@@ -446,6 +452,16 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		if err := s.ensureProjectFlockNotClosedForExpense(c.Context(), currentExpense); err != nil {
 			return err
 		}
+		oldFarmIDs, resolveOldFarmErr := commonSvc.ResolveProjectFlockIDsByExpenseID(c.Context(), tx, id)
+		if resolveOldFarmErr != nil {
+			s.Log.Warnf("Failed to resolve old expense farm ids for invalidation (expense_id=%d): %+v", id, resolveOldFarmErr)
+		}
+		invalidationFarmIDs = append(invalidationFarmIDs, oldFarmIDs...)
+
+		invalidationFromDate = currentExpense.TransactionDate
+		if requestedTransactionDate != nil {
+			invalidationFromDate = commonSvc.MinNonZeroDateOnlyUTC(currentExpense.TransactionDate, *requestedTransactionDate)
+		}
 		categoryChanged := false
 		var newCategory string
 		if req.Category != nil && *req.Category != currentExpense.Category {
@@ -631,6 +647,12 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 			}
 		}
 
+		newFarmIDs, resolveNewFarmErr := commonSvc.ResolveProjectFlockIDsByExpenseID(c.Context(), tx, id)
+		if resolveNewFarmErr != nil {
+			s.Log.Warnf("Failed to resolve new expense farm ids for invalidation (expense_id=%d): %+v", id, resolveNewFarmErr)
+		}
+		invalidationFarmIDs = append(invalidationFarmIDs, newFarmIDs...)
+
 		return nil
 	})
 
@@ -645,6 +667,7 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	if err != nil {
 		return nil, err
 	}
+	s.invalidateDepreciationSnapshots(c.Context(), nil, invalidationFarmIDs, invalidationFromDate)
 	return responseDTO, nil
 }
 
@@ -671,6 +694,10 @@ func (s expenseService) DeleteOne(c *fiber.Ctx, id uint64) error {
 	if err := s.ensureProjectFlockNotClosedForExpense(c.Context(), expense); err != nil {
 		return err
 	}
+	farmIDs, resolveFarmErr := commonSvc.ResolveProjectFlockIDsByExpenseID(c.Context(), s.Repository.DB(), idUint)
+	if resolveFarmErr != nil {
+		s.Log.Warnf("Failed to resolve expense farm ids before delete (expense_id=%d): %+v", idUint, resolveFarmErr)
+	}
 	if err := s.Repository.DeleteOne(c.Context(), idUint); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			s.Log.Errorf("Expense not found for ID %d: %+v", id, err)
@@ -680,6 +707,8 @@ func (s expenseService) DeleteOne(c *fiber.Ctx, id uint64) error {
 		return err
 	}
 	s.Log.Infof("Successfully deleted expense with ID %d", id)
+	invalidationFromDate := commonSvc.MinNonZeroDateOnlyUTC(expense.TransactionDate, expense.RealizationDate)
+	s.invalidateDepreciationSnapshots(c.Context(), nil, farmIDs, invalidationFromDate)
 	return nil
 }
 
@@ -800,6 +829,8 @@ func (s *expenseService) CreateRealization(c *fiber.Ctx, expenseID uint, req *va
 	if err != nil {
 		return nil, err
 	}
+	invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(expense.TransactionDate, realizationDate, expense.RealizationDate)
+	s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, expenseID, invalidateFromDate, nil)
 	return responseDTO, nil
 }
 
@@ -857,6 +888,13 @@ func (s *expenseService) CompleteExpense(c *fiber.Ctx, id uint, notes *string) (
 	if err != nil {
 		return nil, err
 	}
+	expense, expenseErr := s.Repository.GetByID(c.Context(), id, nil)
+	if expenseErr != nil {
+		s.Log.Warnf("Failed to load expense for depreciation invalidation after complete (expense_id=%d): %+v", id, expenseErr)
+	} else {
+		invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(expense.TransactionDate, expense.RealizationDate)
+		s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, id, invalidateFromDate, nil)
+	}
 	return responseDTO, nil
 }
 
@@ -884,6 +922,12 @@ func (s *expenseService) UpdateRealization(c *fiber.Ctx, expenseID uint, req *va
 	if err := s.ensureProjectFlockNotClosedForExpense(c.Context(), expense); err != nil {
 		return nil, err
 	}
+	invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(expense.TransactionDate, expense.RealizationDate)
+	if req.RealizationDate != nil {
+		if parsedDate, parseErr := utils.ParseDateString(*req.RealizationDate); parseErr == nil {
+			invalidateFromDate = commonSvc.MinNonZeroDateOnlyUTC(invalidateFromDate, parsedDate)
+		}
+	}
 	latestApproval, err := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowExpense, expenseID, nil)
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate workflow")
@@ -996,6 +1040,7 @@ func (s *expenseService) UpdateRealization(c *fiber.Ctx, expenseID uint, req *va
 	if err != nil {
 		return nil, err
 	}
+	s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, expenseID, invalidateFromDate, nil)
 	return responseDTO, nil
 }
 
@@ -1057,6 +1102,7 @@ func (s *expenseService) Approval(c *fiber.Ctx, req *validation.ApprovalRequest,
 	}
 
 	var results []expenseDto.ExpenseDetailDTO
+	invalidateFromDateByExpenseID := make(map[uint]time.Time)
 
 	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
 
@@ -1069,6 +1115,17 @@ func (s *expenseService) Approval(c *fiber.Ctx, req *validation.ApprovalRequest,
 			); err != nil {
 				return err
 			}
+			expenseForInvalidation, err := expenseRepoTx.GetByID(c.Context(), id, nil)
+			if err != nil {
+				if errors.Is(err, gorm.ErrRecordNotFound) {
+					return fiber.NewError(fiber.StatusNotFound, "Expense not found")
+				}
+				return fiber.NewError(fiber.StatusInternalServerError, "Failed to load expense")
+			}
+			invalidateFromDateByExpenseID[id] = commonSvc.MinNonZeroDateOnlyUTC(
+				expenseForInvalidation.TransactionDate,
+				expenseForInvalidation.RealizationDate,
+			)
 
 			latestApproval, err := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowExpense, id, nil)
 			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
@@ -1170,10 +1227,73 @@ func (s *expenseService) Approval(c *fiber.Ctx, req *validation.ApprovalRequest,
 		}
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed approve expenses")
 	}
+	for expenseID, invalidateFromDate := range invalidateFromDateByExpenseID {
+		s.invalidateDepreciationSnapshotsByExpense(c.Context(), nil, expenseID, invalidateFromDate, nil)
+	}
 
 	return results, nil
 }
 
+func (s *expenseService) invalidateDepreciationSnapshotsByExpense(
+	ctx context.Context,
+	tx *gorm.DB,
+	expenseID uint,
+	fromDate time.Time,
+	fallbackFarmIDs []uint,
+) {
+	targetDB := s.Repository.DB()
+	if tx != nil {
+		targetDB = tx
+	}
+
+	farmIDs := append([]uint{}, fallbackFarmIDs...)
+	if expenseID != 0 {
+		resolvedFarmIDs, err := commonSvc.ResolveProjectFlockIDsByExpenseID(ctx, targetDB, expenseID)
+		if err != nil {
+			s.Log.Warnf("Failed to resolve expense farm ids for invalidation (expense_id=%d): %+v", expenseID, err)
+		} else {
+			farmIDs = append(farmIDs, resolvedFarmIDs...)
+		}
+	}
+	s.invalidateDepreciationSnapshots(ctx, tx, farmIDs, fromDate)
+}
+
+func (s *expenseService) invalidateDepreciationSnapshots(
+	ctx context.Context,
+	tx *gorm.DB,
+	farmIDs []uint,
+	fromDate time.Time,
+) {
+	if fromDate.IsZero() {
+		return
+	}
+
+	targetDB := s.Repository.DB()
+	if tx != nil {
+		targetDB = tx
+	}
+	farmIDs = utils.UniqueUintSlice(farmIDs)
+	if len(farmIDs) == 0 {
+		if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, nil, fromDate); err != nil {
+			s.Log.Warnf(
+				"Failed to invalidate depreciation snapshots globally (from=%s): %+v",
+				fromDate.Format("2006-01-02"),
+				err,
+			)
+		}
+		return
+	}
+
+	if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, farmIDs, fromDate); err != nil {
+		s.Log.Warnf(
+			"Failed to invalidate depreciation snapshots (farm_ids=%v, from=%s): %+v",
+			farmIDs,
+			fromDate.Format("2006-01-02"),
+			err,
+		)
+	}
+}
+
 func (s *expenseService) generatePoNumber(ctx *gorm.DB, expenseID uint) (string, error) {
 
 	expenseRepoTx := repository.NewExpenseRepository(ctx)

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

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

@@ -31,6 +31,8 @@ type MarketingDeliveryProductRepositoryImpl struct {
 	*commonRepo.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),
@@ -43,9 +45,9 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetDeliveryProductsByProjectFlo
 	attributionQuery := commonRepo.MarketingDeliveryAttributionRowsQuery(r.DB().WithContext(ctx))
 
 	db := r.DB().WithContext(ctx).
+		Select("DISTINCT "+marketingDeliveryProductSelectWithNullAttributed).
 		Joins("JOIN (?) AS mda ON mda.marketing_delivery_product_id = marketing_delivery_products.id", attributionQuery).
-		Where("mda.project_flock_id = ?", projectFlockID).
-		Distinct("marketing_delivery_products.*")
+		Where("mda.project_flock_id = ?", projectFlockID)
 
 	if callback != nil {
 		db = callback(db)
@@ -110,6 +112,7 @@ 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)
 
@@ -124,6 +127,8 @@ 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
@@ -132,6 +137,27 @@ 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
@@ -211,6 +237,7 @@ func (r *MarketingDeliveryProductRepositoryImpl) fetchClosingDeliveryProducts(
 	}
 
 	query := r.closingDeliveryProductsQuery(ctx).
+		Select(marketingDeliveryProductSelectWithNullAttributed).
 		Where("marketing_delivery_products.id IN ?", deliveryIDs).
 		Order("marketing_delivery_products.delivery_date DESC")
 

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

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"math"
 	"strings"
 	"time"
 
@@ -375,11 +376,12 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Delivery
 				itemDeliveryDate = &parsedDate
 			}
 
-			totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
+			totalWeight, totalPrice := s.resolveDeliveryTotals(marketing.MarketingType, requestedProduct, foundMarketingProduct)
 
 			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
@@ -498,11 +500,12 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 					itemDeliveryDate = deliveryProduct.DeliveryDate
 				}
 
-				totalWeight, totalPrice := s.calculatePriceByMarketingType(marketing.MarketingType, requestedProduct.Qty, requestedProduct.AvgWeight, requestedProduct.UnitPrice, foundMarketingProduct.Week)
+				totalWeight, totalPrice := s.resolveDeliveryTotals(marketing.MarketingType, requestedProduct, foundMarketingProduct)
 
 				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
@@ -541,20 +544,53 @@ func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.DeliveryO
 	return s.getMarketingWithDeliveries(c, id)
 }
 
-func (s *deliveryOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int) (totalWeight, totalPrice float64) {
+func (s *deliveryOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int, convertionUnit *string, _ *float64) (totalWeight, totalPrice float64) {
 	if marketingType == string(utils.MarketingTypeTrading) {
 		totalWeight = 0
-		totalPrice = qty * unitPrice
+		totalPrice = math.Round(qty*unitPrice*100) / 100
 	} else if marketingType == string(utils.MarketingTypeAyamPullet) && week != nil && *week > 0 {
-		totalWeight = qty * avgWeight
-		totalPrice = unitPrice * float64(*week) * qty
+		totalWeight = math.Round(qty*avgWeight*100) / 100
+		totalPrice = math.Round(unitPrice*float64(*week)*qty*100) / 100
 	} else {
-		totalWeight = qty * avgWeight
-		totalPrice = totalWeight * unitPrice
+		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
 }
 
+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")

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

@@ -815,7 +815,7 @@ func (s *salesOrdersService) createMarketingProductWithDelivery(ctx context.Cont
 	return nil
 }
 
-func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int, convertionUnit *string, weightPerConvertion *float64) (totalWeight, totalPrice float64) {
+func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string, qty, avgWeight, unitPrice float64, week *int, convertionUnit *string, _ *float64) (totalWeight, totalPrice float64) {
 	if marketingType == string(utils.MarketingTypeTrading) {
 		totalWeight = 0
 		totalPrice = math.Round(qty*unitPrice*100) / 100
@@ -831,11 +831,8 @@ func (s *salesOrdersService) calculatePriceByMarketingType(marketingType string,
 				totalPrice = math.Round(qty*unitPrice*100) / 100
 				return totalWeight, totalPrice
 			case string(utils.ConvertionUnitPeti):
-				if weightPerConvertion != nil && *weightPerConvertion > 0 {
-					totalPeti := totalWeight / *weightPerConvertion
-					totalPrice = math.Round(totalPeti*unitPrice*100) / 100
-					return totalWeight, totalPrice
-				}
+				totalPrice = math.Round(totalWeight*unitPrice*100) / 100
+				return totalWeight, totalPrice
 			}
 		}
 

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

@@ -1,12 +1,15 @@
 package validation
 
 type DeliveryProduct struct {
-	MarketingProductId uint    `json:"marketing_product_id" validate:"required,gt=0"`
-	Qty                float64 `json:"qty" validate:"omitempty,gte=0"`
-	UnitPrice          float64 `json:"unit_price" validate:"omitempty,gte=0"`
-	AvgWeight          float64 `json:"avg_weight" validate:"omitempty,gte=0"`
-	DeliveryDate       string  `json:"delivery_date" validate:"omitempty,datetime=2006-01-02"`
-	VehicleNumber      string  `json:"vehicle_number" validate:"omitempty,max=50"`
+	MarketingProductId  uint     `json:"marketing_product_id" validate:"required,gt=0"`
+	Qty                 float64  `json:"qty" validate:"omitempty,gte=0"`
+	UnitPrice           float64  `json:"unit_price" validate:"omitempty,gte=0"`
+	AvgWeight           float64  `json:"avg_weight" validate:"omitempty,gte=0"`
+	WeightPerConvertion *float64 `json:"weight_per_convertion" validate:"omitempty,gte=0"`
+	TotalWeight         *float64 `json:"total_weight" validate:"omitempty,gte=0"`
+	TotalPrice          *float64 `json:"total_price" validate:"omitempty,gte=0"`
+	DeliveryDate        string   `json:"delivery_date" validate:"omitempty,datetime=2006-01-02"`
+	VehicleNumber       string   `json:"vehicle_number" validate:"omitempty,max=50"`
 }
 
 type 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 != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
+			db = db.Where("name ILIKE ?", "%"+params.Search+"%")
 		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
+		return db.Order("name ASC").Order("id ASC")
 	})
 
 	if scopeErr != nil {

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

@@ -33,6 +33,14 @@ 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,7 +53,28 @@ 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 != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
+			db = 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,7 +21,8 @@ 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,max=50"`
+	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,max=50"`
+	HasMarketing *bool  `query:"has_marketing" validate:"omitempty"`
 }

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("created_at DESC").Order("updated_at DESC")
+		return db.Order("locations.name ASC").Order("locations.id ASC")
 	})
 
 	if scopeErr != nil {

internal/modules/production/chickins/services/chickin.service.go

@@ -419,6 +419,11 @@ func (s *chickinService) CreateOne(c *fiber.Ctx, req *validation.Create) ([]enti
 	if len(result) == 0 {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to load created chickins")
 	}
+	invalidateFromDate := time.Time{}
+	for i := range result {
+		invalidateFromDate = commonSvc.MinNonZeroDateOnlyUTC(invalidateFromDate, result[i].ChickInDate)
+	}
+	s.invalidateDepreciationSnapshots(c.Context(), nil, []uint{req.ProjectFlockKandangId}, invalidateFromDate)
 
 	return result, nil
 }
@@ -462,6 +467,8 @@ func (s chickinService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 	if err != nil {
 		return nil, err
 	}
+	invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(chickin.ChickInDate, updated.ChickInDate)
+	s.invalidateDepreciationSnapshots(c.Context(), nil, []uint{updated.ProjectFlockKandangId}, invalidateFromDate)
 
 	if updated.UsageQty > 0 {
 		if err := s.syncChickinTraceForProductWarehouse(c.Context(), nil, updated.ProductWarehouseId); err != nil {
@@ -566,6 +573,7 @@ func (s chickinService) DeleteOne(c *fiber.Ctx, id uint) error {
 			consumeAllocAfter,
 			traceAllocAfter,
 		)
+		s.invalidateDepreciationSnapshots(c.Context(), tx, []uint{lockedChickin.ProjectFlockKandangId}, lockedChickin.ChickInDate)
 
 		return nil
 	})
@@ -1160,6 +1168,7 @@ func (s chickinService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entit
 	if action == entity.ApprovalActionApproved {
 		step = utils.ChickinStepDisetujui
 	}
+	invalidateFromByPFK := make(map[uint]time.Time, len(approvableIDs))
 
 	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 		if err := s.ensurePopulationRouteScope(c.Context(), dbTransaction); err != nil {
@@ -1204,6 +1213,12 @@ func (s chickinService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entit
 				if err != nil {
 					return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to get chickins for approval %d", approvableID))
 				}
+				for _, chickin := range chickins {
+					invalidateFromByPFK[approvableID] = commonSvc.MinNonZeroDateOnlyUTC(
+						invalidateFromByPFK[approvableID],
+						chickin.ChickInDate,
+					)
+				}
 
 				kandangForApproval, err := s.ProjectflockKandangRepo.GetByID(c.Context(), approvableID)
 				if err != nil {
@@ -1281,6 +1296,12 @@ func (s chickinService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entit
 				if err != nil {
 					return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("Failed to get pending chickins for rejection %d", approvableID))
 				}
+				for _, chickin := range chickins {
+					invalidateFromByPFK[approvableID] = commonSvc.MinNonZeroDateOnlyUTC(
+						invalidateFromByPFK[approvableID],
+						chickin.ChickInDate,
+					)
+				}
 
 				if len(chickins) == 0 {
 					continue
@@ -1328,6 +1349,9 @@ func (s chickinService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entit
 		}
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to record approval")
 	}
+	for projectFlockKandangID, invalidateFromDate := range invalidateFromByPFK {
+		s.invalidateDepreciationSnapshots(c.Context(), nil, []uint{projectFlockKandangID}, invalidateFromDate)
+	}
 
 	updated := make([]entity.ProjectChickin, 0)
 	for _, kandangID := range approvableIDs {
@@ -1837,6 +1861,57 @@ func normalizeDateOnlyUTC(value time.Time) time.Time {
 	return time.Date(value.UTC().Year(), value.UTC().Month(), value.UTC().Day(), 0, 0, 0, 0, time.UTC)
 }
 
+func (s chickinService) invalidateDepreciationSnapshots(
+	ctx context.Context,
+	tx *gorm.DB,
+	projectFlockKandangIDs []uint,
+	fromDate time.Time,
+) {
+	if fromDate.IsZero() {
+		return
+	}
+
+	projectFlockKandangIDs = uniqueUint(projectFlockKandangIDs)
+	if len(projectFlockKandangIDs) == 0 {
+		return
+	}
+
+	targetDB := s.Repository.DB()
+	if tx != nil {
+		targetDB = tx
+	}
+
+	farmIDs, err := commonSvc.ResolveProjectFlockIDsByProjectFlockKandangIDs(ctx, targetDB, projectFlockKandangIDs)
+	if err != nil {
+		s.Log.Warnf(
+			"Failed to resolve farm ids for chickin depreciation invalidation (pfk_ids=%v): %+v",
+			projectFlockKandangIDs,
+			err,
+		)
+		farmIDs = nil
+	}
+
+	if len(farmIDs) == 0 {
+		if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, nil, fromDate); err != nil {
+			s.Log.Warnf(
+				"Failed to invalidate depreciation snapshots globally (from=%s): %+v",
+				fromDate.Format("2006-01-02"),
+				err,
+			)
+		}
+		return
+	}
+
+	if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, farmIDs, fromDate); err != nil {
+		s.Log.Warnf(
+			"Failed to invalidate depreciation snapshots (farm_ids=%v, from=%s): %+v",
+			farmIDs,
+			fromDate.Format("2006-01-02"),
+			err,
+		)
+	}
+}
+
 func (s *chickinService) syncChickinTraceForProductWarehouse(ctx context.Context, tx *gorm.DB, productWarehouseID uint) error {
 	if productWarehouseID == 0 {
 		return nil

internal/modules/production/project-flock-kandangs/controllers/project_flock_kandang.controller.go

@@ -24,22 +24,50 @@ func NewProjectFlockKandangController(projectFlockKandangService service.Project
 
 func (u *ProjectFlockKandangController) GetAll(c *fiber.Ctx) error {
 	query := &validation.Query{
-		Page:           c.QueryInt("page", 1),
-		Limit:          c.QueryInt("limit", 10),
-		Search:         c.Query("search", ""),
-		ProjectFlockId: uint(c.QueryInt("project_flock_id", 0)),
-		KandangId:      uint(c.QueryInt("kandang_id", 0)),
-		Category:       c.Query("category", ""),
-		AreaId:         uint(c.QueryInt("area_id", 0)),
-		SortBy:         c.Query("sort_by", ""),
-		SortOrder:      c.Query("sort_order", ""),
-		StepName:       c.Query("step_name", ""),
+		Page:            c.QueryInt("page", 1),
+		Limit:           c.QueryInt("limit", 10),
+		Search:          c.Query("search", ""),
+		NameWithPeriode: c.QueryBool("name_with_periode", false),
+		ProjectFlockId:  uint(c.QueryInt("project_flock_id", 0)),
+		KandangId:       uint(c.QueryInt("kandang_id", 0)),
+		Category:        c.Query("category", ""),
+		AreaId:          uint(c.QueryInt("area_id", 0)),
+		LocationId:      uint(c.QueryInt("location_id", 0)),
+		SortBy:          c.Query("sort_by", ""),
+		SortOrder:       c.Query("sort_order", ""),
+		StepName:        c.Query("step_name", ""),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {
 		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
 	}
 
+	if query.NameWithPeriode {
+		results, totalResults, err := u.ProjectFlockKandangService.GetAllNameWithPeriode(c, query)
+		if err != nil {
+			return err
+		}
+
+		data := make([]dto.ProjectFlockKandangNameWithPeriodDTO, 0, len(results))
+		for _, result := range results {
+			data = append(data, dto.ToProjectFlockKandangNameWithPeriodDTOValues(result.Id, result.KandangName, result.Period))
+		}
+
+		return c.Status(fiber.StatusOK).
+			JSON(response.SuccessWithPaginate[dto.ProjectFlockKandangNameWithPeriodDTO]{
+				Code:    fiber.StatusOK,
+				Status:  "success",
+				Message: "Get all projectFlockKandangs successfully",
+				Meta: response.Meta{
+					Page:         query.Page,
+					Limit:        query.Limit,
+					TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+					TotalResults: totalResults,
+				},
+				Data: data,
+			})
+	}
+
 	results, totalResults, err := u.ProjectFlockKandangService.GetAll(c, query)
 	if err != nil {
 		return err

internal/modules/production/project-flock-kandangs/dto/project_flock_kandang.dto.go

@@ -60,6 +60,11 @@ type ProjectFlockKandangListDTO struct {
 	ChickinApproval *approvalDTO.ApprovalRelationDTO `json:"chickin_approval,omitempty"`
 }
 
+type ProjectFlockKandangNameWithPeriodDTO struct {
+	Id             uint   `json:"id"`
+	NameWithPeriod string `json:"name_with_period"`
+}
+
 type ProjectFlockKandangDetailDTO struct {
 	ProjectFlockKandangListDTO
 	Chickins      []chickinDTO.ChickinRelationDTO `json:"chickins,omitempty"`
@@ -129,13 +134,17 @@ func toKandangRelation(kandang entity.Kandang) *kandangDTO.KandangRelationDTO {
 }
 
 func toNameWithPeriod(kandang entity.Kandang, period int) string {
-	if kandang.Name == "" {
+	return toNameWithPeriodValue(kandang.Name, period)
+}
+
+func toNameWithPeriodValue(kandangName string, period int) string {
+	if kandangName == "" {
 		return ""
 	}
 	if period == 0 {
-		return kandang.Name
+		return kandangName
 	}
-	return kandang.Name + " Period " + strconv.Itoa(period)
+	return kandangName + " Period " + strconv.Itoa(period)
 }
 
 func toApprovalDTOSelector(
@@ -167,6 +176,20 @@ func ToProjectFlockKandangListDTO(e entity.ProjectFlockKandang) ProjectFlockKand
 	}
 }
 
+func ToProjectFlockKandangNameWithPeriodDTO(e entity.ProjectFlockKandang) ProjectFlockKandangNameWithPeriodDTO {
+	return ProjectFlockKandangNameWithPeriodDTO{
+		Id:             e.Id,
+		NameWithPeriod: toNameWithPeriod(e.Kandang, e.Period),
+	}
+}
+
+func ToProjectFlockKandangNameWithPeriodDTOValues(id uint, kandangName string, period int) ProjectFlockKandangNameWithPeriodDTO {
+	return ProjectFlockKandangNameWithPeriodDTO{
+		Id:             id,
+		NameWithPeriod: toNameWithPeriodValue(kandangName, period),
+	}
+}
+
 func toCreatedUserDTO(pf entity.ProjectFlock) *userDTO.UserRelationDTO {
 	if pf.CreatedUser.Id != 0 {
 		mapped := userDTO.ToUserRelationDTO(pf.CreatedUser)

internal/modules/production/project-flock-kandangs/route.go

@@ -13,11 +13,11 @@ func ProjectFlockKandangRoutes(v1 fiber.Router, u user.UserService, s projectFlo
 	ctrl := controller.NewProjectFlockKandangController(s)
 
 	route := v1.Group("/project-flock-kandangs")
-	route.Use(m.Auth(u))
-	route.Get("/",m.RequirePermissions(m.P_ProjectFlockKandangsGetAll), ctrl.GetAll)
-	route.Get("/:id",m.RequirePermissions(m.P_ProjectFlockKandangsGetOne), ctrl.GetOne)
+	// route.Use(m.Auth(u))
+	route.Get("/", ctrl.GetAll)
+	route.Get("/:id", m.RequirePermissions(m.P_ProjectFlockKandangsGetOne), ctrl.GetOne)
 	// route.Post("/:id/closing", m.RequirePermissions(m.PermissionProjectFlockClosing), ctrl.Closing)
 	// route.Get("/:id/closing/check", m.RequirePermissions(m.PermissionProjectFlockClosing), ctrl.CheckClosing)
-	route.Post("/:id/closing",m.RequirePermissions(m.P_ProjectFlockKandangsClosing),  ctrl.Closing)
+	route.Post("/:id/closing", m.RequirePermissions(m.P_ProjectFlockKandangsClosing), ctrl.Closing)
 	route.Get("/:id/closing/check", m.RequirePermissions(m.P_ProjectFlockKandangsCheckClosing), ctrl.CheckClosing)
 }

internal/modules/production/project-flock-kandangs/services/project_flock_kandang.service.go

@@ -26,6 +26,7 @@ import (
 
 type ProjectFlockKandangService interface {
 	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlockKandang, int64, error)
+	GetAllNameWithPeriode(ctx *fiber.Ctx, params *validation.Query) ([]ProjectFlockKandangNameWithPeriode, int64, error)
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlockKandang, map[uint]float64, []entity.ProductWarehouse, error)
 	CheckClosing(ctx *fiber.Ctx, id uint) (*ClosingCheckResult, error)
 	Closing(ctx *fiber.Ctx, id uint, req *validation.Closing) (*entity.ProjectFlockKandang, error)
@@ -51,6 +52,12 @@ type ClosingCheckResult struct {
 	Expenses           []ExpenseSummary       `json:"expenses"`
 }
 
+type ProjectFlockKandangNameWithPeriode struct {
+	Id          uint
+	KandangName string
+	Period      int
+}
+
 type StockRemainingDetail struct {
 	FlagName           string  `json:"flag_name"`
 	ProductWarehouseId uint    `json:"product_warehouse_id"`
@@ -133,6 +140,36 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 	return projectFlockKandangs, total, nil
 }
 
+func (s projectFlockKandangService) GetAllNameWithPeriode(c *fiber.Ctx, params *validation.Query) ([]ProjectFlockKandangNameWithPeriode, int64, error) {
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, 0, err
+	}
+
+	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
+	if err != nil {
+		return nil, 0, err
+	}
+
+	offset := (params.Page - 1) * params.Limit
+
+	rows, total, err := s.Repository.GetAllNameWithPeriodeScoped(c.Context(), offset, params.Limit, params, scope.IDs, scope.Restrict)
+	if err != nil {
+		s.Log.Errorf("Failed to get projectFlockKandangs name_with_periode: %+v", err)
+		return nil, 0, err
+	}
+
+	results := make([]ProjectFlockKandangNameWithPeriode, 0, len(rows))
+	for _, row := range rows {
+		results = append(results, ProjectFlockKandangNameWithPeriode{
+			Id:          row.Id,
+			KandangName: row.KandangName,
+			Period:      row.Period,
+		})
+	}
+
+	return results, total, nil
+}
+
 func (s projectFlockKandangService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlockKandang, map[uint]float64, []entity.ProductWarehouse, error) {
 	scope, err := m.ResolveLocationScope(c, s.Repository.DB())
 	if err != nil {

internal/modules/production/project-flock-kandangs/validations/project_flock_kandang.validation.go

@@ -11,19 +11,21 @@ type Update struct {
 }
 
 type Query struct {
-	Page           int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit          int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search         string `query:"search" validate:"omitempty,max=50"`
-	ProjectFlockId uint   `query:"project_flock_id" validate:"omitempty"`
-	KandangId      uint   `query:"kandang_id" validate:"omitempty"`
-	Category       string `query:"category" validate:"omitempty,oneof=Growing Laying"`
-	AreaId         uint   `query:"area_id" validate:"omitempty"`
-	SortBy         string `query:"sort_by" validate:"omitempty,oneof=created_at period"`
-	SortOrder      string `query:"sort_order" validate:"omitempty,oneof=ASC DESC"`
-	StepName       string `query:"step_name" validate:"omitempty,max=50"`
+	Page            int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit           int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Search          string `query:"search" validate:"omitempty,max=50"`
+	NameWithPeriode bool   `query:"name_with_periode"`
+	ProjectFlockId  uint   `query:"project_flock_id" validate:"omitempty"`
+	KandangId       uint   `query:"kandang_id" validate:"omitempty"`
+	Category        string `query:"category" validate:"omitempty,oneof=Growing Laying"`
+	AreaId          uint   `query:"area_id" validate:"omitempty"`
+	LocationId      uint   `query:"location_id" validate:"omitempty,number,gt=0"`
+	SortBy          string `query:"sort_by" validate:"omitempty,oneof=created_at period"`
+	SortOrder       string `query:"sort_order" validate:"omitempty,oneof=ASC DESC"`
+	StepName        string `query:"step_name" validate:"omitempty,max=50"`
 }
 
 type Closing struct {
 	Action     string  `json:"action" validate:"required,oneof=close unclose"`
 	ClosedDate *string `json:"closed_date,omitempty"`
-}
+}

internal/modules/production/project_flocks/repositories/projectflock.repository.go

@@ -322,8 +322,8 @@ func (r *ProjectflockRepositoryImpl) buildOrderExpressions(sortBy, sortOrder str
 		}
 	default:
 		return []string{
-			"project_flocks.created_at DESC",
-			"project_flocks.updated_at DESC",
+			"project_flocks.flock_name ASC",
+			"project_flocks.id ASC",
 		}
 	}
 }

internal/modules/production/project_flocks/repositories/projectflock_kandang.repository.go

@@ -22,6 +22,7 @@ type ProjectFlockKandangRepository interface {
 	GetAll(ctx context.Context, offset int, limit int, modifier func(*gorm.DB) *gorm.DB) ([]entity.ProjectFlockKandang, int64, error)
 	GetAllWithFilters(ctx context.Context, offset int, limit int, params interface{}) ([]entity.ProjectFlockKandang, int64, error)
 	GetAllWithFiltersScoped(ctx context.Context, offset int, limit int, params interface{}, locationIDs []uint, restrict bool) ([]entity.ProjectFlockKandang, int64, error)
+	GetAllNameWithPeriodeScoped(ctx context.Context, offset int, limit int, params *validation.Query, locationIDs []uint, restrict bool) ([]ProjectFlockKandangNameWithPeriode, int64, error)
 	GetByProjectFlockID(ctx context.Context, projectFlockID uint) ([]entity.ProjectFlockKandang, error)
 	ListExistingKandangIDs(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]uint, error)
 	HasKandangsLinkedToOtherProject(ctx context.Context, kandangIDs []uint, exceptProjectID *uint) (bool, error)
@@ -40,6 +41,12 @@ type projectFlockKandangRepositoryImpl struct {
 	db *gorm.DB
 }
 
+type ProjectFlockKandangNameWithPeriode struct {
+	Id          uint   `gorm:"column:id"`
+	KandangName string `gorm:"column:kandang_name"`
+	Period      int    `gorm:"column:period"`
+}
+
 const flockBaseNameExpression = "LOWER(TRIM(regexp_replace(project_flocks.flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g')))"
 
 func NewProjectFlockKandangRepository(db *gorm.DB) ProjectFlockKandangRepository {
@@ -171,13 +178,17 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFilters(ctx context.Contex
 		if query.AreaId > 0 {
 			q = q.Where("\"project_flocks\".\"area_id\" = ?", query.AreaId)
 		}
+
+		if query.LocationId > 0 {
+			q = q.Where("\"kandangs\".\"location_id\" = ?", query.LocationId)
+		}
 	}
 
 	if err := q.Model(&entity.ProjectFlockKandang{}).Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
 
-	sortBy := "\"project_flock_kandangs\".\"created_at\" DESC"
+	sortBy := "\"project_flock_kandangs\".\"id\" ASC"
 	if ok && query != nil && query.SortBy != "" {
 		sortOrder := "DESC"
 		if query.SortOrder == "ASC" {
@@ -269,13 +280,17 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFiltersScoped(ctx context.
 		if query.AreaId > 0 {
 			q = q.Where("\"project_flocks\".\"area_id\" = ?", query.AreaId)
 		}
+
+		if query.LocationId > 0 {
+			q = q.Where("\"kandangs\".\"location_id\" = ?", query.LocationId)
+		}
 	}
 
 	if err := q.Model(&entity.ProjectFlockKandang{}).Count(&total).Error; err != nil {
 		return nil, 0, err
 	}
 
-	sortBy := "\"project_flock_kandangs\".\"created_at\" DESC"
+	sortBy := "\"project_flock_kandangs\".\"id\" ASC"
 	if ok && query != nil && query.SortBy != "" {
 		sortOrder := "DESC"
 		if query.SortOrder == "ASC" {
@@ -297,6 +312,101 @@ func (r *projectFlockKandangRepositoryImpl) GetAllWithFiltersScoped(ctx context.
 	return records, total, nil
 }
 
+func (r *projectFlockKandangRepositoryImpl) GetAllNameWithPeriodeScoped(ctx context.Context, offset int, limit int, params *validation.Query, locationIDs []uint, restrict bool) ([]ProjectFlockKandangNameWithPeriode, int64, error) {
+	var records []ProjectFlockKandangNameWithPeriode
+	var total int64
+
+	q := r.db.WithContext(ctx).
+		Table("project_flock_kandangs").
+		Joins("JOIN \"kandangs\" ON \"project_flock_kandangs\".\"kandang_id\" = \"kandangs\".\"id\"").
+		Joins("JOIN \"project_flocks\" ON \"project_flock_kandangs\".\"project_flock_id\" = \"project_flocks\".\"id\"")
+
+	if restrict {
+		if len(locationIDs) == 0 {
+			return []ProjectFlockKandangNameWithPeriode{}, 0, nil
+		}
+		q = q.Where("\"project_flocks\".\"location_id\" IN ?", locationIDs)
+	}
+
+	if params != nil && params.StepName != "" {
+		q = q.Where(`
+			EXISTS (
+				SELECT 1 FROM "approvals"
+				WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+				AND "approvals"."approvable_type" = ?
+				AND LOWER("approvals"."step_name") = LOWER(?)
+				AND "approvals"."id" IN (
+					SELECT "approvals"."id" FROM "approvals"
+					WHERE "approvals"."approvable_id" = "project_flock_kandangs"."id"
+					AND "approvals"."approvable_type" = ?
+					ORDER BY "approvals"."id" DESC
+					LIMIT 1
+				)
+			)
+		`, "PROJECT_FLOCK_KANDANGS", params.StepName, "PROJECT_FLOCK_KANDANGS")
+	}
+
+	if params != nil {
+		if params.Search != "" {
+			escapedSearch := strings.NewReplacer("\\", "\\\\", "%", "\\%", "_", "\\_").Replace(params.Search)
+			q = q.Where(
+				r.db.Where("LOWER(\"kandangs\".\"name\") LIKE LOWER(?) ESCAPE '\\'", "%"+escapedSearch+"%").
+					Or("LOWER(\"project_flocks\".\"flock_name\") LIKE LOWER(?) ESCAPE '\\'", "%"+escapedSearch+"%"),
+			)
+		}
+
+		if params.ProjectFlockId > 0 {
+			q = q.Where("\"project_flock_kandangs\".\"project_flock_id\" = ?", params.ProjectFlockId)
+		}
+
+		if params.KandangId > 0 {
+			q = q.Where("\"project_flock_kandangs\".\"kandang_id\" = ?", params.KandangId)
+		}
+
+		if params.Category != "" {
+			q = q.Where("\"project_flocks\".\"category\" = ?", params.Category)
+		}
+
+		if params.AreaId > 0 {
+			q = q.Where("\"project_flocks\".\"area_id\" = ?", params.AreaId)
+		}
+
+		if params.LocationId > 0 {
+			q = q.Where("\"kandangs\".\"location_id\" = ?", params.LocationId)
+		}
+	}
+
+	if err := q.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	sortBy := "\"project_flock_kandangs\".\"created_at\" DESC"
+	if params != nil && params.SortBy != "" {
+		sortOrder := "DESC"
+		if params.SortOrder == "ASC" {
+			sortOrder = "ASC"
+		}
+
+		switch params.SortBy {
+		case "created_at":
+			sortBy = "\"project_flock_kandangs\".\"created_at\" " + sortOrder
+		case "period":
+			sortBy = "\"project_flocks\".\"period\" " + sortOrder
+		}
+	}
+
+	if err := q.
+		Select("\"project_flock_kandangs\".\"id\", \"project_flock_kandangs\".\"period\", \"kandangs\".\"name\" AS kandang_name").
+		Order(sortBy).
+		Offset(offset).
+		Limit(limit).
+		Scan(&records).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return records, total, nil
+}
+
 func (r *projectFlockKandangRepositoryImpl) WithTx(tx *gorm.DB) ProjectFlockKandangRepository {
 	return &projectFlockKandangRepositoryImpl{db: tx}
 }

internal/modules/production/recordings/controllers/recording.controller.go

@@ -26,6 +26,7 @@ func NewRecordingController(recordingService service.RecordingService) *Recordin
 
 func (u *RecordingController) GetAll(c *fiber.Ctx) error {
 	projectFlockID := c.QueryInt("project_flock_kandang_id", 0)
+	exportType := strings.TrimSpace(c.Query("export"))
 
 	page := c.QueryInt("page", 1)
 	limit := c.QueryInt("limit", 10)
@@ -46,6 +47,11 @@ func (u *RecordingController) GetAll(c *fiber.Ctx) error {
 		return err
 	}
 
+	listDTO := dto.ToRecordingListDTOs(result)
+	if strings.EqualFold(exportType, "excel") {
+		return exportRecordingListExcel(c, listDTO)
+	}
+
 	return c.Status(fiber.StatusOK).
 		JSON(response.SuccessWithPaginate[dto.RecordingListDTO]{
 			Code:    fiber.StatusOK,
@@ -57,7 +63,7 @@ func (u *RecordingController) GetAll(c *fiber.Ctx) error {
 				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
 				TotalResults: totalResults,
 			},
-			Data: dto.ToRecordingListDTOs(result),
+			Data: listDTO,
 		})
 }
 

internal/modules/production/recordings/controllers/recording.export.go

@@ -0,0 +1,517 @@
+package controller
+
+import (
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+	"time"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/dto"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/xuri/excelize/v2"
+)
+
+func exportRecordingListExcel(c *fiber.Ctx, items []dto.RecordingListDTO) error {
+	file := excelize.NewFile()
+	defer file.Close()
+
+	const sheetName = "Recordings"
+	defaultSheet := file.GetSheetName(file.GetActiveSheetIndex())
+	if defaultSheet != sheetName {
+		if err := file.SetSheetName(defaultSheet, sheetName); err != nil {
+			return fiber.NewError(fiber.StatusInternalServerError, "failed to prepare excel sheet")
+		}
+	}
+
+	if err := setRecordingExportColumns(file, sheetName); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to prepare excel columns")
+	}
+	if err := setRecordingExportHeaders(file, sheetName); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to prepare excel headers")
+	}
+	if err := setRecordingExportRows(file, sheetName, items); err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to prepare excel rows")
+	}
+
+	buffer, err := file.WriteToBuffer()
+	if err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, "failed to generate excel file")
+	}
+
+	filename := fmt.Sprintf("recordings_%s.xlsx", time.Now().Format("20060102_150405"))
+	c.Set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, filename))
+
+	return c.Status(fiber.StatusOK).Send(buffer.Bytes())
+}
+
+func setRecordingExportColumns(file *excelize.File, sheet string) error {
+	columnWidths := map[string]float64{
+		"A":  6,
+		"B":  18,
+		"C":  24,
+		"D":  18,
+		"E":  10,
+		"F":  12,
+		"G":  20,
+		"H":  18,
+		"I":  16,
+		"J":  12,
+		"K":  12,
+		"L":  16,
+		"M":  16,
+		"N":  18,
+		"O":  18,
+		"P":  16,
+		"Q":  16,
+		"R":  16,
+		"S":  16,
+		"T":  16,
+		"U":  16,
+		"V":  16,
+		"W":  18,
+		"X":  18,
+		"Y":  18,
+		"Z":  22,
+		"AA": 16,
+		"AB": 18,
+	}
+
+	for col, width := range columnWidths {
+		if err := file.SetColWidth(sheet, col, col, width); err != nil {
+			return err
+		}
+	}
+
+	if err := file.SetRowHeight(sheet, 1, 30); err != nil {
+		return err
+	}
+	if err := file.SetRowHeight(sheet, 2, 30); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func setRecordingExportHeaders(file *excelize.File, sheet string) error {
+	verticalHeaderCols := []string{"A", "B", "C", "D", "E", "F", "G", "H", "I", "Y", "Z", "AA", "AB"}
+	for _, col := range verticalHeaderCols {
+		if err := file.MergeCell(sheet, col+"1", col+"2"); err != nil {
+			return err
+		}
+	}
+
+	headerValues := map[string]string{
+		"A1":  "No",
+		"B1":  "Lokasi",
+		"C1":  "Flock",
+		"D1":  "Kandang",
+		"E1":  "Periode",
+		"F1":  "Kategori",
+		"G1":  "Umur (hari)",
+		"H1":  "Waktu Recording",
+		"I1":  "Populasi Akhir",
+		"Y1":  "Status Approval",
+		"Z1":  "Catatan Approval",
+		"AA1": "Dibuat Oleh",
+		"AB1": "Tanggal Submit",
+	}
+	for cell, value := range headerValues {
+		if err := file.SetCellValue(sheet, cell, value); err != nil {
+			return err
+		}
+	}
+
+	if err := file.MergeCell(sheet, "J1", "K1"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "J1", "FCR"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "J2", "Actual"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "K2", "Standard"); err != nil {
+		return err
+	}
+
+	if err := file.MergeCell(sheet, "L1", "M1"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "L1", "Feed Intake (KG)"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "L2", "Actual"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "M2", "Standard"); err != nil {
+		return err
+	}
+
+	if err := file.MergeCell(sheet, "N1", "P1"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "N1", "Mortality"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "N2", "Cum Depletion Rate"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "O2", "Max Depletion Std"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "P2", "Total Depletion"); err != nil {
+		return err
+	}
+
+	if err := file.MergeCell(sheet, "Q1", "T1"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "Q1", "Egg Production"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "Q2", "Egg Mass Actual"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "R2", "Egg Mass Standar"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "S2", "Egg Weight Actual"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "T2", "Egg Weight Standar"); err != nil {
+		return err
+	}
+
+	if err := file.MergeCell(sheet, "U1", "X1"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "U1", "Hen Performance"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "U2", "Hen Day Actual"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "V2", "Hen Day Standar"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "W2", "Hen House Actual"); err != nil {
+		return err
+	}
+	if err := file.SetCellValue(sheet, "X2", "Hen House Standar"); err != nil {
+		return err
+	}
+
+	headerStyle, err := file.NewStyle(&excelize.Style{
+		Font: &excelize.Font{
+			Bold:  true,
+			Color: "7A7A7A",
+		},
+		Fill: excelize.Fill{
+			Type:    "pattern",
+			Pattern: 1,
+			Color:   []string{"F5F5F5"},
+		},
+		Alignment: &excelize.Alignment{
+			Horizontal: "center",
+			Vertical:   "center",
+			WrapText:   true,
+		},
+		Border: []excelize.Border{
+			{Type: "left", Color: "DDDDDD", Style: 1},
+			{Type: "top", Color: "DDDDDD", Style: 1},
+			{Type: "bottom", Color: "DDDDDD", Style: 1},
+			{Type: "right", Color: "DDDDDD", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	return file.SetCellStyle(sheet, "A1", "AB2", headerStyle)
+}
+
+func setRecordingExportRows(file *excelize.File, sheet string, items []dto.RecordingListDTO) error {
+	if len(items) == 0 {
+		return nil
+	}
+
+	columns := []string{
+		"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N",
+		"O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "AA", "AB",
+	}
+
+	for i, item := range items {
+		rowNumber := i + 3
+
+		fcrStd := 0.0
+		if item.ProjectFlock.Fcr != nil {
+			fcrStd = item.ProjectFlock.Fcr.FcrStd
+		}
+
+		maxDepletionStd := 0.0
+		eggMassStd := 0.0
+		eggWeightStd := 0.0
+		henDayStd := 0.0
+		henHouseStd := 0.0
+		feedIntakeStd := 0.0
+		if item.ProjectFlock.ProductionStandart != nil {
+			maxDepletionStd = item.ProjectFlock.ProductionStandart.MaxDepletionStd
+			eggMassStd = item.ProjectFlock.ProductionStandart.EggMassStd
+			eggWeightStd = item.ProjectFlock.ProductionStandart.EggWeightStd
+			henDayStd = item.ProjectFlock.ProductionStandart.HenDayStd
+			henHouseStd = item.ProjectFlock.ProductionStandart.HenHouseStd
+			feedIntakeStd = item.ProjectFlock.ProductionStandart.FeedIntakeStd
+		}
+
+		locationName := "-"
+		if item.Location != nil {
+			locationName = safeExportText(item.Location.Name)
+		}
+
+		kandangName := "-"
+		if item.Kandang != nil {
+			kandangName = safeExportText(item.Kandang.Name)
+		}
+
+		createdBy := "-"
+		if item.CreatedUser != nil {
+			createdBy = safeExportText(item.CreatedUser.Name)
+		} else if strings.TrimSpace(item.Approval.ActionBy.Name) != "" {
+			createdBy = safeExportText(item.Approval.ActionBy.Name)
+		}
+
+		rowValues := []interface{}{
+			i + 1,
+			locationName,
+			safeExportText(item.ProjectFlock.FlockName),
+			kandangName,
+			item.ProjectFlock.Period,
+			formatCategoryLabel(item.ProjectFlock.ProjectFlockCategory),
+			formatAgeLabel(item),
+			formatDateIndonesian(item.RecordDatetime),
+			formatNumberID(item.ProjectFlock.TotalChickQty, 0, false),
+			formatNumberID(item.FcrValue, 2, true),
+			formatNumberID(fcrStd, 2, true),
+			formatNumberID(item.FeedIntake, 2, true),
+			formatNumberID(feedIntakeStd, 2, true),
+			formatPercentID(item.CumDepletionRate, 2),
+			formatPercentID(maxDepletionStd, 2),
+			formatNumberID(item.TotalDepletionQty, 2, true),
+			formatNumberID(item.EggMass, 2, true),
+			formatNumberID(eggMassStd, 2, true),
+			formatNumberID(item.EggWeight, 2, true),
+			formatNumberID(eggWeightStd, 2, true),
+			formatPercentID(item.HenDay, 2),
+			formatPercentID(henDayStd, 2),
+			formatPercentID(item.HenHouse, 2),
+			formatPercentID(henHouseStd, 2),
+			formatApprovalStatus(item),
+			safeExportText(pointerString(item.Approval.Notes)),
+			createdBy,
+			formatDateIndonesian(item.CreatedAt),
+		}
+
+		for idx, col := range columns {
+			cell := fmt.Sprintf("%s%d", col, rowNumber)
+			if err := file.SetCellValue(sheet, cell, rowValues[idx]); err != nil {
+				return err
+			}
+		}
+	}
+
+	lastRow := len(items) + 2
+	dataCenterStyle, err := file.NewStyle(&excelize.Style{
+		Alignment: &excelize.Alignment{
+			Horizontal: "center",
+			Vertical:   "center",
+			WrapText:   true,
+		},
+		Border: []excelize.Border{
+			{Type: "left", Color: "E6E6E6", Style: 1},
+			{Type: "top", Color: "E6E6E6", Style: 1},
+			{Type: "bottom", Color: "E6E6E6", Style: 1},
+			{Type: "right", Color: "E6E6E6", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+	if err := file.SetCellStyle(sheet, "A3", fmt.Sprintf("AB%d", lastRow), dataCenterStyle); err != nil {
+		return err
+	}
+
+	dataLeftStyle, err := file.NewStyle(&excelize.Style{
+		Alignment: &excelize.Alignment{
+			Horizontal: "left",
+			Vertical:   "center",
+			WrapText:   true,
+		},
+		Border: []excelize.Border{
+			{Type: "left", Color: "E6E6E6", Style: 1},
+			{Type: "top", Color: "E6E6E6", Style: 1},
+			{Type: "bottom", Color: "E6E6E6", Style: 1},
+			{Type: "right", Color: "E6E6E6", Style: 1},
+		},
+	})
+	if err != nil {
+		return err
+	}
+
+	leftColumns := []string{"B", "C", "D", "F", "G", "H", "Y", "Z", "AA", "AB"}
+	for _, col := range leftColumns {
+		if err := file.SetCellStyle(sheet, col+"3", fmt.Sprintf("%s%d", col, lastRow), dataLeftStyle); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func formatAgeLabel(item dto.RecordingListDTO) string {
+	if item.Day <= 0 {
+		return "-"
+	}
+
+	week := 0
+	if item.ProjectFlock.ProductionStandart != nil && item.ProjectFlock.ProductionStandart.Week > 0 {
+		week = item.ProjectFlock.ProductionStandart.Week
+	} else {
+		week = ((item.Day - 1) / 7) + 1
+	}
+
+	return fmt.Sprintf("%d (Minggu ke-%d)", item.Day, week)
+}
+
+func formatDateIndonesian(t time.Time) string {
+	if t.IsZero() {
+		return "-"
+	}
+
+	loc, err := time.LoadLocation("Asia/Jakarta")
+	if err == nil {
+		t = t.In(loc)
+	}
+
+	monthNames := []string{
+		"",
+		"Januari",
+		"Februari",
+		"Maret",
+		"April",
+		"Mei",
+		"Juni",
+		"Juli",
+		"Agustus",
+		"September",
+		"Oktober",
+		"November",
+		"Desember",
+	}
+
+	month := int(t.Month())
+	monthLabel := strconv.Itoa(month)
+	if month > 0 && month < len(monthNames) {
+		monthLabel = monthNames[month]
+	}
+
+	return fmt.Sprintf("%02d %s %d", t.Day(), monthLabel, t.Year())
+}
+
+func formatCategoryLabel(value string) string {
+	normalized := strings.TrimSpace(strings.ReplaceAll(value, "_", " "))
+	if normalized == "" {
+		return "-"
+	}
+
+	parts := strings.Fields(strings.ToLower(normalized))
+	for i, part := range parts {
+		if len(part) == 0 {
+			continue
+		}
+		parts[i] = strings.ToUpper(part[:1]) + part[1:]
+	}
+
+	return strings.Join(parts, " ")
+}
+
+func formatPercentID(value float64, decimals int) string {
+	return fmt.Sprintf("%s%%", formatNumberID(value, decimals, false))
+}
+
+func formatNumberID(value float64, decimals int, trim bool) string {
+	if math.IsNaN(value) || math.IsInf(value, 0) {
+		return "0"
+	}
+	if decimals < 0 {
+		decimals = 0
+	}
+
+	raw := strconv.FormatFloat(value, 'f', decimals, 64)
+	if trim && strings.Contains(raw, ".") {
+		raw = strings.TrimRight(raw, "0")
+		raw = strings.TrimRight(raw, ".")
+	}
+
+	parts := strings.SplitN(raw, ".", 2)
+	intPart := parts[0]
+	sign := ""
+	if strings.HasPrefix(intPart, "-") {
+		sign = "-"
+		intPart = strings.TrimPrefix(intPart, "-")
+	}
+	if intPart == "" {
+		intPart = "0"
+	}
+
+	var grouped strings.Builder
+	rem := len(intPart) % 3
+	if rem > 0 {
+		grouped.WriteString(intPart[:rem])
+		if len(intPart) > rem {
+			grouped.WriteString(".")
+		}
+	}
+	for i := rem; i < len(intPart); i += 3 {
+		grouped.WriteString(intPart[i : i+3])
+		if i+3 < len(intPart) {
+			grouped.WriteString(".")
+		}
+	}
+
+	result := sign + grouped.String()
+	if len(parts) == 2 && parts[1] != "" {
+		result += "," + parts[1]
+	}
+
+	return result
+}
+
+func safeExportText(value string) string {
+	normalized := strings.TrimSpace(value)
+	if normalized == "" {
+		return "-"
+	}
+	return normalized
+}
+
+func pointerString(value *string) string {
+	if value == nil {
+		return ""
+	}
+	return *value
+}
+
+func formatApprovalStatus(item dto.RecordingListDTO) string {
+	action := strings.ToUpper(strings.TrimSpace(pointerString(item.Approval.Action)))
+	switch action {
+	case "UPDATED":
+		return "Diperbarui"
+	case "CREATED":
+		return safeExportText(item.Approval.StepName)
+	default:
+		return safeExportText(item.Approval.StepName)
+	}
+}

internal/modules/production/recordings/repositories/recording.repository.go

@@ -758,15 +758,39 @@ func (r *RecordingRepositoryImpl) GetCumulativeEggQtyByProjectFlockKandang(
 		return 0, nil
 	}
 
-	var result float64
+	var cumulativeEggQty float64
 	err := tx.
 		Table("recording_eggs").
 		Select("COALESCE(SUM(recording_eggs.qty), 0)").
 		Joins("JOIN recordings ON recordings.id = recording_eggs.recording_id").
 		Where("recordings.project_flock_kandangs_id = ?", projectFlockKandangId).
 		Where("recordings.record_datetime <= ?", recordTime).
-		Scan(&result).Error
-	return result, err
+		Scan(&cumulativeEggQty).Error
+	if err != nil {
+		return 0, err
+	}
+
+	productWarehouseSubQuery := tx.
+		Table("recording_eggs").
+		Select("DISTINCT recording_eggs.product_warehouse_id").
+		Joins("JOIN recordings ON recordings.id = recording_eggs.recording_id").
+		Where("recordings.project_flock_kandangs_id = ?", projectFlockKandangId).
+		Where("recordings.record_datetime <= ?", recordTime)
+
+	var adjustmentEggQty float64
+	err = tx.
+		Table("adjustment_stocks").
+		Select("COALESCE(SUM(adjustment_stocks.total_qty), 0)").
+		Where("adjustment_stocks.product_warehouse_id IN (?)", productWarehouseSubQuery).
+		Where("adjustment_stocks.function_code = ?", "RECORDING_EGG_IN").
+		Where("adjustment_stocks.transaction_type = ?", "RECORDING").
+		Where("adjustment_stocks.created_at <= ?", recordTime).
+		Scan(&adjustmentEggQty).Error
+	if err != nil {
+		return 0, err
+	}
+
+	return cumulativeEggQty + adjustmentEggQty, nil
 }
 func (r *RecordingRepositoryImpl) GetProductionWeightAndQtyByProjectFlockID(ctx context.Context, projectFlockID uint) (totalWeight float64, totalQty float64, err error) {
 	// Body-weight tracking is removed; keep stub for report compatibility.

internal/modules/production/recordings/services/recording.service.go

@@ -517,7 +517,14 @@ func (s *recordingService) CreateOne(c *fiber.Ctx, req *validation.Create) (*ent
 		return nil, transactionErr
 	}
 
-	return s.GetOne(c, createdRecording.Id)
+	created, err := s.GetOne(c, createdRecording.Id)
+	if err != nil {
+		return nil, err
+	}
+	if created != nil {
+		s.invalidateDepreciationSnapshots(c.Context(), nil, created.ProjectFlockKandangId, created.RecordDatetime)
+	}
+	return created, nil
 }
 
 func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.Recording, error) {
@@ -848,6 +855,13 @@ func (s recordingService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uin
 	if err := recordingutil.AttachProductionStandards(ctx, s.Repository.DB(), false, s.Log, updatedRecording); err != nil {
 		return nil, err
 	}
+	invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(recordingEntity.RecordDatetime, updatedRecording.RecordDatetime)
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		updatedRecording.ProjectFlockKandangId,
+		invalidateFromDate,
+	)
 	return updatedRecording, nil
 }
 
@@ -965,6 +979,12 @@ func (s recordingService) Approval(c *fiber.Ctx, req *validation.Approve) ([]ent
 		if err != nil {
 			return nil, err
 		}
+		s.invalidateDepreciationSnapshots(
+			c.Context(),
+			nil,
+			recording.ProjectFlockKandangId,
+			recording.RecordDatetime,
+		)
 		updated = append(updated, *recording)
 	}
 
@@ -985,7 +1005,7 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 	}
 	note := recordingutil.RecordingNote("Delete", id)
 
-	return s.Repository.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+	err = s.Repository.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		recording, err := s.Repository.WithTx(tx).GetByID(ctx, id, nil)
 		if err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -1029,9 +1049,60 @@ func (s recordingService) DeleteOne(c *fiber.Ctx, id uint) error {
 			s.Log.Errorf("Failed to recalculate recordings after delete: %+v", err)
 			return err
 		}
+		s.invalidateDepreciationSnapshots(ctx, tx, recording.ProjectFlockKandangId, recording.RecordDatetime)
 
 		return nil
 	})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s recordingService) invalidateDepreciationSnapshots(
+	ctx context.Context,
+	tx *gorm.DB,
+	projectFlockKandangID uint,
+	fromDate time.Time,
+) {
+	if projectFlockKandangID == 0 || fromDate.IsZero() {
+		return
+	}
+
+	targetDB := s.Repository.DB()
+	if tx != nil {
+		targetDB = tx
+	}
+
+	farmIDs, err := commonSvc.ResolveProjectFlockIDsByProjectFlockKandangIDs(ctx, targetDB, []uint{projectFlockKandangID})
+	if err != nil {
+		s.Log.Warnf(
+			"Failed to resolve farm for recording depreciation invalidation (pfk=%d): %+v",
+			projectFlockKandangID,
+			err,
+		)
+		farmIDs = nil
+	}
+
+	if len(farmIDs) == 0 {
+		if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, nil, fromDate); err != nil {
+			s.Log.Warnf(
+				"Failed to invalidate depreciation snapshots globally (from=%s): %+v",
+				fromDate.Format("2006-01-02"),
+				err,
+			)
+		}
+		return
+	}
+
+	if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, farmIDs, fromDate); err != nil {
+		s.Log.Warnf(
+			"Failed to invalidate depreciation snapshots (farm_ids=%v, from=%s): %+v",
+			farmIDs,
+			fromDate.Format("2006-01-02"),
+			err,
+		)
+	}
 }
 
 func (s *recordingService) resolveRecordingCategory(ctx context.Context, recording *entity.Recording) (string, error) {
@@ -1989,9 +2060,9 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 	}
 
 	var eggMass float64
-	if remainingChick > 0 && totalEggWeightGrams > 0 {
-		// totalEggWeightGrams is in grams; egg mass is grams per hen.
-		eggMass = totalEggWeightGrams / remainingChick
+	if initialChickin > 0 && totalEggWeightGrams > 0 {
+		// totalEggWeightGrams is in grams; egg mass uses initial chick population.
+		eggMass = totalEggWeightGrams / initialChickin
 		updates["egg_mass"] = eggMass
 		recording.EggMass = &eggMass
 	} else {

internal/modules/production/recordings/validations/recording.validation.go

@@ -37,7 +37,7 @@ 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"`
+	Limit                 int    `query:"limit" validate:"omitempty,number,min=1"`
 	Offset                int    `query:"-" validate:"omitempty,number,min=0"`
 	ProjectFlockKandangId uint   `query:"project_flock_kandang_id" validate:"omitempty,number,min=1"`
 	Search                string `query:"search" validate:"omitempty,max=50"`

internal/modules/production/transfer_layings/services/transfer_laying.service.go

@@ -377,6 +377,7 @@ func (s *transferLayingService) CreateOne(c *fiber.Ctx, req *validation.Create)
 	if err != nil {
 		return nil, err
 	}
+	s.invalidateDepreciationSnapshots(c.Context(), nil, []uint{req.TargetProjectFlockId}, transferDate)
 	return laying_transfer, nil
 
 }
@@ -588,6 +589,13 @@ func (s *transferLayingService) UpdateOne(c *fiber.Ctx, req *validation.Update,
 	}
 
 	layingTransfer, _, err := s.GetOne(c, id)
+	invalidateFromDate := commonSvc.MinNonZeroDateOnlyUTC(existingTransfer.TransferDate, transferDate)
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		[]uint{existingTransfer.ToProjectFlockId, req.TargetProjectFlockId},
+		invalidateFromDate,
+	)
 
 	return layingTransfer, err
 }
@@ -661,6 +669,7 @@ func (s transferLayingService) DeleteOne(c *fiber.Ctx, id uint) error {
 		s.Log.Errorf("Failed to delete transferLaying: %+v", err)
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to delete transfer laying")
 	}
+	s.invalidateDepreciationSnapshots(c.Context(), nil, []uint{transfer.ToProjectFlockId}, transfer.TransferDate)
 
 	return nil
 }
@@ -798,6 +807,14 @@ func (s transferLayingService) Approval(c *fiber.Ctx, req *validation.Approve) (
 		if err != nil {
 			return nil, err
 		}
+		if transfer != nil {
+			s.invalidateDepreciationSnapshots(
+				c.Context(),
+				nil,
+				[]uint{transfer.ToProjectFlockId},
+				resolveDepreciationEffectiveDateForTransfer(transfer),
+			)
+		}
 		updated = append(updated, *transfer)
 	}
 
@@ -837,6 +854,14 @@ func (s transferLayingService) Execute(c *fiber.Ctx, id uint) (*entity.LayingTra
 	if err != nil {
 		return nil, err
 	}
+	if transfer != nil {
+		s.invalidateDepreciationSnapshots(
+			c.Context(),
+			nil,
+			[]uint{transfer.ToProjectFlockId},
+			resolveDepreciationEffectiveDateForTransfer(transfer),
+		)
+	}
 	return transfer, nil
 }
 
@@ -873,6 +898,14 @@ func (s transferLayingService) ExecuteWithBusinessDate(c *fiber.Ctx, id uint, bu
 	if err != nil {
 		return nil, err
 	}
+	if transfer != nil {
+		s.invalidateDepreciationSnapshots(
+			c.Context(),
+			nil,
+			[]uint{transfer.ToProjectFlockId},
+			resolveDepreciationEffectiveDateForTransfer(transfer),
+		)
+	}
 	return transfer, nil
 }
 
@@ -1226,6 +1259,14 @@ func (s transferLayingService) Unexecute(c *fiber.Ctx, id uint) (*entity.LayingT
 	if err != nil {
 		return nil, err
 	}
+	if transfer != nil {
+		s.invalidateDepreciationSnapshots(
+			c.Context(),
+			nil,
+			[]uint{transfer.ToProjectFlockId},
+			resolveDepreciationEffectiveDateForTransfer(transfer),
+		)
+	}
 	return transfer, nil
 }
 
@@ -1678,6 +1719,43 @@ func normalizeDateOnlyUTC(value time.Time) time.Time {
 	return time.Date(value.UTC().Year(), value.UTC().Month(), value.UTC().Day(), 0, 0, 0, 0, time.UTC)
 }
 
+func resolveDepreciationEffectiveDateForTransfer(transfer *entity.LayingTransfer) time.Time {
+	if transfer == nil {
+		return time.Time{}
+	}
+	if transfer.EffectiveMoveDate != nil && !transfer.EffectiveMoveDate.IsZero() {
+		return *transfer.EffectiveMoveDate
+	}
+	if transfer.EconomicCutoffDate != nil && !transfer.EconomicCutoffDate.IsZero() {
+		return *transfer.EconomicCutoffDate
+	}
+	return transfer.TransferDate
+}
+
+func (s transferLayingService) invalidateDepreciationSnapshots(
+	ctx context.Context,
+	tx *gorm.DB,
+	farmIDs []uint,
+	fromDate time.Time,
+) {
+	if fromDate.IsZero() {
+		return
+	}
+	targetDB := s.Repository.DB()
+	if tx != nil {
+		targetDB = tx
+	}
+	uniqueFarmIDs := utils.UniqueUintSlice(farmIDs)
+	if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, uniqueFarmIDs, fromDate); err != nil {
+		s.Log.Warnf(
+			"Failed to invalidate farm depreciation snapshots (farms=%v, from=%s): %+v",
+			uniqueFarmIDs,
+			fromDate.Format("2006-01-02"),
+			err,
+		)
+	}
+}
+
 func isLegacyTransfer(transfer *entity.LayingTransfer) bool {
 	if transfer == nil {
 		return false

internal/modules/production/uniformities/repositories/uniformity.repository.go

@@ -42,7 +42,9 @@ func (r *UniformityRepositoryImpl) GetAllWithFilters(ctx context.Context, offset
 func (r *UniformityRepositoryImpl) WithDefaultRelations() func(*gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {
 		return db.
+			Preload("ProjectFlockKandang.ProjectFlock").
 			Preload("ProjectFlockKandang.ProjectFlock.Location").
+			Preload("ProjectFlockKandang.Chickins").
 			Preload("ProjectFlockKandang.Kandang.Location")
 	}
 }

internal/modules/production/uniformities/services/uniformity.service.go

@@ -106,6 +106,7 @@ func (s uniformityService) GetAll(c *fiber.Ctx, params *validation.Query) ([]ent
 		s.Log.Errorf("Failed to get uniformitys: %+v", err)
 		return nil, 0, err
 	}
+	s.normalizeUniformityWeeks(uniformitys)
 	if err := s.attachLatestApprovals(c.Context(), uniformitys); err != nil {
 		return nil, 0, err
 	}
@@ -125,6 +126,7 @@ func (s uniformityService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlockKa
 		s.Log.Errorf("Failed get uniformity by id: %+v", err)
 		return nil, err
 	}
+	s.normalizeUniformityWeek(uniformity)
 	if err := s.attachLatestApproval(c.Context(), uniformity); err != nil {
 		return nil, err
 	}
@@ -135,6 +137,23 @@ func (s uniformityService) GetSummary(c *fiber.Ctx, id uint) (*entity.ProjectFlo
 	return s.GetOne(c, id)
 }
 
+func (s *uniformityService) normalizeUniformityWeeks(items []entity.ProjectFlockKandangUniformity) {
+	for i := range items {
+		s.normalizeUniformityWeek(&items[i])
+	}
+}
+
+func (s *uniformityService) normalizeUniformityWeek(item *entity.ProjectFlockKandangUniformity) {
+	if item == nil || item.UniformDate == nil {
+		return
+	}
+	computedWeek, err := s.computeUniformityWeekForPFK(&item.ProjectFlockKandang, *item.UniformDate)
+	if err != nil || computedWeek <= 0 {
+		return
+	}
+	item.Week = computedWeek
+}
+
 func (s uniformityService) GetStandard(c *fiber.Ctx, uniformity *entity.ProjectFlockKandangUniformity) (*utypes.UniformityStandard, error) {
 	if uniformity == nil {
 		return nil, nil
@@ -372,24 +391,18 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file
 		}
 		return nil, err
 	}
-	category := strings.TrimSpace(pfk.ProjectFlock.Category)
-	if s.ProductionStandardRepo != nil && pfk.ProjectFlock.ProductionStandardId != 0 {
-		if standard, err := s.ProductionStandardRepo.GetByID(c.Context(), pfk.ProjectFlock.ProductionStandardId, nil); err == nil {
-			if strings.TrimSpace(standard.ProjectCategory) != "" {
-				category = standard.ProjectCategory
-			}
-		}
+	computedWeek, err := s.computeUniformityWeekForPFK(pfk, uniformDate)
+	if err != nil {
+		return nil, err
 	}
-	weekBase := 1
-	isLayingCategory := strings.EqualFold(category, string(utils.ProjectFlockCategoryLaying))
-	if isLayingCategory {
-		weekBase = config.LayingWeekStart()
-	}
-	if req.Week < weekBase {
-		if isLayingCategory {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase))
-		}
-		return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects")
+	isGrowingCategory := strings.EqualFold(strings.TrimSpace(pfk.ProjectFlock.Category), string(utils.ProjectFlockCategoryGrowing))
+	if req.Week > 0 && req.Week != computedWeek {
+		s.Log.WithFields(logrus.Fields{
+			"project_flock_kandang_id": req.ProjectFlockKandangId,
+			"uniform_date":             uniformDate.Format("2006-01-02"),
+			"requested_week":           req.Week,
+			"computed_week":            computedWeek,
+		}).Warn("Uniformity week mismatch detected; using computed week")
 	}
 
 	var latestWeek int
@@ -400,17 +413,14 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file
 		Scan(&latestWeek).Error; err != nil {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate uniformity week sequence")
 	}
-	if latestWeek == 0 && req.Week != weekBase {
-		if isLayingCategory {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase))
-		}
-		return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects")
-	}
-	if latestWeek > 0 && req.Week > latestWeek+1 {
+	if latestWeek > 0 && computedWeek > latestWeek+1 {
 		return nil, fiber.NewError(fiber.StatusBadRequest, "week must be sequential without skipping")
 	}
+	// if latestWeek > 0 && req.Week > latestWeek+1 {
+	// 	return nil, fiber.NewError(fiber.StatusBadRequest, "week must be sequential without skipping")
+	// }
 
-	if err := s.ensureUniqueUniformity(c.Context(), 0, req.ProjectFlockKandangId, req.Week); err != nil {
+	if err := s.ensureUniqueUniformity(c.Context(), 0, req.ProjectFlockKandangId, computedWeek); err != nil {
 		return nil, err
 	}
 
@@ -438,7 +448,7 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file
 
 	createBody := &entity.ProjectFlockKandangUniformity{
 		Uniformity:            calculation.Uniformity,
-		Week:                  req.Week,
+		Week:                  computedWeek,
 		Cv:                    calculation.Cv,
 		ChickQtyOfWeight:      calculation.ChickQtyOfWeight,
 		MeanUp:                calculation.MeanUp,
@@ -467,7 +477,7 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file
 		); err != nil {
 			return err
 		}
-		if strings.EqualFold(category, string(utils.ProjectFlockCategoryGrowing)) {
+		if isGrowingCategory {
 			if err := s.updateGrowingFcrForWeek(tx, createBody.ProjectFlockKandangId, createBody.Week, calculation.MeanUp); err != nil {
 				return err
 			}
@@ -536,9 +546,6 @@ func (s uniformityService) UpdateOne(c *fiber.Ctx, req *validation.Update, id ui
 		}
 		updateBody["project_flock_kandang_id"] = *req.ProjectFlockKandangId
 	}
-	if req.Week != nil {
-		updateBody["week"] = *req.Week
-	}
 
 	if req.Date != nil || req.ProjectFlockKandangId != nil || req.Week != nil {
 		current, err := s.Repository.GetByID(c.Context(), id, nil)
@@ -552,15 +559,11 @@ func (s uniformityService) UpdateOne(c *fiber.Ctx, req *validation.Update, id ui
 		if targetDate == nil {
 			targetDate = current.UniformDate
 		}
-		targetWeek := current.Week
-		if req.Week != nil {
-			targetWeek = *req.Week
-		}
 		targetPFKID := current.ProjectFlockKandangId
 		if req.ProjectFlockKandangId != nil {
 			targetPFKID = *req.ProjectFlockKandangId
 		}
-		if targetPFKID != 0 && targetWeek > 0 {
+		if targetPFKID != 0 && targetDate != nil {
 			pfk, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), targetPFKID)
 			if err != nil {
 				if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -568,28 +571,21 @@ func (s uniformityService) UpdateOne(c *fiber.Ctx, req *validation.Update, id ui
 				}
 				return nil, err
 			}
-			category := strings.TrimSpace(pfk.ProjectFlock.Category)
-			if s.ProductionStandardRepo != nil && pfk.ProjectFlock.ProductionStandardId != 0 {
-				if standard, err := s.ProductionStandardRepo.GetByID(c.Context(), pfk.ProjectFlock.ProductionStandardId, nil); err == nil {
-					if strings.TrimSpace(standard.ProjectCategory) != "" {
-						category = standard.ProjectCategory
-					}
-				}
+			computedWeek, err := s.computeUniformityWeekForPFK(pfk, *targetDate)
+			if err != nil {
+				return nil, err
 			}
-			weekBase := 1
-			isLayingCategory := strings.EqualFold(category, string(utils.ProjectFlockCategoryLaying))
-			if isLayingCategory {
-				weekBase = config.LayingWeekStart()
+			if req.Week != nil && *req.Week != computedWeek {
+				s.Log.WithFields(logrus.Fields{
+					"uniformity_id":            id,
+					"project_flock_kandang_id": targetPFKID,
+					"uniform_date":             targetDate.Format("2006-01-02"),
+					"requested_week":           *req.Week,
+					"computed_week":            computedWeek,
+				}).Warn("Uniformity week mismatch detected on update; using computed week")
 			}
-			if targetWeek < weekBase {
-				if isLayingCategory {
-					return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase))
-				}
-				return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects")
-			}
-		}
-		if targetDate != nil {
-			if err := s.ensureUniqueUniformity(c.Context(), id, targetPFKID, targetWeek); err != nil {
+			updateBody["week"] = computedWeek
+			if err := s.ensureUniqueUniformity(c.Context(), id, targetPFKID, computedWeek); err != nil {
 				return nil, err
 			}
 		}
@@ -734,6 +730,51 @@ func (s *uniformityService) ensureUniqueUniformity(ctx context.Context, id uint,
 	return nil
 }
 
+func (s *uniformityService) computeUniformityWeekForPFK(pfk *entity.ProjectFlockKandang, uniformDate time.Time) (int, error) {
+	if pfk == nil || pfk.Id == 0 {
+		return 0, fiber.NewError(fiber.StatusBadRequest, "Project flock kandang tidak valid")
+	}
+
+	chickInDate, ok := earliestUniformityChickInDate(pfk.Chickins)
+	if !ok {
+		return 0, fiber.NewError(fiber.StatusBadRequest, "Tanggal chick in tidak ditemukan")
+	}
+
+	chickInDay := normalizeUniformityDateOnlyUTC(chickInDate)
+	uniformDay := normalizeUniformityDateOnlyUTC(uniformDate)
+	if uniformDay.Before(chickInDay) {
+		return 0, fiber.NewError(fiber.StatusBadRequest, "Uniformity date tidak boleh sebelum tanggal chick in")
+	}
+
+	diff := int(uniformDay.Sub(chickInDay).Hours() / 24)
+	weekBase := 1
+	if strings.EqualFold(strings.TrimSpace(pfk.ProjectFlock.Category), string(utils.ProjectFlockCategoryLaying)) {
+		weekBase = config.LayingWeekStart()
+	}
+
+	return (diff / 7) + weekBase, nil
+}
+
+func earliestUniformityChickInDate(chickins []entity.ProjectChickin) (time.Time, bool) {
+	var earliest time.Time
+	for _, chickin := range chickins {
+		if chickin.ChickInDate.IsZero() {
+			continue
+		}
+		if earliest.IsZero() || chickin.ChickInDate.Before(earliest) {
+			earliest = chickin.ChickInDate
+		}
+	}
+	if earliest.IsZero() {
+		return time.Time{}, false
+	}
+	return earliest, true
+}
+
+func normalizeUniformityDateOnlyUTC(value time.Time) time.Time {
+	return time.Date(value.UTC().Year(), value.UTC().Month(), value.UTC().Day(), 0, 0, 0, 0, time.UTC)
+}
+
 func (s uniformityService) DeleteOne(c *fiber.Ctx, id uint) error {
 	if err := m.EnsureUniformityAccess(c, s.Repository.DB(), id); err != nil {
 		return err

internal/modules/production/uniformities/services/uniformity_week_test.go

@@ -0,0 +1,78 @@
+package service
+
+import (
+	"testing"
+	"time"
+
+	"gitlab.com/mbugroup/lti-api.git/internal/config"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+)
+
+func TestComputeUniformityWeekForPFK(t *testing.T) {
+	originalWeekStart := config.TransferToLayingGrowingMaxWeek
+	config.TransferToLayingGrowingMaxWeek = 19
+	t.Cleanup(func() {
+		config.TransferToLayingGrowingMaxWeek = originalWeekStart
+	})
+
+	svc := &uniformityService{}
+	baseDate := time.Date(2026, time.January, 1, 9, 30, 0, 0, time.UTC)
+
+	t.Run("growing starts from week one", func(t *testing.T) {
+		pfk := &entity.ProjectFlockKandang{
+			Id: 1,
+			ProjectFlock: entity.ProjectFlock{
+				Category: string(utils.ProjectFlockCategoryGrowing),
+			},
+			Chickins: []entity.ProjectChickin{
+				{ChickInDate: baseDate},
+			},
+		}
+
+		week, err := svc.computeUniformityWeekForPFK(pfk, baseDate)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if week != 1 {
+			t.Fatalf("expected week 1, got %d", week)
+		}
+	})
+
+	t.Run("laying uses configured week base and earliest chick in", func(t *testing.T) {
+		pfk := &entity.ProjectFlockKandang{
+			Id: 2,
+			ProjectFlock: entity.ProjectFlock{
+				Category: string(utils.ProjectFlockCategoryLaying),
+			},
+			Chickins: []entity.ProjectChickin{
+				{ChickInDate: baseDate.AddDate(0, 0, 4)},
+				{ChickInDate: baseDate},
+			},
+		}
+
+		week, err := svc.computeUniformityWeekForPFK(pfk, baseDate.AddDate(0, 0, 7))
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if week != 20 {
+			t.Fatalf("expected week 20, got %d", week)
+		}
+	})
+
+	t.Run("rejects date before chick in", func(t *testing.T) {
+		pfk := &entity.ProjectFlockKandang{
+			Id: 3,
+			ProjectFlock: entity.ProjectFlock{
+				Category: string(utils.ProjectFlockCategoryLaying),
+			},
+			Chickins: []entity.ProjectChickin{
+				{ChickInDate: baseDate},
+			},
+		}
+
+		if _, err := svc.computeUniformityWeekForPFK(pfk, baseDate.AddDate(0, 0, -1)); err == nil {
+			t.Fatal("expected error for date before chick in")
+		}
+	})
+}

internal/modules/production/uniformities/validations/uniformity.validation.go

@@ -12,7 +12,7 @@ import (
 type Create struct {
 	Date                  string `form:"date" validate:"required"`
 	ProjectFlockKandangId uint   `form:"project_flock_kandang_id" validate:"required,number,min=1"`
-	Week                  int    `form:"week" validate:"required,min=1"`
+	Week                  int    `form:"week" validate:"omitempty,min=1"`
 }
 
 type Update struct {
@@ -120,14 +120,14 @@ func ParseCreate(c *fiber.Ctx) (*Create, *multipart.FileHeader, error) {
 		return nil, nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
 	}
 
+	week := 0
 	weekStr := strings.TrimSpace(c.FormValue("week"))
-	if weekStr == "" {
-		return nil, nil, fiber.NewError(fiber.StatusBadRequest, "week is required")
-	}
-
-	week, err := strconv.Atoi(weekStr)
-	if err != nil || week <= 0 {
-		return nil, nil, fiber.NewError(fiber.StatusBadRequest, "week is required")
+	if weekStr != "" {
+		parsedWeek, err := strconv.Atoi(weekStr)
+		if err != nil || parsedWeek <= 0 {
+			return nil, nil, fiber.NewError(fiber.StatusBadRequest, "week is invalid")
+		}
+		week = parsedWeek
 	}
 
 	file, err := c.FormFile("document")

internal/modules/purchases/repositories/purchase.repository.go

@@ -169,6 +169,7 @@ type PurchaseReceivingUpdate struct {
 	TravelNumber          *string
 	TravelDocumentPath    *string
 	VehicleNumber         *string
+	ClearVehicleNumber    bool
 	ReceivedQty           *float64
 	WarehouseID           *uint
 	ProductWarehouseID    *uint
@@ -246,6 +247,8 @@ func (r *PurchaseRepositoryImpl) UpdateReceivingDetails(
 		}
 		if upd.VehicleNumber != nil {
 			data["vehicle_number"] = upd.VehicleNumber
+		} else if upd.ClearVehicleNumber {
+			data["vehicle_number"] = ""
 		}
 		if upd.WarehouseID != nil && *upd.WarehouseID != 0 {
 			data["warehouse_id"] = upd.WarehouseID

internal/modules/purchases/services/expense_bridge.go

@@ -183,15 +183,102 @@ func (b *expenseBridge) markExpensesUpdated(ctx context.Context, expenseIDs map[
 	return nil
 }
 
+func (b *expenseBridge) clearExpenseLinksForItems(ctx context.Context, itemIDs []uint) error {
+	if len(itemIDs) == 0 {
+		return nil
+	}
+
+	unique := make(map[uint]struct{}, len(itemIDs))
+	normalized := make([]uint, 0, len(itemIDs))
+	for _, id := range itemIDs {
+		if id == 0 {
+			continue
+		}
+		if _, exists := unique[id]; exists {
+			continue
+		}
+		unique[id] = struct{}{}
+		normalized = append(normalized, id)
+	}
+	if len(normalized) == 0 {
+		return nil
+	}
+
+	rows := make([]struct {
+		ItemID            uint
+		ExpenseNonstockID *uint64
+		ExpenseID         *uint64
+	}, 0, len(normalized))
+	if err := b.db.WithContext(ctx).
+		Table("purchase_items pi").
+		Select("pi.id as item_id, pi.expense_nonstock_id, en.expense_id").
+		Joins("LEFT JOIN expense_nonstocks en ON en.id = pi.expense_nonstock_id").
+		Where("pi.id IN ?", normalized).
+		Scan(&rows).Error; err != nil {
+		return err
+	}
+
+	expenseNonstockIDs := make([]uint64, 0, len(rows))
+	expenseIDs := make(map[uint64]struct{})
+	for _, row := range rows {
+		if row.ExpenseNonstockID != nil && *row.ExpenseNonstockID != 0 {
+			expenseNonstockIDs = append(expenseNonstockIDs, *row.ExpenseNonstockID)
+		}
+		if row.ExpenseID != nil && *row.ExpenseID != 0 {
+			expenseIDs[*row.ExpenseID] = struct{}{}
+		}
+	}
+
+	return b.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if err := tx.Model(&entity.PurchaseItem{}).
+			Where("id IN ?", normalized).
+			Update("expense_nonstock_id", gorm.Expr("NULL")).Error; err != nil {
+			return err
+		}
+
+		if len(expenseNonstockIDs) > 0 {
+			if err := tx.Where("id IN ?", expenseNonstockIDs).Delete(&entity.ExpenseNonstock{}).Error; err != nil {
+				return err
+			}
+		}
+
+		approvalRepoTx := commonRepo.NewApprovalRepository(tx)
+		for expenseID := range expenseIDs {
+			var count int64
+			if err := tx.Model(&entity.ExpenseNonstock{}).
+				Where("expense_id = ?", expenseID).
+				Count(&count).Error; err != nil {
+				return err
+			}
+			if count > 0 {
+				continue
+			}
+
+			if err := approvalRepoTx.DeleteByTarget(ctx, utils.ApprovalWorkflowExpense.String(), uint(expenseID)); err != nil {
+				return err
+			}
+			if err := tx.Delete(&entity.Expense{}, expenseID).Error; err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
+
 func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates []ExpenseReceivingPayload) error {
 	if purchaseID == 0 || len(updates) == 0 {
 		return nil
 	}
 
 	ctx := c.Context()
+	clearExpenseLinks := make([]uint, 0, len(updates))
 	filtered := make([]ExpenseReceivingPayload, 0, len(updates))
 	for _, upd := range updates {
+		if upd.PurchaseItemID == 0 {
+			continue
+		}
 		if upd.SupplierID == 0 {
+			clearExpenseLinks = append(clearExpenseLinks, upd.PurchaseItemID)
 			continue
 		}
 		if upd.TransportPerItem == nil || *upd.TransportPerItem <= 0 {
@@ -202,6 +289,11 @@ func (b *expenseBridge) OnItemsReceived(c *fiber.Ctx, purchaseID uint, updates [
 		}
 		filtered = append(filtered, upd)
 	}
+	if len(clearExpenseLinks) > 0 {
+		if err := b.clearExpenseLinksForItems(ctx, clearExpenseLinks); err != nil {
+			return err
+		}
+	}
 	if len(filtered) == 0 {
 		return nil
 	}

internal/modules/purchases/services/purchase.service.go

@@ -248,7 +248,7 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 					SELECT 1
 					FROM purchase_items pi
 					JOIN products p ON p.id = pi.product_id
-					WHERE pi.purchase_id = purchases.id AND p.product_category_id IN ?
+								WHERE pi.purchase_id = purchases.id AND p.product_category_id IN ?
 				)`,
 				productCategoryIDs,
 			)
@@ -316,12 +316,119 @@ func (s *purchaseService) GetAll(c *fiber.Ctx, params *validation.Query) ([]enti
 						WHERE pi.purchase_id = purchases.id
 							AND LOWER(COALESCE(p.name, '')) LIKE ?
 					)
+					OR EXISTS (
+						SELECT 1
+						FROM purchase_items pi
+						JOIN warehouses w ON w.id = pi.warehouse_id
+						JOIN locations l ON l.id = w.location_id
+						WHERE pi.purchase_id = purchases.id
+							AND LOWER(COALESCE(l.name, '')) LIKE ?
+					)
+					OR EXISTS (
+						SELECT 1
+						FROM purchase_items pi
+						JOIN expense_nonstocks en ON en.id = pi.expense_nonstock_id
+						JOIN expenses e ON e.id = en.expense_id
+						WHERE pi.purchase_id = purchases.id
+							AND LOWER(COALESCE(e.reference_number, '')) LIKE ?
+					)
 				)`,
 				like,
 				like,
 				like,
 				like,
 				like,
+				like,
+				like,
+			)
+		}
+
+		if len(approvalStatuses) > 0 {
+			approvalConditions := make([]string, 0, len(approvalStatuses))
+			approvalArgs := make([]any, 0, 2+(len(approvalStatuses)*3))
+			approvalArgs = append(approvalArgs, utils.ApprovalWorkflowPurchase.String(), utils.ApprovalWorkflowPurchase.String())
+			for _, status := range approvalStatuses {
+				if status == "" {
+					continue
+				}
+				like := "%" + status + "%"
+				approvalConditions = append(approvalConditions, `(LOWER(COALESCE(a.step_name, '')) LIKE ? OR LOWER(COALESCE(CAST(a.action AS TEXT), '')) LIKE ? OR CAST(a.step_number AS TEXT) = ?)`)
+				approvalArgs = append(approvalArgs, like, like, status)
+			}
+
+			if len(approvalConditions) > 0 {
+				approvalClause := strings.Join(approvalConditions, " OR ")
+				approvalQuery := fmt.Sprintf(
+					`EXISTS (
+						SELECT 1
+						FROM approvals a
+						WHERE a.approvable_type = ?
+							AND a.approvable_id = purchases.id
+							AND a.id = (
+								SELECT a2.id
+								FROM approvals a2
+								WHERE a2.approvable_type = ?
+									AND a2.approvable_id = purchases.id
+								ORDER BY a2.action_at DESC, a2.id DESC
+								LIMIT 1
+							)
+							AND (%s)
+					)`,
+					approvalClause,
+				)
+				db = db.Where(approvalQuery, approvalArgs...)
+			}
+		}
+
+		if search != "" {
+			like := "%" + search + "%"
+			db = db.Where(
+				`(
+					LOWER(COALESCE(purchases.pr_number, '')) LIKE ?
+					OR LOWER(COALESCE(purchases.po_number, '')) LIKE ?
+					OR EXISTS (
+						SELECT 1
+						FROM suppliers s
+						WHERE s.id = purchases.supplier_id
+							AND LOWER(COALESCE(s.name, '')) LIKE ?
+					)
+					OR EXISTS (
+						SELECT 1
+						FROM users u
+						WHERE u.id = purchases.created_by
+							AND LOWER(COALESCE(u.name, '')) LIKE ?
+					)
+					OR EXISTS (
+						SELECT 1
+						FROM purchase_items pi
+						JOIN products p ON p.id = pi.product_id
+						WHERE pi.purchase_id = purchases.id
+							AND LOWER(COALESCE(p.name, '')) LIKE ?
+					)
+					OR EXISTS (
+						SELECT 1
+						FROM purchase_items pi
+						JOIN warehouses w ON w.id = pi.warehouse_id
+						JOIN locations l ON l.id = w.location_id
+						WHERE pi.purchase_id = purchases.id
+							AND LOWER(COALESCE(l.name, '')) LIKE ?
+					)
+					OR EXISTS (
+						SELECT 1
+						FROM purchase_items pi
+						JOIN expense_nonstocks en ON en.id = pi.expense_nonstock_id
+						JOIN expenses e ON e.id = en.expense_id
+						WHERE pi.purchase_id = purchases.id
+							AND LOWER(COALESCE(e.reference_number, '')) LIKE ?
+					)
+				)`,
+				like,
+				like,
+				like,
+				like,
+				like,
+				like,
+				like,
 			)
 		}
 
@@ -568,6 +675,12 @@ func (s *purchaseService) CreateOne(c *fiber.Ctx, req *validation.CreatePurchase
 	if err := s.attachLatestApproval(c.Context(), created); err != nil {
 		s.Log.Warnf("Unable to attach latest approval for purchase %d: %+v", created.Id, err)
 	}
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		collectPFKIDsFromPurchase(created),
+		resolvePurchaseDepreciationInvalidateDate(created, created.Items, now),
+	)
 
 	return created, nil
 }
@@ -719,6 +832,12 @@ func (s *purchaseService) ApproveStaffPurchase(c *fiber.Ctx, id uint, req *valid
 	if err := s.attachLatestApproval(c.Context(), updated); err != nil {
 		s.Log.Warnf("Unable to attach latest approval for purchase %d: %+v", updated.Id, err)
 	}
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		collectPFKIDsFromPurchase(updated),
+		resolvePurchaseDepreciationInvalidateDate(updated, updated.Items, time.Now().UTC()),
+	)
 
 	return updated, nil
 }
@@ -827,6 +946,12 @@ func (s *purchaseService) ApproveManagerPurchase(c *fiber.Ctx, id uint, req *val
 	if err := s.attachLatestApproval(c.Context(), updated); err != nil {
 		s.Log.Warnf("Unable to attach latest approval for purchase %d: %+v", updated.Id, err)
 	}
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		collectPFKIDsFromPurchase(updated),
+		resolvePurchaseDepreciationInvalidateDate(updated, updated.Items, now),
+	)
 
 	return updated, nil
 }
@@ -954,6 +1079,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		supplierID        uint
 		transportPerItem  *float64
 		vehicleNumber     *string
+		clearVehicle      bool
 		overrideWarehouse bool
 		receivedQty       float64
 	}
@@ -1046,12 +1172,16 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 		}
 
 		var vehicleNumber *string
-		if payload.VehicleNumber != nil && strings.TrimSpace(*payload.VehicleNumber) != "" {
+		clearVehicle := false
+		if payload.VehicleNumber != nil {
 			val := strings.TrimSpace(*payload.VehicleNumber)
-			vehicleNumber = &val
-		} else if item.VehicleNumber != nil && strings.TrimSpace(*item.VehicleNumber) != "" {
-			val := strings.TrimSpace(*item.VehicleNumber)
-			vehicleNumber = &val
+			if val != "" {
+				vehicleNumber = &val
+			} else {
+				clearVehicle = true
+			}
+		} else {
+			clearVehicle = true
 		}
 
 		prepared = append(prepared, preparedReceiving{
@@ -1062,6 +1192,7 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			supplierID:        supplierID,
 			transportPerItem:  transportPerItem,
 			vehicleNumber:     vehicleNumber,
+			clearVehicle:      clearVehicle,
 			overrideWarehouse: overrideWarehouse,
 			receivedQty:       receivedQty,
 		})
@@ -1175,7 +1306,8 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 				ReceivedDate:          &dateCopy,
 				TravelNumber:          prep.payload.TravelNumber,
 				TravelDocumentPath:    prep.payload.TravelDocumentPath,
-				VehicleNumber:         prep.payload.VehicleNumber,
+				VehicleNumber:         prep.vehicleNumber,
+				ClearVehicleNumber:    prep.clearVehicle,
 				ReceivedQty:           &qtyCopy,
 				ProductWarehouseID:    newPWID,
 				ClearProductWarehouse: false,
@@ -1307,6 +1439,16 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 	if err := s.attachLatestApproval(c.Context(), updated); err != nil {
 		s.Log.Warnf("Unable to attach latest approval for purchase %d: %+v", updated.Id, err)
 	}
+	invalidateFromDate := resolvePurchaseDepreciationInvalidateDate(updated, updated.Items, time.Now().UTC())
+	if earliestReceived != nil {
+		invalidateFromDate = commonSvc.MinNonZeroDateOnlyUTC(invalidateFromDate, *earliestReceived)
+	}
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		collectPFKIDsFromPurchase(updated),
+		invalidateFromDate,
+	)
 
 	receivingPayloads := make([]ExpenseReceivingPayload, 0, len(prepared))
 	for _, prep := range prepared {
@@ -1514,6 +1656,12 @@ func (s *purchaseService) DeleteItems(c *fiber.Ctx, id uint, req *validation.Del
 	if err := s.attachLatestApproval(ctx, updated); err != nil {
 		s.Log.Warnf("Unable to attach latest approval for purchase %d: %+v", updated.Id, err)
 	}
+	s.invalidateDepreciationSnapshots(
+		ctx,
+		nil,
+		collectPFKIDsFromPurchaseItems(itemsToDelete),
+		resolvePurchaseDepreciationInvalidateDate(purchase, itemsToDelete, time.Now().UTC()),
+	)
 
 	return updated, nil
 }
@@ -1607,6 +1755,12 @@ func (s *purchaseService) DeletePurchase(c *fiber.Ctx, id uint) error {
 			return utils.Internal("Failed to sync expense")
 		}
 	}
+	s.invalidateDepreciationSnapshots(
+		ctx,
+		nil,
+		collectPFKIDsFromPurchaseItems(itemsToDelete),
+		resolvePurchaseDepreciationInvalidateDate(purchase, itemsToDelete, time.Now().UTC()),
+	)
 
 	return nil
 }
@@ -2277,7 +2431,17 @@ func (s *purchaseService) rejectAndReload(
 	if err := s.createPurchaseApproval(c.Context(), nil, purchaseID, step, entity.ApprovalActionRejected, actorID, notes, false); err != nil {
 		return nil, err
 	}
-	return s.loadPurchase(c.Context(), purchaseID)
+	updated, err := s.loadPurchase(c.Context(), purchaseID)
+	if err != nil {
+		return nil, err
+	}
+	s.invalidateDepreciationSnapshots(
+		c.Context(),
+		nil,
+		collectPFKIDsFromPurchase(updated),
+		resolvePurchaseDepreciationInvalidateDate(updated, updated.Items, time.Now().UTC()),
+	)
+	return updated, nil
 }
 func (s *purchaseService) loadPurchase(
 	ctx context.Context,
@@ -2408,10 +2572,17 @@ func (s *purchaseService) resolveChickinLockedItemIDsByItemID(ctx context.Contex
 }
 
 func collectPFKIDsFromPurchase(p *entity.Purchase) []uint {
+	if p == nil {
+		return nil
+	}
+	return collectPFKIDsFromPurchaseItems(p.Items)
+}
+
+func collectPFKIDsFromPurchaseItems(items []entity.PurchaseItem) []uint {
 	seen := make(map[uint]struct{})
 	ids := make([]uint, 0)
 
-	for _, item := range p.Items {
+	for _, item := range items {
 		if item.ProjectFlockKandangId == nil || *item.ProjectFlockKandangId == 0 {
 			continue
 		}
@@ -2424,6 +2595,82 @@ func collectPFKIDsFromPurchase(p *entity.Purchase) []uint {
 	}
 	return ids
 }
+
+func resolvePurchaseDepreciationInvalidateDate(
+	purchase *entity.Purchase,
+	items []entity.PurchaseItem,
+	fallback time.Time,
+) time.Time {
+	fromDate := time.Time{}
+	if purchase != nil {
+		fromDate = commonSvc.MinNonZeroDateOnlyUTC(fromDate, purchase.CreatedAt)
+		if purchase.PoDate != nil {
+			fromDate = commonSvc.MinNonZeroDateOnlyUTC(fromDate, *purchase.PoDate)
+		}
+	}
+	for _, item := range items {
+		if item.ReceivedDate == nil {
+			continue
+		}
+		fromDate = commonSvc.MinNonZeroDateOnlyUTC(fromDate, *item.ReceivedDate)
+	}
+	if fromDate.IsZero() {
+		fromDate = fallback
+	}
+	return fromDate
+}
+
+func (s *purchaseService) invalidateDepreciationSnapshots(
+	ctx context.Context,
+	tx *gorm.DB,
+	projectFlockKandangIDs []uint,
+	fromDate time.Time,
+) {
+	if fromDate.IsZero() {
+		return
+	}
+	projectFlockKandangIDs = utils.UniqueUintSlice(projectFlockKandangIDs)
+
+	targetDB := s.PurchaseRepo.DB()
+	if tx != nil {
+		targetDB = tx
+	}
+
+	var farmIDs []uint
+	if len(projectFlockKandangIDs) > 0 {
+		resolvedFarmIDs, err := commonSvc.ResolveProjectFlockIDsByProjectFlockKandangIDs(ctx, targetDB, projectFlockKandangIDs)
+		if err != nil {
+			s.Log.Warnf(
+				"Failed to resolve farm ids for purchase depreciation invalidation (pfk_ids=%v): %+v",
+				projectFlockKandangIDs,
+				err,
+			)
+		} else {
+			farmIDs = resolvedFarmIDs
+		}
+	}
+
+	if len(farmIDs) == 0 {
+		if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, nil, fromDate); err != nil {
+			s.Log.Warnf(
+				"Failed to invalidate depreciation snapshots globally (from=%s): %+v",
+				fromDate.Format("2006-01-02"),
+				err,
+			)
+		}
+		return
+	}
+
+	if err := commonSvc.InvalidateFarmDepreciationSnapshotsFromDate(ctx, targetDB, farmIDs, fromDate); err != nil {
+		s.Log.Warnf(
+			"Failed to invalidate depreciation snapshots (farm_ids=%v, from=%s): %+v",
+			farmIDs,
+			fromDate.Format("2006-01-02"),
+			err,
+		)
+	}
+}
+
 func (s *purchaseService) ensureProjectFlockNotClosedForPurchase(
 	ctx context.Context,
 	purchase *entity.Purchase,

internal/modules/purchases/validations/purchase.validation.go

@@ -67,11 +67,11 @@ type Query struct {
 	AreaID            uint   `query:"area_id" validate:"omitempty,gt=0"`
 	LocationID        uint   `query:"location_id" validate:"omitempty,gt=0"`
 	ProductCategoryID string `query:"product_category_id" validate:"omitempty,max=500"`
-	Search            string `query:"search" validate:"omitempty,max=100"`
 	ApprovalStatus    string `query:"approval_status" validate:"omitempty,max=500"`
 	PoDate            string `query:"po_date" validate:"omitempty,datetime=2006-01-02"`
 	PoDateFrom        string `query:"po_date_from" validate:"omitempty,datetime=2006-01-02"`
 	PoDateTo          string `query:"po_date_to" validate:"omitempty,datetime=2006-01-02"`
+	Search            string `query:"search" validate:"omitempty,max=100"`
 	CreatedFrom       string `query:"created_from" validate:"omitempty,datetime=2006-01-02"`
 	CreatedTo         string `query:"created_to" validate:"omitempty,datetime=2006-01-02"`
 }

internal/modules/repports/controllers/repport.controller.go

@@ -90,6 +90,75 @@ func (c *RepportController) GetExpense(ctx *fiber.Ctx) error {
 		})
 }
 
+func (c *RepportController) GetExpenseDepreciation(ctx *fiber.Ctx) error {
+	rows, meta, err := c.RepportService.GetExpenseDepreciation(ctx)
+	if err != nil {
+		return err
+	}
+
+	resp := struct {
+		Code    int                             `json:"code"`
+		Status  string                          `json:"status"`
+		Message string                          `json:"message"`
+		Meta    dto.ExpenseDepreciationMetaDTO  `json:"meta"`
+		Data    []dto.ExpenseDepreciationRowDTO `json:"data"`
+	}{
+		Code:    fiber.StatusOK,
+		Status:  "success",
+		Message: "Get expense depreciation report successfully",
+		Meta:    *meta,
+		Data:    rows,
+	}
+
+	return ctx.Status(fiber.StatusOK).JSON(resp)
+}
+
+func (c *RepportController) GetExpenseDepreciationManualInputs(ctx *fiber.Ctx) error {
+	rows, meta, err := c.RepportService.GetExpenseDepreciationManualInputs(ctx)
+	if err != nil {
+		return err
+	}
+
+	resp := struct {
+		Code    int                                        `json:"code"`
+		Status  string                                     `json:"status"`
+		Message string                                     `json:"message"`
+		Meta    dto.ExpenseDepreciationMetaDTO             `json:"meta"`
+		Data    []dto.ExpenseDepreciationManualInputRowDTO `json:"data"`
+	}{
+		Code:    fiber.StatusOK,
+		Status:  "success",
+		Message: "Get expense depreciation manual inputs successfully",
+		Meta:    *meta,
+		Data:    rows,
+	}
+
+	return ctx.Status(fiber.StatusOK).JSON(resp)
+}
+
+func (c *RepportController) UpsertExpenseDepreciationManualInput(ctx *fiber.Ctx) error {
+	req := new(validation.ExpenseDepreciationManualInputUpsert)
+	if err := ctx.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	if err := m.EnsureProjectFlockAccess(ctx, c.RepportService.DB(), req.ProjectFlockID); err != nil {
+		return err
+	}
+
+	result, err := c.RepportService.UpsertExpenseDepreciationManualInput(ctx, req)
+	if err != nil {
+		return err
+	}
+
+	return ctx.Status(fiber.StatusOK).JSON(response.Success{
+		Code:    fiber.StatusOK,
+		Status:  "success",
+		Message: "Upsert expense depreciation manual input successfully",
+		Data:    result,
+	})
+}
+
 func (c *RepportController) GetMarketing(ctx *fiber.Ctx) error {
 	query := &validation.MarketingQuery{
 		Page:          ctx.QueryInt("page", 1),
@@ -429,9 +498,33 @@ func (c *RepportController) GetProductionResult(ctx *fiber.Ctx) error {
 		})
 }
 
+func (c *RepportController) GetHppV2Breakdown(ctx *fiber.Ctx) error {
+	query := &validation.HppV2BreakdownQuery{
+		ProjectFlockKandangID: uint(ctx.QueryInt("project_flock_kandang_id", 0)),
+		Period:                ctx.Query("period", ""),
+	}
+
+	if err := m.EnsureProjectFlockKandangAccess(ctx, c.RepportService.DB(), 0, query.ProjectFlockKandangID); err != nil {
+		return err
+	}
+
+	data, err := c.RepportService.GetHppV2Breakdown(ctx, query)
+	if err != nil {
+		return err
+	}
+
+	return ctx.Status(fiber.StatusOK).JSON(response.Success{
+		Code:    fiber.StatusOK,
+		Status:  "success",
+		Message: "Get HPP v2 breakdown successfully",
+		Data:    data,
+	})
+}
+
 func parseCommaSeparatedInt64s(raw string) ([]int64, error) {
 	return parseCommaSeparatedInt64sWithField(raw, "supplier_ids")
 }
+
 func parseCommaSeparatedInt64sWithField(raw, field string) ([]int64, error) {
 	raw = strings.TrimSpace(raw)
 	if raw == "" {

internal/modules/repports/dto/repportExpenseDepreciation.dto.go

@@ -0,0 +1,44 @@
+package dto
+
+type ExpenseDepreciationFiltersDTO struct {
+	AreaID         string `json:"area_id"`
+	LocationID     string `json:"location_id"`
+	ProjectFlockID string `json:"project_flock_id"`
+	Period         string `json:"period"`
+}
+
+type ExpenseDepreciationMetaDTO struct {
+	Page         int                           `json:"page"`
+	Limit        int                           `json:"limit"`
+	TotalPages   int64                         `json:"total_pages"`
+	TotalResults int64                         `json:"total_results"`
+	Filters      ExpenseDepreciationFiltersDTO `json:"filters"`
+}
+
+type ExpenseDepreciationRowDTO struct {
+	ProjectFlockID               int64   `json:"project_flock_id"`
+	FarmName                     string  `json:"farm_name"`
+	Period                       string  `json:"period"`
+	DepreciationPercentEffective float64 `json:"depreciation_percent_effective"`
+	DepreciationValue            float64 `json:"depreciation_value"`
+	PulletCostDayNTotal          float64 `json:"pullet_cost_day_n_total"`
+	Components                   any     `json:"components"`
+}
+
+type ExpenseDepreciationManualInputRowDTO struct {
+	ID             int64   `json:"id"`
+	ProjectFlockID int64   `json:"project_flock_id"`
+	FarmName       string  `json:"farm_name"`
+	TotalCost      float64 `json:"total_cost"`
+	CutoverDate    string  `json:"cutover_date"`
+	Note           *string `json:"note"`
+}
+
+func NewExpenseDepreciationFiltersDTO(area, location, projectFlockID, period string) ExpenseDepreciationFiltersDTO {
+	return ExpenseDepreciationFiltersDTO{
+		AreaID:         area,
+		LocationID:     location,
+		ProjectFlockID: projectFlockID,
+		Period:         period,
+	}
+}

internal/modules/repports/module.go

@@ -33,9 +33,11 @@ func (RepportModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	recordingRepository := recordingRepo.NewRecordingRepository(db)
 	approvalRepository := commonRepo.NewApprovalRepository(db)
 	hppCostRepository := commonRepo.NewHppCostRepository(db)
+	hppV2CostRepository := commonRepo.NewHppV2CostRepository(db)
 	purchaseSupplierRepository := repportRepo.NewPurchaseSupplierRepository(db)
 	debtSupplierRepository := repportRepo.NewDebtSupplierRepository(db)
 	hppPerKandangRepository := repportRepo.NewHppPerKandangRepository(db)
+	expenseDepreciationRepository := repportRepo.NewExpenseDepreciationRepository(db)
 	productionResultRepository := repportRepo.NewProductionResultRepository(db)
 	customerPaymentRepository := repportRepo.NewCustomerPaymentRepository(db)
 	customerRepository := customerRepo.NewCustomerRepository(db)
@@ -45,7 +47,29 @@ func (RepportModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 
 	approvalSvc := approvalService.NewApprovalService(approvalRepository)
 	hppSvc := approvalService.NewHppService(hppCostRepository)
-	repportService := sRepport.NewRepportService(db, validate, expenseRealizationRepository, marketingDeliveryProductRepository, purchaseRepository, chickinRepository, recordingRepository, approvalSvc, hppSvc, purchaseSupplierRepository, debtSupplierRepository, hppPerKandangRepository, productionResultRepository, customerPaymentRepository, customerRepository, standardGrowthDetailRepository, productionStandardDetailRepository)
+	hppV2Svc := approvalService.NewHppV2Service(hppV2CostRepository)
+	repportService := sRepport.NewRepportService(
+		db,
+		validate,
+		expenseRealizationRepository,
+		expenseDepreciationRepository,
+		marketingDeliveryProductRepository,
+		purchaseRepository,
+		chickinRepository,
+		recordingRepository,
+		approvalSvc,
+		hppSvc,
+		hppV2Svc,
+		hppCostRepository,
+		purchaseSupplierRepository,
+		debtSupplierRepository,
+		hppPerKandangRepository,
+		productionResultRepository,
+		customerPaymentRepository,
+		customerRepository,
+		standardGrowthDetailRepository,
+		productionStandardDetailRepository,
+	)
 	userService := sUser.NewUserService(userRepository, validate)
 
 	RepportRoutes(router, userService, repportService)

internal/modules/repports/repositories/expense_depreciation.repository.go

@@ -0,0 +1,329 @@
+package repositories
+
+import (
+	"context"
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+type FarmDepreciationCandidateRow struct {
+	ProjectFlockID uint
+	FarmName       string
+}
+
+type FarmDepreciationLatestTransferRow struct {
+	ProjectFlockID        uint
+	FarmName              string
+	ProjectFlockKandangID uint
+	KandangID             uint
+	KandangName           string
+	HouseType             *string
+	SourceProjectFlockID  uint
+	TransferDate          time.Time
+	TransferQty           float64
+	TransferID            uint
+}
+
+type FarmDepreciationManualInputRow struct {
+	Id             uint
+	ProjectFlockID uint
+	FarmName       string
+	TotalCost      float64
+	CutoverDate    time.Time
+	Note           *string
+}
+
+type houseDepreciationPercentRow struct {
+	HouseType           string
+	Day                 int
+	DepreciationPercent float64
+}
+
+type ExpenseDepreciationRepository interface {
+	GetCandidateFarms(ctx context.Context, period time.Time, areaIDs, locationIDs, projectFlockIDs []int64) ([]FarmDepreciationCandidateRow, error)
+	GetSnapshotsByPeriodAndFarmIDs(ctx context.Context, period time.Time, farmIDs []uint) ([]entity.FarmDepreciationSnapshot, error)
+	UpsertSnapshots(ctx context.Context, rows []entity.FarmDepreciationSnapshot) error
+	DeleteSnapshotsFromDate(ctx context.Context, fromDate time.Time, farmIDs []uint) error
+	GetLatestTransferInputsByFarms(ctx context.Context, period time.Time, farmIDs []uint) ([]FarmDepreciationLatestTransferRow, error)
+	GetDepreciationPercents(ctx context.Context, houseTypes []string, maxDay int) (map[string]map[int]float64, error)
+	GetLatestManualInputsByFarms(ctx context.Context, areaIDs, locationIDs, projectFlockIDs []int64) ([]FarmDepreciationManualInputRow, error)
+	UpsertManualInput(ctx context.Context, row *entity.FarmDepreciationManualInput) error
+	DB() *gorm.DB
+}
+
+type expenseDepreciationRepository struct {
+	db *gorm.DB
+}
+
+func NewExpenseDepreciationRepository(db *gorm.DB) ExpenseDepreciationRepository {
+	return &expenseDepreciationRepository{db: db}
+}
+
+func (r *expenseDepreciationRepository) DB() *gorm.DB {
+	return r.db
+}
+
+func (r *expenseDepreciationRepository) GetCandidateFarms(
+	ctx context.Context,
+	period time.Time,
+	areaIDs, locationIDs, projectFlockIDs []int64,
+) ([]FarmDepreciationCandidateRow, error) {
+	rows := make([]FarmDepreciationCandidateRow, 0)
+
+	query := r.db.WithContext(ctx).
+		Table("project_flocks AS pf").
+		Select("DISTINCT pf.id AS project_flock_id, pf.flock_name AS farm_name").
+		Joins("JOIN project_flock_kandangs AS pfk ON pfk.project_flock_id = pf.id").
+		Where("pf.deleted_at IS NULL").
+		Where("pf.category = ?", utils.ProjectFlockCategoryLaying).
+		Where("(pfk.closed_at IS NULL OR DATE(pfk.closed_at) >= DATE(?))", period)
+
+	if len(areaIDs) > 0 {
+		query = query.Where("pf.area_id IN ?", areaIDs)
+	}
+	if len(locationIDs) > 0 {
+		query = query.Where("pf.location_id IN ?", locationIDs)
+	}
+	if len(projectFlockIDs) > 0 {
+		query = query.Where("pf.id IN ?", projectFlockIDs)
+	}
+
+	if err := query.Order("pf.id ASC").Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	return rows, nil
+}
+
+func (r *expenseDepreciationRepository) GetSnapshotsByPeriodAndFarmIDs(
+	ctx context.Context,
+	period time.Time,
+	farmIDs []uint,
+) ([]entity.FarmDepreciationSnapshot, error) {
+	if len(farmIDs) == 0 {
+		return []entity.FarmDepreciationSnapshot{}, nil
+	}
+
+	rows := make([]entity.FarmDepreciationSnapshot, 0)
+	if err := r.db.WithContext(ctx).
+		Where("project_flock_id IN ?", farmIDs).
+		Where("period_date = DATE(?)", period).
+		Find(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	return rows, nil
+}
+
+func (r *expenseDepreciationRepository) UpsertSnapshots(ctx context.Context, rows []entity.FarmDepreciationSnapshot) error {
+	if len(rows) == 0 {
+		return nil
+	}
+
+	return r.db.WithContext(ctx).
+		Clauses(clause.OnConflict{
+			Columns: []clause.Column{
+				{Name: "project_flock_id"},
+				{Name: "period_date"},
+			},
+			DoUpdates: clause.AssignmentColumns([]string{
+				"depreciation_percent_effective",
+				"depreciation_value",
+				"pullet_cost_day_n_total",
+				"components",
+				"updated_at",
+			}),
+		}).
+		Create(&rows).Error
+}
+
+func (r *expenseDepreciationRepository) DeleteSnapshotsFromDate(
+	ctx context.Context,
+	fromDate time.Time,
+	farmIDs []uint,
+) error {
+	if fromDate.IsZero() {
+		return nil
+	}
+
+	query := r.db.WithContext(ctx).
+		Table("farm_depreciation_snapshots").
+		Where("period_date >= DATE(?)", fromDate)
+	if len(farmIDs) > 0 {
+		query = query.Where("project_flock_id IN ?", farmIDs)
+	}
+	return query.Delete(nil).Error
+}
+
+func (r *expenseDepreciationRepository) GetLatestTransferInputsByFarms(
+	ctx context.Context,
+	period time.Time,
+	farmIDs []uint,
+) ([]FarmDepreciationLatestTransferRow, error) {
+	if len(farmIDs) == 0 {
+		return []FarmDepreciationLatestTransferRow{}, nil
+	}
+
+	rows := make([]FarmDepreciationLatestTransferRow, 0)
+	query := `
+WITH latest_transfer_approval AS (
+	SELECT a.approvable_id, a.action
+	FROM approvals a
+	JOIN (
+		SELECT approvable_id, MAX(action_at) AS latest_action_at
+		FROM approvals
+		WHERE approvable_type = @approval_type
+		GROUP BY approvable_id
+	) la
+		ON la.approvable_id = a.approvable_id
+		AND la.latest_action_at = a.action_at
+	WHERE a.approvable_type = @approval_type
+),
+approved_transfers AS (
+	SELECT
+		lt.id,
+		lt.from_project_flock_id,
+		lt.to_project_flock_id,
+		COALESCE(DATE(lt.effective_move_date), DATE(lt.economic_cutoff_date), DATE(lt.transfer_date)) AS effective_date
+	FROM laying_transfers lt
+	JOIN latest_transfer_approval lta ON lta.approvable_id = lt.id
+	WHERE lt.deleted_at IS NULL
+	  AND lt.executed_at IS NOT NULL
+	  AND lta.action = 'APPROVED'
+)
+SELECT DISTINCT ON (ltt.target_project_flock_kandang_id)
+	pf.id AS project_flock_id,
+	pf.flock_name AS farm_name,
+	pfk.id AS project_flock_kandang_id,
+	k.id AS kandang_id,
+	k.name AS kandang_name,
+	k.house_type::text AS house_type,
+	at.from_project_flock_id AS source_project_flock_id,
+	at.effective_date AS transfer_date,
+	ltt.total_qty AS transfer_qty,
+	at.id AS transfer_id
+FROM laying_transfer_targets ltt
+JOIN approved_transfers at ON at.id = ltt.laying_transfer_id
+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
+JOIN kandangs k ON k.id = pfk.kandang_id
+WHERE ltt.deleted_at IS NULL
+  AND pf.id IN @farm_ids
+  AND at.effective_date <= DATE(@period_date)
+ORDER BY ltt.target_project_flock_kandang_id, at.effective_date DESC, at.id DESC
+`
+
+	if err := r.db.WithContext(ctx).Raw(query, map[string]any{
+		"approval_type": utils.ApprovalWorkflowTransferToLaying.String(),
+		"farm_ids":      farmIDs,
+		"period_date":   period,
+	}).Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	return rows, nil
+}
+
+func (r *expenseDepreciationRepository) GetDepreciationPercents(
+	ctx context.Context,
+	houseTypes []string,
+	maxDay int,
+) (map[string]map[int]float64, error) {
+	result := make(map[string]map[int]float64)
+	if len(houseTypes) == 0 || maxDay <= 0 {
+		return result, nil
+	}
+
+	rows := make([]houseDepreciationPercentRow, 0)
+	if err := r.db.WithContext(ctx).
+		Table("house_depreciation_standards").
+		Select("house_type::text AS house_type, day, depreciation_percent").
+		Where("house_type::text IN ?", houseTypes).
+		Where("day <= ?", maxDay).
+		Order("house_type ASC, day ASC").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	for _, row := range rows {
+		if _, exists := result[row.HouseType]; !exists {
+			result[row.HouseType] = make(map[int]float64)
+		}
+		result[row.HouseType][row.Day] = row.DepreciationPercent
+	}
+
+	return result, nil
+}
+
+func (r *expenseDepreciationRepository) GetLatestManualInputsByFarms(
+	ctx context.Context,
+	areaIDs, locationIDs, projectFlockIDs []int64,
+) ([]FarmDepreciationManualInputRow, error) {
+	rows := make([]FarmDepreciationManualInputRow, 0)
+
+	query := r.db.WithContext(ctx).
+		Table("farm_depreciation_manual_inputs AS fdmi").
+		Select(`
+			fdmi.id AS id,
+			fdmi.project_flock_id AS project_flock_id,
+			pf.flock_name AS farm_name,
+			fdmi.total_cost AS total_cost,
+			fdmi.cutover_date AS cutover_date,
+			fdmi.note AS note
+		`).
+		Joins("JOIN project_flocks AS pf ON pf.id = fdmi.project_flock_id").
+		Where("pf.deleted_at IS NULL").
+		Where("pf.category = ?", utils.ProjectFlockCategoryLaying)
+
+	if len(areaIDs) > 0 {
+		query = query.Where("pf.area_id IN ?", areaIDs)
+	}
+	if len(locationIDs) > 0 {
+		query = query.Where("pf.location_id IN ?", locationIDs)
+	}
+	if len(projectFlockIDs) > 0 {
+		query = query.Where("pf.id IN ?", projectFlockIDs)
+	}
+
+	if err := query.
+		Order("pf.id ASC").
+		Scan(&rows).Error; err != nil {
+		return nil, err
+	}
+
+	return rows, nil
+}
+
+func (r *expenseDepreciationRepository) UpsertManualInput(ctx context.Context, row *entity.FarmDepreciationManualInput) error {
+	if row == nil {
+		return nil
+	}
+
+	now := time.Now().UTC()
+	err := r.db.WithContext(ctx).
+		Clauses(clause.OnConflict{
+			Columns: []clause.Column{
+				{Name: "project_flock_id"},
+			},
+			DoUpdates: clause.Assignments(map[string]any{
+				"total_cost":   row.TotalCost,
+				"cutover_date": row.CutoverDate,
+				"note":         row.Note,
+				"updated_at":   now,
+			}),
+		}).
+		Create(row).Error
+	if err != nil {
+		return err
+	}
+
+	return r.db.WithContext(ctx).
+		Table("farm_depreciation_manual_inputs").
+		Select("id, project_flock_id, total_cost, cutover_date, note").
+		Where("project_flock_id = ?", row.ProjectFlockId).
+		Take(row).Error
+}

internal/modules/repports/repositories/purchase_supplier.repository.go

@@ -196,7 +196,6 @@ func (r *purchaseSupplierRepositoryImpl) GetItemsBySuppliers(ctx context.Context
 			Joins("JOIN products ON products.id = purchase_items.product_id").
 			Where("products.product_category_id IN ?", filters.ProductCategoryIDs)
 	}
-
 	if len(filters.AreaIDs) > 0 || filters.AllowedAreaIDs != nil {
 		db = db.Joins("JOIN warehouses ON warehouses.id = purchase_items.warehouse_id")
 		if len(filters.AreaIDs) > 0 {

internal/modules/repports/route.go

@@ -16,10 +16,14 @@ func RepportRoutes(v1 fiber.Router, u user.UserService, s repport.RepportService
 	route.Use(m.Auth(u))
 
 	route.Get("/expense", m.RequirePermissions(m.P_ReportExpenseGetAll), ctrl.GetExpense)
+	route.Get("/expense/depreciation", ctrl.GetExpenseDepreciation)
+	route.Get("/expense/depreciation/manual-inputs", ctrl.GetExpenseDepreciationManualInputs)
+	route.Put("/expense/depreciation/manual-inputs", ctrl.UpsertExpenseDepreciationManualInput)
 	route.Get("/marketing", m.RequirePermissions(m.P_ReportDeliveryGetAll), ctrl.GetMarketing)
 	route.Get("/purchase-supplier", m.RequirePermissions(m.P_ReportPurchaseSupplierGetAll), ctrl.GetPurchaseSupplier)
 	route.Get("/debt-supplier", m.RequirePermissions(m.P_ReportDebtSupplierGetAll), ctrl.GetDebtSupplier)
 	route.Get("/hpp-per-kandang", m.RequirePermissions(m.P_ReportHppPerKandangGetAll), ctrl.GetHppPerKandang)
+	route.Get("/hpp-v2-breakdown", m.RequirePermissions(m.P_ReportHppPerKandangGetAll), ctrl.GetHppV2Breakdown)
 	route.Get("/production-result/:idProjectFlockKandang", m.RequirePermissions(m.P_ReportProductionResultGetAll), ctrl.GetProductionResult)
 	route.Get("/customer-payment", m.RequirePermissions(m.P_ReportCustomerPaymentGetAll), ctrl.GetCustomerPayment)
 }

internal/modules/repports/services/repport.expense_depreciation_test.go

@@ -0,0 +1,445 @@
+package service
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/gofiber/fiber/v2"
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	approvalService "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	dto "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/dto"
+	repportRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/repositories"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/validations"
+	"gorm.io/gorm"
+)
+
+type expenseDepreciationRepoMock struct {
+	repportRepo.ExpenseDepreciationRepository
+	manualInputs []repportRepo.FarmDepreciationManualInputRow
+
+	upsertedRow   *entity.FarmDepreciationManualInput
+	deleteCalled  bool
+	deleteDate    time.Time
+	deleteFarmIDs []uint
+}
+
+func (m *expenseDepreciationRepoMock) DB() *gorm.DB {
+	return nil
+}
+
+func (m *expenseDepreciationRepoMock) UpsertManualInput(_ context.Context, row *entity.FarmDepreciationManualInput) error {
+	if row == nil {
+		return nil
+	}
+	cloned := *row
+	if cloned.Id == 0 {
+		cloned.Id = 123
+	}
+	m.upsertedRow = &cloned
+	row.Id = cloned.Id
+	return nil
+}
+
+func (m *expenseDepreciationRepoMock) DeleteSnapshotsFromDate(_ context.Context, fromDate time.Time, farmIDs []uint) error {
+	m.deleteCalled = true
+	m.deleteDate = fromDate
+	m.deleteFarmIDs = append([]uint{}, farmIDs...)
+	return nil
+}
+
+func (m *expenseDepreciationRepoMock) GetLatestManualInputsByFarms(_ context.Context, _ []int64, _ []int64, _ []int64) ([]repportRepo.FarmDepreciationManualInputRow, error) {
+	return append([]repportRepo.FarmDepreciationManualInputRow{}, m.manualInputs...), nil
+}
+
+type hppCostRepoMock struct {
+	commonRepo.HppCostRepository
+	kandangIDsByFarm map[uint][]uint
+}
+
+func (m *hppCostRepoMock) GetProjectFlockKandangIDs(_ context.Context, projectFlockID uint) ([]uint, error) {
+	return append([]uint{}, m.kandangIDsByFarm[projectFlockID]...), nil
+}
+
+type hppV2ServiceMock struct {
+	approvalService.HppV2Service
+	breakdownByPFK map[uint]*approvalService.HppV2Breakdown
+}
+
+func (m *hppV2ServiceMock) CalculateHppBreakdown(projectFlockKandangId uint, _ *time.Time) (*approvalService.HppV2Breakdown, error) {
+	return m.breakdownByPFK[projectFlockKandangId], nil
+}
+
+func TestComputeExpenseDepreciationSnapshots_FromHppV2NormalTransfer(t *testing.T) {
+	periodDate := mustJakartaDate(t, "2026-06-05")
+	svc := &repportService{
+		HppCostRepo: &hppCostRepoMock{
+			kandangIDsByFarm: map[uint][]uint{
+				1: {10},
+			},
+		},
+		HppV2Svc: &hppV2ServiceMock{
+			breakdownByPFK: map[uint]*approvalService.HppV2Breakdown{
+				10: {
+					ProjectFlockKandangID: 10,
+					KandangID:             100,
+					KandangName:           "Kandang A",
+					HouseType:             "close_house",
+					Components: []approvalService.HppV2Component{
+						{
+							Code:  "DEPRECIATION",
+							Title: "Depreciation",
+							Total: 100,
+							Parts: []approvalService.HppV2ComponentPart{
+								{
+									Code:  "normal_transfer",
+									Total: 100,
+									Details: map[string]any{
+										"schedule_day":            2,
+										"depreciation_percent":    10.0,
+										"pullet_cost_day_n":       1000.0,
+										"source_project_flock_id": 77,
+										"origin_date":             "2026-01-01",
+									},
+									References: []approvalService.HppV2Reference{
+										{
+											Type: "laying_transfer",
+											ID:   701,
+											Date: "2026-05-20",
+											Qty:  150,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	rows, err := svc.computeExpenseDepreciationSnapshots(context.Background(), periodDate, []uint{1}, map[uint]string{1: "Farm A"})
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	if rows[0].DepreciationValue != 100 {
+		t.Fatalf("expected depreciation value 100, got %v", rows[0].DepreciationValue)
+	}
+	if rows[0].PulletCostDayNTotal != 1000 {
+		t.Fatalf("expected pullet cost day n 1000, got %v", rows[0].PulletCostDayNTotal)
+	}
+	assertFloatEqual(t, rows[0].DepreciationPercentEffective, 10)
+
+	components := decodeDepreciationComponents(t, rows[0].Components)
+	if components.KandangCount != 1 {
+		t.Fatalf("expected kandang_count 1, got %d", components.KandangCount)
+	}
+	entry := components.Kandang[0]
+	if entry.ProjectFlockKandangID != 10 || entry.KandangID != 100 || entry.KandangName != "Kandang A" {
+		t.Fatalf("unexpected kandang identity: %+v", entry)
+	}
+	if entry.TransferID != 701 || entry.TransferDate != "2026-05-20" || entry.TransferQty != 150 {
+		t.Fatalf("unexpected transfer metadata: %+v", entry)
+	}
+	if entry.DepreciationSource != "normal_transfer" {
+		t.Fatalf("expected depreciation_source normal_transfer, got %q", entry.DepreciationSource)
+	}
+	if entry.ManualInputID != nil || entry.CutoverDate != "" || entry.StartScheduleDay != nil {
+		t.Fatalf("expected manual fields empty for normal transfer, got %+v", entry)
+	}
+}
+
+func TestComputeExpenseDepreciationSnapshots_FromHppV2ManualCutover(t *testing.T) {
+	periodDate := mustJakartaDate(t, "2026-06-05")
+	svc := &repportService{
+		HppCostRepo: &hppCostRepoMock{
+			kandangIDsByFarm: map[uint][]uint{
+				2: {20},
+			},
+		},
+		HppV2Svc: &hppV2ServiceMock{
+			breakdownByPFK: map[uint]*approvalService.HppV2Breakdown{
+				20: {
+					ProjectFlockKandangID: 20,
+					KandangID:             200,
+					KandangName:           "Kandang B",
+					HouseType:             "open_house",
+					Components: []approvalService.HppV2Component{
+						{
+							Code:  "DEPRECIATION",
+							Title: "Depreciation",
+							Total: 200,
+							Parts: []approvalService.HppV2ComponentPart{
+								{
+									Code:  "manual_cutover",
+									Total: 200,
+									Details: map[string]any{
+										"schedule_day":         2,
+										"start_schedule_day":   2,
+										"depreciation_percent": 25.0,
+										"pullet_cost_day_n":    800.0,
+										"manual_input_id":      901,
+										"cutover_date":         "2026-06-01",
+										"origin_date":          "2026-01-01",
+									},
+									References: []approvalService.HppV2Reference{
+										{
+											Type: "farm_depreciation_manual_input",
+											ID:   901,
+											Date: "2026-06-01",
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	rows, err := svc.computeExpenseDepreciationSnapshots(context.Background(), periodDate, []uint{2}, map[uint]string{2: "Farm B"})
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	assertFloatEqual(t, rows[0].DepreciationPercentEffective, 25)
+
+	components := decodeDepreciationComponents(t, rows[0].Components)
+	if components.KandangCount != 1 {
+		t.Fatalf("expected kandang_count 1, got %d", components.KandangCount)
+	}
+	entry := components.Kandang[0]
+	if entry.DepreciationSource != "manual_cutover" {
+		t.Fatalf("expected depreciation_source manual_cutover, got %q", entry.DepreciationSource)
+	}
+	if entry.TransferID != 0 || entry.TransferDate != "" || entry.TransferQty != 0 {
+		t.Fatalf("expected transfer fields empty for manual path, got %+v", entry)
+	}
+	if entry.ManualInputID == nil || *entry.ManualInputID != 901 {
+		t.Fatalf("expected manual_input_id 901, got %+v", entry.ManualInputID)
+	}
+	if entry.CutoverDate != "2026-06-01" || entry.OriginDate != "2026-01-01" {
+		t.Fatalf("unexpected manual date fields: %+v", entry)
+	}
+	if entry.StartScheduleDay == nil || *entry.StartScheduleDay != 2 {
+		t.Fatalf("expected start_schedule_day 2, got %+v", entry.StartScheduleDay)
+	}
+}
+
+func TestComputeExpenseDepreciationSnapshots_AggregatesMultipleKandang(t *testing.T) {
+	periodDate := mustJakartaDate(t, "2026-06-05")
+	svc := &repportService{
+		HppCostRepo: &hppCostRepoMock{
+			kandangIDsByFarm: map[uint][]uint{
+				3: {30, 31},
+			},
+		},
+		HppV2Svc: &hppV2ServiceMock{
+			breakdownByPFK: map[uint]*approvalService.HppV2Breakdown{
+				30: {
+					ProjectFlockKandangID: 30,
+					KandangID:             300,
+					KandangName:           "Kandang C1",
+					Components: []approvalService.HppV2Component{
+						{
+							Code: "DEPRECIATION",
+							Parts: []approvalService.HppV2ComponentPart{
+								{
+									Code:  "normal_transfer",
+									Total: 50,
+									Details: map[string]any{
+										"schedule_day":         1,
+										"depreciation_percent": 10.0,
+										"pullet_cost_day_n":    500.0,
+									},
+								},
+							},
+						},
+					},
+				},
+				31: {
+					ProjectFlockKandangID: 31,
+					KandangID:             301,
+					KandangName:           "Kandang C2",
+					Components: []approvalService.HppV2Component{
+						{
+							Code: "DEPRECIATION",
+							Parts: []approvalService.HppV2ComponentPart{
+								{
+									Code:  "normal_transfer",
+									Total: 100,
+									Details: map[string]any{
+										"schedule_day":         2,
+										"depreciation_percent": 10.0,
+										"pullet_cost_day_n":    1000.0,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	rows, err := svc.computeExpenseDepreciationSnapshots(context.Background(), periodDate, []uint{3}, map[uint]string{3: "Farm C"})
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	if rows[0].DepreciationValue != 150 {
+		t.Fatalf("expected depreciation value 150, got %v", rows[0].DepreciationValue)
+	}
+	if rows[0].PulletCostDayNTotal != 1500 {
+		t.Fatalf("expected pullet cost day n 1500, got %v", rows[0].PulletCostDayNTotal)
+	}
+	assertFloatEqual(t, rows[0].DepreciationPercentEffective, 10)
+
+	components := decodeDepreciationComponents(t, rows[0].Components)
+	if components.KandangCount != 2 {
+		t.Fatalf("expected kandang_count 2, got %d", components.KandangCount)
+	}
+}
+
+func TestComputeExpenseDepreciationSnapshots_ZeroWhenDepreciationMissing(t *testing.T) {
+	periodDate := mustJakartaDate(t, "2026-06-05")
+	svc := &repportService{
+		HppCostRepo: &hppCostRepoMock{
+			kandangIDsByFarm: map[uint][]uint{
+				4: {40},
+			},
+		},
+		HppV2Svc: &hppV2ServiceMock{
+			breakdownByPFK: map[uint]*approvalService.HppV2Breakdown{
+				40: {
+					ProjectFlockKandangID: 40,
+					KandangID:             400,
+					KandangName:           "Kandang D",
+					Components: []approvalService.HppV2Component{
+						{Code: "PAKAN", Total: 123},
+					},
+				},
+			},
+		},
+	}
+
+	rows, err := svc.computeExpenseDepreciationSnapshots(context.Background(), periodDate, []uint{4}, map[uint]string{4: "Farm D"})
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+	if len(rows) != 1 {
+		t.Fatalf("expected 1 row, got %d", len(rows))
+	}
+	if rows[0].DepreciationValue != 0 || rows[0].PulletCostDayNTotal != 0 || rows[0].DepreciationPercentEffective != 0 {
+		t.Fatalf("expected zero snapshot values, got %+v", rows[0])
+	}
+	components := decodeDepreciationComponents(t, rows[0].Components)
+	if components.KandangCount != 0 || len(components.Kandang) != 0 {
+		t.Fatalf("expected empty components, got %+v", components)
+	}
+}
+
+func TestUpsertExpenseDepreciationManualInput_InvalidatesSnapshotsFromCutoverDate(t *testing.T) {
+	repo := &expenseDepreciationRepoMock{
+		manualInputs: []repportRepo.FarmDepreciationManualInputRow{
+			{
+				Id:             123,
+				ProjectFlockID: 99,
+				FarmName:       "Farm Z",
+				TotalCost:      1000,
+				CutoverDate:    mustJakartaDate(t, "2026-06-01"),
+			},
+		},
+	}
+
+	svc := &repportService{
+		Validate:                validator.New(),
+		ExpenseDepreciationRepo: repo,
+	}
+
+	reqPayload := &validation.ExpenseDepreciationManualInputUpsert{
+		ProjectFlockID: 99,
+		TotalCost:      1000,
+		CutoverDate:    "2026-06-01",
+	}
+
+	app := fiber.New()
+	var response *dto.ExpenseDepreciationManualInputRowDTO
+	app.Put("/", func(c *fiber.Ctx) error {
+		result, err := svc.UpsertExpenseDepreciationManualInput(c, reqPayload)
+		if err != nil {
+			return err
+		}
+		response = result
+		return c.SendStatus(fiber.StatusOK)
+	})
+
+	httpResp, err := app.Test(httptest.NewRequest(http.MethodPut, "/", nil))
+	if err != nil {
+		t.Fatalf("expected no app error, got %v", err)
+	}
+	if httpResp.StatusCode != fiber.StatusOK {
+		t.Fatalf("expected status %d, got %d", fiber.StatusOK, httpResp.StatusCode)
+	}
+	if !repo.deleteCalled {
+		t.Fatal("expected DeleteSnapshotsFromDate to be called")
+	}
+	if len(repo.deleteFarmIDs) != 1 || repo.deleteFarmIDs[0] != 99 {
+		t.Fatalf("expected delete farm ids [99], got %v", repo.deleteFarmIDs)
+	}
+	if repo.deleteDate.Format("2006-01-02") != "2026-06-01" {
+		t.Fatalf("expected delete date 2026-06-01, got %s", repo.deleteDate.Format("2006-01-02"))
+	}
+	if response == nil {
+		t.Fatal("expected response")
+	}
+	if response.FarmName != "Farm Z" {
+		t.Fatalf("expected farm name Farm Z, got %s", response.FarmName)
+	}
+}
+
+func decodeDepreciationComponents(t *testing.T, raw []byte) depreciationFarmComponents {
+	t.Helper()
+	var out depreciationFarmComponents
+	if len(raw) == 0 {
+		return out
+	}
+	if err := json.Unmarshal(raw, &out); err != nil {
+		t.Fatalf("failed to decode components: %v", err)
+	}
+	return out
+}
+
+func mustJakartaDate(t *testing.T, raw string) time.Time {
+	t.Helper()
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		t.Fatalf("failed loading timezone: %v", err)
+	}
+	value, err := time.ParseInLocation("2006-01-02", raw, location)
+	if err != nil {
+		t.Fatalf("failed parsing date %q: %v", raw, err)
+	}
+	return value
+}
+
+func assertFloatEqual(t *testing.T, got float64, want float64) {
+	t.Helper()
+	const epsilon = 0.000001
+	if got > want+epsilon || got < want-epsilon {
+		t.Fatalf("expected %.6f, got %.6f", want, got)
+	}
+}