feat/BE/US-76/US-78/US-79/TASK-112,120,133,121-Recording growing/TASK-187,189,202,190-Recording Laying/TASK-191,192,194,197,203-Grading Telur

internal/database/migrations/20251028110309_adjustments_flock_project_table.down.sql

@@ -0,0 +1,98 @@
+BEGIN;
+
+DROP INDEX IF EXISTS project_flocks_base_period_unique;
+
+ALTER TABLE project_flocks
+    ADD COLUMN IF NOT EXISTS flock_id BIGINT;
+
+WITH normalized AS (
+    SELECT
+        pf.id,
+        COALESCE(
+            NULLIF(TRIM(regexp_replace(pf.flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g')), ''),
+            CONCAT('Project Flock ', pf.id)
+        ) AS normalized_name,
+        COALESCE(NULLIF(pf.created_by, 0), 1) AS created_by
+    FROM project_flocks pf
+),
+seed_flocks AS (
+    SELECT DISTINCT
+        n.normalized_name,
+        MIN(n.created_by) AS created_by
+    FROM normalized n
+    GROUP BY n.normalized_name
+)
+INSERT INTO flocks (name, created_by, created_at, updated_at)
+SELECT sf.normalized_name, sf.created_by, NOW(), NOW()
+FROM seed_flocks sf
+ON CONFLICT DO NOTHING;
+
+WITH normalized AS (
+    SELECT
+        pf.id,
+        COALESCE(
+            NULLIF(TRIM(regexp_replace(pf.flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g')), ''),
+            CONCAT('Project Flock ', pf.id)
+        ) AS normalized_name
+    FROM project_flocks pf
+),
+resolved AS (
+    SELECT
+        n.id,
+        f.id AS flock_id
+    FROM normalized n
+    JOIN flocks f ON LOWER(f.name) = LOWER(n.normalized_name)
+)
+UPDATE project_flocks pf
+SET flock_id = resolved.flock_id
+FROM resolved
+WHERE pf.id = resolved.id;
+
+WITH missing AS (
+    SELECT
+        pf.id,
+        COALESCE(
+            NULLIF(TRIM(regexp_replace(pf.flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g')), ''),
+            CONCAT('Project Flock ', pf.id)
+        ) AS normalized_name,
+        COALESCE(NULLIF(pf.created_by, 0), 1) AS created_by
+    FROM project_flocks pf
+    WHERE pf.flock_id IS NULL
+),
+seed_missing AS (
+    SELECT DISTINCT normalized_name, created_by FROM missing
+)
+INSERT INTO flocks (name, created_by, created_at, updated_at)
+SELECT sm.normalized_name, sm.created_by, NOW(), NOW()
+FROM seed_missing sm
+ON CONFLICT DO NOTHING;
+
+WITH missing AS (
+    SELECT
+        pf.id,
+        COALESCE(
+            NULLIF(TRIM(regexp_replace(pf.flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g')), ''),
+            CONCAT('Project Flock ', pf.id)
+        ) AS normalized_name
+    FROM project_flocks pf
+    WHERE pf.flock_id IS NULL
+)
+UPDATE project_flocks pf
+SET flock_id = f.id
+FROM missing m
+JOIN flocks f ON LOWER(f.name) = LOWER(m.normalized_name)
+WHERE pf.id = m.id;
+
+ALTER TABLE project_flocks
+    ALTER COLUMN flock_id SET NOT NULL;
+
+DROP INDEX IF EXISTS project_flocks_flock_name_unique;
+
+ALTER TABLE project_flocks
+    DROP COLUMN IF EXISTS flock_name;
+
+CREATE UNIQUE INDEX IF NOT EXISTS project_flocks_flock_period_unique
+    ON project_flocks (flock_id, period)
+    WHERE deleted_at IS NULL;
+
+COMMIT;

internal/database/migrations/20251028110309_adjustments_flock_project_table.up.sql

@@ -0,0 +1,55 @@
+BEGIN;
+
+ALTER TABLE project_flocks
+    ADD COLUMN IF NOT EXISTS flock_name VARCHAR(255);
+
+WITH generated_names AS (
+    SELECT
+        pf.id,
+        COALESCE(f.name, CONCAT('Project Flock ', pf.id)) AS base_name,
+        pf.period,
+        ROW_NUMBER() OVER (PARTITION BY COALESCE(f.name, CONCAT('Project Flock ', pf.id)) ORDER BY pf.id) AS rn
+    FROM project_flocks pf
+    LEFT JOIN flocks f ON f.id = pf.flock_id
+)
+UPDATE project_flocks pf
+SET flock_name = CASE
+        WHEN gn.period IS NOT NULL THEN
+            CASE
+                WHEN gn.rn = 1 THEN CONCAT(gn.base_name, ' ', gn.period)
+                ELSE CONCAT(gn.base_name, ' ', gn.period, ' ', gn.rn)
+            END
+        ELSE
+            CASE
+                WHEN gn.rn = 1 THEN gn.base_name
+                ELSE CONCAT(gn.base_name, ' ', gn.rn)
+            END
+    END
+FROM generated_names gn
+WHERE pf.id = gn.id
+  AND (pf.flock_name IS NULL OR pf.flock_name = '');
+
+UPDATE project_flocks
+SET flock_name = CONCAT('Project Flock ', id)
+WHERE flock_name IS NULL OR flock_name = '';
+
+ALTER TABLE project_flocks
+    ALTER COLUMN flock_name SET NOT NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS project_flocks_flock_name_unique
+    ON project_flocks (flock_name)
+    WHERE deleted_at IS NULL;
+
+DROP INDEX IF EXISTS project_flocks_flock_period_unique;
+
+CREATE UNIQUE INDEX IF NOT EXISTS project_flocks_base_period_unique
+    ON project_flocks (
+        LOWER(TRIM(regexp_replace(flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g'))),
+        period
+    )
+    WHERE deleted_at IS NULL;
+
+ALTER TABLE project_flocks
+    DROP COLUMN IF EXISTS flock_id;
+
+COMMIT;

internal/database/migrations/20251029070455_update_recording_schema.down.sql

@@ -0,0 +1,143 @@
+BEGIN;
+
+-- Drop newly introduced egg tables
+DROP TABLE IF EXISTS grading_eggs;
+DROP TABLE IF EXISTS recording_eggs;
+
+-- Revert recording_stocks structure
+ALTER TABLE recording_stocks
+    DROP CONSTRAINT IF EXISTS chk_recording_stocks_nonneg;
+
+ALTER TABLE recording_stocks
+    DROP COLUMN IF EXISTS usage_qty,
+    DROP COLUMN IF EXISTS pending_qty;
+
+ALTER TABLE recording_stocks
+    ADD COLUMN increase NUMERIC(10,3),
+    ADD COLUMN decrease NUMERIC(10,3),
+    ADD COLUMN usage_amount BIGINT,
+    ADD COLUMN notes VARCHAR;
+
+ALTER TABLE recording_stocks
+    ADD CONSTRAINT chk_recording_stocks_nonneg CHECK (
+        (increase IS NULL OR increase >= 0) AND
+        (decrease IS NULL OR decrease >= 0) AND
+        (usage_amount IS NULL OR usage_amount >= 0)
+    );
+
+-- Revert recording_depletions structure
+ALTER TABLE recording_depletions
+    DROP CONSTRAINT IF EXISTS chk_recording_depl_qty;
+
+ALTER TABLE recording_depletions
+    ALTER COLUMN qty TYPE BIGINT USING COALESCE(qty, 0)::BIGINT;
+
+ALTER TABLE recording_depletions
+    RENAME COLUMN qty TO total;
+
+ALTER TABLE recording_depletions
+    ADD COLUMN notes VARCHAR;
+
+ALTER TABLE recording_depletions
+    ADD CONSTRAINT chk_recording_depl_total CHECK (total >= 0);
+
+-- Revert recording_bws structure
+ALTER TABLE recording_bws
+    DROP CONSTRAINT IF EXISTS chk_recording_bws_nonneg;
+
+ALTER TABLE recording_bws
+    ALTER COLUMN qty TYPE INT USING COALESCE(qty, 0)::INT;
+
+ALTER TABLE recording_bws
+    DROP COLUMN IF EXISTS total_weight;
+
+ALTER TABLE recording_bws
+    ALTER COLUMN avg_weight TYPE NUMERIC(8,2) USING COALESCE(avg_weight, 0)::NUMERIC(8,2);
+
+ALTER TABLE recording_bws
+    RENAME COLUMN avg_weight TO weight;
+
+ALTER TABLE recording_bws
+    ADD COLUMN notes VARCHAR;
+
+UPDATE recording_bws
+SET qty = GREATEST(qty, 1);
+
+ALTER TABLE recording_bws
+    ADD CONSTRAINT chk_recording_bws_nonneg CHECK (weight >= 0 AND qty >= 1);
+
+-- Revert recordings header
+DROP INDEX IF EXISTS idx_recordings_flock_datetime;
+
+ALTER TABLE recordings
+    DROP CONSTRAINT IF EXISTS fk_recordings_project_flock_kandang,
+    DROP CONSTRAINT IF EXISTS chk_recordings_nonnegatives_v2;
+
+ALTER TABLE recordings
+    ALTER COLUMN total_depletion_qty TYPE INT USING COALESCE(total_depletion_qty, 0)::INT,
+    ALTER COLUMN total_chick_qty TYPE BIGINT USING COALESCE(total_chick_qty, 0)::BIGINT;
+
+ALTER TABLE recordings
+    RENAME COLUMN total_depletion_qty TO total_depletion;
+
+ALTER TABLE recordings
+    RENAME COLUMN total_chick_qty TO total_chick;
+
+ALTER TABLE recordings
+    ADD COLUMN record_date DATE,
+    ADD COLUMN status INT NOT NULL DEFAULT 0,
+    ADD COLUMN ontime INT NOT NULL DEFAULT 0,
+    ADD COLUMN daily_depletion_rate NUMERIC(7,3),
+    ADD COLUMN cum_depletion INT;
+
+ALTER TABLE recordings
+    RENAME COLUMN project_flock_kandangs_id TO project_flock_id;
+
+ALTER TABLE recordings
+    ADD CONSTRAINT fk_recordings_project_flock
+        FOREIGN KEY (project_flock_id) REFERENCES project_flock_kandangs(id);
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_status CHECK (status IN (0,1,2,3));
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_ontime CHECK (ontime IN (0,1));
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_nonnegatives CHECK (
+        (total_depletion IS NULL OR total_depletion >= 0) AND
+        (cum_depletion  IS NULL OR cum_depletion  >= 0) AND
+        (total_chick    IS NULL OR total_chick    >= 0) AND
+        (cum_intake     IS NULL OR cum_intake     >= 0) AND
+        (daily_gain     IS NULL OR daily_gain     >= 0) AND
+        (avg_daily_gain IS NULL OR avg_daily_gain >= 0) AND
+        (fcr_value      IS NULL OR fcr_value      >  0) AND
+        (daily_depletion_rate IS NULL OR daily_depletion_rate >= 0) AND
+        (cum_depletion_rate  IS NULL OR cum_depletion_rate  >= 0)
+    );
+
+-- Ensure new columns carry derived data
+UPDATE recordings
+SET record_date = (record_datetime AT TIME ZONE 'Asia/Jakarta')::date
+WHERE record_date IS NULL;
+
+-- Restore helper trigger/function and indexes
+CREATE OR REPLACE FUNCTION trg_set_record_date() RETURNS trigger AS $$
+BEGIN
+  NEW.record_date := (NEW.record_datetime AT TIME ZONE 'Asia/Jakarta')::date;
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER recordings_set_record_date_trg
+BEFORE INSERT OR UPDATE OF record_datetime ON recordings
+FOR EACH ROW EXECUTE FUNCTION trg_set_record_date();
+
+CREATE INDEX idx_recordings_flock_datetime
+    ON recordings (project_flock_id, record_datetime);
+
+CREATE UNIQUE INDEX uq_recordings_flock_record_date
+    ON recordings (project_flock_id, record_date)
+    WHERE deleted_at IS NULL;
+
+COMMIT;

internal/database/migrations/20251029070455_update_recording_schema.up.sql

@@ -0,0 +1,168 @@
+BEGIN;
+
+-- Drop trigger & helper function tied to record_date before removing the column
+DROP TRIGGER IF EXISTS recordings_set_record_date_trg ON recordings;
+DROP FUNCTION IF EXISTS trg_set_record_date();
+
+-- Drop indexes and constraints that reference legacy columns
+DROP INDEX IF EXISTS uq_recordings_flock_record_date;
+DROP INDEX IF EXISTS idx_recordings_flock_datetime;
+
+ALTER TABLE recordings
+    DROP CONSTRAINT IF EXISTS fk_recordings_project_flock,
+    DROP CONSTRAINT IF EXISTS chk_recordings_status,
+    DROP CONSTRAINT IF EXISTS chk_recordings_ontime,
+    DROP CONSTRAINT IF EXISTS chk_recordings_nonnegatives;
+
+-- Align recordings header with the new schema
+ALTER TABLE recordings
+    RENAME COLUMN project_flock_id TO project_flock_kandangs_id;
+
+ALTER TABLE recordings
+    DROP COLUMN IF EXISTS record_date,
+    DROP COLUMN IF EXISTS status,
+    DROP COLUMN IF EXISTS ontime,
+    DROP COLUMN IF EXISTS daily_depletion_rate,
+    DROP COLUMN IF EXISTS cum_depletion;
+
+ALTER TABLE recordings
+    RENAME COLUMN total_depletion TO total_depletion_qty;
+
+ALTER TABLE recordings
+    RENAME COLUMN total_chick TO total_chick_qty;
+
+ALTER TABLE recordings
+    ALTER COLUMN total_depletion_qty TYPE NUMERIC(15,3) USING COALESCE(total_depletion_qty, 0)::NUMERIC(15,3),
+    ALTER COLUMN total_chick_qty TYPE NUMERIC(15,3) USING COALESCE(total_chick_qty, 0)::NUMERIC(15,3),
+    ALTER COLUMN cum_intake TYPE INT USING COALESCE(cum_intake, 0)::INT;
+
+ALTER TABLE recordings
+    ADD CONSTRAINT fk_recordings_project_flock_kandang
+        FOREIGN KEY (project_flock_kandangs_id) REFERENCES project_flock_kandangs(id);
+
+ALTER TABLE recordings
+    ADD CONSTRAINT chk_recordings_nonnegatives_v2 CHECK (
+        (total_depletion_qty IS NULL OR total_depletion_qty >= 0) AND
+        (cum_depletion_rate  IS NULL OR cum_depletion_rate  >= 0) AND
+        (daily_gain          IS NULL OR daily_gain          >= 0) AND
+        (avg_daily_gain      IS NULL OR avg_daily_gain      >= 0) AND
+        (cum_intake          IS NULL OR cum_intake          >= 0) AND
+        (fcr_value           IS NULL OR fcr_value           >= 0) AND
+        (total_chick_qty     IS NULL OR total_chick_qty     >= 0)
+    );
+
+CREATE INDEX idx_recordings_flock_datetime
+    ON recordings (project_flock_kandangs_id, record_datetime);
+
+-- recording_bws reshape
+ALTER TABLE recording_bws
+    RENAME COLUMN weight TO avg_weight;
+
+ALTER TABLE recording_bws
+    ALTER COLUMN avg_weight TYPE NUMERIC(8,2) USING COALESCE(avg_weight, 0)::NUMERIC(8,2);
+
+ALTER TABLE recording_bws
+    ADD COLUMN total_weight NUMERIC(10,3);
+
+UPDATE recording_bws
+SET total_weight = COALESCE(avg_weight, 0) * COALESCE(qty, 0);
+
+ALTER TABLE recording_bws
+    ALTER COLUMN total_weight SET NOT NULL;
+
+ALTER TABLE recording_bws
+    ALTER COLUMN qty TYPE NUMERIC(15,3) USING COALESCE(qty, 0)::NUMERIC(15,3);
+
+ALTER TABLE recording_bws
+    DROP COLUMN IF EXISTS notes;
+
+ALTER TABLE recording_bws
+    DROP CONSTRAINT IF EXISTS chk_recording_bws_nonneg;
+
+ALTER TABLE recording_bws
+    ADD CONSTRAINT chk_recording_bws_nonneg CHECK (
+        avg_weight >= 0 AND qty >= 0 AND total_weight >= 0
+    );
+
+-- recording_depletions reshape
+ALTER TABLE recording_depletions
+    RENAME COLUMN total TO qty;
+
+ALTER TABLE recording_depletions
+    ALTER COLUMN qty TYPE NUMERIC(15,3) USING COALESCE(qty, 0)::NUMERIC(15,3);
+
+ALTER TABLE recording_depletions
+    DROP COLUMN IF EXISTS notes;
+
+ALTER TABLE recording_depletions
+    DROP CONSTRAINT IF EXISTS chk_recording_depl_total;
+
+ALTER TABLE recording_depletions
+    ADD CONSTRAINT chk_recording_depl_qty CHECK (qty >= 0);
+
+-- recording_stocks reshape
+ALTER TABLE recording_stocks
+    DROP CONSTRAINT IF EXISTS chk_recording_stocks_nonneg;
+
+ALTER TABLE recording_stocks
+    DROP COLUMN IF EXISTS increase,
+    DROP COLUMN IF EXISTS decrease,
+    DROP COLUMN IF EXISTS usage_amount,
+    DROP COLUMN IF EXISTS notes;
+
+ALTER TABLE recording_stocks
+    ADD COLUMN usage_qty NUMERIC(15,3),
+    ADD COLUMN pending_qty NUMERIC(15,3);
+
+ALTER TABLE recording_stocks
+    ADD CONSTRAINT chk_recording_stocks_nonneg CHECK (
+        (usage_qty IS NULL OR usage_qty >= 0) AND
+        (pending_qty IS NULL OR pending_qty >= 0)
+    );
+
+-- recording_eggs table
+CREATE TABLE recording_eggs (
+    id                   BIGSERIAL PRIMARY KEY,
+    recording_id         BIGINT NOT NULL,
+    product_warehouse_id BIGINT NOT NULL,
+    qty                  INT NOT NULL,
+    created_by           BIGINT,
+    created_at           TIMESTAMPTZ DEFAULT NOW(),
+    updated_at           TIMESTAMPTZ DEFAULT NOW(),
+
+    CONSTRAINT fk_recording_eggs_recording
+        FOREIGN KEY (recording_id) REFERENCES recordings(id) ON DELETE CASCADE,
+    CONSTRAINT fk_recording_eggs_product_warehouse
+        FOREIGN KEY (product_warehouse_id) REFERENCES product_warehouses(id),
+    CONSTRAINT fk_recording_eggs_created_by
+        FOREIGN KEY (created_by) REFERENCES users(id),
+    CONSTRAINT chk_recording_eggs_qty CHECK (qty >= 0)
+);
+
+CREATE INDEX idx_recording_eggs_recording
+    ON recording_eggs (recording_id);
+
+CREATE INDEX idx_recording_eggs_product
+    ON recording_eggs (product_warehouse_id);
+
+-- grading_eggs table
+CREATE TABLE grading_eggs (
+    id                BIGSERIAL PRIMARY KEY,
+    recording_egg_id  BIGINT NOT NULL,
+    qty               NUMERIC(15,3) NOT NULL,
+    grade             VARCHAR,
+    created_by        BIGINT,
+    created_at        TIMESTAMPTZ DEFAULT NOW(),
+    updated_at        TIMESTAMPTZ DEFAULT NOW(),
+
+    CONSTRAINT fk_grading_eggs_recording_egg
+        FOREIGN KEY (recording_egg_id) REFERENCES recording_eggs(id) ON DELETE CASCADE,
+    CONSTRAINT fk_grading_eggs_created_by
+        FOREIGN KEY (created_by) REFERENCES users(id),
+    CONSTRAINT chk_grading_eggs_qty CHECK (qty >= 0)
+);
+
+CREATE INDEX idx_grading_eggs_recording_egg
+    ON grading_eggs (recording_egg_id);
+
+COMMIT;

internal/database/seed/seeder.go

@@ -8,7 +8,6 @@ import (
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
-	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 
 	"gorm.io/gorm"
 )
@@ -41,21 +40,14 @@ func Run(db *gorm.DB) error {
 			return err
 		}
 
-		flocks, err := seedFlocks(tx, adminID)
-		if err != nil {
+		if _, err := seedFlocks(tx, adminID); err != nil {
 			return err
 		}
 
-		fcrs, err := seedFcr(tx, adminID)
-		if err != nil {
+		if _, err := seedFcr(tx, adminID); err != nil {
 			return err
 		}
 
-		
-		if err := seedProjectFlocks(tx, adminID, flocks, areas, fcrs, locations); err != nil {
-			return err
-		}
-		
 		kandangs, err := seedKandangs(tx, adminID, locations, users)
 		if err != nil {
 			return err
@@ -93,10 +85,6 @@ func Run(db *gorm.DB) error {
 		if err := seedTransferStock(tx, adminID); err != nil {
 			return err
 		}
-		if err := seedChickin(tx, adminID); err != nil {
-			return err
-		}
-
 		fmt.Println("✅ Master data seeding completed")
 		return nil
 	})
@@ -243,158 +231,12 @@ func seedFlocks(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
 	return result, nil
 }
 
-func seedProjectFlocks(
-	tx *gorm.DB,
-	createdBy uint,
-	flocks, areas, fcrs, locations map[string]uint,
-) error {
-	seeds := []struct {
-		Key      string
-		Flock    string
-		Area     string
-		Category utils.ProjectFlockCategory
-		Fcr      string
-		Location string
-		Period   int
-	}{
-		{
-			Key:      "Singaparna Period 1",
-			Flock:    "Flock Priangan",
-			Area:     "Priangan",
-			Category: utils.ProjectFlockCategoryGrowing,
-			Fcr:      "FCR Layer",
-			Location: "Singaparna",
-			Period:   1,
-		},
-		{
-			Key:      "Cikaum Period 1",
-			Flock:    "Flock Banten",
-			Area:     "Banten",
-			Category: utils.ProjectFlockCategoryGrowing,
-			Fcr:      "FCR Layer",
-			Location: "Cikaum",
-			Period:   1,
-		},
-	}
-
-	for _, seed := range seeds {
-		flockID, ok := flocks[seed.Flock]
-		if !ok {
-			return fmt.Errorf("floc %s not seeded", seed.Flock)
-		}
-		areaID, ok := areas[seed.Area]
-		if !ok {
-			return fmt.Errorf("area %s not seeded", seed.Area)
-		}
-		fcrID, ok := fcrs[seed.Fcr]
-		if !ok {
-			return fmt.Errorf("fcr %s not seeded", seed.Fcr)
-		}
-		locationID, ok := locations[seed.Location]
-		if !ok {
-			return fmt.Errorf("location %s not seeded", seed.Location)
-		}
-
-		var projectFlock entity.ProjectFlock
-		err := tx.Where(
-			"flock_id = ? AND area_id = ? AND category = ? AND fcr_id = ? AND location_id = ? AND period = ?",
-			flockID, areaID, seed.Category, fcrID, locationID, seed.Period,
-		).First(&projectFlock).Error
-
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			projectFlock = entity.ProjectFlock{
-				FlockId:    flockID,
-				AreaId:     areaID,
-				Category:   string(seed.Category),
-				FcrId:      fcrID,
-				LocationId: locationID,
-				Period:     seed.Period,
-				CreatedBy:  createdBy,
-			}
-			if err := tx.Create(&projectFlock).Error; err != nil {
-				return err
-			}
-		} else if err != nil {
-			return err
-		} else {
-			if err := tx.Model(&entity.ProjectFlock{}).Where("id = ?", projectFlock.Id).Updates(map[string]any{
-				"flock_id":    flockID,
-				"area_id":     areaID,
-				"category":    string(seed.Category),
-				"fcr_id":      fcrID,
-				"location_id": locationID,
-				"period":      seed.Period,
-			}).Error; err != nil {
-				return err
-			}
-		}
-
-		if err := ensureProjectFlockApprovals(tx, projectFlock.Id, createdBy); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func ensureProjectFlockApprovals(tx *gorm.DB, projectFlockID uint, actorID uint) error {
-	if projectFlockID == 0 || actorID == 0 {
-		return nil
-	}
-
-	workflow := utils.ApprovalWorkflowProjectFlock.String()
-
-	steps := []struct {
-		step   approvalutils.ApprovalStep
-		action entity.ApprovalAction
-	}{
-		{step: utils.ProjectFlockStepPengajuan, action: entity.ApprovalActionCreated},
-		{step: utils.ProjectFlockStepAktif, action: entity.ApprovalActionApproved},
-	}
-
-	for _, cfg := range steps {
-		var count int64
-		if err := tx.Model(&entity.Approval{}).
-			Where("approvable_type = ? AND approvable_id = ? AND step_number = ?", workflow, projectFlockID, uint16(cfg.step)).
-			Count(&count).Error; err != nil {
-			return err
-		}
-		if count > 0 {
-			continue
-		}
-
-		stepName, ok := utils.ProjectFlockApprovalSteps[cfg.step]
-		if !ok || strings.TrimSpace(stepName) == "" {
-			stepName = fmt.Sprintf("Step %d", cfg.step)
-		}
-
-		var actionPtr *entity.ApprovalAction
-		action := cfg.action
-		actionPtr = &action
-
-		record := entity.Approval{
-			ApprovableType: workflow,
-			ApprovableId:   projectFlockID,
-			StepNumber:     uint16(cfg.step),
-			StepName:       stepName,
-			Action:         actionPtr,
-			ActionBy:       uintPtr(actorID),
-		}
-
-		if err := tx.Create(&record).Error; err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 func seedKandangs(tx *gorm.DB, createdBy uint, locations map[string]uint, users map[string]uint) (map[string]uint, error) {
 	seeds := []struct {
-		Name            string
-		Status          utils.KandangStatus
-		Location        string
-		PicKey          string
+		Name     string
+		Status   utils.KandangStatus
+		Location string
+		PicKey   string
 	}{
 		{Name: "Singaparna 1", Status: utils.KandangStatusNonActive, Location: "Singaparna", PicKey: "admin"},
 		{Name: "Singaparna 2", Status: utils.KandangStatusNonActive, Location: "Singaparna", PicKey: "admin"},
@@ -414,16 +256,15 @@ func seedKandangs(tx *gorm.DB, createdBy uint, locations map[string]uint, users
 			return nil, fmt.Errorf("user %s not seeded", seed.PicKey)
 		}
 
-
 		var kandang entity.Kandang
 		err := tx.Where("name = ?", seed.Name).First(&kandang).Error
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			kandang = entity.Kandang{
-				Name:           seed.Name,
-				Status:         string(seed.Status),
-				LocationId:     locID,
-				PicId:          picID,
-				CreatedBy:      createdBy,
+				Name:       seed.Name,
+				Status:     string(seed.Status),
+				LocationId: locID,
+				PicId:      picID,
+				CreatedBy:  createdBy,
 			}
 			if err := tx.Create(&kandang).Error; err != nil {
 				return nil, err
@@ -446,7 +287,6 @@ func seedKandangs(tx *gorm.DB, createdBy uint, locations map[string]uint, users
 	return result, nil
 }
 
-
 func seedWarehouses(tx *gorm.DB, createdBy uint, areas map[string]uint, locations map[string]uint, kandangs map[string]uint) error {
 	seeds := []struct {
 		Name     string
@@ -525,6 +365,7 @@ func seedProductCategories(tx *gorm.DB, createdBy uint) (map[string]uint, error)
 	}{
 		{"Bahan Baku", "RAW"},
 		{"Day Old Chick", "DOC"},
+		{"Telur", "EGG"},
 	}
 
 	result := make(map[string]uint, len(seeds))
@@ -739,6 +580,22 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Suppliers: []string{"PT CHAROEN POKPHAND INDONESIA Tbk"},
 			Flags:     []utils.FlagType{utils.FlagPakan, utils.FlagStarter},
 		},
+		{
+			Name:     "Telur Konsumsi Baik",
+			Brand:    "Layer Farm",
+			Sku:      "EGG-GOOD",
+			Uom:      "Unit",
+			Category: "Telur",
+			Price:    1800,
+		},
+		{
+			Name:     "Telur Pecah",
+			Brand:    "Layer Farm",
+			Sku:      "EGG-CRACK",
+			Uom:      "Unit",
+			Category: "Telur",
+			Price:    900,
+		},
 	}
 
 	for _, seed := range seeds {
@@ -978,25 +835,44 @@ func seedBanks(tx *gorm.DB, createdBy uint) error {
 }
 
 func seedProductWarehouse(tx *gorm.DB, createdBy uint) error {
-
 	seeds := []struct {
-		ProductID   uint
-		WarehouseID uint
-		Quantity    float64
+		ProductName   string
+		WarehouseName string
+		Quantity      float64
 	}{
-		{ProductID: 1, WarehouseID: 1, Quantity: 100},
-		{ProductID: 2, WarehouseID: 2, Quantity: 200},
-		{ProductID: 2, WarehouseID: 1, Quantity: 300},
-		{ProductID: 1, WarehouseID: 3, Quantity: 5000},
+		{ProductName: "DOC Broiler", WarehouseName: "Gudang Priangan", Quantity: 100},
+		{ProductName: "281 SPECIAL STARTER", WarehouseName: "Gudang Singaparna", Quantity: 200},
+		{ProductName: "281 SPECIAL STARTER", WarehouseName: "Gudang Banten", Quantity: 300},
+		{ProductName: "DOC Broiler", WarehouseName: "Gudang Singaparna 1", Quantity: 5000},
+		{ProductName: "Telur Konsumsi Baik", WarehouseName: "Gudang Singaparna 1", Quantity: 600},
+		{ProductName: "Telur Pecah", WarehouseName: "Gudang Singaparna 1", Quantity: 80},
+		{ProductName: "Telur Konsumsi Baik", WarehouseName: "Gudang Cikaum 1", Quantity: 450},
+		{ProductName: "Telur Pecah", WarehouseName: "Gudang Cikaum 1", Quantity: 60},
 	}
 
 	for _, seed := range seeds {
+		var product entity.Product
+		if err := tx.Where("name = ?", seed.ProductName).First(&product).Error; err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return fmt.Errorf("product %q not found for product warehouse seeding", seed.ProductName)
+			}
+			return err
+		}
+
+		var warehouse entity.Warehouse
+		if err := tx.Where("name = ?", seed.WarehouseName).First(&warehouse).Error; err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return fmt.Errorf("warehouse %q not found for product warehouse seeding", seed.WarehouseName)
+			}
+			return err
+		}
+
 		var productWarehouse entity.ProductWarehouse
-		err := tx.Where("product_id = ? AND warehouse_id = ?", seed.ProductID, seed.WarehouseID).First(&productWarehouse).Error
+		err := tx.Where("product_id = ? AND warehouse_id = ?", product.Id, warehouse.Id).First(&productWarehouse).Error
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			productWarehouse = entity.ProductWarehouse{
-				ProductId:   seed.ProductID,
-				WarehouseId: seed.WarehouseID,
+				ProductId:   product.Id,
+				WarehouseId: warehouse.Id,
 				Quantity:    seed.Quantity,
 				CreatedBy:   createdBy,
 			}
@@ -1005,6 +881,12 @@ func seedProductWarehouse(tx *gorm.DB, createdBy uint) error {
 			}
 		} else if err != nil {
 			return err
+		} else {
+			if err := tx.Model(&productWarehouse).Updates(map[string]any{
+				"quantity": seed.Quantity,
+			}).Error; err != nil {
+				return err
+			}
 		}
 	}
 
@@ -1085,71 +967,6 @@ func seedTransferStock(tx *gorm.DB, createdBy uint) error {
 
 	return nil
 }
-func seedChickin(tx *gorm.DB, createdBy uint) error {
-    // gunakan identitas yang stabil, bukan ID pivot
-    seeds := []struct {
-        KandangName  string
-        LocationName string
-        Period       int
-        ChickInDate  string
-        Quantity     float64
-        Note         string
-    }{
-        {"Singaparna 1", "Singaparna", 1, "2025-10-20", 100, "Seeder chickin 1"},
-        {"Cikaum 1",     "Cikaum",     1, "2025-10-21", 200, "Seeder chickin 2"},
-    }
-
-    for _, s := range seeds {
-        pfkID, err := ensurePFK(tx, s.KandangName, s.LocationName, s.Period)
-        if err != nil { return err }
-
-        date, err := time.Parse("2006-01-02", s.ChickInDate)
-        if err != nil { return err }
-
-        // upsert project_chickin (idempotent)
-        var chickin entity.ProjectChickin
-        err = tx.Where("project_flock_kandang_id = ? AND chick_in_date = ?", pfkID, date).First(&chickin).Error
-        if errors.Is(err, gorm.ErrRecordNotFound) {
-            chickin = entity.ProjectChickin{
-                ProjectFlockKandangId: pfkID,
-                ChickInDate:           date,
-                Quantity:              s.Quantity,
-                Note:                  s.Note,
-                CreatedBy:             createdBy,
-            }
-            if err := tx.Create(&chickin).Error; err != nil { return err }
-        } else if err != nil {
-            return err
-        }
-
-        // upsert population
-        var pop entity.ProjectFlockPopulation
-        err = tx.Where("project_flock_kandang_id = ?", pfkID).First(&pop).Error
-        if errors.Is(err, gorm.ErrRecordNotFound) {
-            pop = entity.ProjectFlockPopulation{
-                ProjectFlockKandangId: pfkID,
-                InitialQuantity:       s.Quantity,
-                CurrentQuantity:       s.Quantity,
-                ReservedQuantity:      0,
-                CreatedBy:             createdBy,
-            }
-            if err := tx.Create(&pop).Error; err != nil { return err }
-        } else if err != nil {
-            return err
-        } else {
-            if err := tx.Model(&entity.ProjectFlockPopulation{}).
-                Where("id = ?", pop.Id).
-                Updates(map[string]any{
-                    "initial_quantity":  pop.InitialQuantity + s.Quantity,
-                    "current_quantity":  pop.CurrentQuantity + s.Quantity,
-                    "reserved_quantity": 0,
-                }).Error; err != nil { return err }
-        }
-    }
-    return nil
-}
-
-
 func ptr[T any](v T) *T {
 	return &v
 }
@@ -1165,30 +982,3 @@ func intPtr(v int) *int {
 func uintPtr(v uint) *uint {
 	return &v
 }
-
-func ensurePFK(tx *gorm.DB, kandangName, locationName string, period int) (uint, error) {
-    var kandang entity.Kandang
-    if err := tx.Where("name = ?", kandangName).First(&kandang).Error; err != nil {
-        return 0, fmt.Errorf("kandang %q not found: %w", kandangName, err)
-    }
-    var loc entity.Location
-    if err := tx.Where("name = ?", locationName).First(&loc).Error; err != nil {
-        return 0, fmt.Errorf("location %q not found: %w", locationName, err)
-    }
-    var pf entity.ProjectFlock
-    if err := tx.Where("location_id = ? AND period = ?", loc.Id, period).First(&pf).Error; err != nil {
-        return 0, fmt.Errorf("project_flock for %s period %d not found: %w", locationName, period, err)
-    }
-    var pfk entity.ProjectFlockKandang
-    if err := tx.Where("project_flock_id = ? AND kandang_id = ?", pf.Id, kandang.Id).First(&pfk).Error; err != nil {
-        if errors.Is(err, gorm.ErrRecordNotFound) {
-            pfk = entity.ProjectFlockKandang{ ProjectFlockId: pf.Id, KandangId: kandang.Id }
-            if err := tx.Create(&pfk).Error; err != nil {
-                return 0, fmt.Errorf("create pivot pfk(%d,%d) failed: %w", pf.Id, kandang.Id, err)
-            }
-        } else {
-            return 0, err
-        }
-    }
-    return pfk.Id, nil
-}

internal/entities/projectflock.go

@@ -8,18 +8,17 @@ import (
 
 type ProjectFlock struct {
 	Id         uint           `gorm:"primaryKey"`
-	FlockId    uint           `gorm:"not null;uniqueIndex:project_flocks_flock_period_unique"`
+	FlockName  string         `gorm:"type:varchar(255);not null;uniqueIndex"`
 	AreaId     uint           `gorm:"not null"`
 	Category   string         `gorm:"type:varchar(20);not null"`
 	FcrId      uint           `gorm:"not null"`
 	LocationId uint           `gorm:"not null"`
-	Period     int            `gorm:"not null;uniqueIndex:project_flocks_flock_period_unique"`
+	Period     int            `gorm:"not null"`
 	CreatedBy  uint           `gorm:"not null"`
 	CreatedAt  time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt  time.Time      `gorm:"autoUpdateTime"`
 	DeletedAt  gorm.DeletedAt `gorm:"index" json:"-"`
 
-	Flock          Flock                 `gorm:"foreignKey:FlockId;references:Id"`
 	Area           Area                  `gorm:"foreignKey:AreaId;references:Id"`
 	Fcr            Fcr                   `gorm:"foreignKey:FcrId;references:Id"`
 	Location       Location              `gorm:"foreignKey:LocationId;references:Id"`

internal/entities/recording.go

@@ -8,20 +8,16 @@ import (
 
 type Recording struct {
 	Id                    uint           `gorm:"primaryKey"`
-	ProjectFlockKandangId uint           `gorm:"column:project_flock_id;not null;index"`
+	ProjectFlockKandangId uint           `gorm:"column:project_flock_kandangs_id;not null;index"`
 	RecordDatetime        time.Time      `gorm:"column:record_datetime;not null"`
-	RecordDate            *time.Time     `gorm:"column:record_date"`
-	Ontime                int            `gorm:"column:ontime;not null;default:0"`
 	Day                   *int           `gorm:"column:day"`
-	TotalDepletion        *int           `gorm:"column:total_depletion"`
+	TotalDepletionQty     *float64       `gorm:"column:total_depletion_qty"`
 	CumDepletionRate      *float64       `gorm:"column:cum_depletion_rate"`
 	DailyGain             *float64       `gorm:"column:daily_gain"`
 	AvgDailyGain          *float64       `gorm:"column:avg_daily_gain"`
-	CumIntake             *int64         `gorm:"column:cum_intake"`
+	CumIntake             *int           `gorm:"column:cum_intake"`
 	FcrValue              *float64       `gorm:"column:fcr_value"`
-	TotalChick            *int64         `gorm:"column:total_chick"`
-	DailyDepletionRate    *float64       `gorm:"column:daily_depletion_rate"`
-	CumDepletion          *int           `gorm:"column:cum_depletion"`
+	TotalChickQty         *float64       `gorm:"column:total_chick_qty"`
 	CreatedBy             uint           `gorm:"column:created_by"`
 	CreatedAt             time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt             time.Time      `gorm:"autoUpdateTime"`
@@ -32,4 +28,7 @@ type Recording struct {
 	BodyWeights         []RecordingBW        `gorm:"foreignKey:RecordingId;references:Id"`
 	Depletions          []RecordingDepletion `gorm:"foreignKey:RecordingId;references:Id"`
 	Stocks              []RecordingStock     `gorm:"foreignKey:RecordingId;references:Id"`
+	Eggs                []RecordingEgg       `gorm:"foreignKey:RecordingId;references:Id"`
+
+	LatestApproval *Approval `gorm:"-" json:"-"`
 }

internal/entities/recording_bw.go

@@ -1,16 +1,15 @@
-
 package entities
 
 import "time"
 
 type RecordingBW struct {
-    Id          uint      `gorm:"primaryKey"`
-    RecordingId uint      `gorm:"column:recording_id;not null;index"`
-    Weight      float64   `gorm:"column:weight;not null"`
-    Qty         int       `gorm:"column:qty;not null;default:1"`
-    Notes       *string   `gorm:"column:notes"`
-    CreatedAt   time.Time `gorm:"autoCreateTime"`
-    UpdatedAt   time.Time `gorm:"autoUpdateTime"`
+	Id          uint      `gorm:"primaryKey"`
+	RecordingId uint      `gorm:"column:recording_id;not null;index"`
+	AvgWeight   float64   `gorm:"column:avg_weight;not null"`
+	Qty         float64   `gorm:"column:qty;not null"`
+	TotalWeight float64   `gorm:"column:total_weight;not null"`
+	CreatedAt   time.Time `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time `gorm:"autoUpdateTime"`
 
-    Recording Recording `gorm:"foreignKey:RecordingId;references:Id"`
+	Recording Recording `gorm:"foreignKey:RecordingId;references:Id"`
 }

internal/entities/recording_depletion.go

@@ -1,13 +1,11 @@
 package entities
 
 type RecordingDepletion struct {
-    Id                 uint    `gorm:"primaryKey"`
-    RecordingId        uint    `gorm:"column:recording_id;not null;index"`
-    ProductWarehouseId uint    `gorm:"column:product_warehouse_id;not null"`
-    Total              int64   `gorm:"column:total;not null"`
-    Notes              *string `gorm:"column:notes"`
+	Id                 uint    `gorm:"primaryKey"`
+	RecordingId        uint    `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint    `gorm:"column:product_warehouse_id;not null"`
+	Qty                float64 `gorm:"column:qty;not null"`
 
-    Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
-    ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
+	ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
 }
-

internal/entities/recording_egg.go

@@ -0,0 +1,30 @@
+package entities
+
+import "time"
+
+type RecordingEgg struct {
+	Id                 uint             `gorm:"primaryKey"`
+	RecordingId        uint             `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint             `gorm:"column:product_warehouse_id;not null"`
+	Qty                int              `gorm:"column:qty;not null"`
+	CreatedBy          uint             `gorm:"column:created_by"`
+	CreatedAt          time.Time        `gorm:"autoCreateTime"`
+	UpdatedAt          time.Time        `gorm:"autoUpdateTime"`
+	GradingEggs        []GradingEgg     `gorm:"foreignKey:RecordingEggId;references:Id"`
+	ProductWarehouse   ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	CreatedUser        *User            `gorm:"foreignKey:CreatedBy;references:Id"`
+	Recording          Recording        `gorm:"foreignKey:RecordingId;references:Id"`
+}
+
+type GradingEgg struct {
+	Id             uint      `gorm:"primaryKey"`
+	RecordingEggId uint      `gorm:"column:recording_egg_id;not null;index"`
+	Qty            float64   `gorm:"column:qty;not null"`
+	Grade          string    `gorm:"column:grade;type:varchar(50)"`
+	CreatedBy      uint      `gorm:"column:created_by"`
+	CreatedAt      time.Time `gorm:"autoCreateTime"`
+	UpdatedAt      time.Time `gorm:"autoUpdateTime"`
+
+	RecordingEgg RecordingEgg `gorm:"foreignKey:RecordingEggId;references:Id"`
+	CreatedUser  *User        `gorm:"foreignKey:CreatedBy;references:Id"`
+}

internal/entities/recording_stock.go

@@ -1,14 +1,12 @@
 package entities
 
 type RecordingStock struct {
-    Id                 uint     `gorm:"primaryKey"`
-    RecordingId        uint     `gorm:"column:recording_id;not null;index"`
-    ProductWarehouseId uint     `gorm:"column:product_warehouse_id;not null"`
-    Increase           *float64 `gorm:"column:increase"`
-    Decrease           *float64 `gorm:"column:decrease"`
-    UsageAmount        *int64   `gorm:"column:usage_amount"`
-    Notes              *string  `gorm:"column:notes"`
+	Id                 uint     `gorm:"primaryKey"`
+	RecordingId        uint     `gorm:"column:recording_id;not null;index"`
+	ProductWarehouseId uint     `gorm:"column:product_warehouse_id;not null"`
+	UsageQty           *float64 `gorm:"column:usage_qty"`
+	PendingQty         *float64 `gorm:"column:pending_qty"`
 
-    Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
-    ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
+	Recording        Recording        `gorm:"foreignKey:RecordingId;references:Id"`
+	ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
 }

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

@@ -202,21 +202,7 @@ func (s *adjustmentService) AdjustmentHistory(c *fiber.Ctx, query *validation.Qu
 		if query.TransactionType != "" {
 			db = db.Where("transaction_type = ?", strings.ToUpper(query.TransactionType))
 		}
-		if query.ProductID > 0 {
-			db = db.Joins("JOIN product_warehouses ON product_warehouses.id = stock_logs.product_warehouse_id").
-				Where("product_warehouses.product_id = ?", query.ProductID)
-		}
-
-		if query.WarehouseID > 0 {
-			if query.ProductID > 0 {
-
-				db = db.Where("product_warehouses.warehouse_id = ?", query.WarehouseID)
-			} else {
-
-				db = db.Joins("JOIN product_warehouses ON product_warehouses.id = stock_logs.product_warehouse_id").
-					Where("product_warehouses.warehouse_id = ?", query.WarehouseID)
-			}
-		}
+		db = s.StockLogsRepository.ApplyProductWarehouseFilters(db, uint(query.ProductID), uint(query.WarehouseID))
 
 		return db.Order("created_at DESC")
 	})

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

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"fmt"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -17,34 +18,35 @@ type ProductWarehouseRepository interface {
 	ExistsByID(ctx context.Context, id uint) (bool, error)
 	GetProductWarehouseByProductAndWarehouseID(ctx context.Context, productId, warehouseId uint) (*entity.ProductWarehouse, error)
 	GetByCategoryCodeAndWarehouseID(ctx context.Context, categoryCode string, warehouseId uint) ([]entity.ProductWarehouse, error)
+	GetLatestByCategoryCodeAndWarehouseID(ctx context.Context, categoryCode string, warehouseId uint, db *gorm.DB) (*entity.ProductWarehouse, error)
+	ApplyFlagsFilter(db *gorm.DB, flags []string) *gorm.DB
+	AdjustQuantities(ctx context.Context, deltas map[uint]float64, modifier func(*gorm.DB) *gorm.DB) error
 }
 
 type ProductWarehouseRepositoryImpl struct {
 	*repository.BaseRepositoryImpl[entity.ProductWarehouse]
-	db *gorm.DB
 }
 
 func NewProductWarehouseRepository(db *gorm.DB) ProductWarehouseRepository {
 	return &ProductWarehouseRepositoryImpl{
 		BaseRepositoryImpl: repository.NewBaseRepository[entity.ProductWarehouse](db),
-		db:                 db,
 	}
 }
 
 func (r *ProductWarehouseRepositoryImpl) IsProductExist(ctx context.Context, productId uint) (bool, error) {
-	return repository.Exists[entity.Product](ctx, r.db, productId)
+	return repository.Exists[entity.Product](ctx, r.DB(), productId)
 }
 func (r *ProductWarehouseRepositoryImpl) IsWarehouseExist(ctx context.Context, warehouseId uint) (bool, error) {
-	return repository.Exists[entity.Warehouse](ctx, r.db, warehouseId)
+	return repository.Exists[entity.Warehouse](ctx, r.DB(), warehouseId)
 }
 
 func (r *ProductWarehouseRepositoryImpl) ExistsByID(ctx context.Context, id uint) (bool, error) {
-	return repository.Exists[entity.ProductWarehouse](ctx, r.db, id)
+	return repository.Exists[entity.ProductWarehouse](ctx, r.DB(), id)
 }
 
 func (r *ProductWarehouseRepositoryImpl) ProductWarehouseExists(ctx context.Context, productId, warehouseId uint, excludeID *uint) (bool, error) {
 	var count int64
-	query := r.db.WithContext(ctx).Model(&entity.ProductWarehouse{}).
+	query := r.DB().WithContext(ctx).Model(&entity.ProductWarehouse{}).
 		Where("product_id = ? AND warehouse_id = ?", productId, warehouseId)
 	if excludeID != nil {
 		query = query.Where("id != ?", *excludeID)
@@ -57,7 +59,7 @@ func (r *ProductWarehouseRepositoryImpl) ProductWarehouseExists(ctx context.Cont
 
 func (r *ProductWarehouseRepositoryImpl) ProductWarehouseExistByProductAndWarehouseID(ctx context.Context, productId, warehouseId uint) (bool, error) {
 	var count int64
-	if err := r.db.WithContext(ctx).
+	if err := r.DB().WithContext(ctx).
 		Model(&entity.ProductWarehouse{}).
 		Where("product_id = ? AND warehouse_id = ?", productId, warehouseId).
 		Count(&count).Error; err != nil {
@@ -76,7 +78,7 @@ func (r *ProductWarehouseRepositoryImpl) GetProductWarehouseByProductAndWarehous
 
 func (r *ProductWarehouseRepositoryImpl) GetByCategoryCodeAndWarehouseID(ctx context.Context, categoryCode string, warehouseId uint) ([]entity.ProductWarehouse, error) {
 	var productWarehouses []entity.ProductWarehouse
-	err := r.db.WithContext(ctx).
+	err := r.DB().WithContext(ctx).
 		Table("product_warehouses").
 		Select("product_warehouses.*").
 		Joins("JOIN products ON products.id = product_warehouses.product_id").
@@ -89,3 +91,58 @@ func (r *ProductWarehouseRepositoryImpl) GetByCategoryCodeAndWarehouseID(ctx con
 	}
 	return productWarehouses, nil
 }
+
+func (r *ProductWarehouseRepositoryImpl) GetLatestByCategoryCodeAndWarehouseID(ctx context.Context, categoryCode string, warehouseId uint, db *gorm.DB) (*entity.ProductWarehouse, error) {
+	var productWarehouse entity.ProductWarehouse
+	query := r.DB()
+	if db != nil {
+		query = db
+	}
+	fmt.Println(warehouseId)
+	err := query.WithContext(ctx).
+		Table("product_warehouses").
+		Select("product_warehouses.*").
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN product_categories ON product_categories.id = products.product_category_id").
+		Where("product_categories.code = ? AND product_warehouses.warehouse_id = ?", categoryCode, warehouseId).
+		Order("product_warehouses.created_at DESC").
+		First(&productWarehouse).Error
+	if err != nil {
+		return nil, err
+	}
+	return &productWarehouse, nil
+}
+
+func (r *ProductWarehouseRepositoryImpl) ApplyFlagsFilter(db *gorm.DB, flags []string) *gorm.DB {
+	if len(flags) == 0 {
+		return db
+	}
+
+	return db.
+		Joins("JOIN products ON products.id = product_warehouses.product_id").
+		Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
+		Where("flags.name IN ?", flags)
+}
+
+func (r *ProductWarehouseRepositoryImpl) AdjustQuantities(ctx context.Context, deltas map[uint]float64, modifier func(*gorm.DB) *gorm.DB) error {
+	if len(deltas) == 0 {
+		return nil
+	}
+
+	base := r.DB().WithContext(ctx)
+	if modifier != nil {
+		base = modifier(base)
+	}
+
+	for id, delta := range deltas {
+		if delta == 0 {
+			continue
+		}
+		if err := base.Model(&entity.ProductWarehouse{}).
+			Where("id = ?", id).
+			Update("quantity", gorm.Expr("COALESCE(quantity,0) + ?", delta)).Error; err != nil {
+			return err
+		}
+	}
+	return nil
+}

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

@@ -84,11 +84,7 @@ func (s productWarehouseService) GetAll(c *fiber.Ctx, params *validation.Query)
 			db = db.Where("warehouse_id = ?", params.WarehouseId)
 		}
 
-		if len(cleanFlags) > 0 {
-			db = db.Joins("JOIN products ON products.id = product_warehouses.product_id").
-				Joins("JOIN flags ON flags.flagable_id = products.id AND flags.flagable_type = ?", "products").
-				Where("flags.name IN ?", cleanFlags)
-		}
+		db = s.Repository.ApplyFlagsFilter(db, cleanFlags)
 
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})

internal/modules/master/flocks/repositories/flock.repository.go

@@ -11,6 +11,7 @@ import (
 type FlockRepository interface {
 	repository.BaseRepository[entity.Flock]
 	NameExists(ctx context.Context, name string, excludeID *uint) (bool, error)
+	GetByName(ctx context.Context, name string) (*entity.Flock, error)
 }
 
 type FlockRepositoryImpl struct {
@@ -28,3 +29,15 @@ func NewFlockRepository(db *gorm.DB) FlockRepository {
 func (r *FlockRepositoryImpl) NameExists(ctx context.Context, name string, excludeID *uint) (bool, error) {
 	return repository.ExistsByName[entity.Flock](ctx, r.db, name, excludeID)
 }
+
+func (r *FlockRepositoryImpl) GetByName(ctx context.Context, name string) (*entity.Flock, error) {
+	var flock entity.Flock
+	err := r.db.WithContext(ctx).
+		Where("LOWER(name) = LOWER(?)", name).
+		Where("deleted_at IS NULL").
+		First(&flock).Error
+	if err != nil {
+		return nil, err
+	}
+	return &flock, nil
+}

internal/modules/master/kandangs/repositories/kandang.repository.go

@@ -20,7 +20,7 @@ type KandangRepository interface {
 	HasActiveKandangForProjectFlock(ctx context.Context, projectFlockID uint, excludeID *uint) (bool, error)
 	UpdateStatusByProjectFlockID(ctx context.Context, projectFlockID uint, status utils.KandangStatus) error
 	UpsertProjectFlockKandang(ctx context.Context, projectFlockID, kandangID uint) error
-
+	UpdateStatusByIDs(ctx context.Context, kandangIDs []uint, status utils.KandangStatus) error
 }
 
 type KandangRepositoryImpl struct {
@@ -61,15 +61,15 @@ func (r *KandangRepositoryImpl) ProjectFlockExists(ctx context.Context, projectF
 
 func (r *KandangRepositoryImpl) HasActiveKandangForProjectFlock(ctx context.Context, projectFlockID uint, excludeID *uint) (bool, error) {
 	var count int64
-	 q := r.db.WithContext(ctx).
-        Table("kandangs k").
-        Joins("JOIN project_flock_kandangs pfk ON pfk.kandang_id = k.id").
-        Where("pfk.project_flock_id = ?", projectFlockID).
-        Where("k.status = ?", utils.KandangStatusActive).
-        Where("k.deleted_at IS NULL")
-    if excludeID != nil {
-        q = q.Where("k.id <> ?", *excludeID)
-    }
+	q := r.db.WithContext(ctx).
+		Table("kandangs k").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.kandang_id = k.id").
+		Where("pfk.project_flock_id = ?", projectFlockID).
+		Where("k.status = ?", utils.KandangStatusActive).
+		Where("k.deleted_at IS NULL")
+	if excludeID != nil {
+		q = q.Where("k.id <> ?", *excludeID)
+	}
 	if err := q.Count(&count).Error; err != nil {
 		return false, err
 	}
@@ -78,49 +78,59 @@ func (r *KandangRepositoryImpl) HasActiveKandangForProjectFlock(ctx context.Cont
 
 func (r *KandangRepositoryImpl) GetFirstByProjectFlockID(ctx context.Context, projectFlockID uint) (*entity.Kandang, error) {
 	kandang := new(entity.Kandang)
-    err := r.db.WithContext(ctx).
-        Table("kandangs k").
-        Joins("JOIN project_flock_kandangs pfk ON pfk.kandang_id = k.id").
-        Where("pfk.project_flock_id = ?", projectFlockID).
-        Where("k.deleted_at IS NULL").
-        Order("k.id ASC").
-        Limit(1).
-        Find(kandang).Error
-    if err != nil {
-        return nil, err
-    }
-    if kandang.Id == 0 {
-        return nil, gorm.ErrRecordNotFound
-    }
+	err := r.db.WithContext(ctx).
+		Table("kandangs k").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.kandang_id = k.id").
+		Where("pfk.project_flock_id = ?", projectFlockID).
+		Where("k.deleted_at IS NULL").
+		Order("k.id ASC").
+		Limit(1).
+		Find(kandang).Error
+	if err != nil {
+		return nil, err
+	}
+	if kandang.Id == 0 {
+		return nil, gorm.ErrRecordNotFound
+	}
 
 	return kandang, nil
 }
 
 func (r *KandangRepositoryImpl) UpdateStatusByProjectFlockID(ctx context.Context, projectFlockID uint, status utils.KandangStatus) error {
-	  sub := r.db.WithContext(ctx).
-        Table("project_flock_kandangs").
-        Select("kandang_id").
-        Where("project_flock_id = ?", projectFlockID)
+	sub := r.db.WithContext(ctx).
+		Table("project_flock_kandangs").
+		Select("kandang_id").
+		Where("project_flock_id = ?", projectFlockID)
 
-    return r.db.WithContext(ctx).
-        Model(&entity.Kandang{}).
-        Where("id IN (?)", sub).
-        Where("deleted_at IS NULL").
-        Update("status", string(status)).Error
+	return r.db.WithContext(ctx).
+		Model(&entity.Kandang{}).
+		Where("id IN (?)", sub).
+		Where("deleted_at IS NULL").
+		Update("status", string(status)).Error
 }
 
 func (r *KandangRepositoryImpl) UpsertProjectFlockKandang(ctx context.Context, projectFlockID, kandangID uint) error {
-    var link entity.ProjectFlockKandang
-    err := r.db.WithContext(ctx).
-        Where("project_flock_id = ? AND kandang_id = ?", projectFlockID, kandangID).
-        First(&link).Error
-    if errors.Is(err, gorm.ErrRecordNotFound) {
-        link = entity.ProjectFlockKandang{
-            ProjectFlockId: projectFlockID,
-            KandangId:      kandangID,
-        }
-        return r.db.WithContext(ctx).Create(&link).Error
-    }
-    return err
+	var link entity.ProjectFlockKandang
+	err := r.db.WithContext(ctx).
+		Where("project_flock_id = ? AND kandang_id = ?", projectFlockID, kandangID).
+		First(&link).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		link = entity.ProjectFlockKandang{
+			ProjectFlockId: projectFlockID,
+			KandangId:      kandangID,
+		}
+		return r.db.WithContext(ctx).Create(&link).Error
+	}
+	return err
 }
 
+func (r *KandangRepositoryImpl) UpdateStatusByIDs(ctx context.Context, kandangIDs []uint, status utils.KandangStatus) error {
+	if len(kandangIDs) == 0 {
+		return nil
+	}
+	return r.db.WithContext(ctx).
+		Model(&entity.Kandang{}).
+		Where("id IN ?", kandangIDs).
+		Where("deleted_at IS NULL").
+		Update("status", string(status)).Error
+}

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

@@ -9,6 +9,7 @@ import (
 	flockBaseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
 	kandangBaseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationBaseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
+	pfutils "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/utils"
 	userBaseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 )
 
@@ -88,9 +89,9 @@ func ToUserBaseDTO(e entity.User) userBaseDTO.UserBaseDTO {
 
 func ToProjectFlockDTO(e entity.ProjectFlock) ProjectFlockDTO {
 	var flock *flockBaseDTO.FlockBaseDTO
-	if e.Flock.Id != 0 {
-		mapped := flockBaseDTO.ToFlockBaseDTO(e.Flock)
-		flock = &mapped
+	if base := pfutils.DeriveBaseName(e.FlockName); base != "" {
+		summary := flockBaseDTO.FlockBaseDTO{Id: 0, Name: base}
+		flock = &summary
 	}
 	var area *areaBaseDTO.AreaBaseDTO
 	if e.Area.Id != 0 {

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

@@ -63,7 +63,6 @@ func (s chickinService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("ProjectFlockKandang.Kandang.Location.Area").
 		Preload("ProjectFlockKandang.Kandang.Pic").
 		Preload("ProjectFlockKandang.ProjectFlock").
-		Preload("ProjectFlockKandang.ProjectFlock.Flock").
 		Preload("ProjectFlockKandang.ProjectFlock.Area").
 		Preload("ProjectFlockKandang.ProjectFlock.Fcr").
 		Preload("ProjectFlockKandang.ProjectFlock.Location").
@@ -340,15 +339,12 @@ func (s chickinService) DeleteOne(c *fiber.Ctx, id uint) error {
 			return rollback(err)
 		}
 
-		var productWarehouse entity.ProductWarehouse
-		err = tx.WithContext(c.Context()).Table("product_warehouses").
-			Select("product_warehouses.*").
-			Joins("JOIN products ON products.id = product_warehouses.product_id").
-			Joins("JOIN product_categories ON product_categories.id = products.product_category_id").
-			Where("product_categories.code = ? AND product_warehouses.warehouse_id = ?", "DOC", warehouse.Id).
-			Order("product_warehouses.created_at DESC").
-			First(&productWarehouse).Error
-
+		productWarehouse, err := s.ProductWarehouseRepo.GetLatestByCategoryCodeAndWarehouseID(
+			c.Context(),
+			"DOC",
+			warehouse.Id,
+			tx,
+		)
 		if err != nil {
 			if errors.Is(err, gorm.ErrRecordNotFound) {
 				return rollback(fiber.NewError(fiber.StatusNotFound, "Product Warehouse not found for the given Project Flock and Warehouse"))

internal/modules/production/project_flocks/dto/projectflock.dto.go

@@ -10,14 +10,16 @@ import (
 	flockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
+	pfutils "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/utils"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 )
 
 type ProjectFlockBaseDTO struct {
-	Id     uint `json:"id"`
-	Period int  `json:"period"`
+	Id        uint   `json:"id"`
+	Period    int    `json:"period"`
+	FlockName string `json:"flock_name"`
 }
 
 type ProjectFlockListDTO struct {
@@ -59,9 +61,9 @@ func ToProjectFlockListDTO(e entity.ProjectFlock) ProjectFlockListDTO {
 	}
 
 	var flockSummary *flockDTO.FlockBaseDTO
-	if e.Flock.Id != 0 {
-		mapped := flockDTO.ToFlockBaseDTO(e.Flock)
-		flockSummary = &mapped
+	if baseName := pfutils.DeriveBaseName(e.FlockName); baseName != "" {
+		summary := flockDTO.FlockBaseDTO{Id: 0, Name: baseName}
+		flockSummary = &summary
 	}
 
 	var areaSummary *areaDTO.AreaBaseDTO
@@ -144,8 +146,9 @@ func defaultProjectFlockLatestApproval(e entity.ProjectFlock) approvalDTO.Approv
 
 func createProjectFlockBaseDTO(e entity.ProjectFlock) ProjectFlockBaseDTO {
 	return ProjectFlockBaseDTO{
-		Id:     e.Id,
-		Period: e.Period,
+		Id:        e.Id,
+		Period:    e.Period,
+		FlockName: e.FlockName,
 	}
 }
 

internal/modules/production/project_flocks/dto/projectflock_kandang.dto.go

@@ -7,6 +7,7 @@ import (
 	flockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
 	kandangDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/dto"
 	locationDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/locations/dto"
+	pfutils "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/utils"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
 )
 
@@ -48,15 +49,16 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 
 		pfLocal := ProjectFlockWithPivotDTO{
 			ProjectFlockBaseDTO: ProjectFlockBaseDTO{
-				Id:     e.ProjectFlock.Id,
-				Period: e.ProjectFlock.Period,
+				Id:        e.ProjectFlock.Id,
+				Period:    e.ProjectFlock.Period,
+				FlockName: e.ProjectFlock.FlockName,
 			},
 			Category: e.ProjectFlock.Category,
 		}
 
-		if e.ProjectFlock.Flock.Id != 0 {
-			mapped := ToFlockSummaryDTO(e.ProjectFlock.Flock)
-			pfLocal.Flock = &mapped
+		if base := pfutils.DeriveBaseName(e.ProjectFlock.FlockName); base != "" {
+			summary := flockDTO.FlockBaseDTO{Id: 0, Name: base}
+			pfLocal.Flock = &summary
 		}
 		if e.ProjectFlock.Area.Id != 0 {
 			mapped := areaDTO.ToAreaBaseDTO(e.ProjectFlock.Area)
@@ -75,11 +77,6 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 			pfLocal.CreatedUser = &mapped
 		}
 
-		pivotMap := make(map[uint]uint)
-		for _, ph := range e.ProjectFlock.KandangHistory {
-			pivotMap[ph.KandangId] = ph.Id
-		}
-
 		for _, k := range e.ProjectFlock.Kandangs {
 			kb := kandangDTO.ToKandangBaseDTO(k)
 			pfLocal.Kandangs = append(pfLocal.Kandangs, KandangWithPivotDTO{

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

@@ -3,19 +3,30 @@ package repository
 import (
 	"context"
 	"errors"
+	"fmt"
+	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/validations"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 )
 
+const baseNameExpression = "LOWER(TRIM(regexp_replace(flock_name, '\\\\s+\\\\d+(\\\\s+\\\\d+)*$', '', 'g')))"
+
 type ProjectflockRepository interface {
 	repository.BaseRepository[entity.ProjectFlock]
-	GetAllByFlock(ctx context.Context, flockID uint) ([]entity.ProjectFlock, error)
-	GetActiveByFlock(ctx context.Context, flockID uint) (*entity.ProjectFlock, error)
-	GetMaxPeriodByFlock(ctx context.Context, flockID uint) (int, error)
-	GetNextPeriodForFlock(ctx context.Context, flockID uint) (int, error)
+	GetAllByBaseName(ctx context.Context, baseName string) ([]entity.ProjectFlock, error)
+	GetActiveByBaseName(ctx context.Context, baseName string) (*entity.ProjectFlock, error)
+	GetMaxPeriodByBaseName(ctx context.Context, baseName string) (int, error)
+	GetNextSequenceForBase(ctx context.Context, baseName string) (int, error)
+	GetAllWithFilters(ctx context.Context, offset, limit int, params *validation.Query) ([]entity.ProjectFlock, int64, error)
+	WithDefaultRelations() func(*gorm.DB) *gorm.DB
+	ExistsByFlockName(ctx context.Context, flockName string, excludeID *uint) (bool, error)
+	AreaExists(ctx context.Context, id uint) (bool, error)
+	FcrExists(ctx context.Context, id uint) (bool, error)
+	LocationExists(ctx context.Context, id uint) (bool, error)
 }
 
 type ProjectflockRepositoryImpl struct {
@@ -28,11 +39,11 @@ func NewProjectflockRepository(db *gorm.DB) ProjectflockRepository {
 	}
 }
 
-func (r *ProjectflockRepositoryImpl) GetAllByFlock(ctx context.Context, flockID uint) ([]entity.ProjectFlock, error) {
+func (r *ProjectflockRepositoryImpl) GetAllByBaseName(ctx context.Context, baseName string) ([]entity.ProjectFlock, error) {
 	var records []entity.ProjectFlock
 	if err := r.DB().WithContext(ctx).
 		Unscoped().
-		Where("flock_id = ?", flockID).
+		Where(baseNameExpression+" = LOWER(?)", baseName).
 		Order("period ASC").
 		Find(&records).Error; err != nil {
 		return nil, err
@@ -40,10 +51,10 @@ func (r *ProjectflockRepositoryImpl) GetAllByFlock(ctx context.Context, flockID
 	return records, nil
 }
 
-func (r *ProjectflockRepositoryImpl) GetActiveByFlock(ctx context.Context, flockID uint) (*entity.ProjectFlock, error) {
+func (r *ProjectflockRepositoryImpl) GetActiveByBaseName(ctx context.Context, baseName string) (*entity.ProjectFlock, error) {
 	var record entity.ProjectFlock
 	err := r.DB().WithContext(ctx).
-		Where("flock_id = ?", flockID).
+		Where(baseNameExpression+" = LOWER(?)", baseName).
 		Order("period DESC").
 		First(&record).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -55,11 +66,11 @@ func (r *ProjectflockRepositoryImpl) GetActiveByFlock(ctx context.Context, flock
 	return &record, nil
 }
 
-func (r *ProjectflockRepositoryImpl) GetMaxPeriodByFlock(ctx context.Context, flockID uint) (int, error) {
+func (r *ProjectflockRepositoryImpl) GetMaxPeriodByBaseName(ctx context.Context, baseName string) (int, error) {
 	var max int
 	if err := r.DB().WithContext(ctx).
 		Model(&entity.ProjectFlock{}).
-		Where("flock_id = ?", flockID).
+		Where(baseNameExpression+" = LOWER(?)", baseName).
 		Select("COALESCE(MAX(period), 0)").
 		Scan(&max).Error; err != nil {
 		return 0, err
@@ -67,13 +78,13 @@ func (r *ProjectflockRepositoryImpl) GetMaxPeriodByFlock(ctx context.Context, fl
 	return max, nil
 }
 
-func (r *ProjectflockRepositoryImpl) GetNextPeriodForFlock(ctx context.Context, flockID uint) (int, error) {
+func (r *ProjectflockRepositoryImpl) GetNextSequenceForBase(ctx context.Context, baseName string) (int, error) {
 	var payload struct {
 		Period int
 	}
 	if err := r.DB().WithContext(ctx).
 		Model(&entity.ProjectFlock{}).
-		Where("flock_id = ?", flockID).
+		Where(baseNameExpression+" = LOWER(?)", baseName).
 		Clauses(clause.Locking{Strength: "UPDATE"}).
 		Order("period DESC").
 		Limit(1).
@@ -86,3 +97,164 @@ func (r *ProjectflockRepositoryImpl) GetNextPeriodForFlock(ctx context.Context,
 	}
 	return payload.Period + 1, nil
 }
+
+func (r *ProjectflockRepositoryImpl) GetAllWithFilters(ctx context.Context, offset, limit int, params *validation.Query) ([]entity.ProjectFlock, int64, error) {
+	return r.GetAll(ctx, offset, limit, func(db *gorm.DB) *gorm.DB {
+		db = r.withDefaultRelations(db)
+		return r.applyQueryFilters(db, params)
+	})
+}
+
+func (r *ProjectflockRepositoryImpl) WithDefaultRelations() func(*gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		return r.withDefaultRelations(db)
+	}
+}
+
+func (r *ProjectflockRepositoryImpl) withDefaultRelations(db *gorm.DB) *gorm.DB {
+	return db.
+		Preload("CreatedUser").
+		Preload("Area").
+		Preload("Fcr").
+		Preload("Location").
+		Preload("Kandangs")
+}
+
+func (r *ProjectflockRepositoryImpl) applyQueryFilters(db *gorm.DB, params *validation.Query) *gorm.DB {
+	if params == nil {
+		return db
+	}
+
+	if params.AreaId > 0 {
+		db = db.Where("project_flocks.area_id = ?", params.AreaId)
+	}
+	if params.LocationId > 0 {
+		db = db.Where("project_flocks.location_id = ?", params.LocationId)
+	}
+	if params.Period > 0 {
+		db = db.Where("project_flocks.period = ?", params.Period)
+	}
+	if len(params.KandangIds) > 0 {
+		db = db.Where(`
+        EXISTS (
+            SELECT 1
+            FROM project_flock_kandangs pfk
+            WHERE pfk.project_flock_id = project_flocks.id
+              AND pfk.kandang_id IN ?
+        )`, params.KandangIds)
+	}
+
+	db = r.applySearchFilters(db, params.Search)
+
+	for _, expr := range r.buildOrderExpressions(params.SortBy, params.SortOrder) {
+		db = db.Order(expr)
+	}
+
+	return db
+}
+
+func (r *ProjectflockRepositoryImpl) applySearchFilters(db *gorm.DB, rawSearch string) *gorm.DB {
+	if rawSearch == "" {
+		return db
+	}
+
+	normalized := strings.ToLower(strings.TrimSpace(rawSearch))
+	if normalized == "" {
+		return db
+	}
+
+	likeQuery := "%" + normalized + "%"
+	return db.
+		Joins("LEFT JOIN areas ON areas.id = project_flocks.area_id").
+		Joins("LEFT JOIN fcrs ON fcrs.id = project_flocks.fcr_id").
+		Joins("LEFT JOIN locations ON locations.id = project_flocks.location_id").
+		Joins("LEFT JOIN users AS created_users ON created_users.id = project_flocks.created_by").
+		Where(`
+			LOWER(areas.name) LIKE ?
+            OR LOWER(project_flocks.category) LIKE ?
+			OR LOWER(fcrs.name) LIKE ?
+			OR LOWER(locations.name) LIKE ?
+			OR LOWER(locations.address) LIKE ?
+			OR LOWER(created_users.name) LIKE ?
+			OR LOWER(created_users.email) LIKE ?
+			OR LOWER(project_flocks.flock_name) LIKE ?
+			OR LOWER(TRIM(regexp_replace(project_flocks.flock_name, '\\s+\\d+(\\s+\\d+)*$', '', 'g'))) LIKE ?
+			OR LOWER(CAST(project_flocks.period AS TEXT)) LIKE ?
+			OR EXISTS (
+				SELECT 1 FROM kandangs
+				WHERE kandangs.project_flock_id = project_flocks.id
+				AND LOWER(kandangs.name) LIKE ?
+			)
+		`,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+			likeQuery,
+		)
+}
+
+func (r *ProjectflockRepositoryImpl) AreaExists(ctx context.Context, id uint) (bool, error) {
+	return repository.Exists[entity.Area](ctx, r.DB(), id)
+}
+
+func (r *ProjectflockRepositoryImpl) FcrExists(ctx context.Context, id uint) (bool, error) {
+	return repository.Exists[entity.Fcr](ctx, r.DB(), id)
+}
+
+func (r *ProjectflockRepositoryImpl) LocationExists(ctx context.Context, id uint) (bool, error) {
+	return repository.Exists[entity.Location](ctx, r.DB(), id)
+}
+
+func (r *ProjectflockRepositoryImpl) buildOrderExpressions(sortBy, sortOrder string) []string {
+	direction := "ASC"
+	if strings.ToLower(sortOrder) == "desc" {
+		direction = "DESC"
+	}
+
+	switch sortBy {
+	case "area":
+		return []string{
+			fmt.Sprintf("(SELECT name FROM areas WHERE areas.id = project_flocks.area_id) %s", direction),
+			fmt.Sprintf("project_flocks.id %s", direction),
+		}
+	case "location":
+		return []string{
+			fmt.Sprintf("(SELECT name FROM locations WHERE locations.id = project_flocks.location_id) %s", direction),
+			fmt.Sprintf("project_flocks.id %s", direction),
+		}
+	case "kandangs":
+		return []string{
+			fmt.Sprintf("(SELECT COUNT(*) FROM project_flock_kandangs pfk WHERE pfk.project_flock_id = project_flocks.id) %s", direction),
+			fmt.Sprintf("project_flocks.id %s", direction),
+		}
+	case "period":
+		return []string{
+			fmt.Sprintf("project_flocks.period %s", direction),
+			fmt.Sprintf("project_flocks.id %s", direction),
+		}
+	default:
+		return []string{
+			"project_flocks.created_at DESC",
+			"project_flocks.updated_at DESC",
+		}
+	}
+}
+
+func (r *ProjectflockRepositoryImpl) ExistsByFlockName(ctx context.Context, flockName string, excludeID *uint) (bool, error) {
+	var count int64
+	q := r.DB().WithContext(ctx).Model(&entity.ProjectFlock{}).Where("flock_name = ?", flockName)
+	if excludeID != nil && *excludeID != 0 {
+		q = q.Where("id <> ?", *excludeID)
+	}
+	if err := q.Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}

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

@@ -13,6 +13,9 @@ type ProjectFlockKandangRepository interface {
 	CreateMany(ctx context.Context, records []*entity.ProjectFlockKandang) error
 	DeleteMany(ctx context.Context, projectFlockID uint, kandangIDs []uint) error
 	GetAll(ctx context.Context) ([]entity.ProjectFlockKandang, error)
+	ListExistingKandangIDs(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]uint, error)
+	HasKandangsLinkedToOtherProject(ctx context.Context, kandangIDs []uint, exceptProjectID *uint) (bool, error)
+	FindKandangsWithRecordings(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]entity.Kandang, error)
 	WithTx(tx *gorm.DB) ProjectFlockKandangRepository
 	DB() *gorm.DB
 }
@@ -45,7 +48,6 @@ func (r *projectFlockKandangRepositoryImpl) GetAll(ctx context.Context) ([]entit
 	var records []entity.ProjectFlockKandang
 	if err := r.db.WithContext(ctx).
 		Preload("ProjectFlock").
-		Preload("ProjectFlock.Flock").
 		Preload("ProjectFlock.Fcr").
 		Preload("ProjectFlock.Area").
 		Preload("ProjectFlock.Location").
@@ -72,7 +74,6 @@ func (r *projectFlockKandangRepositoryImpl) GetByID(ctx context.Context, id uint
 	record := new(entity.ProjectFlockKandang)
 	if err := r.db.WithContext(ctx).
 		Preload("ProjectFlock").
-		Preload("ProjectFlock.Flock").
 		Preload("ProjectFlock.Fcr").
 		Preload("ProjectFlock.Area").
 		Preload("ProjectFlock.Location").
@@ -91,7 +92,6 @@ func (r *projectFlockKandangRepositoryImpl) GetByProjectFlockAndKandang(ctx cont
 	if err := r.db.WithContext(ctx).
 		Where("project_flock_id = ? AND kandang_id = ?", projectFlockID, kandangID).
 		Preload("ProjectFlock").
-		Preload("ProjectFlock.Flock").
 		Preload("ProjectFlock.Fcr").
 		Preload("ProjectFlock.Area").
 		Preload("ProjectFlock.Location").
@@ -104,3 +104,48 @@ func (r *projectFlockKandangRepositoryImpl) GetByProjectFlockAndKandang(ctx cont
 	}
 	return record, nil
 }
+
+func (r *projectFlockKandangRepositoryImpl) ListExistingKandangIDs(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]uint, error) {
+	if len(kandangIDs) == 0 {
+		return nil, nil
+	}
+	var existing []uint
+	err := r.db.WithContext(ctx).
+		Table("project_flock_kandangs").
+		Where("project_flock_id = ? AND kandang_id IN ?", projectFlockID, kandangIDs).
+		Pluck("kandang_id", &existing).Error
+	return existing, err
+}
+
+func (r *projectFlockKandangRepositoryImpl) HasKandangsLinkedToOtherProject(ctx context.Context, kandangIDs []uint, exceptProjectID *uint) (bool, error) {
+	if len(kandangIDs) == 0 {
+		return false, nil
+	}
+	q := r.db.WithContext(ctx).
+		Table("project_flock_kandangs").
+		Where("kandang_id IN ?", kandangIDs)
+	if exceptProjectID != nil {
+		q = q.Where("project_flock_id <> ?", *exceptProjectID)
+	}
+	var count int64
+	if err := q.Count(&count).Error; err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func (r *projectFlockKandangRepositoryImpl) FindKandangsWithRecordings(ctx context.Context, projectFlockID uint, kandangIDs []uint) ([]entity.Kandang, error) {
+	if len(kandangIDs) == 0 {
+		return nil, nil
+	}
+	var kandangs []entity.Kandang
+	err := r.db.WithContext(ctx).
+		Table("recordings AS r").
+		Select("pfk.kandang_id AS id, COALESCE(k.name, '') AS name").
+		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
+		Joins("LEFT JOIN kandangs AS k ON k.id = pfk.kandang_id").
+		Where("pfk.project_flock_id = ? AND pfk.kandang_id IN ?", projectFlockID, kandangIDs).
+		Group("pfk.kandang_id, k.name").
+		Scan(&kandangs).Error
+	return kandangs, err
+}

internal/modules/production/project_flocks/services/projectflock.service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strconv"
 	"strings"
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
@@ -14,6 +15,7 @@ import (
 	kandangRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/kandangs/repositories"
 	warehouseRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/repositories"
 	repository "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
+	pfutils "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/utils"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/validations"
 	utils "gitlab.com/mbugroup/lti-api.git/internal/utils"
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
@@ -29,24 +31,24 @@ type ProjectflockService interface {
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.ProjectFlock, error)
 	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.ProjectFlock, error)
-	DeleteOne(ctx *fiber.Ctx, id uint) error
-	GetProjectFlockKandangByProjectAndKandang(ctx *fiber.Ctx, projectFlockID uint, kandangID uint) (*entity.ProjectFlockKandang, error)
 	GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID uint) (float64, error)
+	DeleteOne(ctx *fiber.Ctx, id uint) error
+	GetProjectFlockKandangByProjectAndKandang(ctx *fiber.Ctx, projectFlockID uint, kandangID uint) (*entity.ProjectFlockKandang, float64, error)
 	GetFlockPeriodSummary(ctx *fiber.Ctx, flockID uint) (*FlockPeriodSummary, error)
 	Approval(ctx *fiber.Ctx, req *validation.Approve) ([]entity.ProjectFlock, error)
 }
 
 type projectflockService struct {
-	Log                     *logrus.Logger
-	Validate                *validator.Validate
-	Repository              repository.ProjectflockRepository
-	FlockRepo               flockRepository.FlockRepository
-	KandangRepo             kandangRepository.KandangRepository
-	WarehouseRepo           warehouseRepository.WarehouseRepository
-	ProductWarehouseRepo    productWarehouseRepository.ProductWarehouseRepository
-	PivotRepo        repository.ProjectFlockKandangRepository
-	ApprovalSvc             commonSvc.ApprovalService
-	approvalWorkflow        approvalutils.ApprovalWorkflowKey
+	Log                  *logrus.Logger
+	Validate             *validator.Validate
+	Repository           repository.ProjectflockRepository
+	FlockRepo            flockRepository.FlockRepository
+	KandangRepo          kandangRepository.KandangRepository
+	WarehouseRepo        warehouseRepository.WarehouseRepository
+	ProductWarehouseRepo productWarehouseRepository.ProductWarehouseRepository
+	PivotRepo            repository.ProjectFlockKandangRepository
+	ApprovalSvc          commonSvc.ApprovalService
+	approvalWorkflow     approvalutils.ApprovalWorkflowKey
 }
 
 type FlockPeriodSummary struct {
@@ -65,29 +67,19 @@ func NewProjectflockService(
 	validate *validator.Validate,
 ) ProjectflockService {
 	return &projectflockService{
-		Log:                     utils.Log,
-		Validate:                validate,
-		Repository:              repo,
-		FlockRepo:               flockRepo,
-		KandangRepo:             kandangRepo,
-		WarehouseRepo:           warehouseRepo,
-		ProductWarehouseRepo:    productWarehouseRepo,
-		PivotRepo:        pivotRepo,
-		ApprovalSvc:             approvalSvc,
-		approvalWorkflow:        utils.ApprovalWorkflowProjectFlock,
+		Log:                  utils.Log,
+		Validate:             validate,
+		Repository:           repo,
+		FlockRepo:            flockRepo,
+		KandangRepo:          kandangRepo,
+		WarehouseRepo:        warehouseRepo,
+		ProductWarehouseRepo: productWarehouseRepo,
+		PivotRepo:            pivotRepo,
+		ApprovalSvc:          approvalSvc,
+		approvalWorkflow:     utils.ApprovalWorkflowProjectFlock,
 	}
 }
 
-func (s projectflockService) withRelations(db *gorm.DB) *gorm.DB {
-	return db.
-		Preload("CreatedUser").
-		Preload("Flock").
-		Preload("Area").
-		Preload("Fcr").
-		Preload("Location").
-		Preload("Kandangs")
-}
-
 func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, err
@@ -102,79 +94,11 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 
 	offset := (params.Page - 1) * params.Limit
 
-	projectflocks, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
-		db = s.withRelations(db)
-
-		if params.AreaId > 0 {
-			db = db.Where("project_flocks.area_id = ?", params.AreaId)
-		}
-		if params.LocationId > 0 {
-			db = db.Where("project_flocks.location_id = ?", params.LocationId)
-		}
-		if params.Period > 0 {
-			db = db.Where("project_flocks.period = ?", params.Period)
-		}
-		if len(params.KandangIds) > 0 {
-			db = db.Where(`
-        EXISTS (
-            SELECT 1
-            FROM project_flock_kandangs pfk
-            WHERE pfk.project_flock_id = project_flocks.id
-              AND pfk.kandang_id IN ?
-        )`, params.KandangIds)
-		}
-		if params.Search != "" {
-			normalizedSearch := strings.ToLower(strings.TrimSpace(params.Search))
-			if normalizedSearch == "" {
-				for _, expr := range s.buildOrderExpressions(params.SortBy, params.SortOrder) {
-					db = db.Order(expr)
-				}
-				return db
-			}
-			likeQuery := "%" + normalizedSearch + "%"
-			db = db.
-				Joins("LEFT JOIN flocks ON flocks.id = project_flocks.flock_id").
-				Joins("LEFT JOIN areas ON areas.id = project_flocks.area_id").
-				Joins("LEFT JOIN fcrs ON fcrs.id = project_flocks.fcr_id").
-				Joins("LEFT JOIN locations ON locations.id = project_flocks.location_id").
-				Joins("LEFT JOIN users AS created_users ON created_users.id = project_flocks.created_by").
-				Where(`
-					LOWER(flocks.name) LIKE ?
-					OR LOWER(areas.name) LIKE ?
-					OR LOWER(project_flocks.category) LIKE ?
-					OR LOWER(fcrs.name) LIKE ?
-					OR LOWER(locations.name) LIKE ?
-					OR LOWER(locations.address) LIKE ?
-					OR LOWER(created_users.name) LIKE ?
-					OR LOWER(created_users.email) LIKE ?
-					OR LOWER(CAST(project_flocks.period AS TEXT)) LIKE ?
-					OR EXISTS (
-						SELECT 1 FROM kandangs
-						WHERE kandangs.project_flock_id = project_flocks.id
-						AND LOWER(kandangs.name) LIKE ?
-					)
-				`,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-					likeQuery,
-				)
-		}
-		for _, expr := range s.buildOrderExpressions(params.SortBy, params.SortOrder) {
-			db = db.Order(expr)
-		}
-		return db
-	})
+	projectflocks, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, params)
 
 	if err != nil {
 		s.Log.Errorf("Failed to get projectflocks: %+v", err)
-		return nil, 0, err
+		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flocks")
 	}
 
 	if s.ApprovalSvc != nil && len(projectflocks) > 0 {
@@ -201,13 +125,13 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 }
 
 func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, error) {
-	projectflock, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	projectflock, err := s.Repository.GetByID(c.Context(), id, s.Repository.WithDefaultRelations())
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 	}
 	if err != nil {
 		s.Log.Errorf("Failed get projectflock by id: %+v", err)
-		return nil, err
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
 	}
 
 	if s.ApprovalSvc != nil {
@@ -243,15 +167,28 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 		return nil, fiber.NewError(fiber.StatusBadRequest, "kandang_ids is required")
 	}
 
+	baseName := strings.TrimSpace(req.FlockName)
+	if baseName == "" {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Flock name cannot be empty")
+	}
+
 	if err := commonSvc.EnsureRelations(c.Context(),
-		commonSvc.RelationCheck{Name: "Flock", ID: &req.FlockId, Exists: relationExistsChecker[entity.Flock](s.Repository.DB())},
-		commonSvc.RelationCheck{Name: "Area", ID: &req.AreaId, Exists: relationExistsChecker[entity.Area](s.Repository.DB())},
-		commonSvc.RelationCheck{Name: "FCR", ID: &req.FcrId, Exists: relationExistsChecker[entity.Fcr](s.Repository.DB())},
-		commonSvc.RelationCheck{Name: "Location", ID: &req.LocationId, Exists: relationExistsChecker[entity.Location](s.Repository.DB())},
+		commonSvc.RelationCheck{Name: "Area", ID: &req.AreaId, Exists: s.Repository.AreaExists},
+		commonSvc.RelationCheck{Name: "FCR", ID: &req.FcrId, Exists: s.Repository.FcrExists},
+		commonSvc.RelationCheck{Name: "Location", ID: &req.LocationId, Exists: s.Repository.LocationExists},
 	); err != nil {
 		return nil, err
 	}
 
+	canonicalBase := baseName
+	if s.FlockRepo != nil {
+		baseFlock, err := s.ensureFlockByName(c.Context(), baseName)
+		if err != nil {
+			return nil, err
+		}
+		canonicalBase = baseFlock.Name
+	}
+
 	kandangIDs := uniqueUintSlice(req.KandangIds)
 	kandangs, err := s.KandangRepo.GetByIDs(c.Context(), kandangIDs, nil)
 	if err != nil {
@@ -264,14 +201,14 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 		return nil, fiber.NewError(fiber.StatusNotFound, "Some kandangs not found")
 	}
 	// larang kalau ada yg sudah terikat ke project lain
-	if linked, err := s.anyKandangLinkedToOtherProject(c.Context(), s.Repository.DB(), kandangIDs, nil); err != nil {
+	if linked, err := s.pivotRepo().HasKandangsLinkedToOtherProject(c.Context(), kandangIDs, nil); err != nil {
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate kandangs linkage")
 	} else if linked {
 		return nil, fiber.NewError(fiber.StatusConflict, "Beberapa kandang sudah terikat dengan project flock lain")
 	}
 
 	createBody := &entity.ProjectFlock{
-		FlockId:    req.FlockId,
+		FlockName:  "",
 		AreaId:     req.AreaId,
 		Category:   cat,
 		FcrId:      req.FcrId,
@@ -282,11 +219,16 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 		projectRepo := repository.NewProjectflockRepository(dbTransaction)
 
-		period, err := projectRepo.GetNextPeriodForFlock(c.Context(), req.FlockId)
+		nextSeq, err := projectRepo.GetNextSequenceForBase(c.Context(), canonicalBase)
 		if err != nil {
 			return err
 		}
-		createBody.Period = period
+		generatedName, seq, err := s.generateSequentialFlockName(c.Context(), projectRepo, canonicalBase, nextSeq, nil)
+		if err != nil {
+			return err
+		}
+		createBody.FlockName = generatedName
+		createBody.Period = seq
 
 		if err := projectRepo.CreateOne(c.Context(), createBody, nil); err != nil {
 			return err
@@ -312,11 +254,14 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 	})
 
 	if err != nil {
+		if fiberErr, ok := err.(*fiber.Error); ok {
+			return nil, fiberErr
+		}
 		if errors.Is(err, gorm.ErrDuplicatedKey) {
 			return nil, fiber.NewError(fiber.StatusConflict, "Project flock period already exists")
 		}
 		s.Log.Errorf("Failed to create projectflock: %+v", err)
-		return nil, err
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to create project flock")
 	}
 
 	return s.GetOne(c, createBody.Id)
@@ -327,7 +272,7 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 		return nil, err
 	}
 
-	existing, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	existing, err := s.Repository.GetByID(c.Context(), id, s.Repository.WithDefaultRelations())
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 	}
@@ -338,15 +283,28 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 	updateBody := make(map[string]any)
 	hasBodyChanges := false
 	var relationChecks []commonSvc.RelationCheck
+	existingBase := pfutils.DeriveBaseName(existing.FlockName)
+	targetBaseName := existingBase
+	needFlockNameRegenerate := false
 
-	if req.FlockId != nil {
-		updateBody["flock_id"] = *req.FlockId
-		hasBodyChanges = true
-		relationChecks = append(relationChecks, commonSvc.RelationCheck{
-			Name:   "Flock",
-			ID:     req.FlockId,
-			Exists: relationExistsChecker[entity.Flock](s.Repository.DB()),
-		})
+	if req.FlockName != nil {
+		trimmed := strings.TrimSpace(*req.FlockName)
+		if trimmed == "" {
+			return nil, fiber.NewError(fiber.StatusBadRequest, "Flock name cannot be empty")
+		}
+		canonicalBase := trimmed
+		if s.FlockRepo != nil {
+			flockEntity, err := s.ensureFlockByName(c.Context(), trimmed)
+			if err != nil {
+				return nil, err
+			}
+			canonicalBase = flockEntity.Name
+		}
+		if !strings.EqualFold(canonicalBase, existingBase) {
+			needFlockNameRegenerate = true
+			targetBaseName = canonicalBase
+			hasBodyChanges = true
+		}
 	}
 	if req.AreaId != nil {
 		updateBody["area_id"] = *req.AreaId
@@ -354,7 +312,7 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 		relationChecks = append(relationChecks, commonSvc.RelationCheck{
 			Name:   "Area",
 			ID:     req.AreaId,
-			Exists: relationExistsChecker[entity.Area](s.Repository.DB()),
+			Exists: s.Repository.AreaExists,
 		})
 	}
 	if req.Category != nil {
@@ -371,7 +329,7 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 		relationChecks = append(relationChecks, commonSvc.RelationCheck{
 			Name:   "FCR",
 			ID:     req.FcrId,
-			Exists: relationExistsChecker[entity.Fcr](s.Repository.DB()),
+			Exists: s.Repository.FcrExists,
 		})
 	}
 	if req.LocationId != nil {
@@ -380,7 +338,7 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 		relationChecks = append(relationChecks, commonSvc.RelationCheck{
 			Name:   "Location",
 			ID:     req.LocationId,
-			Exists: relationExistsChecker[entity.Location](s.Repository.DB()),
+			Exists: s.Repository.LocationExists,
 		})
 	}
 
@@ -408,7 +366,7 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 		if len(kandangs) != len(newKandangIDs) {
 			return nil, fiber.NewError(fiber.StatusNotFound, "Some kandangs not found")
 		}
-		if linked, err := s.anyKandangLinkedToOtherProject(c.Context(), s.Repository.DB(), newKandangIDs, &id); err != nil {
+		if linked, err := s.pivotRepo().HasKandangsLinkedToOtherProject(c.Context(), newKandangIDs, &id); err != nil {
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate kandangs linkage")
 		} else if linked {
 			return nil, fiber.NewError(fiber.StatusConflict, "Beberapa kandang sudah terikat dengan project flock lain")
@@ -424,6 +382,29 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 		projectRepo := repository.NewProjectflockRepository(dbTransaction)
 
+		baseForGeneration := targetBaseName
+		if strings.TrimSpace(baseForGeneration) == "" {
+			baseForGeneration = existingBase
+		}
+		if strings.TrimSpace(baseForGeneration) == "" {
+			baseForGeneration = strings.TrimSpace(existing.FlockName)
+		}
+
+		if needFlockNameRegenerate {
+			nextSeq, err := projectRepo.GetNextSequenceForBase(c.Context(), baseForGeneration)
+			if err != nil {
+				return err
+			}
+			newName, seq, err := s.generateSequentialFlockName(c.Context(), projectRepo, baseForGeneration, nextSeq, &id)
+			if err != nil {
+				return err
+			}
+			updateBody["flock_name"] = newName
+			if seq != existing.Period {
+				updateBody["period"] = seq
+			}
+		}
+
 		if len(updateBody) > 0 {
 			if err := projectRepo.PatchOne(c.Context(), id, updateBody, nil); err != nil {
 				return err
@@ -512,7 +493,10 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 			return nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 		}
 		s.Log.Errorf("Failed to update projectflock %d: %+v", id, err)
-		return nil, err
+		if errors.Is(err, gorm.ErrDuplicatedKey) {
+			return nil, fiber.NewError(fiber.StatusConflict, "Project flock period already exists")
+		}
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to update project flock")
 	}
 
 	return s.GetOne(c, id)
@@ -616,7 +600,7 @@ func (s projectflockService) Approval(c *fiber.Ctx, req *validation.Approve) ([]
 }
 
 func (s projectflockService) DeleteOne(c *fiber.Ctx, id uint) error {
-	existing, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
+	existing, err := s.Repository.GetByID(c.Context(), id, s.Repository.WithDefaultRelations())
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 	}
@@ -650,22 +634,70 @@ func (s projectflockService) DeleteOne(c *fiber.Ctx, id uint) error {
 			return fiberErr
 		}
 		s.Log.Errorf("Failed to delete projectflock %d: %+v", id, err)
-		return err
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to delete project flock")
 	}
 
 	return nil
 }
 
-func (s projectflockService) GetProjectFlockKandangByProjectAndKandang(ctx *fiber.Ctx, projectFlockID uint, kandangID uint) (*entity.ProjectFlockKandang, error) {
+func (s projectflockService) GetProjectFlockKandangByProjectAndKandang(ctx *fiber.Ctx, projectFlockID uint, kandangID uint) (*entity.ProjectFlockKandang, float64, error) {
 
 	pfk, err := s.PivotRepo.GetByProjectFlockAndKandang(ctx.Context(), projectFlockID, kandangID)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
+			return nil, 0, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
 		}
-		return nil, err
+		s.Log.Errorf("Failed to fetch project_flock_kandang by project %d and kandang %d: %+v", projectFlockID, kandangID, err)
+		return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
 	}
-	return pfk, nil
+
+	availableQuantity, err := s.GetAvailableDocQuantity(ctx, pfk.KandangId)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	return pfk, availableQuantity, nil
+}
+
+func (s projectflockService) GetProjectFlockKandangByParams(ctx *fiber.Ctx, idStr string, projectFlockIdStr string, kandangIdStr string) (*entity.ProjectFlockKandang, float64, error) {
+	idStr = strings.TrimSpace(idStr)
+	projectFlockIdStr = strings.TrimSpace(projectFlockIdStr)
+	kandangIdStr = strings.TrimSpace(kandangIdStr)
+
+	if idStr != "" {
+		id, err := strconv.Atoi(idStr)
+		if err != nil || id <= 0 {
+			return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
+		}
+		pfk, err := s.PivotRepo.GetByID(ctx.Context(), uint(id))
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return nil, 0, fiber.NewError(fiber.StatusNotFound, "ProjectFlockKandang not found")
+			}
+			s.Log.Errorf("Failed to fetch project_flock_kandang %d: %+v", id, err)
+			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
+		}
+
+		availableQuantity, err := s.GetAvailableDocQuantity(ctx, pfk.KandangId)
+		if err != nil {
+			return nil, 0, err
+		}
+
+		return pfk, availableQuantity, nil
+	}
+
+	if projectFlockIdStr == "" || kandangIdStr == "" {
+		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Missing lookup parameters")
+	}
+	pfid, err := strconv.Atoi(projectFlockIdStr)
+	if err != nil || pfid <= 0 {
+		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
+	}
+	kid, err := strconv.Atoi(kandangIdStr)
+	if err != nil || kid <= 0 {
+		return nil, 0, fiber.NewError(fiber.StatusBadRequest, "Invalid kandang_id")
+	}
+	return s.GetProjectFlockKandangByProjectAndKandang(ctx, uint(pfid), uint(kid))
 }
 
 func (s projectflockService) GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID uint) (float64, error) {
@@ -675,14 +707,7 @@ func (s projectflockService) GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID u
 		return 0, err
 	}
 
-	var productWarehouses []entity.ProductWarehouse
-	err = s.ProductWarehouseRepo.DB().
-		WithContext(ctx.Context()).
-		Joins("JOIN products ON products.id = product_warehouses.product_id").
-		Joins("JOIN product_categories ON product_categories.id = products.product_category_id").
-		Where("product_categories.code = ? AND product_warehouses.warehouse_id = ?", "DOC", wh.Id).
-		Order("created_at DESC").
-		Find(&productWarehouses).Error
+	productWarehouses, err := s.ProductWarehouseRepo.GetByCategoryCodeAndWarehouseID(ctx.Context(), "DOC", wh.Id)
 	if err != nil {
 		return 0, err
 	}
@@ -706,7 +731,7 @@ func (s projectflockService) GetFlockPeriodSummary(c *fiber.Ctx, flockID uint) (
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch flock")
 	}
 
-	maxPeriod, err := s.Repository.GetMaxPeriodByFlock(c.Context(), flockID)
+	maxPeriod, err := s.Repository.GetMaxPeriodByBaseName(c.Context(), flock.Name)
 	if err != nil {
 		s.Log.Errorf("Failed to compute next period for flock %d: %+v", flockID, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to compute next period")
@@ -731,45 +756,64 @@ func uniqueUintSlice(values []uint) []uint {
 	return result
 }
 
-func relationExistsChecker[T any](db *gorm.DB) func(context.Context, uint) (bool, error) {
-	return func(ctx context.Context, id uint) (bool, error) {
-		return commonRepo.Exists[T](ctx, db, id)
+func (s projectflockService) generateSequentialFlockName(ctx context.Context, repo repository.ProjectflockRepository, baseName string, startNumber int, excludeID *uint) (string, int, error) {
+	name := strings.TrimSpace(baseName)
+	if name == "" {
+		return "", 0, fiber.NewError(fiber.StatusBadRequest, "Base flock name cannot be empty")
+	}
+
+	number := startNumber
+	if number <= 0 {
+		number = 1
+	}
+
+	attempts := 0
+	for {
+		candidate := fmt.Sprintf("%s %03d", name, number)
+		exists, err := repo.ExistsByFlockName(ctx, candidate, excludeID)
+		if err != nil {
+			s.Log.Errorf("Failed checking project flock name uniqueness for %q: %+v", candidate, err)
+			return "", 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to generate flock name")
+		}
+		if !exists {
+			return candidate, number, nil
+		}
+		number++
+		attempts++
+		if attempts > 9999 {
+			return "", 0, fiber.NewError(fiber.StatusInternalServerError, "Unable to generate unique flock name")
+		}
 	}
 }
 
-func (s projectflockService) buildOrderExpressions(sortBy, sortOrder string) []string {
-	direction := "ASC"
-	if strings.ToLower(sortOrder) == "desc" {
-		direction = "DESC"
+func (s projectflockService) ensureFlockByName(ctx context.Context, name string) (*entity.Flock, error) {
+	trimmed := strings.TrimSpace(name)
+	if trimmed == "" {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Flock name cannot be empty")
 	}
 
-	switch sortBy {
-	case "area":
-		return []string{
-			fmt.Sprintf("(SELECT name FROM areas WHERE areas.id = project_flocks.area_id) %s", direction),
-			fmt.Sprintf("project_flocks.id %s", direction),
-		}
-	case "location":
-		return []string{
-			fmt.Sprintf("(SELECT name FROM locations WHERE locations.id = project_flocks.location_id) %s", direction),
-			fmt.Sprintf("project_flocks.id %s", direction),
-		}
-	case "kandangs":
-		return []string{
-			fmt.Sprintf("(SELECT COUNT(*) FROM project_flock_kandangs pfk WHERE pfk.project_flock_id = project_flocks.id) %s", direction),
-			fmt.Sprintf("project_flocks.id %s", direction),
-		}
-	case "period":
-		return []string{
-			fmt.Sprintf("project_flocks.period %s", direction),
-			fmt.Sprintf("project_flocks.id %s", direction),
-		}
-	default:
-		return []string{
-			"project_flocks.created_at DESC",
-			"project_flocks.updated_at DESC",
-		}
+	flock, err := s.FlockRepo.GetByName(ctx, trimmed)
+	if err == nil {
+		return flock, nil
 	}
+	if !errors.Is(err, gorm.ErrRecordNotFound) {
+		s.Log.Errorf("Failed to fetch flock by name %q: %+v", trimmed, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to prepare flock data")
+	}
+
+	newFlock := &entity.Flock{
+		Name:      trimmed,
+		CreatedBy: 1, // TODO: replace with authenticated user
+	}
+	if err := s.FlockRepo.CreateOne(ctx, newFlock, nil); err != nil {
+		if errors.Is(err, gorm.ErrDuplicatedKey) {
+			return s.FlockRepo.GetByName(ctx, trimmed)
+		}
+		s.Log.Errorf("Failed to create flock %q: %+v", trimmed, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to prepare flock data")
+	}
+
+	return newFlock, nil
 }
 
 func (s projectflockService) attachKandangs(ctx context.Context, dbTransaction *gorm.DB, projectFlockID uint, kandangIDs []uint) error {
@@ -777,20 +821,12 @@ func (s projectflockService) attachKandangs(ctx context.Context, dbTransaction *
 		return nil
 	}
 
-	if err := dbTransaction.
-		Model(&entity.Kandang{}).
-		Where("id IN ?", kandangIDs).
-		Updates(map[string]any{
-			"status": string(utils.KandangStatusPengajuan),
-		}).Error; err != nil {
+	if err := s.kandangRepoWithTx(dbTransaction).UpdateStatusByIDs(ctx, kandangIDs, utils.KandangStatusPengajuan); err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to update kandangs status")
 	}
 
-	var already []uint
-	if err := dbTransaction.
-		Table("project_flock_kandangs").
-		Where("project_flock_id = ? AND kandang_id IN ?", projectFlockID, kandangIDs).
-		Pluck("kandang_id", &already).Error; err != nil {
+	already, err := s.pivotRepoWithTx(dbTransaction).ListExistingKandangIDs(ctx, projectFlockID, kandangIDs)
+	if err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to check existing pivot")
 	}
 	exists := make(map[uint]struct{}, len(already))
@@ -799,7 +835,7 @@ func (s projectflockService) attachKandangs(ctx context.Context, dbTransaction *
 	}
 
 	var toAttach []uint
-	seen := make(map[uint]struct{}, len(kandangIDs)) 
+	seen := make(map[uint]struct{}, len(kandangIDs))
 	for _, id := range kandangIDs {
 		if _, ok := seen[id]; ok {
 			continue
@@ -821,6 +857,9 @@ func (s projectflockService) attachKandangs(ctx context.Context, dbTransaction *
 		})
 	}
 	if err := s.pivotRepoWithTx(dbTransaction).CreateMany(ctx, records); err != nil {
+		if errors.Is(err, gorm.ErrDuplicatedKey) {
+			return fiber.NewError(fiber.StatusConflict, "Beberapa kandang sudah terhubung dengan project flock ini")
+		}
 		return fiber.NewError(fiber.StatusInternalServerError, "Failed to persist project flock history")
 	}
 	return nil
@@ -831,13 +870,25 @@ func (s projectflockService) detachKandangs(ctx context.Context, dbTransaction *
 		return nil
 	}
 
+	blocked, err := s.pivotRepoWithTx(dbTransaction).FindKandangsWithRecordings(ctx, projectFlockID, kandangIDs)
+	if err != nil {
+		s.Log.Errorf("Failed to check recordings before detaching kandangs: %+v", err)
+		return fiber.NewError(fiber.StatusInternalServerError, "Failed to validate kandang detachment")
+	}
+	if len(blocked) > 0 {
+		names := make([]string, 0, len(blocked))
+		for _, item := range blocked {
+			label := fmt.Sprintf("ID %d", item.Id)
+			if strings.TrimSpace(item.Name) != "" {
+				label = fmt.Sprintf("%s (%s)", label, item.Name)
+			}
+			names = append(names, label)
+		}
+		return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Tidak dapat melepas kandang karena sudah memiliki recording: %s", strings.Join(names, ", ")))
+	}
+
 	if resetStatus {
-		if err := dbTransaction.
-			Model(&entity.Kandang{}).
-			Where("id IN ?", kandangIDs).
-			Updates(map[string]any{
-				"status": string(utils.KandangStatusNonActive),
-			}).Error; err != nil {
+		if err := s.kandangRepoWithTx(dbTransaction).UpdateStatusByIDs(ctx, kandangIDs, utils.KandangStatusNonActive); err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, "Failed to update kandangs status")
 		}
 	}
@@ -849,23 +900,25 @@ func (s projectflockService) detachKandangs(ctx context.Context, dbTransaction *
 }
 
 func (s projectflockService) pivotRepoWithTx(dbTransaction *gorm.DB) repository.ProjectFlockKandangRepository {
-	if s.PivotRepo == nil {
-		return repository.NewProjectFlockKandangRepository(dbTransaction)
+	if dbTransaction == nil {
+		return s.pivotRepo()
 	}
-	return s.PivotRepo.WithTx(dbTransaction)
+	return s.pivotRepo().WithTx(dbTransaction)
 }
 
-func (s projectflockService) anyKandangLinkedToOtherProject(ctx context.Context, db *gorm.DB, kandangIDs []uint, exceptProjectID *uint) (bool, error) {
-	q := db.WithContext(ctx).
-		Table("project_flock_kandangs").
-		Where("kandang_id IN ?", kandangIDs)
-	if exceptProjectID != nil {
-		q = q.Where("project_flock_id <> ?", *exceptProjectID)
+func (s projectflockService) pivotRepo() repository.ProjectFlockKandangRepository {
+	if s.PivotRepo != nil {
+		return s.PivotRepo
 	}
-	var count int64
-	if err := q.Count(&count).Error; err != nil {
-		return false, err
-	}
-	return count > 0, nil
+	return repository.NewProjectFlockKandangRepository(s.Repository.DB())
 }
 
+func (s projectflockService) kandangRepoWithTx(tx *gorm.DB) kandangRepository.KandangRepository {
+	if tx != nil {
+		return kandangRepository.NewKandangRepository(tx)
+	}
+	if s.KandangRepo != nil {
+		return s.KandangRepo
+	}
+	return kandangRepository.NewKandangRepository(s.Repository.DB())
+}

internal/modules/production/project_flocks/utils/base_name.go

@@ -0,0 +1,25 @@
+package utils
+
+import (
+	"strconv"
+	"strings"
+)
+
+// DeriveBaseName removes trailing numeric tokens from the flock name.
+func DeriveBaseName(name string) string {
+	trimmed := strings.TrimSpace(name)
+	if trimmed == "" {
+		return ""
+	}
+
+	parts := strings.Fields(trimmed)
+	for len(parts) > 0 {
+		if _, err := strconv.Atoi(parts[len(parts)-1]); err == nil {
+			parts = parts[:len(parts)-1]
+			continue
+		}
+		break
+	}
+
+	return strings.TrimSpace(strings.Join(parts, " "))
+}

internal/modules/production/project_flocks/validations/projectflock.validation.go

@@ -1,7 +1,7 @@
 package validation
 
 type Create struct {
-	FlockId    uint   `json:"flock_id" validate:"required_strict,number,gt=0"`
+	FlockName  string `json:"flock_name" validate:"required_strict"`
 	AreaId     uint   `json:"area_id" validate:"required_strict,number,gt=0"`
 	Category   string `json:"category" validate:"required_strict"`
 	FcrId      uint   `json:"fcr_id" validate:"required_strict,number,gt=0"`
@@ -10,7 +10,7 @@ type Create struct {
 }
 
 type Update struct {
-	FlockId    *uint   `json:"flock_id,omitempty" validate:"omitempty,number,gt=0"`
+	FlockName  *string `json:"flock_name,omitempty" validate:"omitempty"`
 	AreaId     *uint   `json:"area_id,omitempty" validate:"omitempty,number,gt=0"`
 	Category   *string `json:"category,omitempty" validate:"omitempty"`
 	FcrId      *uint   `json:"fcr_id,omitempty" validate:"omitempty,number,gt=0"`

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

@@ -146,6 +146,60 @@ func (u *RecordingController) UpdateOne(c *fiber.Ctx) error {
 		})
 }
 
+func (u *RecordingController) SubmitGrading(c *fiber.Ctx) error {
+	req := new(validation.SubmitGrading)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	result, err := u.RecordingService.SubmitGrading(c, req)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Submit grading eggs successfully",
+			Data:    dto.ToRecordingDetailDTO(*result),
+		})
+}
+
+func (u *RecordingController) Approve(c *fiber.Ctx) error {
+	req := new(validation.Approve)
+
+	if err := c.BodyParser(req); err != nil {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid request body")
+	}
+
+	results, err := u.RecordingService.Approval(c, req)
+	if err != nil {
+		return err
+	}
+
+	var (
+		data    interface{}
+		message = "Submit recording approvals successfully"
+	)
+
+	if len(results) == 1 {
+		message = "Submit recording approval successfully"
+		data = dto.ToRecordingDetailDTO(results[0])
+	} else {
+		data = dto.ToRecordingListDTOs(results)
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: message,
+			Data:    data,
+		})
+}
+
 func (u *RecordingController) DeleteOne(c *fiber.Ctx) error {
 	param := c.Params("id")
 

internal/modules/production/recordings/dto/recording.dto.go

@@ -1,30 +1,34 @@
 package dto
 
 import (
+	"math"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	approvalDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/approvals/dto"
 	userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 )
 
 // === DTO Structs ===
 
 type RecordingBaseDTO struct {
-	Id                    uint       `json:"id"`
-	ProjectFlockKandangId uint       `json:"project_flock_kandang_id"`
-	RecordDatetime        time.Time  `json:"record_datetime"`
-	RecordDate            *time.Time `json:"record_date,omitempty"`
-	Ontime                bool       `json:"ontime"`
-	Day                   *int       `json:"day,omitempty"`
-	TotalDepletion        *int       `json:"total_depletion,omitempty"`
-	CumDepletionRate      *float64   `json:"cum_depletion_rate,omitempty"`
-	DailyGain             *float64   `json:"daily_gain,omitempty"`
-	AvgDailyGain          *float64   `json:"avg_daily_gain,omitempty"`
-	CumIntake             *int64     `json:"cum_intake,omitempty"`
-	FcrValue              *float64   `json:"fcr_value,omitempty"`
-	TotalChick            *int64     `json:"total_chick,omitempty"`
-	DailyDepletionRate    *float64   `json:"daily_depletion_rate,omitempty"`
-	CumDepletion          *int       `json:"cum_depletion,omitempty"`
+	Id                    uint                        `json:"id"`
+	ProjectFlockKandangId uint                        `json:"project_flock_kandang_id"`
+	RecordDatetime        time.Time                   `json:"record_datetime"`
+	Day                   *int                        `json:"day,omitempty"`
+	ProjectFlockCategory  *string                     `json:"project_flock_category,omitempty"`
+	TotalDepletionQty     *float64                    `json:"total_depletion_qty,omitempty"`
+	CumDepletionRate      *float64                    `json:"cum_depletion_rate,omitempty"`
+	DailyGain             *float64                    `json:"daily_gain,omitempty"`
+	AvgDailyGain          *float64                    `json:"avg_daily_gain,omitempty"`
+	CumIntake             *int                        `json:"cum_intake,omitempty"`
+	FcrValue              *float64                    `json:"fcr_value,omitempty"`
+	TotalChickQty         *float64                    `json:"total_chick_qty,omitempty"`
+	Approval              approvalDTO.ApprovalBaseDTO `json:"approval"`
+	EggGradingStatus      *string                     `json:"egg_grading_status,omitempty"`
+	EggGradingPendingQty  *int                        `json:"egg_grading_pending_qty,omitempty"`
 }
 
 type RecordingListDTO struct {
@@ -39,30 +43,35 @@ type RecordingDetailDTO struct {
 	BodyWeights []RecordingBodyWeightDTO `json:"body_weights"`
 	Depletions  []RecordingDepletionDTO  `json:"depletions"`
 	Stocks      []RecordingStockDTO      `json:"stocks"`
+	Eggs        []RecordingEggDTO        `json:"eggs"`
 }
 
 type RecordingBodyWeightDTO struct {
-	Weight float64 `json:"weight"`
-	Qty    int     `json:"qty"`
-	Notes  *string `json:"notes,omitempty"`
+	AvgWeight   float64 `json:"avg_weight"`
+	Qty         float64 `json:"qty"`
+	TotalWeight float64 `json:"total_weight"`
 }
 
 type RecordingDepletionDTO struct {
 	ProductWarehouseId uint                          `json:"product_warehouse_id"`
-	Total              int64                         `json:"total"`
-	Notes              *string                       `json:"notes,omitempty"`
+	Qty                float64                       `json:"qty"`
 	ProductWarehouse   *RecordingProductWarehouseDTO `json:"product_warehouse,omitempty"`
 }
 
 type RecordingStockDTO struct {
 	ProductWarehouseId uint                          `json:"product_warehouse_id"`
-	Increase           *float64                      `json:"increase,omitempty"`
-	Decrease           *float64                      `json:"decrease,omitempty"`
-	UsageAmount        *int64                        `json:"usage_amount,omitempty"`
-	Notes              *string                       `json:"notes,omitempty"`
+	UsageAmount        *float64                      `json:"usage_amount,omitempty"`
+	PendingQty         *float64                      `json:"pending_qty,omitempty"`
 	ProductWarehouse   *RecordingProductWarehouseDTO `json:"product_warehouse,omitempty"`
 }
 
+type RecordingEggDTO struct {
+	ProductWarehouseId uint                          `json:"product_warehouse_id"`
+	Qty                int                           `json:"qty"`
+	ProductWarehouse   *RecordingProductWarehouseDTO `json:"product_warehouse,omitempty"`
+	Gradings           []RecordingEggGradingDTO      `json:"gradings,omitempty"`
+}
+
 type RecordingProductWarehouseDTO struct {
 	Id            uint   `json:"id"`
 	ProductId     uint   `json:"product_id"`
@@ -71,36 +80,46 @@ type RecordingProductWarehouseDTO struct {
 	WarehouseName string `json:"warehouse_name"`
 }
 
+type RecordingEggGradingDTO struct {
+	Grade string  `json:"grade,omitempty"`
+	Qty   float64 `json:"qty"`
+}
+
 // === Mapper Functions ===
 
 func ToRecordingBaseDTO(e entity.Recording) RecordingBaseDTO {
-	recordDate := e.RecordDate
-	if recordDate == nil {
-		rd := time.Date(
-			e.RecordDatetime.Year(),
-			e.RecordDatetime.Month(),
-			e.RecordDatetime.Day(),
-			0, 0, 0, 0,
-			e.RecordDatetime.Location(),
-		)
-		recordDate = &rd
+	var projectFlockCategory *string
+	if e.ProjectFlockKandang != nil && e.ProjectFlockKandang.ProjectFlock.Id != 0 {
+		category := e.ProjectFlockKandang.ProjectFlock.Category
+		if category != "" {
+			projectFlockCategory = &category
+		}
 	}
+
+	latestApproval := defaultRecordingLatestApproval(e)
+	if e.LatestApproval != nil {
+		snapshot := approvalDTO.ToApprovalDTO(*e.LatestApproval)
+		latestApproval = snapshot
+	}
+
+	gradingStatus, gradingPending := computeEggGradingStatus(e)
+
 	return RecordingBaseDTO{
 		Id:                    e.Id,
 		ProjectFlockKandangId: e.ProjectFlockKandangId,
 		RecordDatetime:        e.RecordDatetime,
-		RecordDate:            recordDate,
-		Ontime:                e.Ontime == 1,
 		Day:                   e.Day,
-		TotalDepletion:        e.TotalDepletion,
+		ProjectFlockCategory:  projectFlockCategory,
+		TotalDepletionQty:     e.TotalDepletionQty,
 		CumDepletionRate:      e.CumDepletionRate,
 		DailyGain:             e.DailyGain,
 		AvgDailyGain:          e.AvgDailyGain,
 		CumIntake:             e.CumIntake,
 		FcrValue:              e.FcrValue,
-		TotalChick:            e.TotalChick,
-		DailyDepletionRate:    e.DailyDepletionRate,
-		CumDepletion:          e.CumDepletion,
+		TotalChickQty:         e.TotalChickQty,
+		Approval:              latestApproval,
+		EggGradingStatus:      gradingStatus,
+		EggGradingPendingQty:  gradingPending,
 	}
 }
 
@@ -133,6 +152,7 @@ func ToRecordingDetailDTO(e entity.Recording) RecordingDetailDTO {
 		BodyWeights:      ToRecordingBodyWeightDTOs(e.BodyWeights),
 		Depletions:       ToRecordingDepletionDTOs(e.Depletions),
 		Stocks:           ToRecordingStockDTOs(e.Stocks),
+		Eggs:             ToRecordingEggDTOs(e.Eggs),
 	}
 }
 
@@ -140,9 +160,9 @@ func ToRecordingBodyWeightDTOs(bodyWeights []entity.RecordingBW) []RecordingBody
 	result := make([]RecordingBodyWeightDTO, len(bodyWeights))
 	for i, bw := range bodyWeights {
 		result[i] = RecordingBodyWeightDTO{
-			Weight: bw.Weight,
-			Qty:    bw.Qty,
-			Notes:  bw.Notes,
+			AvgWeight:   bw.AvgWeight,
+			Qty:         bw.Qty,
+			TotalWeight: bw.TotalWeight,
 		}
 	}
 	return result
@@ -153,8 +173,7 @@ func ToRecordingDepletionDTOs(depletions []entity.RecordingDepletion) []Recordin
 	for i, d := range depletions {
 		result[i] = RecordingDepletionDTO{
 			ProductWarehouseId: d.ProductWarehouseId,
-			Total:              d.Total,
-			Notes:              d.Notes,
+			Qty:                d.Qty,
 			ProductWarehouse:   toRecordingProductWarehouseDTO(&d.ProductWarehouse),
 		}
 	}
@@ -166,16 +185,43 @@ func ToRecordingStockDTOs(stocks []entity.RecordingStock) []RecordingStockDTO {
 	for i, s := range stocks {
 		result[i] = RecordingStockDTO{
 			ProductWarehouseId: s.ProductWarehouseId,
-			Increase:           s.Increase,
-			Decrease:           s.Decrease,
-			UsageAmount:        s.UsageAmount,
-			Notes:              s.Notes,
+			UsageAmount:        s.UsageQty,
+			PendingQty:         s.PendingQty,
 			ProductWarehouse:   toRecordingProductWarehouseDTO(&s.ProductWarehouse),
 		}
 	}
 	return result
 }
 
+func ToRecordingEggDTOs(eggs []entity.RecordingEgg) []RecordingEggDTO {
+	result := make([]RecordingEggDTO, len(eggs))
+	for i, egg := range eggs {
+		result[i] = RecordingEggDTO{
+			ProductWarehouseId: egg.ProductWarehouseId,
+			Qty:                egg.Qty,
+			ProductWarehouse:   toRecordingProductWarehouseDTO(&egg.ProductWarehouse),
+			Gradings:           ToRecordingEggGradingDTOs(egg.GradingEggs),
+		}
+	}
+	return result
+}
+
+func ToRecordingEggGradingDTOs(gradings []entity.GradingEgg) []RecordingEggGradingDTO {
+	if len(gradings) == 0 {
+		return nil
+	}
+
+	result := make([]RecordingEggGradingDTO, len(gradings))
+	for i, grading := range gradings {
+		result[i] = RecordingEggGradingDTO{
+			Grade: grading.Grade,
+			Qty:   grading.Qty,
+		}
+	}
+
+	return result
+}
+
 func toRecordingProductWarehouseDTO(pw *entity.ProductWarehouse) *RecordingProductWarehouseDTO {
 	if pw == nil || pw.Id == 0 {
 		return nil
@@ -196,3 +242,57 @@ func toRecordingProductWarehouseDTO(pw *entity.ProductWarehouse) *RecordingProdu
 
 	return &dto
 }
+
+func computeEggGradingStatus(e entity.Recording) (*string, *int) {
+	if len(e.Eggs) == 0 {
+		return nil, nil
+	}
+
+	totalEggs := 0
+	totalGraded := 0.0
+	for _, egg := range e.Eggs {
+		totalEggs += egg.Qty
+		for _, grading := range egg.GradingEggs {
+			totalGraded += grading.Qty
+		}
+	}
+
+	if totalEggs == 0 {
+		return nil, nil
+	}
+
+	pending := float64(totalEggs) - totalGraded
+
+	if pending > 0.5 {
+		status := "GRADING_TELUR"
+		pendingInt := int(math.Round(pending))
+		return &status, &pendingInt
+	}
+
+	status := "GRADING_SELESAI"
+	zero := 0
+	return &status, &zero
+}
+
+func defaultRecordingLatestApproval(e entity.Recording) approvalDTO.ApprovalBaseDTO {
+	result := approvalDTO.ApprovalBaseDTO{}
+
+	step := utils.RecordingStepPengajuan
+	result.StepNumber = uint16(step)
+	if label, ok := approvalutils.ApprovalStepName(utils.ApprovalWorkflowRecording, step); ok {
+		result.StepName = label
+	} else if label, ok := utils.RecordingApprovalSteps[step]; ok {
+		result.StepName = label
+	}
+
+	if e.CreatedUser != nil && e.CreatedUser.Id != 0 {
+		result.ActionBy = userDTO.ToUserBaseDTO(*e.CreatedUser)
+	} else if e.CreatedBy != 0 {
+		result.ActionBy = userDTO.UserBaseDTO{
+			Id:     e.CreatedBy,
+			IdUser: int64(e.CreatedBy),
+		}
+	}
+
+	return result
+}

internal/modules/production/recordings/module.go

@@ -1,14 +1,19 @@
 package recordings
 
 import (
+	"fmt"
+
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"gorm.io/gorm"
 
+	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
+	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	rProductWarehouse "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
-	rProjectFlockKandang "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
+	rProjectFlock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/repositories"
 	rRecording "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
 	sRecording "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/services"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
 	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
 	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -18,11 +23,26 @@ type RecordingModule struct{}
 
 func (RecordingModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
 	recordingRepo := rRecording.NewRecordingRepository(db)
-	projectFlockKandangRepo := rProjectFlockKandang.NewProjectFlockKandangRepository(db)
+	projectFlockKandangRepo := rProjectFlock.NewProjectFlockKandangRepository(db)
+	projectFlockPopulationRepo := rProjectFlock.NewProjectFlockPopulationRepository(db)
 	productWarehouseRepo := rProductWarehouse.NewProductWarehouseRepository(db)
+	approvalRepo := commonRepo.NewApprovalRepository(db)
+	approvalService := commonSvc.NewApprovalService(approvalRepo)
+	if err := approvalService.RegisterWorkflowSteps(utils.ApprovalWorkflowRecording, utils.RecordingApprovalSteps); err != nil {
+		panic(fmt.Sprintf("failed to register recording approval workflow: %v", err))
+	}
+
 	userRepo := rUser.NewUserRepository(db)
 
-	recordingService := sRecording.NewRecordingService(recordingRepo, projectFlockKandangRepo, productWarehouseRepo, validate)
+	recordingService := sRecording.NewRecordingService(
+		recordingRepo,
+		projectFlockKandangRepo,
+		productWarehouseRepo,
+		projectFlockPopulationRepo,
+		approvalRepo,
+		approvalService,
+		validate,
+	)
 	userService := sUser.NewUserService(userRepo, validate)
 
 	RecordingRoutes(router, userService, recordingService)

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

@@ -1,10 +1,12 @@
 package repository
 
 import (
+	"context"
 	"errors"
 	"math"
 	"sort"
 	"strings"
+	"time"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -22,11 +24,22 @@ type RecordingRepository interface {
 
 	CreateStocks(tx *gorm.DB, stocks []entity.RecordingStock) error
 	DeleteStocks(tx *gorm.DB, recordingID uint) error
+	ListStocks(tx *gorm.DB, recordingID uint) ([]entity.RecordingStock, error)
 
 	CreateDepletions(tx *gorm.DB, depletions []entity.RecordingDepletion) error
 	DeleteDepletions(tx *gorm.DB, recordingID uint) error
+	ListDepletions(tx *gorm.DB, recordingID uint) ([]entity.RecordingDepletion, error)
 
-	SumRecordingDepletions(tx *gorm.DB, recordingID uint) (int64, error)
+	CreateEggs(tx *gorm.DB, eggs []entity.RecordingEgg) error
+	DeleteEggs(tx *gorm.DB, recordingID uint) error
+	ListEggs(tx *gorm.DB, recordingID uint) ([]entity.RecordingEgg, error)
+	GetRecordingEggByID(ctx context.Context, id uint, modifier func(*gorm.DB) *gorm.DB) (*entity.RecordingEgg, error)
+	CreateGradingEggs(tx *gorm.DB, gradings []entity.GradingEgg) error
+	DeleteGradingEggs(tx *gorm.DB, recordingEggID uint) error
+
+	ExistsOnDate(ctx context.Context, projectFlockKandangId uint, recordTime time.Time) (bool, error)
+
+	SumRecordingDepletions(tx *gorm.DB, recordingID uint) (float64, error)
 	FindPreviousRecording(tx *gorm.DB, projectFlockKandangId uint, currentDay int) (*entity.Recording, error)
 	GetTotalChick(tx *gorm.DB, projectFlockKandangId uint) (int64, error)
 	GetAverageBodyWeight(tx *gorm.DB, recordingID uint) (float64, error)
@@ -58,13 +71,18 @@ func (r *RecordingRepositoryImpl) WithRelations(db *gorm.DB) *gorm.DB {
 		Preload("Stocks").
 		Preload("Stocks.ProductWarehouse").
 		Preload("Stocks.ProductWarehouse.Product").
-		Preload("Stocks.ProductWarehouse.Warehouse")
+		Preload("Stocks.ProductWarehouse.Warehouse").
+		Preload("Eggs").
+		Preload("Eggs.ProductWarehouse").
+		Preload("Eggs.ProductWarehouse.Product").
+		Preload("Eggs.ProductWarehouse.Warehouse").
+		Preload("Eggs.GradingEggs")
 }
 
 func (r *RecordingRepositoryImpl) GenerateNextDay(tx *gorm.DB, projectFlockKandangId uint) (int, error) {
 	var days []int
 	if err := tx.Model(&entity.Recording{}).
-		Where("project_flock_id = ?", projectFlockKandangId).
+		Where("project_flock_kandangs_id = ?", projectFlockKandangId).
 		Where("day IS NOT NULL").
 		Pluck("day", &days).Error; err != nil {
 		return 0, err
@@ -94,6 +112,14 @@ func (r *RecordingRepositoryImpl) DeleteStocks(tx *gorm.DB, recordingID uint) er
 	return tx.Where("recording_id = ?", recordingID).Delete(&entity.RecordingStock{}).Error
 }
 
+func (r *RecordingRepositoryImpl) ListStocks(tx *gorm.DB, recordingID uint) ([]entity.RecordingStock, error) {
+	var items []entity.RecordingStock
+	if err := tx.Where("recording_id = ?", recordingID).Find(&items).Error; err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 func (r *RecordingRepositoryImpl) CreateDepletions(tx *gorm.DB, depletions []entity.RecordingDepletion) error {
 	if len(depletions) == 0 {
 		return nil
@@ -105,11 +131,100 @@ func (r *RecordingRepositoryImpl) DeleteDepletions(tx *gorm.DB, recordingID uint
 	return tx.Where("recording_id = ?", recordingID).Delete(&entity.RecordingDepletion{}).Error
 }
 
-func (r *RecordingRepositoryImpl) SumRecordingDepletions(tx *gorm.DB, recordingID uint) (int64, error) {
-	var result int64
+func (r *RecordingRepositoryImpl) ListDepletions(tx *gorm.DB, recordingID uint) ([]entity.RecordingDepletion, error) {
+	var items []entity.RecordingDepletion
+	if err := tx.Where("recording_id = ?", recordingID).Find(&items).Error; err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+func (r *RecordingRepositoryImpl) CreateEggs(tx *gorm.DB, eggs []entity.RecordingEgg) error {
+	if len(eggs) == 0 {
+		return nil
+	}
+	return tx.Create(&eggs).Error
+}
+
+func (r *RecordingRepositoryImpl) DeleteEggs(tx *gorm.DB, recordingID uint) error {
+	return tx.Where("recording_id = ?", recordingID).Delete(&entity.RecordingEgg{}).Error
+}
+
+func (r *RecordingRepositoryImpl) ListEggs(tx *gorm.DB, recordingID uint) ([]entity.RecordingEgg, error) {
+	var items []entity.RecordingEgg
+	if err := tx.Where("recording_id = ?", recordingID).Find(&items).Error; err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
+func (r *RecordingRepositoryImpl) GetRecordingEggByID(
+	ctx context.Context,
+	id uint,
+	modifier func(*gorm.DB) *gorm.DB,
+) (*entity.RecordingEgg, error) {
+	if id == 0 {
+		return nil, gorm.ErrRecordNotFound
+	}
+
+	db := r.DB()
+	if modifier != nil {
+		db = modifier(db)
+	}
+
+	var egg entity.RecordingEgg
+	query := db.WithContext(ctx).
+		Preload("Recording").
+		Preload("Recording.ProjectFlockKandang").
+		Preload("Recording.ProjectFlockKandang.ProjectFlock").
+		Preload("ProductWarehouse").
+		Preload("GradingEggs").
+		Where("id = ?", id)
+
+	if err := query.First(&egg).Error; err != nil {
+		return nil, err
+	}
+	return &egg, nil
+}
+
+func (r *RecordingRepositoryImpl) CreateGradingEggs(tx *gorm.DB, gradings []entity.GradingEgg) error {
+	if len(gradings) == 0 {
+		return nil
+	}
+	return tx.Create(&gradings).Error
+}
+
+func (r *RecordingRepositoryImpl) DeleteGradingEggs(tx *gorm.DB, recordingEggID uint) error {
+	return tx.Where("recording_egg_id = ?", recordingEggID).Delete(&entity.GradingEgg{}).Error
+}
+
+func (r *RecordingRepositoryImpl) ExistsOnDate(ctx context.Context, projectFlockKandangId uint, recordTime time.Time) (bool, error) {
+	if projectFlockKandangId == 0 {
+		return false, nil
+	}
+
+	ref := recordTime.In(time.UTC)
+	startOfDay := time.Date(ref.Year(), ref.Month(), ref.Day(), 0, 0, 0, 0, time.UTC)
+	endOfDay := startOfDay.Add(24 * time.Hour)
+
+	var count int64
+	err := r.DB().
+		WithContext(ctx).
+		Model(&entity.Recording{}).
+		Where("project_flock_kandangs_id = ?", projectFlockKandangId).
+		Where("record_datetime >= ? AND record_datetime < ?", startOfDay, endOfDay).
+		Count(&count).Error
+	if err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
+func (r *RecordingRepositoryImpl) SumRecordingDepletions(tx *gorm.DB, recordingID uint) (float64, error) {
+	var result float64
 	if err := tx.Model(&entity.RecordingDepletion{}).
 		Where("recording_id = ?", recordingID).
-		Select("COALESCE(SUM(total), 0)").
+		Select("COALESCE(SUM(qty), 0)").
 		Scan(&result).Error; err != nil {
 		return 0, err
 	}
@@ -123,7 +238,7 @@ func (r *RecordingRepositoryImpl) FindPreviousRecording(tx *gorm.DB, projectFloc
 
 	var prev entity.Recording
 	err := tx.
-		Where("project_flock_id = ? AND day < ?", projectFlockKandangId, currentDay).
+		Where("project_flock_kandangs_id = ? AND day < ?", projectFlockKandangId, currentDay).
 		Where("day IS NOT NULL").
 		Order("day DESC").
 		Limit(1).
@@ -159,7 +274,7 @@ func (r *RecordingRepositoryImpl) GetAverageBodyWeight(tx *gorm.DB, recordingID
 		TotalQty    float64
 	}
 	if err := tx.Model(&entity.RecordingBW{}).
-		Select("COALESCE(SUM(weight * qty), 0) AS total_weight, COALESCE(SUM(qty), 0) AS total_qty").
+		Select("COALESCE(SUM(total_weight), 0) AS total_weight, COALESCE(SUM(qty), 0) AS total_qty").
 		Where("recording_id = ?", recordingID).
 		Scan(&result).Error; err != nil {
 		return 0, err
@@ -172,13 +287,13 @@ func (r *RecordingRepositoryImpl) GetAverageBodyWeight(tx *gorm.DB, recordingID
 
 func (r *RecordingRepositoryImpl) GetFeedUsageInGrams(tx *gorm.DB, recordingID uint) (float64, error) {
 	var rows []struct {
-		UsageAmount float64
-		UomName     string
+		UsageQty float64
+		UomName  string
 	}
 
 	if err := tx.
 		Table("recording_stocks").
-		Select("COALESCE(recording_stocks.usage_amount, 0) AS usage_amount, LOWER(uoms.name) AS uom_name").
+		Select("COALESCE(recording_stocks.usage_qty, 0) AS usage_qty, LOWER(uoms.name) AS uom_name").
 		Joins("JOIN product_warehouses ON product_warehouses.id = recording_stocks.product_warehouse_id").
 		Joins("JOIN products ON products.id = product_warehouses.product_id").
 		Joins("JOIN uoms ON uoms.id = products.uom_id").
@@ -189,16 +304,16 @@ func (r *RecordingRepositoryImpl) GetFeedUsageInGrams(tx *gorm.DB, recordingID u
 
 	var total float64
 	for _, row := range rows {
-		if row.UsageAmount <= 0 {
+		if row.UsageQty <= 0 {
 			continue
 		}
 		switch strings.TrimSpace(row.UomName) {
 		case "kilogram", "kg", "kilograms", "kilo":
-			total += row.UsageAmount * 1000
+			total += row.UsageQty * 1000
 		case "gram", "g", "grams":
-			total += row.UsageAmount
+			total += row.UsageQty
 		default:
-			total += row.UsageAmount
+			total += row.UsageQty
 		}
 	}
 	return total, nil

internal/modules/production/recordings/route.go

@@ -23,7 +23,9 @@ func RecordingRoutes(v1 fiber.Router, u user.UserService, s recording.RecordingS
 	route.Get("/", ctrl.GetAll)
 	route.Get("/next-day", ctrl.GetNextDay)
 	route.Post("/", ctrl.CreateOne)
+	route.Post("/gradings", ctrl.SubmitGrading)
 	route.Get("/:id", ctrl.GetOne)
 	route.Patch("/:id", ctrl.UpdateOne)
+	route.Post("/approvals", ctrl.Approve)
 	route.Delete("/:id", ctrl.DeleteOne)
 }

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

@@ -2,23 +2,25 @@ package validation
 
 type (
 	BodyWeight struct {
-		Weight float64 `json:"weight" validate:"required"`
-		Qty    int     `json:"qty" validate:"required,number,min=1"`
-		Notes  *string `json:"notes,omitempty" validate:"omitempty"`
+		AvgWeight   float64  `json:"avg_weight" validate:"required"`
+		Qty         float64  `json:"qty" validate:"required,gt=0"`
+		TotalWeight *float64 `json:"total_weight,omitempty" validate:"omitempty,gt=0"`
 	}
 
 	Stock struct {
 		ProductWarehouseId uint     `json:"product_warehouse_id" validate:"required,number,min=1"`
-		Increase           *float64 `json:"increase,omitempty" validate:"omitempty"`
-		Decrease           *float64 `json:"decrease,omitempty" validate:"omitempty"`
-		UsageAmount        *int64   `json:"usage_amount,omitempty" validate:"omitempty,min=0"`
-		Notes              *string  `json:"notes,omitempty" validate:"omitempty"`
+		UsageAmount        *float64 `json:"usage_amount,omitempty" validate:"omitempty,gte=0"`
+		PendingQty         *float64 `json:"pending_qty,omitempty" validate:"omitempty,gte=0"`
 	}
 
 	Depletion struct {
 		ProductWarehouseId uint    `json:"product_warehouse_id" validate:"required,number,min=1"`
-		Total              int64   `json:"total" validate:"required,number,min=0"`
-		Notes              *string `json:"notes,omitempty" validate:"omitempty"`
+		Qty                float64 `json:"qty" validate:"required,gte=0"`
+	}
+
+	Egg struct {
+		ProductWarehouseId uint `json:"product_warehouse_id" validate:"required,number,min=1"`
+		Qty                int  `json:"qty" validate:"required,number,min=0"`
 	}
 )
 
@@ -27,12 +29,14 @@ type Create struct {
 	BodyWeights           []BodyWeight `json:"body_weights,omitempty" validate:"omitempty,dive"`
 	Stocks                []Stock      `json:"stocks,omitempty" validate:"omitempty,dive"`
 	Depletions            []Depletion  `json:"depletions,omitempty" validate:"omitempty,dive"`
+	Eggs                  []Egg        `json:"eggs,omitempty" validate:"omitempty,dive"`
 }
 
 type Update struct {
 	BodyWeights []BodyWeight `json:"body_weights,omitempty" validate:"omitempty,dive"`
 	Stocks      []Stock      `json:"stocks,omitempty" validate:"omitempty,dive"`
 	Depletions  []Depletion  `json:"depletions,omitempty" validate:"omitempty,dive"`
+	Eggs        []Egg        `json:"eggs,omitempty" validate:"omitempty,dive"`
 }
 
 type Query struct {
@@ -40,3 +44,19 @@ type Query struct {
 	Limit                 int  `query:"limit" validate:"omitempty,number,min=1,max=100"`
 	ProjectFlockKandangId uint `query:"project_flock_kandang_id" validate:"omitempty,number,min=1"`
 }
+
+type EggGrading struct {
+	Grade string  `json:"grade" validate:"required"`
+	Qty   float64 `json:"qty" validate:"required,gte=0"`
+}
+
+type SubmitGrading struct {
+	RecordingEggId uint         `json:"recording_egg_id" validate:"required,number,min=1"`
+	EggsGrading    []EggGrading `json:"eggs_grading" validate:"required,dive"`
+}
+
+type Approve struct {
+	Action        string  `json:"action" validate:"required_strict"`
+	ApprovableIds []uint  `json:"approvable_ids" validate:"required_strict,min=1,dive,gt=0"`
+	Notes         *string `json:"notes,omitempty" validate:"omitempty,max=500"`
+}

internal/modules/shared/repositories/stock-logs.repository.go

@@ -13,6 +13,7 @@ type StockLogRepository interface {
 	GetByFlaggable(ctx context.Context, logType string, logId uint) ([]*entity.StockLog, error)
 	GetByProductWarehouse(ctx context.Context, productWarehouseId uint, limit int) ([]*entity.StockLog, error)
 	GetByTransactionType(ctx context.Context, transactionType string, limit int) ([]*entity.StockLog, error)
+	ApplyProductWarehouseFilters(db *gorm.DB, productID, warehouseID uint) *gorm.DB
 }
 
 type StockLogRepositoryImpl struct {
@@ -86,3 +87,20 @@ func (r *StockLogRepositoryImpl) GetByTransactionType(ctx context.Context, trans
 
 	return stockLogs, nil
 }
+
+func (r *StockLogRepositoryImpl) ApplyProductWarehouseFilters(db *gorm.DB, productID, warehouseID uint) *gorm.DB {
+	if productID == 0 && warehouseID == 0 {
+		return db
+	}
+
+	db = db.Joins("JOIN product_warehouses ON product_warehouses.id = stock_logs.product_warehouse_id")
+
+	if productID > 0 {
+		db = db.Where("product_warehouses.product_id = ?", productID)
+	}
+	if warehouseID > 0 {
+		db = db.Where("product_warehouses.warehouse_id = ?", warehouseID)
+	}
+
+	return db
+}

internal/utils/constant.go

@@ -140,6 +140,23 @@ var ProjectFlockApprovalSteps = map[approvalutils.ApprovalStep]string{
 	ProjectFlockStepAktif:     "Aktif",
 }
 
+// -------------------------------------------------------------------
+// Recording Approval
+// -------------------------------------------------------------------
+
+const (
+	ApprovalWorkflowRecording approvalutils.ApprovalWorkflowKey = approvalutils.ApprovalWorkflowKey("RECORDINGS")
+	RecordingStepGradingTelur approvalutils.ApprovalStep        = 1
+	RecordingStepPengajuan    approvalutils.ApprovalStep        = 2
+	RecordingStepDisetujui    approvalutils.ApprovalStep        = 3
+)
+
+var RecordingApprovalSteps = map[approvalutils.ApprovalStep]string{
+	RecordingStepGradingTelur: "Grading-Telur",
+	RecordingStepPengajuan: "Pengajuan",
+	RecordingStepDisetujui: "Disetujui",
+}
+
 // -------------------------------------------------------------------
 // Validators
 // -------------------------------------------------------------------
@@ -268,6 +285,8 @@ func IsValidSupplierCategory(v string) bool {
 
 // example use
 
+// Recording helper
+
 /**
 if !utils.IsValidFlagType(req.FlagName) {
     return fiber.NewError(fiber.StatusBadRequest, "Invalid flag type")

internal/utils/recording/util.recording.go

@@ -0,0 +1,96 @@
+package recording
+
+import (
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/validations"
+)
+
+func MapBodyWeights(recordingID uint, items []validation.BodyWeight) []entity.RecordingBW {
+	if len(items) == 0 {
+		return nil
+	}
+
+	result := make([]entity.RecordingBW, 0, len(items))
+	for _, item := range items {
+		totalWeight := item.TotalWeight
+		if totalWeight == nil {
+			calculated := item.AvgWeight * item.Qty
+			totalWeight = &calculated
+		}
+
+		result = append(result, entity.RecordingBW{
+			RecordingId: recordingID,
+			AvgWeight:   item.AvgWeight,
+			Qty:         item.Qty,
+			TotalWeight: *totalWeight,
+		})
+	}
+	return result
+}
+
+func MapStocks(recordingID uint, items []validation.Stock) []entity.RecordingStock {
+	if len(items) == 0 {
+		return nil
+	}
+
+	result := make([]entity.RecordingStock, 0, len(items))
+	for _, item := range items {
+		result = append(result, entity.RecordingStock{
+			RecordingId:        recordingID,
+			ProductWarehouseId: item.ProductWarehouseId,
+			UsageQty:           item.UsageAmount,
+			PendingQty:         item.PendingQty,
+		})
+	}
+	return result
+}
+
+func MapDepletions(recordingID uint, items []validation.Depletion) []entity.RecordingDepletion {
+	if len(items) == 0 {
+		return nil
+	}
+
+	result := make([]entity.RecordingDepletion, 0, len(items))
+	for _, item := range items {
+		result = append(result, entity.RecordingDepletion{
+			RecordingId:        recordingID,
+			ProductWarehouseId: item.ProductWarehouseId,
+			Qty:                item.Qty,
+		})
+	}
+	return result
+}
+
+func MapEggs(recordingID uint, createdBy uint, items []validation.Egg) []entity.RecordingEgg {
+	if len(items) == 0 {
+		return nil
+	}
+
+	result := make([]entity.RecordingEgg, 0, len(items))
+	for _, item := range items {
+		result = append(result, entity.RecordingEgg{
+			RecordingId:        recordingID,
+			ProductWarehouseId: item.ProductWarehouseId,
+			Qty:                item.Qty,
+			CreatedBy:          createdBy,
+		})
+	}
+	return result
+}
+
+func ToGrams(weight float64) float64 {
+	if weight <= 0 {
+		return 0
+	}
+	if weight < 10 {
+		return weight * 1000
+	}
+	return weight
+}
+
+func GramsToKg(grams float64) float64 {
+	if grams <= 0 {
+		return 0
+	}
+	return grams / 1000
+}