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

fix projectflock approval with dto

Browse Source
This commit is contained in:
ragilap
2025-12-11 11:27:50 +07:00
parent 3ada837b8b
commit f60564d673
3 changed files with 117 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/production/project-flock-kandangs/controllers/project_flock_kandang.controller.go
+11 -2
View File
@@ -101,13 +101,22 @@ func (u *ProjectFlockKandangController) Closing(c *fiber.Ctx) error {
return err
}
detail, availableQtys, productWarehouses, err := u.ProjectFlockKandangService.GetOne(c, result.Id)
if err != nil {
return err
}
detailDTO := dto.ToProjectFlockKandangDetailDTOWithAvailableQty(*detail, availableQtys, productWarehouses)
return c.Status(fiber.StatusOK).
JSON(response.Success{
Code: fiber.StatusOK,
Status: "success",
Message: "Status closing kandang diperbarui",
// Data: dto.ProjectFlockKandangDetailDTO(*result),
Data: result,
Data: fiber.Map{
"detail": detailDTO,
"approval": detailDTO.Approval,
},
})
}
internal/modules/production/project-flock-kandangs/services/project_flock_kandang.service.go
+49 -21
View File
@@ -432,16 +432,30 @@ func (s projectFlockKandangService) Closing(c *fiber.Ctx, id uint, req *validati
}
if s.ApprovalSvc != nil {
closeAction := entity.ApprovalActionApproved
if _, aerr := s.ApprovalSvc.CreateApproval(
c.Context(),
utils.ApprovalWorkflowProjectFlockKandang,
id,
utils.ProjectFlockKandangStepClosed,
&closeAction,
actorID,
nil,
); aerr != nil {
return nil, aerr
// Hindari duplikasi jika approval terakhir sudah Closed + Approved
latestPFK, lerr := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowProjectFlockKandang, id, nil)
if lerr != nil {
return nil, lerr
}
shouldCreate := true
if latestPFK != nil &&
latestPFK.StepNumber == uint16(utils.ProjectFlockKandangStepClosed) &&
latestPFK.Action != nil && *latestPFK.Action == closeAction {
shouldCreate = false
}
if shouldCreate {
if _, aerr := s.ApprovalSvc.CreateApproval(
c.Context(),
utils.ApprovalWorkflowProjectFlockKandang,
id,
utils.ProjectFlockKandangStepClosed,
&closeAction,
actorID,
nil,
); aerr != nil {
return nil, aerr
}
}
// Jika semua kandang dalam project sudah ditutup, set approval project flock ke SELESAI.
@@ -500,17 +514,31 @@ func (s projectFlockKandangService) Closing(c *fiber.Ctx, id uint, req *validati
}
}
if s.ApprovalSvc != nil {
reopenAction := entity.ApprovalActionApproved
if _, aerr := s.ApprovalSvc.CreateApproval(
c.Context(),
utils.ApprovalWorkflowProjectFlockKandang,
id,
utils.ProjectFlockKandangStepDisetujui,
&reopenAction,
actorID,
nil,
); aerr != nil && !errors.Is(aerr, gorm.ErrDuplicatedKey) {
return nil, aerr
reopenAction := entity.ApprovalActionUpdated
// Hindari duplikasi jika approval terakhir sudah Disetujui + Updated
latestPFK, lerr := s.ApprovalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowProjectFlockKandang, id, nil)
if lerr != nil {
return nil, lerr
}
shouldCreate := true
if latestPFK != nil &&
latestPFK.StepNumber == uint16(utils.ProjectFlockKandangStepDisetujui) &&
latestPFK.Action != nil && *latestPFK.Action == reopenAction {
shouldCreate = false
}
if shouldCreate {
if _, aerr := s.ApprovalSvc.CreateApproval(
c.Context(),
utils.ApprovalWorkflowProjectFlockKandang,
id,
utils.ProjectFlockKandangStepDisetujui,
&reopenAction,
actorID,
nil,
); aerr != nil && !errors.Is(aerr, gorm.ErrDuplicatedKey) {
return nil, aerr
}
}
}
default: