feat[BE-127] add source and target project flock to transfer laying API

internal/modules/production/project-flock-kandangs/services/project_flock_kandang.service.go

@@ -85,7 +85,6 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 		}
 	}
 
-	// Fetch Flock master data for each ProjectFlockKandang
 	flockMap := make(map[uint]*flockDTO.FlockBaseDTO)
 	for i := range projectFlockKandangs {
 		if projectFlockKandangs[i].ProjectFlock.Id != 0 {
@@ -95,7 +94,7 @@ func (s projectFlockKandangService) GetAll(c *fiber.Ctx, params *validation.Quer
 				if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 					s.Log.Warnf("Failed to fetch flock %q: %+v", baseName, err)
 				} else if flock != nil {
-					// Convert to DTO and store in map with ProjectFlockId as key
+
 					flockMap[projectFlockKandangs[i].ProjectFlock.Id] = &flockDTO.FlockBaseDTO{
 						Id:   flock.Id,
 						Name: flock.Name,

internal/modules/production/transfer_layings/dto/transfer_laying.dto.go

@@ -18,9 +18,9 @@ type TransferLayingBaseDTO struct {
 }
 
 type ProjectFlockSummaryDTO struct {
-	Id       uint   `json:"id"`
-	Period   int    `json:"period"`
-	Category string `json:"category"`
+	Id        uint   `json:"id"`
+	FlockName string `json:"flock_name"`
+	Category  string `json:"category"`
 }
 
 type ProductSummaryDTO struct {
@@ -40,8 +40,13 @@ type ProductWarehouseSummaryDTO struct {
 }
 
 type ProjectFlockKandangSummaryDTO struct {
-	Id        uint `json:"id"`
-	KandangId uint `json:"kandang_id"`
+	Id      uint               `json:"id"`
+	Kandang *KandangSummaryDTO `json:"kandang,omitempty"`
+}
+
+type KandangSummaryDTO struct {
+	Id   uint   `json:"id"`
+	Name string `json:"name"`
 }
 
 type LayingTransferSourceDTO struct {
@@ -99,9 +104,9 @@ func ToProjectFlockSummaryDTO(pf *entity.ProjectFlock) *ProjectFlockSummaryDTO {
 	}
 
 	return &ProjectFlockSummaryDTO{
-		Id:       pf.Id,
-		Period:   pf.Period,
-		Category: pf.Category,
+		Id:        pf.Id,
+		FlockName: pf.FlockName,
+		Category:  pf.Category,
 	}
 }
 
@@ -110,9 +115,17 @@ func ToProjectFlockKandangSummaryDTO(pfk *entity.ProjectFlockKandang) *ProjectFl
 		return nil
 	}
 
+	var kandang *KandangSummaryDTO
+	if pfk.Kandang.Id != 0 {
+		kandang = &KandangSummaryDTO{
+			Id:   pfk.Kandang.Id,
+			Name: pfk.Kandang.Name,
+		}
+	}
+
 	return &ProjectFlockKandangSummaryDTO{
-		Id:        pfk.Id,
-		KandangId: pfk.KandangId,
+		Id:      pfk.Id,
+		Kandang: kandang,
 	}
 }
 

internal/modules/production/transfer_layings/services/transfer_laying.service.go

@@ -72,13 +72,17 @@ func NewTransferLayingService(
 func (s transferLayingService) withRelations(db *gorm.DB) *gorm.DB {
 	return db.
 		Preload("CreatedUser").
+		Preload("FromProjectFlock").
+		Preload("ToProjectFlock").
 		Preload("Sources").
 		Preload("Sources.SourceProjectFlockKandang").
+		Preload("Sources.SourceProjectFlockKandang.Kandang").
 		Preload("Sources.ProductWarehouse").
 		Preload("Sources.ProductWarehouse.Product").
 		Preload("Sources.ProductWarehouse.Warehouse").
 		Preload("Targets").
 		Preload("Targets.TargetProjectFlockKandang").
+		Preload("Targets.TargetProjectFlockKandang.Kandang").
 		Preload("Targets.ProductWarehouse").
 		Preload("Targets.ProductWarehouse.Product").
 		Preload("Targets.ProductWarehouse.Warehouse")