Early-return empty campaign source merge
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:
@@ -161,37 +161,49 @@ func (sources *AccessReviewCampaignSources) MergeByCampaignID(
|
|||||||
) error {
|
) error {
|
||||||
uniqueSourceIDs := uniqueGIDs(accessReviewSourceIDs)
|
uniqueSourceIDs := uniqueGIDs(accessReviewSourceIDs)
|
||||||
|
|
||||||
if len(uniqueSourceIDs) > 0 {
|
if len(uniqueSourceIDs) == 0 {
|
||||||
countQ := `
|
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)
|
SELECT COUNT(DISTINCT id)
|
||||||
FROM access_review_sources
|
FROM access_review_sources
|
||||||
WHERE
|
WHERE
|
||||||
%s
|
%s
|
||||||
AND id = ANY(@access_review_source_ids::text[])
|
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))
|
countArgs := pgx.StrictNamedArgs{"access_review_source_ids": sourceIDStrings}
|
||||||
for i, id := range uniqueSourceIDs {
|
maps.Copy(countArgs, scope.SQLArguments())
|
||||||
sourceIDStrings[i] = id.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
countArgs := pgx.StrictNamedArgs{"access_review_source_ids": sourceIDStrings}
|
var found int
|
||||||
maps.Copy(countArgs, scope.SQLArguments())
|
if err := conn.QueryRow(ctx, countQ, countArgs).Scan(&found); err != nil {
|
||||||
|
return fmt.Errorf("cannot count access review sources: %w", err)
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceIDStrings := make([]string, len(uniqueSourceIDs))
|
if found != len(uniqueSourceIDs) {
|
||||||
for i, id := range uniqueSourceIDs {
|
return ErrResourceNotFound
|
||||||
sourceIDStrings[i] = id.String()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
|
|||||||
Reference in New Issue
Block a user