6db9178449
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 15s
CI / ui (pull_request) Successful in 1m8s
CI / conformance (pull_request) Successful in 9s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 1m50s
Non-default campaigns gain an optional colour override (background / text / link) in two sets — one for every theme, one for the dark theme only — and an "urgent" flag. - Colours ride profile.get as six trailing FlatBuffers strings on BannerCampaign (backward-compatible). The client resolves the cascade (dark <- dark ?? all, light <- all) per rendered theme and derives the strip border from the background in JS (no CSS color-mix, for the old Android WebView floor); AdBanner applies them as inline vars scoped to the strip. - Urgent is resolved entirely server-side: while any enabled, in-window urgent campaign exists, computeActiveSet returns only the urgent campaigns and bannerFor skips the eligibility gate — so a system notice reaches every viewer (paid / hint-holding / no_banner included) and preempts the ordinary feed. No wire field; it appears on each viewer's next profile.get. - Admin console (/_gm/banners): native colour pickers + a live light/dark preview of the strip, and an urgent toggle. The default campaign stays plain, enforced by the service and a DB CHECK. Migration 00009 is additive (nullable colour columns + a bool default + all-or-nothing / hex / default-plain CHECKs) — expand-contract, rollback-safe. Docs: ARCHITECTURE §10, UI_DESIGN, FUNCTIONAL (+ru). Tests: ads unit (urgent preempt + colour validation), codec + resolver unit, gateway transcode, and integration (colour round-trip + urgent bypass against real Postgres).
328 lines
12 KiB
Go
328 lines
12 KiB
Go
package ads
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/go-jet/jet/v2/postgres"
|
|
"github.com/go-jet/jet/v2/qrm"
|
|
"github.com/google/uuid"
|
|
|
|
"scrabble/backend/internal/postgres/jet/backend/model"
|
|
"scrabble/backend/internal/postgres/jet/backend/table"
|
|
)
|
|
|
|
// Store is the Postgres-backed query surface for advertising campaigns, their
|
|
// messages and the single global display-settings row.
|
|
type Store struct {
|
|
db *sql.DB
|
|
}
|
|
|
|
// NewStore constructs a Store wrapping db.
|
|
func NewStore(db *sql.DB) *Store { return &Store{db: db} }
|
|
|
|
// ListCampaigns returns every campaign with its messages, the default first then
|
|
// by creation time, for the admin console.
|
|
func (s *Store) ListCampaigns(ctx context.Context) ([]Campaign, error) {
|
|
return s.loadCampaigns(ctx, false)
|
|
}
|
|
|
|
// ActiveCampaigns returns the enabled campaigns with their messages, the default
|
|
// first then by creation time. Window filtering and the default-remainder weight
|
|
// are applied by the Service (ActiveSet), not here.
|
|
func (s *Store) ActiveCampaigns(ctx context.Context) ([]Campaign, error) {
|
|
return s.loadCampaigns(ctx, true)
|
|
}
|
|
|
|
// loadCampaigns reads campaigns (optionally only the enabled ones) and attaches
|
|
// each one's messages in display order, with a single messages query (the table
|
|
// is small, so this avoids both an N+1 and a join projection).
|
|
func (s *Store) loadCampaigns(ctx context.Context, enabledOnly bool) ([]Campaign, error) {
|
|
sel := postgres.SELECT(table.AdCampaigns.AllColumns).FROM(table.AdCampaigns)
|
|
if enabledOnly {
|
|
sel = sel.WHERE(table.AdCampaigns.Enabled.EQ(postgres.Bool(true)))
|
|
}
|
|
sel = sel.ORDER_BY(table.AdCampaigns.IsDefault.DESC(), table.AdCampaigns.CreatedAt.ASC())
|
|
|
|
var rows []model.AdCampaigns
|
|
if err := sel.QueryContext(ctx, s.db, &rows); err != nil {
|
|
return nil, fmt.Errorf("ads: list campaigns: %w", err)
|
|
}
|
|
byID, err := s.messagesByCampaign(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out := make([]Campaign, 0, len(rows))
|
|
for _, r := range rows {
|
|
c := modelToCampaign(r)
|
|
c.Messages = byID[r.CampaignID]
|
|
out = append(out, c)
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// Campaign returns one campaign with its messages, or ErrNotFound.
|
|
func (s *Store) Campaign(ctx context.Context, id uuid.UUID) (Campaign, error) {
|
|
sel := postgres.SELECT(table.AdCampaigns.AllColumns).
|
|
FROM(table.AdCampaigns).
|
|
WHERE(table.AdCampaigns.CampaignID.EQ(postgres.UUID(id))).
|
|
LIMIT(1)
|
|
var row model.AdCampaigns
|
|
if err := sel.QueryContext(ctx, s.db, &row); err != nil {
|
|
if errors.Is(err, qrm.ErrNoRows) {
|
|
return Campaign{}, ErrNotFound
|
|
}
|
|
return Campaign{}, fmt.Errorf("ads: get campaign %s: %w", id, err)
|
|
}
|
|
c := modelToCampaign(row)
|
|
msgs, err := s.messagesFor(ctx, id)
|
|
if err != nil {
|
|
return Campaign{}, err
|
|
}
|
|
c.Messages = msgs
|
|
return c, nil
|
|
}
|
|
|
|
// CreateCampaign inserts a campaign (always non-default) and returns its new id.
|
|
func (s *Store) CreateCampaign(ctx context.Context, c Campaign) (uuid.UUID, error) {
|
|
id := uuid.New()
|
|
now := time.Now().UTC()
|
|
abg, afg, alink := colorCols(c.OverrideAll)
|
|
dbg, dfg, dlink := colorCols(c.OverrideDark)
|
|
stmt := table.AdCampaigns.INSERT(
|
|
table.AdCampaigns.CampaignID, table.AdCampaigns.Name, table.AdCampaigns.Weight,
|
|
table.AdCampaigns.IsDefault, table.AdCampaigns.Enabled,
|
|
table.AdCampaigns.StartsAt, table.AdCampaigns.EndsAt,
|
|
table.AdCampaigns.OverrideBg, table.AdCampaigns.OverrideFg, table.AdCampaigns.OverrideLink,
|
|
table.AdCampaigns.OverrideBgDark, table.AdCampaigns.OverrideFgDark, table.AdCampaigns.OverrideLinkDark,
|
|
table.AdCampaigns.Urgent,
|
|
table.AdCampaigns.CreatedAt, table.AdCampaigns.UpdatedAt,
|
|
).VALUES(
|
|
postgres.UUID(id), postgres.String(c.Name), postgres.Int(int64(c.Weight)),
|
|
postgres.Bool(false), postgres.Bool(c.Enabled),
|
|
tsOrNull(c.StartsAt), tsOrNull(c.EndsAt),
|
|
abg, afg, alink,
|
|
dbg, dfg, dlink,
|
|
postgres.Bool(c.Urgent),
|
|
postgres.TimestampzT(now), postgres.TimestampzT(now),
|
|
)
|
|
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
|
return uuid.Nil, fmt.Errorf("ads: create campaign: %w", err)
|
|
}
|
|
return id, nil
|
|
}
|
|
|
|
// UpdateCampaign updates a campaign's name, weight, enabled flag and validity
|
|
// window. The default flag is never touched here. Returns ErrNotFound when no
|
|
// campaign matches.
|
|
func (s *Store) UpdateCampaign(ctx context.Context, c Campaign) error {
|
|
abg, afg, alink := colorCols(c.OverrideAll)
|
|
dbg, dfg, dlink := colorCols(c.OverrideDark)
|
|
stmt := table.AdCampaigns.UPDATE(
|
|
table.AdCampaigns.Name, table.AdCampaigns.Weight, table.AdCampaigns.Enabled,
|
|
table.AdCampaigns.StartsAt, table.AdCampaigns.EndsAt,
|
|
table.AdCampaigns.OverrideBg, table.AdCampaigns.OverrideFg, table.AdCampaigns.OverrideLink,
|
|
table.AdCampaigns.OverrideBgDark, table.AdCampaigns.OverrideFgDark, table.AdCampaigns.OverrideLinkDark,
|
|
table.AdCampaigns.Urgent, table.AdCampaigns.UpdatedAt,
|
|
).SET(
|
|
postgres.String(c.Name), postgres.Int(int64(c.Weight)), postgres.Bool(c.Enabled),
|
|
tsOrNull(c.StartsAt), tsOrNull(c.EndsAt),
|
|
abg, afg, alink,
|
|
dbg, dfg, dlink,
|
|
postgres.Bool(c.Urgent), postgres.TimestampzT(time.Now().UTC()),
|
|
).WHERE(table.AdCampaigns.CampaignID.EQ(postgres.UUID(c.ID)))
|
|
return execOne(ctx, s.db, stmt, "update campaign")
|
|
}
|
|
|
|
// DeleteCampaign removes a campaign (its messages cascade). Returns ErrNotFound
|
|
// when no campaign matches. The Service refuses to delete the default.
|
|
func (s *Store) DeleteCampaign(ctx context.Context, id uuid.UUID) error {
|
|
stmt := table.AdCampaigns.DELETE().WHERE(table.AdCampaigns.CampaignID.EQ(postgres.UUID(id)))
|
|
return execOne(ctx, s.db, stmt, "delete campaign")
|
|
}
|
|
|
|
// AddMessage inserts a message into a campaign and returns its new id.
|
|
func (s *Store) AddMessage(ctx context.Context, m Message) (uuid.UUID, error) {
|
|
id := uuid.New()
|
|
now := time.Now().UTC()
|
|
stmt := table.AdMessages.INSERT(
|
|
table.AdMessages.MessageID, table.AdMessages.CampaignID, table.AdMessages.Position,
|
|
table.AdMessages.BodyEn, table.AdMessages.BodyRu,
|
|
table.AdMessages.CreatedAt, table.AdMessages.UpdatedAt,
|
|
).VALUES(
|
|
postgres.UUID(id), postgres.UUID(m.CampaignID), postgres.Int(int64(m.Position)),
|
|
postgres.String(m.BodyEn), postgres.String(m.BodyRu),
|
|
postgres.TimestampzT(now), postgres.TimestampzT(now),
|
|
)
|
|
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
|
return uuid.Nil, fmt.Errorf("ads: add message: %w", err)
|
|
}
|
|
return id, nil
|
|
}
|
|
|
|
// UpdateMessageBodies updates a message's bilingual bodies (its position is
|
|
// unchanged). Returns ErrNotFound when no message matches.
|
|
func (s *Store) UpdateMessageBodies(ctx context.Context, id uuid.UUID, bodyEn, bodyRu string) error {
|
|
stmt := table.AdMessages.UPDATE(
|
|
table.AdMessages.BodyEn, table.AdMessages.BodyRu, table.AdMessages.UpdatedAt,
|
|
).SET(
|
|
postgres.String(bodyEn), postgres.String(bodyRu), postgres.TimestampzT(time.Now().UTC()),
|
|
).WHERE(table.AdMessages.MessageID.EQ(postgres.UUID(id)))
|
|
return execOne(ctx, s.db, stmt, "update message")
|
|
}
|
|
|
|
// SetMessagePosition updates only a message's position (used to reorder).
|
|
func (s *Store) SetMessagePosition(ctx context.Context, id uuid.UUID, position int) error {
|
|
stmt := table.AdMessages.UPDATE(table.AdMessages.Position, table.AdMessages.UpdatedAt).
|
|
SET(postgres.Int(int64(position)), postgres.TimestampzT(time.Now().UTC())).
|
|
WHERE(table.AdMessages.MessageID.EQ(postgres.UUID(id)))
|
|
return execOne(ctx, s.db, stmt, "reorder message")
|
|
}
|
|
|
|
// DeleteMessage removes a message. Returns ErrNotFound when no message matches.
|
|
func (s *Store) DeleteMessage(ctx context.Context, id uuid.UUID) error {
|
|
stmt := table.AdMessages.DELETE().WHERE(table.AdMessages.MessageID.EQ(postgres.UUID(id)))
|
|
return execOne(ctx, s.db, stmt, "delete message")
|
|
}
|
|
|
|
// Settings returns the global display timings.
|
|
func (s *Store) Settings(ctx context.Context) (Timings, error) {
|
|
sel := postgres.SELECT(table.AdSettings.AllColumns).FROM(table.AdSettings).LIMIT(1)
|
|
var row model.AdSettings
|
|
if err := sel.QueryContext(ctx, s.db, &row); err != nil {
|
|
return Timings{}, fmt.Errorf("ads: get settings: %w", err)
|
|
}
|
|
return Timings{
|
|
HoldMs: int(row.HoldMs),
|
|
EdgePauseMs: int(row.EdgePauseMs),
|
|
ScrollPxPerSec: int(row.ScrollPxPerSec),
|
|
FadeOutMs: int(row.FadeOutMs),
|
|
GapMs: int(row.GapMs),
|
|
FadeInMs: int(row.FadeInMs),
|
|
}, nil
|
|
}
|
|
|
|
// UpdateSettings overwrites the single global display-settings row.
|
|
func (s *Store) UpdateSettings(ctx context.Context, t Timings) error {
|
|
stmt := table.AdSettings.UPDATE(
|
|
table.AdSettings.HoldMs, table.AdSettings.EdgePauseMs, table.AdSettings.ScrollPxPerSec,
|
|
table.AdSettings.FadeOutMs, table.AdSettings.GapMs, table.AdSettings.FadeInMs, table.AdSettings.UpdatedAt,
|
|
).SET(
|
|
postgres.Int(int64(t.HoldMs)), postgres.Int(int64(t.EdgePauseMs)), postgres.Int(int64(t.ScrollPxPerSec)),
|
|
postgres.Int(int64(t.FadeOutMs)), postgres.Int(int64(t.GapMs)), postgres.Int(int64(t.FadeInMs)),
|
|
postgres.TimestampzT(time.Now().UTC()),
|
|
).WHERE(table.AdSettings.ID.EQ(postgres.Bool(true)))
|
|
if _, err := stmt.ExecContext(ctx, s.db); err != nil {
|
|
return fmt.Errorf("ads: update settings: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// messagesByCampaign loads every message grouped by campaign id, in display order.
|
|
func (s *Store) messagesByCampaign(ctx context.Context) (map[uuid.UUID][]Message, error) {
|
|
sel := postgres.SELECT(table.AdMessages.AllColumns).
|
|
FROM(table.AdMessages).
|
|
ORDER_BY(table.AdMessages.CampaignID.ASC(), table.AdMessages.Position.ASC(), table.AdMessages.CreatedAt.ASC())
|
|
var rows []model.AdMessages
|
|
if err := sel.QueryContext(ctx, s.db, &rows); err != nil {
|
|
return nil, fmt.Errorf("ads: list messages: %w", err)
|
|
}
|
|
out := make(map[uuid.UUID][]Message, len(rows))
|
|
for _, r := range rows {
|
|
out[r.CampaignID] = append(out[r.CampaignID], modelToMessage(r))
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// messagesFor loads one campaign's messages in display order.
|
|
func (s *Store) messagesFor(ctx context.Context, campaignID uuid.UUID) ([]Message, error) {
|
|
sel := postgres.SELECT(table.AdMessages.AllColumns).
|
|
FROM(table.AdMessages).
|
|
WHERE(table.AdMessages.CampaignID.EQ(postgres.UUID(campaignID))).
|
|
ORDER_BY(table.AdMessages.Position.ASC(), table.AdMessages.CreatedAt.ASC())
|
|
var rows []model.AdMessages
|
|
if err := sel.QueryContext(ctx, s.db, &rows); err != nil {
|
|
return nil, fmt.Errorf("ads: list messages for %s: %w", campaignID, err)
|
|
}
|
|
out := make([]Message, 0, len(rows))
|
|
for _, r := range rows {
|
|
out = append(out, modelToMessage(r))
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// execOne runs a statement expected to touch exactly one row, mapping a zero
|
|
// row-count to ErrNotFound.
|
|
func execOne(ctx context.Context, db qrm.Executable, stmt postgres.Statement, what string) error {
|
|
res, err := stmt.ExecContext(ctx, db)
|
|
if err != nil {
|
|
return fmt.Errorf("ads: %s: %w", what, err)
|
|
}
|
|
n, err := res.RowsAffected()
|
|
if err != nil {
|
|
return fmt.Errorf("ads: %s rows: %w", what, err)
|
|
}
|
|
if n == 0 {
|
|
return ErrNotFound
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func modelToCampaign(r model.AdCampaigns) Campaign {
|
|
return Campaign{
|
|
ID: r.CampaignID,
|
|
Name: r.Name,
|
|
Weight: int(r.Weight),
|
|
IsDefault: r.IsDefault,
|
|
Enabled: r.Enabled,
|
|
StartsAt: r.StartsAt,
|
|
EndsAt: r.EndsAt,
|
|
OverrideAll: colorSetFrom(r.OverrideBg, r.OverrideFg, r.OverrideLink),
|
|
OverrideDark: colorSetFrom(r.OverrideBgDark, r.OverrideFgDark, r.OverrideLinkDark),
|
|
Urgent: r.Urgent,
|
|
CreatedAt: r.CreatedAt,
|
|
UpdatedAt: r.UpdatedAt,
|
|
}
|
|
}
|
|
|
|
// colorSetFrom rebuilds an optional ColorSet from three nullable colour columns.
|
|
// The all-or-nothing CHECK keeps the trio consistent, so a nil in any one means
|
|
// the set is absent.
|
|
func colorSetFrom(bg, fg, link *string) *ColorSet {
|
|
if bg == nil || fg == nil || link == nil {
|
|
return nil
|
|
}
|
|
return &ColorSet{Bg: *bg, Fg: *fg, Link: *link}
|
|
}
|
|
|
|
// colorCols renders a *ColorSet as its three column value-expressions in
|
|
// bg, fg, link order — NULL for each when the set is absent.
|
|
func colorCols(cs *ColorSet) (bg, fg, link postgres.Expression) {
|
|
if cs == nil {
|
|
return postgres.NULL, postgres.NULL, postgres.NULL
|
|
}
|
|
return postgres.String(cs.Bg), postgres.String(cs.Fg), postgres.String(cs.Link)
|
|
}
|
|
|
|
func modelToMessage(r model.AdMessages) Message {
|
|
return Message{
|
|
ID: r.MessageID,
|
|
CampaignID: r.CampaignID,
|
|
Position: int(r.Position),
|
|
BodyEn: r.BodyEn,
|
|
BodyRu: r.BodyRu,
|
|
}
|
|
}
|
|
|
|
// tsOrNull renders a nullable validity-window bound: NULL for a nil pointer,
|
|
// otherwise the UTC timestamp.
|
|
func tsOrNull(t *time.Time) postgres.Expression {
|
|
if t == nil {
|
|
return postgres.NULL
|
|
}
|
|
return postgres.TimestampzT(t.UTC())
|
|
}
|