Skip to content

fix(db): normalize legacy 'general fund' initiative_type to 'general_fund' (DO NOT MERGE) #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mlehotskylf wants to merge 5 commits into
base: main
Choose a base branch
from
+34 −9
Open

fix(db): normalize legacy 'general fund' initiative_type to 'general_fund' (DO NOT MERGE) #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbf69fb
fix(db): normalize legacy 'general fund' initiative_type to 'general_…
mlehotskylf Jun 14, 2026
78aada2
fix(migration): normalise 'general fund' → 'general_fund' at source
mlehotskylf Jun 14, 2026
d4ff09f
fix(migration): remove 002 SQL migration — Python script fix is suffi…
mlehotskylf Jun 14, 2026
50276ad
fix(migration): normalise ostif → security_audit on migration
mlehotskylf Jun 15, 2026
d2324bc
fix(types): surface other and community under General Fund tab
mlehotskylf Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions backend/db/scripts/migrate_dynamo_to_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
- initiatives.id (UUID PK) is generated deterministically via
_as_uuid(projectId / entityId) so FK lookups from donations/subscriptions
remain stable across re-runs.
- DynamoDB entity type quirk: SaveEntity rewrites 'general fund' → 'initiative'
before every PutItem. Migration reverses this:
if entityType == 'initiative' → restore to 'general fund'
- DynamoDB entity type quirks — normalised to ValidInitiativeTypes canonical forms:
'initiative' → 'general_fund' (SaveEntity rewrites 'general fund' before PutItem)
'ostif' → 'security_audit'
- Budget.AmountInCents is serialised with json tag "amount" — access as
budget.get("amount"), NOT budget.get("amountInCents").
- Excluded from schema (no DynamoDB write path / computed at read-time):
Expand Down Expand Up @@ -722,11 +722,15 @@ def migrate_initiatives(cur, entities: list, projects: list, known_users: set, u
)
known_initiative_ids.add(pg_id)

# entityType quirk: SaveEntity rewrites 'general fund' → 'initiative'
# before every PutItem. Reverse it here.
# Normalise DynamoDB entityType values to the canonical forms used by
# ValidInitiativeTypes in the new backend:
# 'initiative' → 'general_fund' (SaveEntity quirk: rewrites 'general fund' before PutItem)
# 'ostif' → 'security_audit' (OSTIF is a security-audit programme)
entity_type: str = e.get("entityType") or ""
if entity_type == "initiative":
entity_type = "general fund"
entity_type = "general_fund"
Comment thread
mlehotskylf marked this conversation as resolved.
elif entity_type == "ostif":
entity_type = "security_audit"

# ── Core initiative row ──────────────────────────────────────────
initiative_rows.append(
Expand Down Expand Up @@ -843,7 +847,9 @@ def migrate_initiatives(cur, entities: list, projects: list, known_users: set, u
# ── OSTIF-specific detail (ostif entity type only) ───────────────
# entity.Detail interface{} is a domain.Detail struct when non-nil.
# TypeDeserializer returns it as a plain dict.
if entity_type == "ostif":
# Use the raw DynamoDB entityType here — entity_type is already
# normalised to 'security_audit' by this point.
if e.get("entityType") == "ostif":
raw_detail = e.get("detail")
if isinstance(raw_detail, dict) and raw_detail:
ostif_detail_rows.append(
Expand Down
10 changes: 8 additions & 2 deletions backend/internal/infrastructure/db/initiative_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,14 @@ func (r *InitiativeRepository) List(ctx context.Context, filter models.Initiativ
argN++
}
if filter.InitiativeType != "" {
where += fmt.Sprintf(" AND i.initiative_type = $%d", argN)
args = append(args, filter.InitiativeType)
if filter.InitiativeType == "general_fund" {
// 'other' and 'community' are legacy types that surface under the General Fund tab.
where += fmt.Sprintf(" AND i.initiative_type = ANY($%d)", argN)
args = append(args, []string{"general_fund", "other", "community"})
} else {
Comment thread
mlehotskylf marked this conversation as resolved.
where += fmt.Sprintf(" AND i.initiative_type = $%d", argN)
args = append(args, filter.InitiativeType)
}
argN++
}
if filter.Status != "" {
Expand Down
13 changes: 13 additions & 0 deletions frontend/app/components/shared/components/initiative-card/initiative-card.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ export const initiativeTypeConfigMap: Record<string, InitiativeTypeConfig> = {
colorClass: 'text-positive-600',
gradient: 'linear-gradient(180deg, rgba(240, 253, 244, 0.5) 0%, rgba(255, 255, 255, 0.5) 50%)',
},
// Legacy types that surface under the General Fund tab without DB renaming.
other: {
label: 'General Fund',
icon: 'hand-holding-dollar',
colorClass: 'text-positive-600',
gradient: 'linear-gradient(180deg, rgba(240, 253, 244, 0.5) 0%, rgba(255, 255, 255, 0.5) 50%)',
Comment thread
mlehotskylf marked this conversation as resolved.
},
community: {
label: 'General Fund',
icon: 'hand-holding-dollar',
colorClass: 'text-positive-600',
gradient: 'linear-gradient(180deg, rgba(240, 253, 244, 0.5) 0%, rgba(255, 255, 255, 0.5) 50%)',
},
};

export const defaultInitiativeTypeConfig: InitiativeTypeConfig = {
Expand Down
Loading