Merge branch 'fix/LSS390' into 'development'

[FIX][BE]: LSS390 See merge request mbugroup/lti-api!208
2026-05-20 13:31:56 +00:00 · 2026-01-20 02:23:42 +00:00
parent c793c3cf9a 3052497fc0
commit b615570036
4 changed files with 195 additions and 141 deletions
@@ -27,10 +27,13 @@ type HppPerKandangResponseData struct {
 type HppPerKandangRowDTO struct {
 	ID                  int                         `json:"id"`
 	Kandang             HppPerKandangRowKandangDTO  `json:"kandang"`
+	NameWithPeriode     string                      `json:"name_with_periode"`
 	WeightRange         HppPerKandangWeightRangeDTO `json:"weight_range"`
 	AvgWeightKg         float64                     `json:"avg_weight_kg"`
 	EggProductionPieces int64                       `json:"egg_production_pieces"`
 	EggProductionKg     float64                     `json:"egg_production_kg"`
+	// EggProductionTotalWeightKg float64                     `json:"egg_production_total_weight_kg"`
+	// EggProductionTotalPieces   int64                       `json:"egg_production_total_pieces"`
 	// FeedCostRp               float64                     `json:"feed_cost_rp"`
 	// OvkCostRp                float64                     `json:"ovk_cost_rp"`
 	EggHppRpPerKg     float64                    `json:"egg_hpp_rp_per_kg"`
@@ -38,8 +41,8 @@ type HppPerKandangRowDTO struct {
 	FeedSuppliers     []HppPerKandangSupplierDTO `json:"feed_suppliers"`
 	DocSuppliers      []HppPerKandangSupplierDTO `json:"doc_suppliers"`
 	AverageDocPriceRp int64                      `json:"average_doc_price_rp"`
-	HppRp             float64                    `json:"hpp_rp"`
-	RemainingValueRp  int64                      `json:"remaining_value_rp"`
+	// HppRp             float64                    `json:"hpp_rp"`
+	// RemainingValueRp  int64                      `json:"remaining_value_rp"`
 }

 type HppPerKandangRowKandangDTO struct {
@@ -11,37 +11,40 @@ import (
 )

 type HppPerKandangRow struct {
-	ProjectFlockKandangID  uint
-	KandangID              uint
-	KandangName            string
-	KandangStatus          string
-	LocationID             uint
-	LocationName           string
-	PicID                  uint
-	PicName                string
-	RecordingCount         int64
-	RemainingChickenBirds  float64
-	RemainingChickenWeight float64
-	EggProductionWeightKg  float64
-	EggProductionPieces    float64
+	ProjectFlockKandangID uint
+	ProjectFlockPeriod    int
+	KandangID             uint
+	KandangName           string
+	KandangStatus         string
+	LocationID            uint
+	LocationName          string
+	PicID                 uint
+	PicName               string
+	RecordingCount        int64
+	// RemainingChickenBirds          float64
+	// RemainingChickenWeight         float64
+	EggProductionWeightKgRemaining float64
+	EggProductionPiecesRemaining   float64
+	EggProductionTotalWeightKg     float64
+	EggProductionTotalPieces       float64
 }

 type HppPerKandangCostRow struct {
-	KandangID   uint
-	FeedCost    float64
-	OvkCost     float64
-	DocCost     float64
-	DocQty      float64
-	BudgetCost  float64
-	ExpenseCost float64
+	ProjectFlockKandangID uint
+	FeedCost              float64
+	OvkCost               float64
+	DocCost               float64
+	DocQty                float64
+	BudgetCost            float64
+	ExpenseCost           float64
 }

 type HppPerKandangSupplierRow struct {
-	KandangID     uint
-	SupplierID    uint
-	SupplierName  string
-	SupplierAlias string
-	Category      string
+	ProjectFlockKandangID uint
+	SupplierID            uint
+	SupplierName          string
+	SupplierAlias         string
+	Category              string
 }

 type HppPerKandangRepository interface {
@@ -86,6 +89,7 @@ func (r *hppPerKandangRepository) GetRowsByPeriod(ctx context.Context, start, en
 		Table("project_flocks AS pf").
 		Select(`
 			pfk.id AS project_flock_kandang_id,
+			pfk.period AS project_flock_period,
 			k.id AS kandang_id,
 			k.name AS kandang_name,
 			k.status AS kandang_status,
@@ -97,18 +101,27 @@ func (r *hppPerKandangRepository) GetRowsByPeriod(ctx context.Context, start, en
 			COALESCE(MAX(vr.total_chick_qty), 0) AS remaining_chicken_birds,
 			0 AS remaining_chicken_weight,
 			0 AS egg_production_weight_kg,
-			0 AS egg_production_pieces`).
+			0 AS egg_production_pieces,
+			0 AS egg_production_total_weight_kg,
+			0 AS egg_production_total_pieces`).
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.project_flock_id = pf.id").
+		Joins(`
+			LEFT JOIN (
+				SELECT project_flock_kandang_id, MIN(chick_in_date) AS chick_in_date
+				FROM project_chickins
+				GROUP BY project_flock_kandang_id
+			) AS pc ON pc.project_flock_kandang_id = pfk.id`).
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
 		Joins("JOIN users AS pic ON pic.id = k.pic_id").
 		Joins("LEFT JOIN (?) AS vr ON vr.project_flock_kandangs_id = pfk.id", validRecordings).
-		Where("pfk.closed_at IS NULL")
+		Where("pf.category = ?", utils.ProjectFlockCategoryLaying).
+		Where("(pfk.closed_at IS NULL OR ? BETWEEN pc.chick_in_date AND pfk.closed_at)", start)

 	query = applyLocationFilters(query, areaIDs, locationIDs, kandangIDs)

-	query = query.Group("pfk.id, k.id, k.name, k.status, loc.id, loc.name, pic.id, pic.name").
-		Order("k.id ASC")
+	query = query.Group("pfk.id, pfk.period, k.id, k.name, k.status, loc.id, loc.name, pic.id, pic.name").
+		Order("pfk.id ASC")

 	if err := query.Scan(&rows).Error; err != nil {
 		return nil, err
@@ -139,7 +152,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	query := r.db.WithContext(ctx).
 		Table("recordings AS r").
 		Select(`
-			k.id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM(CASE
 				WHEN f.name = ? THEN COALESCE(sa.qty, 0) * COALESCE(pi.price, 0)
 				WHEN sa.stockable_type = ? AND tf.name = ? THEN COALESCE(std.total_qty, 0) * COALESCE(tpi.price, 0)
@@ -164,29 +177,29 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN flags AS f ON f.flagable_id = pi.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Joins("LEFT JOIN flags AS tf ON tf.flagable_id = std.product_id AND tf.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("r.project_flock_kandangs_id IN ?", projectFlockKandangIDs).
-		// Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.record_datetime < ?", end).
 		Where("r.deleted_at IS NULL").
 		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected))

-	query = query.Group("k.id").Order("k.id ASC")
+	query = query.Group("pfk.id").Order("pfk.id ASC")

 	if err := query.Scan(&rows).Error; err != nil {
 		return nil, nil, err
 	}

 	docRows := make([]struct {
-		KandangID     uint
-		DocCost       float64
-		DocQty        float64
-		SupplierID    *uint
-		SupplierName  *string
-		SupplierAlias *string
+		ProjectFlockKandangID uint
+		DocCost               float64
+		DocQty                float64
+		SupplierID            *uint
+		SupplierName          *string
+		SupplierAlias         *string
 	}, 0)

 	docQuery := r.db.WithContext(ctx).
 		Table("project_chickins AS pc").
 		Select(`
-			pfk.kandang_id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM(pc.usage_qty * COALESCE(pi.price, 0)), 0) AS doc_cost,
 			COALESCE(SUM(pc.usage_qty), 0) AS doc_qty,
 			s.id AS supplier_id,
@@ -199,7 +212,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN purchases AS pur ON pur.id = pi.purchase_id").
 		Joins("LEFT JOIN suppliers AS s ON s.id = pur.supplier_id").
 		Where("pc.project_flock_kandang_id IN ?", projectFlockKandangIDs).
-		Group("pfk.kandang_id, s.id, s.name, s.alias")
+		Group("pfk.id, s.id, s.name, s.alias")

 	if err := docQuery.Scan(&docRows).Error; err != nil {
 		return nil, nil, err
@@ -208,28 +221,28 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	costMap := make(map[uint]*HppPerKandangCostRow, len(rows))
 	for i := range rows {
 		row := rows[i]
-		costMap[row.KandangID] = &rows[i]
+		costMap[row.ProjectFlockKandangID] = &rows[i]
 	}

 	docSuppliers := make([]HppPerKandangSupplierRow, 0)
 	docSeen := make(map[uint]map[uint]bool)
 	for _, doc := range docRows {
-		entry, ok := costMap[doc.KandangID]
+		entry, ok := costMap[doc.ProjectFlockKandangID]
 		if !ok {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: doc.KandangID,
+				ProjectFlockKandangID: doc.ProjectFlockKandangID,
 			})
 			entry = &rows[len(rows)-1]
-			costMap[doc.KandangID] = entry
+			costMap[doc.ProjectFlockKandangID] = entry
 		}
 		entry.DocCost += doc.DocCost
 		entry.DocQty += doc.DocQty
 		if doc.SupplierID != nil {
-			if docSeen[doc.KandangID] == nil {
-				docSeen[doc.KandangID] = make(map[uint]bool)
+			if docSeen[doc.ProjectFlockKandangID] == nil {
+				docSeen[doc.ProjectFlockKandangID] = make(map[uint]bool)
 			}
-			if !docSeen[doc.KandangID][*doc.SupplierID] {
-				docSeen[doc.KandangID][*doc.SupplierID] = true
+			if !docSeen[doc.ProjectFlockKandangID][*doc.SupplierID] {
+				docSeen[doc.ProjectFlockKandangID][*doc.SupplierID] = true
 				supplierName := ""
 				if doc.SupplierName != nil {
 					supplierName = *doc.SupplierName
@@ -239,19 +252,19 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 					supplierAlias = *doc.SupplierAlias
 				}
 				docSuppliers = append(docSuppliers, HppPerKandangSupplierRow{
-					KandangID:     doc.KandangID,
-					SupplierID:    *doc.SupplierID,
-					SupplierName:  supplierName,
-					SupplierAlias: supplierAlias,
-					Category:      "DOC",
+					ProjectFlockKandangID: doc.ProjectFlockKandangID,
+					SupplierID:            *doc.SupplierID,
+					SupplierName:          supplierName,
+					SupplierAlias:         supplierAlias,
+					Category:              "DOC",
 				})
 			}
 		}
 	}

 	budgetRows := make([]struct {
-		KandangID  uint
-		BudgetCost float64
+		ProjectFlockKandangID uint
+		BudgetCost            float64
 	}, 0)

 	pfkUsageSub := r.db.
@@ -272,7 +285,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	budgetQuery := r.db.WithContext(ctx).
 		Table("project_flock_kandangs AS pfk").
 		Select(`
-			k.id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM((pb.qty * pb.price) * COALESCE(k_usage.kandang_usage_qty, 0) / NULLIF(p_usage.project_usage_qty, 0)), 0) AS budget_cost`).
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
@@ -280,7 +293,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN (?) AS k_usage ON k_usage.project_flock_kandang_id = pfk.id", pfkUsageSub).
 		Joins("LEFT JOIN (?) AS p_usage ON p_usage.project_flock_id = pfk.project_flock_id", projectUsageSub).
 		Where("pfk.id IN (?)", projectFlockKandangIDs).
-		Group("k.id")
+		Group("pfk.id")
 	// budgetQuery = applyLocationFilters(budgetQuery, areaIDs, locationIDs, kandangIDs)

 	if err := budgetQuery.Scan(&budgetRows).Error; err != nil {
@@ -288,33 +301,33 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	}

 	for _, budget := range budgetRows {
-		entry, ok := costMap[budget.KandangID]
+		entry, ok := costMap[budget.ProjectFlockKandangID]
 		if !ok {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: budget.KandangID,
+				ProjectFlockKandangID: budget.ProjectFlockKandangID,
 			})
 			entry = &rows[len(rows)-1]
-			costMap[budget.KandangID] = entry
+			costMap[budget.ProjectFlockKandangID] = entry
 		}
 		entry.BudgetCost += budget.BudgetCost
 	}

 	expenseRows := make([]struct {
-		KandangID   uint
-		ExpenseCost float64
+		ProjectFlockKandangID uint
+		ExpenseCost           float64
 	}, 0)

 	expenseQuery := r.db.WithContext(ctx).
 		Table("project_flock_kandangs AS pfk").
 		Select(`
-			k.id AS kandang_id,
+			pfk.id AS project_flock_kandang_id,
 			COALESCE(SUM(er.qty * er.price), 0) AS expense_cost`).
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
 		Joins("JOIN expense_nonstocks AS en ON en.project_flock_kandang_id = pfk.id").
 		Joins("JOIN expense_realizations AS er ON er.expense_nonstock_id = en.id").
 		Where("pfk.id IN (?)", projectFlockKandangIDs).
-		Group("k.id")
+		Group("pfk.id")
 	// expenseQuery = applyLocationFilters(expenseQuery, areaIDs, locationIDs, kandangIDs)

 	if err := expenseQuery.Scan(&expenseRows).Error; err != nil {
@@ -322,13 +335,13 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	}

 	for _, exp := range expenseRows {
-		entry, ok := costMap[exp.KandangID]
+		entry, ok := costMap[exp.ProjectFlockKandangID]
 		if !ok {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: exp.KandangID,
+				ProjectFlockKandangID: exp.ProjectFlockKandangID,
 			})
 			entry = &rows[len(rows)-1]
-			costMap[exp.KandangID] = entry
+			costMap[exp.ProjectFlockKandangID] = entry
 		}
 		entry.ExpenseCost += exp.ExpenseCost
 	}
@@ -337,7 +350,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,

 	feedQuery := r.db.WithContext(ctx).
 		Table("recordings AS r").
-		Select("DISTINCT k.id AS kandang_id, s.id AS supplier_id, s.name AS supplier_name, s.alias AS supplier_alias").
+		Select("DISTINCT pfk.id AS project_flock_kandang_id, s.id AS supplier_id, s.name AS supplier_name, s.alias AS supplier_alias").
 		Joins("JOIN project_flock_kandangs AS pfk ON pfk.id = r.project_flock_kandangs_id").
 		Joins("JOIN kandangs AS k ON k.id = pfk.kandang_id").
 		Joins("JOIN locations AS loc ON loc.id = k.location_id").
@@ -349,7 +362,7 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 		Joins("LEFT JOIN flags AS f ON f.flagable_id = pi.product_id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where("f.name IN ?", []utils.FlagType{utils.FlagPakan, utils.FlagOVK}).
 		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
-		// Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.record_datetime < ?", end).
 		Where("r.deleted_at IS NULL")
 	// feedQuery = applyLocationFilters(feedQuery, areaIDs, locationIDs, kandangIDs)

@@ -358,11 +371,11 @@ func (r *hppPerKandangRepository) GetFeedOvkDocCostByPeriod(ctx context.Context,
 	}

 	for i := range feedSuppliers {
-		if _, exists := costMap[feedSuppliers[i].KandangID]; !exists {
+		if _, exists := costMap[feedSuppliers[i].ProjectFlockKandangID]; !exists {
 			rows = append(rows, HppPerKandangCostRow{
-				KandangID: feedSuppliers[i].KandangID,
+				ProjectFlockKandangID: feedSuppliers[i].ProjectFlockKandangID,
 			})
-			costMap[feedSuppliers[i].KandangID] = &rows[len(rows)-1]
+			costMap[feedSuppliers[i].ProjectFlockKandangID] = &rows[len(rows)-1]
 		}
 		feedSuppliers[i].Category = "FEED"
 	}
@@ -391,9 +404,11 @@ func (r *hppPerKandangRepository) GetEggProductionByProjectFlockKandangIDs(ctx c
 		)

 	type eggRow struct {
-		ProjectFlockKandangID uint
-		EggProductionWeightKg float64
-		EggProductionPieces   float64
+		ProjectFlockKandangID          uint
+		EggProductionWeightKgRemaining float64
+		EggProductionPiecesRemaining   float64
+		EggProductionTotalWeightKg     float64
+		EggProductionTotalPieces       float64
 	}

 	eggRows := make([]eggRow, 0)
@@ -401,12 +416,14 @@ func (r *hppPerKandangRepository) GetEggProductionByProjectFlockKandangIDs(ctx c
 		Table("recordings AS r").
 		Select(`
 			r.project_flock_kandangs_id AS project_flock_kandang_id,
-			COALESCE(SUM(re.weight), 0) AS egg_production_weight_kg,
-			COALESCE(SUM(re.qty), 0) AS egg_production_pieces`).
+			COALESCE(SUM((re.total_qty - re.total_used) * re.weight / 1000), 0) AS egg_production_weight_kg_remaining,
+			COALESCE(SUM(re.total_qty - re.total_used), 0) AS egg_production_pieces_remaining,
+			COALESCE(SUM(re.weight / 1000), 0) AS egg_production_total_weight_kg,
+			COALESCE(SUM(re.total_qty), 0) AS egg_production_total_pieces`).
 		Joins("LEFT JOIN (?) AS la ON la.approvable_id = r.id", latestApproval).
 		Joins("LEFT JOIN recording_eggs AS re ON re.recording_id = r.id").
 		Where("r.project_flock_kandangs_id IN ?", projectFlockKandangIDs).
-		// Where("r.record_datetime >= ? AND r.record_datetime < ?", start, end).
+		Where("r.record_datetime < ?", end).
 		Where("r.deleted_at IS NULL").
 		Where("(la.action IS NULL OR la.action != ?)", string(entity.ApprovalActionRejected)).
 		Group("r.project_flock_kandangs_id")
@@ -418,9 +435,11 @@ func (r *hppPerKandangRepository) GetEggProductionByProjectFlockKandangIDs(ctx c
 	result := make(map[uint]HppPerKandangRow, len(eggRows))
 	for _, row := range eggRows {
 		result[row.ProjectFlockKandangID] = HppPerKandangRow{
-			ProjectFlockKandangID: row.ProjectFlockKandangID,
-			EggProductionWeightKg: row.EggProductionWeightKg,
-			EggProductionPieces:   row.EggProductionPieces,
+			ProjectFlockKandangID:          row.ProjectFlockKandangID,
+			EggProductionWeightKgRemaining: row.EggProductionWeightKgRemaining,
+			EggProductionPiecesRemaining:   row.EggProductionPiecesRemaining,
+			EggProductionTotalWeightKg:     row.EggProductionTotalWeightKg,
+			EggProductionTotalPieces:       row.EggProductionTotalPieces,
 		}
 	}

@@ -435,7 +454,7 @@ func applyLocationFilters(query *gorm.DB, areaIDs, locationIDs, kandangIDs []int
 		query = query.Where("k.location_id IN ?", locationIDs)
 	}
 	if len(kandangIDs) > 0 {
-		query = query.Where("k.id IN ?", kandangIDs)
+		query = query.Where("pfk.id IN ?", kandangIDs)
 	}
 	return query
 }
@@ -1426,15 +1426,17 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 		}
 		for pfkID, egg := range eggMap {
 			if rowIdx, ok := pfkIndex[pfkID]; ok {
-				repoRows[rowIdx].EggProductionWeightKg = egg.EggProductionWeightKg
-				repoRows[rowIdx].EggProductionPieces = egg.EggProductionPieces
+				repoRows[rowIdx].EggProductionWeightKgRemaining = egg.EggProductionWeightKgRemaining
+				repoRows[rowIdx].EggProductionPiecesRemaining = egg.EggProductionPiecesRemaining
+				repoRows[rowIdx].EggProductionTotalWeightKg = egg.EggProductionTotalWeightKg
+				repoRows[rowIdx].EggProductionTotalPieces = egg.EggProductionTotalPieces
 			}
 		}
 	}

 	costMap := make(map[uint]HppCostAggregate, len(costRows))
 	for _, row := range costRows {
-		costMap[row.KandangID] = HppCostAggregate{
+		costMap[row.ProjectFlockKandangID] = HppCostAggregate{
 			FeedCost:    row.FeedCost,
 			OvkCost:     row.OvkCost,
 			DocCost:     row.DocCost,
@@ -1463,15 +1465,15 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 			category = "DOC"
 		}

-		if seen[sup.KandangID] == nil {
-			seen[sup.KandangID] = make(map[uint]bool)
+		if seen[sup.ProjectFlockKandangID] == nil {
+			seen[sup.ProjectFlockKandangID] = make(map[uint]bool)
 		}
-		if seen[sup.KandangID][sup.SupplierID] {
+		if seen[sup.ProjectFlockKandangID][sup.SupplierID] {
 			continue
 		}
-		seen[sup.KandangID][sup.SupplierID] = true
+		seen[sup.ProjectFlockKandangID][sup.SupplierID] = true

-		targetMap[sup.KandangID] = append(targetMap[sup.KandangID], dto.HppPerKandangSupplierDTO{
+		targetMap[sup.ProjectFlockKandangID] = append(targetMap[sup.ProjectFlockKandangID], dto.HppPerKandangSupplierDTO{
 			ID:       int64(sup.SupplierID),
 			Name:     sup.SupplierName,
 			Alias:    sup.SupplierAlias,
@@ -1498,12 +1500,12 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 	dataRows := make([]dto.HppPerKandangRowDTO, 0, len(repoRows))
 	perRangeMap := make(map[weightRangeKey]*weightRangeAggregate)
 	var totalBirds int64
-	var totalWeight float64
+	// var totalWeight float64
 	var totalEggPieces int64
 	var totalEggKg float64
-	var totalRemainingValueRp int64
+	// var totalRemainingValueRp int64
 	var totalEggValueRp int64
-	var totalHppSum float64
+	// var totalHppSum float64
 	var totalHppCount int
 	var totalDocPriceSum float64
 	var totalDocPriceCount int
@@ -1517,26 +1519,34 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 			continue
 		}

-		birdsFloat := row.RemainingChickenBirds
-		if math.IsNaN(birdsFloat) || math.IsInf(birdsFloat, 0) {
-			birdsFloat = 0
+		// birdsFloat := row.RemainingChickenBirds
+		// if math.IsNaN(birdsFloat) || math.IsInf(birdsFloat, 0) {
+		// 	birdsFloat = 0
+		// }
+		// weightFloat := row.RemainingChickenWeight
+		// if math.IsNaN(weightFloat) || math.IsInf(weightFloat, 0) {
+		// 	weightFloat = 0
+		// }
+		eggPiecesFloatRemaining := row.EggProductionPiecesRemaining
+		if math.IsNaN(eggPiecesFloatRemaining) || math.IsInf(eggPiecesFloatRemaining, 0) {
+			eggPiecesFloatRemaining = 0
 		}
-		weightFloat := row.RemainingChickenWeight
-		if math.IsNaN(weightFloat) || math.IsInf(weightFloat, 0) {
-			weightFloat = 0
+		eggTotalPiecesFloat := row.EggProductionTotalPieces
+		if math.IsNaN(eggTotalPiecesFloat) || math.IsInf(eggTotalPiecesFloat, 0) {
+			eggTotalPiecesFloat = 0
 		}
-		eggPiecesFloat := row.EggProductionPieces
-		if math.IsNaN(eggPiecesFloat) || math.IsInf(eggPiecesFloat, 0) {
-			eggPiecesFloat = 0
+		eggRemainingWeightFloatRemaining := row.EggProductionWeightKgRemaining
+		if math.IsNaN(eggRemainingWeightFloatRemaining) || math.IsInf(eggRemainingWeightFloatRemaining, 0) {
+			eggRemainingWeightFloatRemaining = 0
 		}
-		eggWeightFloat := row.EggProductionWeightKg
+		eggWeightFloat := row.EggProductionTotalWeightKg
 		if math.IsNaN(eggWeightFloat) || math.IsInf(eggWeightFloat, 0) {
 			eggWeightFloat = 0
 		}

 		avgWeight := 0.0
-		if eggPiecesFloat > 0 {
-			avgWeight = eggWeightFloat / eggPiecesFloat
+		if eggTotalPiecesFloat > 0 {
+			avgWeight = eggWeightFloat / eggTotalPiecesFloat
 		}
 		if params.WeightMin != nil && avgWeight < *params.WeightMin {
 			continue
@@ -1552,28 +1562,30 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 		weightMax := weightMin + 0.09
 		rangeKey := weightRangeKey{Min: weightMin, Max: weightMax}

-		rowBirds := int64(math.Round(birdsFloat))
-		costEntry := costMap[row.KandangID]
+		// rowBirds := int64(math.Round(birdsFloat))
+		costEntry := costMap[row.ProjectFlockKandangID]
 		totalCost := costEntry.FeedCost + costEntry.OvkCost + costEntry.DocCost + costEntry.BudgetCost + costEntry.ExpenseCost
-		hppRp := 0.0
-		if weightFloat > 0 {
-			hppRp = totalCost / weightFloat
-		}
+		// hppRp := 0.0
+		// if weightFloat > 0 {
+		// 	hppRp = totalCost / weightFloat
+		// }
 		eggHpp := 0.0
 		if eggWeightFloat > 0 {
-			eggHpp = totalCost / eggWeightFloat
+			eggHpp = (totalCost / eggWeightFloat) / 1000
 		}

-		rowEggPieces := int64(math.Round(eggPiecesFloat))
-		rowEggValue := int64(eggHpp * eggWeightFloat)
-		rowRemainingValue := int64(hppRp * weightFloat)
+		rowEggPieces := int64(math.Round(eggPiecesFloatRemaining))
+		rowEggValue := int64(eggHpp * eggRemainingWeightFloatRemaining)
+		// rowRemainingValue := int64(hppRp * weightFloat)
 		avgDocPrice := int64(0)
 		if costEntry.DocQty > 0 {
 			avgDocPrice = int64(math.Round(costEntry.DocCost / costEntry.DocQty))
 		}

+		nameWithPeriod := fmt.Sprintf("%s Period %d", row.KandangName, row.ProjectFlockPeriod)
+
 		dataRows = append(dataRows, dto.HppPerKandangRowDTO{
-			ID: int(row.KandangID),
+			ID: int(row.ProjectFlockKandangID),
 			Kandang: dto.HppPerKandangRowKandangDTO{
 				ID:     int64(row.KandangID),
 				Name:   row.KandangName,
@@ -1591,32 +1603,35 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 				WeightMin: weightMin,
 				WeightMax: weightMax,
 			},
-			AvgWeightKg: avgWeight,
+			AvgWeightKg:     avgWeight,
+			NameWithPeriode: nameWithPeriod,
 			// FeedCostRp:               costEntry.FeedCost,
 			// OvkCostRp:                costEntry.OvkCost,
-			DocSuppliers:        docSupplierMap[row.KandangID],
-			FeedSuppliers:       feedSupplierMap[row.KandangID],
-			EggProductionPieces: rowEggPieces,
-			EggProductionKg:     eggWeightFloat,
-			AverageDocPriceRp:   avgDocPrice,
+			DocSuppliers:        docSupplierMap[row.ProjectFlockKandangID],
+			FeedSuppliers:       feedSupplierMap[row.ProjectFlockKandangID],
+			EggProductionPieces: int64(math.Round(eggPiecesFloatRemaining)),
+			EggProductionKg:     eggRemainingWeightFloatRemaining,
+			// EggProductionTotalWeightKg: eggWeightFloat,
+			// EggProductionTotalPieces:   int64(math.Round(eggTotalPiecesFloat)),
+			AverageDocPriceRp: avgDocPrice,
 			// HppRp:               hppRp,
-			EggHppRpPerKg:    eggHpp,
-			RemainingValueRp: rowRemainingValue,
-			EggValueRp:       rowEggValue,
+			EggHppRpPerKg: eggHpp,
+			// RemainingValueRp: rowRemainingValue,
+			EggValueRp: rowEggValue,
 		})

-		totalBirds += rowBirds
-		totalWeight += weightFloat
+		// totalBirds += rowBirds
+		// totalWeight += weightFloat
 		totalEggPieces += rowEggPieces
-		totalEggKg += eggWeightFloat
-		totalRemainingValueRp += rowRemainingValue
+		totalEggKg += eggRemainingWeightFloatRemaining
+		// totalRemainingValueRp += rowRemainingValue
 		totalEggValueRp += rowEggValue
 		totalAvgWeightSum += avgWeight
 		totalAvgWeightCount++
-		if weightFloat > 0 {
-			totalHppSum += hppRp
-			totalHppCount++
-		}
+		// if weightFloat > 0 {
+		// 	totalHppSum += hppRp
+		// 	totalHppCount++
+		// }
 		if avgDocPrice > 0 {
 			totalDocPriceSum += float64(avgDocPrice)
 			totalDocPriceCount++
@@ -1643,23 +1658,23 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
 		}

 		rangeSummary := rangeAgg.Summary
-		rangeAgg.RemainingBirds += rowBirds
-		rangeAgg.RemainingWeightKg += row.RemainingChickenWeight
+		// rangeAgg.RemainingBirds += rowBirds
+		// rangeAgg.RemainingWeightKg += row.RemainingChickenWeight
 		rangeAgg.AvgWeightSum += avgWeight
 		rangeAgg.AvgWeightCount++
-		for _, supplier := range feedSupplierMap[row.KandangID] {
+		for _, supplier := range feedSupplierMap[row.ProjectFlockKandangID] {
 			if _, ok := rangeAgg.FeedSuppliers[supplier.ID]; !ok {
 				rangeAgg.FeedSuppliers[supplier.ID] = supplier
 			}
 		}
-		for _, supplier := range docSupplierMap[row.KandangID] {
+		for _, supplier := range docSupplierMap[row.ProjectFlockKandangID] {
 			if _, ok := rangeAgg.DocSuppliers[supplier.ID]; !ok {
 				rangeAgg.DocSuppliers[supplier.ID] = supplier
 			}
 		}
 		rangeSummary.EggProductionPieces += rowEggPieces
-		rangeSummary.EggProductionKg += eggWeightFloat
-		rangeSummary.RemainingValueRp += rowRemainingValue
+		rangeSummary.EggProductionKg += eggRemainingWeightFloatRemaining
+		// rangeSummary.RemainingValueRp += rowRemainingValue
 		rangeSummary.EggValueRp += rowEggValue
 		if eggWeightFloat > 0 {
 			rangeAgg.EggHppSum += eggHpp
@@ -1806,6 +1821,9 @@ func (s *repportService) parseHppPerKandangQuery(ctx *fiber.Ctx) (*validation.Hp
 	if err != nil {
 		return nil, dto.HppPerKandangFiltersDTO{}, fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}
+	if weightMin != nil && weightMax != nil && *weightMin > *weightMax {
+		return nil, dto.HppPerKandangFiltersDTO{}, fiber.NewError(fiber.StatusBadRequest, "weight_min must be less than or equal to weight_max")
+	}

 	params := &validation.HppPerKandangQuery{
 		Page:           page,