mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
[FIX][BE]: LSS390
This commit is contained in:
giovanni
@@ -31,6 +31,8 @@ type HppPerKandangRowDTO struct {
|
||||
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 +40,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,19 +11,21 @@ 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
|
||||
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 {
|
||||
@@ -97,13 +99,22 @@ 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)
|
||||
|
||||
@@ -164,7 +175,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).
|
||||
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))
|
||||
|
||||
@@ -349,7 +360,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)
|
||||
|
||||
@@ -391,9 +402,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 +414,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 +433,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 +452,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
|
||||
}
|
||||
|
||||
@@ -1370,8 +1370,10 @@ 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
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1442,12 +1444,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
|
||||
@@ -1461,26 +1463,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
|
||||
@@ -1496,21 +1506,21 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
|
||||
weightMax := weightMin + 0.09
|
||||
rangeKey := weightRangeKey{Min: weightMin, Max: weightMax}
|
||||
|
||||
rowBirds := int64(math.Round(birdsFloat))
|
||||
// rowBirds := int64(math.Round(birdsFloat))
|
||||
costEntry := costMap[row.KandangID]
|
||||
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))
|
||||
@@ -1540,27 +1550,29 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
|
||||
// OvkCostRp: costEntry.OvkCost,
|
||||
DocSuppliers: docSupplierMap[row.KandangID],
|
||||
FeedSuppliers: feedSupplierMap[row.KandangID],
|
||||
EggProductionPieces: rowEggPieces,
|
||||
EggProductionKg: eggWeightFloat,
|
||||
AverageDocPriceRp: avgDocPrice,
|
||||
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++
|
||||
@@ -1587,8 +1599,8 @@ 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] {
|
||||
@@ -1602,8 +1614,8 @@ func (s *repportService) GetHppPerKandang(ctx *fiber.Ctx) (*dto.HppPerKandangRes
|
||||
}
|
||||
}
|
||||
rangeSummary.EggProductionPieces += rowEggPieces
|
||||
rangeSummary.EggProductionKg += eggWeightFloat
|
||||
rangeSummary.RemainingValueRp += rowRemainingValue
|
||||
rangeSummary.EggProductionKg += eggRemainingWeightFloatRemaining
|
||||
// rangeSummary.RemainingValueRp += rowRemainingValue
|
||||
rangeSummary.EggValueRp += rowEggValue
|
||||
if eggWeightFloat > 0 {
|
||||
rangeAgg.EggHppSum += eggHpp
|
||||
@@ -1750,6 +1762,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,
|
||||
|
||||
Reference in New Issue
Block a user