gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 13:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/BE/Sprint-5' into 'feat/BE/US-159,160/marketing'

Browse Source 
# Conflicts:
#   internal/modules/production/project_flocks/controllers/projectflock.controller.go
#   internal/modules/production/project_flocks/dto/projectflock.dto.go
#   internal/modules/production/project_flocks/route.go
#   internal/modules/production/transfer_layings/dto/transfer_laying.dto.go
This commit is contained in:
Hafizh A. Y.
2025-11-20 02:16:12 +00:00
parent bf8519df3f f5b7fd60ad
commit 3080a6f8ef
14 changed files with 337 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/production/chickins/dto/chickin.dto.go
+4 -3
View File
@@ -109,7 +109,8 @@ func ToUserBaseDTO(e entity.User) userBaseDTO.UserBaseDTO {
return userBaseDTO.ToUserBaseDTO(e)
}
func ToProjectFlockDTO(e entity.ProjectFlock) ProjectFlockDTO {
func ToProjectFlockDTO(pfk entity.ProjectFlockKandang) ProjectFlockDTO {
e := pfk.ProjectFlock
var flock *flockBaseDTO.FlockBaseDTO
if base := pfutils.DeriveBaseName(e.FlockName); base != "" {
summary := flockBaseDTO.FlockBaseDTO{Id: 0, Name: base}
@@ -132,7 +133,7 @@ func ToProjectFlockDTO(e entity.ProjectFlock) ProjectFlockDTO {
}
return ProjectFlockDTO{
Id: e.Id,
Period: e.Period,
Period: pfk.Period,
Category: e.Category,
Flock: flock,
Area: area,
@@ -144,7 +145,7 @@ func ToProjectFlockDTO(e entity.ProjectFlock) ProjectFlockDTO {
func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangDTO {
var pf *ProjectFlockDTO
if e.ProjectFlock.Id != 0 {
mapped := ToProjectFlockDTO(e.ProjectFlock)
mapped := ToProjectFlockDTO(e)
pf = &mapped
}
var kandang *kandangBaseDTO.KandangBaseDTO