fix(BE): req body approval and fix projectflock.dto

internal/modules/production/project_flocks/dto/projectflock.dto.go

@@ -58,6 +58,30 @@ func ToProjectFlockListDTO(e entity.ProjectFlock) ProjectFlockListDTO {
 		}
 	}
 
+	var flockSummary *flockDTO.FlockBaseDTO
+	if e.Flock.Id != 0 {
+		mapped := flockDTO.ToFlockBaseDTO(e.Flock)
+		flockSummary = &mapped
+	}
+
+	var areaSummary *areaDTO.AreaBaseDTO
+	if e.Area.Id != 0 {
+		mapped := areaDTO.ToAreaBaseDTO(e.Area)
+		areaSummary = &mapped
+	}
+
+	var fcrSummary *fcrDTO.FcrBaseDTO
+	if e.Fcr.Id != 0 {
+		mapped := fcrDTO.ToFcrBaseDTO(e.Fcr)
+		fcrSummary = &mapped
+	}
+
+	var locationSummary *locationDTO.LocationBaseDTO
+	if e.Location.Id != 0 {
+		mapped := locationDTO.ToLocationBaseDTO(e.Location)
+		locationSummary = &mapped
+	}
+
 	latestApproval := defaultProjectFlockLatestApproval(e)
 	if e.LatestApproval != nil {
 		snapshot := approvalDTO.ToApprovalDTO(*e.LatestApproval)
@@ -66,8 +90,12 @@ func ToProjectFlockListDTO(e entity.ProjectFlock) ProjectFlockListDTO {
 
 	return ProjectFlockListDTO{
 		ProjectFlockBaseDTO: createProjectFlockBaseDTO(e),
+		Flock:               flockSummary,
+		Area:                areaSummary,
 		Kandangs:            kandangSummaries,
 		Category:            e.Category,
+		Fcr:                 fcrSummary,
+		Location:            locationSummary,
 		CreatedAt:           e.CreatedAt,
 		UpdatedAt:           e.UpdatedAt,
 		CreatedUser:         createdUser,
@@ -101,13 +129,6 @@ func defaultProjectFlockLatestApproval(e entity.ProjectFlock) approvalDTO.Approv
 			result.StepName = label
 		}
 	}
-	if result.StepName == "" {
-		result.StepName = "Pengajuan"
-	}
-
-	if !e.CreatedAt.IsZero() {
-		result.ActionAt = e.CreatedAt
-	}
 
 	if e.CreatedUser.Id != 0 {
 		result.ActionBy = userDTO.ToUserBaseDTO(e.CreatedUser)