From 29791ae775d2a45df31559f43e7bc7485ee436fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <emile@probo.com>
Date: Fri, 29 May 2026 01:37:26 +0200
Subject: [PATCH] Scope mapping writes and stabilize sibling lookup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The tracker-mapping worker loaded a pattern in its claim transaction and
committed the resolution in a separate, later transaction. A full-row
Update would write back stale values and clobber any user edit made in
between. Add UpdateMapping, which writes only the worker-resolved
columns (common_tracker_pattern_id, third_party_id, and a description
filled only when still empty), leaving user-editable fields untouched.

Also add ORDER BY tracker_pattern_id to the sibling pattern lookup: the
query used LIMIT without an ORDER BY, so an over-limit match set
returned an arbitrary subset and could resolve the third party
differently across runs.

Signed-off-by: Émile Ré <emile@probo.com>
---
 pkg/cookiebanner/tracker_mapping_worker.go |  2 +-
 pkg/coredata/detected_tracker.go           |  1 +
 pkg/coredata/tracker_pattern.go            | 54 ++++++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/pkg/cookiebanner/tracker_mapping_worker.go b/pkg/cookiebanner/tracker_mapping_worker.go
index 0a070e630..f75b2a875 100644
--- a/pkg/cookiebanner/tracker_mapping_worker.go
+++ b/pkg/cookiebanner/tracker_mapping_worker.go
@@ -267,7 +267,7 @@ func (h *trackerMappingHandler) Process(ctx context.Context, tp coredata.Tracker
 					}
 				}
 
-				if err := tp.Update(ctx, tx, scope); err != nil {
+				if err := tp.UpdateMapping(ctx, tx, scope); err != nil {
 					return fmt.Errorf("cannot update tracker pattern mapping: %w", err)
 				}
 
diff --git a/pkg/coredata/detected_tracker.go b/pkg/coredata/detected_tracker.go
index 71b0eccb6..01aa63521 100644
--- a/pkg/coredata/detected_tracker.go
+++ b/pkg/coredata/detected_tracker.go
@@ -271,6 +271,7 @@ WHERE cookie_banner_id = @cookie_banner_id
   AND initiator_domain = ANY(@domains)
   AND tracker_pattern_id IS NOT NULL
   AND tracker_pattern_id != @exclude_pattern_id
+ORDER BY tracker_pattern_id
 LIMIT @limit;
 `
 
diff --git a/pkg/coredata/tracker_pattern.go b/pkg/coredata/tracker_pattern.go
index 5acf622c2..52aa7505e 100644
--- a/pkg/coredata/tracker_pattern.go
+++ b/pkg/coredata/tracker_pattern.go
@@ -555,6 +555,60 @@ WHERE
 	return nil
 }
 
+// UpdateMapping writes only the columns the tracker-mapping worker
+// resolves — common_tracker_pattern_id, third_party_id and an enriched
+// description — leaving the user-editable fields (display_name,
+// excluded, cookie_category_id, max_age_seconds, source, last_matched_at)
+// untouched.
+//
+// The worker loads the pattern in its claim transaction and commits the
+// resolution in a separate, later transaction, so a full-row Update
+// would write back stale values and clobber any concurrent edit made in
+// between. The description is only filled when still empty in the
+// database, so a concurrently set description is never overwritten.
+func (tp *TrackerPattern) UpdateMapping(
+	ctx context.Context,
+	tx pg.Tx,
+	scope Scoper,
+) error {
+	q := `
+UPDATE tracker_patterns
+SET
+	common_tracker_pattern_id = @common_tracker_pattern_id,
+	third_party_id = @third_party_id,
+	description = CASE
+		WHEN description = '' THEN @description
+		ELSE description
+	END,
+	updated_at = @updated_at
+WHERE
+	%s
+	AND id = @id
+`
+
+	q = fmt.Sprintf(q, scope.SQLFragment())
+
+	args := pgx.StrictNamedArgs{
+		"id":                        tp.ID,
+		"common_tracker_pattern_id": tp.CommonTrackerPatternID,
+		"third_party_id":            tp.ThirdPartyID,
+		"description":               tp.Description,
+		"updated_at":                tp.UpdatedAt,
+	}
+	maps.Copy(args, scope.SQLArguments())
+
+	result, err := tx.Exec(ctx, q, args)
+	if err != nil {
+		return fmt.Errorf("cannot update tracker pattern mapping: %w", err)
+	}
+
+	if result.RowsAffected() == 0 {
+		return ErrResourceNotFound
+	}
+
+	return nil
+}
+
 func (tp *TrackerPattern) Delete(
 	ctx context.Context,
 	tx pg.Tx,