[FIX/BE-US] add transfer to laying filter location and area

This commit is contained in:
ragilap
2026-01-27 22:28:14 +07:00
parent 8848a50e3b
commit 8410573ee6
2 changed files with 28 additions and 5 deletions
@@ -107,6 +107,11 @@ func (s transferLayingService) GetAll(c *fiber.Ctx, params *validation.Query) ([
return nil, 0, err
}
scope, err := m.ResolveLocationScope(c, s.Repository.DB())
if err != nil {
return nil, 0, err
}
offset := (params.Page - 1) * params.Limit
filterParams := &repository.GetAllFilterParams{
@@ -116,6 +121,8 @@ func (s transferLayingService) GetAll(c *fiber.Ctx, params *validation.Query) ([
FlockSource: params.FlockSource,
FlockDestination: params.FlockDestination,
Status: params.Status,
LocationIDs: scope.IDs,
LocationRestrict: scope.Restrict,
}
transferLayings, total, err := s.Repository.GetAllWithFilters(c.Context(), offset, params.Limit, filterParams)
@@ -124,11 +131,6 @@ func (s transferLayingService) GetAll(c *fiber.Ctx, params *validation.Query) ([
return nil, 0, err
}
if err != nil {
s.Log.Errorf("Failed to get transferLayings: %+v", err)
return nil, 0, err
}
approvalRepo := commonRepo.NewApprovalRepository(s.Repository.DB())
for i, transfer := range transferLayings {
latestApproval, err := approvalRepo.LatestByTarget(c.Context(), string(utils.ApprovalWorkflowTransferToLaying), transfer.Id, func(db *gorm.DB) *gorm.DB {