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

2026-05-24 07:15:43 +00:00 · 2025-10-31 16:04:22 +07:00
parent f869943573
commit 4b39f52d5a
6 changed files with 188 additions and 82 deletions
@@ -52,8 +52,8 @@ type projectflockService struct {
 }

 type FlockPeriodSummary struct {
-	Flock      entity.Flock
-	NextPeriod int
+    Flock      entity.Flock
+    NextPeriod int
 }

 func NewProjectflockService(
@@ -719,28 +719,57 @@ func (s projectflockService) GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID u
 	return total, nil
 }

-func (s projectflockService) GetFlockPeriodSummary(c *fiber.Ctx, flockID uint) (*FlockPeriodSummary, error) {
-	flock, err := s.FlockRepo.GetByID(c.Context(), flockID, func(db *gorm.DB) *gorm.DB {
-		return db.Preload("CreatedUser")
-	})
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, fiber.NewError(fiber.StatusNotFound, "Flock not found")
-	}
-	if err != nil {
-		s.Log.Errorf("Failed get flock %d for period summary: %+v", flockID, err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch flock")
-	}
+func (s projectflockService) GetFlockPeriodSummary(c *fiber.Ctx, projectFlockKandangID uint) (*FlockPeriodSummary, error) {
+    if projectFlockKandangID == 0 {
+        return nil, fiber.NewError(fiber.StatusBadRequest, "project_flock_kandang_id is required")
+    }

-	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")
-	}
+    pivot, err := s.pivotRepo().GetByID(c.Context(), projectFlockKandangID)
+    if errors.Is(err, gorm.ErrRecordNotFound) {
+        return nil, fiber.NewError(fiber.StatusNotFound, "Project flock kandang not found")
+    }
+    if err != nil {
+        s.Log.Errorf("Failed to fetch project_flock_kandang %d: %+v", projectFlockKandangID, err)
+        return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandang")
+    }

-	return &FlockPeriodSummary{
-		Flock:      *flock,
-		NextPeriod: maxPeriod + 1,
-	}, nil
+    var baseName string
+    var referenceFlock *entity.Flock
+    if pivot.ProjectFlock.Id != 0 {
+        baseName = pfutils.DeriveBaseName(pivot.ProjectFlock.FlockName)
+    }
+
+    if strings.TrimSpace(baseName) != "" {
+        referenceFlock, err = s.FlockRepo.GetByName(c.Context(), baseName)
+        if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+            s.Log.Errorf("Failed to fetch flock %q: %+v", baseName, err)
+            return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch flock")
+        }
+    }
+
+    if referenceFlock == nil {
+        referenceFlock = &entity.Flock{Name: pivot.ProjectFlock.FlockName}
+    }
+
+    maxPeriod := pivot.ProjectFlock.Period
+    if strings.TrimSpace(baseName) != "" {
+        if headerMax, err := s.Repository.GetMaxPeriodByBaseName(c.Context(), baseName); err != nil {
+            s.Log.Warnf("Unable to compute header period for base %q: %+v", baseName, err)
+        } else if headerMax > maxPeriod {
+            maxPeriod = headerMax
+        }
+
+        if pivotMax, err := s.pivotRepo().MaxPeriodByBaseName(c.Context(), baseName); err != nil {
+            s.Log.Warnf("Unable to compute pivot period for base %q: %+v", baseName, err)
+        } else if pivotMax > maxPeriod {
+            maxPeriod = pivotMax
+        }
+    }
+
+    return &FlockPeriodSummary{
+        Flock:      *referenceFlock,
+        NextPeriod: maxPeriod + 1,
+    }, nil
 }

 func uniqueUintSlice(values []uint) []uint {