Add StadiumAlias CloudKit sync and offline-first data architecture
- Add CKStadiumAlias model for CloudKit record mapping - Add fetchStadiumAliases/fetchStadiumAliasChanges to CloudKitService - Add syncStadiumAliases to CanonicalSyncService for delta sync - Add subscribeToStadiumAliasUpdates for push notifications - Update cloudkit_import.py with --stadium-aliases-only option Data Architecture Updates: - Remove obsolete provider files (CanonicalDataProvider, CloudKitDataProvider, StubDataProvider) - AppDataProvider now reads exclusively from SwiftData - Add background CloudKit sync on app startup (non-blocking) - Document data architecture in CLAUDE.md 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,6 +14,7 @@ Usage:
|
||||
python cloudkit_import.py --key-id XX --key-file key.p8 # Import all
|
||||
python cloudkit_import.py --stadiums-only ... # Stadiums first
|
||||
python cloudkit_import.py --games-only ... # Games after
|
||||
python cloudkit_import.py --stadium-aliases-only ... # Stadium aliases only
|
||||
python cloudkit_import.py --delete-all ... # Delete then import
|
||||
python cloudkit_import.py --delete-only ... # Delete only (no import)
|
||||
"""
|
||||
@@ -44,26 +45,27 @@ def show_menu():
|
||||
print("\n" + "="*50)
|
||||
print("CloudKit Import - Select Action")
|
||||
print("="*50)
|
||||
print("\n 1. Import all (stadiums, teams, games, league structure, team aliases)")
|
||||
print("\n 1. Import all (stadiums, teams, games, league structure, team aliases, stadium aliases)")
|
||||
print(" 2. Stadiums only")
|
||||
print(" 3. Games only")
|
||||
print(" 4. League structure only")
|
||||
print(" 5. Team aliases only")
|
||||
print(" 6. Canonical only (league structure + team aliases)")
|
||||
print(" 7. Delete all then import")
|
||||
print(" 8. Delete only (no import)")
|
||||
print(" 9. Dry run (preview only)")
|
||||
print(" 6. Stadium aliases only")
|
||||
print(" 7. Canonical only (league structure + team aliases + stadium aliases)")
|
||||
print(" 8. Delete all then import")
|
||||
print(" 9. Delete only (no import)")
|
||||
print(" 10. Dry run (preview only)")
|
||||
print(" 0. Exit")
|
||||
print()
|
||||
|
||||
while True:
|
||||
try:
|
||||
choice = input("Enter choice [1-9, 0 to exit]: ").strip()
|
||||
choice = input("Enter choice [1-10, 0 to exit]: ").strip()
|
||||
if choice == '0':
|
||||
return None
|
||||
if choice in ['1', '2', '3', '4', '5', '6', '7', '8', '9']:
|
||||
if choice in ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10']:
|
||||
return int(choice)
|
||||
print("Invalid choice. Please enter 1-9 or 0.")
|
||||
print("Invalid choice. Please enter 1-10 or 0.")
|
||||
except (EOFError, KeyboardInterrupt):
|
||||
print("\nExiting.")
|
||||
return None
|
||||
@@ -257,7 +259,8 @@ def main():
|
||||
p.add_argument('--games-only', action='store_true')
|
||||
p.add_argument('--league-structure-only', action='store_true', help='Import only league structure')
|
||||
p.add_argument('--team-aliases-only', action='store_true', help='Import only team aliases')
|
||||
p.add_argument('--canonical-only', action='store_true', help='Import only canonical data (league structure + team aliases)')
|
||||
p.add_argument('--stadium-aliases-only', action='store_true', help='Import only stadium aliases')
|
||||
p.add_argument('--canonical-only', action='store_true', help='Import only canonical data (league structure + team aliases + stadium aliases)')
|
||||
p.add_argument('--delete-all', action='store_true', help='Delete all records before importing')
|
||||
p.add_argument('--delete-only', action='store_true', help='Only delete records, do not import')
|
||||
p.add_argument('--dry-run', action='store_true')
|
||||
@@ -268,8 +271,8 @@ def main():
|
||||
# Show interactive menu if no action flags provided or --interactive
|
||||
has_action_flag = any([
|
||||
args.stadiums_only, args.games_only, args.league_structure_only,
|
||||
args.team_aliases_only, args.canonical_only, args.delete_all,
|
||||
args.delete_only, args.dry_run
|
||||
args.team_aliases_only, args.stadium_aliases_only, args.canonical_only,
|
||||
args.delete_all, args.delete_only, args.dry_run
|
||||
])
|
||||
|
||||
if args.interactive or not has_action_flag:
|
||||
@@ -288,13 +291,15 @@ def main():
|
||||
args.league_structure_only = True
|
||||
elif choice == 5: # Team aliases only
|
||||
args.team_aliases_only = True
|
||||
elif choice == 6: # Canonical only
|
||||
elif choice == 6: # Stadium aliases only
|
||||
args.stadium_aliases_only = True
|
||||
elif choice == 7: # Canonical only
|
||||
args.canonical_only = True
|
||||
elif choice == 7: # Delete all then import
|
||||
elif choice == 8: # Delete all then import
|
||||
args.delete_all = True
|
||||
elif choice == 8: # Delete only
|
||||
elif choice == 9: # Delete only
|
||||
args.delete_only = True
|
||||
elif choice == 9: # Dry run
|
||||
elif choice == 10: # Dry run
|
||||
args.dry_run = True
|
||||
|
||||
print(f"\n{'='*50}")
|
||||
@@ -308,7 +313,8 @@ def main():
|
||||
games = json.load(open(data_dir / 'games.json')) if (data_dir / 'games.json').exists() else []
|
||||
league_structure = json.load(open(data_dir / 'league_structure.json')) if (data_dir / 'league_structure.json').exists() else []
|
||||
team_aliases = json.load(open(data_dir / 'team_aliases.json')) if (data_dir / 'team_aliases.json').exists() else []
|
||||
print(f"Loaded {len(stadiums)} stadiums, {len(games)} games, {len(league_structure)} league structures, {len(team_aliases)} team aliases\n")
|
||||
stadium_aliases = json.load(open(data_dir / 'stadium_aliases.json')) if (data_dir / 'stadium_aliases.json').exists() else []
|
||||
print(f"Loaded {len(stadiums)} stadiums, {len(games)} games, {len(league_structure)} league structures, {len(team_aliases)} team aliases, {len(stadium_aliases)} stadium aliases\n")
|
||||
|
||||
ck = None
|
||||
if not args.dry_run:
|
||||
@@ -325,7 +331,7 @@ def main():
|
||||
|
||||
print("--- Deleting Existing Records ---")
|
||||
# Delete in order: dependent records first, then base records
|
||||
for record_type in ['Game', 'TeamAlias', 'Team', 'LeagueStructure', 'Stadium']:
|
||||
for record_type in ['Game', 'TeamAlias', 'StadiumAlias', 'Team', 'LeagueStructure', 'Stadium']:
|
||||
print(f" Deleting {record_type} records...")
|
||||
deleted = ck.delete_all(record_type, verbose=args.verbose)
|
||||
print(f" Deleted {deleted} {record_type} records")
|
||||
@@ -336,15 +342,16 @@ def main():
|
||||
print()
|
||||
return
|
||||
|
||||
stats = {'stadiums': 0, 'teams': 0, 'games': 0, 'league_structures': 0, 'team_aliases': 0}
|
||||
stats = {'stadiums': 0, 'teams': 0, 'games': 0, 'league_structures': 0, 'team_aliases': 0, 'stadium_aliases': 0}
|
||||
team_map = {}
|
||||
|
||||
# Determine what to import based on flags
|
||||
import_stadiums = not args.games_only and not args.league_structure_only and not args.team_aliases_only and not args.canonical_only
|
||||
import_teams = not args.games_only and not args.league_structure_only and not args.team_aliases_only and not args.canonical_only
|
||||
import_games = not args.stadiums_only and not args.league_structure_only and not args.team_aliases_only and not args.canonical_only
|
||||
import_league_structure = args.league_structure_only or args.canonical_only or (not args.stadiums_only and not args.games_only and not args.team_aliases_only)
|
||||
import_team_aliases = args.team_aliases_only or args.canonical_only or (not args.stadiums_only and not args.games_only and not args.league_structure_only)
|
||||
import_stadiums = not args.games_only and not args.league_structure_only and not args.team_aliases_only and not args.stadium_aliases_only and not args.canonical_only
|
||||
import_teams = not args.games_only and not args.league_structure_only and not args.team_aliases_only and not args.stadium_aliases_only and not args.canonical_only
|
||||
import_games = not args.stadiums_only and not args.league_structure_only and not args.team_aliases_only and not args.stadium_aliases_only and not args.canonical_only
|
||||
import_league_structure = args.league_structure_only or args.canonical_only or (not args.stadiums_only and not args.games_only and not args.team_aliases_only and not args.stadium_aliases_only)
|
||||
import_team_aliases = args.team_aliases_only or args.canonical_only or (not args.stadiums_only and not args.games_only and not args.league_structure_only and not args.stadium_aliases_only)
|
||||
import_stadium_aliases = args.stadium_aliases_only or args.canonical_only or (not args.stadiums_only and not args.games_only and not args.league_structure_only and not args.team_aliases_only)
|
||||
|
||||
# Build stadium UUID lookup (stadium string ID -> UUID)
|
||||
stadium_uuid_map = {s['id']: deterministic_uuid(s['id']) for s in stadiums}
|
||||
@@ -522,8 +529,40 @@ def main():
|
||||
})
|
||||
stats['team_aliases'] = import_data(ck, recs, 'team aliases', args.dry_run, args.verbose)
|
||||
|
||||
# Import stadium aliases
|
||||
if import_stadium_aliases and stadium_aliases:
|
||||
print("--- Stadium Aliases ---")
|
||||
now_ms = int(datetime.now(timezone.utc).timestamp() * 1000)
|
||||
recs = []
|
||||
for sa in stadium_aliases:
|
||||
fields = {
|
||||
'aliasName': {'value': sa['alias_name'].lower()}, # Normalize to lowercase
|
||||
'stadiumCanonicalId': {'value': sa['stadium_canonical_id']},
|
||||
'schemaVersion': {'value': 1},
|
||||
'lastModified': {'value': now_ms, 'type': 'TIMESTAMP'},
|
||||
}
|
||||
# Add optional date fields
|
||||
if sa.get('valid_from'):
|
||||
try:
|
||||
dt = datetime.strptime(sa['valid_from'], '%Y-%m-%d')
|
||||
fields['validFrom'] = {'value': int(dt.timestamp() * 1000), 'type': 'TIMESTAMP'}
|
||||
except:
|
||||
pass
|
||||
if sa.get('valid_until'):
|
||||
try:
|
||||
dt = datetime.strptime(sa['valid_until'], '%Y-%m-%d')
|
||||
fields['validUntil'] = {'value': int(dt.timestamp() * 1000), 'type': 'TIMESTAMP'}
|
||||
except:
|
||||
pass
|
||||
recs.append({
|
||||
'recordType': 'StadiumAlias',
|
||||
'recordName': sa['alias_name'].lower(), # Use alias_name as recordName (unique key)
|
||||
'fields': fields
|
||||
})
|
||||
stats['stadium_aliases'] = import_data(ck, recs, 'stadium aliases', args.dry_run, args.verbose)
|
||||
|
||||
print(f"\n{'='*50}")
|
||||
print(f"COMPLETE: {stats['stadiums']} stadiums, {stats['teams']} teams, {stats['games']} games, {stats['league_structures']} league structures, {stats['team_aliases']} team aliases")
|
||||
print(f"COMPLETE: {stats['stadiums']} stadiums, {stats['teams']} teams, {stats['games']} games, {stats['league_structures']} league structures, {stats['team_aliases']} team aliases, {stats['stadium_aliases']} stadium aliases")
|
||||
if args.dry_run:
|
||||
print("[DRY RUN - nothing imported]")
|
||||
print()
|
||||
|
||||
Reference in New Issue
Block a user