Stage 11: account linking & merge (email + Telegram Login Widget) (#12)

backend/internal/postgres/jet/backend/model/accounts.go

@@ -26,4 +26,7 @@ type Accounts struct {
 	HintBalance            int32
 	IsGuest                bool
 	NotificationsInAppOnly bool
+	PaidAccount            bool
+	MergedInto             *uuid.UUID
+	MergedAt               *time.Time
 }

backend/internal/postgres/jet/backend/table/accounts.go

@@ -30,6 +30,9 @@ type accountsTable struct {
 	HintBalance            postgres.ColumnInteger
 	IsGuest                postgres.ColumnBool
 	NotificationsInAppOnly postgres.ColumnBool
+	PaidAccount            postgres.ColumnBool
+	MergedInto             postgres.ColumnString
+	MergedAt               postgres.ColumnTimestampz
 
 	AllColumns     postgres.ColumnList
 	MutableColumns postgres.ColumnList
@@ -84,9 +87,12 @@ func newAccountsTableImpl(schemaName, tableName, alias string) accountsTable {
 		HintBalanceColumn            = postgres.IntegerColumn("hint_balance")
 		IsGuestColumn                = postgres.BoolColumn("is_guest")
 		NotificationsInAppOnlyColumn = postgres.BoolColumn("notifications_in_app_only")
-		allColumns                   = postgres.ColumnList{AccountIDColumn, DisplayNameColumn, PreferredLanguageColumn, TimeZoneColumn, BlockChatColumn, BlockFriendRequestsColumn, CreatedAtColumn, UpdatedAtColumn, AwayStartColumn, AwayEndColumn, HintBalanceColumn, IsGuestColumn, NotificationsInAppOnlyColumn}
-		mutableColumns               = postgres.ColumnList{DisplayNameColumn, PreferredLanguageColumn, TimeZoneColumn, BlockChatColumn, BlockFriendRequestsColumn, CreatedAtColumn, UpdatedAtColumn, AwayStartColumn, AwayEndColumn, HintBalanceColumn, IsGuestColumn, NotificationsInAppOnlyColumn}
-		defaultColumns               = postgres.ColumnList{DisplayNameColumn, PreferredLanguageColumn, TimeZoneColumn, BlockChatColumn, BlockFriendRequestsColumn, CreatedAtColumn, UpdatedAtColumn, AwayStartColumn, AwayEndColumn, HintBalanceColumn, IsGuestColumn, NotificationsInAppOnlyColumn}
+		PaidAccountColumn            = postgres.BoolColumn("paid_account")
+		MergedIntoColumn             = postgres.StringColumn("merged_into")
+		MergedAtColumn               = postgres.TimestampzColumn("merged_at")
+		allColumns                   = postgres.ColumnList{AccountIDColumn, DisplayNameColumn, PreferredLanguageColumn, TimeZoneColumn, BlockChatColumn, BlockFriendRequestsColumn, CreatedAtColumn, UpdatedAtColumn, AwayStartColumn, AwayEndColumn, HintBalanceColumn, IsGuestColumn, NotificationsInAppOnlyColumn, PaidAccountColumn, MergedIntoColumn, MergedAtColumn}
+		mutableColumns               = postgres.ColumnList{DisplayNameColumn, PreferredLanguageColumn, TimeZoneColumn, BlockChatColumn, BlockFriendRequestsColumn, CreatedAtColumn, UpdatedAtColumn, AwayStartColumn, AwayEndColumn, HintBalanceColumn, IsGuestColumn, NotificationsInAppOnlyColumn, PaidAccountColumn, MergedIntoColumn, MergedAtColumn}
+		defaultColumns               = postgres.ColumnList{DisplayNameColumn, PreferredLanguageColumn, TimeZoneColumn, BlockChatColumn, BlockFriendRequestsColumn, CreatedAtColumn, UpdatedAtColumn, AwayStartColumn, AwayEndColumn, HintBalanceColumn, IsGuestColumn, NotificationsInAppOnlyColumn, PaidAccountColumn}
 	)
 
 	return accountsTable{
@@ -106,6 +112,9 @@ func newAccountsTableImpl(schemaName, tableName, alias string) accountsTable {
 		HintBalance:            HintBalanceColumn,
 		IsGuest:                IsGuestColumn,
 		NotificationsInAppOnly: NotificationsInAppOnlyColumn,
+		PaidAccount:            PaidAccountColumn,
+		MergedInto:             MergedIntoColumn,
+		MergedAt:               MergedAtColumn,
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,

backend/internal/postgres/migrations/00009_account_merge.sql

@@ -0,0 +1,24 @@
+-- +goose Up
+-- Stage 11 account linking & merge: retire a secondary account into a primary one.
+-- merged_into/merged_at turn the secondary into an audit tombstone (its identities
+-- are repointed and its non-shared rows transferred to the primary, but the row is
+-- kept so the no-cascade game_players/chat/complaints foreign keys of any shared
+-- finished game stay valid). merged_into self-references accounts and is SET NULL on
+-- delete so a future guest reaper (PLAN.md TODO-3) can still remove a primary.
+-- paid_account is a forward-looking lifetime one-time-payment marker (no purchase
+-- flow yet); the merge ORs it so a paid status is never lost. Adds columns, so the
+-- generated jet code is regenerated (cmd/jetgen).
+SET search_path = backend, pg_catalog;
+
+ALTER TABLE accounts
+    ADD COLUMN paid_account boolean     NOT NULL DEFAULT false,
+    ADD COLUMN merged_into  uuid        REFERENCES accounts (account_id) ON DELETE SET NULL,
+    ADD COLUMN merged_at    timestamptz;
+
+-- +goose Down
+SET search_path = backend, pg_catalog;
+
+ALTER TABLE accounts
+    DROP COLUMN merged_at,
+    DROP COLUMN merged_into,
+    DROP COLUMN paid_account;