From 3eb225cca896eb4ee94c1d048a8463f6defeb592 Mon Sep 17 00:00:00 2001 From: giovanni Date: Thu, 9 Apr 2026 17:00:03 +0700 Subject: [PATCH] adjust validation from week 19 --- .../services/uniformity.service.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/modules/production/uniformities/services/uniformity.service.go b/internal/modules/production/uniformities/services/uniformity.service.go index 5c28ce78..1bb72ae4 100644 --- a/internal/modules/production/uniformities/services/uniformity.service.go +++ b/internal/modules/production/uniformities/services/uniformity.service.go @@ -386,10 +386,10 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file weekBase = config.LayingWeekStart() } if req.Week < weekBase { - if isLayingCategory { - return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase)) + if !isLayingCategory { + return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects") } - return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects") + // return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase)) } var latestWeek int @@ -401,10 +401,10 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to validate uniformity week sequence") } if latestWeek == 0 && req.Week != weekBase { - if isLayingCategory { - return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase)) + if !isLayingCategory { + return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects") } - return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects") + // return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase)) } // if latestWeek > 0 && req.Week > latestWeek+1 { // return nil, fiber.NewError(fiber.StatusBadRequest, "week must be sequential without skipping") @@ -582,10 +582,10 @@ func (s uniformityService) UpdateOne(c *fiber.Ctx, req *validation.Update, id ui weekBase = config.LayingWeekStart() } if targetWeek < weekBase { - if isLayingCategory { - return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase)) + if !isLayingCategory { + return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects") } - return nil, fiber.NewError(fiber.StatusBadRequest, "week must start from 1 for growing projects") + return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("week must start from %d for laying projects", weekBase)) } } if targetDate != nil {