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

Denormalize organization_id onto cookie entities

Browse Source 
Add organization_id to cookie_banner_versions, cookie_categories,
and cookie_consent_records so AuthorizationAttributes can return
it directly without JOINing back to cookie_banners. Document the
pattern in contrib/claude/coredata.md.

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-04-13 14:46:14 +04:00
parent 8ba3034828
commit 61cd3244df
6 changed files with 83 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/coredata/cookie_banner_version.go
View File

@@ -45,6 +45,7 @@ type (
CookieBannerVersion struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
CookieBannerID gid.GID `db:"cookie_banner_id"`
Version int `db:"version"`
State CookieBannerVersionState `db:"state"`
@@ -66,23 +67,7 @@ func (v *CookieBannerVersion) CursorKey(field CookieBannerVersionOrderField) pag
}
func (v *CookieBannerVersion) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) {
q := `
SELECT cb.organization_id
FROM cookie_banner_versions cbv
JOIN cookie_banners cb ON cbv.cookie_banner_id = cb.id
WHERE cbv.id = $1
LIMIT 1;
`
var organizationID gid.GID
if err := conn.QueryRow(ctx, q, v.ID).Scan(&organizationID); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrResourceNotFound
}
return nil, fmt.Errorf("cannot query cookie banner version authorization attributes: %w", err)
}
return map[string]string{"organization_id": organizationID.String()}, nil
return map[string]string{"organization_id": v.OrganizationID.String()}, nil
}
func (v *CookieBannerVersion) GetSnapshot() (CookieBannerVersionSnapshot, error) {
@@ -111,6 +96,7 @@ func (v *CookieBannerVersion) LoadByID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
version,
state,
@@ -158,6 +144,7 @@ func (v *CookieBannerVersions) LoadByCookieBannerID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
version,
state,
@@ -234,6 +221,7 @@ func (v *CookieBannerVersion) LoadByCookieBannerIDAndVersion(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
version,
state,
@@ -284,6 +272,7 @@ func (v *CookieBannerVersion) LoadLatestByCookieBannerID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
version,
state,
@@ -362,6 +351,7 @@ func (v *CookieBannerVersion) Insert(
INSERT INTO cookie_banner_versions (
id,
tenant_id,
organization_id,
cookie_banner_id,
version,
state,
@@ -371,6 +361,7 @@ INSERT INTO cookie_banner_versions (
) VALUES (
@id,
@tenant_id,
@organization_id,
@cookie_banner_id,
@version,
@state,
@@ -383,6 +374,7 @@ INSERT INTO cookie_banner_versions (
args := pgx.StrictNamedArgs{
"id": v.ID,
"tenant_id": scope.GetTenantID(),
"organization_id": v.OrganizationID,
"cookie_banner_id": v.CookieBannerID,
"version": v.Version,
"state": v.State,

26
pkg/coredata/cookie_category.go
View File

@@ -39,6 +39,7 @@ type (
CookieCategory struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
CookieBannerID gid.GID `db:"cookie_banner_id"`
Name string `db:"name"`
Description string `db:"description"`
@@ -77,23 +78,7 @@ func (c *CookieCategory) CursorKey(field CookieCategoryOrderField) page.CursorKe
}
func (c *CookieCategory) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) {
q := `
SELECT cb.organization_id
FROM cookie_categories cc
JOIN cookie_banners cb ON cc.cookie_banner_id = cb.id
WHERE cc.id = $1
LIMIT 1;
`
var organizationID gid.GID
if err := conn.QueryRow(ctx, q, c.ID).Scan(&organizationID); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrResourceNotFound
}
return nil, fmt.Errorf("cannot query cookie category authorization attributes: %w", err)
}
return map[string]string{"organization_id": organizationID.String()}, nil
return map[string]string{"organization_id": c.OrganizationID.String()}, nil
}
func (c *CookieCategory) LoadByID(
@@ -105,6 +90,7 @@ func (c *CookieCategory) LoadByID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
name,
description,
@@ -154,6 +140,7 @@ func (c *CookieCategories) LoadByCookieBannerID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
name,
description,
@@ -230,6 +217,7 @@ func (c *CookieCategories) LoadAllByCookieBannerID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
name,
description,
@@ -272,6 +260,7 @@ func (c *CookieCategory) Insert(
INSERT INTO cookie_categories (
id,
tenant_id,
organization_id,
cookie_banner_id,
name,
description,
@@ -283,6 +272,7 @@ INSERT INTO cookie_categories (
) VALUES (
@id,
@tenant_id,
@organization_id,
@cookie_banner_id,
@name,
@description,
@@ -297,6 +287,7 @@ INSERT INTO cookie_categories (
args := pgx.StrictNamedArgs{
"id": c.ID,
"tenant_id": scope.GetTenantID(),
"organization_id": c.OrganizationID,
"cookie_banner_id": c.CookieBannerID,
"name": c.Name,
"description": c.Description,
@@ -333,6 +324,7 @@ WHERE
AND id = @id
RETURNING
id,
organization_id,
cookie_banner_id,
name,
description,

24
pkg/coredata/cookie_consent_record.go
View File

@@ -17,7 +17,6 @@ package coredata
import (
"context"
"encoding/json"
"errors"
"fmt"
"maps"
"time"
@@ -31,6 +30,7 @@ import (
type (
CookieConsentRecord struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
CookieBannerID gid.GID `db:"cookie_banner_id"`
CookieBannerVersionID gid.GID `db:"cookie_banner_version_id"`
VisitorID string `db:"visitor_id"`
@@ -54,23 +54,7 @@ func (r *CookieConsentRecord) CursorKey(field CookieConsentRecordOrderField) pag
}
func (r *CookieConsentRecord) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) {
q := `
SELECT cb.organization_id
FROM cookie_consent_records cr
JOIN cookie_banners cb ON cr.cookie_banner_id = cb.id
WHERE cr.id = $1
LIMIT 1;
`
var organizationID gid.GID
if err := conn.QueryRow(ctx, q, r.ID).Scan(&organizationID); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrResourceNotFound
}
return nil, fmt.Errorf("cannot query consent record authorization attributes: %w", err)
}
return map[string]string{"organization_id": organizationID.String()}, nil
return map[string]string{"organization_id": r.OrganizationID.String()}, nil
}
func (r *CookieConsentRecords) LoadByCookieBannerID(
@@ -84,6 +68,7 @@ func (r *CookieConsentRecords) LoadByCookieBannerID(
q := `
SELECT
id,
organization_id,
cookie_banner_id,
cookie_banner_version_id,
visitor_id,
@@ -166,6 +151,7 @@ func (r *CookieConsentRecord) Insert(
INSERT INTO cookie_consent_records (
id,
tenant_id,
organization_id,
cookie_banner_id,
cookie_banner_version_id,
visitor_id,
@@ -177,6 +163,7 @@ INSERT INTO cookie_consent_records (
) VALUES (
@id,
@tenant_id,
@organization_id,
@cookie_banner_id,
@cookie_banner_version_id,
@visitor_id,
@@ -191,6 +178,7 @@ INSERT INTO cookie_consent_records (
args := pgx.StrictNamedArgs{
"id": r.ID,
"tenant_id": scope.GetTenantID(),
"organization_id": r.OrganizationID,
"cookie_banner_id": r.CookieBannerID,
"cookie_banner_version_id": r.CookieBannerVersionID,
"visitor_id": r.VisitorID,

7
pkg/coredata/migrations/20260413T120000Z.sql
View File

@@ -31,6 +31,7 @@ CREATE TYPE cookie_banner_version_state AS ENUM ('DRAFT', 'PUBLISHED');
CREATE TABLE cookie_banner_versions (
id TEXT PRIMARY KEY,
tenant_id TEXT NOT NULL,
organization_id TEXT NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
cookie_banner_id TEXT NOT NULL REFERENCES cookie_banners(id) ON DELETE CASCADE,
version INTEGER NOT NULL,
state cookie_banner_version_state NOT NULL,
@@ -42,6 +43,10 @@ CREATE TABLE cookie_banner_versions (
UNIQUE (cookie_banner_id, version)
);
-- Add version reference to consent records
-- Denormalize organization_id onto categories and consent records
ALTER TABLE cookie_categories
ADD COLUMN organization_id TEXT NOT NULL REFERENCES organizations(id) ON DELETE CASCADE;
ALTER TABLE cookie_consent_records
ADD COLUMN organization_id TEXT NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
ADD COLUMN cookie_banner_version_id TEXT NOT NULL REFERENCES cookie_banner_versions(id);