From b502751b4e257fc5330f12fd53104b4e868859fd Mon Sep 17 00:00:00 2001 From: aguhh18 Date: Thu, 20 Nov 2025 08:50:47 +0700 Subject: [PATCH] Fix[BE-261]: change realization json to not using prefix Realization --- internal/modules/expenses/dto/expense.dto.go | 50 ++++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/modules/expenses/dto/expense.dto.go b/internal/modules/expenses/dto/expense.dto.go index ae048ca1..70afd4d4 100644 --- a/internal/modules/expenses/dto/expense.dto.go +++ b/internal/modules/expenses/dto/expense.dto.go @@ -69,20 +69,20 @@ type ProjectFlockKandangNestedDTO struct { } type ExpenseRealizationDTO struct { - Id uint64 `json:"id"` - RealizationQty float64 `json:"realization_qty"` - RealizationUnitPrice float64 `json:"realization_unit_price"` - RealizationTotalPrice float64 `json:"realization_total_price"` - RealizationDate time.Time `json:"realization_date"` - Note *string `json:"note,omitempty"` + Id uint64 `json:"id"` + Qty float64 `json:"qty"` + UnitPrice float64 `json:"unit_price"` + TotalPrice float64 `json:"total_price"` + Date time.Time `json:"date"` + Note *string `json:"note,omitempty"` } type RealizationOnlyDTO struct { Id uint64 `json:"id"` - RealizationQty float64 `json:"realization_qty"` - RealizationUnitPrice float64 `json:"realization_unit_price"` - RealizationTotalPrice float64 `json:"realization_total_price"` - RealizationDate time.Time `json:"realization_date"` + Qty float64 `json:"qty"` + UnitPrice float64 `json:"unit_price"` + TotalPrice float64 `json:"total_price"` + Date time.Time `json:"date"` Note *string `json:"note,omitempty"` Nonstock *nonstockDTO.NonstockBaseDTO `json:"nonstock,omitempty"` ProjectFlockKandang *ProjectFlockKandangNestedDTO `json:"project_flock_kandang,omitempty"` @@ -224,14 +224,14 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO { } realisasiDTO := RealizationOnlyDTO{ - Id: ns.Realization.Id, - RealizationQty: ns.Realization.RealizationQty, - RealizationUnitPrice: ns.Realization.RealizationUnitPrice, - RealizationTotalPrice: ns.Realization.RealizationTotalPrice, - RealizationDate: ns.Realization.RealizationDate, - Note: ns.Realization.Note, - Nonstock: nonstock, - ProjectFlockKandang: projectFlockKandang, + Id: ns.Realization.Id, + Qty: ns.Realization.RealizationQty, + UnitPrice: ns.Realization.RealizationUnitPrice, + TotalPrice: ns.Realization.RealizationTotalPrice, + Date: ns.Realization.RealizationDate, + Note: ns.Realization.Note, + Nonstock: nonstock, + ProjectFlockKandang: projectFlockKandang, } realisasi = append(realisasi, realisasiDTO) } @@ -246,7 +246,7 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO { var totalRealisasi float64 for _, r := range realisasi { - totalRealisasi += r.RealizationTotalPrice + totalRealisasi += r.TotalPrice } // Group pengajuans and realisasi by kandang @@ -336,11 +336,11 @@ func ToExpenseNonstockDTO(ns entity.ExpenseNonstock) ExpenseNonstockDTO { func ToExpenseRealizationDTO(r entity.ExpenseRealization) ExpenseRealizationDTO { return ExpenseRealizationDTO{ - Id: r.Id, - RealizationQty: r.RealizationQty, - RealizationUnitPrice: r.RealizationUnitPrice, - RealizationTotalPrice: r.RealizationTotalPrice, - RealizationDate: r.RealizationDate, - Note: r.Note, + Id: r.Id, + Qty: r.RealizationQty, + UnitPrice: r.RealizationUnitPrice, + TotalPrice: r.RealizationTotalPrice, + Date: r.RealizationDate, + Note: r.Note, } }