fix[BE]: fixing null project flock ikandang id on lookup

This commit is contained in:
aguhh18
2025-11-13 20:27:49 +07:00
parent 2f5fab9f80
commit 903b114315
2 changed files with 17 additions and 12 deletions
@@ -74,7 +74,9 @@ type ProjectFlockKandangDetailDTO struct {
func ToProjectFlockKandangBaseDTO(e entity.ProjectFlockKandang) ProjectFlockKandangBaseDTO { func ToProjectFlockKandangBaseDTO(e entity.ProjectFlockKandang) ProjectFlockKandangBaseDTO {
return ProjectFlockKandangBaseDTO{ return ProjectFlockKandangBaseDTO{
Id: e.Id, Id: e.Id,
KandangId: e.KandangId,
ProjectFlockId: e.ProjectFlockId,
} }
} }
@@ -28,12 +28,13 @@ type ProjectFlockWithPivotDTO struct {
} }
type ProjectFlockKandangDTO struct { type ProjectFlockKandangDTO struct {
Id uint `json:"id"` Id uint `json:"id"`
ProjectFlockKandangId uint `json:"project_flock_kandang_id"`
KandangId uint `json:"kandang_id"` ProjectFlockId uint `json:"project_flock_id"`
Kandang *kandangDTO.KandangBaseDTO `json:"kandang,omitempty"` KandangId uint `json:"kandang_id"`
ProjectFlock *ProjectFlockWithPivotDTO `json:"project_flock,omitempty"` Kandang *kandangDTO.KandangBaseDTO `json:"kandang,omitempty"`
AvailableQuantity float64 `json:"available_quantity"` ProjectFlock *ProjectFlockWithPivotDTO `json:"project_flock,omitempty"`
AvailableQuantity float64 `json:"available_quantity"`
} }
func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangDTO { func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangDTO {
@@ -88,10 +89,12 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
} }
return ProjectFlockKandangDTO{ return ProjectFlockKandangDTO{
Id: e.Id, Id: e.Id,
KandangId: e.KandangId, ProjectFlockKandangId: e.Id,
Kandang: kandang, ProjectFlockId: e.ProjectFlockId,
ProjectFlock: pf, KandangId: e.KandangId,
AvailableQuantity: 0, Kandang: kandang,
ProjectFlock: pf,
AvailableQuantity: 0,
} }
} }