Compare commits
2 Commits
dev
...
1ed9aa0994
| Author | SHA1 | Date | |
|---|---|---|---|
|
1ed9aa0994 | ||
|
|
04783f66f1 |
@@ -1,83 +0,0 @@
|
|||||||
# Git
|
|
||||||
.git
|
|
||||||
.gitignore
|
|
||||||
|
|
||||||
# Python
|
|
||||||
__pycache__
|
|
||||||
*.py[cod]
|
|
||||||
*$py.class
|
|
||||||
*.so
|
|
||||||
.Python
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
|
||||||
downloads/
|
|
||||||
eggs/
|
|
||||||
.eggs/
|
|
||||||
lib/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
var/
|
|
||||||
wheels/
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
||||||
|
|
||||||
# Virtual environments
|
|
||||||
venv/
|
|
||||||
ENV/
|
|
||||||
env/
|
|
||||||
.venv/
|
|
||||||
|
|
||||||
# IDE
|
|
||||||
.idea/
|
|
||||||
.vscode/
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
*~
|
|
||||||
|
|
||||||
# Testing
|
|
||||||
.pytest_cache/
|
|
||||||
.coverage
|
|
||||||
htmlcov/
|
|
||||||
.tox/
|
|
||||||
.nox/
|
|
||||||
|
|
||||||
# Environment files (will be mounted or passed via env vars)
|
|
||||||
.env
|
|
||||||
.env.local
|
|
||||||
.env.*.local
|
|
||||||
*.env
|
|
||||||
|
|
||||||
# Logs
|
|
||||||
*.log
|
|
||||||
logs/
|
|
||||||
|
|
||||||
# Database
|
|
||||||
*.db
|
|
||||||
*.sqlite3
|
|
||||||
|
|
||||||
# Alembic
|
|
||||||
alembic/versions/__pycache__/
|
|
||||||
|
|
||||||
# Docker
|
|
||||||
Dockerfile
|
|
||||||
docker-compose*.yml
|
|
||||||
.docker/
|
|
||||||
|
|
||||||
# Documentation
|
|
||||||
*.md
|
|
||||||
docs/
|
|
||||||
|
|
||||||
# Temporary files
|
|
||||||
tmp/
|
|
||||||
temp/
|
|
||||||
*.tmp
|
|
||||||
|
|
||||||
# OS files
|
|
||||||
.DS_Store
|
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# Uploads (will be mounted as volume)
|
|
||||||
uploads/
|
|
||||||
13
.env.example
13
.env.example
@@ -6,10 +6,6 @@ JWT_SECRET=your-secret-key-change-this-in-production
|
|||||||
JWT_ALGORITHM=HS256
|
JWT_ALGORITHM=HS256
|
||||||
ACCESS_TOKEN_EXPIRE_MINUTES=30
|
ACCESS_TOKEN_EXPIRE_MINUTES=30
|
||||||
|
|
||||||
# Settings Encryption (for database-stored sensitive settings)
|
|
||||||
# Generate with: python -c "import secrets; print(secrets.token_urlsafe(64))"
|
|
||||||
SETTINGS_ENCRYPTION_KEY=your-encryption-key-generate-with-command-above
|
|
||||||
|
|
||||||
# SMTP Email Configuration (Port 465 - SSL/TLS)
|
# SMTP Email Configuration (Port 465 - SSL/TLS)
|
||||||
SMTP_HOST=p.konceptkit.com
|
SMTP_HOST=p.konceptkit.com
|
||||||
SMTP_PORT=465
|
SMTP_PORT=465
|
||||||
@@ -32,14 +28,7 @@ SMTP_FROM_NAME=LOAF Membership
|
|||||||
# Frontend URL
|
# Frontend URL
|
||||||
FRONTEND_URL=http://localhost:3000
|
FRONTEND_URL=http://localhost:3000
|
||||||
|
|
||||||
# Backend URL (for webhook URLs and API references)
|
# Stripe Configuration (for future payment integration)
|
||||||
# Used to construct Stripe webhook URL shown in Admin Settings
|
|
||||||
BACKEND_URL=http://localhost:8000
|
|
||||||
|
|
||||||
# Stripe Configuration (NOW DATABASE-DRIVEN via Admin Settings page)
|
|
||||||
# Configure Stripe credentials through the Admin Settings UI (requires SETTINGS_ENCRYPTION_KEY)
|
|
||||||
# No longer requires .env variables - managed through database for dynamic updates
|
|
||||||
# Legacy .env variables below are deprecated:
|
|
||||||
# STRIPE_SECRET_KEY=sk_test_...
|
# STRIPE_SECRET_KEY=sk_test_...
|
||||||
# STRIPE_WEBHOOK_SECRET=whsec_...
|
# STRIPE_WEBHOOK_SECRET=whsec_...
|
||||||
|
|
||||||
|
|||||||
308
.gitignore
vendored
308
.gitignore
vendored
@@ -1,309 +1 @@
|
|||||||
# ============================================================================
|
|
||||||
# Python Backend .gitignore
|
|
||||||
# For FastAPI + PostgreSQL + Cloudflare R2 + Stripe
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
# ===== Environment Variables =====
|
|
||||||
.env
|
.env
|
||||||
.env.*
|
|
||||||
!.env.example
|
|
||||||
.envrc
|
|
||||||
|
|
||||||
# ===== Python =====
|
|
||||||
# Byte-compiled / optimized / DLL files
|
|
||||||
__pycache__/
|
|
||||||
*.py[cod]
|
|
||||||
*$py.class
|
|
||||||
|
|
||||||
# C extensions
|
|
||||||
*.so
|
|
||||||
|
|
||||||
# Distribution / packaging
|
|
||||||
.Python
|
|
||||||
build/
|
|
||||||
develop-eggs/
|
|
||||||
dist/
|
|
||||||
downloads/
|
|
||||||
eggs/
|
|
||||||
.eggs/
|
|
||||||
lib/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
var/
|
|
||||||
wheels/
|
|
||||||
share/python-wheels/
|
|
||||||
*.egg-info/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
||||||
MANIFEST
|
|
||||||
|
|
||||||
# PyInstaller
|
|
||||||
*.manifest
|
|
||||||
*.spec
|
|
||||||
|
|
||||||
# Unit test / coverage reports
|
|
||||||
htmlcov/
|
|
||||||
.tox/
|
|
||||||
.nox/
|
|
||||||
.coverage
|
|
||||||
.coverage.*
|
|
||||||
.cache
|
|
||||||
nosetests.xml
|
|
||||||
coverage.xml
|
|
||||||
*.cover
|
|
||||||
*.py,cover
|
|
||||||
.hypothesis/
|
|
||||||
.pytest_cache/
|
|
||||||
cover/
|
|
||||||
|
|
||||||
# Translations
|
|
||||||
*.mo
|
|
||||||
*.pot
|
|
||||||
|
|
||||||
# Django stuff (if ever added):
|
|
||||||
*.log
|
|
||||||
local_settings.py
|
|
||||||
db.sqlite3
|
|
||||||
db.sqlite3-journal
|
|
||||||
|
|
||||||
# Flask stuff (if ever added):
|
|
||||||
instance/
|
|
||||||
.webassets-cache
|
|
||||||
|
|
||||||
# Scrapy stuff (if ever added):
|
|
||||||
.scrapy
|
|
||||||
|
|
||||||
# Sphinx documentation
|
|
||||||
docs/_build/
|
|
||||||
|
|
||||||
# PyBuilder
|
|
||||||
.pybuilder/
|
|
||||||
target/
|
|
||||||
|
|
||||||
# Jupyter Notebook
|
|
||||||
.ipynb_checkpoints
|
|
||||||
|
|
||||||
# IPython
|
|
||||||
profile_default/
|
|
||||||
ipython_config.py
|
|
||||||
|
|
||||||
# pyenv
|
|
||||||
.python-version
|
|
||||||
|
|
||||||
# pipenv
|
|
||||||
Pipfile.lock
|
|
||||||
|
|
||||||
# poetry
|
|
||||||
poetry.lock
|
|
||||||
|
|
||||||
# pdm
|
|
||||||
.pdm.toml
|
|
||||||
|
|
||||||
# PEP 582
|
|
||||||
__pypackages__/
|
|
||||||
|
|
||||||
# Celery stuff
|
|
||||||
celerybeat-schedule
|
|
||||||
celerybeat.pid
|
|
||||||
|
|
||||||
# SageMath parsed files
|
|
||||||
*.sage.py
|
|
||||||
|
|
||||||
# Environments
|
|
||||||
.venv
|
|
||||||
env/
|
|
||||||
venv/
|
|
||||||
ENV/
|
|
||||||
env.bak/
|
|
||||||
venv.bak/
|
|
||||||
|
|
||||||
# Spyder project settings
|
|
||||||
.spyderproject
|
|
||||||
.spyproject
|
|
||||||
|
|
||||||
# Rope project settings
|
|
||||||
.ropeproject
|
|
||||||
|
|
||||||
# mkdocs documentation
|
|
||||||
/site
|
|
||||||
|
|
||||||
# mypy
|
|
||||||
.mypy_cache/
|
|
||||||
.dmypy.json
|
|
||||||
dmypy.json
|
|
||||||
|
|
||||||
# Pyre type checker
|
|
||||||
.pyre/
|
|
||||||
|
|
||||||
# pytype static type analyzer
|
|
||||||
.pytype/
|
|
||||||
|
|
||||||
# Cython debug symbols
|
|
||||||
cython_debug/
|
|
||||||
|
|
||||||
# ===== Database =====
|
|
||||||
# SQLite (development)
|
|
||||||
*.db
|
|
||||||
*.sqlite
|
|
||||||
*.sqlite3
|
|
||||||
|
|
||||||
# PostgreSQL dumps
|
|
||||||
*.sql.gz
|
|
||||||
*.dump
|
|
||||||
|
|
||||||
# Database backups
|
|
||||||
backups/
|
|
||||||
*.backup
|
|
||||||
|
|
||||||
# ===== Alembic Migrations =====
|
|
||||||
# Keep migration files but ignore bytecode
|
|
||||||
alembic/__pycache__/
|
|
||||||
alembic/versions/__pycache__/
|
|
||||||
# Keep alembic.ini, env.py, and all migration files in alembic/versions/
|
|
||||||
|
|
||||||
# ===== IDE / Editors =====
|
|
||||||
# VSCode
|
|
||||||
.vscode/
|
|
||||||
*.code-workspace
|
|
||||||
|
|
||||||
# PyCharm
|
|
||||||
.idea/
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
*.iws
|
|
||||||
|
|
||||||
# Sublime Text
|
|
||||||
*.sublime-project
|
|
||||||
*.sublime-workspace
|
|
||||||
|
|
||||||
# Vim
|
|
||||||
*.swp
|
|
||||||
*.swo
|
|
||||||
*~
|
|
||||||
.netrwhist
|
|
||||||
|
|
||||||
# Emacs
|
|
||||||
*~
|
|
||||||
\#*\#
|
|
||||||
/.emacs.desktop
|
|
||||||
/.emacs.desktop.lock
|
|
||||||
*.elc
|
|
||||||
|
|
||||||
# Eclipse
|
|
||||||
.project
|
|
||||||
.pydevproject
|
|
||||||
.settings/
|
|
||||||
|
|
||||||
# ===== Operating System =====
|
|
||||||
# macOS
|
|
||||||
.DS_Store
|
|
||||||
.AppleDouble
|
|
||||||
.LSOverride
|
|
||||||
._*
|
|
||||||
.DocumentRevisions-V100
|
|
||||||
.fseventsd
|
|
||||||
.Spotlight-V100
|
|
||||||
.TemporaryItems
|
|
||||||
.Trashes
|
|
||||||
.VolumeIcon.icns
|
|
||||||
.com.apple.timemachine.donotpresent
|
|
||||||
|
|
||||||
# Windows
|
|
||||||
Thumbs.db
|
|
||||||
Thumbs.db:encryptable
|
|
||||||
ehthumbs.db
|
|
||||||
ehthumbs_vista.db
|
|
||||||
*.stackdump
|
|
||||||
[Dd]esktop.ini
|
|
||||||
$RECYCLE.BIN/
|
|
||||||
*.cab
|
|
||||||
*.msi
|
|
||||||
*.msix
|
|
||||||
*.msm
|
|
||||||
*.msp
|
|
||||||
*.lnk
|
|
||||||
|
|
||||||
# Linux
|
|
||||||
.directory
|
|
||||||
.Trash-*
|
|
||||||
.nfs*
|
|
||||||
|
|
||||||
# ===== Logs & Runtime =====
|
|
||||||
*.log
|
|
||||||
logs/
|
|
||||||
*.out
|
|
||||||
*.err
|
|
||||||
*.pid
|
|
||||||
*.seed
|
|
||||||
*.pid.lock
|
|
||||||
|
|
||||||
# ===== Application-Specific =====
|
|
||||||
# Uploaded files (R2 storage handles this)
|
|
||||||
uploads/
|
|
||||||
temp_uploads/
|
|
||||||
tmp/
|
|
||||||
temporary/
|
|
||||||
|
|
||||||
# Generated SQL files (from scripts)
|
|
||||||
create_superadmin.sql
|
|
||||||
|
|
||||||
# CSV imports
|
|
||||||
imports/*.csv
|
|
||||||
!imports/.gitkeep
|
|
||||||
|
|
||||||
# Generated reports
|
|
||||||
reports/
|
|
||||||
exports/
|
|
||||||
|
|
||||||
# Cache directories
|
|
||||||
.cache/
|
|
||||||
cache/
|
|
||||||
|
|
||||||
# ===== Security & Secrets =====
|
|
||||||
# API keys and secrets
|
|
||||||
secrets/
|
|
||||||
*.pem
|
|
||||||
*.key
|
|
||||||
*.cert
|
|
||||||
*.crt
|
|
||||||
*.p12
|
|
||||||
*.pfx
|
|
||||||
|
|
||||||
# Stripe webhook secrets
|
|
||||||
stripe_*.txt
|
|
||||||
|
|
||||||
# ===== Testing =====
|
|
||||||
# Test databases
|
|
||||||
test.db
|
|
||||||
test_*.db
|
|
||||||
|
|
||||||
# Test coverage
|
|
||||||
htmlcov/
|
|
||||||
.coverage
|
|
||||||
|
|
||||||
# ===== Miscellaneous =====
|
|
||||||
# Backup files
|
|
||||||
*.bak
|
|
||||||
*.backup
|
|
||||||
*.old
|
|
||||||
*.orig
|
|
||||||
|
|
||||||
# Compressed files
|
|
||||||
*.zip
|
|
||||||
*.tar.gz
|
|
||||||
*.rar
|
|
||||||
|
|
||||||
# Temporary files
|
|
||||||
*.tmp
|
|
||||||
*.temp
|
|
||||||
|
|
||||||
# Lock files
|
|
||||||
*.lock
|
|
||||||
!requirements.txt.lock
|
|
||||||
|
|
||||||
# ===== Keep These =====
|
|
||||||
# Keep these example/template files
|
|
||||||
!.env.example
|
|
||||||
!migrations/.gitkeep
|
|
||||||
!uploads/.gitkeep
|
|
||||||
|
|||||||
@@ -1,247 +0,0 @@
|
|||||||
# Database Status - LOAF Membership Platform
|
|
||||||
|
|
||||||
**Database:** `loaf_new`
|
|
||||||
**Host:** 10.9.23.11:54321
|
|
||||||
**Last Updated:** 2026-01-03
|
|
||||||
**Status:** ✅ Fully initialized with seed data
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Database Summary
|
|
||||||
|
|
||||||
### Tables (18 total)
|
|
||||||
|
|
||||||
| Table Name | Status | Records | Purpose |
|
|
||||||
|------------|--------|---------|---------|
|
|
||||||
| ✅ alembic_version | Active | 1 | Migration tracking (001_initial_baseline) |
|
|
||||||
| ✅ users | Active | 0 | User accounts and profiles |
|
|
||||||
| ✅ events | Active | 0 | Event management |
|
|
||||||
| ✅ event_rsvps | Active | 0 | Event RSVPs and attendance |
|
|
||||||
| ✅ event_galleries | Active | 0 | Event photo galleries |
|
|
||||||
| ✅ roles | Active | 5 | RBAC role definitions |
|
|
||||||
| ✅ permissions | Active | 25 | RBAC permission definitions |
|
|
||||||
| ✅ role_permissions | Active | 49 | Role-permission mappings |
|
|
||||||
| ✅ user_invitations | Active | 0 | Admin invitation system |
|
|
||||||
| ✅ subscriptions | Active | 0 | User subscriptions |
|
|
||||||
| ✅ subscription_plans | Active | 3 | Available membership plans |
|
|
||||||
| ✅ donations | Active | 0 | Donation tracking |
|
|
||||||
| ✅ import_jobs | Active | 0 | CSV import tracking |
|
|
||||||
| ✅ import_rollback_audit | Active | 0 | Import rollback audit trail |
|
|
||||||
| ✅ newsletter_archives | Active | 0 | Newsletter document archive |
|
|
||||||
| ✅ financial_reports | Active | 0 | Financial document archive |
|
|
||||||
| ✅ bylaws_documents | Active | 0 | Bylaws document archive |
|
|
||||||
| ✅ storage_usage | Active | 1 | Storage quota tracking (100GB limit) |
|
|
||||||
|
|
||||||
### ENUMs (8 total)
|
|
||||||
|
|
||||||
| ENUM Name | Values | Used By |
|
|
||||||
|-----------|--------|---------|
|
|
||||||
| ✅ userstatus | pending_email, awaiting_event, pre_approved, payment_pending, active, inactive | users.status |
|
|
||||||
| ✅ userrole | guest, member, admin, finance, superadmin | users.role, user_invitations.role |
|
|
||||||
| ✅ rsvpstatus | yes, no, maybe | event_rsvps.rsvp_status |
|
|
||||||
| ✅ subscriptionstatus | active, past_due, canceled, incomplete, trialing | subscriptions.status |
|
|
||||||
| ✅ donationtype | one_time, recurring, pledge, in_kind, memorial | donations.donation_type |
|
|
||||||
| ✅ donationstatus | pending, completed, failed, refunded | donations.status |
|
|
||||||
| ✅ invitationstatus | pending, accepted, expired, revoked | user_invitations.status |
|
|
||||||
| ✅ importjobstatus | processing, completed, failed | import_jobs.status |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Seed Data Loaded
|
|
||||||
|
|
||||||
### Roles (5)
|
|
||||||
|
|
||||||
| Code | Name | System Role | Permissions |
|
|
||||||
|------|------|-------------|-------------|
|
|
||||||
| admin | Admin | Yes | 16 |
|
|
||||||
| finance | Finance | Yes | 7 |
|
|
||||||
| guest | Guest | Yes | 0 |
|
|
||||||
| member | Member | Yes | 1 |
|
|
||||||
| superadmin | Super Admin | Yes | 25 |
|
|
||||||
|
|
||||||
### Permissions (25 across 5 modules)
|
|
||||||
|
|
||||||
**Users Module (6 permissions):**
|
|
||||||
- users.view - View Users
|
|
||||||
- users.create - Create Users
|
|
||||||
- users.edit - Edit Users
|
|
||||||
- users.delete - Delete Users
|
|
||||||
- users.approve - Approve Users
|
|
||||||
- users.import - Import Users
|
|
||||||
|
|
||||||
**Events Module (6 permissions):**
|
|
||||||
- events.view - View Events
|
|
||||||
- events.create - Create Events
|
|
||||||
- events.edit - Edit Events
|
|
||||||
- events.delete - Delete Events
|
|
||||||
- events.publish - Publish Events
|
|
||||||
- events.manage_attendance - Manage Attendance
|
|
||||||
|
|
||||||
**Finance Module (5 permissions):**
|
|
||||||
- finance.view - View Financial Data
|
|
||||||
- finance.manage_plans - Manage Subscription Plans
|
|
||||||
- finance.manage_subscriptions - Manage Subscriptions
|
|
||||||
- finance.view_reports - View Financial Reports
|
|
||||||
- finance.export - Export Financial Data
|
|
||||||
|
|
||||||
**Content Module (3 permissions):**
|
|
||||||
- content.newsletters - Manage Newsletters
|
|
||||||
- content.documents - Manage Documents
|
|
||||||
- content.gallery - Manage Gallery
|
|
||||||
|
|
||||||
**System Module (5 permissions):**
|
|
||||||
- system.settings - System Settings
|
|
||||||
- system.roles - Manage Roles
|
|
||||||
- system.invitations - Manage Invitations
|
|
||||||
- system.storage - Manage Storage
|
|
||||||
- system.audit - View Audit Logs
|
|
||||||
|
|
||||||
### Subscription Plans (3)
|
|
||||||
|
|
||||||
| Plan Name | Price | Billing | Custom Pricing | Donation Support |
|
|
||||||
|-----------|-------|---------|----------------|------------------|
|
|
||||||
| Pay What You Want Membership | $30.00 (min) | Annual | ✅ Yes | ✅ Yes |
|
|
||||||
| Annual Individual Membership | $60.00 | Annual | ❌ No | ❌ No |
|
|
||||||
| Annual Group Membership | $100.00 | Annual | ❌ No | ❌ No |
|
|
||||||
|
|
||||||
**Note:** Stripe price IDs need to be configured after Stripe setup.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Migration Status
|
|
||||||
|
|
||||||
**Current Revision:** `001_initial_baseline (head)`
|
|
||||||
**Migration System:** Alembic 1.14.0
|
|
||||||
**Schema Source:** `migrations/000_initial_schema.sql`
|
|
||||||
**Seed Source:** `migrations/seed_data.sql`
|
|
||||||
|
|
||||||
**Migration History:**
|
|
||||||
- `001_initial_baseline` - Empty baseline marker (2026-01-02)
|
|
||||||
|
|
||||||
**Future migrations** will be generated using:
|
|
||||||
```bash
|
|
||||||
alembic revision --autogenerate -m "description"
|
|
||||||
alembic upgrade head
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Next Steps
|
|
||||||
|
|
||||||
### Immediate (Required)
|
|
||||||
|
|
||||||
1. **Create Superadmin User**
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
python3 create_superadmin.py
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Configure Stripe Price IDs**
|
|
||||||
```sql
|
|
||||||
UPDATE subscription_plans
|
|
||||||
SET stripe_price_id = 'price_xxx'
|
|
||||||
WHERE name = 'Annual Individual Membership';
|
|
||||||
|
|
||||||
UPDATE subscription_plans
|
|
||||||
SET stripe_price_id = 'price_yyy'
|
|
||||||
WHERE name = 'Annual Group Membership';
|
|
||||||
|
|
||||||
UPDATE subscription_plans
|
|
||||||
SET stripe_price_id = 'price_zzz'
|
|
||||||
WHERE name = 'Pay What You Want Membership';
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Set Environment Variables**
|
|
||||||
- Copy `backend/.env.example` to `backend/.env`
|
|
||||||
- Fill in all required values (DATABASE_URL, JWT_SECRET, SMTP, Stripe, R2)
|
|
||||||
|
|
||||||
4. **Test Application**
|
|
||||||
```bash
|
|
||||||
# Backend
|
|
||||||
cd backend
|
|
||||||
uvicorn server:app --reload
|
|
||||||
|
|
||||||
# Frontend (separate terminal)
|
|
||||||
cd frontend
|
|
||||||
yarn start
|
|
||||||
```
|
|
||||||
|
|
||||||
### Optional (Recommended)
|
|
||||||
|
|
||||||
1. **Add Sample Events**
|
|
||||||
- Login as superadmin
|
|
||||||
- Navigate to Admin → Events
|
|
||||||
- Create 2-3 sample events
|
|
||||||
|
|
||||||
2. **Test Registration Flow**
|
|
||||||
- Register a test user
|
|
||||||
- Verify email verification works
|
|
||||||
- Test event RSVP
|
|
||||||
- Test admin approval flow
|
|
||||||
|
|
||||||
3. **Configure Email Templates**
|
|
||||||
- Review templates in `backend/email_service.py`
|
|
||||||
- Customize colors, branding, copy
|
|
||||||
|
|
||||||
4. **Set Up Monitoring**
|
|
||||||
- Configure error logging
|
|
||||||
- Set up uptime monitoring
|
|
||||||
- Configure backup schedule
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Database Maintenance
|
|
||||||
|
|
||||||
### Backup Command
|
|
||||||
|
|
||||||
```bash
|
|
||||||
PGPASSWORD='your-password' pg_dump -h 10.9.23.11 -p 54321 -U postgres loaf_new > backup_$(date +%Y%m%d_%H%M%S).sql
|
|
||||||
```
|
|
||||||
|
|
||||||
### Restore Command
|
|
||||||
|
|
||||||
```bash
|
|
||||||
PGPASSWORD='your-password' psql -h 10.9.23.11 -p 54321 -U postgres -d loaf_new < backup_file.sql
|
|
||||||
```
|
|
||||||
|
|
||||||
### Health Check Queries
|
|
||||||
|
|
||||||
```sql
|
|
||||||
-- Check user count by status
|
|
||||||
SELECT status, COUNT(*) FROM users GROUP BY status;
|
|
||||||
|
|
||||||
-- Check upcoming events
|
|
||||||
SELECT title, start_at FROM events WHERE start_at > NOW() ORDER BY start_at LIMIT 5;
|
|
||||||
|
|
||||||
-- Check active subscriptions
|
|
||||||
SELECT COUNT(*) FROM subscriptions WHERE status = 'active';
|
|
||||||
|
|
||||||
-- Check storage usage
|
|
||||||
SELECT
|
|
||||||
total_bytes_used / 1024 / 1024 / 1024 as used_gb,
|
|
||||||
max_bytes_allowed / 1024 / 1024 / 1024 as max_gb,
|
|
||||||
ROUND((total_bytes_used::numeric / max_bytes_allowed * 100)::numeric, 2) as percent_used
|
|
||||||
FROM storage_usage;
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Support & Resources
|
|
||||||
|
|
||||||
- **Deployment Guide:** See `DEPLOYMENT.md` for complete deployment instructions
|
|
||||||
- **API Documentation:** http://localhost:8000/docs (when backend running)
|
|
||||||
- **Alembic Guide:** See `backend/alembic/README.md` for migration documentation
|
|
||||||
- **Project Documentation:** See `CLAUDE.md` for codebase overview
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Changelog
|
|
||||||
|
|
||||||
**2026-01-03:**
|
|
||||||
- ✅ Created all 17 data tables
|
|
||||||
- ✅ Created all 8 ENUMs
|
|
||||||
- ✅ Loaded seed data (5 roles, 25 permissions, 3 subscription plans)
|
|
||||||
- ✅ Initialized Alembic tracking (001_initial_baseline)
|
|
||||||
- ✅ Created superadmin user helper script
|
|
||||||
|
|
||||||
**Status:** Database is fully initialized and ready for use. Next step: Create superadmin user and start application.
|
|
||||||
379
DEPLOYMENT.md
379
DEPLOYMENT.md
@@ -1,379 +0,0 @@
|
|||||||
# Deployment Guide - LOAF Membership Platform
|
|
||||||
|
|
||||||
## Fresh Database Installation
|
|
||||||
|
|
||||||
Follow these steps in order for a **brand new deployment**:
|
|
||||||
|
|
||||||
### Step 1: Create PostgreSQL Database
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Connect to PostgreSQL
|
|
||||||
psql -U postgres
|
|
||||||
|
|
||||||
# Create database
|
|
||||||
CREATE DATABASE membership_db;
|
|
||||||
|
|
||||||
# Create user (if needed)
|
|
||||||
CREATE USER loaf_admin WITH PASSWORD 'your-secure-password';
|
|
||||||
GRANT ALL PRIVILEGES ON DATABASE membership_db TO loaf_admin;
|
|
||||||
|
|
||||||
# Exit PostgreSQL
|
|
||||||
\q
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 2: Run Initial Schema
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
|
|
||||||
# Apply the complete schema (creates all 17 tables, 8 enums, indexes)
|
|
||||||
psql -U loaf_admin -d membership_db -f migrations/000_initial_schema.sql
|
|
||||||
```
|
|
||||||
|
|
||||||
**What this creates:**
|
|
||||||
- ✅ 17 tables: users, events, subscriptions, roles, permissions, etc.
|
|
||||||
- ✅ 8 custom enums: UserStatus, UserRole, RSVPStatus, etc.
|
|
||||||
- ✅ All indexes and foreign keys
|
|
||||||
- ✅ All constraints and defaults
|
|
||||||
|
|
||||||
### Step 3: Mark Database for Alembic Tracking
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Mark the database as being at the baseline
|
|
||||||
alembic stamp head
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 4: Verify Setup
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Check Alembic status
|
|
||||||
alembic current
|
|
||||||
# Expected output: 001_initial_baseline (head)
|
|
||||||
|
|
||||||
# Check database tables
|
|
||||||
psql -U loaf_admin -d membership_db -c "\dt"
|
|
||||||
# Should show 17 tables
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 5: Set Environment Variables
|
|
||||||
|
|
||||||
Create `backend/.env`:
|
|
||||||
|
|
||||||
```env
|
|
||||||
# Database
|
|
||||||
DATABASE_URL=postgresql://loaf_admin:your-password@localhost:5432/membership_db
|
|
||||||
|
|
||||||
# JWT
|
|
||||||
JWT_SECRET=your-secret-key-minimum-32-characters-long
|
|
||||||
JWT_ALGORITHM=HS256
|
|
||||||
ACCESS_TOKEN_EXPIRE_MINUTES=30
|
|
||||||
|
|
||||||
# Email (SMTP)
|
|
||||||
SMTP_HOST=smtp.gmail.com
|
|
||||||
SMTP_PORT=587
|
|
||||||
SMTP_USERNAME=your-email@gmail.com
|
|
||||||
SMTP_PASSWORD=your-app-password
|
|
||||||
SMTP_FROM_EMAIL=noreply@loafmembers.org
|
|
||||||
SMTP_FROM_NAME=LOAF Membership
|
|
||||||
|
|
||||||
# Frontend URL
|
|
||||||
FRONTEND_URL=https://members.loafmembers.org
|
|
||||||
|
|
||||||
# Cloudflare R2
|
|
||||||
R2_ENDPOINT_URL=https://your-account-id.r2.cloudflarestorage.com
|
|
||||||
R2_ACCESS_KEY_ID=your-r2-access-key
|
|
||||||
R2_SECRET_ACCESS_KEY=your-r2-secret-key
|
|
||||||
R2_BUCKET_NAME=loaf-membership
|
|
||||||
R2_PUBLIC_URL=https://cdn.loafmembers.org
|
|
||||||
|
|
||||||
# Stripe
|
|
||||||
STRIPE_SECRET_KEY=sk_live_...
|
|
||||||
STRIPE_WEBHOOK_SECRET=whsec_...
|
|
||||||
STRIPE_PRICE_ID_ANNUAL=price_...
|
|
||||||
STRIPE_PRICE_ID_GROUP=price_...
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 6: Install Dependencies
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Backend
|
|
||||||
cd backend
|
|
||||||
pip install -r requirements.txt
|
|
||||||
|
|
||||||
# Frontend
|
|
||||||
cd ../frontend
|
|
||||||
yarn install
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 7: Start Services
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Backend (in backend/)
|
|
||||||
uvicorn server:app --host 0.0.0.0 --port 8000
|
|
||||||
|
|
||||||
# Frontend (in frontend/)
|
|
||||||
yarn start
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 8: Create First Superadmin User
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Connect to database
|
|
||||||
psql -U loaf_admin -d membership_db
|
|
||||||
|
|
||||||
# Create superadmin user
|
|
||||||
INSERT INTO users (
|
|
||||||
id, email, password_hash, first_name, last_name,
|
|
||||||
status, role, email_verified, created_at, updated_at
|
|
||||||
) VALUES (
|
|
||||||
gen_random_uuid(),
|
|
||||||
'admin@loafmembers.org',
|
|
||||||
'$2b$12$your-bcrypt-hashed-password-here', -- Use bcrypt to hash password
|
|
||||||
'Admin',
|
|
||||||
'User',
|
|
||||||
'active',
|
|
||||||
'superadmin',
|
|
||||||
true,
|
|
||||||
NOW(),
|
|
||||||
NOW()
|
|
||||||
);
|
|
||||||
```
|
|
||||||
|
|
||||||
**Generate password hash:**
|
|
||||||
```python
|
|
||||||
import bcrypt
|
|
||||||
password = b"your-secure-password"
|
|
||||||
hashed = bcrypt.hashpw(password, bcrypt.gensalt())
|
|
||||||
print(hashed.decode())
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Existing Database Update
|
|
||||||
|
|
||||||
For **updating an existing deployment** with new code:
|
|
||||||
|
|
||||||
### Step 1: Backup Database
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pg_dump -U loaf_admin membership_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 2: Pull Latest Code
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git pull origin main
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 3: Install New Dependencies
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Backend
|
|
||||||
cd backend
|
|
||||||
pip install -r requirements.txt
|
|
||||||
|
|
||||||
# Frontend
|
|
||||||
cd ../frontend
|
|
||||||
yarn install
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 4: Apply Database Migrations
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
|
|
||||||
# Check current migration status
|
|
||||||
alembic current
|
|
||||||
|
|
||||||
# Apply pending migrations
|
|
||||||
alembic upgrade head
|
|
||||||
|
|
||||||
# Verify
|
|
||||||
alembic current
|
|
||||||
```
|
|
||||||
|
|
||||||
### Step 5: Restart Services
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Restart backend
|
|
||||||
systemctl restart membership-backend
|
|
||||||
|
|
||||||
# Rebuild and restart frontend
|
|
||||||
cd frontend
|
|
||||||
yarn build
|
|
||||||
systemctl restart membership-frontend
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## First-Time Alembic Setup (Existing Database)
|
|
||||||
|
|
||||||
If you have an **existing database** that was created with `000_initial_schema.sql` but hasn't been marked for Alembic tracking:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
|
|
||||||
# Mark database as being at the baseline (one-time only)
|
|
||||||
alembic stamp head
|
|
||||||
|
|
||||||
# Verify
|
|
||||||
alembic current
|
|
||||||
# Expected output: 001_initial_baseline (head)
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Database Schema Verification
|
|
||||||
|
|
||||||
**Check all tables exist:**
|
|
||||||
```bash
|
|
||||||
psql -U loaf_admin -d membership_db -c "\dt"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected tables (17 total):**
|
|
||||||
- users
|
|
||||||
- events
|
|
||||||
- event_rsvps
|
|
||||||
- subscriptions
|
|
||||||
- subscription_plans
|
|
||||||
- permissions
|
|
||||||
- roles
|
|
||||||
- role_permissions
|
|
||||||
- user_invitations
|
|
||||||
- import_jobs
|
|
||||||
- import_rollback_audit
|
|
||||||
- event_galleries
|
|
||||||
- newsletter_archives
|
|
||||||
- financial_reports
|
|
||||||
- bylaws_documents
|
|
||||||
- donations
|
|
||||||
- storage_usage
|
|
||||||
|
|
||||||
**Check enums:**
|
|
||||||
```bash
|
|
||||||
psql -U loaf_admin -d membership_db -c "\dT"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected enums (8 total):**
|
|
||||||
- userstatus
|
|
||||||
- userrole
|
|
||||||
- rsvpstatus
|
|
||||||
- subscriptionstatus
|
|
||||||
- donationtype
|
|
||||||
- donationstatus
|
|
||||||
- invitationstatus
|
|
||||||
- importjobstatus
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Rollback Procedures
|
|
||||||
|
|
||||||
### Rollback Last Migration
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
alembic downgrade -1
|
|
||||||
```
|
|
||||||
|
|
||||||
### Rollback to Specific Revision
|
|
||||||
|
|
||||||
```bash
|
|
||||||
alembic downgrade <revision_id>
|
|
||||||
```
|
|
||||||
|
|
||||||
### Complete Database Reset
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# WARNING: This deletes ALL data!
|
|
||||||
|
|
||||||
# 1. Backup first
|
|
||||||
pg_dump -U loaf_admin membership_db > emergency_backup.sql
|
|
||||||
|
|
||||||
# 2. Drop database
|
|
||||||
dropdb membership_db
|
|
||||||
|
|
||||||
# 3. Recreate database
|
|
||||||
createdb membership_db
|
|
||||||
|
|
||||||
# 4. Run initial schema
|
|
||||||
psql -U loaf_admin -d membership_db -f backend/migrations/000_initial_schema.sql
|
|
||||||
|
|
||||||
# 5. Mark for Alembic
|
|
||||||
cd backend
|
|
||||||
alembic stamp head
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
### "relation does not exist" error
|
|
||||||
|
|
||||||
The database wasn't initialized properly.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
```bash
|
|
||||||
psql -U loaf_admin -d membership_db -f backend/migrations/000_initial_schema.sql
|
|
||||||
alembic stamp head
|
|
||||||
```
|
|
||||||
|
|
||||||
### "Target database is not up to date"
|
|
||||||
|
|
||||||
Migrations haven't been applied.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
alembic upgrade head
|
|
||||||
```
|
|
||||||
|
|
||||||
### "Can't locate revision"
|
|
||||||
|
|
||||||
Alembic tracking is out of sync.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
```bash
|
|
||||||
# Check what revision the database thinks it's at
|
|
||||||
alembic current
|
|
||||||
|
|
||||||
# If empty or wrong, manually set it
|
|
||||||
alembic stamp head
|
|
||||||
```
|
|
||||||
|
|
||||||
### Database connection errors
|
|
||||||
|
|
||||||
Check `.env` file has correct `DATABASE_URL`.
|
|
||||||
|
|
||||||
**Format:**
|
|
||||||
```
|
|
||||||
DATABASE_URL=postgresql://username:password@host:port/database
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Production Checklist
|
|
||||||
|
|
||||||
Before going live:
|
|
||||||
|
|
||||||
- [ ] Database created and schema applied
|
|
||||||
- [ ] Alembic marked as up-to-date (`alembic current` shows baseline)
|
|
||||||
- [ ] All environment variables set in `.env`
|
|
||||||
- [ ] Dependencies installed (Python + Node)
|
|
||||||
- [ ] Superadmin user created
|
|
||||||
- [ ] SSL certificates configured
|
|
||||||
- [ ] Backup system in place
|
|
||||||
- [ ] Monitoring configured
|
|
||||||
- [ ] Domain DNS pointing to server
|
|
||||||
- [ ] Email sending verified (SMTP working)
|
|
||||||
- [ ] Stripe webhook endpoint configured
|
|
||||||
- [ ] R2 bucket accessible and CORS configured
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Support
|
|
||||||
|
|
||||||
For issues:
|
|
||||||
1. Check logs: `tail -f backend/logs/app.log`
|
|
||||||
2. Check Alembic status: `alembic current`
|
|
||||||
3. Verify environment variables: `cat backend/.env`
|
|
||||||
4. Test database connection: `psql -U loaf_admin -d membership_db`
|
|
||||||
42
Dockerfile
42
Dockerfile
@@ -1,40 +1,20 @@
|
|||||||
# Backend Dockerfile - FastAPI with Python
|
# Use an official Python image (Linux)
|
||||||
FROM python:3.11-slim
|
FROM python:3.12-slim
|
||||||
|
|
||||||
# Set environment variables
|
# Set a working directory
|
||||||
ENV PYTHONDONTWRITEBYTECODE=1
|
|
||||||
ENV PYTHONUNBUFFERED=1
|
|
||||||
ENV PYTHONPATH=/app
|
|
||||||
|
|
||||||
# Set work directory
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install system dependencies
|
# Copy dependency list
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
gcc \
|
|
||||||
libpq-dev \
|
|
||||||
curl \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Install Python dependencies
|
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
RUN pip install --no-cache-dir --upgrade pip && \
|
|
||||||
pip install --no-cache-dir -r requirements.txt
|
|
||||||
|
|
||||||
# Copy application code
|
# Install dependencies
|
||||||
|
RUN pip3 install -r requirements.txt
|
||||||
|
|
||||||
|
# Copy the rest of the project
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Create non-root user for security
|
# Expose port (whatever your backend runs on)
|
||||||
RUN adduser --disabled-password --gecos '' appuser && \
|
|
||||||
chown -R appuser:appuser /app
|
|
||||||
USER appuser
|
|
||||||
|
|
||||||
# Expose port
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
# Health check
|
# Run exactly your command
|
||||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
|
CMD ["python", "-m", "uvicorn", "server:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
|
||||||
CMD curl -f http://localhost:8000/health || exit 1
|
|
||||||
|
|
||||||
# Run the application
|
|
||||||
CMD ["uvicorn", "server:app", "--host", "0.0.0.0", "--port", "8000"]
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,141 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Add Directory Permissions Script
|
|
||||||
|
|
||||||
This script adds the new directory.view and directory.manage permissions
|
|
||||||
without clearing existing permissions.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
python add_directory_permissions.py
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
from sqlalchemy import create_engine, text
|
|
||||||
from sqlalchemy.orm import sessionmaker
|
|
||||||
from database import Base
|
|
||||||
from models import Permission, RolePermission, Role, UserRole
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
|
|
||||||
# Load environment variables
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
# Database connection
|
|
||||||
DATABASE_URL = os.getenv("DATABASE_URL")
|
|
||||||
if not DATABASE_URL:
|
|
||||||
print("Error: DATABASE_URL environment variable not set")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
engine = create_engine(DATABASE_URL)
|
|
||||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
|
||||||
|
|
||||||
# New directory permissions
|
|
||||||
NEW_PERMISSIONS = [
|
|
||||||
{"code": "directory.view", "name": "View Directory Settings", "description": "View member directory field configuration", "module": "directory"},
|
|
||||||
{"code": "directory.manage", "name": "Manage Directory Fields", "description": "Enable/disable directory fields shown in Profile and Directory pages", "module": "directory"},
|
|
||||||
]
|
|
||||||
|
|
||||||
# Roles that should have these permissions
|
|
||||||
ROLE_PERMISSION_MAP = {
|
|
||||||
"directory.view": ["admin", "superadmin"],
|
|
||||||
"directory.manage": ["admin", "superadmin"],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def add_directory_permissions():
|
|
||||||
"""Add directory permissions and assign to appropriate roles"""
|
|
||||||
db = SessionLocal()
|
|
||||||
|
|
||||||
try:
|
|
||||||
print("=" * 60)
|
|
||||||
print("Adding Directory Permissions")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
# Step 1: Add permissions if they don't exist
|
|
||||||
print("\n1. Adding permissions...")
|
|
||||||
permission_map = {}
|
|
||||||
|
|
||||||
for perm_data in NEW_PERMISSIONS:
|
|
||||||
existing = db.query(Permission).filter(Permission.code == perm_data["code"]).first()
|
|
||||||
if existing:
|
|
||||||
print(f" - {perm_data['code']}: Already exists")
|
|
||||||
permission_map[perm_data["code"]] = existing
|
|
||||||
else:
|
|
||||||
permission = Permission(
|
|
||||||
code=perm_data["code"],
|
|
||||||
name=perm_data["name"],
|
|
||||||
description=perm_data["description"],
|
|
||||||
module=perm_data["module"]
|
|
||||||
)
|
|
||||||
db.add(permission)
|
|
||||||
db.flush() # Get the ID
|
|
||||||
permission_map[perm_data["code"]] = permission
|
|
||||||
print(f" - {perm_data['code']}: Created")
|
|
||||||
|
|
||||||
db.commit()
|
|
||||||
|
|
||||||
# Step 2: Get roles
|
|
||||||
print("\n2. Fetching roles...")
|
|
||||||
roles = db.query(Role).all()
|
|
||||||
role_map = {role.code: role for role in roles}
|
|
||||||
print(f" Found {len(roles)} roles: {', '.join(role_map.keys())}")
|
|
||||||
|
|
||||||
# Enum mapping for backward compatibility
|
|
||||||
role_enum_map = {
|
|
||||||
'guest': UserRole.guest,
|
|
||||||
'member': UserRole.member,
|
|
||||||
'admin': UserRole.admin,
|
|
||||||
'superadmin': UserRole.superadmin,
|
|
||||||
'finance': UserRole.finance
|
|
||||||
}
|
|
||||||
|
|
||||||
# Step 3: Assign permissions to roles
|
|
||||||
print("\n3. Assigning permissions to roles...")
|
|
||||||
for perm_code, role_codes in ROLE_PERMISSION_MAP.items():
|
|
||||||
permission = permission_map.get(perm_code)
|
|
||||||
if not permission:
|
|
||||||
print(f" Warning: Permission {perm_code} not found")
|
|
||||||
continue
|
|
||||||
|
|
||||||
for role_code in role_codes:
|
|
||||||
role = role_map.get(role_code)
|
|
||||||
if not role:
|
|
||||||
print(f" Warning: Role {role_code} not found")
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Check if mapping already exists
|
|
||||||
existing_mapping = db.query(RolePermission).filter(
|
|
||||||
RolePermission.role_id == role.id,
|
|
||||||
RolePermission.permission_id == permission.id
|
|
||||||
).first()
|
|
||||||
|
|
||||||
if existing_mapping:
|
|
||||||
print(f" - {role_code} -> {perm_code}: Already assigned")
|
|
||||||
else:
|
|
||||||
role_enum = role_enum_map.get(role_code, UserRole.guest)
|
|
||||||
mapping = RolePermission(
|
|
||||||
role=role_enum,
|
|
||||||
role_id=role.id,
|
|
||||||
permission_id=permission.id
|
|
||||||
)
|
|
||||||
db.add(mapping)
|
|
||||||
print(f" - {role_code} -> {perm_code}: Assigned")
|
|
||||||
|
|
||||||
db.commit()
|
|
||||||
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("Directory permissions added successfully!")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
db.rollback()
|
|
||||||
print(f"\nError: {str(e)}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
raise
|
|
||||||
finally:
|
|
||||||
db.close()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
add_directory_permissions()
|
|
||||||
@@ -1,141 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Add Registration Permissions Script
|
|
||||||
|
|
||||||
This script adds the new registration.view and registration.manage permissions
|
|
||||||
without clearing existing permissions.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
python add_registration_permissions.py
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
from sqlalchemy import create_engine, text
|
|
||||||
from sqlalchemy.orm import sessionmaker
|
|
||||||
from database import Base
|
|
||||||
from models import Permission, RolePermission, Role, UserRole
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
|
|
||||||
# Load environment variables
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
# Database connection
|
|
||||||
DATABASE_URL = os.getenv("DATABASE_URL")
|
|
||||||
if not DATABASE_URL:
|
|
||||||
print("Error: DATABASE_URL environment variable not set")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
engine = create_engine(DATABASE_URL)
|
|
||||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
|
||||||
|
|
||||||
# New registration permissions
|
|
||||||
NEW_PERMISSIONS = [
|
|
||||||
{"code": "registration.view", "name": "View Registration Settings", "description": "View registration form schema and settings", "module": "registration"},
|
|
||||||
{"code": "registration.manage", "name": "Manage Registration Form", "description": "Edit registration form schema, steps, and fields", "module": "registration"},
|
|
||||||
]
|
|
||||||
|
|
||||||
# Roles that should have these permissions
|
|
||||||
ROLE_PERMISSION_MAP = {
|
|
||||||
"registration.view": ["admin", "superadmin"],
|
|
||||||
"registration.manage": ["admin", "superadmin"],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def add_registration_permissions():
|
|
||||||
"""Add registration permissions and assign to appropriate roles"""
|
|
||||||
db = SessionLocal()
|
|
||||||
|
|
||||||
try:
|
|
||||||
print("=" * 60)
|
|
||||||
print("Adding Registration Permissions")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
# Step 1: Add permissions if they don't exist
|
|
||||||
print("\n1. Adding permissions...")
|
|
||||||
permission_map = {}
|
|
||||||
|
|
||||||
for perm_data in NEW_PERMISSIONS:
|
|
||||||
existing = db.query(Permission).filter(Permission.code == perm_data["code"]).first()
|
|
||||||
if existing:
|
|
||||||
print(f" - {perm_data['code']}: Already exists")
|
|
||||||
permission_map[perm_data["code"]] = existing
|
|
||||||
else:
|
|
||||||
permission = Permission(
|
|
||||||
code=perm_data["code"],
|
|
||||||
name=perm_data["name"],
|
|
||||||
description=perm_data["description"],
|
|
||||||
module=perm_data["module"]
|
|
||||||
)
|
|
||||||
db.add(permission)
|
|
||||||
db.flush() # Get the ID
|
|
||||||
permission_map[perm_data["code"]] = permission
|
|
||||||
print(f" - {perm_data['code']}: Created")
|
|
||||||
|
|
||||||
db.commit()
|
|
||||||
|
|
||||||
# Step 2: Get roles
|
|
||||||
print("\n2. Fetching roles...")
|
|
||||||
roles = db.query(Role).all()
|
|
||||||
role_map = {role.code: role for role in roles}
|
|
||||||
print(f" Found {len(roles)} roles: {', '.join(role_map.keys())}")
|
|
||||||
|
|
||||||
# Enum mapping for backward compatibility
|
|
||||||
role_enum_map = {
|
|
||||||
'guest': UserRole.guest,
|
|
||||||
'member': UserRole.member,
|
|
||||||
'admin': UserRole.admin,
|
|
||||||
'superadmin': UserRole.superadmin,
|
|
||||||
'finance': UserRole.finance
|
|
||||||
}
|
|
||||||
|
|
||||||
# Step 3: Assign permissions to roles
|
|
||||||
print("\n3. Assigning permissions to roles...")
|
|
||||||
for perm_code, role_codes in ROLE_PERMISSION_MAP.items():
|
|
||||||
permission = permission_map.get(perm_code)
|
|
||||||
if not permission:
|
|
||||||
print(f" Warning: Permission {perm_code} not found")
|
|
||||||
continue
|
|
||||||
|
|
||||||
for role_code in role_codes:
|
|
||||||
role = role_map.get(role_code)
|
|
||||||
if not role:
|
|
||||||
print(f" Warning: Role {role_code} not found")
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Check if mapping already exists
|
|
||||||
existing_mapping = db.query(RolePermission).filter(
|
|
||||||
RolePermission.role_id == role.id,
|
|
||||||
RolePermission.permission_id == permission.id
|
|
||||||
).first()
|
|
||||||
|
|
||||||
if existing_mapping:
|
|
||||||
print(f" - {role_code} -> {perm_code}: Already assigned")
|
|
||||||
else:
|
|
||||||
role_enum = role_enum_map.get(role_code, UserRole.guest)
|
|
||||||
mapping = RolePermission(
|
|
||||||
role=role_enum,
|
|
||||||
role_id=role.id,
|
|
||||||
permission_id=permission.id
|
|
||||||
)
|
|
||||||
db.add(mapping)
|
|
||||||
print(f" - {role_code} -> {perm_code}: Assigned")
|
|
||||||
|
|
||||||
db.commit()
|
|
||||||
|
|
||||||
print("\n" + "=" * 60)
|
|
||||||
print("Registration permissions added successfully!")
|
|
||||||
print("=" * 60)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
db.rollback()
|
|
||||||
print(f"\nError: {str(e)}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
raise
|
|
||||||
finally:
|
|
||||||
db.close()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
add_registration_permissions()
|
|
||||||
118
alembic.ini
118
alembic.ini
@@ -1,118 +0,0 @@
|
|||||||
# A generic, single database configuration.
|
|
||||||
|
|
||||||
[alembic]
|
|
||||||
# path to migration scripts
|
|
||||||
# Use forward slashes (/) also on windows to provide an os agnostic path
|
|
||||||
script_location = alembic
|
|
||||||
|
|
||||||
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
|
||||||
# Uncomment the line below if you want the files to be prepended with date and time
|
|
||||||
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
|
||||||
# for all available tokens
|
|
||||||
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
|
||||||
|
|
||||||
# sys.path path, will be prepended to sys.path if present.
|
|
||||||
# defaults to the current working directory.
|
|
||||||
prepend_sys_path = .
|
|
||||||
|
|
||||||
# timezone to use when rendering the date within the migration file
|
|
||||||
# as well as the filename.
|
|
||||||
# If specified, requires the python>=3.9 or backports.zoneinfo library.
|
|
||||||
# Any required deps can installed by adding `alembic[tz]` to the pip requirements
|
|
||||||
# string value is passed to ZoneInfo()
|
|
||||||
# leave blank for localtime
|
|
||||||
# timezone =
|
|
||||||
|
|
||||||
# max length of characters to apply to the "slug" field
|
|
||||||
# truncate_slug_length = 40
|
|
||||||
|
|
||||||
# set to 'true' to run the environment during
|
|
||||||
# the 'revision' command, regardless of autogenerate
|
|
||||||
# revision_environment = false
|
|
||||||
|
|
||||||
# set to 'true' to allow .pyc and .pyo files without
|
|
||||||
# a source .py file to be detected as revisions in the
|
|
||||||
# versions/ directory
|
|
||||||
# sourceless = false
|
|
||||||
|
|
||||||
# version location specification; This defaults
|
|
||||||
# to alembic/versions. When using multiple version
|
|
||||||
# directories, initial revisions must be specified with --version-path.
|
|
||||||
# The path separator used here should be the separator specified by "version_path_separator" below.
|
|
||||||
# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
|
|
||||||
|
|
||||||
# version path separator; As mentioned above, this is the character used to split
|
|
||||||
# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
|
|
||||||
# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
|
|
||||||
# Valid values for version_path_separator are:
|
|
||||||
#
|
|
||||||
# version_path_separator = :
|
|
||||||
# version_path_separator = ;
|
|
||||||
# version_path_separator = space
|
|
||||||
# version_path_separator = newline
|
|
||||||
version_path_separator = os # Use os.pathsep. Default configuration used for new projects.
|
|
||||||
|
|
||||||
# set to 'true' to search source files recursively
|
|
||||||
# in each "version_locations" directory
|
|
||||||
# new in Alembic version 1.10
|
|
||||||
# recursive_version_locations = false
|
|
||||||
|
|
||||||
# the output encoding used when revision files
|
|
||||||
# are written from script.py.mako
|
|
||||||
# output_encoding = utf-8
|
|
||||||
|
|
||||||
# sqlalchemy.url = driver://user:pass@localhost/dbname
|
|
||||||
# Database URL is configured in alembic/env.py from .env file for security
|
|
||||||
|
|
||||||
|
|
||||||
[post_write_hooks]
|
|
||||||
# post_write_hooks defines scripts or Python functions that are run
|
|
||||||
# on newly generated revision scripts. See the documentation for further
|
|
||||||
# detail and examples
|
|
||||||
|
|
||||||
# format using "black" - use the console_scripts runner, against the "black" entrypoint
|
|
||||||
# hooks = black
|
|
||||||
# black.type = console_scripts
|
|
||||||
# black.entrypoint = black
|
|
||||||
# black.options = -l 79 REVISION_SCRIPT_FILENAME
|
|
||||||
|
|
||||||
# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
|
|
||||||
# hooks = ruff
|
|
||||||
# ruff.type = exec
|
|
||||||
# ruff.executable = %(here)s/.venv/bin/ruff
|
|
||||||
# ruff.options = --fix REVISION_SCRIPT_FILENAME
|
|
||||||
|
|
||||||
# Logging configuration
|
|
||||||
[loggers]
|
|
||||||
keys = root,sqlalchemy,alembic
|
|
||||||
|
|
||||||
[handlers]
|
|
||||||
keys = console
|
|
||||||
|
|
||||||
[formatters]
|
|
||||||
keys = generic
|
|
||||||
|
|
||||||
[logger_root]
|
|
||||||
level = WARNING
|
|
||||||
handlers = console
|
|
||||||
qualname =
|
|
||||||
|
|
||||||
[logger_sqlalchemy]
|
|
||||||
level = WARNING
|
|
||||||
handlers =
|
|
||||||
qualname = sqlalchemy.engine
|
|
||||||
|
|
||||||
[logger_alembic]
|
|
||||||
level = INFO
|
|
||||||
handlers =
|
|
||||||
qualname = alembic
|
|
||||||
|
|
||||||
[handler_console]
|
|
||||||
class = StreamHandler
|
|
||||||
args = (sys.stderr,)
|
|
||||||
level = NOTSET
|
|
||||||
formatter = generic
|
|
||||||
|
|
||||||
[formatter_generic]
|
|
||||||
format = %(levelname)-5.5s [%(name)s] %(message)s
|
|
||||||
datefmt = %H:%M:%S
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
Generic single-database configuration.
|
|
||||||
@@ -1,259 +0,0 @@
|
|||||||
# Alembic Database Migrations
|
|
||||||
|
|
||||||
This directory contains **Alembic** database migrations for the LOAF membership platform.
|
|
||||||
|
|
||||||
## What is Alembic?
|
|
||||||
|
|
||||||
Alembic is a lightweight database migration tool for SQLAlchemy. It allows you to:
|
|
||||||
- Track database schema changes over time
|
|
||||||
- Apply migrations incrementally
|
|
||||||
- Roll back changes if needed
|
|
||||||
- Auto-generate migration scripts from model changes
|
|
||||||
|
|
||||||
## Directory Structure
|
|
||||||
|
|
||||||
```
|
|
||||||
alembic/
|
|
||||||
├── versions/ # Migration scripts (KEEP IN VERSION CONTROL)
|
|
||||||
│ └── *.py # Individual migration files
|
|
||||||
├── env.py # Alembic environment configuration
|
|
||||||
├── script.py.mako # Template for new migration files
|
|
||||||
└── README.md # This file
|
|
||||||
```
|
|
||||||
|
|
||||||
## Quick Start
|
|
||||||
|
|
||||||
### 1. Create a New Migration
|
|
||||||
|
|
||||||
After making changes to `models.py`, generate a migration:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd backend
|
|
||||||
alembic revision --autogenerate -m "add_user_bio_field"
|
|
||||||
```
|
|
||||||
|
|
||||||
This will create a new file in `alembic/versions/` like:
|
|
||||||
```
|
|
||||||
3e02c74581c9_add_user_bio_field.py
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Review the Generated Migration
|
|
||||||
|
|
||||||
**IMPORTANT:** Always review auto-generated migrations before applying them!
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Open the latest migration file
|
|
||||||
cat alembic/versions/3e02c74581c9_add_user_bio_field.py
|
|
||||||
```
|
|
||||||
|
|
||||||
Check:
|
|
||||||
- ✅ The `upgrade()` function contains the correct changes
|
|
||||||
- ✅ The `downgrade()` function properly reverses those changes
|
|
||||||
- ✅ No unintended table drops or data loss
|
|
||||||
|
|
||||||
### 3. Apply the Migration
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Apply all pending migrations
|
|
||||||
alembic upgrade head
|
|
||||||
|
|
||||||
# Or apply migrations one at a time
|
|
||||||
alembic upgrade +1
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4. Rollback a Migration
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Rollback the last migration
|
|
||||||
alembic downgrade -1
|
|
||||||
|
|
||||||
# Rollback to a specific revision
|
|
||||||
alembic downgrade 3e02c74581c9
|
|
||||||
```
|
|
||||||
|
|
||||||
## Common Commands
|
|
||||||
|
|
||||||
| Command | Description |
|
|
||||||
|---------|-------------|
|
|
||||||
| `alembic current` | Show current migration revision |
|
|
||||||
| `alembic history` | Show migration history |
|
|
||||||
| `alembic heads` | Show head revisions |
|
|
||||||
| `alembic upgrade head` | Apply all pending migrations |
|
|
||||||
| `alembic downgrade -1` | Rollback last migration |
|
|
||||||
| `alembic revision --autogenerate -m "message"` | Create new migration |
|
|
||||||
| `alembic stamp head` | Mark database as up-to-date without running migrations |
|
|
||||||
|
|
||||||
## Migration Workflow
|
|
||||||
|
|
||||||
### For Development
|
|
||||||
|
|
||||||
1. **Make changes to `models.py`**
|
|
||||||
```python
|
|
||||||
# In models.py
|
|
||||||
class User(Base):
|
|
||||||
# ...existing fields...
|
|
||||||
bio = Column(Text, nullable=True) # New field
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Generate migration**
|
|
||||||
```bash
|
|
||||||
alembic revision --autogenerate -m "add_user_bio_field"
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Review the generated file**
|
|
||||||
```python
|
|
||||||
# In alembic/versions/xxxxx_add_user_bio_field.py
|
|
||||||
def upgrade():
|
|
||||||
op.add_column('users', sa.Column('bio', sa.Text(), nullable=True))
|
|
||||||
|
|
||||||
def downgrade():
|
|
||||||
op.drop_column('users', 'bio')
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **Apply migration**
|
|
||||||
```bash
|
|
||||||
alembic upgrade head
|
|
||||||
```
|
|
||||||
|
|
||||||
5. **Commit migration file to Git**
|
|
||||||
```bash
|
|
||||||
git add alembic/versions/xxxxx_add_user_bio_field.py
|
|
||||||
git commit -m "Add user bio field"
|
|
||||||
```
|
|
||||||
|
|
||||||
### For Production Deployment
|
|
||||||
|
|
||||||
**Fresh Database (New Installation):**
|
|
||||||
```bash
|
|
||||||
# 1. Create database
|
|
||||||
createdb membership_db
|
|
||||||
|
|
||||||
# 2. Run initial schema SQL (creates all 17 tables)
|
|
||||||
psql -U username -d membership_db -f ../migrations/000_initial_schema.sql
|
|
||||||
|
|
||||||
# 3. Mark database as up-to-date with Alembic
|
|
||||||
alembic stamp head
|
|
||||||
|
|
||||||
# 4. Verify
|
|
||||||
alembic current # Should show: 001_initial_baseline (head)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Existing Database (Apply New Migrations):**
|
|
||||||
```bash
|
|
||||||
# 1. Pull latest code
|
|
||||||
git pull origin main
|
|
||||||
|
|
||||||
# 2. Apply migrations
|
|
||||||
alembic upgrade head
|
|
||||||
|
|
||||||
# 3. Verify
|
|
||||||
alembic current
|
|
||||||
|
|
||||||
# 4. Restart application
|
|
||||||
systemctl restart membership-backend
|
|
||||||
```
|
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
### Database Connection
|
|
||||||
|
|
||||||
Alembic reads the `DATABASE_URL` from your `.env` file:
|
|
||||||
|
|
||||||
```env
|
|
||||||
DATABASE_URL=postgresql://user:password@localhost:5432/membership_db
|
|
||||||
```
|
|
||||||
|
|
||||||
The connection is configured in `alembic/env.py` (lines 29-36).
|
|
||||||
|
|
||||||
### Target Metadata
|
|
||||||
|
|
||||||
Alembic uses `Base.metadata` from `models.py` to detect changes:
|
|
||||||
|
|
||||||
```python
|
|
||||||
# In alembic/env.py
|
|
||||||
from models import Base
|
|
||||||
target_metadata = Base.metadata
|
|
||||||
```
|
|
||||||
|
|
||||||
## Important Notes
|
|
||||||
|
|
||||||
### ✅ DO:
|
|
||||||
- Always review auto-generated migrations before applying
|
|
||||||
- Test migrations in development before production
|
|
||||||
- Commit migration files to version control
|
|
||||||
- Write descriptive migration messages
|
|
||||||
- Include both `upgrade()` and `downgrade()` functions
|
|
||||||
|
|
||||||
### ❌ DON'T:
|
|
||||||
- Don't edit migration files after they've been applied in production
|
|
||||||
- Don't delete migration files from `alembic/versions/`
|
|
||||||
- Don't modify the `revision` or `down_revision` values
|
|
||||||
- Don't commit `.pyc` files (already in .gitignore)
|
|
||||||
|
|
||||||
## Migration History
|
|
||||||
|
|
||||||
| Revision | Description | Date | Type |
|
|
||||||
|----------|-------------|------|------|
|
|
||||||
| `001_initial_baseline` | Baseline marker (empty migration) | 2026-01-02 | Baseline |
|
|
||||||
|
|
||||||
**Note:** The actual initial schema is created by running `backend/migrations/000_initial_schema.sql`. The baseline migration is an empty marker that indicates the starting point for Alembic tracking.
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
### "Target database is not up to date"
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Check current revision
|
|
||||||
alembic current
|
|
||||||
|
|
||||||
# Check pending migrations
|
|
||||||
alembic history
|
|
||||||
|
|
||||||
# Apply missing migrations
|
|
||||||
alembic upgrade head
|
|
||||||
```
|
|
||||||
|
|
||||||
### "FAILED: Can't locate revision identified by 'xxxxx'"
|
|
||||||
|
|
||||||
The database thinks it's at a revision that doesn't exist in your `alembic/versions/`.
|
|
||||||
|
|
||||||
**Solution:**
|
|
||||||
```bash
|
|
||||||
# Mark database at a known good revision
|
|
||||||
alembic stamp head
|
|
||||||
```
|
|
||||||
|
|
||||||
### Migration conflicts
|
|
||||||
|
|
||||||
If you get merge conflicts in migration files:
|
|
||||||
|
|
||||||
1. Resolve conflicts in the migration file
|
|
||||||
2. Ensure `revision` and `down_revision` chain is correct
|
|
||||||
3. Test the migration locally
|
|
||||||
|
|
||||||
### Fresh database setup
|
|
||||||
|
|
||||||
For a completely new database:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Step 1: Run initial schema SQL
|
|
||||||
psql -U username -d membership_db -f ../migrations/000_initial_schema.sql
|
|
||||||
|
|
||||||
# Step 2: Mark as up-to-date
|
|
||||||
alembic stamp head
|
|
||||||
|
|
||||||
# Step 3: Verify
|
|
||||||
alembic current # Should show: 001_initial_baseline (head)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Legacy Migrations
|
|
||||||
|
|
||||||
Old numbered SQL migrations (`000_initial_schema.sql` through `011_wordpress_import_enhancements.sql`) are preserved in `backend/migrations/` for reference. These have been consolidated into the initial Alembic migration.
|
|
||||||
|
|
||||||
**Going forward, all new migrations must use Alembic.**
|
|
||||||
|
|
||||||
## Additional Resources
|
|
||||||
|
|
||||||
- [Alembic Documentation](https://alembic.sqlalchemy.org/)
|
|
||||||
- [SQLAlchemy Documentation](https://docs.sqlalchemy.org/)
|
|
||||||
- [PostgreSQL Documentation](https://www.postgresql.org/docs/)
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
from logging.config import fileConfig
|
|
||||||
|
|
||||||
from sqlalchemy import engine_from_config, pool
|
|
||||||
from alembic import context
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
|
|
||||||
# Add the parent directory to the path so we can import our models
|
|
||||||
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
|
|
||||||
|
|
||||||
# Load environment variables from .env file
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
# Import all models so Alembic can detect them
|
|
||||||
from models import Base
|
|
||||||
import models # This ensures all models are imported
|
|
||||||
|
|
||||||
# this is the Alembic Config object, which provides
|
|
||||||
# access to the values within the .ini file in use.
|
|
||||||
config = context.config
|
|
||||||
|
|
||||||
# Interpret the config file for Python logging.
|
|
||||||
# This line sets up loggers basically.
|
|
||||||
if config.config_file_name is not None:
|
|
||||||
fileConfig(config.config_file_name)
|
|
||||||
|
|
||||||
# Set the SQLAlchemy URL from environment variable
|
|
||||||
database_url = os.getenv("DATABASE_URL")
|
|
||||||
if database_url:
|
|
||||||
config.set_main_option("sqlalchemy.url", database_url)
|
|
||||||
else:
|
|
||||||
raise ValueError(
|
|
||||||
"DATABASE_URL environment variable not set. "
|
|
||||||
"Please create a .env file with DATABASE_URL=postgresql://user:password@host:port/dbname"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add your model's MetaData object here for 'autogenerate' support
|
|
||||||
target_metadata = Base.metadata
|
|
||||||
|
|
||||||
|
|
||||||
def run_migrations_offline() -> None:
|
|
||||||
"""Run migrations in 'offline' mode.
|
|
||||||
|
|
||||||
This configures the context with just a URL
|
|
||||||
and not an Engine, though an Engine is acceptable
|
|
||||||
here as well. By skipping the Engine creation
|
|
||||||
we don't even need a DBAPI to be available.
|
|
||||||
|
|
||||||
Calls to context.execute() here emit the given string to the
|
|
||||||
script output.
|
|
||||||
|
|
||||||
"""
|
|
||||||
url = config.get_main_option("sqlalchemy.url")
|
|
||||||
context.configure(
|
|
||||||
url=url,
|
|
||||||
target_metadata=target_metadata,
|
|
||||||
literal_binds=True,
|
|
||||||
dialect_opts={"paramstyle": "named"},
|
|
||||||
compare_type=True, # Detect type changes
|
|
||||||
compare_server_default=True, # Detect default value changes
|
|
||||||
)
|
|
||||||
|
|
||||||
with context.begin_transaction():
|
|
||||||
context.run_migrations()
|
|
||||||
|
|
||||||
|
|
||||||
def run_migrations_online() -> None:
|
|
||||||
"""Run migrations in 'online' mode.
|
|
||||||
|
|
||||||
In this scenario we need to create an Engine
|
|
||||||
and associate a connection with the context.
|
|
||||||
|
|
||||||
"""
|
|
||||||
connectable = engine_from_config(
|
|
||||||
config.get_section(config.config_ini_section, {}),
|
|
||||||
prefix="sqlalchemy.",
|
|
||||||
poolclass=pool.NullPool,
|
|
||||||
)
|
|
||||||
|
|
||||||
with connectable.connect() as connection:
|
|
||||||
context.configure(
|
|
||||||
connection=connection,
|
|
||||||
target_metadata=target_metadata,
|
|
||||||
compare_type=True, # Detect type changes
|
|
||||||
compare_server_default=True, # Detect default value changes
|
|
||||||
)
|
|
||||||
|
|
||||||
with context.begin_transaction():
|
|
||||||
context.run_migrations()
|
|
||||||
|
|
||||||
|
|
||||||
if context.is_offline_mode():
|
|
||||||
run_migrations_offline()
|
|
||||||
else:
|
|
||||||
run_migrations_online()
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
"""${message}
|
|
||||||
|
|
||||||
Revision ID: ${up_revision}
|
|
||||||
Revises: ${down_revision | comma,n}
|
|
||||||
Create Date: ${create_date}
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
${imports if imports else ""}
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = ${repr(up_revision)}
|
|
||||||
down_revision: Union[str, None] = ${repr(down_revision)}
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
|
||||||
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
${upgrades if upgrades else "pass"}
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
${downgrades if downgrades else "pass"}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
"""initial_baseline - Use 000_initial_schema.sql for fresh deployments
|
|
||||||
|
|
||||||
Revision ID: 001_initial_baseline
|
|
||||||
Revises:
|
|
||||||
Create Date: 2026-01-02 16:45:00.000000
|
|
||||||
|
|
||||||
IMPORTANT: This is a baseline migration for existing databases.
|
|
||||||
|
|
||||||
For FRESH deployments:
|
|
||||||
1. Run: psql -U user -d dbname -f backend/migrations/000_initial_schema.sql
|
|
||||||
2. Run: alembic stamp head
|
|
||||||
|
|
||||||
For EXISTING deployments (already have database):
|
|
||||||
1. Run: alembic stamp head (marks database as up-to-date)
|
|
||||||
|
|
||||||
This migration intentionally does NOTHING because:
|
|
||||||
- Fresh deployments use 000_initial_schema.sql to create all tables
|
|
||||||
- Existing deployments already have all tables from 000_initial_schema.sql
|
|
||||||
- Future migrations will be incremental changes from this baseline
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '001_initial_baseline'
|
|
||||||
down_revision: Union[str, None] = None
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""
|
|
||||||
This migration does nothing.
|
|
||||||
|
|
||||||
It serves as a baseline marker that indicates:
|
|
||||||
- All 17 tables exist (users, events, subscriptions, etc.)
|
|
||||||
- All 8 enums are defined (UserStatus, UserRole, etc.)
|
|
||||||
- All indexes and constraints are in place
|
|
||||||
|
|
||||||
The actual schema is created by running:
|
|
||||||
backend/migrations/000_initial_schema.sql
|
|
||||||
"""
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""
|
|
||||||
Cannot downgrade below baseline.
|
|
||||||
|
|
||||||
If you need to completely reset the database:
|
|
||||||
1. dropdb dbname
|
|
||||||
2. createdb dbname
|
|
||||||
3. psql -U user -d dbname -f backend/migrations/000_initial_schema.sql
|
|
||||||
4. alembic stamp head
|
|
||||||
"""
|
|
||||||
pass
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
"""add_missing_user_fields
|
|
||||||
|
|
||||||
Revision ID: 002_add_missing_user_fields
|
|
||||||
Revises: 001_initial_baseline
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Adds missing user fields to sync models.py with database:
|
|
||||||
- scholarship_reason
|
|
||||||
- directory_* fields (email, bio, address, phone, dob, partner_name)
|
|
||||||
- profile_photo_url (rename from profile_image_url)
|
|
||||||
- social_media_* fields (facebook, instagram, twitter, linkedin)
|
|
||||||
- email_verification_expires
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '002_add_missing_user_fields'
|
|
||||||
down_revision: Union[str, None] = '001_initial_baseline'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add missing user fields (skip if already exists)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('users')}
|
|
||||||
|
|
||||||
# Add scholarship_reason
|
|
||||||
if 'scholarship_reason' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('scholarship_reason', sa.Text(), nullable=True))
|
|
||||||
|
|
||||||
# Add directory fields
|
|
||||||
if 'directory_email' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('directory_email', sa.String(), nullable=True))
|
|
||||||
if 'directory_bio' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('directory_bio', sa.Text(), nullable=True))
|
|
||||||
if 'directory_address' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('directory_address', sa.String(), nullable=True))
|
|
||||||
if 'directory_phone' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('directory_phone', sa.String(), nullable=True))
|
|
||||||
if 'directory_dob' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('directory_dob', sa.DateTime(), nullable=True))
|
|
||||||
if 'directory_partner_name' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('directory_partner_name', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# Rename profile_image_url to profile_photo_url (skip if already renamed)
|
|
||||||
if 'profile_image_url' in existing_columns and 'profile_photo_url' not in existing_columns:
|
|
||||||
op.alter_column('users', 'profile_image_url', new_column_name='profile_photo_url')
|
|
||||||
|
|
||||||
# Add social media fields
|
|
||||||
if 'social_media_facebook' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('social_media_facebook', sa.String(), nullable=True))
|
|
||||||
if 'social_media_instagram' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('social_media_instagram', sa.String(), nullable=True))
|
|
||||||
if 'social_media_twitter' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('social_media_twitter', sa.String(), nullable=True))
|
|
||||||
if 'social_media_linkedin' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('social_media_linkedin', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# Add email_verification_expires if missing
|
|
||||||
if 'email_verification_expires' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('email_verification_expires', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove added fields (rollback)"""
|
|
||||||
|
|
||||||
# Remove social media fields
|
|
||||||
op.drop_column('users', 'social_media_linkedin')
|
|
||||||
op.drop_column('users', 'social_media_twitter')
|
|
||||||
op.drop_column('users', 'social_media_instagram')
|
|
||||||
op.drop_column('users', 'social_media_facebook')
|
|
||||||
|
|
||||||
# Rename profile_photo_url back to profile_image_url
|
|
||||||
op.alter_column('users', 'profile_photo_url', new_column_name='profile_image_url')
|
|
||||||
|
|
||||||
# Remove directory fields
|
|
||||||
op.drop_column('users', 'directory_partner_name')
|
|
||||||
op.drop_column('users', 'directory_dob')
|
|
||||||
op.drop_column('users', 'directory_phone')
|
|
||||||
op.drop_column('users', 'directory_address')
|
|
||||||
op.drop_column('users', 'directory_bio')
|
|
||||||
op.drop_column('users', 'directory_email')
|
|
||||||
|
|
||||||
# Remove scholarship_reason
|
|
||||||
op.drop_column('users', 'scholarship_reason')
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
"""add_user_invitation_fields
|
|
||||||
|
|
||||||
Revision ID: 003_add_user_invitation_fields
|
|
||||||
Revises: 002_add_missing_user_fields
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Adds optional pre-filled fields to user_invitations table:
|
|
||||||
- first_name
|
|
||||||
- last_name
|
|
||||||
- phone
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '003_add_user_invitation_fields'
|
|
||||||
down_revision: Union[str, None] = '002_add_missing_user_fields'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add optional pre-filled information fields to user_invitations (skip if already exists)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('user_invitations')}
|
|
||||||
|
|
||||||
# Add first_name if missing
|
|
||||||
if 'first_name' not in existing_columns:
|
|
||||||
op.add_column('user_invitations', sa.Column('first_name', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# Add last_name if missing
|
|
||||||
if 'last_name' not in existing_columns:
|
|
||||||
op.add_column('user_invitations', sa.Column('last_name', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# Add phone if missing
|
|
||||||
if 'phone' not in existing_columns:
|
|
||||||
op.add_column('user_invitations', sa.Column('phone', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove added fields (rollback)"""
|
|
||||||
|
|
||||||
op.drop_column('user_invitations', 'phone')
|
|
||||||
op.drop_column('user_invitations', 'last_name')
|
|
||||||
op.drop_column('user_invitations', 'first_name')
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
"""add_document_file_sizes
|
|
||||||
|
|
||||||
Revision ID: 004_add_document_file_sizes
|
|
||||||
Revises: 003_add_user_invitation_fields
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Adds file_size_bytes to all document tables:
|
|
||||||
- newsletter_archives
|
|
||||||
- financial_reports
|
|
||||||
- bylaws_documents
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '004_add_document_file_sizes'
|
|
||||||
down_revision: Union[str, None] = '003_add_user_invitation_fields'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add file_size_bytes column to document tables (skip if already exists)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
|
|
||||||
# Add to newsletter_archives if missing
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('newsletter_archives')}
|
|
||||||
if 'file_size_bytes' not in existing_columns:
|
|
||||||
op.add_column('newsletter_archives', sa.Column('file_size_bytes', sa.Integer(), nullable=True))
|
|
||||||
|
|
||||||
# Add to financial_reports if missing
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('financial_reports')}
|
|
||||||
if 'file_size_bytes' not in existing_columns:
|
|
||||||
op.add_column('financial_reports', sa.Column('file_size_bytes', sa.Integer(), nullable=True))
|
|
||||||
|
|
||||||
# Add to bylaws_documents if missing
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('bylaws_documents')}
|
|
||||||
if 'file_size_bytes' not in existing_columns:
|
|
||||||
op.add_column('bylaws_documents', sa.Column('file_size_bytes', sa.Integer(), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove file_size_bytes columns (rollback)"""
|
|
||||||
|
|
||||||
op.drop_column('bylaws_documents', 'file_size_bytes')
|
|
||||||
op.drop_column('financial_reports', 'file_size_bytes')
|
|
||||||
op.drop_column('newsletter_archives', 'file_size_bytes')
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
"""fix_subscriptions_and_storage
|
|
||||||
|
|
||||||
Revision ID: 005_fix_subs_storage
|
|
||||||
Revises: 004_add_document_file_sizes
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
- Add missing columns to subscriptions table
|
|
||||||
- Rename storage_usage.last_calculated_at to last_updated
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects.postgresql import UUID
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '005_fix_subs_storage'
|
|
||||||
down_revision: Union[str, None] = '004_add_document_file_sizes'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add missing columns and fix naming (skip if already exists)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
|
|
||||||
# Check existing columns in subscriptions table
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('subscriptions')}
|
|
||||||
|
|
||||||
# Add missing columns to subscriptions table only if they don't exist
|
|
||||||
if 'start_date' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('start_date', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
if 'end_date' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('end_date', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
if 'amount_paid_cents' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('amount_paid_cents', sa.Integer(), nullable=True))
|
|
||||||
if 'manual_payment_notes' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('manual_payment_notes', sa.Text(), nullable=True))
|
|
||||||
if 'manual_payment_admin_id' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('manual_payment_admin_id', UUID(as_uuid=True), nullable=True))
|
|
||||||
if 'manual_payment_date' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('manual_payment_date', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
if 'payment_method' not in existing_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('payment_method', sa.String(50), nullable=True))
|
|
||||||
|
|
||||||
# Add foreign key for manual_payment_admin_id if it doesn't exist
|
|
||||||
existing_fks = [fk['name'] for fk in inspector.get_foreign_keys('subscriptions')]
|
|
||||||
if 'subscriptions_manual_payment_admin_id_fkey' not in existing_fks:
|
|
||||||
op.create_foreign_key(
|
|
||||||
'subscriptions_manual_payment_admin_id_fkey',
|
|
||||||
'subscriptions', 'users',
|
|
||||||
['manual_payment_admin_id'], ['id']
|
|
||||||
)
|
|
||||||
|
|
||||||
# Rename storage_usage.last_calculated_at to last_updated (only if needed)
|
|
||||||
storage_columns = {col['name'] for col in inspector.get_columns('storage_usage')}
|
|
||||||
if 'last_calculated_at' in storage_columns and 'last_updated' not in storage_columns:
|
|
||||||
op.alter_column('storage_usage', 'last_calculated_at', new_column_name='last_updated')
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove added columns (rollback)"""
|
|
||||||
|
|
||||||
# Rename back
|
|
||||||
op.alter_column('storage_usage', 'last_updated', new_column_name='last_calculated_at')
|
|
||||||
|
|
||||||
# Drop foreign key first
|
|
||||||
op.drop_constraint('subscriptions_manual_payment_admin_id_fkey', 'subscriptions', type_='foreignkey')
|
|
||||||
|
|
||||||
# Drop columns from subscriptions
|
|
||||||
op.drop_column('subscriptions', 'payment_method')
|
|
||||||
op.drop_column('subscriptions', 'manual_payment_date')
|
|
||||||
op.drop_column('subscriptions', 'manual_payment_admin_id')
|
|
||||||
op.drop_column('subscriptions', 'manual_payment_notes')
|
|
||||||
op.drop_column('subscriptions', 'amount_paid_cents')
|
|
||||||
op.drop_column('subscriptions', 'end_date')
|
|
||||||
op.drop_column('subscriptions', 'start_date')
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
"""rename_is_active
|
|
||||||
|
|
||||||
Revision ID: 006_rename_active
|
|
||||||
Revises: 005_fix_subs_storage
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
- Rename subscription_plans.is_active to active (match models.py)
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '006_rename_active'
|
|
||||||
down_revision: Union[str, None] = '005_fix_subs_storage'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Rename is_active to active (skip if already renamed)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
|
|
||||||
# Check if rename is needed
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('subscription_plans')}
|
|
||||||
if 'is_active' in existing_columns and 'active' not in existing_columns:
|
|
||||||
op.alter_column('subscription_plans', 'is_active', new_column_name='active')
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Rename back to is_active"""
|
|
||||||
op.alter_column('subscription_plans', 'active', new_column_name='is_active')
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
"""add_subscription_plan_fields
|
|
||||||
|
|
||||||
Revision ID: 007_add_sub_fields
|
|
||||||
Revises: 006_rename_active
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
- Add missing columns to subscription_plans table
|
|
||||||
(custom cycle fields, dynamic pricing fields)
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '007_add_sub_fields'
|
|
||||||
down_revision: Union[str, None] = '006_rename_active'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add missing columns to subscription_plans (skip if already exists)"""
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
# Get database connection
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('subscription_plans')}
|
|
||||||
|
|
||||||
# Custom billing cycle fields
|
|
||||||
if 'custom_cycle_enabled' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('custom_cycle_enabled', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
if 'custom_cycle_start_month' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('custom_cycle_start_month', sa.Integer(), nullable=True))
|
|
||||||
if 'custom_cycle_start_day' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('custom_cycle_start_day', sa.Integer(), nullable=True))
|
|
||||||
if 'custom_cycle_end_month' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('custom_cycle_end_month', sa.Integer(), nullable=True))
|
|
||||||
if 'custom_cycle_end_day' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('custom_cycle_end_day', sa.Integer(), nullable=True))
|
|
||||||
|
|
||||||
# Dynamic pricing fields
|
|
||||||
if 'minimum_price_cents' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('minimum_price_cents', sa.Integer(), nullable=False, server_default='3000'))
|
|
||||||
if 'suggested_price_cents' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('suggested_price_cents', sa.Integer(), nullable=True))
|
|
||||||
if 'allow_donation' not in existing_columns:
|
|
||||||
op.add_column('subscription_plans', sa.Column('allow_donation', sa.Boolean(), nullable=False, server_default='true'))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove added columns (rollback)"""
|
|
||||||
|
|
||||||
op.drop_column('subscription_plans', 'allow_donation')
|
|
||||||
op.drop_column('subscription_plans', 'suggested_price_cents')
|
|
||||||
op.drop_column('subscription_plans', 'minimum_price_cents')
|
|
||||||
op.drop_column('subscription_plans', 'custom_cycle_end_day')
|
|
||||||
op.drop_column('subscription_plans', 'custom_cycle_end_month')
|
|
||||||
op.drop_column('subscription_plans', 'custom_cycle_start_day')
|
|
||||||
op.drop_column('subscription_plans', 'custom_cycle_start_month')
|
|
||||||
op.drop_column('subscription_plans', 'custom_cycle_enabled')
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
"""add_donation_columns
|
|
||||||
|
|
||||||
Revision ID: 008_add_donations
|
|
||||||
Revises: 007_add_sub_fields
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
- Add missing Stripe payment columns to donations table
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '008_add_donations'
|
|
||||||
down_revision: Union[str, None] = '007_add_sub_fields'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add missing columns to donations table (skip if already exists)"""
|
|
||||||
|
|
||||||
# Get database connection
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('donations')}
|
|
||||||
|
|
||||||
# Stripe payment columns
|
|
||||||
if 'stripe_checkout_session_id' not in existing_columns:
|
|
||||||
op.add_column('donations', sa.Column('stripe_checkout_session_id', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
if 'stripe_payment_intent_id' not in existing_columns:
|
|
||||||
op.add_column('donations', sa.Column('stripe_payment_intent_id', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
if 'payment_method' not in existing_columns:
|
|
||||||
op.add_column('donations', sa.Column('payment_method', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
if 'notes' not in existing_columns:
|
|
||||||
op.add_column('donations', sa.Column('notes', sa.Text(), nullable=True))
|
|
||||||
|
|
||||||
if 'updated_at' not in existing_columns:
|
|
||||||
op.add_column('donations', sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove added columns (rollback)"""
|
|
||||||
|
|
||||||
op.drop_column('donations', 'updated_at')
|
|
||||||
op.drop_column('donations', 'notes')
|
|
||||||
op.drop_column('donations', 'payment_method')
|
|
||||||
op.drop_column('donations', 'stripe_payment_intent_id')
|
|
||||||
op.drop_column('donations', 'stripe_checkout_session_id')
|
|
||||||
@@ -1,237 +0,0 @@
|
|||||||
"""add_all_missing_columns
|
|
||||||
|
|
||||||
Revision ID: 009_add_all_missing
|
|
||||||
Revises: 008_add_donations
|
|
||||||
Create Date: 2026-01-04
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
- Add ALL remaining missing columns across all tables
|
|
||||||
- Users: newsletter preferences, volunteer, scholarship, directory, password reset, ToS, member_since, reminders, rejection, import tracking
|
|
||||||
- Events: calendar_uid
|
|
||||||
- Subscriptions: base_subscription_cents, donation_cents, manual_payment
|
|
||||||
- ImportJobs: WordPress import fields
|
|
||||||
- Create ImportRollbackAudit table if not exists
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects.postgresql import UUID
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '009_add_all_missing'
|
|
||||||
down_revision: Union[str, None] = '008_add_donations'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add all missing columns across all tables"""
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 1. USERS TABLE - Add ~28 missing columns
|
|
||||||
# ============================================================
|
|
||||||
users_columns = {col['name'] for col in inspector.get_columns('users')}
|
|
||||||
|
|
||||||
# Newsletter publication preferences
|
|
||||||
if 'newsletter_publish_name' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('newsletter_publish_name', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
if 'newsletter_publish_photo' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('newsletter_publish_photo', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
if 'newsletter_publish_birthday' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('newsletter_publish_birthday', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
if 'newsletter_publish_none' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('newsletter_publish_none', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
|
|
||||||
# Volunteer interests
|
|
||||||
if 'volunteer_interests' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('volunteer_interests', sa.JSON(), nullable=True, server_default='[]'))
|
|
||||||
|
|
||||||
# Scholarship
|
|
||||||
if 'scholarship_requested' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('scholarship_requested', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
|
|
||||||
# Directory
|
|
||||||
if 'show_in_directory' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('show_in_directory', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
|
|
||||||
# Password reset
|
|
||||||
if 'password_reset_token' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('password_reset_token', sa.String(), nullable=True))
|
|
||||||
if 'password_reset_expires' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('password_reset_expires', sa.DateTime(), nullable=True))
|
|
||||||
if 'force_password_change' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('force_password_change', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
|
|
||||||
# Terms of Service
|
|
||||||
if 'accepts_tos' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('accepts_tos', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
if 'tos_accepted_at' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('tos_accepted_at', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
# Member since
|
|
||||||
if 'member_since' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('member_since', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
# Email verification reminders
|
|
||||||
if 'email_verification_reminders_sent' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('email_verification_reminders_sent', sa.Integer(), nullable=False, server_default='0'))
|
|
||||||
if 'last_email_verification_reminder_at' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('last_email_verification_reminder_at', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
# Event attendance reminders
|
|
||||||
if 'event_attendance_reminders_sent' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('event_attendance_reminders_sent', sa.Integer(), nullable=False, server_default='0'))
|
|
||||||
if 'last_event_attendance_reminder_at' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('last_event_attendance_reminder_at', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
# Payment reminders
|
|
||||||
if 'payment_reminders_sent' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('payment_reminders_sent', sa.Integer(), nullable=False, server_default='0'))
|
|
||||||
if 'last_payment_reminder_at' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('last_payment_reminder_at', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
# Renewal reminders
|
|
||||||
if 'renewal_reminders_sent' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('renewal_reminders_sent', sa.Integer(), nullable=False, server_default='0'))
|
|
||||||
if 'last_renewal_reminder_at' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('last_renewal_reminder_at', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
# Rejection tracking
|
|
||||||
if 'rejection_reason' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('rejection_reason', sa.Text(), nullable=True))
|
|
||||||
if 'rejected_at' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('rejected_at', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
if 'rejected_by' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('rejected_by', UUID(as_uuid=True), nullable=True))
|
|
||||||
# Note: Foreign key constraint skipped to avoid circular dependency issues
|
|
||||||
|
|
||||||
# WordPress import tracking
|
|
||||||
if 'import_source' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('import_source', sa.String(50), nullable=True))
|
|
||||||
if 'import_job_id' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('import_job_id', UUID(as_uuid=True), nullable=True))
|
|
||||||
# Note: Foreign key will be added after import_jobs table is updated
|
|
||||||
if 'wordpress_user_id' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('wordpress_user_id', sa.BigInteger(), nullable=True))
|
|
||||||
if 'wordpress_registered_date' not in users_columns:
|
|
||||||
op.add_column('users', sa.Column('wordpress_registered_date', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 2. EVENTS TABLE - Add calendar_uid
|
|
||||||
# ============================================================
|
|
||||||
events_columns = {col['name'] for col in inspector.get_columns('events')}
|
|
||||||
|
|
||||||
if 'calendar_uid' not in events_columns:
|
|
||||||
op.add_column('events', sa.Column('calendar_uid', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 3. SUBSCRIPTIONS TABLE - Add donation tracking
|
|
||||||
# ============================================================
|
|
||||||
subscriptions_columns = {col['name'] for col in inspector.get_columns('subscriptions')}
|
|
||||||
|
|
||||||
if 'base_subscription_cents' not in subscriptions_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('base_subscription_cents', sa.Integer(), nullable=True))
|
|
||||||
# Update existing rows: base_subscription_cents = amount_paid_cents - donation_cents (default 0)
|
|
||||||
op.execute("UPDATE subscriptions SET base_subscription_cents = COALESCE(amount_paid_cents, 0) WHERE base_subscription_cents IS NULL")
|
|
||||||
# Make it non-nullable after populating
|
|
||||||
op.alter_column('subscriptions', 'base_subscription_cents', nullable=False)
|
|
||||||
|
|
||||||
if 'donation_cents' not in subscriptions_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('donation_cents', sa.Integer(), nullable=False, server_default='0'))
|
|
||||||
|
|
||||||
if 'manual_payment' not in subscriptions_columns:
|
|
||||||
op.add_column('subscriptions', sa.Column('manual_payment', sa.Boolean(), nullable=False, server_default='false'))
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 4. IMPORT_JOBS TABLE - Add WordPress import fields
|
|
||||||
# ============================================================
|
|
||||||
import_jobs_columns = {col['name'] for col in inspector.get_columns('import_jobs')}
|
|
||||||
|
|
||||||
if 'field_mapping' not in import_jobs_columns:
|
|
||||||
op.add_column('import_jobs', sa.Column('field_mapping', sa.JSON(), nullable=False, server_default='{}'))
|
|
||||||
|
|
||||||
if 'wordpress_metadata' not in import_jobs_columns:
|
|
||||||
op.add_column('import_jobs', sa.Column('wordpress_metadata', sa.JSON(), nullable=False, server_default='{}'))
|
|
||||||
|
|
||||||
if 'imported_user_ids' not in import_jobs_columns:
|
|
||||||
op.add_column('import_jobs', sa.Column('imported_user_ids', sa.JSON(), nullable=False, server_default='[]'))
|
|
||||||
|
|
||||||
if 'rollback_at' not in import_jobs_columns:
|
|
||||||
op.add_column('import_jobs', sa.Column('rollback_at', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
if 'rollback_by' not in import_jobs_columns:
|
|
||||||
op.add_column('import_jobs', sa.Column('rollback_by', UUID(as_uuid=True), nullable=True))
|
|
||||||
# Foreign key will be added if needed
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 5. CREATE IMPORT_ROLLBACK_AUDIT TABLE
|
|
||||||
# ============================================================
|
|
||||||
if 'import_rollback_audit' not in inspector.get_table_names():
|
|
||||||
op.create_table(
|
|
||||||
'import_rollback_audit',
|
|
||||||
sa.Column('id', UUID(as_uuid=True), primary_key=True),
|
|
||||||
sa.Column('import_job_id', UUID(as_uuid=True), sa.ForeignKey('import_jobs.id'), nullable=False),
|
|
||||||
sa.Column('rolled_back_by', UUID(as_uuid=True), sa.ForeignKey('users.id'), nullable=False),
|
|
||||||
sa.Column('rolled_back_at', sa.DateTime(), nullable=False),
|
|
||||||
sa.Column('deleted_user_count', sa.Integer(), nullable=False),
|
|
||||||
sa.Column('deleted_user_ids', sa.JSON(), nullable=False),
|
|
||||||
sa.Column('reason', sa.Text(), nullable=True),
|
|
||||||
sa.Column('created_at', sa.DateTime(), nullable=False)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove all added columns and tables"""
|
|
||||||
|
|
||||||
# Drop import_rollback_audit table
|
|
||||||
op.drop_table('import_rollback_audit')
|
|
||||||
|
|
||||||
# Drop import_jobs columns
|
|
||||||
op.drop_column('import_jobs', 'rollback_by')
|
|
||||||
op.drop_column('import_jobs', 'rollback_at')
|
|
||||||
op.drop_column('import_jobs', 'imported_user_ids')
|
|
||||||
op.drop_column('import_jobs', 'wordpress_metadata')
|
|
||||||
op.drop_column('import_jobs', 'field_mapping')
|
|
||||||
|
|
||||||
# Drop subscriptions columns
|
|
||||||
op.drop_column('subscriptions', 'manual_payment')
|
|
||||||
op.drop_column('subscriptions', 'donation_cents')
|
|
||||||
op.drop_column('subscriptions', 'base_subscription_cents')
|
|
||||||
|
|
||||||
# Drop events columns
|
|
||||||
op.drop_column('events', 'calendar_uid')
|
|
||||||
|
|
||||||
# Drop users columns (in reverse order)
|
|
||||||
op.drop_column('users', 'wordpress_registered_date')
|
|
||||||
op.drop_column('users', 'wordpress_user_id')
|
|
||||||
op.drop_column('users', 'import_job_id')
|
|
||||||
op.drop_column('users', 'import_source')
|
|
||||||
op.drop_column('users', 'rejected_by')
|
|
||||||
op.drop_column('users', 'rejected_at')
|
|
||||||
op.drop_column('users', 'rejection_reason')
|
|
||||||
op.drop_column('users', 'last_renewal_reminder_at')
|
|
||||||
op.drop_column('users', 'renewal_reminders_sent')
|
|
||||||
op.drop_column('users', 'last_payment_reminder_at')
|
|
||||||
op.drop_column('users', 'payment_reminders_sent')
|
|
||||||
op.drop_column('users', 'last_event_attendance_reminder_at')
|
|
||||||
op.drop_column('users', 'event_attendance_reminders_sent')
|
|
||||||
op.drop_column('users', 'last_email_verification_reminder_at')
|
|
||||||
op.drop_column('users', 'email_verification_reminders_sent')
|
|
||||||
op.drop_column('users', 'member_since')
|
|
||||||
op.drop_column('users', 'tos_accepted_at')
|
|
||||||
op.drop_column('users', 'accepts_tos')
|
|
||||||
op.drop_column('users', 'force_password_change')
|
|
||||||
op.drop_column('users', 'password_reset_expires')
|
|
||||||
op.drop_column('users', 'password_reset_token')
|
|
||||||
op.drop_column('users', 'show_in_directory')
|
|
||||||
op.drop_column('users', 'scholarship_requested')
|
|
||||||
op.drop_column('users', 'volunteer_interests')
|
|
||||||
op.drop_column('users', 'newsletter_publish_none')
|
|
||||||
op.drop_column('users', 'newsletter_publish_birthday')
|
|
||||||
op.drop_column('users', 'newsletter_publish_photo')
|
|
||||||
op.drop_column('users', 'newsletter_publish_name')
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
"""add_email_verification_expires
|
|
||||||
|
|
||||||
Revision ID: 010_add_email_exp
|
|
||||||
Revises: 009_add_all_missing
|
|
||||||
Create Date: 2026-01-05
|
|
||||||
|
|
||||||
Fixes:
|
|
||||||
- Add missing email_verification_expires column to users table
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '010_add_email_exp'
|
|
||||||
down_revision: Union[str, None] = '009_add_all_missing'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Add email_verification_expires column (skip if already exists)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
existing_columns = {col['name'] for col in inspector.get_columns('users')}
|
|
||||||
|
|
||||||
# Add email_verification_expires if missing
|
|
||||||
if 'email_verification_expires' not in existing_columns:
|
|
||||||
op.add_column('users', sa.Column('email_verification_expires', sa.DateTime(), nullable=True))
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Remove email_verification_expires column"""
|
|
||||||
op.drop_column('users', 'email_verification_expires')
|
|
||||||
@@ -1,410 +0,0 @@
|
|||||||
"""align_prod_with_dev
|
|
||||||
|
|
||||||
Revision ID: 011_align_prod_dev
|
|
||||||
Revises: 010_add_email_exp
|
|
||||||
Create Date: 2026-01-05
|
|
||||||
|
|
||||||
Aligns PROD database schema with DEV database schema (source of truth).
|
|
||||||
Fixes type mismatches, removes PROD-only columns, adds DEV-only columns, updates nullable constraints.
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects.postgresql import JSONB, JSON
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '011_align_prod_dev'
|
|
||||||
down_revision: Union[str, None] = '010_add_email_exp'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Align PROD schema with DEV schema (source of truth)"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
|
|
||||||
print("Starting schema alignment: PROD → DEV (source of truth)...")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 1. FIX USERS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[1/14] Fixing users table...")
|
|
||||||
|
|
||||||
users_columns = {col['name'] for col in inspector.get_columns('users')}
|
|
||||||
|
|
||||||
# Remove PROD-only columns (not in models.py or DEV)
|
|
||||||
if 'bio' in users_columns:
|
|
||||||
op.drop_column('users', 'bio')
|
|
||||||
print(" ✓ Removed users.bio (PROD-only)")
|
|
||||||
|
|
||||||
if 'interests' in users_columns:
|
|
||||||
op.drop_column('users', 'interests')
|
|
||||||
print(" ✓ Removed users.interests (PROD-only)")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Change constrained VARCHAR(n) to unconstrained VARCHAR
|
|
||||||
op.alter_column('users', 'first_name', type_=sa.String(), postgresql_using='first_name::varchar')
|
|
||||||
op.alter_column('users', 'last_name', type_=sa.String(), postgresql_using='last_name::varchar')
|
|
||||||
op.alter_column('users', 'email', type_=sa.String(), postgresql_using='email::varchar')
|
|
||||||
op.alter_column('users', 'phone', type_=sa.String(), postgresql_using='phone::varchar')
|
|
||||||
op.alter_column('users', 'city', type_=sa.String(), postgresql_using='city::varchar')
|
|
||||||
op.alter_column('users', 'state', type_=sa.String(), postgresql_using='state::varchar')
|
|
||||||
op.alter_column('users', 'zipcode', type_=sa.String(), postgresql_using='zipcode::varchar')
|
|
||||||
op.alter_column('users', 'partner_first_name', type_=sa.String(), postgresql_using='partner_first_name::varchar')
|
|
||||||
op.alter_column('users', 'partner_last_name', type_=sa.String(), postgresql_using='partner_last_name::varchar')
|
|
||||||
op.alter_column('users', 'referred_by_member_name', type_=sa.String(), postgresql_using='referred_by_member_name::varchar')
|
|
||||||
op.alter_column('users', 'password_hash', type_=sa.String(), postgresql_using='password_hash::varchar')
|
|
||||||
op.alter_column('users', 'email_verification_token', type_=sa.String(), postgresql_using='email_verification_token::varchar')
|
|
||||||
op.alter_column('users', 'password_reset_token', type_=sa.String(), postgresql_using='password_reset_token::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
|
|
||||||
# Change TEXT to VARCHAR
|
|
||||||
op.alter_column('users', 'address', type_=sa.String(), postgresql_using='address::varchar')
|
|
||||||
op.alter_column('users', 'profile_photo_url', type_=sa.String(), postgresql_using='profile_photo_url::varchar')
|
|
||||||
print(" ✓ Changed TEXT to VARCHAR")
|
|
||||||
|
|
||||||
# Change DATE to TIMESTAMP
|
|
||||||
op.alter_column('users', 'date_of_birth', type_=sa.DateTime(), postgresql_using='date_of_birth::timestamp')
|
|
||||||
op.alter_column('users', 'member_since', type_=sa.DateTime(), postgresql_using='member_since::timestamp')
|
|
||||||
print(" ✓ Changed DATE to TIMESTAMP")
|
|
||||||
|
|
||||||
# Change JSONB to JSON
|
|
||||||
op.alter_column('users', 'lead_sources', type_=JSON(), postgresql_using='lead_sources::json')
|
|
||||||
print(" ✓ Changed lead_sources JSONB to JSON")
|
|
||||||
|
|
||||||
# Change TEXT to JSON for volunteer_interests
|
|
||||||
op.alter_column('users', 'volunteer_interests', type_=JSON(), postgresql_using='volunteer_interests::json')
|
|
||||||
print(" ✓ Changed volunteer_interests TEXT to JSON")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: Some type conversions failed: {e}")
|
|
||||||
|
|
||||||
# Fill NULL values with defaults BEFORE setting NOT NULL constraints
|
|
||||||
print(" ⏳ Filling NULL values with defaults...")
|
|
||||||
|
|
||||||
# Update string fields
|
|
||||||
conn.execute(sa.text("UPDATE users SET address = '' WHERE address IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET city = '' WHERE city IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET state = '' WHERE state IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET zipcode = '' WHERE zipcode IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET phone = '' WHERE phone IS NULL"))
|
|
||||||
|
|
||||||
# Update date_of_birth with sentinel date
|
|
||||||
conn.execute(sa.text("UPDATE users SET date_of_birth = '1900-01-01'::timestamp WHERE date_of_birth IS NULL"))
|
|
||||||
|
|
||||||
# Update boolean fields
|
|
||||||
conn.execute(sa.text("UPDATE users SET show_in_directory = false WHERE show_in_directory IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET newsletter_publish_name = false WHERE newsletter_publish_name IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET newsletter_publish_birthday = false WHERE newsletter_publish_birthday IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET newsletter_publish_photo = false WHERE newsletter_publish_photo IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET newsletter_publish_none = false WHERE newsletter_publish_none IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET force_password_change = false WHERE force_password_change IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET scholarship_requested = false WHERE scholarship_requested IS NULL"))
|
|
||||||
conn.execute(sa.text("UPDATE users SET accepts_tos = false WHERE accepts_tos IS NULL"))
|
|
||||||
|
|
||||||
# Check how many rows were updated
|
|
||||||
null_check = conn.execute(sa.text("""
|
|
||||||
SELECT
|
|
||||||
COUNT(*) FILTER (WHERE address = '') as address_filled,
|
|
||||||
COUNT(*) FILTER (WHERE date_of_birth = '1900-01-01'::timestamp) as dob_filled
|
|
||||||
FROM users
|
|
||||||
""")).fetchone()
|
|
||||||
print(f" ✓ Filled NULLs: {null_check[0]} addresses, {null_check[1]} dates of birth")
|
|
||||||
|
|
||||||
# Now safe to set NOT NULL constraints
|
|
||||||
op.alter_column('users', 'address', nullable=False)
|
|
||||||
op.alter_column('users', 'city', nullable=False)
|
|
||||||
op.alter_column('users', 'state', nullable=False)
|
|
||||||
op.alter_column('users', 'zipcode', nullable=False)
|
|
||||||
op.alter_column('users', 'phone', nullable=False)
|
|
||||||
op.alter_column('users', 'date_of_birth', nullable=False)
|
|
||||||
op.alter_column('users', 'show_in_directory', nullable=False)
|
|
||||||
op.alter_column('users', 'newsletter_publish_name', nullable=False)
|
|
||||||
op.alter_column('users', 'newsletter_publish_birthday', nullable=False)
|
|
||||||
op.alter_column('users', 'newsletter_publish_photo', nullable=False)
|
|
||||||
op.alter_column('users', 'newsletter_publish_none', nullable=False)
|
|
||||||
op.alter_column('users', 'force_password_change', nullable=False)
|
|
||||||
op.alter_column('users', 'scholarship_requested', nullable=False)
|
|
||||||
op.alter_column('users', 'accepts_tos', nullable=False)
|
|
||||||
print(" ✓ Set NOT NULL constraints")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 2. FIX DONATIONS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[2/14] Fixing donations table...")
|
|
||||||
|
|
||||||
donations_columns = {col['name'] for col in inspector.get_columns('donations')}
|
|
||||||
|
|
||||||
# Remove PROD-only columns
|
|
||||||
if 'is_anonymous' in donations_columns:
|
|
||||||
op.drop_column('donations', 'is_anonymous')
|
|
||||||
print(" ✓ Removed donations.is_anonymous (PROD-only)")
|
|
||||||
|
|
||||||
if 'completed_at' in donations_columns:
|
|
||||||
op.drop_column('donations', 'completed_at')
|
|
||||||
print(" ✓ Removed donations.completed_at (PROD-only)")
|
|
||||||
|
|
||||||
if 'message' in donations_columns:
|
|
||||||
op.drop_column('donations', 'message')
|
|
||||||
print(" ✓ Removed donations.message (PROD-only)")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('donations', 'donor_email', type_=sa.String(), postgresql_using='donor_email::varchar')
|
|
||||||
op.alter_column('donations', 'donor_name', type_=sa.String(), postgresql_using='donor_name::varchar')
|
|
||||||
op.alter_column('donations', 'stripe_payment_intent_id', type_=sa.String(), postgresql_using='stripe_payment_intent_id::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: Type conversion failed: {e}")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 3. FIX SUBSCRIPTIONS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[3/14] Fixing subscriptions table...")
|
|
||||||
|
|
||||||
subscriptions_columns = {col['name'] for col in inspector.get_columns('subscriptions')}
|
|
||||||
|
|
||||||
# Remove PROD-only columns
|
|
||||||
if 'cancel_at_period_end' in subscriptions_columns:
|
|
||||||
op.drop_column('subscriptions', 'cancel_at_period_end')
|
|
||||||
print(" ✓ Removed subscriptions.cancel_at_period_end (PROD-only)")
|
|
||||||
|
|
||||||
if 'canceled_at' in subscriptions_columns:
|
|
||||||
op.drop_column('subscriptions', 'canceled_at')
|
|
||||||
print(" ✓ Removed subscriptions.canceled_at (PROD-only)")
|
|
||||||
|
|
||||||
if 'current_period_start' in subscriptions_columns:
|
|
||||||
op.drop_column('subscriptions', 'current_period_start')
|
|
||||||
print(" ✓ Removed subscriptions.current_period_start (PROD-only)")
|
|
||||||
|
|
||||||
if 'current_period_end' in subscriptions_columns:
|
|
||||||
op.drop_column('subscriptions', 'current_period_end')
|
|
||||||
print(" ✓ Removed subscriptions.current_period_end (PROD-only)")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('subscriptions', 'stripe_subscription_id', type_=sa.String(), postgresql_using='stripe_subscription_id::varchar')
|
|
||||||
op.alter_column('subscriptions', 'stripe_customer_id', type_=sa.String(), postgresql_using='stripe_customer_id::varchar')
|
|
||||||
op.alter_column('subscriptions', 'payment_method', type_=sa.String(), postgresql_using='payment_method::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: Type conversion failed: {e}")
|
|
||||||
|
|
||||||
# Fix nullable constraints
|
|
||||||
op.alter_column('subscriptions', 'start_date', nullable=False)
|
|
||||||
op.alter_column('subscriptions', 'manual_payment', nullable=False)
|
|
||||||
op.alter_column('subscriptions', 'donation_cents', nullable=False)
|
|
||||||
op.alter_column('subscriptions', 'base_subscription_cents', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraints")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 4. FIX STORAGE_USAGE TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[4/14] Fixing storage_usage table...")
|
|
||||||
|
|
||||||
storage_columns = {col['name'] for col in inspector.get_columns('storage_usage')}
|
|
||||||
|
|
||||||
# Remove PROD-only columns
|
|
||||||
if 'created_at' in storage_columns:
|
|
||||||
op.drop_column('storage_usage', 'created_at')
|
|
||||||
print(" ✓ Removed storage_usage.created_at (PROD-only)")
|
|
||||||
|
|
||||||
if 'updated_at' in storage_columns:
|
|
||||||
op.drop_column('storage_usage', 'updated_at')
|
|
||||||
print(" ✓ Removed storage_usage.updated_at (PROD-only)")
|
|
||||||
|
|
||||||
op.alter_column('storage_usage', 'max_bytes_allowed', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 5. FIX EVENT_GALLERIES TABLE (Add missing DEV columns)
|
|
||||||
# ============================================================
|
|
||||||
print("\n[5/14] Fixing event_galleries table...")
|
|
||||||
|
|
||||||
event_galleries_columns = {col['name'] for col in inspector.get_columns('event_galleries')}
|
|
||||||
|
|
||||||
# Add DEV-only columns (exist in models.py but not in PROD)
|
|
||||||
if 'image_key' not in event_galleries_columns:
|
|
||||||
op.add_column('event_galleries', sa.Column('image_key', sa.String(), nullable=False, server_default=''))
|
|
||||||
print(" ✓ Added event_galleries.image_key")
|
|
||||||
|
|
||||||
if 'file_size_bytes' not in event_galleries_columns:
|
|
||||||
op.add_column('event_galleries', sa.Column('file_size_bytes', sa.Integer(), nullable=False, server_default='0'))
|
|
||||||
print(" ✓ Added event_galleries.file_size_bytes")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('event_galleries', 'image_url', type_=sa.String(), postgresql_using='image_url::varchar')
|
|
||||||
print(" ✓ Changed TEXT to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: Type conversion failed: {e}")
|
|
||||||
|
|
||||||
# Note: uploaded_by column already has correct nullable=False in both DEV and PROD
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 6. FIX BYLAWS_DOCUMENTS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[6/14] Fixing bylaws_documents table...")
|
|
||||||
|
|
||||||
bylaws_columns = {col['name'] for col in inspector.get_columns('bylaws_documents')}
|
|
||||||
|
|
||||||
# Remove PROD-only column
|
|
||||||
if 'updated_at' in bylaws_columns:
|
|
||||||
op.drop_column('bylaws_documents', 'updated_at')
|
|
||||||
print(" ✓ Removed bylaws_documents.updated_at (PROD-only)")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('bylaws_documents', 'title', type_=sa.String(), postgresql_using='title::varchar')
|
|
||||||
op.alter_column('bylaws_documents', 'version', type_=sa.String(), postgresql_using='version::varchar')
|
|
||||||
op.alter_column('bylaws_documents', 'document_url', type_=sa.String(), postgresql_using='document_url::varchar')
|
|
||||||
op.alter_column('bylaws_documents', 'document_type', type_=sa.String(), postgresql_using='document_type::varchar')
|
|
||||||
print(" ✓ Changed column types")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: Type conversion failed: {e}")
|
|
||||||
|
|
||||||
op.alter_column('bylaws_documents', 'document_type', nullable=True)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 7. FIX EVENTS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[7/14] Fixing events table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('events', 'title', type_=sa.String(), postgresql_using='title::varchar')
|
|
||||||
op.alter_column('events', 'location', type_=sa.String(), postgresql_using='location::varchar')
|
|
||||||
op.alter_column('events', 'calendar_uid', type_=sa.String(), postgresql_using='calendar_uid::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('events', 'location', nullable=False)
|
|
||||||
op.alter_column('events', 'created_by', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraints")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 8. FIX PERMISSIONS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[8/14] Fixing permissions table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('permissions', 'code', type_=sa.String(), postgresql_using='code::varchar')
|
|
||||||
op.alter_column('permissions', 'name', type_=sa.String(), postgresql_using='name::varchar')
|
|
||||||
op.alter_column('permissions', 'module', type_=sa.String(), postgresql_using='module::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('permissions', 'module', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 9. FIX ROLES TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[9/14] Fixing roles table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('roles', 'code', type_=sa.String(), postgresql_using='code::varchar')
|
|
||||||
op.alter_column('roles', 'name', type_=sa.String(), postgresql_using='name::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('roles', 'is_system_role', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 10. FIX USER_INVITATIONS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[10/14] Fixing user_invitations table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('user_invitations', 'email', type_=sa.String(), postgresql_using='email::varchar')
|
|
||||||
op.alter_column('user_invitations', 'token', type_=sa.String(), postgresql_using='token::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('user_invitations', 'invited_at', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 11. FIX NEWSLETTER_ARCHIVES TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[11/14] Fixing newsletter_archives table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('newsletter_archives', 'title', type_=sa.String(), postgresql_using='title::varchar')
|
|
||||||
op.alter_column('newsletter_archives', 'document_url', type_=sa.String(), postgresql_using='document_url::varchar')
|
|
||||||
op.alter_column('newsletter_archives', 'document_type', type_=sa.String(), postgresql_using='document_type::varchar')
|
|
||||||
print(" ✓ Changed column types")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('newsletter_archives', 'document_type', nullable=True)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 12. FIX FINANCIAL_REPORTS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[12/14] Fixing financial_reports table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('financial_reports', 'title', type_=sa.String(), postgresql_using='title::varchar')
|
|
||||||
op.alter_column('financial_reports', 'document_url', type_=sa.String(), postgresql_using='document_url::varchar')
|
|
||||||
op.alter_column('financial_reports', 'document_type', type_=sa.String(), postgresql_using='document_type::varchar')
|
|
||||||
print(" ✓ Changed column types")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('financial_reports', 'document_type', nullable=True)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 13. FIX IMPORT_JOBS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[13/14] Fixing import_jobs table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('import_jobs', 'filename', type_=sa.String(), postgresql_using='filename::varchar')
|
|
||||||
op.alter_column('import_jobs', 'file_key', type_=sa.String(), postgresql_using='file_key::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
|
|
||||||
# Change JSONB to JSON
|
|
||||||
op.alter_column('import_jobs', 'errors', type_=JSON(), postgresql_using='errors::json')
|
|
||||||
print(" ✓ Changed errors JSONB to JSON")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
# Fix nullable constraints
|
|
||||||
op.alter_column('import_jobs', 'processed_rows', nullable=False)
|
|
||||||
op.alter_column('import_jobs', 'successful_rows', nullable=False)
|
|
||||||
op.alter_column('import_jobs', 'failed_rows', nullable=False)
|
|
||||||
op.alter_column('import_jobs', 'errors', nullable=False)
|
|
||||||
op.alter_column('import_jobs', 'started_at', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraints")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 14. FIX SUBSCRIPTION_PLANS TABLE
|
|
||||||
# ============================================================
|
|
||||||
print("\n[14/14] Fixing subscription_plans table...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
op.alter_column('subscription_plans', 'name', type_=sa.String(), postgresql_using='name::varchar')
|
|
||||||
op.alter_column('subscription_plans', 'billing_cycle', type_=sa.String(), postgresql_using='billing_cycle::varchar')
|
|
||||||
op.alter_column('subscription_plans', 'stripe_price_id', type_=sa.String(), postgresql_using='stripe_price_id::varchar')
|
|
||||||
print(" ✓ Changed VARCHAR(n) to VARCHAR")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
op.alter_column('subscription_plans', 'minimum_price_cents', nullable=False)
|
|
||||||
print(" ✓ Fixed nullable constraint")
|
|
||||||
|
|
||||||
print("\n✅ Schema alignment complete! PROD now matches DEV (source of truth)")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Revert alignment changes (not recommended)"""
|
|
||||||
print("⚠️ Downgrade not supported for alignment migration")
|
|
||||||
print(" To revert, restore from backup")
|
|
||||||
pass
|
|
||||||
@@ -1,170 +0,0 @@
|
|||||||
"""fix_remaining_differences
|
|
||||||
|
|
||||||
Revision ID: 012_fix_remaining
|
|
||||||
Revises: 011_align_prod_dev
|
|
||||||
Create Date: 2026-01-05
|
|
||||||
|
|
||||||
Fixes the last 5 schema differences found after migration 011:
|
|
||||||
1-2. import_rollback_audit nullable constraints (PROD)
|
|
||||||
3-4. role_permissions type and nullable (PROD)
|
|
||||||
5. UserStatus enum values (DEV - remove deprecated values)
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects.postgresql import ENUM
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '012_fix_remaining'
|
|
||||||
down_revision: Union[str, None] = '011_align_prod_dev'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Fix remaining schema differences"""
|
|
||||||
from sqlalchemy import inspect
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
inspector = inspect(conn)
|
|
||||||
|
|
||||||
print("Fixing remaining schema differences...")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 1. FIX IMPORT_ROLLBACK_AUDIT TABLE (PROD only)
|
|
||||||
# ============================================================
|
|
||||||
print("\n[1/3] Fixing import_rollback_audit nullable constraints...")
|
|
||||||
|
|
||||||
# Check if there are any NULL values first
|
|
||||||
try:
|
|
||||||
null_count = conn.execute(sa.text("""
|
|
||||||
SELECT COUNT(*) FROM import_rollback_audit
|
|
||||||
WHERE created_at IS NULL OR rolled_back_at IS NULL
|
|
||||||
""")).scalar()
|
|
||||||
|
|
||||||
if null_count > 0:
|
|
||||||
# Fill NULLs with current timestamp
|
|
||||||
conn.execute(sa.text("""
|
|
||||||
UPDATE import_rollback_audit
|
|
||||||
SET created_at = NOW() WHERE created_at IS NULL
|
|
||||||
"""))
|
|
||||||
conn.execute(sa.text("""
|
|
||||||
UPDATE import_rollback_audit
|
|
||||||
SET rolled_back_at = NOW() WHERE rolled_back_at IS NULL
|
|
||||||
"""))
|
|
||||||
print(f" ✓ Filled {null_count} NULL timestamps")
|
|
||||||
|
|
||||||
# Now set NOT NULL
|
|
||||||
op.alter_column('import_rollback_audit', 'created_at', nullable=False)
|
|
||||||
op.alter_column('import_rollback_audit', 'rolled_back_at', nullable=False)
|
|
||||||
print(" ✓ Set NOT NULL constraints")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 2. FIX ROLE_PERMISSIONS TABLE (PROD only)
|
|
||||||
# ============================================================
|
|
||||||
print("\n[2/3] Fixing role_permissions.role type and nullable...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Change VARCHAR(50) to VARCHAR(10) to match UserRole enum
|
|
||||||
op.alter_column('role_permissions', 'role',
|
|
||||||
type_=sa.String(10),
|
|
||||||
postgresql_using='role::varchar(10)')
|
|
||||||
print(" ✓ Changed VARCHAR(50) to VARCHAR(10)")
|
|
||||||
|
|
||||||
# Set NOT NULL
|
|
||||||
op.alter_column('role_permissions', 'role', nullable=False)
|
|
||||||
print(" ✓ Set NOT NULL constraint")
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: {e}")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# 3. FIX USERSTATUS ENUM (DEV only - remove deprecated values)
|
|
||||||
# ============================================================
|
|
||||||
print("\n[3/3] Fixing UserStatus enum values...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# First, check if the enum has deprecated values
|
|
||||||
enum_values = conn.execute(sa.text("""
|
|
||||||
SELECT enumlabel
|
|
||||||
FROM pg_enum
|
|
||||||
WHERE enumtypid = (
|
|
||||||
SELECT oid FROM pg_type WHERE typname = 'userstatus'
|
|
||||||
)
|
|
||||||
""")).fetchall()
|
|
||||||
|
|
||||||
enum_values_list = [row[0] for row in enum_values]
|
|
||||||
has_deprecated = 'pending_approval' in enum_values_list or 'pre_approved' in enum_values_list
|
|
||||||
|
|
||||||
if not has_deprecated:
|
|
||||||
print(" ✓ UserStatus enum already correct (no deprecated values)")
|
|
||||||
else:
|
|
||||||
print(" ⏳ Found deprecated enum values, migrating...")
|
|
||||||
|
|
||||||
# Check if any users have deprecated status values
|
|
||||||
deprecated_count = conn.execute(sa.text("""
|
|
||||||
SELECT COUNT(*) FROM users
|
|
||||||
WHERE status IN ('pending_approval', 'pre_approved')
|
|
||||||
""")).scalar()
|
|
||||||
|
|
||||||
if deprecated_count > 0:
|
|
||||||
print(f" ⏳ Migrating {deprecated_count} users with deprecated status values...")
|
|
||||||
|
|
||||||
# Migrate deprecated values to new equivalents
|
|
||||||
conn.execute(sa.text("""
|
|
||||||
UPDATE users
|
|
||||||
SET status = 'pre_validated'
|
|
||||||
WHERE status = 'pre_approved'
|
|
||||||
"""))
|
|
||||||
|
|
||||||
conn.execute(sa.text("""
|
|
||||||
UPDATE users
|
|
||||||
SET status = 'payment_pending'
|
|
||||||
WHERE status = 'pending_approval'
|
|
||||||
"""))
|
|
||||||
|
|
||||||
print(" ✓ Migrated deprecated status values")
|
|
||||||
else:
|
|
||||||
print(" ✓ No users with deprecated status values")
|
|
||||||
|
|
||||||
# Now remove deprecated enum values
|
|
||||||
# PostgreSQL doesn't support removing enum values directly,
|
|
||||||
# so we need to recreate the enum
|
|
||||||
conn.execute(sa.text("""
|
|
||||||
-- Create new enum with correct values (matches models.py)
|
|
||||||
CREATE TYPE userstatus_new AS ENUM (
|
|
||||||
'pending_email',
|
|
||||||
'pending_validation',
|
|
||||||
'pre_validated',
|
|
||||||
'payment_pending',
|
|
||||||
'active',
|
|
||||||
'inactive',
|
|
||||||
'canceled',
|
|
||||||
'expired',
|
|
||||||
'rejected',
|
|
||||||
'abandoned'
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Update column to use new enum
|
|
||||||
ALTER TABLE users
|
|
||||||
ALTER COLUMN status TYPE userstatus_new
|
|
||||||
USING status::text::userstatus_new;
|
|
||||||
|
|
||||||
-- Drop old enum and rename new one
|
|
||||||
DROP TYPE userstatus;
|
|
||||||
ALTER TYPE userstatus_new RENAME TO userstatus;
|
|
||||||
"""))
|
|
||||||
|
|
||||||
print(" ✓ Updated UserStatus enum (removed deprecated values)")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ⚠️ Warning: Enum update failed (may already be correct): {e}")
|
|
||||||
|
|
||||||
print("\n✅ All remaining differences fixed!")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Revert fixes (not recommended)"""
|
|
||||||
print("⚠️ Downgrade not supported")
|
|
||||||
pass
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
"""sync_role_permissions
|
|
||||||
|
|
||||||
Revision ID: 013_sync_permissions
|
|
||||||
Revises: 012_fix_remaining
|
|
||||||
Create Date: 2026-01-05
|
|
||||||
|
|
||||||
Syncs role_permissions between DEV and PROD bidirectionally.
|
|
||||||
- Adds 18 DEV-only permissions to PROD (new features)
|
|
||||||
- Adds 6 PROD-only permissions to DEV (operational/security)
|
|
||||||
Result: Both environments have identical 142 permission mappings
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '013_sync_permissions'
|
|
||||||
down_revision: Union[str, None] = '012_fix_remaining'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Sync role_permissions bidirectionally"""
|
|
||||||
from sqlalchemy import text
|
|
||||||
|
|
||||||
conn = op.get_bind()
|
|
||||||
|
|
||||||
print("Syncing role_permissions between environments...")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# STEP 1: Add missing permissions to ensure all exist
|
|
||||||
# ============================================================
|
|
||||||
print("\n[1/2] Ensuring all permissions exist...")
|
|
||||||
|
|
||||||
# Permissions that should exist (union of both environments)
|
|
||||||
all_permissions = [
|
|
||||||
# From DEV-only list
|
|
||||||
('donations.export', 'Export Donations', 'donations'),
|
|
||||||
('donations.view', 'View Donations', 'donations'),
|
|
||||||
('financials.create', 'Create Financial Reports', 'financials'),
|
|
||||||
('financials.delete', 'Delete Financial Reports', 'financials'),
|
|
||||||
('financials.edit', 'Edit Financial Reports', 'financials'),
|
|
||||||
('financials.export', 'Export Financial Reports', 'financials'),
|
|
||||||
('financials.payments', 'Manage Financial Payments', 'financials'),
|
|
||||||
('settings.edit', 'Edit Settings', 'settings'),
|
|
||||||
('settings.email_templates', 'Manage Email Templates', 'settings'),
|
|
||||||
('subscriptions.activate', 'Activate Subscriptions', 'subscriptions'),
|
|
||||||
('subscriptions.cancel', 'Cancel Subscriptions', 'subscriptions'),
|
|
||||||
('subscriptions.create', 'Create Subscriptions', 'subscriptions'),
|
|
||||||
('subscriptions.edit', 'Edit Subscriptions', 'subscriptions'),
|
|
||||||
('subscriptions.export', 'Export Subscriptions', 'subscriptions'),
|
|
||||||
('subscriptions.plans', 'Manage Subscription Plans', 'subscriptions'),
|
|
||||||
('subscriptions.view', 'View Subscriptions', 'subscriptions'),
|
|
||||||
('events.calendar_export', 'Export Event Calendar', 'events'),
|
|
||||||
('events.rsvps', 'View Event RSVPs', 'events'),
|
|
||||||
# From PROD-only list
|
|
||||||
('permissions.audit', 'Audit Permissions', 'permissions'),
|
|
||||||
('permissions.view', 'View Permissions', 'permissions'),
|
|
||||||
('settings.backup', 'Manage Backups', 'settings'),
|
|
||||||
]
|
|
||||||
|
|
||||||
for code, name, module in all_permissions:
|
|
||||||
# Insert if not exists
|
|
||||||
conn.execute(text(f"""
|
|
||||||
INSERT INTO permissions (id, code, name, description, module, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'{code}',
|
|
||||||
'{name}',
|
|
||||||
'{name}',
|
|
||||||
'{module}',
|
|
||||||
NOW()
|
|
||||||
WHERE NOT EXISTS (
|
|
||||||
SELECT 1 FROM permissions WHERE code = '{code}'
|
|
||||||
)
|
|
||||||
"""))
|
|
||||||
|
|
||||||
print(" ✓ Ensured all permissions exist")
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# STEP 2: Add missing role-permission mappings
|
|
||||||
# ============================================================
|
|
||||||
print("\n[2/2] Adding missing role-permission mappings...")
|
|
||||||
|
|
||||||
# Mappings that should exist (union of both environments)
|
|
||||||
role_permission_mappings = [
|
|
||||||
# DEV-only (add to PROD)
|
|
||||||
('admin', 'donations.export'),
|
|
||||||
('admin', 'donations.view'),
|
|
||||||
('admin', 'financials.create'),
|
|
||||||
('admin', 'financials.delete'),
|
|
||||||
('admin', 'financials.edit'),
|
|
||||||
('admin', 'financials.export'),
|
|
||||||
('admin', 'financials.payments'),
|
|
||||||
('admin', 'settings.edit'),
|
|
||||||
('admin', 'settings.email_templates'),
|
|
||||||
('admin', 'subscriptions.activate'),
|
|
||||||
('admin', 'subscriptions.cancel'),
|
|
||||||
('admin', 'subscriptions.create'),
|
|
||||||
('admin', 'subscriptions.edit'),
|
|
||||||
('admin', 'subscriptions.export'),
|
|
||||||
('admin', 'subscriptions.plans'),
|
|
||||||
('admin', 'subscriptions.view'),
|
|
||||||
('member', 'events.calendar_export'),
|
|
||||||
('member', 'events.rsvps'),
|
|
||||||
# PROD-only (add to DEV)
|
|
||||||
('admin', 'permissions.audit'),
|
|
||||||
('admin', 'permissions.view'),
|
|
||||||
('admin', 'settings.backup'),
|
|
||||||
('finance', 'bylaws.view'),
|
|
||||||
('finance', 'events.view'),
|
|
||||||
('finance', 'newsletters.view'),
|
|
||||||
]
|
|
||||||
|
|
||||||
added_count = 0
|
|
||||||
for role, perm_code in role_permission_mappings:
|
|
||||||
result = conn.execute(text(f"""
|
|
||||||
INSERT INTO role_permissions (id, role, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'{role}',
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code = '{perm_code}'
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM role_permissions rp
|
|
||||||
WHERE rp.role = '{role}'
|
|
||||||
AND rp.permission_id = p.id
|
|
||||||
)
|
|
||||||
RETURNING id
|
|
||||||
"""))
|
|
||||||
if result.rowcount > 0:
|
|
||||||
added_count += 1
|
|
||||||
|
|
||||||
print(f" ✓ Added {added_count} missing role-permission mappings")
|
|
||||||
|
|
||||||
# Verify final count
|
|
||||||
final_count = conn.execute(text("SELECT COUNT(*) FROM role_permissions")).scalar()
|
|
||||||
print(f"\n✅ Role-permission mappings synchronized: {final_count} total")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Revert sync (not recommended)"""
|
|
||||||
print("⚠️ Downgrade not supported - permissions are additive")
|
|
||||||
pass
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
"""add_custom_registration_data
|
|
||||||
|
|
||||||
Revision ID: 014_custom_registration
|
|
||||||
Revises: a1b2c3d4e5f6
|
|
||||||
Create Date: 2026-02-01 10:00:00.000000
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '014_custom_registration'
|
|
||||||
down_revision: Union[str, None] = 'a1b2c3d4e5f6'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# Add custom_registration_data column to users table
|
|
||||||
# This stores dynamic registration field responses as JSON
|
|
||||||
op.add_column('users', sa.Column(
|
|
||||||
'custom_registration_data',
|
|
||||||
sa.JSON,
|
|
||||||
nullable=False,
|
|
||||||
server_default='{}'
|
|
||||||
))
|
|
||||||
|
|
||||||
# Add comment for documentation
|
|
||||||
op.execute("""
|
|
||||||
COMMENT ON COLUMN users.custom_registration_data IS
|
|
||||||
'Dynamic registration field responses stored as JSON for custom form fields';
|
|
||||||
""")
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
op.drop_column('users', 'custom_registration_data')
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
"""add_role_audit_fields
|
|
||||||
|
|
||||||
Revision ID: 4fa11836f7fd
|
|
||||||
Revises: 013_sync_permissions
|
|
||||||
Create Date: 2026-01-16 17:21:40.514605
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects.postgresql import UUID
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '4fa11836f7fd'
|
|
||||||
down_revision: Union[str, None] = '013_sync_permissions'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# Add role audit trail columns
|
|
||||||
op.add_column('users', sa.Column('role_changed_at', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
op.add_column('users', sa.Column('role_changed_by', UUID(as_uuid=True), nullable=True))
|
|
||||||
|
|
||||||
# Create foreign key constraint to track who changed the role
|
|
||||||
op.create_foreign_key(
|
|
||||||
'fk_users_role_changed_by',
|
|
||||||
'users', 'users',
|
|
||||||
['role_changed_by'], ['id'],
|
|
||||||
ondelete='SET NULL'
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create index for efficient querying by role change date
|
|
||||||
op.create_index('idx_users_role_changed_at', 'users', ['role_changed_at'])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# Drop index first
|
|
||||||
op.drop_index('idx_users_role_changed_at')
|
|
||||||
|
|
||||||
# Drop foreign key constraint
|
|
||||||
op.drop_constraint('fk_users_role_changed_by', 'users', type_='foreignkey')
|
|
||||||
|
|
||||||
# Drop columns
|
|
||||||
op.drop_column('users', 'role_changed_by')
|
|
||||||
op.drop_column('users', 'role_changed_at')
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
"""add_stripe_transaction_metadata
|
|
||||||
|
|
||||||
Revision ID: 956ea1628264
|
|
||||||
Revises: ec4cb4a49cde
|
|
||||||
Create Date: 2026-01-20 22:00:01.806931
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '956ea1628264'
|
|
||||||
down_revision: Union[str, None] = 'ec4cb4a49cde'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# Add Stripe transaction metadata to subscriptions table
|
|
||||||
op.add_column('subscriptions', sa.Column('stripe_payment_intent_id', sa.String(), nullable=True))
|
|
||||||
op.add_column('subscriptions', sa.Column('stripe_charge_id', sa.String(), nullable=True))
|
|
||||||
op.add_column('subscriptions', sa.Column('stripe_invoice_id', sa.String(), nullable=True))
|
|
||||||
op.add_column('subscriptions', sa.Column('payment_completed_at', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
op.add_column('subscriptions', sa.Column('card_last4', sa.String(4), nullable=True))
|
|
||||||
op.add_column('subscriptions', sa.Column('card_brand', sa.String(20), nullable=True))
|
|
||||||
op.add_column('subscriptions', sa.Column('stripe_receipt_url', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# Add indexes for Stripe transaction IDs in subscriptions
|
|
||||||
op.create_index('idx_subscriptions_payment_intent', 'subscriptions', ['stripe_payment_intent_id'])
|
|
||||||
op.create_index('idx_subscriptions_charge_id', 'subscriptions', ['stripe_charge_id'])
|
|
||||||
op.create_index('idx_subscriptions_invoice_id', 'subscriptions', ['stripe_invoice_id'])
|
|
||||||
|
|
||||||
# Add Stripe transaction metadata to donations table
|
|
||||||
op.add_column('donations', sa.Column('stripe_charge_id', sa.String(), nullable=True))
|
|
||||||
op.add_column('donations', sa.Column('stripe_customer_id', sa.String(), nullable=True))
|
|
||||||
op.add_column('donations', sa.Column('payment_completed_at', sa.DateTime(timezone=True), nullable=True))
|
|
||||||
op.add_column('donations', sa.Column('card_last4', sa.String(4), nullable=True))
|
|
||||||
op.add_column('donations', sa.Column('card_brand', sa.String(20), nullable=True))
|
|
||||||
op.add_column('donations', sa.Column('stripe_receipt_url', sa.String(), nullable=True))
|
|
||||||
|
|
||||||
# Add indexes for Stripe transaction IDs in donations
|
|
||||||
op.create_index('idx_donations_payment_intent', 'donations', ['stripe_payment_intent_id'])
|
|
||||||
op.create_index('idx_donations_charge_id', 'donations', ['stripe_charge_id'])
|
|
||||||
op.create_index('idx_donations_customer_id', 'donations', ['stripe_customer_id'])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# Remove indexes from donations
|
|
||||||
op.drop_index('idx_donations_customer_id', table_name='donations')
|
|
||||||
op.drop_index('idx_donations_charge_id', table_name='donations')
|
|
||||||
op.drop_index('idx_donations_payment_intent', table_name='donations')
|
|
||||||
|
|
||||||
# Remove columns from donations
|
|
||||||
op.drop_column('donations', 'stripe_receipt_url')
|
|
||||||
op.drop_column('donations', 'card_brand')
|
|
||||||
op.drop_column('donations', 'card_last4')
|
|
||||||
op.drop_column('donations', 'payment_completed_at')
|
|
||||||
op.drop_column('donations', 'stripe_customer_id')
|
|
||||||
op.drop_column('donations', 'stripe_charge_id')
|
|
||||||
|
|
||||||
# Remove indexes from subscriptions
|
|
||||||
op.drop_index('idx_subscriptions_invoice_id', table_name='subscriptions')
|
|
||||||
op.drop_index('idx_subscriptions_charge_id', table_name='subscriptions')
|
|
||||||
op.drop_index('idx_subscriptions_payment_intent', table_name='subscriptions')
|
|
||||||
|
|
||||||
# Remove columns from subscriptions
|
|
||||||
op.drop_column('subscriptions', 'stripe_receipt_url')
|
|
||||||
op.drop_column('subscriptions', 'card_brand')
|
|
||||||
op.drop_column('subscriptions', 'card_last4')
|
|
||||||
op.drop_column('subscriptions', 'payment_completed_at')
|
|
||||||
op.drop_column('subscriptions', 'stripe_invoice_id')
|
|
||||||
op.drop_column('subscriptions', 'stripe_charge_id')
|
|
||||||
op.drop_column('subscriptions', 'stripe_payment_intent_id')
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
"""add_payment_methods
|
|
||||||
|
|
||||||
Revision ID: a1b2c3d4e5f6
|
|
||||||
Revises: 956ea1628264
|
|
||||||
Create Date: 2026-01-30 10:00:00.000000
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects import postgresql
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = 'a1b2c3d4e5f6'
|
|
||||||
down_revision: Union[str, None] = '956ea1628264'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
conn = op.get_bind()
|
|
||||||
|
|
||||||
# Create PaymentMethodType enum
|
|
||||||
paymentmethodtype = postgresql.ENUM(
|
|
||||||
'card', 'cash', 'bank_transfer', 'check',
|
|
||||||
name='paymentmethodtype',
|
|
||||||
create_type=False
|
|
||||||
)
|
|
||||||
paymentmethodtype.create(conn, checkfirst=True)
|
|
||||||
|
|
||||||
# Check if stripe_customer_id column exists on users table
|
|
||||||
result = conn.execute(sa.text("""
|
|
||||||
SELECT column_name FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users' AND column_name = 'stripe_customer_id'
|
|
||||||
"""))
|
|
||||||
if result.fetchone() is None:
|
|
||||||
# Add stripe_customer_id to users table
|
|
||||||
op.add_column('users', sa.Column(
|
|
||||||
'stripe_customer_id',
|
|
||||||
sa.String(),
|
|
||||||
nullable=True,
|
|
||||||
comment='Stripe Customer ID for payment method management'
|
|
||||||
))
|
|
||||||
op.create_index('ix_users_stripe_customer_id', 'users', ['stripe_customer_id'])
|
|
||||||
|
|
||||||
# Check if payment_methods table exists
|
|
||||||
result = conn.execute(sa.text("""
|
|
||||||
SELECT table_name FROM information_schema.tables
|
|
||||||
WHERE table_name = 'payment_methods'
|
|
||||||
"""))
|
|
||||||
if result.fetchone() is None:
|
|
||||||
# Create payment_methods table
|
|
||||||
op.create_table(
|
|
||||||
'payment_methods',
|
|
||||||
sa.Column('id', postgresql.UUID(as_uuid=True), primary_key=True),
|
|
||||||
sa.Column('user_id', postgresql.UUID(as_uuid=True), sa.ForeignKey('users.id', ondelete='CASCADE'), nullable=False),
|
|
||||||
sa.Column('stripe_payment_method_id', sa.String(), nullable=True, unique=True, comment='Stripe pm_xxx reference'),
|
|
||||||
sa.Column('card_brand', sa.String(20), nullable=True, comment='Card brand: visa, mastercard, amex, etc.'),
|
|
||||||
sa.Column('card_last4', sa.String(4), nullable=True, comment='Last 4 digits of card'),
|
|
||||||
sa.Column('card_exp_month', sa.Integer(), nullable=True, comment='Card expiration month'),
|
|
||||||
sa.Column('card_exp_year', sa.Integer(), nullable=True, comment='Card expiration year'),
|
|
||||||
sa.Column('card_funding', sa.String(20), nullable=True, comment='Card funding type: credit, debit, prepaid'),
|
|
||||||
sa.Column('payment_type', paymentmethodtype, nullable=False, server_default='card'),
|
|
||||||
sa.Column('is_default', sa.Boolean(), nullable=False, server_default='false', comment='Whether this is the default payment method for auto-renewals'),
|
|
||||||
sa.Column('is_active', sa.Boolean(), nullable=False, server_default='true', comment='Soft delete flag - False means removed'),
|
|
||||||
sa.Column('is_manual', sa.Boolean(), nullable=False, server_default='false', comment='True for manually recorded methods (cash/check)'),
|
|
||||||
sa.Column('manual_notes', sa.Text(), nullable=True, comment='Admin notes for manual payment methods'),
|
|
||||||
sa.Column('created_by', postgresql.UUID(as_uuid=True), sa.ForeignKey('users.id', ondelete='SET NULL'), nullable=True, comment='Admin who added this on behalf of user'),
|
|
||||||
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
|
|
||||||
sa.Column('updated_at', sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now(), onupdate=sa.func.now()),
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create indexes
|
|
||||||
op.create_index('ix_payment_methods_user_id', 'payment_methods', ['user_id'])
|
|
||||||
op.create_index('ix_payment_methods_stripe_pm_id', 'payment_methods', ['stripe_payment_method_id'])
|
|
||||||
op.create_index('idx_payment_method_user_default', 'payment_methods', ['user_id', 'is_default'])
|
|
||||||
op.create_index('idx_payment_method_active', 'payment_methods', ['user_id', 'is_active'])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# Drop indexes
|
|
||||||
op.drop_index('idx_payment_method_active', table_name='payment_methods')
|
|
||||||
op.drop_index('idx_payment_method_user_default', table_name='payment_methods')
|
|
||||||
op.drop_index('ix_payment_methods_stripe_pm_id', table_name='payment_methods')
|
|
||||||
op.drop_index('ix_payment_methods_user_id', table_name='payment_methods')
|
|
||||||
|
|
||||||
# Drop payment_methods table
|
|
||||||
op.drop_table('payment_methods')
|
|
||||||
|
|
||||||
# Drop stripe_customer_id from users
|
|
||||||
op.drop_index('ix_users_stripe_customer_id', table_name='users')
|
|
||||||
op.drop_column('users', 'stripe_customer_id')
|
|
||||||
|
|
||||||
# Drop PaymentMethodType enum
|
|
||||||
paymentmethodtype = postgresql.ENUM(
|
|
||||||
'card', 'cash', 'bank_transfer', 'check',
|
|
||||||
name='paymentmethodtype'
|
|
||||||
)
|
|
||||||
paymentmethodtype.drop(op.get_bind(), checkfirst=True)
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
"""add_system_settings_table
|
|
||||||
|
|
||||||
Revision ID: ec4cb4a49cde
|
|
||||||
Revises: 4fa11836f7fd
|
|
||||||
Create Date: 2026-01-16 18:16:00.283455
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy.dialects.postgresql import UUID
|
|
||||||
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = 'ec4cb4a49cde'
|
|
||||||
down_revision: Union[str, None] = '4fa11836f7fd'
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
# Create enum for setting types (only if not exists)
|
|
||||||
op.execute("""
|
|
||||||
DO $$ BEGIN
|
|
||||||
CREATE TYPE settingtype AS ENUM ('plaintext', 'encrypted', 'json');
|
|
||||||
EXCEPTION
|
|
||||||
WHEN duplicate_object THEN null;
|
|
||||||
END $$;
|
|
||||||
""")
|
|
||||||
|
|
||||||
# Create system_settings table
|
|
||||||
op.execute("""
|
|
||||||
CREATE TABLE system_settings (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
setting_key VARCHAR(100) UNIQUE NOT NULL,
|
|
||||||
setting_value TEXT,
|
|
||||||
setting_type settingtype NOT NULL DEFAULT 'plaintext'::settingtype,
|
|
||||||
description TEXT,
|
|
||||||
updated_by UUID REFERENCES users(id) ON DELETE SET NULL,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
is_sensitive BOOLEAN NOT NULL DEFAULT FALSE
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMENT ON COLUMN system_settings.setting_key IS 'Unique setting identifier (e.g., stripe_secret_key)';
|
|
||||||
COMMENT ON COLUMN system_settings.setting_value IS 'Setting value (encrypted if setting_type is encrypted)';
|
|
||||||
COMMENT ON COLUMN system_settings.setting_type IS 'Type of setting: plaintext, encrypted, or json';
|
|
||||||
COMMENT ON COLUMN system_settings.description IS 'Human-readable description of the setting';
|
|
||||||
COMMENT ON COLUMN system_settings.updated_by IS 'User who last updated this setting';
|
|
||||||
COMMENT ON COLUMN system_settings.is_sensitive IS 'Whether this setting contains sensitive data';
|
|
||||||
""")
|
|
||||||
|
|
||||||
# Create indexes
|
|
||||||
op.create_index('idx_system_settings_key', 'system_settings', ['setting_key'])
|
|
||||||
op.create_index('idx_system_settings_updated_at', 'system_settings', ['updated_at'])
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
# Drop indexes
|
|
||||||
op.drop_index('idx_system_settings_updated_at')
|
|
||||||
op.drop_index('idx_system_settings_key')
|
|
||||||
|
|
||||||
# Drop table
|
|
||||||
op.drop_table('system_settings')
|
|
||||||
|
|
||||||
# Drop enum
|
|
||||||
op.execute('DROP TYPE IF EXISTS settingtype')
|
|
||||||
4
auth.py
4
auth.py
@@ -128,7 +128,7 @@ async def get_current_admin_user(current_user: User = Depends(get_current_user))
|
|||||||
return current_user
|
return current_user
|
||||||
|
|
||||||
async def get_active_member(current_user: User = Depends(get_current_user)) -> User:
|
async def get_active_member(current_user: User = Depends(get_current_user)) -> User:
|
||||||
"""Require user to be active member or staff with valid status"""
|
"""Require user to be active member with valid payment"""
|
||||||
from models import UserStatus
|
from models import UserStatus
|
||||||
|
|
||||||
if current_user.status != UserStatus.active:
|
if current_user.status != UserStatus.active:
|
||||||
@@ -138,7 +138,7 @@ async def get_active_member(current_user: User = Depends(get_current_user)) -> U
|
|||||||
)
|
)
|
||||||
|
|
||||||
role_code = get_user_role_code(current_user)
|
role_code = get_user_role_code(current_user)
|
||||||
if role_code not in ["member", "admin", "superadmin", "finance"]:
|
if role_code not in ["member", "admin", "superadmin"]:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_403_FORBIDDEN,
|
status_code=status.HTTP_403_FORBIDDEN,
|
||||||
detail="Member access only"
|
detail="Member access only"
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
-- Comprehensive check for all missing columns
|
|
||||||
-- Run: psql -h 10.9.23.11 -p 54321 -U postgres -d loaf_new -f check_all_columns.sql
|
|
||||||
|
|
||||||
\echo '================================================================'
|
|
||||||
\echo 'COMPREHENSIVE COLUMN CHECK FOR ALL TABLES'
|
|
||||||
\echo '================================================================'
|
|
||||||
|
|
||||||
-- ============================================================
|
|
||||||
-- 1. USERS TABLE
|
|
||||||
-- ============================================================
|
|
||||||
\echo ''
|
|
||||||
\echo '1. USERS TABLE - Expected: 60+ columns'
|
|
||||||
\echo 'Checking for specific columns:'
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'newsletter_publish_name') THEN '✓' ELSE '✗' END || ' newsletter_publish_name',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'volunteer_interests') THEN '✓' ELSE '✗' END || ' volunteer_interests',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'scholarship_requested') THEN '✓' ELSE '✗' END || ' scholarship_requested',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'show_in_directory') THEN '✓' ELSE '✗' END || ' show_in_directory',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'password_reset_token') THEN '✓' ELSE '✗' END || ' password_reset_token',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'accepts_tos') THEN '✓' ELSE '✗' END || ' accepts_tos',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'member_since') THEN '✓' ELSE '✗' END || ' member_since',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'rejection_reason') THEN '✓' ELSE '✗' END || ' rejection_reason',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'users' AND column_name = 'import_source') THEN '✓' ELSE '✗' END || ' import_source'
|
|
||||||
\gx
|
|
||||||
|
|
||||||
-- ============================================================
|
|
||||||
-- 2. EVENTS TABLE
|
|
||||||
-- ============================================================
|
|
||||||
\echo ''
|
|
||||||
\echo '2. EVENTS TABLE'
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'events' AND column_name = 'calendar_uid') THEN '✓' ELSE '✗' END || ' calendar_uid';
|
|
||||||
|
|
||||||
-- ============================================================
|
|
||||||
-- 3. SUBSCRIPTIONS TABLE
|
|
||||||
-- ============================================================
|
|
||||||
\echo ''
|
|
||||||
\echo '3. SUBSCRIPTIONS TABLE'
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'subscriptions' AND column_name = 'base_subscription_cents') THEN '✓' ELSE '✗' END || ' base_subscription_cents',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'subscriptions' AND column_name = 'donation_cents') THEN '✓' ELSE '✗' END || ' donation_cents',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'subscriptions' AND column_name = 'manual_payment') THEN '✓' ELSE '✗' END || ' manual_payment'
|
|
||||||
\gx
|
|
||||||
|
|
||||||
-- ============================================================
|
|
||||||
-- 4. IMPORT_JOBS TABLE
|
|
||||||
-- ============================================================
|
|
||||||
\echo ''
|
|
||||||
\echo '4. IMPORT_JOBS TABLE'
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'import_jobs' AND column_name = 'field_mapping') THEN '✓' ELSE '✗' END || ' field_mapping',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'import_jobs' AND column_name = 'wordpress_metadata') THEN '✓' ELSE '✗' END || ' wordpress_metadata',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'import_jobs' AND column_name = 'imported_user_ids') THEN '✓' ELSE '✗' END || ' imported_user_ids',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'import_jobs' AND column_name = 'rollback_at') THEN '✓' ELSE '✗' END || ' rollback_at',
|
|
||||||
CASE WHEN EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'import_jobs' AND column_name = 'rollback_by') THEN '✓' ELSE '✗' END || ' rollback_by'
|
|
||||||
\gx
|
|
||||||
|
|
||||||
-- ============================================================
|
|
||||||
-- 5. CHECK IF IMPORT_ROLLBACK_AUDIT TABLE EXISTS
|
|
||||||
-- ============================================================
|
|
||||||
\echo ''
|
|
||||||
\echo '5. IMPORT_ROLLBACK_AUDIT TABLE - Should exist'
|
|
||||||
SELECT CASE
|
|
||||||
WHEN EXISTS (SELECT FROM information_schema.tables WHERE table_name = 'import_rollback_audit')
|
|
||||||
THEN '✓ Table exists'
|
|
||||||
ELSE '✗ TABLE MISSING - Need to create it'
|
|
||||||
END AS status;
|
|
||||||
|
|
||||||
-- ============================================================
|
|
||||||
-- SUMMARY: Count existing columns in each table
|
|
||||||
-- ============================================================
|
|
||||||
\echo ''
|
|
||||||
\echo '================================================================'
|
|
||||||
\echo 'SUMMARY: Column counts per table'
|
|
||||||
\echo '================================================================'
|
|
||||||
|
|
||||||
SELECT
|
|
||||||
table_name,
|
|
||||||
COUNT(*) as column_count
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name IN (
|
|
||||||
'users', 'events', 'event_rsvps', 'subscription_plans', 'subscriptions',
|
|
||||||
'donations', 'event_galleries', 'newsletter_archives', 'financial_reports',
|
|
||||||
'bylaws_documents', 'storage_usage', 'permissions', 'roles', 'role_permissions',
|
|
||||||
'user_invitations', 'import_jobs', 'import_rollback_audit'
|
|
||||||
)
|
|
||||||
GROUP BY table_name
|
|
||||||
ORDER BY table_name;
|
|
||||||
@@ -1,345 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Database Integrity Checker
|
|
||||||
Compares schema and data integrity between development and production databases
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sys
|
|
||||||
from sqlalchemy import create_engine, inspect, text
|
|
||||||
from sqlalchemy.engine import reflection
|
|
||||||
import json
|
|
||||||
from collections import defaultdict
|
|
||||||
|
|
||||||
# Database URLs
|
|
||||||
DEV_DB = "postgresql://postgres:RchhcpaUKZuZuMOvB5kwCP1weLBnAG6tNMXE5FHdk8AwCvolBMALYFVYRM7WCl9x@10.9.23.11:5001/membership_demo"
|
|
||||||
PROD_DB = "postgresql://postgres:fDv3fRvMgfPueDWDUxj27NJVaynsewIdh6b2Hb28tcvG3Ew6mhscASg2kulx4tr7@10.9.23.11:54321/loaf_new"
|
|
||||||
|
|
||||||
def get_db_info(engine, label):
|
|
||||||
"""Get comprehensive database information"""
|
|
||||||
inspector = inspect(engine)
|
|
||||||
|
|
||||||
info = {
|
|
||||||
'label': label,
|
|
||||||
'tables': {},
|
|
||||||
'indexes': {},
|
|
||||||
'foreign_keys': {},
|
|
||||||
'sequences': [],
|
|
||||||
'enums': []
|
|
||||||
}
|
|
||||||
|
|
||||||
# Get all table names
|
|
||||||
table_names = inspector.get_table_names()
|
|
||||||
|
|
||||||
for table_name in table_names:
|
|
||||||
# Get columns
|
|
||||||
columns = inspector.get_columns(table_name)
|
|
||||||
info['tables'][table_name] = {
|
|
||||||
'columns': {
|
|
||||||
col['name']: {
|
|
||||||
'type': str(col['type']),
|
|
||||||
'nullable': col['nullable'],
|
|
||||||
'default': str(col.get('default', None)),
|
|
||||||
'autoincrement': col.get('autoincrement', False)
|
|
||||||
}
|
|
||||||
for col in columns
|
|
||||||
},
|
|
||||||
'column_count': len(columns)
|
|
||||||
}
|
|
||||||
|
|
||||||
# Get primary keys
|
|
||||||
pk = inspector.get_pk_constraint(table_name)
|
|
||||||
info['tables'][table_name]['primary_key'] = pk.get('constrained_columns', [])
|
|
||||||
|
|
||||||
# Get indexes
|
|
||||||
indexes = inspector.get_indexes(table_name)
|
|
||||||
info['indexes'][table_name] = [
|
|
||||||
{
|
|
||||||
'name': idx['name'],
|
|
||||||
'columns': idx['column_names'],
|
|
||||||
'unique': idx['unique']
|
|
||||||
}
|
|
||||||
for idx in indexes
|
|
||||||
]
|
|
||||||
|
|
||||||
# Get foreign keys
|
|
||||||
fks = inspector.get_foreign_keys(table_name)
|
|
||||||
info['foreign_keys'][table_name] = [
|
|
||||||
{
|
|
||||||
'name': fk.get('name'),
|
|
||||||
'columns': fk['constrained_columns'],
|
|
||||||
'referred_table': fk['referred_table'],
|
|
||||||
'referred_columns': fk['referred_columns']
|
|
||||||
}
|
|
||||||
for fk in fks
|
|
||||||
]
|
|
||||||
|
|
||||||
# Get sequences
|
|
||||||
with engine.connect() as conn:
|
|
||||||
result = conn.execute(text("""
|
|
||||||
SELECT sequence_name
|
|
||||||
FROM information_schema.sequences
|
|
||||||
WHERE sequence_schema = 'public'
|
|
||||||
"""))
|
|
||||||
info['sequences'] = [row[0] for row in result]
|
|
||||||
|
|
||||||
# Get enum types
|
|
||||||
result = conn.execute(text("""
|
|
||||||
SELECT t.typname as enum_name,
|
|
||||||
array_agg(e.enumlabel ORDER BY e.enumsortorder) as enum_values
|
|
||||||
FROM pg_type t
|
|
||||||
JOIN pg_enum e ON t.oid = e.enumtypid
|
|
||||||
WHERE t.typnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
|
|
||||||
GROUP BY t.typname
|
|
||||||
"""))
|
|
||||||
info['enums'] = {row[0]: row[1] for row in result}
|
|
||||||
|
|
||||||
return info
|
|
||||||
|
|
||||||
def compare_tables(dev_info, prod_info):
|
|
||||||
"""Compare tables between databases"""
|
|
||||||
dev_tables = set(dev_info['tables'].keys())
|
|
||||||
prod_tables = set(prod_info['tables'].keys())
|
|
||||||
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("TABLE COMPARISON")
|
|
||||||
print("="*80)
|
|
||||||
|
|
||||||
# Tables only in dev
|
|
||||||
dev_only = dev_tables - prod_tables
|
|
||||||
if dev_only:
|
|
||||||
print(f"\n❌ Tables only in DEV ({len(dev_only)}):")
|
|
||||||
for table in sorted(dev_only):
|
|
||||||
print(f" - {table}")
|
|
||||||
|
|
||||||
# Tables only in prod
|
|
||||||
prod_only = prod_tables - dev_tables
|
|
||||||
if prod_only:
|
|
||||||
print(f"\n❌ Tables only in PROD ({len(prod_only)}):")
|
|
||||||
for table in sorted(prod_only):
|
|
||||||
print(f" - {table}")
|
|
||||||
|
|
||||||
# Common tables
|
|
||||||
common = dev_tables & prod_tables
|
|
||||||
print(f"\n✅ Common tables: {len(common)}")
|
|
||||||
|
|
||||||
return common
|
|
||||||
|
|
||||||
def compare_columns(dev_info, prod_info, common_tables):
|
|
||||||
"""Compare columns for common tables"""
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("COLUMN COMPARISON")
|
|
||||||
print("="*80)
|
|
||||||
|
|
||||||
issues = []
|
|
||||||
|
|
||||||
for table in sorted(common_tables):
|
|
||||||
dev_cols = set(dev_info['tables'][table]['columns'].keys())
|
|
||||||
prod_cols = set(prod_info['tables'][table]['columns'].keys())
|
|
||||||
|
|
||||||
dev_only = dev_cols - prod_cols
|
|
||||||
prod_only = prod_cols - dev_cols
|
|
||||||
|
|
||||||
if dev_only or prod_only:
|
|
||||||
print(f"\n⚠️ Table '{table}' has column differences:")
|
|
||||||
|
|
||||||
if dev_only:
|
|
||||||
print(f" Columns only in DEV: {', '.join(sorted(dev_only))}")
|
|
||||||
issues.append(f"{table}: DEV-only columns: {', '.join(dev_only)}")
|
|
||||||
|
|
||||||
if prod_only:
|
|
||||||
print(f" Columns only in PROD: {', '.join(sorted(prod_only))}")
|
|
||||||
issues.append(f"{table}: PROD-only columns: {', '.join(prod_only)}")
|
|
||||||
|
|
||||||
# Compare column types for common columns
|
|
||||||
common_cols = dev_cols & prod_cols
|
|
||||||
for col in common_cols:
|
|
||||||
dev_col = dev_info['tables'][table]['columns'][col]
|
|
||||||
prod_col = prod_info['tables'][table]['columns'][col]
|
|
||||||
|
|
||||||
if dev_col['type'] != prod_col['type']:
|
|
||||||
print(f" ⚠️ Column '{col}' type mismatch:")
|
|
||||||
print(f" DEV: {dev_col['type']}")
|
|
||||||
print(f" PROD: {prod_col['type']}")
|
|
||||||
issues.append(f"{table}.{col}: Type mismatch")
|
|
||||||
|
|
||||||
if dev_col['nullable'] != prod_col['nullable']:
|
|
||||||
print(f" ⚠️ Column '{col}' nullable mismatch:")
|
|
||||||
print(f" DEV: {dev_col['nullable']}")
|
|
||||||
print(f" PROD: {prod_col['nullable']}")
|
|
||||||
issues.append(f"{table}.{col}: Nullable mismatch")
|
|
||||||
|
|
||||||
if not issues:
|
|
||||||
print("\n✅ All columns match between DEV and PROD")
|
|
||||||
|
|
||||||
return issues
|
|
||||||
|
|
||||||
def compare_enums(dev_info, prod_info):
|
|
||||||
"""Compare enum types"""
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("ENUM TYPE COMPARISON")
|
|
||||||
print("="*80)
|
|
||||||
|
|
||||||
dev_enums = set(dev_info['enums'].keys())
|
|
||||||
prod_enums = set(prod_info['enums'].keys())
|
|
||||||
|
|
||||||
dev_only = dev_enums - prod_enums
|
|
||||||
prod_only = prod_enums - dev_enums
|
|
||||||
|
|
||||||
issues = []
|
|
||||||
|
|
||||||
if dev_only:
|
|
||||||
print(f"\n❌ Enums only in DEV: {', '.join(sorted(dev_only))}")
|
|
||||||
issues.extend([f"Enum '{e}' only in DEV" for e in dev_only])
|
|
||||||
|
|
||||||
if prod_only:
|
|
||||||
print(f"\n❌ Enums only in PROD: {', '.join(sorted(prod_only))}")
|
|
||||||
issues.extend([f"Enum '{e}' only in PROD" for e in prod_only])
|
|
||||||
|
|
||||||
# Compare enum values for common enums
|
|
||||||
common = dev_enums & prod_enums
|
|
||||||
for enum_name in sorted(common):
|
|
||||||
dev_values = set(dev_info['enums'][enum_name])
|
|
||||||
prod_values = set(prod_info['enums'][enum_name])
|
|
||||||
|
|
||||||
if dev_values != prod_values:
|
|
||||||
print(f"\n⚠️ Enum '{enum_name}' values differ:")
|
|
||||||
print(f" DEV: {', '.join(sorted(dev_values))}")
|
|
||||||
print(f" PROD: {', '.join(sorted(prod_values))}")
|
|
||||||
issues.append(f"Enum '{enum_name}' values differ")
|
|
||||||
|
|
||||||
if not issues:
|
|
||||||
print("\n✅ All enum types match")
|
|
||||||
|
|
||||||
return issues
|
|
||||||
|
|
||||||
def check_migration_history(dev_engine, prod_engine):
|
|
||||||
"""Check Alembic migration history"""
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("MIGRATION HISTORY")
|
|
||||||
print("="*80)
|
|
||||||
|
|
||||||
try:
|
|
||||||
with dev_engine.connect() as dev_conn:
|
|
||||||
dev_result = dev_conn.execute(text("SELECT version_num FROM alembic_version"))
|
|
||||||
dev_version = dev_result.fetchone()
|
|
||||||
dev_version = dev_version[0] if dev_version else None
|
|
||||||
|
|
||||||
with prod_engine.connect() as prod_conn:
|
|
||||||
prod_result = prod_conn.execute(text("SELECT version_num FROM alembic_version"))
|
|
||||||
prod_version = prod_result.fetchone()
|
|
||||||
prod_version = prod_version[0] if prod_version else None
|
|
||||||
|
|
||||||
print(f"\nDEV migration version: {dev_version}")
|
|
||||||
print(f"PROD migration version: {prod_version}")
|
|
||||||
|
|
||||||
if dev_version == prod_version:
|
|
||||||
print("✅ Migration versions match")
|
|
||||||
return []
|
|
||||||
else:
|
|
||||||
print("❌ Migration versions DO NOT match")
|
|
||||||
return ["Migration versions differ"]
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f"⚠️ Could not check migration history: {str(e)}")
|
|
||||||
return [f"Migration check failed: {str(e)}"]
|
|
||||||
|
|
||||||
def get_row_counts(engine, tables):
|
|
||||||
"""Get row counts for all tables"""
|
|
||||||
counts = {}
|
|
||||||
with engine.connect() as conn:
|
|
||||||
for table in tables:
|
|
||||||
result = conn.execute(text(f"SELECT COUNT(*) FROM {table}"))
|
|
||||||
counts[table] = result.fetchone()[0]
|
|
||||||
return counts
|
|
||||||
|
|
||||||
def compare_data_counts(dev_engine, prod_engine, common_tables):
|
|
||||||
"""Compare row counts between databases"""
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("DATA ROW COUNTS")
|
|
||||||
print("="*80)
|
|
||||||
|
|
||||||
print("\nGetting DEV row counts...")
|
|
||||||
dev_counts = get_row_counts(dev_engine, common_tables)
|
|
||||||
|
|
||||||
print("Getting PROD row counts...")
|
|
||||||
prod_counts = get_row_counts(prod_engine, common_tables)
|
|
||||||
|
|
||||||
print(f"\n{'Table':<30} {'DEV':<15} {'PROD':<15} {'Diff':<15}")
|
|
||||||
print("-" * 75)
|
|
||||||
|
|
||||||
for table in sorted(common_tables):
|
|
||||||
dev_count = dev_counts[table]
|
|
||||||
prod_count = prod_counts[table]
|
|
||||||
diff = dev_count - prod_count
|
|
||||||
diff_str = f"+{diff}" if diff > 0 else str(diff)
|
|
||||||
|
|
||||||
status = "⚠️ " if abs(diff) > 0 else "✅"
|
|
||||||
print(f"{status} {table:<28} {dev_count:<15} {prod_count:<15} {diff_str:<15}")
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("DATABASE INTEGRITY CHECKER")
|
|
||||||
print("="*80)
|
|
||||||
print(f"\nDEV: {DEV_DB.split('@')[1]}") # Hide password
|
|
||||||
print(f"PROD: {PROD_DB.split('@')[1]}")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Connect to databases
|
|
||||||
print("\n🔌 Connecting to databases...")
|
|
||||||
dev_engine = create_engine(DEV_DB)
|
|
||||||
prod_engine = create_engine(PROD_DB)
|
|
||||||
|
|
||||||
# Test connections
|
|
||||||
with dev_engine.connect() as conn:
|
|
||||||
conn.execute(text("SELECT 1"))
|
|
||||||
print("✅ Connected to DEV database")
|
|
||||||
|
|
||||||
with prod_engine.connect() as conn:
|
|
||||||
conn.execute(text("SELECT 1"))
|
|
||||||
print("✅ Connected to PROD database")
|
|
||||||
|
|
||||||
# Get database info
|
|
||||||
print("\n📊 Gathering database information...")
|
|
||||||
dev_info = get_db_info(dev_engine, "DEV")
|
|
||||||
prod_info = get_db_info(prod_engine, "PROD")
|
|
||||||
|
|
||||||
# Run comparisons
|
|
||||||
all_issues = []
|
|
||||||
|
|
||||||
common_tables = compare_tables(dev_info, prod_info)
|
|
||||||
|
|
||||||
column_issues = compare_columns(dev_info, prod_info, common_tables)
|
|
||||||
all_issues.extend(column_issues)
|
|
||||||
|
|
||||||
enum_issues = compare_enums(dev_info, prod_info)
|
|
||||||
all_issues.extend(enum_issues)
|
|
||||||
|
|
||||||
migration_issues = check_migration_history(dev_engine, prod_engine)
|
|
||||||
all_issues.extend(migration_issues)
|
|
||||||
|
|
||||||
compare_data_counts(dev_engine, prod_engine, common_tables)
|
|
||||||
|
|
||||||
# Summary
|
|
||||||
print("\n" + "="*80)
|
|
||||||
print("SUMMARY")
|
|
||||||
print("="*80)
|
|
||||||
|
|
||||||
if all_issues:
|
|
||||||
print(f"\n❌ Found {len(all_issues)} integrity issues:")
|
|
||||||
for i, issue in enumerate(all_issues, 1):
|
|
||||||
print(f" {i}. {issue}")
|
|
||||||
print("\n⚠️ Databases are NOT in sync!")
|
|
||||||
sys.exit(1)
|
|
||||||
else:
|
|
||||||
print("\n✅ Databases are in sync!")
|
|
||||||
print("✅ No integrity issues found")
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
print(f"\n❌ Error: {str(e)}")
|
|
||||||
import traceback
|
|
||||||
traceback.print_exc()
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Check for schema mismatches between models.py and database
|
|
||||||
"""
|
|
||||||
import os
|
|
||||||
from sqlalchemy import create_engine, inspect
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
from models import Base
|
|
||||||
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
# Connect to database
|
|
||||||
engine = create_engine(os.getenv('DATABASE_URL'))
|
|
||||||
inspector = inspect(engine)
|
|
||||||
|
|
||||||
print("=" * 80)
|
|
||||||
print("SCHEMA MISMATCH DETECTION")
|
|
||||||
print("=" * 80)
|
|
||||||
|
|
||||||
mismatches = []
|
|
||||||
|
|
||||||
# Check each model
|
|
||||||
for table_name, table in Base.metadata.tables.items():
|
|
||||||
print(f"\n📋 Checking table: {table_name}")
|
|
||||||
|
|
||||||
# Get columns from database
|
|
||||||
try:
|
|
||||||
db_columns = {col['name'] for col in inspector.get_columns(table_name)}
|
|
||||||
except Exception as e:
|
|
||||||
print(f" ❌ Table doesn't exist in database: {e}")
|
|
||||||
mismatches.append(f"{table_name}: Table missing in database")
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Get columns from model
|
|
||||||
model_columns = {col.name for col in table.columns}
|
|
||||||
|
|
||||||
# Find missing columns
|
|
||||||
missing_in_db = model_columns - db_columns
|
|
||||||
extra_in_db = db_columns - model_columns
|
|
||||||
|
|
||||||
if missing_in_db:
|
|
||||||
print(f" ⚠️ Missing in DATABASE: {missing_in_db}")
|
|
||||||
mismatches.append(f"{table_name}: Missing in DB: {missing_in_db}")
|
|
||||||
|
|
||||||
if extra_in_db:
|
|
||||||
print(f" ℹ️ Extra in DATABASE (not in model): {extra_in_db}")
|
|
||||||
|
|
||||||
if not missing_in_db and not extra_in_db:
|
|
||||||
print(f" ✅ Schema matches!")
|
|
||||||
|
|
||||||
print("\n" + "=" * 80)
|
|
||||||
if mismatches:
|
|
||||||
print(f"❌ FOUND {len(mismatches)} MISMATCHES:")
|
|
||||||
for mismatch in mismatches:
|
|
||||||
print(f" - {mismatch}")
|
|
||||||
else:
|
|
||||||
print("✅ ALL SCHEMAS MATCH!")
|
|
||||||
print("=" * 80)
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
"""
|
|
||||||
Create Superadmin User Script
|
|
||||||
Directly creates a superadmin user in the database for LOAF membership platform
|
|
||||||
"""
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
|
||||||
from getpass import getpass
|
|
||||||
|
|
||||||
# Add the backend directory to path for imports
|
|
||||||
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
|
|
||||||
|
|
||||||
def main():
|
|
||||||
print("=" * 70)
|
|
||||||
print("LOAF Membership Platform - Superadmin User Creator")
|
|
||||||
print("=" * 70)
|
|
||||||
print()
|
|
||||||
|
|
||||||
# Check for DATABASE_URL
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
database_url = os.getenv("DATABASE_URL")
|
|
||||||
if not database_url:
|
|
||||||
print("❌ DATABASE_URL not found in environment or .env file")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Get user input
|
|
||||||
email = input("Email address: ").strip()
|
|
||||||
if not email or '@' not in email:
|
|
||||||
print("❌ Invalid email address")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
first_name = input("First name: ").strip()
|
|
||||||
if not first_name:
|
|
||||||
print("❌ First name is required")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
last_name = input("Last name: ").strip()
|
|
||||||
if not last_name:
|
|
||||||
print("❌ Last name is required")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Get password securely
|
|
||||||
password = getpass("Password: ")
|
|
||||||
if len(password) < 8:
|
|
||||||
print("❌ Password must be at least 8 characters")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
password_confirm = getpass("Confirm password: ")
|
|
||||||
if password != password_confirm:
|
|
||||||
print("❌ Passwords do not match")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
print()
|
|
||||||
print("Creating superadmin user...")
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Import database dependencies
|
|
||||||
from sqlalchemy import create_engine, text
|
|
||||||
from passlib.context import CryptContext
|
|
||||||
|
|
||||||
# Create password hash
|
|
||||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
|
||||||
password_hash = pwd_context.hash(password)
|
|
||||||
|
|
||||||
# Connect to database
|
|
||||||
engine = create_engine(database_url)
|
|
||||||
|
|
||||||
with engine.connect() as conn:
|
|
||||||
# Check if user already exists
|
|
||||||
result = conn.execute(
|
|
||||||
text("SELECT id FROM users WHERE email = :email"),
|
|
||||||
{"email": email}
|
|
||||||
)
|
|
||||||
if result.fetchone():
|
|
||||||
print(f"❌ User with email '{email}' already exists")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# Insert superadmin user
|
|
||||||
conn.execute(
|
|
||||||
text("""
|
|
||||||
INSERT INTO users (
|
|
||||||
id, email, password_hash, first_name, last_name,
|
|
||||||
phone, address, city, state, zipcode, date_of_birth,
|
|
||||||
status, role, email_verified,
|
|
||||||
newsletter_subscribed, accepts_tos,
|
|
||||||
created_at, updated_at
|
|
||||||
) VALUES (
|
|
||||||
gen_random_uuid(),
|
|
||||||
:email,
|
|
||||||
:password_hash,
|
|
||||||
:first_name,
|
|
||||||
:last_name,
|
|
||||||
'',
|
|
||||||
'',
|
|
||||||
'',
|
|
||||||
'',
|
|
||||||
'',
|
|
||||||
'1990-01-01',
|
|
||||||
'active',
|
|
||||||
'superadmin',
|
|
||||||
true,
|
|
||||||
false,
|
|
||||||
true,
|
|
||||||
NOW(),
|
|
||||||
NOW()
|
|
||||||
)
|
|
||||||
"""),
|
|
||||||
{
|
|
||||||
"email": email,
|
|
||||||
"password_hash": password_hash,
|
|
||||||
"first_name": first_name,
|
|
||||||
"last_name": last_name
|
|
||||||
}
|
|
||||||
)
|
|
||||||
conn.commit()
|
|
||||||
|
|
||||||
print()
|
|
||||||
print("=" * 70)
|
|
||||||
print("✅ Superadmin user created successfully!")
|
|
||||||
print("=" * 70)
|
|
||||||
print()
|
|
||||||
print(f" Email: {email}")
|
|
||||||
print(f" Name: {first_name} {last_name}")
|
|
||||||
print(f" Role: superadmin")
|
|
||||||
print(f" Status: active")
|
|
||||||
print()
|
|
||||||
print("You can now log in with these credentials.")
|
|
||||||
print("=" * 70)
|
|
||||||
|
|
||||||
except ImportError as e:
|
|
||||||
print(f"❌ Missing dependency: {e}")
|
|
||||||
print(" Run: pip install sqlalchemy psycopg2-binary passlib python-dotenv")
|
|
||||||
sys.exit(1)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"❌ Database error: {e}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
try:
|
|
||||||
main()
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
print("\n\n❌ Cancelled by user")
|
|
||||||
sys.exit(1)
|
|
||||||
17
database.py
17
database.py
@@ -1,7 +1,6 @@
|
|||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.ext.declarative import declarative_base
|
from sqlalchemy.ext.declarative import declarative_base
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
from sqlalchemy.pool import QueuePool
|
|
||||||
import os
|
import os
|
||||||
from dotenv import load_dotenv
|
from dotenv import load_dotenv
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@@ -11,21 +10,7 @@ load_dotenv(ROOT_DIR / '.env')
|
|||||||
|
|
||||||
DATABASE_URL = os.environ.get('DATABASE_URL', 'postgresql://user:password@localhost:5432/membership_db')
|
DATABASE_URL = os.environ.get('DATABASE_URL', 'postgresql://user:password@localhost:5432/membership_db')
|
||||||
|
|
||||||
# Configure engine with connection pooling and connection health checks
|
engine = create_engine(DATABASE_URL)
|
||||||
engine = create_engine(
|
|
||||||
DATABASE_URL,
|
|
||||||
poolclass=QueuePool,
|
|
||||||
pool_size=5, # Keep 5 connections open
|
|
||||||
max_overflow=10, # Allow up to 10 extra connections during peak
|
|
||||||
pool_pre_ping=True, # CRITICAL: Test connections before using them
|
|
||||||
pool_recycle=3600, # Recycle connections every hour (prevents stale connections)
|
|
||||||
echo=False, # Set to True for SQL debugging
|
|
||||||
connect_args={
|
|
||||||
'connect_timeout': 10, # Timeout connection attempts after 10 seconds
|
|
||||||
'options': '-c statement_timeout=30000' # 30 second query timeout
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
|
|
||||||
Base = declarative_base()
|
Base = declarative_base()
|
||||||
|
|||||||
15
docker-compose.yml
Normal file
15
docker-compose.yml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
version: "3.9"
|
||||||
|
|
||||||
|
services:
|
||||||
|
backend:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile # Use Dockerfile.prod for production
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: "{DATABASE_URL}"
|
||||||
|
volumes:
|
||||||
|
- .:/app # sync code for hot reload
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
"""
|
|
||||||
Encryption service for sensitive settings stored in database.
|
|
||||||
|
|
||||||
Uses Fernet symmetric encryption (AES-128 in CBC mode with HMAC authentication).
|
|
||||||
The encryption key is derived from a master secret stored in .env.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import os
|
|
||||||
import base64
|
|
||||||
from cryptography.fernet import Fernet
|
|
||||||
from cryptography.hazmat.primitives import hashes
|
|
||||||
from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
|
|
||||||
from cryptography.hazmat.backends import default_backend
|
|
||||||
|
|
||||||
|
|
||||||
class EncryptionService:
|
|
||||||
"""Service for encrypting and decrypting sensitive configuration values"""
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
# Get master encryption key from environment
|
|
||||||
# This should be a long, random string (e.g., 64 characters)
|
|
||||||
# Generate one with: python -c "import secrets; print(secrets.token_urlsafe(64))"
|
|
||||||
self.master_secret = os.environ.get('SETTINGS_ENCRYPTION_KEY')
|
|
||||||
|
|
||||||
if not self.master_secret:
|
|
||||||
raise ValueError(
|
|
||||||
"SETTINGS_ENCRYPTION_KEY environment variable not set. "
|
|
||||||
"Generate one with: python -c \"import secrets; print(secrets.token_urlsafe(64))\""
|
|
||||||
)
|
|
||||||
|
|
||||||
# Derive encryption key from master secret using PBKDF2HMAC
|
|
||||||
# This adds an extra layer of security
|
|
||||||
kdf = PBKDF2HMAC(
|
|
||||||
algorithm=hashes.SHA256(),
|
|
||||||
length=32,
|
|
||||||
salt=b'systemsettings', # Fixed salt (OK for key derivation from strong secret)
|
|
||||||
iterations=100000,
|
|
||||||
backend=default_backend()
|
|
||||||
)
|
|
||||||
key = base64.urlsafe_b64encode(kdf.derive(self.master_secret.encode()))
|
|
||||||
self.cipher = Fernet(key)
|
|
||||||
|
|
||||||
def encrypt(self, plaintext: str) -> str:
|
|
||||||
"""
|
|
||||||
Encrypt a plaintext string.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
plaintext: The string to encrypt
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Base64-encoded encrypted string
|
|
||||||
"""
|
|
||||||
if not plaintext:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
encrypted_bytes = self.cipher.encrypt(plaintext.encode())
|
|
||||||
return encrypted_bytes.decode('utf-8')
|
|
||||||
|
|
||||||
def decrypt(self, encrypted: str) -> str:
|
|
||||||
"""
|
|
||||||
Decrypt an encrypted string.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
encrypted: The base64-encoded encrypted string
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Decrypted plaintext string
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
cryptography.fernet.InvalidToken: If decryption fails (wrong key or corrupted data)
|
|
||||||
"""
|
|
||||||
if not encrypted:
|
|
||||||
return ""
|
|
||||||
|
|
||||||
decrypted_bytes = self.cipher.decrypt(encrypted.encode())
|
|
||||||
return decrypted_bytes.decode('utf-8')
|
|
||||||
|
|
||||||
def is_encrypted(self, value: str) -> bool:
|
|
||||||
"""
|
|
||||||
Check if a value appears to be encrypted (starts with Fernet token format).
|
|
||||||
|
|
||||||
This is a heuristic check - not 100% reliable but useful for validation.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
value: String to check
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
True if value looks like a Fernet token
|
|
||||||
"""
|
|
||||||
if not value:
|
|
||||||
return False
|
|
||||||
|
|
||||||
# Fernet tokens are base64-encoded and start with version byte (gAAAAA...)
|
|
||||||
# They're always > 60 characters
|
|
||||||
try:
|
|
||||||
return len(value) > 60 and value.startswith('gAAAAA')
|
|
||||||
except:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
# Global encryption service instance
|
|
||||||
# Initialize on module import so it fails fast if encryption key is missing
|
|
||||||
try:
|
|
||||||
encryption_service = EncryptionService()
|
|
||||||
except ValueError as e:
|
|
||||||
print(f"WARNING: {e}")
|
|
||||||
print("Encryption service will not be available.")
|
|
||||||
encryption_service = None
|
|
||||||
|
|
||||||
|
|
||||||
def get_encryption_service() -> EncryptionService:
|
|
||||||
"""
|
|
||||||
Get the global encryption service instance.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: If encryption service is not initialized (missing SETTINGS_ENCRYPTION_KEY)
|
|
||||||
"""
|
|
||||||
if encryption_service is None:
|
|
||||||
raise ValueError(
|
|
||||||
"Encryption service not initialized. Set SETTINGS_ENCRYPTION_KEY environment variable."
|
|
||||||
)
|
|
||||||
return encryption_service
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# Fix all schema mismatches between models.py and database
|
|
||||||
# Run this on your server
|
|
||||||
|
|
||||||
set -e # Exit on error
|
|
||||||
|
|
||||||
echo "============================================================"
|
|
||||||
echo "Schema Mismatch Fix Script"
|
|
||||||
echo "============================================================"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Navigate to backend directory
|
|
||||||
cd "$(dirname "$0")"
|
|
||||||
|
|
||||||
echo "Step 1: Check current Alembic status..."
|
|
||||||
python3 -m alembic current
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "Step 2: Apply migration 003 (user_invitations fields)..."
|
|
||||||
python3 -m alembic upgrade head
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "Step 3: Verify migration was applied..."
|
|
||||||
python3 -m alembic current
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "Step 4: Restart PM2 backend..."
|
|
||||||
pm2 restart membership-backend
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "============================================================"
|
|
||||||
echo "✅ Schema fixes applied!"
|
|
||||||
echo "============================================================"
|
|
||||||
echo ""
|
|
||||||
echo "Migrations applied:"
|
|
||||||
echo " - 001_initial_baseline"
|
|
||||||
echo " - 002_add_missing_user_fields (users table)"
|
|
||||||
echo " - 003_add_user_invitation_fields (user_invitations table)"
|
|
||||||
echo ""
|
|
||||||
echo "Please test:"
|
|
||||||
echo " 1. Login to admin dashboard"
|
|
||||||
echo " 2. Navigate to user invitations page"
|
|
||||||
echo " 3. Verify no more schema errors"
|
|
||||||
echo ""
|
|
||||||
@@ -77,10 +77,7 @@ CREATE TYPE importjobstatus AS ENUM (
|
|||||||
'processing',
|
'processing',
|
||||||
'completed',
|
'completed',
|
||||||
'failed',
|
'failed',
|
||||||
'partial',
|
'partial'
|
||||||
'validating',
|
|
||||||
'preview_ready',
|
|
||||||
'rolled_back'
|
|
||||||
);
|
);
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
@@ -94,30 +91,6 @@ BEGIN;
|
|||||||
-- SECTION 2: Create Core Tables
|
-- SECTION 2: Create Core Tables
|
||||||
-- ============================================================================
|
-- ============================================================================
|
||||||
|
|
||||||
-- Import Jobs table (must be created before users due to FK reference)
|
|
||||||
CREATE TABLE IF NOT EXISTS import_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
|
|
||||||
filename VARCHAR NOT NULL,
|
|
||||||
status importjobstatus NOT NULL DEFAULT 'processing',
|
|
||||||
total_rows INTEGER DEFAULT 0,
|
|
||||||
processed_rows INTEGER DEFAULT 0,
|
|
||||||
success_count INTEGER DEFAULT 0,
|
|
||||||
error_count INTEGER DEFAULT 0,
|
|
||||||
error_log JSONB DEFAULT '[]'::jsonb,
|
|
||||||
|
|
||||||
-- WordPress import enhancements
|
|
||||||
field_mapping JSONB DEFAULT '{}'::jsonb,
|
|
||||||
wordpress_metadata JSONB DEFAULT '{}'::jsonb,
|
|
||||||
imported_user_ids JSONB DEFAULT '[]'::jsonb,
|
|
||||||
rollback_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
rollback_by UUID, -- Will be updated with FK after users table exists
|
|
||||||
|
|
||||||
started_by UUID, -- Will be updated with FK after users table exists
|
|
||||||
started_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
completed_at TIMESTAMP WITH TIME ZONE
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Users table
|
-- Users table
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
@@ -127,7 +100,6 @@ CREATE TABLE IF NOT EXISTS users (
|
|||||||
password_hash VARCHAR NOT NULL,
|
password_hash VARCHAR NOT NULL,
|
||||||
email_verified BOOLEAN NOT NULL DEFAULT FALSE,
|
email_verified BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
email_verification_token VARCHAR UNIQUE,
|
email_verification_token VARCHAR UNIQUE,
|
||||||
email_verification_expires TIMESTAMP WITH TIME ZONE,
|
|
||||||
|
|
||||||
-- Personal Information
|
-- Personal Information
|
||||||
first_name VARCHAR NOT NULL,
|
first_name VARCHAR NOT NULL,
|
||||||
@@ -138,6 +110,7 @@ CREATE TABLE IF NOT EXISTS users (
|
|||||||
state VARCHAR(2),
|
state VARCHAR(2),
|
||||||
zipcode VARCHAR(10),
|
zipcode VARCHAR(10),
|
||||||
date_of_birth DATE,
|
date_of_birth DATE,
|
||||||
|
bio TEXT,
|
||||||
|
|
||||||
-- Profile
|
-- Profile
|
||||||
profile_photo_url VARCHAR,
|
profile_photo_url VARCHAR,
|
||||||
@@ -161,67 +134,23 @@ CREATE TABLE IF NOT EXISTS users (
|
|||||||
-- Status & Role
|
-- Status & Role
|
||||||
status userstatus NOT NULL DEFAULT 'pending_email',
|
status userstatus NOT NULL DEFAULT 'pending_email',
|
||||||
role userrole NOT NULL DEFAULT 'guest',
|
role userrole NOT NULL DEFAULT 'guest',
|
||||||
role_id UUID, -- For dynamic RBAC
|
role_id UUID, -- For dynamic RBAC (added in later migration)
|
||||||
|
|
||||||
-- Newsletter Preferences
|
|
||||||
newsletter_subscribed BOOLEAN DEFAULT TRUE,
|
|
||||||
newsletter_publish_name BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
newsletter_publish_photo BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
newsletter_publish_birthday BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
newsletter_publish_none BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
|
|
||||||
-- Volunteer Interests
|
|
||||||
volunteer_interests JSONB DEFAULT '[]'::jsonb,
|
|
||||||
|
|
||||||
-- Scholarship Request
|
|
||||||
scholarship_requested BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
scholarship_reason TEXT,
|
|
||||||
|
|
||||||
-- Directory Settings
|
|
||||||
show_in_directory BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
directory_email VARCHAR,
|
|
||||||
directory_bio TEXT,
|
|
||||||
directory_address VARCHAR,
|
|
||||||
directory_phone VARCHAR,
|
|
||||||
directory_dob DATE,
|
|
||||||
directory_partner_name VARCHAR,
|
|
||||||
|
|
||||||
-- Password Reset
|
|
||||||
password_reset_token VARCHAR,
|
|
||||||
password_reset_expires TIMESTAMP WITH TIME ZONE,
|
|
||||||
force_password_change BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
|
|
||||||
-- Terms of Service
|
|
||||||
accepts_tos BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
tos_accepted_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
|
|
||||||
-- Membership
|
|
||||||
member_since DATE,
|
|
||||||
|
|
||||||
-- Reminder Tracking
|
|
||||||
email_verification_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_email_verification_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
event_attendance_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_event_attendance_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
payment_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_payment_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
renewal_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_renewal_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
|
|
||||||
-- Rejection Tracking
|
-- Rejection Tracking
|
||||||
rejection_reason TEXT,
|
rejection_reason TEXT,
|
||||||
rejected_at TIMESTAMP WITH TIME ZONE,
|
rejected_at TIMESTAMP WITH TIME ZONE,
|
||||||
rejected_by UUID REFERENCES users(id),
|
rejected_by UUID REFERENCES users(id),
|
||||||
|
|
||||||
-- WordPress Import Tracking
|
-- Membership
|
||||||
import_source VARCHAR(50),
|
member_since DATE,
|
||||||
import_job_id UUID REFERENCES import_jobs(id),
|
tos_accepted BOOLEAN DEFAULT FALSE,
|
||||||
wordpress_user_id BIGINT,
|
tos_accepted_at TIMESTAMP WITH TIME ZONE,
|
||||||
wordpress_registered_date TIMESTAMP WITH TIME ZONE,
|
newsletter_subscribed BOOLEAN DEFAULT TRUE,
|
||||||
|
|
||||||
-- Role Change Audit Trail
|
-- Reminder Tracking
|
||||||
role_changed_at TIMESTAMP WITH TIME ZONE,
|
reminder_30_days_sent BOOLEAN DEFAULT FALSE,
|
||||||
role_changed_by UUID REFERENCES users(id) ON DELETE SET NULL,
|
reminder_60_days_sent BOOLEAN DEFAULT FALSE,
|
||||||
|
reminder_85_days_sent BOOLEAN DEFAULT FALSE,
|
||||||
|
|
||||||
-- Timestamps
|
-- Timestamps
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
||||||
@@ -312,23 +241,11 @@ CREATE TABLE IF NOT EXISTS subscription_plans (
|
|||||||
name VARCHAR NOT NULL,
|
name VARCHAR NOT NULL,
|
||||||
description TEXT,
|
description TEXT,
|
||||||
price_cents INTEGER NOT NULL,
|
price_cents INTEGER NOT NULL,
|
||||||
billing_cycle VARCHAR NOT NULL DEFAULT 'yearly',
|
billing_cycle VARCHAR NOT NULL DEFAULT 'annual',
|
||||||
stripe_price_id VARCHAR, -- Legacy, deprecated
|
|
||||||
|
|
||||||
-- Configuration
|
-- Configuration
|
||||||
active BOOLEAN NOT NULL DEFAULT TRUE,
|
active BOOLEAN NOT NULL DEFAULT TRUE,
|
||||||
|
features JSONB DEFAULT '[]'::jsonb,
|
||||||
-- Custom billing cycle fields (for recurring date ranges like Jan 1 - Dec 31)
|
|
||||||
custom_cycle_enabled BOOLEAN DEFAULT FALSE NOT NULL,
|
|
||||||
custom_cycle_start_month INTEGER,
|
|
||||||
custom_cycle_start_day INTEGER,
|
|
||||||
custom_cycle_end_month INTEGER,
|
|
||||||
custom_cycle_end_day INTEGER,
|
|
||||||
|
|
||||||
-- Dynamic pricing fields
|
|
||||||
minimum_price_cents INTEGER DEFAULT 3000 NOT NULL,
|
|
||||||
suggested_price_cents INTEGER,
|
|
||||||
allow_donation BOOLEAN DEFAULT TRUE NOT NULL,
|
|
||||||
|
|
||||||
-- Timestamps
|
-- Timestamps
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
||||||
@@ -350,21 +267,13 @@ CREATE TABLE IF NOT EXISTS subscriptions (
|
|||||||
status subscriptionstatus DEFAULT 'active',
|
status subscriptionstatus DEFAULT 'active',
|
||||||
start_date TIMESTAMP WITH TIME ZONE NOT NULL,
|
start_date TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||||
end_date TIMESTAMP WITH TIME ZONE,
|
end_date TIMESTAMP WITH TIME ZONE,
|
||||||
|
next_billing_date TIMESTAMP WITH TIME ZONE,
|
||||||
|
|
||||||
-- Payment Details
|
-- Payment Details
|
||||||
amount_paid_cents INTEGER,
|
amount_paid_cents INTEGER,
|
||||||
base_subscription_cents INTEGER NOT NULL,
|
base_subscription_cents INTEGER NOT NULL,
|
||||||
donation_cents INTEGER DEFAULT 0 NOT NULL,
|
donation_cents INTEGER DEFAULT 0 NOT NULL,
|
||||||
|
|
||||||
-- Stripe transaction metadata (for validation and audit)
|
|
||||||
stripe_payment_intent_id VARCHAR,
|
|
||||||
stripe_charge_id VARCHAR,
|
|
||||||
stripe_invoice_id VARCHAR,
|
|
||||||
payment_completed_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
card_last4 VARCHAR(4),
|
|
||||||
card_brand VARCHAR(20),
|
|
||||||
stripe_receipt_url VARCHAR,
|
|
||||||
|
|
||||||
-- Manual Payment Support
|
-- Manual Payment Support
|
||||||
manual_payment BOOLEAN DEFAULT FALSE NOT NULL,
|
manual_payment BOOLEAN DEFAULT FALSE NOT NULL,
|
||||||
manual_payment_notes TEXT,
|
manual_payment_notes TEXT,
|
||||||
@@ -396,14 +305,6 @@ CREATE TABLE IF NOT EXISTS donations (
|
|||||||
stripe_payment_intent_id VARCHAR,
|
stripe_payment_intent_id VARCHAR,
|
||||||
payment_method VARCHAR,
|
payment_method VARCHAR,
|
||||||
|
|
||||||
-- Stripe transaction metadata (for validation and audit)
|
|
||||||
stripe_charge_id VARCHAR,
|
|
||||||
stripe_customer_id VARCHAR,
|
|
||||||
payment_completed_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
card_last4 VARCHAR(4),
|
|
||||||
card_brand VARCHAR(20),
|
|
||||||
stripe_receipt_url VARCHAR,
|
|
||||||
|
|
||||||
-- Metadata
|
-- Metadata
|
||||||
notes TEXT,
|
notes TEXT,
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
||||||
@@ -530,7 +431,7 @@ CREATE TABLE IF NOT EXISTS storage_usage (
|
|||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
|
||||||
total_bytes_used BIGINT NOT NULL DEFAULT 0,
|
total_bytes_used BIGINT NOT NULL DEFAULT 0,
|
||||||
max_bytes_allowed BIGINT NOT NULL DEFAULT 1073741824, -- 1GB
|
max_bytes_allowed BIGINT NOT NULL DEFAULT 10737418240, -- 10GB
|
||||||
last_updated TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
|
last_updated TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -551,21 +452,21 @@ CREATE TABLE IF NOT EXISTS user_invitations (
|
|||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
|
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP
|
||||||
);
|
);
|
||||||
|
|
||||||
-- Add FK constraints to import_jobs (now that users table exists)
|
-- Import Jobs table
|
||||||
ALTER TABLE import_jobs
|
CREATE TABLE IF NOT EXISTS import_jobs (
|
||||||
ADD CONSTRAINT fk_import_jobs_rollback_by FOREIGN KEY (rollback_by) REFERENCES users(id),
|
|
||||||
ADD CONSTRAINT fk_import_jobs_started_by FOREIGN KEY (started_by) REFERENCES users(id);
|
|
||||||
|
|
||||||
-- Import Rollback Audit table (for tracking rollback operations)
|
|
||||||
CREATE TABLE IF NOT EXISTS import_rollback_audit (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
import_job_id UUID NOT NULL REFERENCES import_jobs(id),
|
|
||||||
rolled_back_by UUID NOT NULL REFERENCES users(id),
|
filename VARCHAR NOT NULL,
|
||||||
rolled_back_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
|
status importjobstatus NOT NULL DEFAULT 'processing',
|
||||||
deleted_user_count INTEGER NOT NULL,
|
total_rows INTEGER DEFAULT 0,
|
||||||
deleted_user_ids JSONB NOT NULL,
|
processed_rows INTEGER DEFAULT 0,
|
||||||
reason TEXT,
|
success_count INTEGER DEFAULT 0,
|
||||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
|
error_count INTEGER DEFAULT 0,
|
||||||
|
error_log JSONB DEFAULT '[]'::jsonb,
|
||||||
|
|
||||||
|
started_by UUID REFERENCES users(id),
|
||||||
|
started_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
completed_at TIMESTAMP WITH TIME ZONE
|
||||||
);
|
);
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
@@ -587,8 +488,6 @@ CREATE INDEX IF NOT EXISTS idx_users_role_id ON users(role_id);
|
|||||||
CREATE INDEX IF NOT EXISTS idx_users_email_verified ON users(email_verified);
|
CREATE INDEX IF NOT EXISTS idx_users_email_verified ON users(email_verified);
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_rejected_at ON users(rejected_at) WHERE rejected_at IS NOT NULL;
|
CREATE INDEX IF NOT EXISTS idx_users_rejected_at ON users(rejected_at) WHERE rejected_at IS NOT NULL;
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_created_at ON users(created_at);
|
CREATE INDEX IF NOT EXISTS idx_users_created_at ON users(created_at);
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_import_job ON users(import_job_id) WHERE import_job_id IS NOT NULL;
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_import_source ON users(import_source) WHERE import_source IS NOT NULL;
|
|
||||||
|
|
||||||
-- Events table indexes
|
-- Events table indexes
|
||||||
CREATE INDEX IF NOT EXISTS idx_events_created_by ON events(created_by);
|
CREATE INDEX IF NOT EXISTS idx_events_created_by ON events(created_by);
|
||||||
@@ -608,26 +507,12 @@ CREATE INDEX IF NOT EXISTS idx_subscriptions_user_id ON subscriptions(user_id);
|
|||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_plan_id ON subscriptions(plan_id);
|
CREATE INDEX IF NOT EXISTS idx_subscriptions_plan_id ON subscriptions(plan_id);
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_status ON subscriptions(status);
|
CREATE INDEX IF NOT EXISTS idx_subscriptions_status ON subscriptions(status);
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_stripe_subscription_id ON subscriptions(stripe_subscription_id);
|
CREATE INDEX IF NOT EXISTS idx_subscriptions_stripe_subscription_id ON subscriptions(stripe_subscription_id);
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_payment_intent ON subscriptions(stripe_payment_intent_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_charge_id ON subscriptions(stripe_charge_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_invoice_id ON subscriptions(stripe_invoice_id);
|
|
||||||
|
|
||||||
-- Donations indexes
|
-- Donations indexes
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_user ON donations(user_id);
|
CREATE INDEX IF NOT EXISTS idx_donation_user ON donations(user_id);
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_type ON donations(donation_type);
|
CREATE INDEX IF NOT EXISTS idx_donation_type ON donations(donation_type);
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_status ON donations(status);
|
CREATE INDEX IF NOT EXISTS idx_donation_status ON donations(status);
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_created ON donations(created_at);
|
CREATE INDEX IF NOT EXISTS idx_donation_created ON donations(created_at);
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_payment_intent ON donations(stripe_payment_intent_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_charge_id ON donations(stripe_charge_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_donation_customer_id ON donations(stripe_customer_id);
|
|
||||||
|
|
||||||
-- Import Jobs indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_import_jobs_status ON import_jobs(status);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_import_jobs_started_by ON import_jobs(started_by);
|
|
||||||
|
|
||||||
-- Import Rollback Audit indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_rollback_audit_import_job ON import_rollback_audit(import_job_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_rollback_audit_rolled_back_at ON import_rollback_audit(rolled_back_at DESC);
|
|
||||||
|
|
||||||
-- Permissions indexes
|
-- Permissions indexes
|
||||||
CREATE INDEX IF NOT EXISTS idx_permissions_code ON permissions(code);
|
CREATE INDEX IF NOT EXISTS idx_permissions_code ON permissions(code);
|
||||||
@@ -659,7 +544,7 @@ INSERT INTO storage_usage (id, total_bytes_used, max_bytes_allowed, last_updated
|
|||||||
SELECT
|
SELECT
|
||||||
gen_random_uuid(),
|
gen_random_uuid(),
|
||||||
0,
|
0,
|
||||||
1073741824, -- 1GB
|
10737418240, -- 10GB
|
||||||
CURRENT_TIMESTAMP
|
CURRENT_TIMESTAMP
|
||||||
WHERE NOT EXISTS (SELECT 1 FROM storage_usage);
|
WHERE NOT EXISTS (SELECT 1 FROM storage_usage);
|
||||||
|
|
||||||
|
|||||||
@@ -1,172 +0,0 @@
|
|||||||
-- ============================================================================
|
|
||||||
-- Fix All Permission Codes to Match Backend Code
|
|
||||||
-- This migration adds all missing permissions that the code actually checks for
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Delete old incorrect permissions and role mappings
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
DELETE FROM role_permissions;
|
|
||||||
DELETE FROM permissions;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Create ALL permissions that backend code actually checks for
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO permissions (id, code, name, description, module, created_at)
|
|
||||||
VALUES
|
|
||||||
-- Users Permissions
|
|
||||||
(gen_random_uuid(), 'users.view', 'View Users', 'View user list and profiles', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.create', 'Create Users', 'Create new users', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.edit', 'Edit Users', 'Edit user information', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.approve', 'Approve Users', 'Approve pending memberships', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.import', 'Import Users', 'Import users from CSV', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.export', 'Export Users', 'Export users to CSV', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.status', 'Change User Status', 'Update user status', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.reset_password', 'Reset User Password', 'Reset user passwords', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.resend_verification', 'Resend Verification', 'Resend email verification', 'users', NOW()),
|
|
||||||
|
|
||||||
-- Events Permissions
|
|
||||||
(gen_random_uuid(), 'events.view', 'View Events', 'View event list', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.create', 'Create Events', 'Create new events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.edit', 'Edit Events', 'Edit event information', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.delete', 'Delete Events', 'Delete events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.rsvps', 'View RSVPs', 'View event RSVPs', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.attendance', 'Manage Attendance', 'Mark attendance', 'events', NOW()),
|
|
||||||
|
|
||||||
-- Gallery Permissions
|
|
||||||
(gen_random_uuid(), 'gallery.upload', 'Upload Photos', 'Upload event photos', 'gallery', NOW()),
|
|
||||||
(gen_random_uuid(), 'gallery.edit', 'Edit Gallery', 'Edit photo captions', 'gallery', NOW()),
|
|
||||||
(gen_random_uuid(), 'gallery.delete', 'Delete Photos', 'Delete event photos', 'gallery', NOW()),
|
|
||||||
|
|
||||||
-- Subscriptions Permissions
|
|
||||||
(gen_random_uuid(), 'subscriptions.view', 'View Subscriptions', 'View user subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.plans', 'Manage Plans', 'Manage subscription plans', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.edit', 'Edit Subscriptions', 'Edit user subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.cancel', 'Cancel Subscriptions', 'Cancel subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.activate', 'Activate Subscriptions', 'Manually activate subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.export', 'Export Subscriptions', 'Export subscription data', 'subscriptions', NOW()),
|
|
||||||
|
|
||||||
-- Donations Permissions
|
|
||||||
(gen_random_uuid(), 'donations.view', 'View Donations', 'View donation records', 'donations', NOW()),
|
|
||||||
(gen_random_uuid(), 'donations.export', 'Export Donations', 'Export donation data', 'donations', NOW()),
|
|
||||||
|
|
||||||
-- Financials Permissions (Financial Reports)
|
|
||||||
(gen_random_uuid(), 'financials.create', 'Create Financial Reports', 'Upload financial reports', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.edit', 'Edit Financial Reports', 'Edit financial reports', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.delete', 'Delete Financial Reports', 'Delete financial reports', 'financials', NOW()),
|
|
||||||
|
|
||||||
-- Newsletters Permissions
|
|
||||||
(gen_random_uuid(), 'newsletters.create', 'Create Newsletters', 'Upload newsletter archives', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.edit', 'Edit Newsletters', 'Edit newsletter archives', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.delete', 'Delete Newsletters', 'Delete newsletter archives', 'newsletters', NOW()),
|
|
||||||
|
|
||||||
-- Bylaws Permissions
|
|
||||||
(gen_random_uuid(), 'bylaws.create', 'Create Bylaws', 'Upload bylaws documents', 'bylaws', NOW()),
|
|
||||||
(gen_random_uuid(), 'bylaws.edit', 'Edit Bylaws', 'Edit bylaws documents', 'bylaws', NOW()),
|
|
||||||
(gen_random_uuid(), 'bylaws.delete', 'Delete Bylaws', 'Delete bylaws documents', 'bylaws', NOW()),
|
|
||||||
|
|
||||||
-- Settings Permissions
|
|
||||||
(gen_random_uuid(), 'settings.storage', 'View Storage Usage', 'View storage usage statistics', 'settings', NOW())
|
|
||||||
ON CONFLICT (code) DO NOTHING;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Assign Permissions to Roles
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Guest Role: No permissions
|
|
||||||
-- (Members can only view their own data through different endpoints)
|
|
||||||
|
|
||||||
-- Member Role: Basic viewing only
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'member',
|
|
||||||
(SELECT id FROM roles WHERE code = 'member'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
'events.view'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Admin Role: Full management except financial
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'admin',
|
|
||||||
(SELECT id FROM roles WHERE code = 'admin'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
-- User Management
|
|
||||||
'users.view', 'users.create', 'users.edit', 'users.approve', 'users.import',
|
|
||||||
'users.export', 'users.status', 'users.reset_password', 'users.resend_verification',
|
|
||||||
|
|
||||||
-- Event Management
|
|
||||||
'events.view', 'events.create', 'events.edit', 'events.delete', 'events.rsvps', 'events.attendance',
|
|
||||||
|
|
||||||
-- Gallery
|
|
||||||
'gallery.upload', 'gallery.edit', 'gallery.delete',
|
|
||||||
|
|
||||||
-- Content
|
|
||||||
'newsletters.create', 'newsletters.edit', 'newsletters.delete',
|
|
||||||
'bylaws.create', 'bylaws.edit', 'bylaws.delete',
|
|
||||||
|
|
||||||
-- Settings
|
|
||||||
'settings.storage'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Finance Role: Financial permissions + basic viewing
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'finance',
|
|
||||||
(SELECT id FROM roles WHERE code = 'finance'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
-- Subscriptions & Donations
|
|
||||||
'subscriptions.view', 'subscriptions.plans', 'subscriptions.edit',
|
|
||||||
'subscriptions.cancel', 'subscriptions.activate', 'subscriptions.export',
|
|
||||||
'donations.view', 'donations.export',
|
|
||||||
|
|
||||||
-- Financial Reports
|
|
||||||
'financials.create', 'financials.edit', 'financials.delete',
|
|
||||||
|
|
||||||
-- Basic Access
|
|
||||||
'users.view',
|
|
||||||
'events.view'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Superadmin Role: ALL permissions
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'superadmin',
|
|
||||||
(SELECT id FROM roles WHERE code = 'superadmin'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
\echo '✅ All permissions fixed!'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Permission counts by role:'
|
|
||||||
\echo ' - Guest: 0'
|
|
||||||
\echo ' - Member: 1'
|
|
||||||
\echo ' - Admin: ~25'
|
|
||||||
\echo ' - Finance: ~13'
|
|
||||||
\echo ' - Superadmin: ALL (40 total)'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Next: Restart backend with: pm2 restart membership-backend'
|
|
||||||
@@ -1,216 +0,0 @@
|
|||||||
-- ============================================================================
|
|
||||||
-- Complete Permission Set (60 permissions from development)
|
|
||||||
-- Run this to sync production with development permissions
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- Delete old permissions and mappings
|
|
||||||
DELETE FROM role_permissions;
|
|
||||||
DELETE FROM permissions;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Create ALL 60 permissions (matching development)
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO permissions (id, code, name, description, module, created_at)
|
|
||||||
VALUES
|
|
||||||
-- Users Permissions (11)
|
|
||||||
(gen_random_uuid(), 'users.view', 'View Users', 'View user list and profiles', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.create', 'Create Users', 'Create new users', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.edit', 'Edit Users', 'Edit user information', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.delete', 'Delete Users', 'Delete users', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.status', 'Change User Status', 'Update user status', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.approve', 'Approve Users', 'Approve pending memberships', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.export', 'Export Users', 'Export users to CSV', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.import', 'Import Users', 'Import users from CSV', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.reset_password', 'Reset User Password', 'Reset user passwords', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.resend_verification', 'Resend Verification', 'Resend email verification', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.invite', 'Invite Users', 'Send user invitations', 'users', NOW()),
|
|
||||||
|
|
||||||
-- Events Permissions (8)
|
|
||||||
(gen_random_uuid(), 'events.view', 'View Events', 'View event list', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.create', 'Create Events', 'Create new events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.edit', 'Edit Events', 'Edit event information', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.delete', 'Delete Events', 'Delete events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.publish', 'Publish Events', 'Publish/unpublish events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.attendance', 'Manage Attendance', 'Mark attendance', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.rsvps', 'View RSVPs', 'View event RSVPs', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.calendar_export', 'Export Calendar', 'Export events to calendar', 'events', NOW()),
|
|
||||||
|
|
||||||
-- Subscriptions Permissions (7)
|
|
||||||
(gen_random_uuid(), 'subscriptions.view', 'View Subscriptions', 'View user subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.create', 'Create Subscriptions', 'Create new subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.edit', 'Edit Subscriptions', 'Edit user subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.cancel', 'Cancel Subscriptions', 'Cancel subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.activate', 'Activate Subscriptions', 'Manually activate subscriptions', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.plans', 'Manage Plans', 'Manage subscription plans', 'subscriptions', NOW()),
|
|
||||||
(gen_random_uuid(), 'subscriptions.export', 'Export Subscriptions', 'Export subscription data', 'subscriptions', NOW()),
|
|
||||||
|
|
||||||
-- Donations Permissions (2)
|
|
||||||
(gen_random_uuid(), 'donations.view', 'View Donations', 'View donation records', 'donations', NOW()),
|
|
||||||
(gen_random_uuid(), 'donations.export', 'Export Donations', 'Export donation data', 'donations', NOW()),
|
|
||||||
|
|
||||||
-- Financials Permissions (6)
|
|
||||||
(gen_random_uuid(), 'financials.view', 'View Financial Reports', 'View financial reports', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.create', 'Create Financial Reports', 'Upload financial reports', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.edit', 'Edit Financial Reports', 'Edit financial reports', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.delete', 'Delete Financial Reports', 'Delete financial reports', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.export', 'Export Financial Data', 'Export financial data', 'financials', NOW()),
|
|
||||||
(gen_random_uuid(), 'financials.payments', 'Manage Payments', 'Process manual payments', 'financials', NOW()),
|
|
||||||
|
|
||||||
-- Newsletters Permissions (6)
|
|
||||||
(gen_random_uuid(), 'newsletters.view', 'View Newsletters', 'View newsletter archives', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.create', 'Create Newsletters', 'Upload newsletter archives', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.edit', 'Edit Newsletters', 'Edit newsletter archives', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.delete', 'Delete Newsletters', 'Delete newsletter archives', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.send', 'Send Newsletters', 'Send newsletters to subscribers', 'newsletters', NOW()),
|
|
||||||
(gen_random_uuid(), 'newsletters.subscribers', 'Manage Subscribers', 'Manage newsletter subscribers', 'newsletters', NOW()),
|
|
||||||
|
|
||||||
-- Bylaws Permissions (5)
|
|
||||||
(gen_random_uuid(), 'bylaws.view', 'View Bylaws', 'View bylaws documents', 'bylaws', NOW()),
|
|
||||||
(gen_random_uuid(), 'bylaws.create', 'Create Bylaws', 'Upload bylaws documents', 'bylaws', NOW()),
|
|
||||||
(gen_random_uuid(), 'bylaws.edit', 'Edit Bylaws', 'Edit bylaws documents', 'bylaws', NOW()),
|
|
||||||
(gen_random_uuid(), 'bylaws.delete', 'Delete Bylaws', 'Delete bylaws documents', 'bylaws', NOW()),
|
|
||||||
(gen_random_uuid(), 'bylaws.publish', 'Publish Bylaws', 'Mark bylaws as current', 'bylaws', NOW()),
|
|
||||||
|
|
||||||
-- Gallery Permissions (5)
|
|
||||||
(gen_random_uuid(), 'gallery.view', 'View Gallery', 'View event galleries', 'gallery', NOW()),
|
|
||||||
(gen_random_uuid(), 'gallery.upload', 'Upload Photos', 'Upload event photos', 'gallery', NOW()),
|
|
||||||
(gen_random_uuid(), 'gallery.edit', 'Edit Gallery', 'Edit photo captions', 'gallery', NOW()),
|
|
||||||
(gen_random_uuid(), 'gallery.delete', 'Delete Photos', 'Delete event photos', 'gallery', NOW()),
|
|
||||||
(gen_random_uuid(), 'gallery.moderate', 'Moderate Gallery', 'Approve/reject gallery submissions', 'gallery', NOW()),
|
|
||||||
|
|
||||||
-- Settings Permissions (6)
|
|
||||||
(gen_random_uuid(), 'settings.view', 'View Settings', 'View system settings', 'settings', NOW()),
|
|
||||||
(gen_random_uuid(), 'settings.edit', 'Edit Settings', 'Edit system settings', 'settings', NOW()),
|
|
||||||
(gen_random_uuid(), 'settings.email_templates', 'Manage Email Templates', 'Edit email templates', 'settings', NOW()),
|
|
||||||
(gen_random_uuid(), 'settings.storage', 'View Storage Usage', 'View storage usage statistics', 'settings', NOW()),
|
|
||||||
(gen_random_uuid(), 'settings.backup', 'Backup System', 'Create system backups', 'settings', NOW()),
|
|
||||||
(gen_random_uuid(), 'settings.logs', 'View Logs', 'View system logs', 'settings', NOW()),
|
|
||||||
|
|
||||||
-- Permissions Management (4)
|
|
||||||
(gen_random_uuid(), 'permissions.view', 'View Permissions', 'View permission list', 'permissions', NOW()),
|
|
||||||
(gen_random_uuid(), 'permissions.assign', 'Assign Permissions', 'Assign permissions to roles', 'permissions', NOW()),
|
|
||||||
(gen_random_uuid(), 'permissions.manage_roles', 'Manage Roles', 'Create/edit roles', 'permissions', NOW()),
|
|
||||||
(gen_random_uuid(), 'permissions.audit', 'View Audit Logs', 'View permission audit logs', 'permissions', NOW())
|
|
||||||
|
|
||||||
ON CONFLICT (code) DO NOTHING;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Assign Permissions to Roles
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Guest Role: No permissions
|
|
||||||
|
|
||||||
-- Member Role: Basic viewing only
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'member',
|
|
||||||
(SELECT id FROM roles WHERE code = 'member'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
'events.view',
|
|
||||||
'gallery.view',
|
|
||||||
'bylaws.view',
|
|
||||||
'newsletters.view'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Admin Role: Most permissions except financials and permissions management
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'admin',
|
|
||||||
(SELECT id FROM roles WHERE code = 'admin'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
-- User Management
|
|
||||||
'users.view', 'users.create', 'users.edit', 'users.approve', 'users.import',
|
|
||||||
'users.export', 'users.status', 'users.reset_password', 'users.resend_verification', 'users.invite',
|
|
||||||
|
|
||||||
-- Event Management
|
|
||||||
'events.view', 'events.create', 'events.edit', 'events.delete', 'events.publish',
|
|
||||||
'events.rsvps', 'events.attendance', 'events.calendar_export',
|
|
||||||
|
|
||||||
-- Gallery
|
|
||||||
'gallery.view', 'gallery.upload', 'gallery.edit', 'gallery.delete', 'gallery.moderate',
|
|
||||||
|
|
||||||
-- Content
|
|
||||||
'newsletters.view', 'newsletters.create', 'newsletters.edit', 'newsletters.delete',
|
|
||||||
'newsletters.send', 'newsletters.subscribers',
|
|
||||||
'bylaws.view', 'bylaws.create', 'bylaws.edit', 'bylaws.delete', 'bylaws.publish',
|
|
||||||
|
|
||||||
-- Settings (limited)
|
|
||||||
'settings.view', 'settings.storage', 'settings.logs'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Finance Role: Financial permissions + basic viewing
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'finance',
|
|
||||||
(SELECT id FROM roles WHERE code = 'finance'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
-- Subscriptions & Donations
|
|
||||||
'subscriptions.view', 'subscriptions.create', 'subscriptions.plans', 'subscriptions.edit',
|
|
||||||
'subscriptions.cancel', 'subscriptions.activate', 'subscriptions.export',
|
|
||||||
'donations.view', 'donations.export',
|
|
||||||
|
|
||||||
-- Financial Reports
|
|
||||||
'financials.view', 'financials.create', 'financials.edit', 'financials.delete',
|
|
||||||
'financials.export', 'financials.payments',
|
|
||||||
|
|
||||||
-- Basic Access
|
|
||||||
'users.view',
|
|
||||||
'events.view',
|
|
||||||
'bylaws.view',
|
|
||||||
'newsletters.view'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Superadmin Role: ALL 60 permissions
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'superadmin',
|
|
||||||
(SELECT id FROM roles WHERE code = 'superadmin'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
\echo '✅ Complete permission set created!'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Permission counts:'
|
|
||||||
\echo ' Total permissions: 60'
|
|
||||||
\echo ' - users: 11'
|
|
||||||
\echo ' - events: 8'
|
|
||||||
\echo ' - subscriptions: 7'
|
|
||||||
\echo ' - donations: 2'
|
|
||||||
\echo ' - financials: 6'
|
|
||||||
\echo ' - newsletters: 6'
|
|
||||||
\echo ' - bylaws: 5'
|
|
||||||
\echo ' - gallery: 5'
|
|
||||||
\echo ' - settings: 6'
|
|
||||||
\echo ' - permissions: 4'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Role assignments:'
|
|
||||||
\echo ' - Guest: 0'
|
|
||||||
\echo ' - Member: 4 (view only)'
|
|
||||||
\echo ' - Admin: ~40'
|
|
||||||
\echo ' - Finance: ~20'
|
|
||||||
\echo ' - Superadmin: 60 (all)'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Next: Restart backend with: pm2 restart membership-backend'
|
|
||||||
@@ -1,153 +0,0 @@
|
|||||||
-- Migration: 011_wordpress_import_enhancements
|
|
||||||
-- Purpose: Enhance ImportJob and User tables for WordPress CSV import feature
|
|
||||||
-- Date: 2025-12-24
|
|
||||||
-- Author: Claude Code
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- PART 1: Enhance ImportJob Table
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Add new columns to import_jobs table for WordPress import tracking
|
|
||||||
ALTER TABLE import_jobs
|
|
||||||
ADD COLUMN IF NOT EXISTS field_mapping JSONB DEFAULT '{}'::jsonb,
|
|
||||||
ADD COLUMN IF NOT EXISTS wordpress_metadata JSONB DEFAULT '{}'::jsonb,
|
|
||||||
ADD COLUMN IF NOT EXISTS imported_user_ids JSONB DEFAULT '[]'::jsonb,
|
|
||||||
ADD COLUMN IF NOT EXISTS rollback_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
ADD COLUMN IF NOT EXISTS rollback_by UUID REFERENCES users(id);
|
|
||||||
|
|
||||||
-- Add comments for documentation
|
|
||||||
COMMENT ON COLUMN import_jobs.field_mapping IS 'Maps CSV columns to database fields: {csv_column: db_field}';
|
|
||||||
COMMENT ON COLUMN import_jobs.wordpress_metadata IS 'Stores preview data, validation results, and WordPress-specific metadata';
|
|
||||||
COMMENT ON COLUMN import_jobs.imported_user_ids IS 'Array of user IDs created from this import job (for rollback)';
|
|
||||||
COMMENT ON COLUMN import_jobs.rollback_at IS 'Timestamp when this import was rolled back';
|
|
||||||
COMMENT ON COLUMN import_jobs.rollback_by IS 'Admin user who performed the rollback';
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- PART 2: Add New ImportJob Status Values
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Add new status values for import workflow
|
|
||||||
-- Note: PostgreSQL enum values cannot be added conditionally, so we use DO block
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
-- Add 'validating' status if it doesn't exist
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_enum WHERE enumlabel = 'validating' AND enumtypid = (SELECT oid FROM pg_type WHERE typname = 'importjobstatus')) THEN
|
|
||||||
ALTER TYPE importjobstatus ADD VALUE 'validating';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
-- Add 'preview_ready' status if it doesn't exist
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_enum WHERE enumlabel = 'preview_ready' AND enumtypid = (SELECT oid FROM pg_type WHERE typname = 'importjobstatus')) THEN
|
|
||||||
ALTER TYPE importjobstatus ADD VALUE 'preview_ready';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
-- Add 'rolled_back' status if it doesn't exist
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_enum WHERE enumlabel = 'rolled_back' AND enumtypid = (SELECT oid FROM pg_type WHERE typname = 'importjobstatus')) THEN
|
|
||||||
ALTER TYPE importjobstatus ADD VALUE 'rolled_back';
|
|
||||||
END IF;
|
|
||||||
END$$;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- PART 3: Enhance User Table for Import Tracking
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Add columns to track import source and WordPress metadata
|
|
||||||
ALTER TABLE users
|
|
||||||
ADD COLUMN IF NOT EXISTS import_source VARCHAR(50),
|
|
||||||
ADD COLUMN IF NOT EXISTS import_job_id UUID REFERENCES import_jobs(id),
|
|
||||||
ADD COLUMN IF NOT EXISTS wordpress_user_id BIGINT,
|
|
||||||
ADD COLUMN IF NOT EXISTS wordpress_registered_date TIMESTAMP WITH TIME ZONE;
|
|
||||||
|
|
||||||
-- Add comments for documentation
|
|
||||||
COMMENT ON COLUMN users.import_source IS 'Source of user creation: wordpress, manual, registration, etc.';
|
|
||||||
COMMENT ON COLUMN users.import_job_id IS 'Reference to import job that created this user (if imported)';
|
|
||||||
COMMENT ON COLUMN users.wordpress_user_id IS 'Original WordPress user ID for reference';
|
|
||||||
COMMENT ON COLUMN users.wordpress_registered_date IS 'Original WordPress registration date';
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- PART 4: Create Indexes for Performance
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Index for querying users by import job (used in rollback)
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_import_job
|
|
||||||
ON users(import_job_id)
|
|
||||||
WHERE import_job_id IS NOT NULL;
|
|
||||||
|
|
||||||
-- Index for querying users by import source
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_import_source
|
|
||||||
ON users(import_source)
|
|
||||||
WHERE import_source IS NOT NULL;
|
|
||||||
|
|
||||||
-- Index for querying import jobs by status
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_import_jobs_status
|
|
||||||
ON import_jobs(status);
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- PART 5: Create Rollback Audit Table (Optional but Recommended)
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Create table to track import rollback history for audit purposes
|
|
||||||
CREATE TABLE IF NOT EXISTS import_rollback_audit (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
import_job_id UUID NOT NULL REFERENCES import_jobs(id),
|
|
||||||
rolled_back_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
rolled_back_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
|
|
||||||
deleted_user_count INTEGER NOT NULL,
|
|
||||||
deleted_user_ids JSONB NOT NULL,
|
|
||||||
reason TEXT,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Index for querying rollback history
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_rollback_audit_import_job
|
|
||||||
ON import_rollback_audit(import_job_id);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_rollback_audit_rolled_back_at
|
|
||||||
ON import_rollback_audit(rolled_back_at DESC);
|
|
||||||
|
|
||||||
COMMENT ON TABLE import_rollback_audit IS 'Audit trail for import rollback operations';
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- VERIFICATION QUERIES (Run after migration to verify)
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Verify ImportJob columns exist
|
|
||||||
-- SELECT column_name, data_type
|
|
||||||
-- FROM information_schema.columns
|
|
||||||
-- WHERE table_name = 'import_jobs'
|
|
||||||
-- AND column_name IN ('field_mapping', 'wordpress_metadata', 'imported_user_ids', 'rollback_at', 'rollback_by');
|
|
||||||
|
|
||||||
-- Verify User columns exist
|
|
||||||
-- SELECT column_name, data_type
|
|
||||||
-- FROM information_schema.columns
|
|
||||||
-- WHERE table_name = 'users'
|
|
||||||
-- AND column_name IN ('import_source', 'import_job_id', 'wordpress_user_id', 'wordpress_registered_date');
|
|
||||||
|
|
||||||
-- Verify new enum values exist
|
|
||||||
-- SELECT enumlabel FROM pg_enum WHERE enumtypid = (SELECT oid FROM pg_type WHERE typname = 'importjobstatus') ORDER BY enumlabel;
|
|
||||||
|
|
||||||
-- Verify indexes exist
|
|
||||||
-- SELECT indexname, indexdef FROM pg_indexes WHERE tablename IN ('users', 'import_jobs', 'import_rollback_audit') ORDER BY indexname;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- ROLLBACK SCRIPT (if needed)
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- WARNING: This will drop all columns and data related to WordPress imports
|
|
||||||
-- USE WITH EXTREME CAUTION
|
|
||||||
|
|
||||||
-- DROP TABLE IF EXISTS import_rollback_audit CASCADE;
|
|
||||||
-- DROP INDEX IF EXISTS idx_users_import_job;
|
|
||||||
-- DROP INDEX IF EXISTS idx_users_import_source;
|
|
||||||
-- DROP INDEX IF EXISTS idx_import_jobs_status;
|
|
||||||
-- ALTER TABLE users DROP COLUMN IF EXISTS import_source;
|
|
||||||
-- ALTER TABLE users DROP COLUMN IF EXISTS import_job_id;
|
|
||||||
-- ALTER TABLE users DROP COLUMN IF EXISTS wordpress_user_id;
|
|
||||||
-- ALTER TABLE users DROP COLUMN IF EXISTS wordpress_registered_date;
|
|
||||||
-- ALTER TABLE import_jobs DROP COLUMN IF EXISTS field_mapping;
|
|
||||||
-- ALTER TABLE import_jobs DROP COLUMN IF EXISTS wordpress_metadata;
|
|
||||||
-- ALTER TABLE import_jobs DROP COLUMN IF EXISTS imported_user_ids;
|
|
||||||
-- ALTER TABLE import_jobs DROP COLUMN IF EXISTS rollback_at;
|
|
||||||
-- ALTER TABLE import_jobs DROP COLUMN IF EXISTS rollback_by;
|
|
||||||
|
|
||||||
-- Note: Cannot easily remove enum values from importjobstatus type without recreating it
|
|
||||||
-- Manual intervention required if rollback of enum values is needed
|
|
||||||
@@ -1,394 +0,0 @@
|
|||||||
-- ============================================================================
|
|
||||||
-- Create Tables Only (ENUMs already exist)
|
|
||||||
-- Run this when ENUMs exist but tables don't
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 1: Core Tables
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Users table
|
|
||||||
CREATE TABLE IF NOT EXISTS users (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
email VARCHAR(255) UNIQUE NOT NULL,
|
|
||||||
password_hash VARCHAR(255) NOT NULL,
|
|
||||||
first_name VARCHAR(100) NOT NULL,
|
|
||||||
last_name VARCHAR(100) NOT NULL,
|
|
||||||
phone VARCHAR(20),
|
|
||||||
address TEXT,
|
|
||||||
city VARCHAR(100),
|
|
||||||
state VARCHAR(2),
|
|
||||||
zipcode VARCHAR(10),
|
|
||||||
date_of_birth DATE,
|
|
||||||
|
|
||||||
-- Profile
|
|
||||||
profile_image_url TEXT,
|
|
||||||
bio TEXT,
|
|
||||||
interests TEXT,
|
|
||||||
|
|
||||||
-- Partner Information
|
|
||||||
partner_first_name VARCHAR(100),
|
|
||||||
partner_last_name VARCHAR(100),
|
|
||||||
partner_is_member BOOLEAN DEFAULT FALSE,
|
|
||||||
partner_plan_to_become_member BOOLEAN DEFAULT FALSE,
|
|
||||||
|
|
||||||
-- Referral
|
|
||||||
referred_by_member_name VARCHAR(200),
|
|
||||||
|
|
||||||
-- Newsletter Preferences
|
|
||||||
newsletter_subscribed BOOLEAN DEFAULT TRUE,
|
|
||||||
newsletter_publish_name BOOLEAN DEFAULT FALSE,
|
|
||||||
newsletter_publish_photo BOOLEAN DEFAULT FALSE,
|
|
||||||
newsletter_publish_birthday BOOLEAN DEFAULT FALSE,
|
|
||||||
newsletter_publish_none BOOLEAN DEFAULT FALSE,
|
|
||||||
|
|
||||||
-- Volunteer & Scholarship
|
|
||||||
volunteer_interests TEXT,
|
|
||||||
scholarship_requested BOOLEAN DEFAULT FALSE,
|
|
||||||
|
|
||||||
-- Directory
|
|
||||||
show_in_directory BOOLEAN DEFAULT TRUE,
|
|
||||||
|
|
||||||
-- Lead Sources (JSON array)
|
|
||||||
lead_sources JSONB DEFAULT '[]'::jsonb,
|
|
||||||
|
|
||||||
-- Status & Role
|
|
||||||
status userstatus DEFAULT 'pending_email' NOT NULL,
|
|
||||||
role userrole DEFAULT 'guest' NOT NULL,
|
|
||||||
role_id UUID,
|
|
||||||
|
|
||||||
-- Rejection Tracking
|
|
||||||
rejection_reason TEXT,
|
|
||||||
rejected_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
rejected_by UUID REFERENCES users(id),
|
|
||||||
|
|
||||||
-- Membership
|
|
||||||
member_since DATE,
|
|
||||||
accepts_tos BOOLEAN DEFAULT FALSE,
|
|
||||||
tos_accepted_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
|
|
||||||
-- Reminder Tracking (from migration 004)
|
|
||||||
email_verification_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_email_verification_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
event_attendance_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_event_attendance_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
payment_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_payment_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
renewal_reminders_sent INTEGER DEFAULT 0 NOT NULL,
|
|
||||||
last_renewal_reminder_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
|
|
||||||
-- WordPress Import Tracking
|
|
||||||
import_source VARCHAR(50),
|
|
||||||
import_job_id UUID,
|
|
||||||
wordpress_user_id BIGINT,
|
|
||||||
wordpress_registered_date TIMESTAMP WITH TIME ZONE,
|
|
||||||
|
|
||||||
-- Authentication
|
|
||||||
email_verified BOOLEAN DEFAULT FALSE,
|
|
||||||
email_verification_token VARCHAR(255),
|
|
||||||
email_verification_expires TIMESTAMP WITH TIME ZONE,
|
|
||||||
password_reset_token VARCHAR(255),
|
|
||||||
password_reset_expires TIMESTAMP WITH TIME ZONE,
|
|
||||||
force_password_change BOOLEAN DEFAULT FALSE,
|
|
||||||
|
|
||||||
-- Timestamps
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Events table
|
|
||||||
CREATE TABLE IF NOT EXISTS events (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
description TEXT,
|
|
||||||
location VARCHAR(255),
|
|
||||||
start_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
|
||||||
end_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
|
||||||
capacity INTEGER,
|
|
||||||
published BOOLEAN DEFAULT FALSE,
|
|
||||||
calendar_uid VARCHAR(255) UNIQUE,
|
|
||||||
created_by UUID REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Event RSVPs
|
|
||||||
CREATE TABLE IF NOT EXISTS event_rsvps (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
event_id UUID NOT NULL REFERENCES events(id) ON DELETE CASCADE,
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
rsvp_status rsvpstatus NOT NULL,
|
|
||||||
attended BOOLEAN DEFAULT FALSE,
|
|
||||||
attended_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
UNIQUE(event_id, user_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Event Gallery
|
|
||||||
CREATE TABLE IF NOT EXISTS event_galleries (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
event_id UUID NOT NULL REFERENCES events(id) ON DELETE CASCADE,
|
|
||||||
image_url TEXT NOT NULL,
|
|
||||||
caption TEXT,
|
|
||||||
uploaded_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Import Jobs
|
|
||||||
CREATE TABLE IF NOT EXISTS import_jobs (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
filename VARCHAR(255) NOT NULL,
|
|
||||||
file_key VARCHAR(255),
|
|
||||||
total_rows INTEGER NOT NULL,
|
|
||||||
processed_rows INTEGER DEFAULT 0,
|
|
||||||
successful_rows INTEGER DEFAULT 0,
|
|
||||||
failed_rows INTEGER DEFAULT 0,
|
|
||||||
status importjobstatus DEFAULT 'processing' NOT NULL,
|
|
||||||
errors JSONB DEFAULT '[]'::jsonb,
|
|
||||||
|
|
||||||
-- WordPress import enhancements
|
|
||||||
field_mapping JSONB DEFAULT '{}'::jsonb,
|
|
||||||
wordpress_metadata JSONB DEFAULT '{}'::jsonb,
|
|
||||||
imported_user_ids JSONB DEFAULT '[]'::jsonb,
|
|
||||||
rollback_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
rollback_by UUID REFERENCES users(id),
|
|
||||||
|
|
||||||
imported_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
started_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
completed_at TIMESTAMP WITH TIME ZONE
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 2: Subscription & Payment Tables
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS subscription_plans (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
name VARCHAR(100) NOT NULL,
|
|
||||||
description TEXT,
|
|
||||||
price_cents INTEGER NOT NULL,
|
|
||||||
billing_cycle VARCHAR(20) NOT NULL,
|
|
||||||
stripe_price_id VARCHAR(255),
|
|
||||||
custom_cycle_enabled BOOLEAN DEFAULT FALSE,
|
|
||||||
minimum_price_cents INTEGER DEFAULT 0,
|
|
||||||
allow_donation BOOLEAN DEFAULT FALSE,
|
|
||||||
is_active BOOLEAN DEFAULT TRUE,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS subscriptions (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
|
||||||
plan_id UUID NOT NULL REFERENCES subscription_plans(id),
|
|
||||||
stripe_subscription_id VARCHAR(255),
|
|
||||||
stripe_customer_id VARCHAR(255),
|
|
||||||
base_subscription_cents INTEGER NOT NULL,
|
|
||||||
donation_cents INTEGER DEFAULT 0,
|
|
||||||
status subscriptionstatus DEFAULT 'active' NOT NULL,
|
|
||||||
current_period_start TIMESTAMP WITH TIME ZONE,
|
|
||||||
current_period_end TIMESTAMP WITH TIME ZONE,
|
|
||||||
cancel_at_period_end BOOLEAN DEFAULT FALSE,
|
|
||||||
canceled_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
manual_payment BOOLEAN DEFAULT FALSE,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS donations (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
user_id UUID REFERENCES users(id),
|
|
||||||
amount_cents INTEGER NOT NULL,
|
|
||||||
donation_type donationtype NOT NULL,
|
|
||||||
status donationstatus DEFAULT 'pending' NOT NULL,
|
|
||||||
stripe_payment_intent_id VARCHAR(255),
|
|
||||||
donor_name VARCHAR(200),
|
|
||||||
donor_email VARCHAR(255),
|
|
||||||
message TEXT,
|
|
||||||
is_anonymous BOOLEAN DEFAULT FALSE,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
completed_at TIMESTAMP WITH TIME ZONE
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 3: RBAC Tables
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS permissions (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
code VARCHAR(100) UNIQUE NOT NULL,
|
|
||||||
name VARCHAR(200) NOT NULL,
|
|
||||||
description TEXT,
|
|
||||||
module VARCHAR(50),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS roles (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
code VARCHAR(50) UNIQUE NOT NULL,
|
|
||||||
name VARCHAR(100) NOT NULL,
|
|
||||||
description TEXT,
|
|
||||||
is_system_role BOOLEAN DEFAULT FALSE,
|
|
||||||
created_by UUID REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS role_permissions (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
role VARCHAR(50),
|
|
||||||
role_id UUID REFERENCES roles(id) ON DELETE CASCADE,
|
|
||||||
permission_id UUID NOT NULL REFERENCES permissions(id) ON DELETE CASCADE,
|
|
||||||
created_by UUID REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS user_invitations (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
email VARCHAR(255) NOT NULL,
|
|
||||||
role userrole NOT NULL,
|
|
||||||
token VARCHAR(255) UNIQUE NOT NULL,
|
|
||||||
invited_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
invited_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
|
||||||
accepted_by UUID REFERENCES users(id),
|
|
||||||
accepted_at TIMESTAMP WITH TIME ZONE,
|
|
||||||
status invitationstatus DEFAULT 'pending' NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 4: Document Management Tables
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS newsletter_archives (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
description TEXT,
|
|
||||||
published_date TIMESTAMP WITH TIME ZONE NOT NULL,
|
|
||||||
document_url TEXT NOT NULL,
|
|
||||||
document_type VARCHAR(50) NOT NULL,
|
|
||||||
created_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS financial_reports (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
year INTEGER NOT NULL,
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
document_url TEXT NOT NULL,
|
|
||||||
document_type VARCHAR(50) NOT NULL,
|
|
||||||
created_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS bylaws_documents (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
title VARCHAR(255) NOT NULL,
|
|
||||||
version VARCHAR(50) NOT NULL,
|
|
||||||
effective_date TIMESTAMP WITH TIME ZONE NOT NULL,
|
|
||||||
document_url TEXT NOT NULL,
|
|
||||||
document_type VARCHAR(50) NOT NULL,
|
|
||||||
is_current BOOLEAN DEFAULT FALSE,
|
|
||||||
created_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 5: System Tables
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS storage_usage (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
total_bytes_used BIGINT DEFAULT 0,
|
|
||||||
max_bytes_allowed BIGINT,
|
|
||||||
last_calculated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS import_rollback_audit (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
import_job_id UUID NOT NULL REFERENCES import_jobs(id),
|
|
||||||
rolled_back_by UUID NOT NULL REFERENCES users(id),
|
|
||||||
rolled_back_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
|
||||||
deleted_user_count INTEGER NOT NULL,
|
|
||||||
deleted_user_ids JSONB NOT NULL,
|
|
||||||
reason TEXT,
|
|
||||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
|
||||||
);
|
|
||||||
|
|
||||||
-- Initialize storage_usage with default row
|
|
||||||
INSERT INTO storage_usage (id, total_bytes_used, max_bytes_allowed)
|
|
||||||
VALUES (gen_random_uuid(), 0, 107374182400) -- 100GB limit
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 6: Create Indexes
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- Users indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_email ON users(email);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_status ON users(status);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_role ON users(role);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_users_created_at ON users(created_at);
|
|
||||||
|
|
||||||
-- Events indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_events_start_at ON events(start_at);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_events_published ON events(published);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_events_created_by ON events(created_by);
|
|
||||||
|
|
||||||
-- Event RSVPs indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_event_rsvps_event_id ON event_rsvps(event_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_event_rsvps_user_id ON event_rsvps(user_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_event_rsvps_attended ON event_rsvps(attended);
|
|
||||||
|
|
||||||
-- Subscriptions indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_user_id ON subscriptions(user_id);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_status ON subscriptions(status);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_subscriptions_stripe_customer_id ON subscriptions(stripe_customer_id);
|
|
||||||
|
|
||||||
-- Permissions indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_permissions_code ON permissions(code);
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_permissions_module ON permissions(module);
|
|
||||||
|
|
||||||
-- Roles indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_roles_code ON roles(code);
|
|
||||||
|
|
||||||
-- Role permissions indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_role_permissions_role ON role_permissions(role);
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_role_permissions_role_id ON role_permissions(role_id);
|
|
||||||
|
|
||||||
-- User invitations indexes
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_user_invitations_email ON user_invitations(email);
|
|
||||||
CREATE INDEX IF NOT EXISTS ix_user_invitations_token ON user_invitations(token);
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
\echo '✅ All tables created successfully!'
|
|
||||||
\echo 'Run: psql ... -c "\dt" to verify'
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
-- ============================================================================
|
|
||||||
-- Database Diagnostic Script
|
|
||||||
-- Run this to check what exists in your database
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
\echo '=== CHECKING ENUMS ==='
|
|
||||||
SELECT
|
|
||||||
t.typname as enum_name,
|
|
||||||
string_agg(e.enumlabel, ', ' ORDER BY e.enumsortorder) as values
|
|
||||||
FROM pg_type t
|
|
||||||
JOIN pg_enum e ON t.oid = e.enumtypid
|
|
||||||
WHERE t.typname IN (
|
|
||||||
'userstatus', 'userrole', 'rsvpstatus', 'subscriptionstatus',
|
|
||||||
'donationtype', 'donationstatus', 'invitationstatus', 'importjobstatus'
|
|
||||||
)
|
|
||||||
GROUP BY t.typname
|
|
||||||
ORDER BY t.typname;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '=== CHECKING TABLES ==='
|
|
||||||
SELECT
|
|
||||||
schemaname,
|
|
||||||
tablename
|
|
||||||
FROM pg_tables
|
|
||||||
WHERE schemaname = 'public'
|
|
||||||
ORDER BY tablename;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '=== CHECKING USERS TABLE STRUCTURE ==='
|
|
||||||
SELECT
|
|
||||||
column_name,
|
|
||||||
data_type,
|
|
||||||
is_nullable,
|
|
||||||
column_default
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users'
|
|
||||||
ORDER BY ordinal_position;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '=== CHECKING FOR CRITICAL FIELDS ==='
|
|
||||||
\echo 'Checking if reminder tracking fields exist...'
|
|
||||||
SELECT EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users'
|
|
||||||
AND column_name = 'email_verification_reminders_sent'
|
|
||||||
) as has_reminder_fields;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo 'Checking if accepts_tos field exists (should be accepts_tos, not tos_accepted)...'
|
|
||||||
SELECT column_name
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users'
|
|
||||||
AND column_name IN ('accepts_tos', 'tos_accepted');
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo 'Checking if WordPress import fields exist...'
|
|
||||||
SELECT EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users'
|
|
||||||
AND column_name = 'import_source'
|
|
||||||
) as has_import_fields;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '=== CHECKING IMPORT_JOBS TABLE ==='
|
|
||||||
SELECT column_name
|
|
||||||
FROM information_schema.columns
|
|
||||||
WHERE table_name = 'import_jobs'
|
|
||||||
ORDER BY ordinal_position;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '=== SUMMARY ==='
|
|
||||||
SELECT
|
|
||||||
(SELECT COUNT(*) FROM pg_type WHERE typname IN (
|
|
||||||
'userstatus', 'userrole', 'rsvpstatus', 'subscriptionstatus',
|
|
||||||
'donationtype', 'donationstatus', 'invitationstatus', 'importjobstatus'
|
|
||||||
)) as enum_count,
|
|
||||||
(SELECT COUNT(*) FROM pg_tables WHERE schemaname = 'public') as table_count,
|
|
||||||
(SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'users') as users_column_count;
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
-- ============================================================================
|
|
||||||
-- Fix Missing Fields Script
|
|
||||||
-- Safely adds missing fields without recreating existing structures
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
\echo '=== FIXING USERS TABLE ==='
|
|
||||||
|
|
||||||
-- Fix TOS field name if needed (tos_accepted -> accepts_tos)
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF EXISTS (
|
|
||||||
SELECT 1 FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users' AND column_name = 'tos_accepted'
|
|
||||||
) AND NOT EXISTS (
|
|
||||||
SELECT 1 FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users' AND column_name = 'accepts_tos'
|
|
||||||
) THEN
|
|
||||||
ALTER TABLE users RENAME COLUMN tos_accepted TO accepts_tos;
|
|
||||||
RAISE NOTICE 'Renamed tos_accepted to accepts_tos';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Add reminder tracking fields if missing
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users' AND column_name = 'email_verification_reminders_sent'
|
|
||||||
) THEN
|
|
||||||
ALTER TABLE users ADD COLUMN email_verification_reminders_sent INTEGER DEFAULT 0 NOT NULL;
|
|
||||||
ALTER TABLE users ADD COLUMN last_email_verification_reminder_at TIMESTAMP WITH TIME ZONE;
|
|
||||||
ALTER TABLE users ADD COLUMN event_attendance_reminders_sent INTEGER DEFAULT 0 NOT NULL;
|
|
||||||
ALTER TABLE users ADD COLUMN last_event_attendance_reminder_at TIMESTAMP WITH TIME ZONE;
|
|
||||||
ALTER TABLE users ADD COLUMN payment_reminders_sent INTEGER DEFAULT 0 NOT NULL;
|
|
||||||
ALTER TABLE users ADD COLUMN last_payment_reminder_at TIMESTAMP WITH TIME ZONE;
|
|
||||||
ALTER TABLE users ADD COLUMN renewal_reminders_sent INTEGER DEFAULT 0 NOT NULL;
|
|
||||||
ALTER TABLE users ADD COLUMN last_renewal_reminder_at TIMESTAMP WITH TIME ZONE;
|
|
||||||
RAISE NOTICE 'Added reminder tracking fields';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Add WordPress import fields if missing
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM information_schema.columns
|
|
||||||
WHERE table_name = 'users' AND column_name = 'import_source'
|
|
||||||
) THEN
|
|
||||||
ALTER TABLE users ADD COLUMN import_source VARCHAR(50);
|
|
||||||
ALTER TABLE users ADD COLUMN import_job_id UUID REFERENCES import_jobs(id);
|
|
||||||
ALTER TABLE users ADD COLUMN wordpress_user_id BIGINT;
|
|
||||||
ALTER TABLE users ADD COLUMN wordpress_registered_date TIMESTAMP WITH TIME ZONE;
|
|
||||||
RAISE NOTICE 'Added WordPress import tracking fields';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
\echo '=== FIXING IMPORT_JOBS TABLE ==='
|
|
||||||
|
|
||||||
-- Add WordPress import enhancement fields if missing
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM information_schema.columns
|
|
||||||
WHERE table_name = 'import_jobs' AND column_name = 'field_mapping'
|
|
||||||
) THEN
|
|
||||||
ALTER TABLE import_jobs ADD COLUMN field_mapping JSONB DEFAULT '{}'::jsonb;
|
|
||||||
ALTER TABLE import_jobs ADD COLUMN wordpress_metadata JSONB DEFAULT '{}'::jsonb;
|
|
||||||
ALTER TABLE import_jobs ADD COLUMN imported_user_ids JSONB DEFAULT '[]'::jsonb;
|
|
||||||
ALTER TABLE import_jobs ADD COLUMN rollback_at TIMESTAMP WITH TIME ZONE;
|
|
||||||
ALTER TABLE import_jobs ADD COLUMN rollback_by UUID REFERENCES users(id);
|
|
||||||
RAISE NOTICE 'Added WordPress import enhancement fields to import_jobs';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Add validating, preview_ready, rolled_back to ImportJobStatus enum if missing
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'importjobstatus' AND e.enumlabel = 'validating'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE importjobstatus ADD VALUE IF NOT EXISTS 'validating';
|
|
||||||
RAISE NOTICE 'Added validating to importjobstatus enum';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'importjobstatus' AND e.enumlabel = 'preview_ready'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE importjobstatus ADD VALUE IF NOT EXISTS 'preview_ready';
|
|
||||||
RAISE NOTICE 'Added preview_ready to importjobstatus enum';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'importjobstatus' AND e.enumlabel = 'rolled_back'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE importjobstatus ADD VALUE IF NOT EXISTS 'rolled_back';
|
|
||||||
RAISE NOTICE 'Added rolled_back to importjobstatus enum';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
-- Add pending_validation, pre_validated, canceled, expired, abandoned to UserStatus enum if missing
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'userstatus' AND e.enumlabel = 'pending_validation'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE userstatus ADD VALUE IF NOT EXISTS 'pending_validation';
|
|
||||||
RAISE NOTICE 'Added pending_validation to userstatus enum';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'userstatus' AND e.enumlabel = 'pre_validated'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE userstatus ADD VALUE IF NOT EXISTS 'pre_validated';
|
|
||||||
RAISE NOTICE 'Added pre_validated to userstatus enum';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'userstatus' AND e.enumlabel = 'canceled'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE userstatus ADD VALUE IF NOT EXISTS 'canceled';
|
|
||||||
RAISE NOTICE 'Added canceled to userstatus enum';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'userstatus' AND e.enumlabel = 'expired'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE userstatus ADD VALUE IF NOT EXISTS 'expired';
|
|
||||||
RAISE NOTICE 'Added expired to userstatus enum';
|
|
||||||
END IF;
|
|
||||||
|
|
||||||
IF NOT EXISTS (
|
|
||||||
SELECT 1 FROM pg_enum e
|
|
||||||
JOIN pg_type t ON e.enumtypid = t.oid
|
|
||||||
WHERE t.typname = 'userstatus' AND e.enumlabel = 'abandoned'
|
|
||||||
) THEN
|
|
||||||
ALTER TYPE userstatus ADD VALUE IF NOT EXISTS 'abandoned';
|
|
||||||
RAISE NOTICE 'Added abandoned to userstatus enum';
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '=== VERIFICATION ==='
|
|
||||||
SELECT
|
|
||||||
(SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'users') as users_columns,
|
|
||||||
(SELECT COUNT(*) FROM information_schema.columns WHERE table_name = 'import_jobs') as import_jobs_columns,
|
|
||||||
(SELECT COUNT(*) FROM pg_enum e JOIN pg_type t ON e.enumtypid = t.oid WHERE t.typname = 'userstatus') as userstatus_values,
|
|
||||||
(SELECT COUNT(*) FROM pg_enum e JOIN pg_type t ON e.enumtypid = t.oid WHERE t.typname = 'importjobstatus') as importjobstatus_values;
|
|
||||||
|
|
||||||
\echo ''
|
|
||||||
\echo '✅ Missing fields have been added!'
|
|
||||||
\echo 'You can now run: alembic stamp head'
|
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
-- ============================================================================
|
|
||||||
-- Seed Data for LOAF Membership Platform
|
|
||||||
-- Run this after creating the database schema
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
BEGIN;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 1: Create Default Roles
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO roles (id, code, name, description, is_system_role, created_at, updated_at)
|
|
||||||
VALUES
|
|
||||||
(gen_random_uuid(), 'guest', 'Guest', 'Default role for new registrations', true, NOW(), NOW()),
|
|
||||||
(gen_random_uuid(), 'member', 'Member', 'Active paying members with full access', true, NOW(), NOW()),
|
|
||||||
(gen_random_uuid(), 'admin', 'Admin', 'Board members with management access', true, NOW(), NOW()),
|
|
||||||
(gen_random_uuid(), 'finance', 'Finance', 'Treasurer role with financial access', true, NOW(), NOW()),
|
|
||||||
(gen_random_uuid(), 'superadmin', 'Super Admin', 'Full system access', true, NOW(), NOW())
|
|
||||||
ON CONFLICT (code) DO NOTHING;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 2: Create Permissions
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO permissions (id, code, name, description, module, created_at)
|
|
||||||
VALUES
|
|
||||||
-- User Management Permissions
|
|
||||||
(gen_random_uuid(), 'users.view', 'View Users', 'View user list and profiles', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.create', 'Create Users', 'Create new users', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.edit', 'Edit Users', 'Edit user information', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.delete', 'Delete Users', 'Delete users', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.approve', 'Approve Users', 'Approve pending memberships', 'users', NOW()),
|
|
||||||
(gen_random_uuid(), 'users.import', 'Import Users', 'Import users from CSV/external sources', 'users', NOW()),
|
|
||||||
|
|
||||||
-- Event Management Permissions
|
|
||||||
(gen_random_uuid(), 'events.view', 'View Events', 'View event list and details', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.create', 'Create Events', 'Create new events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.edit', 'Edit Events', 'Edit event information', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.delete', 'Delete Events', 'Delete events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.publish', 'Publish Events', 'Publish/unpublish events', 'events', NOW()),
|
|
||||||
(gen_random_uuid(), 'events.manage_attendance', 'Manage Attendance', 'Mark event attendance', 'events', NOW()),
|
|
||||||
|
|
||||||
-- Financial Permissions
|
|
||||||
(gen_random_uuid(), 'finance.view', 'View Financial Data', 'View subscriptions and payments', 'finance', NOW()),
|
|
||||||
(gen_random_uuid(), 'finance.manage_plans', 'Manage Subscription Plans', 'Create/edit subscription plans', 'finance', NOW()),
|
|
||||||
(gen_random_uuid(), 'finance.manage_subscriptions', 'Manage Subscriptions', 'Manage user subscriptions', 'finance', NOW()),
|
|
||||||
(gen_random_uuid(), 'finance.view_reports', 'View Financial Reports', 'Access financial reports', 'finance', NOW()),
|
|
||||||
(gen_random_uuid(), 'finance.export', 'Export Financial Data', 'Export financial data', 'finance', NOW()),
|
|
||||||
|
|
||||||
-- Content Management Permissions
|
|
||||||
(gen_random_uuid(), 'content.newsletters', 'Manage Newsletters', 'Manage newsletter archives', 'content', NOW()),
|
|
||||||
(gen_random_uuid(), 'content.documents', 'Manage Documents', 'Manage bylaws and documents', 'content', NOW()),
|
|
||||||
(gen_random_uuid(), 'content.gallery', 'Manage Gallery', 'Manage event galleries', 'content', NOW()),
|
|
||||||
|
|
||||||
-- System Permissions
|
|
||||||
(gen_random_uuid(), 'system.settings', 'System Settings', 'Manage system settings', 'system', NOW()),
|
|
||||||
(gen_random_uuid(), 'system.roles', 'Manage Roles', 'Create/edit roles and permissions', 'system', NOW()),
|
|
||||||
(gen_random_uuid(), 'system.invitations', 'Manage Invitations', 'Send admin invitations', 'system', NOW()),
|
|
||||||
(gen_random_uuid(), 'system.storage', 'Manage Storage', 'View storage usage', 'system', NOW()),
|
|
||||||
(gen_random_uuid(), 'system.audit', 'View Audit Logs', 'View system audit logs', 'system', NOW())
|
|
||||||
ON CONFLICT (code) DO NOTHING;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 3: Assign Permissions to Roles
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
-- Guest Role: No permissions (view-only through public pages)
|
|
||||||
-- No entries needed
|
|
||||||
|
|
||||||
-- Member Role: Limited permissions
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'member',
|
|
||||||
(SELECT id FROM roles WHERE code = 'member'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
'events.view'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Admin Role: Most permissions except financial
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'admin',
|
|
||||||
(SELECT id FROM roles WHERE code = 'admin'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
-- User Management
|
|
||||||
'users.view', 'users.create', 'users.edit', 'users.approve', 'users.import',
|
|
||||||
-- Event Management
|
|
||||||
'events.view', 'events.create', 'events.edit', 'events.delete', 'events.publish', 'events.manage_attendance',
|
|
||||||
-- Content Management
|
|
||||||
'content.newsletters', 'content.documents', 'content.gallery',
|
|
||||||
-- System (limited)
|
|
||||||
'system.invitations', 'system.storage'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Finance Role: Financial permissions + basic access
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'finance',
|
|
||||||
(SELECT id FROM roles WHERE code = 'finance'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
WHERE p.code IN (
|
|
||||||
-- Financial
|
|
||||||
'finance.view', 'finance.manage_plans', 'finance.manage_subscriptions', 'finance.view_reports', 'finance.export',
|
|
||||||
-- Basic Access
|
|
||||||
'users.view', 'events.view'
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- Superadmin Role: All permissions
|
|
||||||
INSERT INTO role_permissions (id, role, role_id, permission_id, created_at)
|
|
||||||
SELECT
|
|
||||||
gen_random_uuid(),
|
|
||||||
'superadmin',
|
|
||||||
(SELECT id FROM roles WHERE code = 'superadmin'),
|
|
||||||
p.id,
|
|
||||||
NOW()
|
|
||||||
FROM permissions p
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 4: Create Subscription Plans
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO subscription_plans (id, name, description, price_cents, billing_cycle, custom_cycle_enabled, minimum_price_cents, allow_donation, is_active, created_at, updated_at)
|
|
||||||
VALUES
|
|
||||||
-- Annual Individual Membership
|
|
||||||
(
|
|
||||||
gen_random_uuid(),
|
|
||||||
'Annual Individual Membership',
|
|
||||||
'Standard annual membership for one person. Includes access to all LOAF events, member directory, and exclusive content.',
|
|
||||||
6000, -- $60.00
|
|
||||||
'annual',
|
|
||||||
false,
|
|
||||||
6000,
|
|
||||||
false,
|
|
||||||
true,
|
|
||||||
NOW(),
|
|
||||||
NOW()
|
|
||||||
),
|
|
||||||
|
|
||||||
-- Annual Group Membership
|
|
||||||
(
|
|
||||||
gen_random_uuid(),
|
|
||||||
'Annual Group Membership',
|
|
||||||
'Annual membership for two people living at the same address. Both members receive full access to all LOAF benefits.',
|
|
||||||
10000, -- $100.00
|
|
||||||
'annual',
|
|
||||||
false,
|
|
||||||
10000,
|
|
||||||
false,
|
|
||||||
true,
|
|
||||||
NOW(),
|
|
||||||
NOW()
|
|
||||||
),
|
|
||||||
|
|
||||||
-- Pay What You Want (with minimum)
|
|
||||||
(
|
|
||||||
gen_random_uuid(),
|
|
||||||
'Pay What You Want Membership',
|
|
||||||
'Choose your own annual membership amount. Minimum $30. Additional contributions help support our scholarship fund.',
|
|
||||||
3000, -- $30.00 minimum
|
|
||||||
'annual',
|
|
||||||
true, -- Allow custom amount
|
|
||||||
3000, -- Minimum $30
|
|
||||||
true, -- Additional amount is treated as donation
|
|
||||||
true,
|
|
||||||
NOW(),
|
|
||||||
NOW()
|
|
||||||
)
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- STEP 5: Initialize Storage Usage (if not already done)
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
INSERT INTO storage_usage (id, total_bytes_used, max_bytes_allowed, last_calculated_at, created_at, updated_at)
|
|
||||||
VALUES (gen_random_uuid(), 0, 107374182400, NOW(), NOW(), NOW()) -- 100GB limit
|
|
||||||
ON CONFLICT DO NOTHING;
|
|
||||||
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
-- ============================================================================
|
|
||||||
-- Success Message
|
|
||||||
-- ============================================================================
|
|
||||||
|
|
||||||
\echo '✅ Seed data created successfully!'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Created:'
|
|
||||||
\echo ' - 5 default roles (guest, member, admin, finance, superadmin)'
|
|
||||||
\echo ' - 25 permissions across 5 modules'
|
|
||||||
\echo ' - Role-permission mappings'
|
|
||||||
\echo ' - 3 subscription plans'
|
|
||||||
\echo ' - Storage usage initialization'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Next steps:'
|
|
||||||
\echo ' 1. Create superadmin user (see instructions below)'
|
|
||||||
\echo ' 2. Configure Stripe price IDs in subscription_plans'
|
|
||||||
\echo ' 3. Start the application'
|
|
||||||
\echo ''
|
|
||||||
\echo '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'
|
|
||||||
\echo 'CREATE SUPERADMIN USER:'
|
|
||||||
\echo '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Generate password hash in Python:'
|
|
||||||
\echo ' python3 -c "import bcrypt; print(bcrypt.hashpw(b\"your-password\", bcrypt.gensalt()).decode())"'
|
|
||||||
\echo ''
|
|
||||||
\echo 'Then run:'
|
|
||||||
\echo ' psql -U postgres -d loaf_new'
|
|
||||||
\echo ''
|
|
||||||
\echo 'INSERT INTO users ('
|
|
||||||
\echo ' id, email, password_hash, first_name, last_name,'
|
|
||||||
\echo ' status, role, email_verified, created_at, updated_at'
|
|
||||||
\echo ') VALUES ('
|
|
||||||
\echo ' gen_random_uuid(),'
|
|
||||||
\echo ' '\''admin@loafmembers.org'\'','
|
|
||||||
\echo ' '\''$2b$12$YOUR_BCRYPT_HASH_HERE'\'','
|
|
||||||
\echo ' '\''Admin'\'','
|
|
||||||
\echo ' '\''User'\'','
|
|
||||||
\echo ' '\''active'\'','
|
|
||||||
\echo ' '\''superadmin'\'','
|
|
||||||
\echo ' true,'
|
|
||||||
\echo ' NOW(),'
|
|
||||||
\echo ' NOW()'
|
|
||||||
\echo ');'
|
|
||||||
\echo ''
|
|
||||||
153
models.py
153
models.py
@@ -44,13 +44,6 @@ class DonationStatus(enum.Enum):
|
|||||||
completed = "completed"
|
completed = "completed"
|
||||||
failed = "failed"
|
failed = "failed"
|
||||||
|
|
||||||
|
|
||||||
class PaymentMethodType(enum.Enum):
|
|
||||||
card = "card"
|
|
||||||
cash = "cash"
|
|
||||||
bank_transfer = "bank_transfer"
|
|
||||||
check = "check"
|
|
||||||
|
|
||||||
class User(Base):
|
class User(Base):
|
||||||
__tablename__ = "users"
|
__tablename__ = "users"
|
||||||
|
|
||||||
@@ -76,7 +69,6 @@ class User(Base):
|
|||||||
role_id = Column(UUID(as_uuid=True), ForeignKey("roles.id"), nullable=True) # New dynamic role FK
|
role_id = Column(UUID(as_uuid=True), ForeignKey("roles.id"), nullable=True) # New dynamic role FK
|
||||||
email_verified = Column(Boolean, default=False)
|
email_verified = Column(Boolean, default=False)
|
||||||
email_verification_token = Column(String, nullable=True)
|
email_verification_token = Column(String, nullable=True)
|
||||||
email_verification_expires = Column(DateTime, nullable=True)
|
|
||||||
newsletter_subscribed = Column(Boolean, default=False)
|
newsletter_subscribed = Column(Boolean, default=False)
|
||||||
|
|
||||||
# Newsletter Publication Preferences (Step 2)
|
# Newsletter Publication Preferences (Step 2)
|
||||||
@@ -138,23 +130,6 @@ class User(Base):
|
|||||||
rejected_at = Column(DateTime(timezone=True), nullable=True, comment="Timestamp when application was rejected")
|
rejected_at = Column(DateTime(timezone=True), nullable=True, comment="Timestamp when application was rejected")
|
||||||
rejected_by = Column(UUID(as_uuid=True), ForeignKey('users.id'), nullable=True, comment="Admin who rejected the application")
|
rejected_by = Column(UUID(as_uuid=True), ForeignKey('users.id'), nullable=True, comment="Admin who rejected the application")
|
||||||
|
|
||||||
# WordPress Import Tracking
|
|
||||||
import_source = Column(String(50), nullable=True, comment="Source of user creation: wordpress, manual, registration")
|
|
||||||
import_job_id = Column(UUID(as_uuid=True), ForeignKey('import_jobs.id'), nullable=True, comment="Import job that created this user")
|
|
||||||
wordpress_user_id = Column(BigInteger, nullable=True, comment="Original WordPress user ID")
|
|
||||||
wordpress_registered_date = Column(DateTime(timezone=True), nullable=True, comment="Original WordPress registration date")
|
|
||||||
|
|
||||||
# Role Change Audit Trail
|
|
||||||
role_changed_at = Column(DateTime(timezone=True), nullable=True, comment="Timestamp when role was last changed")
|
|
||||||
role_changed_by = Column(UUID(as_uuid=True), ForeignKey('users.id', ondelete='SET NULL'), nullable=True, comment="Admin who changed the role")
|
|
||||||
|
|
||||||
# Stripe Customer ID - Centralized for payment method management
|
|
||||||
stripe_customer_id = Column(String, nullable=True, index=True, comment="Stripe Customer ID for payment method management")
|
|
||||||
|
|
||||||
# Dynamic Registration Form - Custom field responses
|
|
||||||
custom_registration_data = Column(JSON, default=dict, nullable=False,
|
|
||||||
comment="Dynamic registration field responses stored as JSON for custom form fields")
|
|
||||||
|
|
||||||
created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
|
created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc))
|
||||||
updated_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
|
updated_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc))
|
||||||
|
|
||||||
@@ -163,53 +138,6 @@ class User(Base):
|
|||||||
events_created = relationship("Event", back_populates="creator")
|
events_created = relationship("Event", back_populates="creator")
|
||||||
rsvps = relationship("EventRSVP", back_populates="user")
|
rsvps = relationship("EventRSVP", back_populates="user")
|
||||||
subscriptions = relationship("Subscription", back_populates="user", foreign_keys="Subscription.user_id")
|
subscriptions = relationship("Subscription", back_populates="user", foreign_keys="Subscription.user_id")
|
||||||
role_changer = relationship("User", foreign_keys=[role_changed_by], remote_side="User.id", post_update=True)
|
|
||||||
payment_methods = relationship("PaymentMethod", back_populates="user", foreign_keys="PaymentMethod.user_id")
|
|
||||||
|
|
||||||
|
|
||||||
class PaymentMethod(Base):
|
|
||||||
"""Stored payment methods for users (Stripe or manual records)"""
|
|
||||||
__tablename__ = "payment_methods"
|
|
||||||
|
|
||||||
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
||||||
user_id = Column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True)
|
|
||||||
|
|
||||||
# Stripe payment method reference
|
|
||||||
stripe_payment_method_id = Column(String, nullable=True, unique=True, index=True, comment="Stripe pm_xxx reference")
|
|
||||||
|
|
||||||
# Card details (stored for display purposes - PCI compliant)
|
|
||||||
card_brand = Column(String(20), nullable=True, comment="Card brand: visa, mastercard, amex, etc.")
|
|
||||||
card_last4 = Column(String(4), nullable=True, comment="Last 4 digits of card")
|
|
||||||
card_exp_month = Column(Integer, nullable=True, comment="Card expiration month")
|
|
||||||
card_exp_year = Column(Integer, nullable=True, comment="Card expiration year")
|
|
||||||
card_funding = Column(String(20), nullable=True, comment="Card funding type: credit, debit, prepaid")
|
|
||||||
|
|
||||||
# Payment type classification
|
|
||||||
payment_type = Column(SQLEnum(PaymentMethodType), default=PaymentMethodType.card, nullable=False)
|
|
||||||
|
|
||||||
# Status flags
|
|
||||||
is_default = Column(Boolean, default=False, nullable=False, comment="Whether this is the default payment method for auto-renewals")
|
|
||||||
is_active = Column(Boolean, default=True, nullable=False, comment="Soft delete flag - False means removed")
|
|
||||||
is_manual = Column(Boolean, default=False, nullable=False, comment="True for manually recorded methods (cash/check)")
|
|
||||||
|
|
||||||
# Manual payment notes (for cash/check records)
|
|
||||||
manual_notes = Column(Text, nullable=True, comment="Admin notes for manual payment methods")
|
|
||||||
|
|
||||||
# Audit trail
|
|
||||||
created_by = Column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="SET NULL"), nullable=True, comment="Admin who added this on behalf of user")
|
|
||||||
created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), nullable=False)
|
|
||||||
updated_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc), nullable=False)
|
|
||||||
|
|
||||||
# Relationships
|
|
||||||
user = relationship("User", back_populates="payment_methods", foreign_keys=[user_id])
|
|
||||||
creator = relationship("User", foreign_keys=[created_by])
|
|
||||||
|
|
||||||
# Composite index for efficient queries
|
|
||||||
__table_args__ = (
|
|
||||||
Index('idx_payment_method_user_default', 'user_id', 'is_default'),
|
|
||||||
Index('idx_payment_method_active', 'user_id', 'is_active'),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class Event(Base):
|
class Event(Base):
|
||||||
__tablename__ = "events"
|
__tablename__ = "events"
|
||||||
@@ -298,15 +226,6 @@ class Subscription(Base):
|
|||||||
donation_cents = Column(Integer, default=0, nullable=False) # Additional donation amount
|
donation_cents = Column(Integer, default=0, nullable=False) # Additional donation amount
|
||||||
# Note: amount_paid_cents = base_subscription_cents + donation_cents
|
# Note: amount_paid_cents = base_subscription_cents + donation_cents
|
||||||
|
|
||||||
# Stripe transaction metadata (for validation and audit)
|
|
||||||
stripe_payment_intent_id = Column(String, nullable=True, index=True) # Initial payment transaction ID
|
|
||||||
stripe_charge_id = Column(String, nullable=True, index=True) # Actual charge reference
|
|
||||||
stripe_invoice_id = Column(String, nullable=True, index=True) # Invoice reference
|
|
||||||
payment_completed_at = Column(DateTime(timezone=True), nullable=True) # Exact payment timestamp from Stripe
|
|
||||||
card_last4 = Column(String(4), nullable=True) # Last 4 digits of card
|
|
||||||
card_brand = Column(String(20), nullable=True) # Visa, Mastercard, etc.
|
|
||||||
stripe_receipt_url = Column(String, nullable=True) # Link to Stripe receipt
|
|
||||||
|
|
||||||
# Manual payment fields
|
# Manual payment fields
|
||||||
manual_payment = Column(Boolean, default=False, nullable=False) # Whether this was a manual offline payment
|
manual_payment = Column(Boolean, default=False, nullable=False) # Whether this was a manual offline payment
|
||||||
manual_payment_notes = Column(Text, nullable=True) # Admin notes about the payment
|
manual_payment_notes = Column(Text, nullable=True) # Admin notes about the payment
|
||||||
@@ -338,17 +257,9 @@ class Donation(Base):
|
|||||||
|
|
||||||
# Payment details
|
# Payment details
|
||||||
stripe_checkout_session_id = Column(String, nullable=True)
|
stripe_checkout_session_id = Column(String, nullable=True)
|
||||||
stripe_payment_intent_id = Column(String, nullable=True, index=True)
|
stripe_payment_intent_id = Column(String, nullable=True)
|
||||||
payment_method = Column(String, nullable=True) # card, bank_transfer, etc.
|
payment_method = Column(String, nullable=True) # card, bank_transfer, etc.
|
||||||
|
|
||||||
# Stripe transaction metadata (for validation and audit)
|
|
||||||
stripe_charge_id = Column(String, nullable=True, index=True) # Actual charge reference
|
|
||||||
stripe_customer_id = Column(String, nullable=True, index=True) # Customer ID if created
|
|
||||||
payment_completed_at = Column(DateTime(timezone=True), nullable=True) # Exact payment timestamp from Stripe
|
|
||||||
card_last4 = Column(String(4), nullable=True) # Last 4 digits of card
|
|
||||||
card_brand = Column(String(20), nullable=True) # Visa, Mastercard, etc.
|
|
||||||
stripe_receipt_url = Column(String, nullable=True) # Link to Stripe receipt
|
|
||||||
|
|
||||||
# Metadata
|
# Metadata
|
||||||
notes = Column(Text, nullable=True)
|
notes = Column(Text, nullable=True)
|
||||||
created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
|
created_at = Column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
|
||||||
@@ -540,9 +451,6 @@ class ImportJobStatus(enum.Enum):
|
|||||||
completed = "completed"
|
completed = "completed"
|
||||||
failed = "failed"
|
failed = "failed"
|
||||||
partial = "partial"
|
partial = "partial"
|
||||||
validating = "validating"
|
|
||||||
preview_ready = "preview_ready"
|
|
||||||
rolled_back = "rolled_back"
|
|
||||||
|
|
||||||
class ImportJob(Base):
|
class ImportJob(Base):
|
||||||
"""Track CSV import jobs with error handling"""
|
"""Track CSV import jobs with error handling"""
|
||||||
@@ -558,13 +466,6 @@ class ImportJob(Base):
|
|||||||
status = Column(SQLEnum(ImportJobStatus), default=ImportJobStatus.processing, nullable=False)
|
status = Column(SQLEnum(ImportJobStatus), default=ImportJobStatus.processing, nullable=False)
|
||||||
errors = Column(JSON, default=list, nullable=False) # [{row: 5, field: "email", error: "Invalid format"}]
|
errors = Column(JSON, default=list, nullable=False) # [{row: 5, field: "email", error: "Invalid format"}]
|
||||||
|
|
||||||
# WordPress import enhancements
|
|
||||||
field_mapping = Column(JSON, default=dict, nullable=False) # Maps CSV columns to DB fields
|
|
||||||
wordpress_metadata = Column(JSON, default=dict, nullable=False) # Preview data, validation results
|
|
||||||
imported_user_ids = Column(JSON, default=list, nullable=False) # User IDs for rollback
|
|
||||||
rollback_at = Column(DateTime, nullable=True)
|
|
||||||
rollback_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
|
|
||||||
|
|
||||||
# Tracking
|
# Tracking
|
||||||
imported_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
imported_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
||||||
started_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
|
started_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
|
||||||
@@ -572,55 +473,3 @@ class ImportJob(Base):
|
|||||||
|
|
||||||
# Relationships
|
# Relationships
|
||||||
importer = relationship("User", foreign_keys=[imported_by])
|
importer = relationship("User", foreign_keys=[imported_by])
|
||||||
rollback_user = relationship("User", foreign_keys=[rollback_by])
|
|
||||||
|
|
||||||
|
|
||||||
class ImportRollbackAudit(Base):
|
|
||||||
"""Audit trail for import rollback operations"""
|
|
||||||
__tablename__ = "import_rollback_audit"
|
|
||||||
|
|
||||||
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
||||||
import_job_id = Column(UUID(as_uuid=True), ForeignKey("import_jobs.id"), nullable=False)
|
|
||||||
rolled_back_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False)
|
|
||||||
rolled_back_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
|
|
||||||
deleted_user_count = Column(Integer, nullable=False)
|
|
||||||
deleted_user_ids = Column(JSON, nullable=False) # List of deleted user UUIDs
|
|
||||||
reason = Column(Text, nullable=True)
|
|
||||||
created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
|
|
||||||
|
|
||||||
# Relationships
|
|
||||||
import_job = relationship("ImportJob")
|
|
||||||
admin_user = relationship("User", foreign_keys=[rolled_back_by])
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================
|
|
||||||
# System Settings Models
|
|
||||||
# ============================================================
|
|
||||||
|
|
||||||
class SettingType(enum.Enum):
|
|
||||||
plaintext = "plaintext"
|
|
||||||
encrypted = "encrypted"
|
|
||||||
json = "json"
|
|
||||||
|
|
||||||
|
|
||||||
class SystemSettings(Base):
|
|
||||||
"""System-wide configuration settings stored in database"""
|
|
||||||
__tablename__ = "system_settings"
|
|
||||||
|
|
||||||
id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
||||||
setting_key = Column(String(100), unique=True, nullable=False, index=True)
|
|
||||||
setting_value = Column(Text, nullable=True)
|
|
||||||
setting_type = Column(SQLEnum(SettingType), default=SettingType.plaintext, nullable=False)
|
|
||||||
description = Column(Text, nullable=True)
|
|
||||||
updated_by = Column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="SET NULL"), nullable=True)
|
|
||||||
created_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), nullable=False)
|
|
||||||
updated_at = Column(DateTime, default=lambda: datetime.now(timezone.utc), onupdate=lambda: datetime.now(timezone.utc), nullable=False)
|
|
||||||
is_sensitive = Column(Boolean, default=False, nullable=False)
|
|
||||||
|
|
||||||
# Relationships
|
|
||||||
updater = relationship("User", foreign_keys=[updated_by])
|
|
||||||
|
|
||||||
# Index on updated_at for audit queries
|
|
||||||
__table_args__ = (
|
|
||||||
Index('idx_system_settings_updated_at', 'updated_at'),
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -11,9 +11,11 @@ from datetime import datetime, timezone, timedelta
|
|||||||
# Load environment variables
|
# Load environment variables
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
|
||||||
# NOTE: Stripe credentials are now database-driven
|
# Initialize Stripe with secret key
|
||||||
# These .env fallbacks are kept for backward compatibility only
|
stripe.api_key = os.getenv("STRIPE_SECRET_KEY")
|
||||||
# The actual credentials are loaded dynamically from system_settings table
|
|
||||||
|
# Stripe webhook secret for signature verification
|
||||||
|
STRIPE_WEBHOOK_SECRET = os.getenv("STRIPE_WEBHOOK_SECRET")
|
||||||
|
|
||||||
def create_checkout_session(
|
def create_checkout_session(
|
||||||
user_id: str,
|
user_id: str,
|
||||||
@@ -21,15 +23,11 @@ def create_checkout_session(
|
|||||||
plan_id: str,
|
plan_id: str,
|
||||||
stripe_price_id: str,
|
stripe_price_id: str,
|
||||||
success_url: str,
|
success_url: str,
|
||||||
cancel_url: str,
|
cancel_url: str
|
||||||
db = None
|
|
||||||
):
|
):
|
||||||
"""
|
"""
|
||||||
Create a Stripe Checkout session for subscription payment.
|
Create a Stripe Checkout session for subscription payment.
|
||||||
|
|
||||||
Args:
|
|
||||||
db: Database session (optional, for reading Stripe credentials from database)
|
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
user_id: User's UUID
|
user_id: User's UUID
|
||||||
user_email: User's email address
|
user_email: User's email address
|
||||||
@@ -41,28 +39,6 @@ def create_checkout_session(
|
|||||||
Returns:
|
Returns:
|
||||||
dict: Checkout session object with session ID and URL
|
dict: Checkout session object with session ID and URL
|
||||||
"""
|
"""
|
||||||
# Load Stripe API key from database if available
|
|
||||||
if db:
|
|
||||||
try:
|
|
||||||
# Import here to avoid circular dependency
|
|
||||||
from models import SystemSettings, SettingType
|
|
||||||
from encryption_service import get_encryption_service
|
|
||||||
|
|
||||||
setting = db.query(SystemSettings).filter(
|
|
||||||
SystemSettings.setting_key == 'stripe_secret_key'
|
|
||||||
).first()
|
|
||||||
|
|
||||||
if setting and setting.setting_value:
|
|
||||||
encryption_service = get_encryption_service()
|
|
||||||
stripe.api_key = encryption_service.decrypt(setting.setting_value)
|
|
||||||
except Exception as e:
|
|
||||||
# Fallback to .env if database read fails
|
|
||||||
print(f"Failed to read Stripe key from database: {e}")
|
|
||||||
stripe.api_key = os.getenv("STRIPE_SECRET_KEY")
|
|
||||||
else:
|
|
||||||
# Fallback to .env if no db session
|
|
||||||
stripe.api_key = os.getenv("STRIPE_SECRET_KEY")
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Create Checkout Session
|
# Create Checkout Session
|
||||||
checkout_session = stripe.checkout.Session.create(
|
checkout_session = stripe.checkout.Session.create(
|
||||||
@@ -98,14 +74,13 @@ def create_checkout_session(
|
|||||||
raise Exception(f"Stripe error: {str(e)}")
|
raise Exception(f"Stripe error: {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
def verify_webhook_signature(payload: bytes, sig_header: str, db=None) -> dict:
|
def verify_webhook_signature(payload: bytes, sig_header: str) -> dict:
|
||||||
"""
|
"""
|
||||||
Verify Stripe webhook signature and construct event.
|
Verify Stripe webhook signature and construct event.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
payload: Raw webhook payload bytes
|
payload: Raw webhook payload bytes
|
||||||
sig_header: Stripe signature header
|
sig_header: Stripe signature header
|
||||||
db: Database session (optional, for reading webhook secret from database)
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
dict: Verified webhook event
|
dict: Verified webhook event
|
||||||
@@ -113,32 +88,9 @@ def verify_webhook_signature(payload: bytes, sig_header: str, db=None) -> dict:
|
|||||||
Raises:
|
Raises:
|
||||||
ValueError: If signature verification fails
|
ValueError: If signature verification fails
|
||||||
"""
|
"""
|
||||||
# Load webhook secret from database if available
|
|
||||||
webhook_secret = None
|
|
||||||
if db:
|
|
||||||
try:
|
|
||||||
from models import SystemSettings
|
|
||||||
from encryption_service import get_encryption_service
|
|
||||||
|
|
||||||
setting = db.query(SystemSettings).filter(
|
|
||||||
SystemSettings.setting_key == 'stripe_webhook_secret'
|
|
||||||
).first()
|
|
||||||
|
|
||||||
if setting and setting.setting_value:
|
|
||||||
encryption_service = get_encryption_service()
|
|
||||||
webhook_secret = encryption_service.decrypt(setting.setting_value)
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Failed to read webhook secret from database: {e}")
|
|
||||||
webhook_secret = os.getenv("STRIPE_WEBHOOK_SECRET")
|
|
||||||
else:
|
|
||||||
webhook_secret = os.getenv("STRIPE_WEBHOOK_SECRET")
|
|
||||||
|
|
||||||
if not webhook_secret:
|
|
||||||
raise ValueError("STRIPE_WEBHOOK_SECRET not configured")
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
event = stripe.Webhook.construct_event(
|
event = stripe.Webhook.construct_event(
|
||||||
payload, sig_header, webhook_secret
|
payload, sig_header, STRIPE_WEBHOOK_SECRET
|
||||||
)
|
)
|
||||||
return event
|
return event
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
|
|||||||
@@ -327,38 +327,6 @@ PERMISSIONS = [
|
|||||||
"module": "gallery"
|
"module": "gallery"
|
||||||
},
|
},
|
||||||
|
|
||||||
# ========== PAYMENT METHODS MODULE ==========
|
|
||||||
{
|
|
||||||
"code": "payment_methods.view",
|
|
||||||
"name": "View Payment Methods",
|
|
||||||
"description": "View user payment methods (masked)",
|
|
||||||
"module": "payment_methods"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "payment_methods.view_sensitive",
|
|
||||||
"name": "View Sensitive Payment Details",
|
|
||||||
"description": "View full payment method details including Stripe IDs (requires password)",
|
|
||||||
"module": "payment_methods"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "payment_methods.create",
|
|
||||||
"name": "Create Payment Methods",
|
|
||||||
"description": "Add payment methods on behalf of users",
|
|
||||||
"module": "payment_methods"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "payment_methods.delete",
|
|
||||||
"name": "Delete Payment Methods",
|
|
||||||
"description": "Delete user payment methods",
|
|
||||||
"module": "payment_methods"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "payment_methods.set_default",
|
|
||||||
"name": "Set Default Payment Method",
|
|
||||||
"description": "Set a user's default payment method",
|
|
||||||
"module": "payment_methods"
|
|
||||||
},
|
|
||||||
|
|
||||||
# ========== SETTINGS MODULE ==========
|
# ========== SETTINGS MODULE ==========
|
||||||
{
|
{
|
||||||
"code": "settings.view",
|
"code": "settings.view",
|
||||||
@@ -485,10 +453,6 @@ DEFAULT_ROLE_PERMISSIONS = {
|
|||||||
"gallery.edit",
|
"gallery.edit",
|
||||||
"gallery.delete",
|
"gallery.delete",
|
||||||
"gallery.moderate",
|
"gallery.moderate",
|
||||||
"payment_methods.view",
|
|
||||||
"payment_methods.create",
|
|
||||||
"payment_methods.delete",
|
|
||||||
"payment_methods.set_default",
|
|
||||||
"settings.view",
|
"settings.view",
|
||||||
"settings.edit",
|
"settings.edit",
|
||||||
"settings.email_templates",
|
"settings.email_templates",
|
||||||
@@ -496,36 +460,6 @@ DEFAULT_ROLE_PERMISSIONS = {
|
|||||||
"settings.logs",
|
"settings.logs",
|
||||||
],
|
],
|
||||||
|
|
||||||
UserRole.finance: [
|
|
||||||
# Finance role has all admin permissions plus sensitive payment access
|
|
||||||
"users.view",
|
|
||||||
"users.export",
|
|
||||||
"events.view",
|
|
||||||
"events.rsvps",
|
|
||||||
"events.calendar_export",
|
|
||||||
"subscriptions.view",
|
|
||||||
"subscriptions.create",
|
|
||||||
"subscriptions.edit",
|
|
||||||
"subscriptions.cancel",
|
|
||||||
"subscriptions.activate",
|
|
||||||
"subscriptions.plans",
|
|
||||||
"financials.view",
|
|
||||||
"financials.create",
|
|
||||||
"financials.edit",
|
|
||||||
"financials.delete",
|
|
||||||
"financials.export",
|
|
||||||
"financials.payments",
|
|
||||||
"newsletters.view",
|
|
||||||
"bylaws.view",
|
|
||||||
"gallery.view",
|
|
||||||
"payment_methods.view",
|
|
||||||
"payment_methods.view_sensitive", # Finance can view sensitive payment details
|
|
||||||
"payment_methods.create",
|
|
||||||
"payment_methods.delete",
|
|
||||||
"payment_methods.set_default",
|
|
||||||
"settings.view",
|
|
||||||
],
|
|
||||||
|
|
||||||
# Superadmin gets all permissions automatically in code,
|
# Superadmin gets all permissions automatically in code,
|
||||||
# so we don't need to explicitly assign them
|
# so we don't need to explicitly assign them
|
||||||
UserRole.superadmin: []
|
UserRole.superadmin: []
|
||||||
|
|||||||
@@ -35,21 +35,6 @@ class R2Storage:
|
|||||||
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx']
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': ['.xlsx']
|
||||||
}
|
}
|
||||||
|
|
||||||
# Branding assets (logo and favicon)
|
|
||||||
ALLOWED_BRANDING_TYPES = {
|
|
||||||
'image/jpeg': ['.jpg', '.jpeg'],
|
|
||||||
'image/png': ['.png'],
|
|
||||||
'image/webp': ['.webp'],
|
|
||||||
'image/svg+xml': ['.svg']
|
|
||||||
}
|
|
||||||
|
|
||||||
ALLOWED_FAVICON_TYPES = {
|
|
||||||
'image/x-icon': ['.ico'],
|
|
||||||
'image/vnd.microsoft.icon': ['.ico'],
|
|
||||||
'image/png': ['.png'],
|
|
||||||
'image/svg+xml': ['.svg']
|
|
||||||
}
|
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
"""Initialize R2 client with credentials from environment"""
|
"""Initialize R2 client with credentials from environment"""
|
||||||
self.account_id = os.getenv('R2_ACCOUNT_ID')
|
self.account_id = os.getenv('R2_ACCOUNT_ID')
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
aiosmtplib==5.0.0
|
aiosmtplib==5.0.0
|
||||||
alembic==1.14.0
|
|
||||||
annotated-types==0.7.0
|
annotated-types==0.7.0
|
||||||
anyio==4.11.0
|
anyio==4.11.0
|
||||||
bcrypt==4.1.3
|
bcrypt==4.1.3
|
||||||
@@ -38,7 +37,6 @@ pandas==2.3.3
|
|||||||
passlib==1.7.4
|
passlib==1.7.4
|
||||||
pathspec==0.12.1
|
pathspec==0.12.1
|
||||||
pillow==10.2.0
|
pillow==10.2.0
|
||||||
phpserialize==1.3
|
|
||||||
platformdirs==4.5.0
|
platformdirs==4.5.0
|
||||||
pluggy==1.6.0
|
pluggy==1.6.0
|
||||||
psycopg2-binary==2.9.11
|
psycopg2-binary==2.9.11
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"""
|
"""
|
||||||
Permission Seeding Script for Dynamic RBAC System
|
Permission Seeding Script for Dynamic RBAC System
|
||||||
|
|
||||||
This script populates the database with 65 granular permissions and assigns them
|
This script populates the database with 59 granular permissions and assigns them
|
||||||
to the appropriate dynamic roles (not the old enum roles).
|
to the appropriate dynamic roles (not the old enum roles).
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
@@ -33,7 +33,7 @@ engine = create_engine(DATABASE_URL)
|
|||||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||||
|
|
||||||
# ============================================================
|
# ============================================================
|
||||||
# Permission Definitions (65 permissions across 11 modules)
|
# Permission Definitions (59 permissions across 10 modules)
|
||||||
# ============================================================
|
# ============================================================
|
||||||
|
|
||||||
PERMISSIONS = [
|
PERMISSIONS = [
|
||||||
@@ -116,55 +116,6 @@ PERMISSIONS = [
|
|||||||
{"code": "permissions.assign", "name": "Assign Permissions", "description": "Assign permissions to roles", "module": "permissions"},
|
{"code": "permissions.assign", "name": "Assign Permissions", "description": "Assign permissions to roles", "module": "permissions"},
|
||||||
{"code": "permissions.manage_roles", "name": "Manage Roles", "description": "Create and manage user roles", "module": "permissions"},
|
{"code": "permissions.manage_roles", "name": "Manage Roles", "description": "Create and manage user roles", "module": "permissions"},
|
||||||
{"code": "permissions.audit", "name": "View Permission Audit Log", "description": "View permission change audit logs", "module": "permissions"},
|
{"code": "permissions.audit", "name": "View Permission Audit Log", "description": "View permission change audit logs", "module": "permissions"},
|
||||||
|
|
||||||
# ========== PAYMENT METHODS MODULE (5) ==========
|
|
||||||
{"code": "payment_methods.view", "name": "View Payment Methods", "description": "View user payment methods (masked)", "module": "payment_methods"},
|
|
||||||
{"code": "payment_methods.view_sensitive", "name": "View Sensitive Payment Details", "description": "View full Stripe payment method IDs (requires password)", "module": "payment_methods"},
|
|
||||||
{"code": "payment_methods.create", "name": "Create Payment Methods", "description": "Add payment methods on behalf of users", "module": "payment_methods"},
|
|
||||||
{"code": "payment_methods.delete", "name": "Delete Payment Methods", "description": "Remove user payment methods", "module": "payment_methods"},
|
|
||||||
{"code": "payment_methods.set_default", "name": "Set Default Payment Method", "description": "Set default payment method for users", "module": "payment_methods"},
|
|
||||||
|
|
||||||
# ========== REGISTRATION MODULE (2) ==========
|
|
||||||
{"code": "registration.view", "name": "View Registration Settings", "description": "View registration form schema and settings", "module": "registration"},
|
|
||||||
{"code": "registration.manage", "name": "Manage Registration Form", "description": "Edit registration form schema, steps, and fields", "module": "registration"},
|
|
||||||
|
|
||||||
# ========== DIRECTORY MODULE (2) ==========
|
|
||||||
{"code": "directory.view", "name": "View Directory Settings", "description": "View member directory field configuration", "module": "directory"},
|
|
||||||
{"code": "directory.manage", "name": "Manage Directory Fields", "description": "Enable/disable directory fields shown in Profile and Directory pages", "module": "directory"},
|
|
||||||
]
|
|
||||||
|
|
||||||
# Default system roles that must exist
|
|
||||||
DEFAULT_ROLES = [
|
|
||||||
{
|
|
||||||
"code": "guest",
|
|
||||||
"name": "Guest",
|
|
||||||
"description": "Default role for new registrations with no special permissions",
|
|
||||||
"is_system_role": True
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "member",
|
|
||||||
"name": "Member",
|
|
||||||
"description": "Active paying members with access to member-only content",
|
|
||||||
"is_system_role": True
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "finance",
|
|
||||||
"name": "Finance",
|
|
||||||
"description": "Financial management role with access to payments, subscriptions, and reports",
|
|
||||||
"is_system_role": True
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "admin",
|
|
||||||
"name": "Admin",
|
|
||||||
"description": "Board members with full management access except RBAC",
|
|
||||||
"is_system_role": True
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "superadmin",
|
|
||||||
"name": "Superadmin",
|
|
||||||
"description": "Full system access including RBAC management",
|
|
||||||
"is_system_role": True
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# Default permission assignments for dynamic roles
|
# Default permission assignments for dynamic roles
|
||||||
@@ -185,9 +136,6 @@ DEFAULT_ROLE_PERMISSIONS = {
|
|||||||
"subscriptions.cancel", "subscriptions.activate", "subscriptions.plans",
|
"subscriptions.cancel", "subscriptions.activate", "subscriptions.plans",
|
||||||
"subscriptions.export",
|
"subscriptions.export",
|
||||||
"donations.view", "donations.export",
|
"donations.view", "donations.export",
|
||||||
# Payment methods - finance can view sensitive details
|
|
||||||
"payment_methods.view", "payment_methods.view_sensitive",
|
|
||||||
"payment_methods.create", "payment_methods.delete", "payment_methods.set_default",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
"admin": [
|
"admin": [
|
||||||
@@ -209,13 +157,6 @@ DEFAULT_ROLE_PERMISSIONS = {
|
|||||||
"gallery.view", "gallery.upload", "gallery.edit", "gallery.delete", "gallery.moderate",
|
"gallery.view", "gallery.upload", "gallery.edit", "gallery.delete", "gallery.moderate",
|
||||||
"settings.view", "settings.edit", "settings.email_templates", "settings.storage",
|
"settings.view", "settings.edit", "settings.email_templates", "settings.storage",
|
||||||
"settings.logs",
|
"settings.logs",
|
||||||
# Payment methods - admin can manage but not view sensitive details
|
|
||||||
"payment_methods.view", "payment_methods.create",
|
|
||||||
"payment_methods.delete", "payment_methods.set_default",
|
|
||||||
# Registration form management
|
|
||||||
"registration.view", "registration.manage",
|
|
||||||
# Directory configuration
|
|
||||||
"directory.view", "directory.manage",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
"superadmin": [
|
"superadmin": [
|
||||||
@@ -255,34 +196,7 @@ def seed_permissions():
|
|||||||
print(f"\n⚠️ WARNING: Tables not fully cleared! Stopping.")
|
print(f"\n⚠️ WARNING: Tables not fully cleared! Stopping.")
|
||||||
return
|
return
|
||||||
|
|
||||||
# Step 2: Create default system roles
|
# Step 2: Create permissions
|
||||||
print(f"\n👤 Creating {len(DEFAULT_ROLES)} system roles...")
|
|
||||||
role_map = {}
|
|
||||||
|
|
||||||
for role_data in DEFAULT_ROLES:
|
|
||||||
# Check if role already exists
|
|
||||||
existing_role = db.query(Role).filter(Role.code == role_data["code"]).first()
|
|
||||||
if existing_role:
|
|
||||||
print(f" • {role_data['name']}: Already exists, updating...")
|
|
||||||
existing_role.name = role_data["name"]
|
|
||||||
existing_role.description = role_data["description"]
|
|
||||||
existing_role.is_system_role = role_data["is_system_role"]
|
|
||||||
role_map[role_data["code"]] = existing_role
|
|
||||||
else:
|
|
||||||
print(f" • {role_data['name']}: Creating...")
|
|
||||||
role = Role(
|
|
||||||
code=role_data["code"],
|
|
||||||
name=role_data["name"],
|
|
||||||
description=role_data["description"],
|
|
||||||
is_system_role=role_data["is_system_role"]
|
|
||||||
)
|
|
||||||
db.add(role)
|
|
||||||
role_map[role_data["code"]] = role
|
|
||||||
|
|
||||||
db.commit()
|
|
||||||
print(f"✓ Created/updated {len(DEFAULT_ROLES)} system roles")
|
|
||||||
|
|
||||||
# Step 3: Create permissions
|
|
||||||
print(f"\n📝 Creating {len(PERMISSIONS)} permissions...")
|
print(f"\n📝 Creating {len(PERMISSIONS)} permissions...")
|
||||||
permission_map = {} # Map code to permission object
|
permission_map = {} # Map code to permission object
|
||||||
|
|
||||||
@@ -299,13 +213,13 @@ def seed_permissions():
|
|||||||
db.commit()
|
db.commit()
|
||||||
print(f"✓ Created {len(PERMISSIONS)} permissions")
|
print(f"✓ Created {len(PERMISSIONS)} permissions")
|
||||||
|
|
||||||
# Step 4: Verify roles exist
|
# Step 3: Get all roles from database
|
||||||
print("\n🔍 Verifying dynamic roles...")
|
print("\n🔍 Fetching dynamic roles...")
|
||||||
roles = db.query(Role).all()
|
roles = db.query(Role).all()
|
||||||
role_map = {role.code: role for role in roles}
|
role_map = {role.code: role for role in roles}
|
||||||
print(f"✓ Found {len(roles)} roles: {', '.join(role_map.keys())}")
|
print(f"✓ Found {len(roles)} roles: {', '.join(role_map.keys())}")
|
||||||
|
|
||||||
# Step 5: Assign permissions to roles
|
# Step 4: Assign permissions to roles
|
||||||
print("\n🔐 Assigning permissions to roles...")
|
print("\n🔐 Assigning permissions to roles...")
|
||||||
|
|
||||||
from models import UserRole # Import for enum mapping
|
from models import UserRole # Import for enum mapping
|
||||||
@@ -344,7 +258,7 @@ def seed_permissions():
|
|||||||
db.commit()
|
db.commit()
|
||||||
print(f" ✓ {role.name}: Assigned {len(permission_codes)} permissions")
|
print(f" ✓ {role.name}: Assigned {len(permission_codes)} permissions")
|
||||||
|
|
||||||
# Step 6: Summary
|
# Step 5: Summary
|
||||||
print("\n" + "=" * 80)
|
print("\n" + "=" * 80)
|
||||||
print("📊 SEEDING SUMMARY")
|
print("📊 SEEDING SUMMARY")
|
||||||
print("=" * 80)
|
print("=" * 80)
|
||||||
@@ -359,8 +273,7 @@ def seed_permissions():
|
|||||||
for module, count in sorted(modules.items()):
|
for module, count in sorted(modules.items()):
|
||||||
print(f" • {module.capitalize()}: {count} permissions")
|
print(f" • {module.capitalize()}: {count} permissions")
|
||||||
|
|
||||||
print(f"\nTotal system roles created: {len(DEFAULT_ROLES)}")
|
print(f"\nTotal permissions created: {len(PERMISSIONS)}")
|
||||||
print(f"Total permissions created: {len(PERMISSIONS)}")
|
|
||||||
print(f"Total role-permission mappings: {total_assigned}")
|
print(f"Total role-permission mappings: {total_assigned}")
|
||||||
print("\n✅ Permission seeding completed successfully!")
|
print("\n✅ Permission seeding completed successfully!")
|
||||||
print("\nNext step: Restart backend server")
|
print("\nNext step: Restart backend server")
|
||||||
|
|||||||
@@ -1,531 +0,0 @@
|
|||||||
"""
|
|
||||||
WordPress CSV Parser Module
|
|
||||||
|
|
||||||
This module provides utilities for parsing WordPress user export CSV files
|
|
||||||
and transforming them into LOAF platform-compatible data structures.
|
|
||||||
|
|
||||||
Key Features:
|
|
||||||
- Parse PHP serialized data (WordPress capabilities)
|
|
||||||
- Map WordPress roles to LOAF roles and statuses
|
|
||||||
- Validate and standardize user data (DOB, phone numbers)
|
|
||||||
- Generate smart status suggestions based on approval and subscription data
|
|
||||||
- Comprehensive data quality analysis and error reporting
|
|
||||||
|
|
||||||
Author: Claude Code
|
|
||||||
Date: 2025-12-24
|
|
||||||
"""
|
|
||||||
|
|
||||||
import csv
|
|
||||||
import re
|
|
||||||
import logging
|
|
||||||
from datetime import datetime
|
|
||||||
from typing import Dict, List, Optional, Tuple
|
|
||||||
import phpserialize
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# WordPress Role Mapping Configuration
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
ROLE_MAPPING = {
|
|
||||||
# WordPress admin roles → LOAF admin roles (auto-active)
|
|
||||||
'administrator': ('superadmin', 'active'),
|
|
||||||
'loaf_admin': ('admin', 'active'),
|
|
||||||
'loaf_treasure': ('finance', 'active'),
|
|
||||||
'loaf_communication': ('admin', 'active'),
|
|
||||||
|
|
||||||
# WordPress member roles → LOAF member role (status from approval)
|
|
||||||
'pms_subscription_plan_63': ('member', None), # Status determined by approval
|
|
||||||
'registered': ('guest', None), # Default WordPress role
|
|
||||||
|
|
||||||
# Fallback for unknown roles
|
|
||||||
'__default__': ('guest', None)
|
|
||||||
}
|
|
||||||
|
|
||||||
# Role priority order (higher index = higher priority)
|
|
||||||
ROLE_PRIORITY = [
|
|
||||||
'registered',
|
|
||||||
'pms_subscription_plan_63',
|
|
||||||
'loaf_communication',
|
|
||||||
'loaf_treasure',
|
|
||||||
'loaf_admin',
|
|
||||||
'administrator'
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# PHP Serialization Parsing
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def parse_php_serialized(data: str) -> List[str]:
|
|
||||||
"""
|
|
||||||
Parse WordPress PHP serialized capabilities string.
|
|
||||||
|
|
||||||
WordPress stores user capabilities as serialized PHP arrays like:
|
|
||||||
a:1:{s:10:"registered";b:1;}
|
|
||||||
a:2:{s:10:"registered";b:1;s:24:"pms_subscription_plan_63";b:1;}
|
|
||||||
|
|
||||||
Args:
|
|
||||||
data: PHP serialized string
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List of role names (e.g., ['registered', 'pms_subscription_plan_63'])
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
>>> parse_php_serialized('a:1:{s:10:"registered";b:1;}')
|
|
||||||
['registered']
|
|
||||||
>>> parse_php_serialized('a:2:{s:10:"registered";b:1;s:24:"pms_subscription_plan_63";b:1;}')
|
|
||||||
['registered', 'pms_subscription_plan_63']
|
|
||||||
"""
|
|
||||||
if not data or pd.isna(data):
|
|
||||||
return []
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Use phpserialize library to parse
|
|
||||||
parsed = phpserialize.loads(data.encode('utf-8'))
|
|
||||||
|
|
||||||
# Extract role names (keys where value is True)
|
|
||||||
if isinstance(parsed, dict):
|
|
||||||
roles = [key.decode('utf-8') if isinstance(key, bytes) else key
|
|
||||||
for key, value in parsed.items() if value]
|
|
||||||
return roles
|
|
||||||
|
|
||||||
return []
|
|
||||||
except Exception as e:
|
|
||||||
logger.warning(f"Failed to parse PHP serialized data: {data[:50]}... Error: {str(e)}")
|
|
||||||
return []
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Role and Status Mapping
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def map_wordpress_role(wp_roles: List[str]) -> Tuple[str, Optional[str]]:
|
|
||||||
"""
|
|
||||||
Map WordPress roles to LOAF role and suggested status.
|
|
||||||
|
|
||||||
Priority logic:
|
|
||||||
1. If user has any admin role → corresponding LOAF admin role with 'active' status
|
|
||||||
2. If user has subscription → 'member' role (status from approval)
|
|
||||||
3. Otherwise → 'guest' role (status from approval)
|
|
||||||
|
|
||||||
Args:
|
|
||||||
wp_roles: List of WordPress role names
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple of (loaf_role, suggested_status)
|
|
||||||
- loaf_role: One of: superadmin, admin, finance, member, guest
|
|
||||||
- suggested_status: One of: active, pre_validated, payment_pending, None (determined by approval)
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
>>> map_wordpress_role(['loaf_admin'])
|
|
||||||
('admin', 'active')
|
|
||||||
>>> map_wordpress_role(['loaf_treasure'])
|
|
||||||
('finance', 'active')
|
|
||||||
>>> map_wordpress_role(['pms_subscription_plan_63', 'registered'])
|
|
||||||
('member', None)
|
|
||||||
>>> map_wordpress_role(['registered'])
|
|
||||||
('guest', None)
|
|
||||||
"""
|
|
||||||
if not wp_roles:
|
|
||||||
return ROLE_MAPPING['__default__']
|
|
||||||
|
|
||||||
# Sort roles by priority (highest priority last)
|
|
||||||
prioritized_roles = sorted(
|
|
||||||
wp_roles,
|
|
||||||
key=lambda r: ROLE_PRIORITY.index(r) if r in ROLE_PRIORITY else -1
|
|
||||||
)
|
|
||||||
|
|
||||||
# Map highest priority role
|
|
||||||
highest_role = prioritized_roles[-1] if prioritized_roles else 'registered'
|
|
||||||
return ROLE_MAPPING.get(highest_role, ROLE_MAPPING['__default__'])
|
|
||||||
|
|
||||||
|
|
||||||
def suggest_status(approval_status: str, has_subscription: bool, wordpress_role: str = 'guest') -> str:
|
|
||||||
"""
|
|
||||||
Suggest LOAF user status based on WordPress approval and subscription data.
|
|
||||||
|
|
||||||
Logic:
|
|
||||||
1. Admin roles (loaf_admin, loaf_treasure, administrator) → always 'active'
|
|
||||||
2. approved + subscription → 'active'
|
|
||||||
3. approved without subscription → 'pre_validated'
|
|
||||||
4. pending → 'payment_pending'
|
|
||||||
5. Other/empty → 'pre_validated'
|
|
||||||
|
|
||||||
Args:
|
|
||||||
approval_status: WordPress approval status (approved, pending, unapproved, etc.)
|
|
||||||
has_subscription: Whether user has pms_subscription_plan_63 role
|
|
||||||
wordpress_role: LOAF role mapped from WordPress (for admin check)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Suggested LOAF status: active, pre_validated, payment_pending, or inactive
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
>>> suggest_status('approved', True, 'member')
|
|
||||||
'active'
|
|
||||||
>>> suggest_status('approved', False, 'member')
|
|
||||||
'pre_validated'
|
|
||||||
>>> suggest_status('pending', True, 'member')
|
|
||||||
'payment_pending'
|
|
||||||
>>> suggest_status('', False, 'admin')
|
|
||||||
'active'
|
|
||||||
"""
|
|
||||||
# Admin roles are always active
|
|
||||||
if wordpress_role in ('superadmin', 'admin', 'finance'):
|
|
||||||
return 'active'
|
|
||||||
|
|
||||||
# Normalize approval status
|
|
||||||
approval = (approval_status or '').lower().strip()
|
|
||||||
|
|
||||||
if approval == 'approved':
|
|
||||||
return 'active' if has_subscription else 'pre_validated'
|
|
||||||
elif approval == 'pending':
|
|
||||||
return 'payment_pending'
|
|
||||||
elif approval == 'unapproved':
|
|
||||||
return 'inactive'
|
|
||||||
else:
|
|
||||||
# Empty or unknown approval status
|
|
||||||
return 'pre_validated'
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Data Validation and Standardization
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def standardize_phone(phone: str) -> str:
|
|
||||||
"""
|
|
||||||
Standardize phone number by extracting digits only.
|
|
||||||
|
|
||||||
Removes all non-digit characters:
|
|
||||||
- (713) 560-7850 → 7135607850
|
|
||||||
- 713-725-8902 → 7137258902
|
|
||||||
- Empty/None → 0000000000 (fallback)
|
|
||||||
|
|
||||||
Args:
|
|
||||||
phone: Phone number in any format
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
10-digit phone number string (or 0000000000 if invalid)
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
>>> standardize_phone('(713) 560-7850')
|
|
||||||
'7135607850'
|
|
||||||
>>> standardize_phone('713-725-8902')
|
|
||||||
'7137258902'
|
|
||||||
>>> standardize_phone('')
|
|
||||||
'0000000000'
|
|
||||||
"""
|
|
||||||
if not phone or pd.isna(phone):
|
|
||||||
return '0000000000'
|
|
||||||
|
|
||||||
# Extract all digits
|
|
||||||
digits = re.sub(r'\D', '', str(phone))
|
|
||||||
|
|
||||||
# Return 10 digits or fallback
|
|
||||||
if len(digits) == 10:
|
|
||||||
return digits
|
|
||||||
elif len(digits) == 11 and digits[0] == '1':
|
|
||||||
# Remove leading 1 (US country code)
|
|
||||||
return digits[1:]
|
|
||||||
else:
|
|
||||||
logger.warning(f"Invalid phone format: {phone} (extracted: {digits})")
|
|
||||||
return '0000000000'
|
|
||||||
|
|
||||||
|
|
||||||
def validate_dob(dob_str: str) -> Tuple[Optional[datetime], Optional[str]]:
|
|
||||||
"""
|
|
||||||
Validate and parse date of birth.
|
|
||||||
|
|
||||||
Validation rules:
|
|
||||||
- Must be in MM/DD/YYYY format
|
|
||||||
- Year must be between 1900 and current year
|
|
||||||
- Cannot be in the future
|
|
||||||
- Reject year 0000 or 2025+ (data quality issues in WordPress export)
|
|
||||||
|
|
||||||
Args:
|
|
||||||
dob_str: Date of birth string in MM/DD/YYYY format
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tuple of (parsed_datetime, warning_message)
|
|
||||||
- parsed_datetime: datetime object if valid, None if invalid
|
|
||||||
- warning_message: Descriptive error message if invalid, None if valid
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
>>> validate_dob('08/02/1962')
|
|
||||||
(datetime(1962, 8, 2), None)
|
|
||||||
>>> validate_dob('08/02/0000')
|
|
||||||
(None, 'Invalid year: 0000')
|
|
||||||
>>> validate_dob('08/02/2025')
|
|
||||||
(None, 'Date is in the future')
|
|
||||||
"""
|
|
||||||
if not dob_str or pd.isna(dob_str):
|
|
||||||
return None, 'Missing date of birth'
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Parse MM/DD/YYYY format
|
|
||||||
parsed = datetime.strptime(str(dob_str).strip(), '%m/%d/%Y')
|
|
||||||
|
|
||||||
# Validate year range
|
|
||||||
if parsed.year == 0:
|
|
||||||
return None, 'Invalid year: 0000 (data quality issue)'
|
|
||||||
elif parsed.year < 1900:
|
|
||||||
return None, f'Year too old: {parsed.year} (likely invalid)'
|
|
||||||
elif parsed.year > datetime.now().year:
|
|
||||||
return None, f'Date is in the future: {parsed.year}'
|
|
||||||
elif parsed > datetime.now():
|
|
||||||
return None, 'Date is in the future'
|
|
||||||
|
|
||||||
return parsed, None
|
|
||||||
|
|
||||||
except ValueError as e:
|
|
||||||
return None, f'Invalid date format: {dob_str} (expected MM/DD/YYYY)'
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# CSV Analysis and Preview Generation
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def analyze_csv(file_path: str, existing_emails: Optional[set] = None) -> Dict:
|
|
||||||
"""
|
|
||||||
Analyze WordPress CSV file and generate preview data with status suggestions.
|
|
||||||
|
|
||||||
This is the main entry point for CSV processing. It:
|
|
||||||
1. Reads and parses the CSV file
|
|
||||||
2. Validates each row and generates warnings
|
|
||||||
3. Maps WordPress roles to LOAF roles
|
|
||||||
4. Suggests status for each user
|
|
||||||
5. Tracks data quality metrics
|
|
||||||
6. Checks for duplicate emails (both within CSV and against existing database)
|
|
||||||
7. Returns comprehensive analysis and preview data
|
|
||||||
|
|
||||||
Args:
|
|
||||||
file_path: Path to WordPress CSV export file
|
|
||||||
existing_emails: Set of emails already in the database (optional)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Dictionary containing:
|
|
||||||
- total_rows: Total number of user rows
|
|
||||||
- valid_rows: Number of rows without critical errors
|
|
||||||
- warnings: Total warning count
|
|
||||||
- errors: Total critical error count
|
|
||||||
- preview_data: List of row dictionaries with suggestions
|
|
||||||
- data_quality: Dictionary of data quality metrics
|
|
||||||
|
|
||||||
Example output:
|
|
||||||
{
|
|
||||||
'total_rows': 183,
|
|
||||||
'valid_rows': 176,
|
|
||||||
'warnings': 66,
|
|
||||||
'errors': 7,
|
|
||||||
'preview_data': [
|
|
||||||
{
|
|
||||||
'row_number': 1,
|
|
||||||
'email': 'user@example.com',
|
|
||||||
'first_name': 'John',
|
|
||||||
'last_name': 'Doe',
|
|
||||||
'phone': '7135607850',
|
|
||||||
'date_of_birth': '1962-08-02',
|
|
||||||
'wordpress_roles': ['registered', 'pms_subscription_plan_63'],
|
|
||||||
'suggested_role': 'member',
|
|
||||||
'suggested_status': 'active',
|
|
||||||
'warnings': [],
|
|
||||||
'errors': []
|
|
||||||
},
|
|
||||||
...
|
|
||||||
],
|
|
||||||
'data_quality': {
|
|
||||||
'invalid_dob': 66,
|
|
||||||
'missing_phone': 7,
|
|
||||||
'duplicate_email_csv': 0,
|
|
||||||
'duplicate_email_db': 3,
|
|
||||||
'unparseable_roles': 2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
import pandas as pd
|
|
||||||
|
|
||||||
# Read CSV with pandas
|
|
||||||
df = pd.read_csv(file_path)
|
|
||||||
|
|
||||||
total_rows = len(df)
|
|
||||||
preview_data = []
|
|
||||||
data_quality = {
|
|
||||||
'invalid_dob': 0,
|
|
||||||
'missing_phone': 0,
|
|
||||||
'duplicate_email_csv': 0,
|
|
||||||
'duplicate_email_db': 0,
|
|
||||||
'unparseable_roles': 0,
|
|
||||||
'missing_email': 0
|
|
||||||
}
|
|
||||||
|
|
||||||
# Track seen emails for CSV duplicate detection
|
|
||||||
seen_emails = {}
|
|
||||||
|
|
||||||
# Convert existing_emails to set if provided
|
|
||||||
if existing_emails is None:
|
|
||||||
existing_emails = set()
|
|
||||||
|
|
||||||
for idx, row in df.iterrows():
|
|
||||||
row_num = idx + 1
|
|
||||||
warnings = []
|
|
||||||
errors = []
|
|
||||||
|
|
||||||
# Extract and validate email
|
|
||||||
email = str(row.get('user_email', '')).strip().lower()
|
|
||||||
if not email or email == 'nan':
|
|
||||||
errors.append('Missing email address')
|
|
||||||
data_quality['missing_email'] += 1
|
|
||||||
else:
|
|
||||||
# Check for duplicates within CSV
|
|
||||||
if email in seen_emails:
|
|
||||||
errors.append(f'Duplicate email in CSV (also in row {seen_emails[email]})')
|
|
||||||
data_quality['duplicate_email_csv'] += 1
|
|
||||||
# Check for duplicates in existing database
|
|
||||||
elif email in existing_emails:
|
|
||||||
errors.append(f'Email already exists in database')
|
|
||||||
data_quality['duplicate_email_db'] += 1
|
|
||||||
else:
|
|
||||||
seen_emails[email] = row_num
|
|
||||||
|
|
||||||
# Extract basic fields
|
|
||||||
first_name = str(row.get('first_name', '')).strip()
|
|
||||||
last_name = str(row.get('last_name', '')).strip()
|
|
||||||
|
|
||||||
# Parse and validate DOB
|
|
||||||
dob_parsed, dob_warning = validate_dob(row.get('date_of_birth'))
|
|
||||||
if dob_warning:
|
|
||||||
warnings.append(dob_warning)
|
|
||||||
data_quality['invalid_dob'] += 1
|
|
||||||
|
|
||||||
# Standardize phone
|
|
||||||
phone = standardize_phone(row.get('cell_phone'))
|
|
||||||
if phone == '0000000000':
|
|
||||||
warnings.append('Missing or invalid phone number')
|
|
||||||
data_quality['missing_phone'] += 1
|
|
||||||
|
|
||||||
# Parse WordPress roles
|
|
||||||
wp_capabilities = row.get('wp_capabilities', '')
|
|
||||||
wp_roles = parse_php_serialized(wp_capabilities)
|
|
||||||
if not wp_roles and wp_capabilities:
|
|
||||||
warnings.append('Could not parse WordPress roles')
|
|
||||||
data_quality['unparseable_roles'] += 1
|
|
||||||
|
|
||||||
# Map to LOAF role and status
|
|
||||||
loaf_role, role_suggested_status = map_wordpress_role(wp_roles)
|
|
||||||
|
|
||||||
# Determine if user has subscription
|
|
||||||
has_subscription = 'pms_subscription_plan_63' in wp_roles
|
|
||||||
|
|
||||||
# Get approval status
|
|
||||||
approval_status = str(row.get('wppb_approval_status', '')).strip()
|
|
||||||
|
|
||||||
# Suggest final status
|
|
||||||
if role_suggested_status:
|
|
||||||
# Admin roles have fixed status from role mapping
|
|
||||||
suggested_status = role_suggested_status
|
|
||||||
else:
|
|
||||||
# Regular users get status from approval logic
|
|
||||||
suggested_status = suggest_status(approval_status, has_subscription, loaf_role)
|
|
||||||
|
|
||||||
# Build preview row
|
|
||||||
preview_row = {
|
|
||||||
'row_number': row_num,
|
|
||||||
'email': email,
|
|
||||||
'first_name': first_name,
|
|
||||||
'last_name': last_name,
|
|
||||||
'phone': phone,
|
|
||||||
'date_of_birth': dob_parsed.isoformat() if dob_parsed else None,
|
|
||||||
'wordpress_user_id': int(row.get('ID', 0)) if pd.notna(row.get('ID')) else None,
|
|
||||||
'wordpress_registered': str(row.get('user_registered', '')),
|
|
||||||
'wordpress_roles': wp_roles,
|
|
||||||
'wordpress_approval_status': approval_status,
|
|
||||||
'has_subscription': has_subscription,
|
|
||||||
'suggested_role': loaf_role,
|
|
||||||
'suggested_status': suggested_status,
|
|
||||||
'warnings': warnings,
|
|
||||||
'errors': errors,
|
|
||||||
'newsletter_consent': str(row.get('newsletter_consent', '')).lower() == 'yes',
|
|
||||||
'newsletter_checklist': str(row.get('newsletter_checklist', '')).lower() == 'yes'
|
|
||||||
}
|
|
||||||
|
|
||||||
preview_data.append(preview_row)
|
|
||||||
|
|
||||||
# Calculate summary statistics
|
|
||||||
valid_rows = sum(1 for row in preview_data if not row['errors'])
|
|
||||||
total_warnings = sum(len(row['warnings']) for row in preview_data)
|
|
||||||
total_errors = sum(len(row['errors']) for row in preview_data)
|
|
||||||
|
|
||||||
return {
|
|
||||||
'total_rows': total_rows,
|
|
||||||
'valid_rows': valid_rows,
|
|
||||||
'warnings': total_warnings,
|
|
||||||
'errors': total_errors,
|
|
||||||
'preview_data': preview_data,
|
|
||||||
'data_quality': data_quality
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Utility Functions
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def get_status_badge_color(status: str) -> str:
|
|
||||||
"""
|
|
||||||
Get appropriate badge color for status display in UI.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
status: User status string
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Tailwind CSS color class
|
|
||||||
"""
|
|
||||||
colors = {
|
|
||||||
'active': 'bg-green-100 text-green-800',
|
|
||||||
'pre_validated': 'bg-blue-100 text-blue-800',
|
|
||||||
'payment_pending': 'bg-yellow-100 text-yellow-800',
|
|
||||||
'inactive': 'bg-gray-100 text-gray-800',
|
|
||||||
'pending_email': 'bg-purple-100 text-purple-800',
|
|
||||||
'awaiting_event': 'bg-indigo-100 text-indigo-800'
|
|
||||||
}
|
|
||||||
return colors.get(status, 'bg-gray-100 text-gray-800')
|
|
||||||
|
|
||||||
|
|
||||||
def format_preview_for_display(preview_data: List[Dict], page: int = 1, page_size: int = 50) -> Dict:
|
|
||||||
"""
|
|
||||||
Format preview data for paginated display in frontend.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
preview_data: Full preview data list
|
|
||||||
page: Page number (1-indexed)
|
|
||||||
page_size: Number of rows per page
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Dictionary with paginated data and metadata
|
|
||||||
"""
|
|
||||||
total_pages = (len(preview_data) + page_size - 1) // page_size
|
|
||||||
start_idx = (page - 1) * page_size
|
|
||||||
end_idx = start_idx + page_size
|
|
||||||
|
|
||||||
return {
|
|
||||||
'page': page,
|
|
||||||
'page_size': page_size,
|
|
||||||
'total_pages': total_pages,
|
|
||||||
'total_rows': len(preview_data),
|
|
||||||
'rows': preview_data[start_idx:end_idx]
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# Module Initialization
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
# Import pandas for CSV processing
|
|
||||||
try:
|
|
||||||
import pandas as pd
|
|
||||||
except ImportError:
|
|
||||||
logger.error("pandas library not found. Please install: pip install pandas")
|
|
||||||
raise
|
|
||||||
|
|
||||||
logger.info("WordPress parser module loaded successfully")
|
|
||||||
Reference in New Issue
Block a user