gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-24 07:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix[BE-261]: change realization json to not using prefix Realization

Browse Source
This commit is contained in:
aguhh18
2025-11-20 08:50:47 +07:00
parent 4c7e5b0731
commit b502751b4e
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/expenses/dto/expense.dto.go
+25 -25
View File
@@ -69,20 +69,20 @@ type ProjectFlockKandangNestedDTO struct {
} }
type ExpenseRealizationDTO struct { type ExpenseRealizationDTO struct {
Id uint64 `json:"id"` Id uint64 `json:"id"`
RealizationQty float64 `json:"realization_qty"` Qty float64 `json:"qty"`
RealizationUnitPrice float64 `json:"realization_unit_price"` UnitPrice float64 `json:"unit_price"`
RealizationTotalPrice float64 `json:"realization_total_price"` TotalPrice float64 `json:"total_price"`
RealizationDate time.Time `json:"realization_date"` Date time.Time `json:"date"`
Note *string `json:"note,omitempty"` Note *string `json:"note,omitempty"`
} }
type RealizationOnlyDTO struct { type RealizationOnlyDTO struct {
Id uint64 `json:"id"` Id uint64 `json:"id"`
RealizationQty float64 `json:"realization_qty"` Qty float64 `json:"qty"`
RealizationUnitPrice float64 `json:"realization_unit_price"` UnitPrice float64 `json:"unit_price"`
RealizationTotalPrice float64 `json:"realization_total_price"` TotalPrice float64 `json:"total_price"`
RealizationDate time.Time `json:"realization_date"` Date time.Time `json:"date"`
Note *string `json:"note,omitempty"` Note *string `json:"note,omitempty"`
Nonstock *nonstockDTO.NonstockBaseDTO `json:"nonstock,omitempty"` Nonstock *nonstockDTO.NonstockBaseDTO `json:"nonstock,omitempty"`
ProjectFlockKandang *ProjectFlockKandangNestedDTO `json:"project_flock_kandang,omitempty"` ProjectFlockKandang *ProjectFlockKandangNestedDTO `json:"project_flock_kandang,omitempty"`
@@ -224,14 +224,14 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO {
} }
realisasiDTO := RealizationOnlyDTO{ realisasiDTO := RealizationOnlyDTO{
Id: ns.Realization.Id, Id: ns.Realization.Id,
RealizationQty: ns.Realization.RealizationQty, Qty: ns.Realization.RealizationQty,
RealizationUnitPrice: ns.Realization.RealizationUnitPrice, UnitPrice: ns.Realization.RealizationUnitPrice,
RealizationTotalPrice: ns.Realization.RealizationTotalPrice, TotalPrice: ns.Realization.RealizationTotalPrice,
RealizationDate: ns.Realization.RealizationDate, Date: ns.Realization.RealizationDate,
Note: ns.Realization.Note, Note: ns.Realization.Note,
Nonstock: nonstock, Nonstock: nonstock,
ProjectFlockKandang: projectFlockKandang, ProjectFlockKandang: projectFlockKandang,
} }
realisasi = append(realisasi, realisasiDTO) realisasi = append(realisasi, realisasiDTO)
} }
@@ -246,7 +246,7 @@ func ToExpenseDetailDTO(e *entity.Expense) ExpenseDetailDTO {
var totalRealisasi float64 var totalRealisasi float64
for _, r := range realisasi { for _, r := range realisasi {
totalRealisasi += r.RealizationTotalPrice totalRealisasi += r.TotalPrice
} }
// Group pengajuans and realisasi by kandang // Group pengajuans and realisasi by kandang
@@ -336,11 +336,11 @@ func ToExpenseNonstockDTO(ns entity.ExpenseNonstock) ExpenseNonstockDTO {
func ToExpenseRealizationDTO(r entity.ExpenseRealization) ExpenseRealizationDTO { func ToExpenseRealizationDTO(r entity.ExpenseRealization) ExpenseRealizationDTO {
return ExpenseRealizationDTO{ return ExpenseRealizationDTO{
Id: r.Id, Id: r.Id,
RealizationQty: r.RealizationQty, Qty: r.RealizationQty,
RealizationUnitPrice: r.RealizationUnitPrice, UnitPrice: r.RealizationUnitPrice,
RealizationTotalPrice: r.RealizationTotalPrice, TotalPrice: r.RealizationTotalPrice,
RealizationDate: r.RealizationDate, Date: r.RealizationDate,
Note: r.Note, Note: r.Note,
} }
} }