From 26f2f3ccbf40190aa5bdff462b40bca2431dae6d Mon Sep 17 00:00:00 2001 From: giovanni-ce Date: Mon, 8 Dec 2025 22:02:02 +0700 Subject: [PATCH] adjust response get one general information closing --- internal/modules/closings/dto/closing.dto.go | 52 ++++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/internal/modules/closings/dto/closing.dto.go b/internal/modules/closings/dto/closing.dto.go index 6a280312..22654549 100644 --- a/internal/modules/closings/dto/closing.dto.go +++ b/internal/modules/closings/dto/closing.dto.go @@ -28,19 +28,19 @@ type ClosingDetailDTO struct { } type ClosingSummaryDTO struct { - LocationID uint `json:"location_id"` - Periode int `json:"periode"` - JenisProduk string `json:"jenis_produk"` - LabelPopulasi string `json:"label_populasi"` - JumlahPopulasi int `json:"jumlah_populasi"` - JumlahPopulasiFormatted string `json:"jumlah_populasi_formatted"` - JenisProject string `json:"jenis_project"` - KandangAktif int `json:"kandang_aktif"` - KandangAktifFormatted string `json:"kandang_aktif_formatted"` - StatusPembayaranPenjualan string `json:"status_pembayaran_penjualan"` - StatusPembayaranMitra string `json:"status_pembayaran_mitra"` - StatusProject string `json:"status_project"` - StatusClosing string `json:"status_closing"` + FlockID uint `json:"flock_id"` + Period int `json:"period"` + // JenisProduk string `json:"jenis_produk"` + // LabelPopulasi string `json:"label_populasi"` + Population int `json:"population"` + PopulationFormatted string `json:"population_formatted"` + ProjectType string `json:"project_type"` + ActiveHouseCount int `json:"active_house_count"` + ActiveHouseLabel string `json:"active_house_label"` + SalesPaymentStatus string `json:"sales_payment_status"` + // StatusPembayaranMitra string `json:"status_pembayaran_mitra"` + StatusProject string `json:"project_status"` + StatusClosing string `json:"closing_status"` } func ToClosingSummaryDTO(project entity.ProjectFlock, statusProject, statusClosing string) ClosingSummaryDTO { @@ -52,19 +52,19 @@ func ToClosingSummaryDTO(project entity.ProjectFlock, statusProject, statusClosi populationInt := int(population) return ClosingSummaryDTO{ - LocationID: project.LocationId, - Periode: period, - JenisProduk: project.Category, - LabelPopulasi: "", - JumlahPopulasi: populationInt, - JumlahPopulasiFormatted: fmt.Sprintf("%d Ekor", populationInt), - JenisProject: "", - KandangAktif: kandangCount, - KandangAktifFormatted: fmt.Sprintf("%d Kandang", kandangCount), - StatusPembayaranPenjualan: "Tempo", - StatusPembayaranMitra: "", - StatusProject: statusProject, - StatusClosing: statusClosing, + FlockID: project.Id, + Period: period, + // JenisProduk: project.Category, + // LabelPopulasi: "", + Population: populationInt, + PopulationFormatted: fmt.Sprintf("%d Ekor", populationInt), + ProjectType: project.Category, + ActiveHouseCount: kandangCount, + ActiveHouseLabel: fmt.Sprintf("%d Kandang", kandangCount), + SalesPaymentStatus: "Tempo", + // StatusPembayaranMitra: "", + StatusProject: statusProject, + StatusClosing: statusClosing, } }