Merge branch 'dev/teguh' into 'development'

FEAT[BE] : change transfer to laying number to correct format

See merge request mbugroup/lti-api!294

internal/common/repository/common.hpp.repository.go

@@ -20,7 +20,6 @@ type HppCostRepository interface {
 	GetTotalPopulation(ctx context.Context, projectFlockKandangIDs []uint) (float64, error)
 	GetPulletCost(ctx context.Context, projectFlockKandangId uint) (float64, error)
 	GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error)
-	GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIdsAll(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, error)
 	GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, startDate *time.Time, endDate *time.Time) (float64, float64, error)
 	GetProjectFlockIDByProjectFlockKandangID(ctx context.Context, projectFlockKandangId uint) (uint, error)
 	GetTransferSourceSummary(ctx context.Context, projectFlockKandangId uint) (uint, float64, error)
@@ -197,10 +196,10 @@ func (r *HppRepositoryImpl) GetPulletCost(ctx context.Context, projectFlockKanda
 }
 
 func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(ctx context.Context, projectFlockKandangIDs []uint, date *time.Time) (float64, float64, error) {
-	// if date == nil {
-	// 	now := time.Now()
-	// 	date = &now
-	// }
+	if date == nil {
+		now := time.Now()
+		date = &now
+	}
 
 	var totals struct {
 		TotalPieces   float64
@@ -220,24 +219,6 @@ func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandang
 	return totals.TotalPieces, totals.TotalWeightKg, nil
 }
 
-func (r *HppRepositoryImpl) GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIdsAll(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, error) {
-	var totals struct {
-		TotalPieces   float64
-		TotalWeightKg float64
-	}
-	err := r.db.WithContext(ctx).
-		Table("recordings AS r").
-		Select("COALESCE(SUM(re.qty), 0) AS total_pieces, COALESCE(SUM(re.weight), 0)AS total_weight_kg").
-		Joins("JOIN recording_eggs AS re ON re.recording_id = r.id").
-		Where("r.project_flock_kandangs_id IN (?)", projectFlockKandangIDs).
-		Scan(&totals).Error
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return totals.TotalPieces, totals.TotalWeightKg, nil
-}
-
 func (r *HppRepositoryImpl) GetEggTerjualPiecesAndWeightKgByProjectFlockKandangIds(
 	ctx context.Context,
 	projectFlockKandangIDs []uint,

internal/modules/closings/dto/closingMarketing.dto.go

@@ -122,16 +122,23 @@ func ToSalesAgeDTO(e entity.MarketingDeliveryProduct) SalesDTO {
 }
 
 func ToSummaryDto(e []entity.MarketingDeliveryProduct) SummaryDTO {
-
 	var totalSalesPrice, totalActualPrice, sumSales, sumActual float64
 	count := len(e)
 
+	if count == 0 {
+		return SummaryDTO{
+			TotalSalesPrice:  0,
+			TotalActualPrice: 0,
+			AvgSalesPrice:    0,
+			AvgActualPrice:   0,
+		}
+	}
+
 	for _, item := range e {
 		totalSalesPrice += item.MarketingProduct.TotalPrice
 		totalActualPrice += item.TotalPrice
 		sumSales += item.MarketingProduct.UnitPrice
 		sumActual += item.UnitPrice
-
 	}
 
 	return SummaryDTO{

internal/modules/closings/services/closingKeuangan.service.go

@@ -262,7 +262,7 @@ func (s closingKeuanganService) calculateProductionData(c *fiber.Ctx, projectFlo
 	}
 
 	if projectFlock.Category == string(utils.ProjectFlockCategoryLaying) {
-		_, data.TotalEggWeightKg, err = s.HppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIdsAll(c.Context(), projectFlockKandangIDs)
+		_, data.TotalEggWeightKg, err = s.HppRepo.GetEggProduksiPiecesAndWeightKgByProjectFlockKandangIds(c.Context(), projectFlockKandangIDs, nil)
 		if err != nil {
 			data.TotalEggWeightKg = 0
 		}

internal/modules/production/transfer_layings/repositories/laying_transfer.repository.go

@@ -49,8 +49,8 @@ func (r *TransferLayingRepositoryImpl) GenerateMovementNumber(ctx context.Contex
 	if err != nil {
 		return "", err
 	}
-	// Format: TL00001, TL00002, dst
-	movementNumber := fmt.Sprintf("TL%05d", seq)
+
+	movementNumber := fmt.Sprintf("TL-%05d", seq)
 	return movementNumber, nil
 }