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 15:25:43 +00:00 · 2025-10-31 16:04:22 +07:00
parent f869943573
commit 4b39f52d5a
6 changed files with 188 additions and 82 deletions
@@ -14,21 +14,22 @@ import (
 // === DTO Structs ===

 type RecordingBaseDTO struct {
-	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"`
+	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"`
+	EggGradingCompletedQty *int                        `json:"egg_grading_completed_qty,omitempty"`
 }

 type RecordingListDTO struct {
@@ -102,24 +103,25 @@ func ToRecordingBaseDTO(e entity.Recording) RecordingBaseDTO {
 		latestApproval = snapshot
 	}

-	gradingStatus, gradingPending := computeEggGradingStatus(e)
+	gradingStatus, gradingPending, gradingCompleted := computeEggGradingStatus(e)

 	return RecordingBaseDTO{
-		Id:                    e.Id,
-		ProjectFlockKandangId: e.ProjectFlockKandangId,
-		RecordDatetime:        e.RecordDatetime,
-		Day:                   e.Day,
-		ProjectFlockCategory:  projectFlockCategory,
-		TotalDepletionQty:     e.TotalDepletionQty,
-		CumDepletionRate:      e.CumDepletionRate,
-		DailyGain:             e.DailyGain,
-		AvgDailyGain:          e.AvgDailyGain,
-		CumIntake:             e.CumIntake,
-		FcrValue:              e.FcrValue,
-		TotalChickQty:         e.TotalChickQty,
-		Approval:              latestApproval,
-		EggGradingStatus:      gradingStatus,
-		EggGradingPendingQty:  gradingPending,
+		Id:                     e.Id,
+		ProjectFlockKandangId:  e.ProjectFlockKandangId,
+		RecordDatetime:         e.RecordDatetime,
+		Day:                    e.Day,
+		ProjectFlockCategory:   projectFlockCategory,
+		TotalDepletionQty:      e.TotalDepletionQty,
+		CumDepletionRate:       e.CumDepletionRate,
+		DailyGain:              e.DailyGain,
+		AvgDailyGain:           e.AvgDailyGain,
+		CumIntake:              e.CumIntake,
+		FcrValue:               e.FcrValue,
+		TotalChickQty:          e.TotalChickQty,
+		Approval:               latestApproval,
+		EggGradingStatus:       gradingStatus,
+		EggGradingPendingQty:   gradingPending,
+		EggGradingCompletedQty: gradingCompleted,
 	}
 }

@@ -243,14 +245,17 @@ func toRecordingProductWarehouseDTO(pw *entity.ProductWarehouse) *RecordingProdu
 	return &dto
 }

-func computeEggGradingStatus(e entity.Recording) (*string, *int) {
-	if len(e.Eggs) == 0 {
-		return nil, nil
+const goodEggProductWarehouseID uint = 5
+
+func computeEggGradingStatus(e entity.Recording) (*string, *int, *int) {
+	goodEggs := filterGoodEggs(e.Eggs)
+	if len(goodEggs) == 0 {
+		return nil, nil, nil
 	}

 	totalEggs := 0
 	totalGraded := 0.0
-	for _, egg := range e.Eggs {
+	for _, egg := range goodEggs {
 		totalEggs += egg.Qty
 		for _, grading := range egg.GradingEggs {
 			totalGraded += grading.Qty
@@ -258,20 +263,41 @@ func computeEggGradingStatus(e entity.Recording) (*string, *int) {
 	}

 	if totalEggs == 0 {
-		return nil, nil
+		return nil, nil, nil
 	}

-	pending := float64(totalEggs) - totalGraded
+	pendingFloat := float64(totalEggs) - totalGraded
+	if pendingFloat < 0 {
+		pendingFloat = 0
+	}
+	pendingInt := int(math.Round(pendingFloat))
+	completedInt := int(math.Round(totalGraded))
+	if completedInt < 0 {
+		completedInt = 0
+	}

-	if pending > 0.5 {
+	if pendingInt > 0 {
 		status := "GRADING_TELUR"
-		pendingInt := int(math.Round(pending))
-		return &status, &pendingInt
+		return &status, &pendingInt, &completedInt
 	}

 	status := "GRADING_SELESAI"
 	zero := 0
-	return &status, &zero
+	return &status, &zero, &completedInt
+}
+
+func filterGoodEggs(eggs []entity.RecordingEgg) []entity.RecordingEgg {
+	if len(eggs) == 0 {
+		return nil
+	}
+
+	result := make([]entity.RecordingEgg, 0, len(eggs))
+	for _, egg := range eggs {
+		if egg.ProductWarehouseId == goodEggProductWarehouseID {
+			result = append(result, egg)
+		}
+	}
+	return result
 }

 func defaultRecordingLatestApproval(e entity.Recording) approvalDTO.ApprovalBaseDTO {