From 1f94ddba95c9e98a20df65b459fb6a4935c0f0a6 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Wed, 11 Jun 2025 16:28:59 -0700 Subject: [PATCH] Fix totalCount 5xx Signed-off-by: Bryan Frimin Signed-off-by: Sacha Al Himdani --- pkg/coredata/control.go | 14 ++++++++++---- pkg/coredata/document.go | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkg/coredata/control.go b/pkg/coredata/control.go index 35411cc8a..72a15c18c 100644 --- a/pkg/coredata/control.go +++ b/pkg/coredata/control.go @@ -68,7 +68,8 @@ func (c *Controls) CountByDocumentID( q := ` WITH ctrl AS ( SELECT - c.id + c.id, + c.tenant_id FROM controls c INNER JOIN @@ -173,7 +174,8 @@ func (c *Controls) CountByMeasureID( q := ` WITH ctrl AS ( SELECT - c.id + c.id, + c.tenant_id FROM controls c INNER JOIN @@ -278,7 +280,8 @@ func (c *Controls) CountByRiskID( q := ` WITH ctrl AS ( SELECT DISTINCT - c.id + c.id, + c.tenant_id FROM controls c LEFT JOIN @@ -475,7 +478,8 @@ func (c *Controls) CountByOrganizationID( q := ` WITH ctrl AS ( SELECT - c.id + c.id, + c.tenant_id FROM controls c INNER JOIN @@ -491,6 +495,8 @@ WHERE %s AND %s ` + q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment()) + args := pgx.StrictNamedArgs{"organization_id": organizationID} maps.Copy(args, scope.SQLArguments()) maps.Copy(args, filter.SQLArguments()) diff --git a/pkg/coredata/document.go b/pkg/coredata/document.go index 52c589735..7b4be115c 100644 --- a/pkg/coredata/document.go +++ b/pkg/coredata/document.go @@ -289,7 +289,8 @@ func (p *Documents) CountByControlID( q := ` WITH plcs AS ( SELECT - p.id + p.id, + p.tenant_id FROM documents p INNER JOIN