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

2026-05-20 13:31:56 +00:00 · 2025-10-22 16:49:45 +07:00
parent 8d0bd3724d
commit 56b1134872
5 changed files with 103 additions and 55 deletions
@@ -29,7 +29,7 @@ type ProjectflockService interface {
 	UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.ProjectFlock, error)
 	DeleteOne(ctx *fiber.Ctx, id uint) error
 	GetFlockPeriodSummary(ctx *fiber.Ctx, flockID uint) (*FlockPeriodSummary, error)
-	Approval(ctx *fiber.Ctx, id uint, req *validation.Approve) (*entity.ProjectFlock, error)
+	Approval(ctx *fiber.Ctx, req *validation.Approve) ([]entity.ProjectFlock, error)
 }

 type projectflockService struct {
@@ -501,17 +501,11 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 	return s.GetOne(c, id)
 }

-func (s projectflockService) Approval(c *fiber.Ctx, id uint, req *validation.Approve) (*entity.ProjectFlock, error) {
+func (s projectflockService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entity.ProjectFlock, error) {
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err
 	}

-	project, err := s.GetOne(c, id)
-	if err != nil {
-		s.Log.Errorf("Failed to fetch projectflock %d before approval: %+v", id, err)
-		return nil, err
-	}
-
 	actorID := uint(1) // TODO: change from auth context
 	var action entity.ApprovalAction
 	switch strings.ToUpper(strings.TrimSpace(req.Action)) {
@@ -523,42 +517,58 @@ func (s projectflockService) Approval(c *fiber.Ctx, id uint, req *validation.App
 		return nil, fiber.NewError(fiber.StatusBadRequest, "action must be APPROVED or REJECTED")
 	}

+	approvableIDs := uniqueUintSlice(req.ApprovableIds)
+	if len(approvableIDs) == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "approvable_ids must contain at least one id")
+	}
+
 	step := utils.ProjectFlockStepPengajuan
 	if action == entity.ApprovalActionApproved {
 		step = utils.ProjectFlockStepAktif
 	}

-	err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
+	err := s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
 		approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(dbTransaction))
-		if _, err := approvalSvc.CreateApproval(
-			c.Context(),
-			utils.ApprovalWorkflowProjectFlock,
-			project.Id,
-			step,
-			&action,
-			actorID,
-			req.Notes,
-		); err != nil {
-			return err
-		}
-
 		kandangRepoTx := kandangRepository.NewKandangRepository(dbTransaction)
-		switch action {
-		case entity.ApprovalActionApproved:
-			if err := kandangRepoTx.UpdateStatusByProjectFlockID(
+		projectRepoTx := repository.NewProjectflockRepository(dbTransaction)
+
+		for _, approvableID := range approvableIDs {
+			if _, err := projectRepoTx.GetByID(c.Context(), approvableID, nil); err != nil {
+				if errors.Is(err, gorm.ErrRecordNotFound) {
+					return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Projectflock %d not found", approvableID))
+				}
+				return err
+			}
+
+			if _, err := approvalSvc.CreateApproval(
 				c.Context(),
-				project.Id,
-				utils.KandangStatusActive,
+				utils.ApprovalWorkflowProjectFlock,
+				approvableID,
+				step,
+				&action,
+				actorID,
+				req.Notes,
 			); err != nil {
 				return err
 			}
-		case entity.ApprovalActionRejected:
-			if err := kandangRepoTx.UpdateStatusByProjectFlockID(
-				c.Context(),
-				project.Id,
-				utils.KandangStatusNonActive,
-			); err != nil {
-				return err
+
+			switch action {
+			case entity.ApprovalActionApproved:
+				if err := kandangRepoTx.UpdateStatusByProjectFlockID(
+					c.Context(),
+					approvableID,
+					utils.KandangStatusActive,
+				); err != nil {
+					return err
+				}
+			case entity.ApprovalActionRejected:
+				if err := kandangRepoTx.UpdateStatusByProjectFlockID(
+					c.Context(),
+					approvableID,
+					utils.KandangStatusNonActive,
+				); err != nil {
+					return err
+				}
 			}
 		}

@@ -566,14 +576,26 @@ func (s projectflockService) Approval(c *fiber.Ctx, id uint, req *validation.App
 	})

 	if err != nil {
+		if fiberErr, ok := err.(*fiber.Error); ok {
+			return nil, fiberErr
+		}
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, fiber.NewError(fiber.StatusNotFound, "Projectflock not found")
 		}
-		s.Log.Errorf("Failed to record approval for projectflock %d: %+v", id, err)
+		s.Log.Errorf("Failed to record approval for projectflocks %+v: %+v", approvableIDs, err)
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to record approval")
 	}

-	return s.GetOne(c, id)
+	updated := make([]entity.ProjectFlock, 0, len(approvableIDs))
+	for _, approvableID := range approvableIDs {
+		project, err := s.GetOne(c, approvableID)
+		if err != nil {
+			return nil, err
+		}
+		updated = append(updated, *project)
+	}
+
+	return updated, nil
 }

 func (s projectflockService) DeleteOne(c *fiber.Ctx, id uint) error {