From e4d4bd94836dc94bb597a3354c03303adc016d34 Mon Sep 17 00:00:00 2001 From: Adnan Zahir Date: Tue, 28 Apr 2026 13:47:16 +0700 Subject: [PATCH] fix: flock label on farm-level products --- .../product-warehouses/dto/product_warehouse.dto.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go b/internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go index 97cff885..344e8d96 100644 --- a/internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go +++ b/internal/modules/inventory/product-warehouses/dto/product_warehouse.dto.go @@ -79,8 +79,12 @@ func ToProductWarehouseListDTO(e entity.ProductWarehouse) ProductWarehouseListDT if e.Product.Id != 0 { product := productDTO.ToProductRelationDTO(e.Product) - // Create a copy with flock name appended if exists - if e.ProjectFlockKandang != nil && e.ProjectFlockKandang.ProjectFlock.Id != 0 { + // Append flock name only for KANDANG-type warehouses. + // Farm-level (LOKASI) warehouses are shared across flocks — attaching a flock + // label there creates duplicates and is misleading. + if e.ProjectFlockKandang != nil && + e.ProjectFlockKandang.ProjectFlock.Id != 0 && + e.Warehouse.Type == "KANDANG" { productCopy := product productCopy.Name = product.Name + " (" + e.ProjectFlockKandang.ProjectFlock.FlockName + ")" dto.Product = &productCopy