fix(BE-273): add object nonstock and supplier in response get one and fix name base to relation in dto

internal/modules/production/project_flocks/controllers/projectflock.controller.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 
-	flockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/services"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/validations"
@@ -85,7 +84,7 @@ func (u *ProjectflockController) GetAll(c *fiber.Ctx) error {
 		query.KandangIds = ids
 	}
 
-	result, totalResults, flockMap, err := u.ProjectflockService.GetAll(c, query)
+	result, totalResults, _, err := u.ProjectflockService.GetAll(c, query)
 	if err != nil {
 		return err
 	}
@@ -124,7 +123,7 @@ func (u *ProjectflockController) GetOne(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusBadRequest, "Invalid Id")
 	}
 
-	result, flock, err := u.ProjectflockService.GetOne(c, uint(id))
+	result, _, err := u.ProjectflockService.GetOne(c, uint(id))
 	if err != nil {
 		return err
 	}
@@ -162,7 +161,7 @@ func (u *ProjectflockController) CreateOne(c *fiber.Ctx) error {
 			Code:    fiber.StatusCreated,
 			Status:  "success",
 			Message: "Create projectflock successfully",
-			Data:    dto.ToProjectFlockListDTO(*result, nil),
+			Data:    dto.ToProjectFlockListDTO(*result),
 		})
 }
 
@@ -189,7 +188,7 @@ func (u *ProjectflockController) UpdateOne(c *fiber.Ctx) error {
 			Code:    fiber.StatusOK,
 			Status:  "success",
 			Message: "Update projectflock successfully",
-			Data:    dto.ToProjectFlockListDTO(*result, nil),
+			Data:    dto.ToProjectFlockListDTO(*result),
 		})
 }
 

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

@@ -17,28 +17,28 @@ import (
 	approvalutils "gitlab.com/mbugroup/lti-api.git/internal/utils/approvals"
 )
 
-type ProjectFlockBaseDTO struct {
+type ProjectFlockRelationDTO struct {
 	Id        uint   `json:"id"`
 	Period    int    `json:"period"`
 	FlockName string `json:"flock_name"`
 }
 
 type ProjectFlockListDTO struct {
-	ProjectFlockBaseDTO
-	Flock       *flockDTO.FlockBaseDTO         `json:"flock,omitempty"`
-	Area        *areaDTO.AreaBaseDTO           `json:"area,omitempty"`
-	Category    string                         `json:"category"`
-	Fcr         *fcrDTO.FcrBaseDTO             `json:"fcr,omitempty"`
-	Location    *locationDTO.LocationBaseDTO   `json:"location,omitempty"`
-	Kandangs    []KandangWithProjectFlockIdDTO `json:"kandangs,omitempty"`
-	CreatedUser *userDTO.UserBaseDTO           `json:"created_user"`
-	CreatedAt   time.Time                      `json:"created_at"`
-	UpdatedAt   time.Time                      `json:"updated_at"`
-	Approval    approvalDTO.ApprovalBaseDTO    `json:"approval"`
+	ProjectFlockRelationDTO
+	Flock       *flockDTO.FlockRelationDTO       `json:"flock,omitempty"`
+	Area        *areaDTO.AreaRelationDTO         `json:"area,omitempty"`
+	Category    string                           `json:"category"`
+	Fcr         *fcrDTO.FcrRelationDTO           `json:"fcr,omitempty"`
+	Location    *locationDTO.LocationRelationDTO `json:"location,omitempty"`
+	Kandangs    []KandangWithProjectFlockIdDTO   `json:"kandangs,omitempty"`
+	CreatedUser *userDTO.UserRelationDTO         `json:"created_user"`
+	CreatedAt   time.Time                        `json:"created_at"`
+	UpdatedAt   time.Time                        `json:"updated_at"`
+	Approval    approvalDTO.ApprovalRelationDTO  `json:"approval"`
 }
 
 type KandangWithProjectFlockIdDTO struct {
-	kandangDTO.KandangBaseDTO
+	kandangDTO.KandangRelationDTO
 	ProjectFlockKandangId uint `json:"project_flock_kandang_id"`
 }
 
@@ -47,8 +47,8 @@ type ProjectFlockDetailDTO struct {
 }
 
 type FlockPeriodDTO struct {
-	Flock      flockDTO.FlockBaseDTO `json:"flock"`
-	NextPeriod int                   `json:"next_period"`
+	Flock      flockDTO.FlockRelationDTO `json:"flock"`
+	NextPeriod int                       `json:"next_period"`
 }
 
 type KandangPeriodSummaryDTO struct {
@@ -58,9 +58,9 @@ type KandangPeriodSummaryDTO struct {
 }
 
 func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectFlockListDTO {
-	var createdUser *userDTO.UserBaseDTO
+	var createdUser *userDTO.UserRelationDTO
 	if e.CreatedUser.Id != 0 {
-		mapped := userDTO.ToUserBaseDTO(e.CreatedUser)
+		mapped := userDTO.ToUserRelationDTO(e.CreatedUser)
 		createdUser = &mapped
 	}
 
@@ -77,34 +77,34 @@ func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectF
 				}
 			}
 			kandangSummaries[i] = KandangWithProjectFlockIdDTO{
-				KandangBaseDTO:        kandangDTO.ToKandangBaseDTO(kandang),
+				KandangRelationDTO:    kandangDTO.ToKandangRelationDTO(kandang),
 				ProjectFlockKandangId: pfkId,
 			}
 		}
 	}
 
-	var areaSummary *areaDTO.AreaBaseDTO
+	var areaSummary *areaDTO.AreaRelationDTO
 	if e.Area.Id != 0 {
-		mapped := areaDTO.ToAreaBaseDTO(e.Area)
+		mapped := areaDTO.ToAreaRelationDTO(e.Area)
 		areaSummary = &mapped
 	}
 
-	var fcrSummary *fcrDTO.FcrBaseDTO
+	var fcrSummary *fcrDTO.FcrRelationDTO
 	if e.Fcr.Id != 0 {
-		mapped := fcrDTO.ToFcrBaseDTO(e.Fcr)
+		mapped := fcrDTO.ToFcrRelationDTO(e.Fcr)
 		fcrSummary = &mapped
 	}
 
-	var locationSummary *locationDTO.LocationBaseDTO
+	var locationSummary *locationDTO.LocationRelationDTO
 	if e.Location.Id != 0 {
-		mapped := locationDTO.ToLocationBaseDTO(e.Location)
+		mapped := locationDTO.ToLocationRelationDTO(e.Location)
 		locationSummary = &mapped
 	}
 
-	var flockSummary *flockDTO.FlockBaseDTO
-	if flock != nil && flock.Id != 0 {
-		flockSummary = flock
-	}
+	// var flockSummary *flockDTO.FlockRelationDTO
+	// if flock != nil && flock.Id != 0 {
+	// 	flockSummary = flock
+	// }
 
 	latestApproval := defaultProjectFlockLatestApproval(e)
 	if e.LatestApproval != nil {
@@ -113,7 +113,7 @@ func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectF
 	}
 
 	return ProjectFlockListDTO{
-		ProjectFlockBaseDTO: createProjectFlockBaseDTO(e, period),
+		ProjectFlockRelationDTO: createProjectFlockRelationDTO(e, period),
 		// Flock:               flockSummary,
 		Area:        areaSummary,
 		Kandangs:    kandangSummaries,
@@ -127,8 +127,8 @@ func ToProjectFlockListDTOWithPeriod(e entity.ProjectFlock, period int) ProjectF
 	}
 }
 
-func ToProjectFlockListDTOWithFlock(e entity.ProjectFlock, flock *flockDTO.FlockBaseDTO) ProjectFlockListDTO {
-	return ToProjectFlockListDTO(e, flock)
+func ToProjectFlockListDTOWithFlock(e entity.ProjectFlock, flock *flockDTO.FlockRelationDTO) ProjectFlockListDTO {
+	return ToProjectFlockListDTO(e)
 }
 
 func ToProjectFlockListDTOs(items []entity.ProjectFlock) []ProjectFlockListDTO {
@@ -160,10 +160,10 @@ func ToProjectFlockListDTOsWithPeriods(items []entity.ProjectFlock, periods map[
 func ToProjectFlockListDTOsWithFlocks(items []entity.ProjectFlock, flocks map[uint]*entity.Flock) []ProjectFlockListDTO {
 	result := make([]ProjectFlockListDTO, len(items))
 	for i, item := range items {
-		var flock *flockDTO.FlockBaseDTO
+		var flock *flockDTO.FlockRelationDTO
 		if flocks != nil {
 			if f := flocks[item.Id]; f != nil {
-				flock = &flockDTO.FlockBaseDTO{
+				flock = &flockDTO.FlockRelationDTO{
 					Id:   f.Id,
 					Name: f.Name,
 				}
@@ -174,14 +174,14 @@ func ToProjectFlockListDTOsWithFlocks(items []entity.ProjectFlock, flocks map[ui
 	return result
 }
 
-func ToProjectFlockDetailDTO(e entity.ProjectFlock, flock *flockDTO.FlockBaseDTO) ProjectFlockDetailDTO {
+func ToProjectFlockDetailDTO(e entity.ProjectFlock, flock *flockDTO.FlockRelationDTO) ProjectFlockDetailDTO {
 	return ProjectFlockDetailDTO{
 		ProjectFlockListDTO: ToProjectFlockListDTOWithPeriod(e, 0),
 	}
 }
 
-func defaultProjectFlockLatestApproval(e entity.ProjectFlock) approvalDTO.ApprovalBaseDTO {
-	result := approvalDTO.ApprovalBaseDTO{}
+func defaultProjectFlockLatestApproval(e entity.ProjectFlock) approvalDTO.ApprovalRelationDTO {
+	result := approvalDTO.ApprovalRelationDTO{}
 
 	step := utils.ProjectFlockStepPengajuan
 	if step > 0 {
@@ -194,9 +194,9 @@ func defaultProjectFlockLatestApproval(e entity.ProjectFlock) approvalDTO.Approv
 	}
 
 	if e.CreatedUser.Id != 0 {
-		result.ActionBy = userDTO.ToUserBaseDTO(e.CreatedUser)
+		result.ActionBy = userDTO.ToUserRelationDTO(e.CreatedUser)
 	} else if e.CreatedBy != 0 {
-		result.ActionBy = userDTO.UserBaseDTO{
+		result.ActionBy = userDTO.UserRelationDTO{
 			Id:     e.CreatedBy,
 			IdUser: int64(e.CreatedBy),
 		}
@@ -205,16 +205,16 @@ func defaultProjectFlockLatestApproval(e entity.ProjectFlock) approvalDTO.Approv
 	return result
 }
 
-func createProjectFlockBaseDTO(e entity.ProjectFlock, period int) ProjectFlockBaseDTO {
-	return ProjectFlockBaseDTO{
+func createProjectFlockRelationDTO(e entity.ProjectFlock, period int) ProjectFlockRelationDTO {
+	return ProjectFlockRelationDTO{
 		Id:        e.Id,
 		Period:    period,
 		FlockName: e.FlockName,
 	}
 }
 
-func ToFlockSummaryDTO(e entity.Flock) flockDTO.FlockBaseDTO {
-	return flockDTO.FlockBaseDTO{
+func ToFlockSummaryDTO(e entity.Flock) flockDTO.FlockRelationDTO {
+	return flockDTO.FlockRelationDTO{
 		Id:   e.Id,
 		Name: e.Name,
 	}

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

@@ -12,35 +12,35 @@ import (
 )
 
 type KandangWithPivotDTO struct {
-	kandangDTO.KandangBaseDTO
+	kandangDTO.KandangRelationDTO
 	AvailableQuantity float64 `json:"available_quantity"`
 }
 
 type ProjectFlockWithPivotDTO struct {
-	ProjectFlockBaseDTO
-	Flock       *flockDTO.FlockBaseDTO       `json:"flock,omitempty"`
-	Area        *areaDTO.AreaBaseDTO         `json:"area,omitempty"`
-	Category    string                       `json:"category"`
-	Fcr         *fcrDTO.FcrBaseDTO           `json:"fcr,omitempty"`
-	Location    *locationDTO.LocationBaseDTO `json:"location,omitempty"`
-	Kandangs    []KandangWithPivotDTO        `json:"kandangs,omitempty"`
-	CreatedUser *userDTO.UserBaseDTO         `json:"created_user,omitempty"`
+	ProjectFlockRelationDTO
+	Flock       *flockDTO.FlockRelationDTO       `json:"flock,omitempty"`
+	Area        *areaDTO.AreaRelationDTO         `json:"area,omitempty"`
+	Category    string                           `json:"category"`
+	Fcr         *fcrDTO.FcrRelationDTO           `json:"fcr,omitempty"`
+	Location    *locationDTO.LocationRelationDTO `json:"location,omitempty"`
+	Kandangs    []KandangWithPivotDTO            `json:"kandangs,omitempty"`
+	CreatedUser *userDTO.UserRelationDTO         `json:"created_user,omitempty"`
 }
 
 type ProjectFlockKandangDTO struct {
-	Id                    uint                       `json:"id"`
-	ProjectFlockKandangId uint                       `json:"project_flock_kandang_id"`
-	ProjectFlockId        uint                       `json:"project_flock_id"`
-	KandangId             uint                       `json:"kandang_id"`
-	Kandang               *kandangDTO.KandangBaseDTO `json:"kandang,omitempty"`
-	ProjectFlock          *ProjectFlockWithPivotDTO  `json:"project_flock,omitempty"`
-	AvailableQuantity     float64                    `json:"available_quantity"`
+	Id                    uint                           `json:"id"`
+	ProjectFlockKandangId uint                           `json:"project_flock_kandang_id"`
+	ProjectFlockId        uint                           `json:"project_flock_id"`
+	KandangId             uint                           `json:"kandang_id"`
+	Kandang               *kandangDTO.KandangRelationDTO `json:"kandang,omitempty"`
+	ProjectFlock          *ProjectFlockWithPivotDTO      `json:"project_flock,omitempty"`
+	AvailableQuantity     float64                        `json:"available_quantity"`
 }
 
 func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangDTO {
-	var kandang *kandangDTO.KandangBaseDTO
+	var kandang *kandangDTO.KandangRelationDTO
 	if e.Kandang.Id != 0 {
-		mapped := kandangDTO.ToKandangBaseDTO(e.Kandang)
+		mapped := kandangDTO.ToKandangRelationDTO(e.Kandang)
 		kandang = &mapped
 	}
 
@@ -48,7 +48,7 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 	if e.ProjectFlock.Id != 0 {
 
 		pfLocal := ProjectFlockWithPivotDTO{
-			ProjectFlockBaseDTO: ProjectFlockBaseDTO{
+			ProjectFlockRelationDTO: ProjectFlockRelationDTO{
 				Id:        e.ProjectFlock.Id,
 				Period:    e.Period,
 				FlockName: e.ProjectFlock.FlockName,
@@ -57,31 +57,31 @@ func ToProjectFlockKandangDTO(e entity.ProjectFlockKandang) ProjectFlockKandangD
 		}
 
 		if base := pfutils.DeriveBaseName(e.ProjectFlock.FlockName); base != "" {
-			summary := flockDTO.FlockBaseDTO{Id: 0, Name: base}
+			summary := flockDTO.FlockRelationDTO{Id: 0, Name: base}
 			pfLocal.Flock = &summary
 		}
 		if e.ProjectFlock.Area.Id != 0 {
-			mapped := areaDTO.ToAreaBaseDTO(e.ProjectFlock.Area)
+			mapped := areaDTO.ToAreaRelationDTO(e.ProjectFlock.Area)
 			pfLocal.Area = &mapped
 		}
 		if e.ProjectFlock.Fcr.Id != 0 {
-			mapped := fcrDTO.ToFcrBaseDTO(e.ProjectFlock.Fcr)
+			mapped := fcrDTO.ToFcrRelationDTO(e.ProjectFlock.Fcr)
 			pfLocal.Fcr = &mapped
 		}
 		if e.ProjectFlock.Location.Id != 0 {
-			mapped := locationDTO.ToLocationBaseDTO(e.ProjectFlock.Location)
+			mapped := locationDTO.ToLocationRelationDTO(e.ProjectFlock.Location)
 			pfLocal.Location = &mapped
 		}
 		if e.ProjectFlock.CreatedUser.Id != 0 {
-			mapped := userDTO.ToUserBaseDTO(e.ProjectFlock.CreatedUser)
+			mapped := userDTO.ToUserRelationDTO(e.ProjectFlock.CreatedUser)
 			pfLocal.CreatedUser = &mapped
 		}
 
 		for _, k := range e.ProjectFlock.Kandangs {
-			kb := kandangDTO.ToKandangBaseDTO(k)
+			kb := kandangDTO.ToKandangRelationDTO(k)
 			pfLocal.Kandangs = append(pfLocal.Kandangs, KandangWithPivotDTO{
-				KandangBaseDTO:    kb,
-				AvailableQuantity: 0,
+				KandangRelationDTO: kb,
+				AvailableQuantity:  0,
 			})
 		}
 

internal/modules/production/project_flocks/services/projectflock.service.go

@@ -29,8 +29,8 @@ import (
 )
 
 type ProjectflockService interface {
-	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, map[uint]*flockDTO.FlockBaseDTO, error)
-	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockBaseDTO, error)
+	GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, map[uint]*flockDTO.FlockRelationDTO, error)
+	GetOne(ctx *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockRelationDTO, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.ProjectFlock, error)
 	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.ProjectFlock, error)
 	GetAvailableDocQuantity(ctx *fiber.Ctx, kandangID uint) (float64, error)
@@ -96,7 +96,7 @@ func (s projectflockService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("KandangHistory.Kandang")
 }
 
-func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, map[uint]*flockDTO.FlockBaseDTO, error) {
+func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.ProjectFlock, int64, map[uint]*flockDTO.FlockRelationDTO, error) {
 	if err := s.Validate.Struct(params); err != nil {
 		return nil, 0, nil, err
 	}
@@ -137,7 +137,7 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 		}
 	}
 
-	flockMap := make(map[uint]*flockDTO.FlockBaseDTO)
+	flockMap := make(map[uint]*flockDTO.FlockRelationDTO)
 	for i := range projectflocks {
 		if projectflocks[i].FlockName != "" {
 			baseName := pfutils.DeriveBaseName(projectflocks[i].FlockName)
@@ -146,7 +146,7 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 				if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 					s.Log.Warnf("Failed to fetch flock %q: %+v", baseName, err)
 				} else if flock != nil {
-					flockMap[projectflocks[i].Id] = &flockDTO.FlockBaseDTO{
+					flockMap[projectflocks[i].Id] = &flockDTO.FlockRelationDTO{
 						Id:   flock.Id,
 						Name: flock.Name,
 					}
@@ -187,7 +187,7 @@ func (s projectflockService) getOneEntityOnly(c *fiber.Ctx, id uint) (*entity.Pr
 	return projectflock, nil
 }
 
-func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockBaseDTO, error) {
+func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock, *flockDTO.FlockRelationDTO, error) {
 	projectflock, err := s.Repository.GetByID(c.Context(), id, s.Repository.WithDefaultRelations())
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
@@ -214,7 +214,7 @@ func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock
 	}
 
 	// Fetch Flock master data for this ProjectFlock
-	var flockResult *flockDTO.FlockBaseDTO
+	var flockResult *flockDTO.FlockRelationDTO
 	if projectflock.FlockName != "" {
 		baseName := pfutils.DeriveBaseName(projectflock.FlockName)
 		if baseName != "" {
@@ -222,7 +222,7 @@ func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock
 			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 				s.Log.Warnf("Failed to fetch flock %q: %+v", baseName, err)
 			} else if flock != nil {
-				flockResult = &flockDTO.FlockBaseDTO{
+				flockResult = &flockDTO.FlockRelationDTO{
 					Id:   flock.Id,
 					Name: flock.Name,
 				}