Merge branch 'dev/ragil' of https://gitlab.com/mbugroup/lti-api into dev/teguh

internal/modules/production/project_flocks/repositories/projectflock.repository.go

@@ -11,7 +11,6 @@ import (
 	"gorm.io/gorm"
 )
 
-
 type ProjectflockRepository interface {
 	repository.BaseRepository[entity.ProjectFlock]
 	GetAllWithFilters(ctx context.Context, offset, limit int, params *validation.Query) ([]entity.ProjectFlock, int64, error)
@@ -42,24 +41,23 @@ func NewProjectflockRepository(db *gorm.DB) ProjectflockRepository {
 
 func (r *ProjectflockRepositoryImpl) GetAllWithFilters(ctx context.Context, offset, limit int, params *validation.Query) ([]entity.ProjectFlock, int64, error) {
 	return r.GetAll(ctx, offset, limit, func(db *gorm.DB) *gorm.DB {
-		return r.applyQueryFilters(db, params)
+		return r.applyQueryFilters(r.WithDefaultRelations()(db), params)
 	})
 }
 
 func (r *ProjectflockRepositoryImpl) WithDefaultRelations() func(*gorm.DB) *gorm.DB {
 	return func(db *gorm.DB) *gorm.DB {
 		return db.
-		Preload("CreatedUser").
-		Preload("Area").
-		Preload("Fcr").
-		Preload("Location").
-		Preload("Kandangs").
-		Preload("KandangHistory").
-		Preload("KandangHistory.Kandang")
+			Preload("CreatedUser").
+			Preload("Area").
+			Preload("Fcr").
+			Preload("Location").
+			Preload("Kandangs").
+			Preload("KandangHistory").
+			Preload("KandangHistory.Kandang")
 	}
 }
 
-
 func (r *ProjectflockRepositoryImpl) applyQueryFilters(db *gorm.DB, params *validation.Query) *gorm.DB {
 	if params == nil {
 		return db

internal/modules/production/project_flocks/route.go

@@ -1,7 +1,7 @@
 package project_flocks
 
 import (
-	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/controllers"
 	projectflock "gitlab.com/mbugroup/lti-api.git/internal/modules/production/project_flocks/services"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -13,7 +13,7 @@ func ProjectflockRoutes(v1 fiber.Router, u user.UserService, s projectflock.Proj
 	ctrl := controller.NewProjectflockController(s)
 
 	route := v1.Group("/project-flocks")
-	// route.Use(m.Auth(u))
+	route.Use(m.Auth(u))
 
 	route.Get("/", ctrl.GetAll)
 	route.Post("/", ctrl.CreateOne)

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

@@ -10,8 +10,7 @@ import (
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
-
-	// authmiddleware "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	productWarehouseRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-warehouses/repositories"
 	flockDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/dto"
 	flockRepository "gitlab.com/mbugroup/lti-api.git/internal/modules/master/flocks/repositories"
@@ -85,18 +84,17 @@ func NewProjectflockService(
 	}
 }
 
+func (s projectflockService) approvalQueryModifier() func(*gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		return db.Preload("ActionUser")
+	}
+}
+
 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
 	}
 
-	if params.Page <= 0 {
-		params.Page = 1
-	}
-	if params.Limit <= 0 {
-		params.Limit = 10
-	}
-
 	offset := (params.Page - 1) * params.Limit
 
 	projectflocks, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, params)
@@ -112,7 +110,7 @@ func (s projectflockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 			ids[i] = item.Id
 		}
 
-		latestMap, err := s.ApprovalSvc.LatestByTargets(c.Context(), s.approvalWorkflow, ids, s.Repository.WithDefaultRelations())
+		latestMap, err := s.ApprovalSvc.LatestByTargets(c.Context(), s.approvalWorkflow, ids, s.approvalQueryModifier())
 		if err != nil {
 			s.Log.Warnf("Unable to load latest approvals for projectflocks: %+v", err)
 		} else if len(latestMap) > 0 {
@@ -156,7 +154,7 @@ func (s projectflockService) getOneEntityOnly(c *fiber.Ctx, id uint) (*entity.Pr
 	}
 
 	if s.ApprovalSvc != nil {
-		approvals, err := s.ApprovalSvc.ListByTarget(c.Context(), s.approvalWorkflow, id, s.Repository.WithDefaultRelations())
+		approvals, err := s.ApprovalSvc.ListByTarget(c.Context(), s.approvalWorkflow, id, s.approvalQueryModifier())
 		if err != nil {
 			s.Log.Warnf("Unable to load approvals for projectflock %d: %+v", id, err)
 		} else if len(approvals) > 0 {
@@ -183,7 +181,7 @@ func (s projectflockService) GetOne(c *fiber.Ctx, id uint) (*entity.ProjectFlock
 	}
 
 	if s.ApprovalSvc != nil {
-		approvals, err := s.ApprovalSvc.ListByTarget(c.Context(), s.approvalWorkflow, id, s.Repository.WithDefaultRelations())
+		approvals, err := s.ApprovalSvc.ListByTarget(c.Context(), s.approvalWorkflow, id, s.approvalQueryModifier())
 		if err != nil {
 			s.Log.Warnf("Unable to load approvals for projectflock %d: %+v", id, err)
 		} else if len(approvals) > 0 {
@@ -221,7 +219,7 @@ func (s *projectflockService) CreateOne(c *fiber.Ctx, req *validation.Create) (*
 		return nil, err
 	}
 
-	actorID, err := actorIDFromContext(c)
+	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
 	}
@@ -344,7 +342,7 @@ func (s projectflockService) UpdateOne(c *fiber.Ctx, req *validation.Update, id
 		return nil, err
 	}
 
-	actorID, err := actorIDFromContext(c)
+	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
 	}
@@ -602,7 +600,7 @@ func (s projectflockService) Approval(c *fiber.Ctx, req *validation.Approve) ([]
 		return nil, err
 	}
 
-	actorID, err := actorIDFromContext(c)
+	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
 	}
@@ -847,7 +845,7 @@ func (s projectflockService) GetPeriodSummary(c *fiber.Ctx, locationID uint) ([]
 
 	summaries := make([]KandangPeriodSummary, 0, len(rows))
 	for _, row := range rows {
-		nextPeriod := 0
+		nextPeriod := 1
 		if row.LatestPeriod > 0 {
 			nextPeriod = row.LatestPeriod + 1
 		}
@@ -1046,12 +1044,3 @@ func (s projectflockService) kandangRepoWithTx(tx *gorm.DB) kandangRepository.Ka
 	}
 	return kandangRepository.NewKandangRepository(s.Repository.DB())
 }
-
-func actorIDFromContext(_ *fiber.Ctx) (uint, error) {
-	// user, ok := authmiddleware.AuthenticatedUser(c)
-	// if !ok || user == nil || user.Id == 0 {
-	// 	return 0, fiber.NewError(fiber.StatusUnauthorized, "Please authenticate")
-	// }
-	// return user.Id, nil
-	return 1, nil
-}