mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
feat(BE): enhance closing service and repository with actual usage cost calculations and egg weight tracking
This commit is contained in:
@@ -426,11 +426,15 @@ func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*
|
||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch budgets")
|
||||
}
|
||||
|
||||
purchaseItems, err := s.PurchaseRepo.GetItemsByProjectFlockID(c.Context(), projectFlockID)
|
||||
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch purchase items")
|
||||
// Get actual usage cost instead of purchase items
|
||||
actualUsageRows, err := s.Repository.GetActualUsageCostByProjectFlockID(c.Context(), projectFlockID)
|
||||
if err != nil {
|
||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch actual usage cost")
|
||||
}
|
||||
|
||||
// Convert actual usage rows to pseudo purchase items
|
||||
purchaseItems := s.convertActualUsageToPurchaseItems(c.Context(), actualUsageRows)
|
||||
|
||||
realizations, err := s.ExpenseRealizationRepo.GetByProjectFlockID(c.Context(), projectFlockID)
|
||||
if err != nil {
|
||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch realizations")
|
||||
@@ -455,6 +459,11 @@ func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*
|
||||
s.Log.Warnf("GetProductionWeightAndQtyByProjectFlockID error: %v", err)
|
||||
}
|
||||
|
||||
totalEggWeightKg, err := s.RecordingRepo.GetTotalEggProductionWeightByProjectFlockID(c.Context(), projectFlockID)
|
||||
if err != nil {
|
||||
s.Log.Warnf("GetTotalEggProductionWeightByProjectFlockID error: %v", err)
|
||||
}
|
||||
|
||||
totalDepletion, err := s.RecordingRepo.GetTotalDepletionByProjectFlockID(c.Context(), projectFlockID)
|
||||
if err != nil {
|
||||
s.Log.Warnf("GetTotalDepletionByProjectFlockID error: %v", err)
|
||||
@@ -468,6 +477,7 @@ func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*
|
||||
DeliveryProducts: deliveryProducts,
|
||||
Chickins: chickins,
|
||||
TotalWeightProduced: totalWeightProduced,
|
||||
TotalEggWeightKg: totalEggWeightKg,
|
||||
TotalDepletion: totalDepletion,
|
||||
}
|
||||
|
||||
@@ -476,8 +486,6 @@ func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*
|
||||
return &report, nil
|
||||
}
|
||||
|
||||
// GetExpeditionHPP menghitung HPP ekspedisi per vendor untuk sebuah project flock.
|
||||
// Jika projectFlockKandangID tidak nil, maka hanya data untuk kandang tersebut yang dihitung.
|
||||
func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
|
||||
if projectFlockID == 0 {
|
||||
return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
|
||||
@@ -778,5 +786,54 @@ func closestFcrValues(standards []entity.FcrStandard, averageWeight float64) (fl
|
||||
}
|
||||
|
||||
return closest.Mortality, closest.FcrNumber
|
||||
|
||||
}
|
||||
|
||||
func (s closingService) convertActualUsageToPurchaseItems(ctx context.Context, actualUsageRows []repository.ActualUsageCostRow) []entity.PurchaseItem {
|
||||
if len(actualUsageRows) == 0 {
|
||||
return []entity.PurchaseItem{}
|
||||
}
|
||||
|
||||
// Collect all product IDs
|
||||
productIDs := make([]uint, len(actualUsageRows))
|
||||
for i, row := range actualUsageRows {
|
||||
productIDs[i] = row.ProductID
|
||||
}
|
||||
|
||||
// Fetch products with flags from repository
|
||||
products, err := s.Repository.GetProductsWithFlagsByIDs(ctx, productIDs)
|
||||
if err != nil {
|
||||
s.Log.Warnf("Failed to fetch products for actual usage: %v", err)
|
||||
products = []entity.Product{}
|
||||
}
|
||||
|
||||
// Create product map
|
||||
productMap := make(map[uint]*entity.Product)
|
||||
for i := range products {
|
||||
productMap[products[i].Id] = &products[i]
|
||||
}
|
||||
|
||||
// Convert to pseudo purchase items
|
||||
purchaseItems := make([]entity.PurchaseItem, 0, len(actualUsageRows))
|
||||
for _, row := range actualUsageRows {
|
||||
product := productMap[row.ProductID]
|
||||
|
||||
// Skip if product not found
|
||||
if product == nil {
|
||||
s.Log.Warnf("Product ID %d not found for actual usage", row.ProductID)
|
||||
continue
|
||||
}
|
||||
|
||||
purchaseItem := entity.PurchaseItem{
|
||||
Id: 0, // Pseudo item, no ID
|
||||
ProductId: row.ProductID,
|
||||
TotalQty: row.TotalQty,
|
||||
TotalPrice: row.TotalPrice,
|
||||
Price: row.AveragePrice,
|
||||
Product: product,
|
||||
}
|
||||
|
||||
purchaseItems = append(purchaseItems, purchaseItem)
|
||||
}
|
||||
|
||||
return purchaseItems
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user