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

Use CookieBanner entity directly in pattern analysis worker

Browse Source 
Replace the ad-hoc patternAnalysisTask struct with coredata.CookieBanner
as the worker type parameter, matching the pattern used by other workers
(esign, accessreview). SQL methods move back to coredata on *CookieBanner.

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-04-30 11:38:25 +04:00
parent e5e1119883
commit 426066e078
2 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/cookiebanner/worker.go
View File

@@ -41,7 +41,7 @@ func NewPatternAnalysisWorker(
pgClient *pg.Client,
logger *log.Logger,
opts ...worker.Option,
) *worker.Worker[coredata.CookieBannerPatternAnalysisTask] {
) *worker.Worker[coredata.CookieBanner] {
h := &patternAnalysisHandler{
svc: svc,
pg: pgClient,
@@ -56,36 +56,36 @@ func NewPatternAnalysisWorker(
)
}
func (h *patternAnalysisHandler) Claim(ctx context.Context) (coredata.CookieBannerPatternAnalysisTask, error) {
var task coredata.CookieBannerPatternAnalysisTask
func (h *patternAnalysisHandler) Claim(ctx context.Context) (coredata.CookieBanner, error) {
var banner coredata.CookieBanner
if err := h.pg.WithTx(
ctx,
func(ctx context.Context, tx pg.Tx) error {
if err := task.ClaimNextForUpdateSkipLocked(ctx, tx); err != nil {
if err := banner.LoadNextForPatternAnalysisForUpdateSkipLocked(ctx, tx); err != nil {
return err
}
return task.ClearPatternAnalysisFlag(ctx, tx)
return banner.ClearPatternAnalysisRequestedAt(ctx, tx)
},
); err != nil {
if errors.Is(err, coredata.ErrResourceNotFound) {
return coredata.CookieBannerPatternAnalysisTask{}, worker.ErrNoTask
return coredata.CookieBanner{}, worker.ErrNoTask
}
return coredata.CookieBannerPatternAnalysisTask{}, fmt.Errorf("cannot claim pattern analysis task: %w", err)
return coredata.CookieBanner{}, fmt.Errorf("cannot claim pattern analysis task: %w", err)
}
return task, nil
return banner, nil
}
func (h *patternAnalysisHandler) Process(ctx context.Context, task coredata.CookieBannerPatternAnalysisTask) error {
func (h *patternAnalysisHandler) Process(ctx context.Context, banner coredata.CookieBanner) error {
return h.pg.WithTx(
ctx,
func(ctx context.Context, tx pg.Tx) error {
scope := coredata.NewScope(task.TenantID)
scope := coredata.NewScopeFromObjectID(banner.ID)
var patterns coredata.CookiePatterns
if err := patterns.LoadAllByCookieBannerID(ctx, tx, scope, task.BannerID); err != nil {
if err := patterns.LoadAllByCookieBannerID(ctx, tx, scope, banner.ID); err != nil {
return fmt.Errorf("cannot load patterns: %w", err)
}
@@ -98,9 +98,9 @@ func (h *patternAnalysisHandler) Process(ctx context.Context, task coredata.Cook
source := bestSource(group)
prefixPattern := &coredata.CookiePattern{
ID: gid.New(task.TenantID, coredata.CookiePatternEntityType),
ID: gid.New(banner.ID.TenantID(), coredata.CookiePatternEntityType),
OrganizationID: group[0].OrganizationID,
CookieBannerID: task.BannerID,
CookieBannerID: banner.ID,
CookieCategoryID: key.categoryID,
Pattern: key.prefix,
MatchType: coredata.CookiePatternMatchTypePrefix,
@@ -117,7 +117,7 @@ func (h *patternAnalysisHandler) Process(ctx context.Context, task coredata.Cook
return fmt.Errorf("cannot insert prefix pattern %q: %w", key.prefix, err)
}
if !inserted {
if err := prefixPattern.LoadByBannerIDAndPattern(ctx, tx, scope, task.BannerID, key.prefix); err != nil {
if err := prefixPattern.LoadByBannerIDAndPattern(ctx, tx, scope, banner.ID, key.prefix); err != nil {
return fmt.Errorf("cannot load existing prefix pattern %q: %w", key.prefix, err)
}
@@ -143,12 +143,12 @@ func (h *patternAnalysisHandler) Process(ctx context.Context, task coredata.Cook
"merged exact patterns into prefix pattern",
log.String("prefix", key.prefix),
log.Int("count", len(group)),
log.String("banner_id", task.BannerID.String()),
log.String("banner_id", banner.ID.String()),
)
}
if merged {
if _, err := h.svc.ensureDraftVersionForBanner(ctx, tx, scope, task.BannerID); err != nil {
if _, err := h.svc.ensureDraftVersionForBanner(ctx, tx, scope, banner.ID); err != nil {
return fmt.Errorf("cannot ensure draft version: %w", err)
}
}

44
pkg/coredata/cookie_banner.go
View File

@@ -46,11 +46,6 @@ type (
UpdatedAt time.Time `db:"updated_at"`
}
CookieBannerPatternAnalysisTask struct {
BannerID gid.GID
TenantID gid.TenantID
}
CookieBanners []*CookieBanner
)
@@ -572,14 +567,26 @@ WHERE
return nil
}
func (t *CookieBannerPatternAnalysisTask) ClaimNextForUpdateSkipLocked(
func (b *CookieBanner) LoadNextForPatternAnalysisForUpdateSkipLocked(
ctx context.Context,
tx pg.Tx,
) error {
q := `
SELECT
id,
tenant_id
organization_id,
name,
origin,
state,
privacy_policy_url,
cookie_policy_url,
consent_expiry_days,
consent_mode,
show_branding,
default_language,
pattern_analysis_requested_at,
created_at,
updated_at
FROM
cookie_banners
WHERE
@@ -590,22 +597,25 @@ FOR UPDATE SKIP LOCKED
LIMIT 1;
`
var tenantIDStr string
if err := tx.QueryRow(ctx, q).Scan(&t.BannerID, &tenantIDStr); err != nil {
rows, err := tx.Query(ctx, q)
if err != nil {
return fmt.Errorf("cannot query cookie banners for pattern analysis: %w", err)
}
banner, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[CookieBanner])
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return ErrResourceNotFound
}
return fmt.Errorf("cannot claim banner for pattern analysis: %w", err)
return fmt.Errorf("cannot collect cookie banner: %w", err)
}
if err := t.TenantID.UnmarshalText([]byte(tenantIDStr)); err != nil {
return fmt.Errorf("cannot parse tenant ID: %w", err)
}
*b = banner
return nil
}
func (t *CookieBannerPatternAnalysisTask) ClearPatternAnalysisFlag(
func (b *CookieBanner) ClearPatternAnalysisRequestedAt(
ctx context.Context,
tx pg.Tx,
) error {
@@ -615,13 +625,15 @@ SET pattern_analysis_requested_at = NULL
WHERE id = @id
`
args := pgx.StrictNamedArgs{"id": t.BannerID}
args := pgx.StrictNamedArgs{"id": b.ID}
_, err := tx.Exec(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot clear pattern analysis flag: %w", err)
return fmt.Errorf("cannot clear pattern analysis requested at: %w", err)
}
b.PatternAnalysisRequestedAt = nil
return nil
}