rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Early-return empty campaign source merge

Browse Source 
Delete scoped snapshots in one statement when the desired source
set is empty; validate and merge only when IDs are present.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
Cursor Agent
2026-07-27 14:32:26 +00:00
parent abbb1ee875
commit 447bdb88e5
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/coredata/access_review_campaign_source.go
View File

@@ -161,37 +161,49 @@ func (sources *AccessReviewCampaignSources) MergeByCampaignID(
) error {
uniqueSourceIDs := uniqueGIDs(accessReviewSourceIDs)
if len(uniqueSourceIDs) > 0 {
countQ := `
if len(uniqueSourceIDs) == 0 {
q := `
DELETE FROM access_review_campaign_sources
WHERE
%s
AND access_review_campaign_id = @access_review_campaign_id
`
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"access_review_campaign_id": campaignID}
maps.Copy(args, scope.SQLArguments())
if _, err := conn.Exec(ctx, q, args); err != nil {
return fmt.Errorf("cannot delete campaign sources: %w", err)
}
return nil
}
sourceIDStrings := make([]string, len(uniqueSourceIDs))
for i, id := range uniqueSourceIDs {
sourceIDStrings[i] = id.String()
}
countQ := `
SELECT COUNT(DISTINCT id)
FROM access_review_sources
WHERE
%s
AND id = ANY(@access_review_source_ids::text[])
`
countQ = fmt.Sprintf(countQ, scope.SQLFragment())
countQ = fmt.Sprintf(countQ, scope.SQLFragment())
sourceIDStrings := make([]string, len(uniqueSourceIDs))
for i, id := range uniqueSourceIDs {
sourceIDStrings[i] = id.String()
}
countArgs := pgx.StrictNamedArgs{"access_review_source_ids": sourceIDStrings}
maps.Copy(countArgs, scope.SQLArguments())
countArgs := pgx.StrictNamedArgs{"access_review_source_ids": sourceIDStrings}
maps.Copy(countArgs, scope.SQLArguments())
var found int
if err := conn.QueryRow(ctx, countQ, countArgs).Scan(&found); err != nil {
return fmt.Errorf("cannot count access review sources: %w", err)
}
if found != len(uniqueSourceIDs) {
return ErrResourceNotFound
}
var found int
if err := conn.QueryRow(ctx, countQ, countArgs).Scan(&found); err != nil {
return fmt.Errorf("cannot count access review sources: %w", err)
}
sourceIDStrings := make([]string, len(uniqueSourceIDs))
for i, id := range uniqueSourceIDs {
sourceIDStrings[i] = id.String()
if found != len(uniqueSourceIDs) {
return ErrResourceNotFound
}
now := time.Now()