gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 13:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX[BE-261]: expense list dto ganti dari hardcoded ke ambil dari expensebasedto

Browse Source
This commit is contained in:
aguhh18
2025-11-21 11:16:34 +07:00
parent 16d562e024
commit b0dfa717d5
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/expenses/dto/expense.dto.go
+11 -21
View File
@@ -34,28 +34,23 @@ type ExpenseBaseDTO struct {
} }
type ExpenseListDTO struct { type ExpenseListDTO struct {
Id uint64 `json:"id"` ExpenseBaseDTO
ReferenceNumber string `json:"reference_number"` CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
PoNumber string `json:"po_number"` CreatedAt time.Time `json:"created_at"`
Category string `json:"category"` UpdatedAt time.Time `json:"updated_at"`
ExpenseDate time.Time `json:"expense_date"` LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
GrandTotal float64 `json:"grand_total"`
CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
} }
type ExpenseDetailDTO struct { type ExpenseDetailDTO struct {
ExpenseBaseDTO ExpenseBaseDTO
Documents []DocumentDTO `json:"documents,omitempty"` Documents []DocumentDTO `json:"documents,omitempty"`
RealizationDocs []DocumentDTO `json:"realization_docs,omitempty"` RealizationDocs []DocumentDTO `json:"realization_docs,omitempty"`
CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
Kandangs []KandangGroupDTO `json:"kandangs,omitempty"` Kandangs []KandangGroupDTO `json:"kandangs,omitempty"`
TotalPengajuan float64 `json:"total_pengajuan"` TotalPengajuan float64 `json:"total_pengajuan"`
TotalRealisasi float64 `json:"total_realisasi"` TotalRealisasi float64 `json:"total_realisasi"`
CreatedAt time.Time `json:"created_at"` CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"` UpdatedAt time.Time `json:"updated_at"`
CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"` LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval,omitempty"`
} }
@@ -149,16 +144,11 @@ func ToExpenseListDTO(e entity.Expense) ExpenseListDTO {
} }
return ExpenseListDTO{ return ExpenseListDTO{
Id: e.Id, ExpenseBaseDTO: ToExpenseBaseDTO(&e),
ReferenceNumber: e.ReferenceNumber, CreatedUser: createdUser,
PoNumber: e.PoNumber, CreatedAt: e.CreatedAt,
Category: e.Category, UpdatedAt: e.UpdatedAt,
ExpenseDate: e.ExpenseDate, LatestApproval: latestApproval,
GrandTotal: e.GrandTotal,
CreatedUser: createdUser,
CreatedAt: e.CreatedAt,
UpdatedAt: e.UpdatedAt,
LatestApproval: latestApproval,
} }
} }