From 31870495a17083e84e44d99b1008c13e0b45f42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Mon, 11 May 2026 14:08:02 +0400 Subject: [PATCH] cookiebanner: rename DetectedTracker.InsertIfNotExists to Upsert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The method uses ON CONFLICT ... DO UPDATE, so the name now matches the actual behaviour. TrackerPattern.InsertIfNotExists keeps its name because it uses ON CONFLICT ... DO NOTHING. Signed-off-by: Émile Ré --- pkg/cookiebanner/service.go | 4 ++-- pkg/coredata/detected_tracker.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cookiebanner/service.go b/pkg/cookiebanner/service.go index bc718a6ef..d4c1a7cf1 100644 --- a/pkg/cookiebanner/service.go +++ b/pkg/cookiebanner/service.go @@ -2179,8 +2179,8 @@ func (s *Service) reportDetectedTracker( UpdatedAt: now, } - if _, err := tracker.InsertIfNotExists(ctx, tx, scope); err != nil { - return fmt.Errorf("cannot insert detected tracker: %w", err) + if _, err := tracker.Upsert(ctx, tx, scope); err != nil { + return fmt.Errorf("cannot upsert detected tracker: %w", err) } return nil diff --git a/pkg/coredata/detected_tracker.go b/pkg/coredata/detected_tracker.go index 21d6ca0c0..92f79fea1 100644 --- a/pkg/coredata/detected_tracker.go +++ b/pkg/coredata/detected_tracker.go @@ -44,7 +44,7 @@ type ( DetectedTrackers []*DetectedTracker ) -func (dt *DetectedTracker) InsertIfNotExists( +func (dt *DetectedTracker) Upsert( ctx context.Context, tx pg.Tx, scope Scoper, @@ -109,7 +109,7 @@ ON CONFLICT (cookie_banner_id, tracker_type, identifier) DO UPDATE result, err := tx.Exec(ctx, q, args) if err != nil { - return false, fmt.Errorf("cannot insert detected tracker: %w", err) + return false, fmt.Errorf("cannot upsert detected tracker: %w", err) } return result.RowsAffected() > 0, nil