From 7551d11888445d89f02a0aa218a0815f42fbe574 Mon Sep 17 00:00:00 2001
From: MacBook Air M1 <macbookairm1@giovannimbu.local>
Date: Tue, 13 Jan 2026 16:14:11 +0700
Subject: [PATCH] add filter by kandang id sapronak

---
 .../modules/closings/controllers/closing.controller.go   | 9 +++++++++
 internal/modules/closings/services/closing.service.go    | 2 +-
 .../modules/closings/validations/closing.validation.go   | 7 ++++---
 .../repositories/production_result.repository.go         | 1 -
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/internal/modules/closings/controllers/closing.controller.go b/internal/modules/closings/controllers/closing.controller.go
index 8f129521..d837f5d6 100644
--- a/internal/modules/closings/controllers/closing.controller.go
+++ b/internal/modules/closings/controllers/closing.controller.go
@@ -162,6 +162,14 @@ func (u *ClosingController) GetClosingSapronak(c *fiber.Ctx) error {
 		Page:  c.QueryInt("page", 1),
 		Limit: c.QueryInt("limit", 10),
 	}
+	if raw := c.Query("kandang_id"); raw != "" {
+		kandangInt, convErr := strconv.Atoi(raw)
+		if convErr != nil || kandangInt <= 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid kandang_id")
+		}
+		kandangUint := uint(kandangInt)
+		query.KandangID = &kandangUint
+	}
 
 	if query.Page < 1 || query.Limit < 1 {
 		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
@@ -346,6 +354,7 @@ func (u *ClosingController) GetClosingDataProduksi(c *fiber.Ctx) error {
 		}
 		kandangUint := uint(kandangInt)
 		kandangID = &kandangUint
+
 	}
 
 	result, err := u.ClosingService.GetClosingDataProduksi(c, uint(id), kandangID)
diff --git a/internal/modules/closings/services/closing.service.go b/internal/modules/closings/services/closing.service.go
index 76f3e024..d87568b6 100644
--- a/internal/modules/closings/services/closing.service.go
+++ b/internal/modules/closings/services/closing.service.go
@@ -236,7 +236,7 @@ func (s closingService) GetClosingSapronak(c *fiber.Ctx, projectFlockID uint, pa
 
 	var projectFlockKandangIDs []uint
 	if params.Type == validation.SapronakTypeOutgoing {
-		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID, nil)
+		projectFlockKandangIDs, err = s.getProjectFlockKandangIDs(c.Context(), projectFlockID, params.KandangID)
 		if err != nil {
 			s.Log.Errorf("Failed to fetch project flock kandang IDs for project flock %d: %+v", projectFlockID, err)
 			return nil, 0, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
diff --git a/internal/modules/closings/validations/closing.validation.go b/internal/modules/closings/validations/closing.validation.go
index 610e89b8..0c738407 100644
--- a/internal/modules/closings/validations/closing.validation.go
+++ b/internal/modules/closings/validations/closing.validation.go
@@ -20,7 +20,8 @@ const (
 )
 
 type ClosingSapronakQuery struct {
-	Type  string `query:"type" validate:"required,oneof=incoming outgoing"`
-	Page  int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Type      string `query:"type" validate:"required,oneof=incoming outgoing"`
+	Page      int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Limit     int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	KandangID *uint  `query:"kandang_id" validate:"omitempty,gt=0"`
 }
diff --git a/internal/modules/repports/repositories/production_result.repository.go b/internal/modules/repports/repositories/production_result.repository.go
index f2decedf..19007d0f 100644
--- a/internal/modules/repports/repositories/production_result.repository.go
+++ b/internal/modules/repports/repositories/production_result.repository.go
@@ -59,7 +59,6 @@ func (r *productionResultRepositoryImpl) GetRecordingsByProjectFlockKandang(
 	dataQuery := r.db.WithContext(ctx).
 		Model(&entity.Recording{}).
 		Where("project_flock_kandangs_id = ?", projectFlockKandangID).
-		Preload("BodyWeights").
 		Preload("Eggs", func(db *gorm.DB) *gorm.DB {
 			return db.Select("recording_eggs.*, f.name AS product_flag_name").
 				Joins("LEFT JOIN product_warehouses pw ON pw.id = recording_eggs.product_warehouse_id").