mirror of
https://github.com/nomadkaraoke/karaoke-gen.git
synced 2026-11-20 13:07:57 +09:00
feat: Migrate user storage to gen_users collection (#173)
## Summary
Separates karaoke-gen user data from karaoke-decide by using a dedicated
`gen_users` collection instead of the shared `users` collection.
**Problem:** Both karaoke-gen and karaoke-decide were using the same
`users` collection in Firestore with incompatible schemas:
- karaoke-gen: email as doc ID, has `credits`, `role`, `is_active`
- karaoke-decide: hash as doc ID, has `user_id`, `is_guest`, `quiz_*`
fields
**Solution:** karaoke-gen now uses its own `gen_users` collection.
## Changes
- Updated `USERS_COLLECTION` constant from `"users"` to `"gen_users"`
- Updated all hardcoded `db.collection("users")` references to use the
constant
- Updated Pulumi Firestore indexes for `gen_users` collection
- Added migration script (already executed)
## Migration Status
✅ 42 karaoke-gen users migrated to `gen_users` collection
✅ 36 karaoke-decide users remain in `users` collection (untouched)
✅ Firestore indexes created for `gen_users`
## Test plan
- [ ] Admin dashboard loads user list from `gen_users`
- [ ] User login/signup works
- [ ] Credit operations work
@coderabbitai ignore
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
69dd904f60
commit
ab05ec8bee
5 files changed
+179
-26
No files matched your search
@@ -15,7 +15,7 @@ from pydantic import BaseModel
|
||||
|
||||
from backend.api.dependencies import require_admin
|
||||
from backend.services.auth_service import UserType
|
||||
from backend.services.user_service import get_user_service, UserService
|
||||
from backend.services.user_service import get_user_service, UserService, USERS_COLLECTION
|
||||
from backend.services.job_manager import JobManager
|
||||
from backend.models.job import JobStatus
|
||||
|
||||
@@ -90,7 +90,7 @@ async def get_admin_stats_overview(
|
||||
return 0
|
||||
|
||||
# User statistics
|
||||
users_collection = db.collection("users")
|
||||
users_collection = db.collection(USERS_COLLECTION)
|
||||
|
||||
total_users = get_count(users_collection)
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ from backend.models.user import (
|
||||
BetaFeedbackResponse,
|
||||
BetaTesterFeedback,
|
||||
)
|
||||
from backend.services.user_service import get_user_service, UserService
|
||||
from backend.services.user_service import get_user_service, UserService, USERS_COLLECTION
|
||||
from backend.services.email_service import get_email_service, EmailService
|
||||
from backend.services.stripe_service import get_stripe_service, StripeService, CREDIT_PACKAGES
|
||||
from backend.api.dependencies import require_admin
|
||||
@@ -684,7 +684,7 @@ async def list_users(
|
||||
limit = min(limit, 100)
|
||||
|
||||
db = user_service.db
|
||||
query = db.collection("users")
|
||||
query = db.collection(USERS_COLLECTION)
|
||||
|
||||
# Filter inactive users
|
||||
if not include_inactive:
|
||||
@@ -952,7 +952,7 @@ async def get_beta_stats(
|
||||
from google.cloud.firestore_v1 import aggregation
|
||||
|
||||
# Count beta testers by status using efficient aggregation queries
|
||||
users_collection = user_service.db.collection("users")
|
||||
users_collection = user_service.db.collection(USERS_COLLECTION)
|
||||
|
||||
# Helper function to get count using aggregation
|
||||
def get_count(query) -> int:
|
||||
|
||||
@@ -32,7 +32,7 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# Collection names
|
||||
USERS_COLLECTION = "users"
|
||||
USERS_COLLECTION = "gen_users"
|
||||
MAGIC_LINKS_COLLECTION = "magic_links"
|
||||
SESSIONS_COLLECTION = "sessions"
|
||||
PROCESSED_STRIPE_SESSIONS_COLLECTION = "processed_stripe_sessions"
|
||||
|
||||
+20
-20
@@ -92,12 +92,12 @@ firestore_index_magic_links = firestore.Index(
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Users: query by is_active, order by created_at (for admin user list)
|
||||
firestore_index_users_active_created = firestore.Index(
|
||||
"firestore-index-users-active-created",
|
||||
# Gen Users: query by is_active, order by created_at (for admin user list)
|
||||
firestore_index_gen_users_active_created = firestore.Index(
|
||||
"firestore-index-gen-users-active-created",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="users",
|
||||
collection="gen_users",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="is_active", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="created_at", order="DESCENDING"),
|
||||
@@ -105,12 +105,12 @@ firestore_index_users_active_created = firestore.Index(
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Users: query by is_active, order by last_login_at (for admin user list sorting)
|
||||
firestore_index_users_active_login = firestore.Index(
|
||||
"firestore-index-users-active-login",
|
||||
# Gen Users: query by is_active, order by last_login_at (for admin user list sorting)
|
||||
firestore_index_gen_users_active_login = firestore.Index(
|
||||
"firestore-index-gen-users-active-login",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="users",
|
||||
collection="gen_users",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="is_active", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="last_login_at", order="DESCENDING"),
|
||||
@@ -118,12 +118,12 @@ firestore_index_users_active_login = firestore.Index(
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Users: query by is_active, order by credits (for admin user list sorting)
|
||||
firestore_index_users_active_credits = firestore.Index(
|
||||
"firestore-index-users-active-credits",
|
||||
# Gen Users: query by is_active, order by credits (for admin user list sorting)
|
||||
firestore_index_gen_users_active_credits = firestore.Index(
|
||||
"firestore-index-gen-users-active-credits",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="users",
|
||||
collection="gen_users",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="is_active", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="credits", order="DESCENDING"),
|
||||
@@ -131,12 +131,12 @@ firestore_index_users_active_credits = firestore.Index(
|
||||
opts=pulumi.ResourceOptions(depends_on=[firestore_db]),
|
||||
)
|
||||
|
||||
# Users: query by is_active, order by email (for admin user list sorting)
|
||||
firestore_index_users_active_email = firestore.Index(
|
||||
"firestore-index-users-active-email",
|
||||
# Gen Users: query by is_active, order by email (for admin user list sorting)
|
||||
firestore_index_gen_users_active_email = firestore.Index(
|
||||
"firestore-index-gen-users-active-email",
|
||||
project=project_id,
|
||||
database=firestore_db.name,
|
||||
collection="users",
|
||||
collection="gen_users",
|
||||
fields=[
|
||||
firestore.IndexFieldArgs(field_path="is_active", order="ASCENDING"),
|
||||
firestore.IndexFieldArgs(field_path="email", order="ASCENDING"),
|
||||
@@ -807,10 +807,10 @@ pulumi.export("firestore_index_jobs_user_email", firestore_index_jobs_user_email
|
||||
pulumi.export("firestore_index_jobs_status", firestore_index_jobs_status.name)
|
||||
pulumi.export("firestore_index_sessions_active", firestore_index_sessions_active.name)
|
||||
pulumi.export("firestore_index_magic_links", firestore_index_magic_links.name)
|
||||
pulumi.export("firestore_index_users_active_created", firestore_index_users_active_created.name)
|
||||
pulumi.export("firestore_index_users_active_login", firestore_index_users_active_login.name)
|
||||
pulumi.export("firestore_index_users_active_credits", firestore_index_users_active_credits.name)
|
||||
pulumi.export("firestore_index_users_active_email", firestore_index_users_active_email.name)
|
||||
pulumi.export("firestore_index_gen_users_active_created", firestore_index_gen_users_active_created.name)
|
||||
pulumi.export("firestore_index_gen_users_active_login", firestore_index_gen_users_active_login.name)
|
||||
pulumi.export("firestore_index_gen_users_active_credits", firestore_index_gen_users_active_credits.name)
|
||||
pulumi.export("firestore_index_gen_users_active_email", firestore_index_gen_users_active_email.name)
|
||||
pulumi.export("service_account_email", service_account.email)
|
||||
pulumi.export("artifact_repo_url", artifact_repo.name.apply(
|
||||
lambda name: f"us-central1-docker.pkg.dev/{project_id}/karaoke-repo"
|
||||
|
||||
@@ -0,0 +1,153 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Migration script to copy karaoke-gen users from 'users' collection to 'gen_users' collection.
|
||||
|
||||
This script:
|
||||
1. Identifies karaoke-gen users in the 'users' collection (by presence of 'credits' field)
|
||||
2. Copies them to the 'gen_users' collection (preserving document ID = email)
|
||||
3. Optionally deletes the old documents from 'users' collection
|
||||
|
||||
Run with:
|
||||
python scripts/migrate_users_to_gen_users.py --dry-run # Preview only
|
||||
python scripts/migrate_users_to_gen_users.py # Execute migration
|
||||
python scripts/migrate_users_to_gen_users.py --delete # Also delete old docs
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import sys
|
||||
from google.cloud import firestore
|
||||
|
||||
|
||||
def is_karaoke_gen_user(doc_data: dict) -> bool:
|
||||
"""
|
||||
Determine if a user document belongs to karaoke-gen.
|
||||
|
||||
karaoke-gen users have:
|
||||
- Document ID = email address (contains @)
|
||||
- 'credits' field
|
||||
- 'role' field with value 'user' or 'admin'
|
||||
- 'is_active' field
|
||||
|
||||
karaoke-decide users have:
|
||||
- Document ID = hash or guest_xxx
|
||||
- 'user_id' field
|
||||
- 'is_guest' field
|
||||
"""
|
||||
# Check for karaoke-gen specific fields
|
||||
has_credits = 'credits' in doc_data
|
||||
has_role = doc_data.get('role') in ['user', 'admin']
|
||||
has_is_active = 'is_active' in doc_data
|
||||
|
||||
# Check for karaoke-decide specific fields
|
||||
has_user_id = 'user_id' in doc_data
|
||||
has_is_guest = 'is_guest' in doc_data
|
||||
|
||||
# karaoke-gen users have credits/role/is_active but NOT user_id/is_guest
|
||||
return has_credits and has_role and has_is_active and not has_user_id and not has_is_guest
|
||||
|
||||
|
||||
def migrate_users(dry_run: bool = True, delete_old: bool = False):
|
||||
"""
|
||||
Migrate karaoke-gen users from 'users' to 'gen_users' collection.
|
||||
"""
|
||||
db = firestore.Client(project='nomadkaraoke')
|
||||
|
||||
users_collection = db.collection('users')
|
||||
gen_users_collection = db.collection('gen_users')
|
||||
|
||||
# Get all documents from users collection
|
||||
print("Fetching all documents from 'users' collection...")
|
||||
all_docs = list(users_collection.stream())
|
||||
print(f"Found {len(all_docs)} total documents in 'users' collection")
|
||||
|
||||
# Filter to karaoke-gen users
|
||||
gen_users = []
|
||||
decide_users = []
|
||||
unknown_users = []
|
||||
|
||||
for doc in all_docs:
|
||||
doc_data = doc.to_dict()
|
||||
doc_id = doc.id
|
||||
|
||||
if is_karaoke_gen_user(doc_data):
|
||||
gen_users.append((doc_id, doc_data))
|
||||
elif 'user_id' in doc_data or 'is_guest' in doc_data:
|
||||
decide_users.append(doc_id)
|
||||
else:
|
||||
unknown_users.append(doc_id)
|
||||
|
||||
print(f"\nClassification results:")
|
||||
print(f" - karaoke-gen users: {len(gen_users)}")
|
||||
print(f" - karaoke-decide users: {len(decide_users)}")
|
||||
print(f" - Unknown/other: {len(unknown_users)}")
|
||||
|
||||
if unknown_users:
|
||||
print(f"\nUnknown users (first 5): {unknown_users[:5]}")
|
||||
|
||||
if dry_run:
|
||||
print(f"\n[DRY RUN] Would migrate {len(gen_users)} users to 'gen_users' collection:")
|
||||
for doc_id, doc_data in gen_users[:10]:
|
||||
email = doc_data.get('email', doc_id)
|
||||
credits = doc_data.get('credits', 0)
|
||||
print(f" - {email} (credits: {credits})")
|
||||
if len(gen_users) > 10:
|
||||
print(f" ... and {len(gen_users) - 10} more")
|
||||
return
|
||||
|
||||
# Execute migration
|
||||
print(f"\nMigrating {len(gen_users)} users to 'gen_users' collection...")
|
||||
migrated = 0
|
||||
errors = 0
|
||||
|
||||
for doc_id, doc_data in gen_users:
|
||||
try:
|
||||
# Use the same document ID (email) in the new collection
|
||||
gen_users_collection.document(doc_id).set(doc_data)
|
||||
migrated += 1
|
||||
|
||||
if migrated % 10 == 0:
|
||||
print(f" Migrated {migrated}/{len(gen_users)}...")
|
||||
except Exception as e:
|
||||
print(f" ERROR migrating {doc_id}: {e}")
|
||||
errors += 1
|
||||
|
||||
print(f"\nMigration complete: {migrated} migrated, {errors} errors")
|
||||
|
||||
# Optionally delete old documents
|
||||
if delete_old and errors == 0:
|
||||
print(f"\nDeleting old documents from 'users' collection...")
|
||||
deleted = 0
|
||||
for doc_id, _ in gen_users:
|
||||
try:
|
||||
users_collection.document(doc_id).delete()
|
||||
deleted += 1
|
||||
except Exception as e:
|
||||
print(f" ERROR deleting {doc_id}: {e}")
|
||||
print(f"Deleted {deleted} documents from 'users' collection")
|
||||
elif delete_old and errors > 0:
|
||||
print("\nSkipping deletion due to migration errors")
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description='Migrate karaoke-gen users to gen_users collection')
|
||||
parser.add_argument('--dry-run', action='store_true', help='Preview migration without making changes')
|
||||
parser.add_argument('--delete', action='store_true', help='Delete old documents after successful migration')
|
||||
args = parser.parse_args()
|
||||
|
||||
# Default to dry-run if neither flag is set
|
||||
dry_run = args.dry_run or not args.delete
|
||||
|
||||
if not dry_run:
|
||||
print("=" * 60)
|
||||
print("WARNING: This will modify production data!")
|
||||
print("=" * 60)
|
||||
response = input("Type 'yes' to continue: ")
|
||||
if response.lower() != 'yes':
|
||||
print("Aborted")
|
||||
sys.exit(1)
|
||||
|
||||
migrate_users(dry_run=dry_run, delete_old=args.delete)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
Reference in new issue
Block a user