fix: fix missing total count when offset > 0 in list resources and li…

…st approvals (#131)
goto · Mar 15, 2024 · 407b192 · 407b192
1 parent 6ea2731
commit 407b192
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/internal/store/postgres/approval_repository.go b/internal/store/postgres/approval_repository.go
@@ -65,7 +65,10 @@ func (r *ApprovalRepository) ListApprovals(ctx context.Context, filter *domain.L
 
 func (r *ApprovalRepository) GetApprovalsTotalCount(ctx context.Context, filter *domain.ListApprovalsFilter) (int64, error) {
 	db := r.db.WithContext(ctx)
-	db = applyFilter(db, filter)
+	f := filter
+	f.Size = 0
+	f.Offset = 0
+	db = applyFilter(db, f)
 
 	var count int64
 	if err := db.Model(&model.Approval{}).Count(&count).Error; err != nil {

diff --git a/internal/store/postgres/resource_repository.go b/internal/store/postgres/resource_repository.go
@@ -57,7 +57,11 @@ func (r *ResourceRepository) Find(ctx context.Context, filter domain.ListResourc
 
 func (r *ResourceRepository) GetResourcesTotalCount(ctx context.Context, filter domain.ListResourcesFilter) (int64, error) {
 	db := r.db.WithContext(ctx)
-	db = applyResourceFilter(db, filter)
+
+	f := filter
+	f.Size = 0
+	f.Offset = 0
+	db = applyResourceFilter(db, f)
 	var count int64
 	err := db.Model(&model.Resource{}).Count(&count).Error