From 008709c19c561b05907e51defc89c2500003e0bb Mon Sep 17 00:00:00 2001 From: aguhh18 Date: Fri, 5 Dec 2025 19:08:58 +0700 Subject: [PATCH] Feat[BE-300]: add preload for kandang for get penjualan --- internal/modules/closings/dto/closingMarketing.dto.go | 6 ++++-- internal/modules/closings/services/closing.service.go | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/modules/closings/dto/closingMarketing.dto.go b/internal/modules/closings/dto/closingMarketing.dto.go index 26652e50..4c47a7e0 100644 --- a/internal/modules/closings/dto/closingMarketing.dto.go +++ b/internal/modules/closings/dto/closingMarketing.dto.go @@ -28,8 +28,6 @@ type SalesDTO struct { PaymentStatus string `json:"payment_status"` } - - type PenjualanRealisasiResponseDTO struct { ProjectType string `json:"project_type"` FlockId uint `json:"flock_id"` @@ -57,6 +55,10 @@ func ToSalesDTO(e entity.MarketingDeliveryProduct) SalesDTO { } var kandang *kandangDTO.KandangRelationDTO + if e.MarketingProduct.ProductWarehouse.ProjectFlockKandang != nil && e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang.Id != 0 { + mapped := kandangDTO.ToKandangRelationDTO(e.MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang) + kandang = &mapped + } doNumber := deliveryOrdersDTO.GenerateDeliveryOrderNumber(e.MarketingProduct.Marketing.SoNumber, e.DeliveryDate, e.MarketingProduct.ProductWarehouse.Warehouse.Id) diff --git a/internal/modules/closings/services/closing.service.go b/internal/modules/closings/services/closing.service.go index 258de214..b0c29a7c 100644 --- a/internal/modules/closings/services/closing.service.go +++ b/internal/modules/closings/services/closing.service.go @@ -90,6 +90,7 @@ func (s closingService) GetPenjualan(c *fiber.Ctx, projectFlockID uint) ([]entit Preload("MarketingProduct.ProductWarehouse.Product.Flags"). Preload("MarketingProduct.ProductWarehouse.Warehouse"). Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang"). + Preload("MarketingProduct.ProductWarehouse.ProjectFlockKandang.Kandang"). Preload("MarketingProduct.Marketing"). Preload("MarketingProduct.Marketing.Customer"). Order("marketing_delivery_products.delivery_date DESC")