Compare commits
2 Commits
2e3bf14b27
...
exdb-2
| Author | SHA1 | Date | |
|---|---|---|---|
| e01d2e7ea6 | |||
| d017da17d4 |
22
.env.sql
22
.env.sql
@ -1,22 +0,0 @@
|
||||
POSTGRES_USER=admin
|
||||
POSTGRES_PASS=admin123456
|
||||
POSTGRES_DBNAME=rogdb
|
||||
DATABASE=postgres
|
||||
PG_HOST=172.31.25.76
|
||||
PG_PORT=5432
|
||||
GS_VERSION=2.20.0
|
||||
GEOSERVER_PORT=8600
|
||||
GEOSERVER_DATA_DIR=/opt/geoserver/data_dir
|
||||
GEOWEBCACHE_CACHE_DIR=/opt/geoserver/data_dir/gwc
|
||||
GEOSERVER_ADMIN_PASSWORD=geoserver
|
||||
GEOSERVER_ADMIN_USER=admin
|
||||
INITIAL_MEMORY=2G
|
||||
MAXIMUM_MEMORY=3G
|
||||
SECRET_KEY=django-insecure-o-d6a5mrhc6#=qqb^-c7@rcj#=cjmrjo$!5*i!uotd@j&f_okb
|
||||
DEBUG=True
|
||||
ALLOWED_HOSTS=rogaining.sumasen.net
|
||||
S3_REGION="us-west-2"
|
||||
S3_BUCKET_NAME="sumasenrogaining"
|
||||
S3_PREFIX="#{location}/scoreboard/"
|
||||
AWS_ACCESS_KEY="AKIA6LVMTADSVEB5LZ2H"
|
||||
AWS_SECRET_ACCESS_KEY="KIbm47dqVBxSmeHygrh5ENV1uXzJMc7fLnJOvtUm"
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -157,6 +157,10 @@ dmypy.json
|
||||
# Cython debug symbols
|
||||
cython_debug/
|
||||
|
||||
# migration files
|
||||
rog/migrations/
|
||||
|
||||
|
||||
# PyCharm
|
||||
# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
|
||||
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
|
||||
|
||||
@ -1,264 +0,0 @@
|
||||
# サーバーAPI変更要求書 実装報告書
|
||||
|
||||
## 概要
|
||||
2025年8月27日のサーバーAPI変更要求書に基づき、最高優先度および高優先度項目の実装を完了しました。
|
||||
|
||||
---
|
||||
|
||||
## ✅ 実装完了項目
|
||||
|
||||
### 🔴 最高優先度（完了）
|
||||
|
||||
#### 1. アプリバージョンチェックAPI
|
||||
**エンドポイント**: `POST /api/app/version-check`
|
||||
|
||||
**実装ファイル**:
|
||||
- `rog/models.py`: `AppVersion`モデル追加
|
||||
- `rog/serializers.py`: `AppVersionSerializer`, `AppVersionCheckSerializer`, `AppVersionResponseSerializer`
|
||||
- `rog/app_version_views.py`: バージョンチェックAPI実装
|
||||
- `rog/urls.py`: URLパターン追加
|
||||
- `create_app_versions_table.sql`: データベーステーブル作成
|
||||
|
||||
**機能**:
|
||||
- セマンティックバージョニング対応
|
||||
- プラットフォーム別管理（Android/iOS）
|
||||
- 強制更新フラグ制御
|
||||
- カスタムメッセージ設定
|
||||
- 管理者向けバージョン管理API
|
||||
|
||||
**使用例**:
|
||||
```bash
|
||||
curl -X POST http://localhost:8000/api/app/version-check/ \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{
|
||||
"current_version": "1.2.3",
|
||||
"platform": "android",
|
||||
"build_number": "123"
|
||||
}'
|
||||
```
|
||||
|
||||
#### 2. イベントステータス管理拡張
|
||||
**エンドポイント**: `GET /newevent2-list/` (既存API拡張)
|
||||
|
||||
**実装ファイル**:
|
||||
- `rog/models.py`: `NewEvent2`モデルに`status`フィールド追加
|
||||
- `rog/serializers.py`: `NewEvent2Serializer`拡張
|
||||
- `api_requirements_migration.sql`: データベース移行スクリプト
|
||||
|
||||
**機能**:
|
||||
- ステータス管理: `public`, `private`, `draft`, `closed`
|
||||
- `deadline_datetime`フィールド追加（API応答統一）
|
||||
- 既存`public`フィールドからの自動移行
|
||||
- ユーザーアクセス権限チェック機能
|
||||
|
||||
**レスポンス例**:
|
||||
```json
|
||||
{
|
||||
"id": 1,
|
||||
"event_name": "岐阜ロゲイニング2025",
|
||||
"start_datetime": "2025-09-15T10:00:00Z",
|
||||
"end_datetime": "2025-09-15T16:00:00Z",
|
||||
"deadline_datetime": "2025-09-10T23:59:59Z",
|
||||
"status": "public"
|
||||
}
|
||||
```
|
||||
|
||||
### 🟡 高優先度（完了）
|
||||
|
||||
#### 3. エントリー情報API拡張
|
||||
**エンドポイント**: `GET /entry/` (既存API拡張)
|
||||
|
||||
**実装ファイル**:
|
||||
- `rog/models.py`: `Entry`モデルにスタッフ権限フィールド追加
|
||||
- `rog/serializers.py`: `EntrySerializer`拡張
|
||||
|
||||
**追加フィールド**:
|
||||
- `staff_privileges`: スタッフ権限フラグ
|
||||
- `can_access_private_events`: 非公開イベント参加権限
|
||||
- `team_validation_status`: チーム承認状況
|
||||
|
||||
#### 4. チェックイン拡張情報システム
|
||||
**実装ファイル**:
|
||||
- `rog/models.py`: `CheckinExtended`モデル追加
|
||||
- `create_checkin_extended_table.sql`: データベーステーブル作成
|
||||
- `rog/views_apis/api_play.py`: `checkin_from_rogapp`API拡張
|
||||
|
||||
**機能**:
|
||||
- GPS精度・座標情報の詳細記録
|
||||
- カメラメタデータ保存
|
||||
- 審査・検証システム
|
||||
- 詳細スコアリング機能
|
||||
- 自動審査フラグ
|
||||
|
||||
**拡張レスポンス例**:
|
||||
```json
|
||||
{
|
||||
"status": "OK",
|
||||
"message": "チェックポイントが正常に登録されました",
|
||||
"team_name": "チーム名",
|
||||
"cp_number": 1,
|
||||
"checkpoint_id": 123,
|
||||
"checkin_time": "2025-09-15 11:30:00",
|
||||
"point_value": 10,
|
||||
"bonus_points": 5,
|
||||
"scoring_breakdown": {
|
||||
"base_points": 10,
|
||||
"camera_bonus": 5,
|
||||
"total_points": 15
|
||||
},
|
||||
"validation_status": "pending",
|
||||
"requires_manual_review": false
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📋 データベース変更
|
||||
|
||||
### 新規テーブル
|
||||
1. **app_versions**: アプリバージョン管理
|
||||
2. **rog_checkin_extended**: チェックイン拡張情報
|
||||
|
||||
### 既存テーブル拡張
|
||||
1. **rog_newevent2**:
|
||||
- `status` VARCHAR(20): イベントステータス
|
||||
|
||||
2. **rog_entry**:
|
||||
- `staff_privileges` BOOLEAN: スタッフ権限
|
||||
- `can_access_private_events` BOOLEAN: 非公開イベント参加権限
|
||||
- `team_validation_status` VARCHAR(20): チーム承認状況
|
||||
|
||||
### インデックス追加
|
||||
- `idx_app_versions_platform`
|
||||
- `idx_app_versions_latest`
|
||||
- `idx_newevent2_status`
|
||||
- `idx_entry_staff_privileges`
|
||||
- `idx_checkin_extended_gpslog`
|
||||
|
||||
---
|
||||
|
||||
## 🔧 技術的実装詳細
|
||||
|
||||
### セキュリティ機能
|
||||
- アプリバージョンチェックは認証不要（AllowAny）
|
||||
- イベントアクセス権限チェック機能
|
||||
- スタッフ権限による非公開イベント制御
|
||||
|
||||
### パフォーマンス最適化
|
||||
- 適切なデータベースインデックス追加
|
||||
- JSON形式でのスコアリング詳細保存
|
||||
- 最新バージョンフラグによる高速検索
|
||||
|
||||
### エラーハンドリング
|
||||
- 包括的なバリデーション
|
||||
- 詳細なログ出力
|
||||
- ユーザーフレンドリーなエラーメッセージ
|
||||
|
||||
---
|
||||
|
||||
## 📂 実装ファイル一覧
|
||||
|
||||
### Core Files
|
||||
- `rog/models.py` - モデル定義
|
||||
- `rog/serializers.py` - シリアライザー
|
||||
- `rog/urls.py` - URLパターン
|
||||
|
||||
### New Files
|
||||
- `rog/app_version_views.py` - バージョンチェックAPI
|
||||
- `create_app_versions_table.sql` - アプリバージョンテーブル
|
||||
- `create_checkin_extended_table.sql` - チェックイン拡張テーブル
|
||||
- `api_requirements_migration.sql` - 全体マイグレーション
|
||||
|
||||
### Modified Files
|
||||
- `rog/views_apis/api_play.py` - チェックインAPI拡張
|
||||
|
||||
---
|
||||
|
||||
## 🚀 デプロイ手順
|
||||
|
||||
### 1. データベース移行
|
||||
```bash
|
||||
# PostgreSQLに接続
|
||||
psql -h localhost -U postgres -d rogdb
|
||||
|
||||
# マイグレーションスクリプト実行
|
||||
\i api_requirements_migration.sql
|
||||
\i create_app_versions_table.sql
|
||||
\i create_checkin_extended_table.sql
|
||||
```
|
||||
|
||||
### 2. Django設定
|
||||
```bash
|
||||
# モデル変更検出
|
||||
python manage.py makemigrations
|
||||
|
||||
# マイグレーション実行
|
||||
python manage.py migrate
|
||||
|
||||
# サーバー再起動
|
||||
sudo systemctl restart rogaining_srv
|
||||
```
|
||||
|
||||
### 3. 動作確認
|
||||
```bash
|
||||
# アプリバージョンチェックテスト
|
||||
curl -X POST http://localhost:8000/api/app/version-check/ \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"current_version": "1.0.0", "platform": "android"}'
|
||||
|
||||
# イベント一覧確認
|
||||
curl http://localhost:8000/api/newevent2-list/
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 パフォーマンス影響
|
||||
|
||||
### 予想される影響
|
||||
- **データベース容量**: 約5-10%増加（新テーブル・フィールド）
|
||||
- **API応答時間**: ほぼ影響なし（適切なインデックス配置）
|
||||
- **メモリ使用量**: 軽微な増加（新モデル定義）
|
||||
|
||||
### 監視項目
|
||||
- アプリバージョンチェックAPI応答時間
|
||||
- チェックイン拡張情報保存成功率
|
||||
- データベース接続プール使用率
|
||||
|
||||
---
|
||||
|
||||
## ⚠️ 注意事項
|
||||
|
||||
### 後方互換性
|
||||
- 既存API仕様は維持
|
||||
- 新フィールドは全てオプショナル
|
||||
- 段階的移行が可能
|
||||
|
||||
### データ整合性
|
||||
- `public`フィールドと`status`フィールドの整合性チェック実装
|
||||
- トランザクション処理による原子性保証
|
||||
|
||||
### 今後の課題
|
||||
- Location2025テーブルとの完全連携
|
||||
- リアルタイム通知システムの実装
|
||||
- 管理者向けダッシュボード強化
|
||||
|
||||
---
|
||||
|
||||
## 📞 次のアクション
|
||||
|
||||
### 🟢 中優先度項目（残り）
|
||||
1. **チェックポイント詳細情報API**: Location2025対応
|
||||
2. **管理者向け機能拡張**: 一括操作・リアルタイム監視
|
||||
3. **プッシュ通知システム**: FCM連携
|
||||
|
||||
### 実装予定
|
||||
- **9月3日まで**: 中優先度項目の実装
|
||||
- **9月10日まで**: テスト・検証完了
|
||||
- **9月15日**: 本番リリース
|
||||
|
||||
---
|
||||
|
||||
**実装完了日**: 2025年8月27日
|
||||
**実装者**: サーバー開発チーム
|
||||
**レビュー**: 技術リード
|
||||
**次回進捗確認**: 2025年9月3日
|
||||
@ -1,187 +0,0 @@
|
||||
# Deploy先でのMigration手順ガイド
|
||||
|
||||
## 推奨手順（安全なアプローチ）
|
||||
|
||||
### パターンA: 新規クリーンDeployment（推奨）
|
||||
|
||||
```bash
|
||||
# 1. 旧DBのバックアップ作成
|
||||
pg_dump rogaining_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 2. Git pullで最新コード取得
|
||||
git pull origin main
|
||||
|
||||
# 3. migration_simple_reset.pyで一括リセット（推奨）
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
|
||||
# 4. 必要に応じてデータ復元スクリプト実行
|
||||
# （既存データがある場合）
|
||||
```
|
||||
|
||||
### パターンB: 段階的Migration修正
|
||||
|
||||
```bash
|
||||
# 1. 旧DBのバックアップ作成
|
||||
pg_dump rogaining_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 2. Git pullで最新コード取得
|
||||
git pull origin main
|
||||
|
||||
# 3. 問題のあるmigrationファイルを一時的に削除
|
||||
rm rog/migrations/0011_auto_20250827_1459.py
|
||||
|
||||
# 4. 正常なmigrationまで適用
|
||||
docker compose exec app python manage.py migrate
|
||||
|
||||
# 5. migration_simple_reset.pyでクリーンアップ
|
||||
docker compose exec app python migration_simple_reset.py --reset-only
|
||||
docker compose exec app python migration_simple_reset.py --apply-only
|
||||
```
|
||||
|
||||
## ⚠️ 元の提案手順の問題点
|
||||
|
||||
```bash
|
||||
１）旧DBをリストア ✅ OK
|
||||
２）Git pull で最新コード設置 ✅ OK
|
||||
３）migrate してDB更新 ❌ 問題: 依存関係エラーで失敗する
|
||||
４）migration_simple_reset.py実行 ✅ OK
|
||||
```
|
||||
|
||||
**問題**: ステップ3で`NodeNotFoundError`が発生し、migrationが失敗します。
|
||||
|
||||
## 具体的なDeployment手順（本番推奨）
|
||||
|
||||
### 事前準備
|
||||
```bash
|
||||
# 本番環境への接続確認
|
||||
docker compose ps
|
||||
|
||||
# 現在のmigration状態確認
|
||||
docker compose exec app python manage.py showmigrations
|
||||
```
|
||||
|
||||
### 実行手順
|
||||
|
||||
#### Step 1: バックアップ作成
|
||||
```bash
|
||||
# データベースバックアップ
|
||||
docker compose exec postgres-db pg_dump -U admin rogaining_db > deploy_backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 現在のmigrationファイルバックアップ
|
||||
cp -r rog/migrations rog/migrations_backup_deploy_$(date +%Y%m%d_%H%M%S)
|
||||
```
|
||||
|
||||
#### Step 2: コード更新
|
||||
```bash
|
||||
# 最新コード取得
|
||||
git pull origin main
|
||||
|
||||
# migration_simple_reset.pyが存在することを確認
|
||||
ls -la migration_simple_reset.py
|
||||
```
|
||||
|
||||
#### Step 3: Migration リセット実行
|
||||
```bash
|
||||
# 全体的なリセット（推奨）
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
```
|
||||
|
||||
または段階的実行：
|
||||
```bash
|
||||
# バックアップのみ
|
||||
docker compose exec app python migration_simple_reset.py --backup-only
|
||||
|
||||
# リセットのみ
|
||||
docker compose exec app python migration_simple_reset.py --reset-only
|
||||
|
||||
# 適用のみ
|
||||
docker compose exec app python migration_simple_reset.py --apply-only
|
||||
```
|
||||
|
||||
#### Step 4: 結果確認
|
||||
```bash
|
||||
# Migration状態確認
|
||||
docker compose exec app python manage.py showmigrations
|
||||
|
||||
# アプリケーション動作確認
|
||||
docker compose exec app python manage.py check
|
||||
```
|
||||
|
||||
#### Step 5: サービス再起動
|
||||
```bash
|
||||
# アプリケーション再起動
|
||||
docker compose restart app
|
||||
|
||||
# 全サービス再起動（必要に応じて）
|
||||
docker compose restart
|
||||
```
|
||||
|
||||
## トラブルシューティング
|
||||
|
||||
### Migration失敗時の対処
|
||||
|
||||
```bash
|
||||
# 1. migration_simple_reset.pyでクリーンアップ
|
||||
docker compose exec app python migration_simple_reset.py --reset-only
|
||||
|
||||
# 2. 手動でmigration状態確認
|
||||
docker compose exec app python manage.py showmigrations
|
||||
|
||||
# 3. 必要に応じて個別migration適用
|
||||
docker compose exec app python manage.py migrate rog 0001 --fake
|
||||
```
|
||||
|
||||
### バックアップからの復元
|
||||
|
||||
```bash
|
||||
# データベース復元
|
||||
docker compose exec postgres-db psql -U admin -d rogaining_db < backup_file.sql
|
||||
|
||||
# migrationファイル復元
|
||||
rm -rf rog/migrations
|
||||
cp -r rog/migrations_backup_deploy_YYYYMMDD_HHMMSS rog/migrations
|
||||
```
|
||||
|
||||
## 重要な注意事項
|
||||
|
||||
### ✅ 実行前チェックリスト
|
||||
- [ ] データベースバックアップ作成済み
|
||||
- [ ] migrationファイルバックアップ作成済み
|
||||
- [ ] migration_simple_reset.pyが最新版
|
||||
- [ ] Docker環境が正常動作中
|
||||
- [ ] 十分なディスク容量確保
|
||||
|
||||
### ⚠️ 避けるべき操作
|
||||
- `python manage.py migrate`を最初に実行（依存関係エラーの原因）
|
||||
- バックアップなしでの作業
|
||||
- 本番環境での実験的操作
|
||||
|
||||
### 🔄 ロールバック計画
|
||||
```bash
|
||||
# 問題発生時の緊急復元
|
||||
docker compose down
|
||||
docker compose exec postgres-db psql -U admin -d rogaining_db < backup_file.sql
|
||||
cp -r rog/migrations_backup_deploy_YYYYMMDD_HHMMSS rog/migrations
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
## 結論
|
||||
|
||||
**推奨される最終手順:**
|
||||
|
||||
```bash
|
||||
# 1. バックアップ作成
|
||||
pg_dump rogaining_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 2. 最新コード取得
|
||||
git pull origin main
|
||||
|
||||
# 3. Migration一括リセット（問題を回避）
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
|
||||
# 4. 動作確認
|
||||
docker compose exec app python manage.py check
|
||||
docker compose restart app
|
||||
```
|
||||
|
||||
この手順により、Migration依存関係の問題を回避し、安全にデプロイが可能になります。
|
||||
@ -1,321 +0,0 @@
|
||||
# Deployment Migration Guide for Production Environment
|
||||
|
||||
## Recommended Procedure (Safe Approach)
|
||||
|
||||
### Pattern A: Fresh Clean Deployment (Recommended)
|
||||
|
||||
```bash
|
||||
# 1. Create backup of old database
|
||||
pg_dump rogaining_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 2. Get latest code with Git pull
|
||||
git pull origin main
|
||||
|
||||
# 3. Perform batch reset with migration_simple_reset.py (Recommended)
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
|
||||
# 4. Execute data restoration scripts if needed
|
||||
# (When existing data is present)
|
||||
```
|
||||
|
||||
### Pattern B: Gradual Migration Fix
|
||||
|
||||
```bash
|
||||
# 1. Create backup of old database
|
||||
pg_dump rogaining_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 2. Get latest code with Git pull
|
||||
git pull origin main
|
||||
|
||||
# 3. Temporarily remove problematic migration file
|
||||
rm rog/migrations/0011_auto_20250827_1459.py
|
||||
|
||||
# 4. Apply migrations up to the last working one
|
||||
docker compose exec app python manage.py migrate
|
||||
|
||||
# 5. Clean up with migration_simple_reset.py
|
||||
docker compose exec app python migration_simple_reset.py --reset-only
|
||||
docker compose exec app python migration_simple_reset.py --apply-only
|
||||
```
|
||||
|
||||
## ⚠️ Issues with Original Proposed Procedure
|
||||
|
||||
```bash
|
||||
1) Restore old DB ✅ OK
|
||||
2) Git pull to deploy latest code ✅ OK
|
||||
3) Run migrate to update DB ❌ Problem: Will fail with dependency error
|
||||
4) Execute migration_simple_reset.py ✅ OK
|
||||
```
|
||||
|
||||
**Issue**: Step 3 will encounter `NodeNotFoundError` and migration will fail.
|
||||
|
||||
## Specific Deployment Procedure (Production Recommended)
|
||||
|
||||
### Pre-deployment Preparation
|
||||
```bash
|
||||
# Verify connection to production environment
|
||||
docker compose ps
|
||||
|
||||
# Check current migration status
|
||||
docker compose exec app python manage.py showmigrations
|
||||
```
|
||||
|
||||
### Execution Steps
|
||||
|
||||
#### Step 1: Create Backups
|
||||
```bash
|
||||
# Database backup
|
||||
docker compose exec postgres-db pg_dump -U admin rogaining_db > deploy_backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# Current migration files backup
|
||||
cp -r rog/migrations rog/migrations_backup_deploy_$(date +%Y%m%d_%H%M%S)
|
||||
```
|
||||
|
||||
#### Step 2: Code Update
|
||||
```bash
|
||||
# Get latest code
|
||||
git pull origin main
|
||||
|
||||
# Verify migration_simple_reset.py exists
|
||||
ls -la migration_simple_reset.py
|
||||
```
|
||||
|
||||
#### Step 3: Execute Migration Reset
|
||||
```bash
|
||||
# Complete reset (recommended)
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
```
|
||||
|
||||
Or step-by-step execution:
|
||||
```bash
|
||||
# Backup only
|
||||
docker compose exec app python migration_simple_reset.py --backup-only
|
||||
|
||||
# Reset only
|
||||
docker compose exec app python migration_simple_reset.py --reset-only
|
||||
|
||||
# Apply only
|
||||
docker compose exec app python migration_simple_reset.py --apply-only
|
||||
```
|
||||
|
||||
#### Step 4: Verify Results
|
||||
```bash
|
||||
# Check migration status
|
||||
docker compose exec app python manage.py showmigrations
|
||||
|
||||
# Verify application functionality
|
||||
docker compose exec app python manage.py check
|
||||
```
|
||||
|
||||
#### Step 5: Restart Services
|
||||
```bash
|
||||
# Restart application
|
||||
docker compose restart app
|
||||
|
||||
# Restart all services (if needed)
|
||||
docker compose restart
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Migration Failure Recovery
|
||||
|
||||
```bash
|
||||
# 1. Clean up with migration_simple_reset.py
|
||||
docker compose exec app python migration_simple_reset.py --reset-only
|
||||
|
||||
# 2. Manually check migration status
|
||||
docker compose exec app python manage.py showmigrations
|
||||
|
||||
# 3. Apply individual migrations if needed
|
||||
docker compose exec app python manage.py migrate rog 0001 --fake
|
||||
```
|
||||
|
||||
### Restore from Backup
|
||||
|
||||
```bash
|
||||
# Database restoration
|
||||
docker compose exec postgres-db psql -U admin -d rogaining_db < backup_file.sql
|
||||
|
||||
# Migration files restoration
|
||||
rm -rf rog/migrations
|
||||
cp -r rog/migrations_backup_deploy_YYYYMMDD_HHMMSS rog/migrations
|
||||
```
|
||||
|
||||
## Important Considerations
|
||||
|
||||
### ✅ Pre-execution Checklist
|
||||
- [ ] Database backup created
|
||||
- [ ] Migration files backup created
|
||||
- [ ] migration_simple_reset.py is latest version
|
||||
- [ ] Docker environment running normally
|
||||
- [ ] Sufficient disk space available
|
||||
|
||||
### ⚠️ Operations to Avoid
|
||||
- Running `python manage.py migrate` first (causes dependency errors)
|
||||
- Working without backups
|
||||
- Experimental operations in production environment
|
||||
|
||||
### 🔄 Rollback Plan
|
||||
```bash
|
||||
# Emergency restoration when issues occur
|
||||
docker compose down
|
||||
docker compose exec postgres-db psql -U admin -d rogaining_db < backup_file.sql
|
||||
cp -r rog/migrations_backup_deploy_YYYYMMDD_HHMMSS rog/migrations
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
## Summary
|
||||
|
||||
**Recommended Final Procedure:**
|
||||
|
||||
```bash
|
||||
# 1. Create backup
|
||||
pg_dump rogaining_db > backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# 2. Get latest code
|
||||
git pull origin main
|
||||
|
||||
# 3. Batch migration reset (avoids issues)
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
|
||||
# 4. Verify functionality
|
||||
docker compose exec app python manage.py check
|
||||
docker compose restart app
|
||||
```
|
||||
|
||||
This procedure avoids migration dependency issues and enables safe deployment.
|
||||
|
||||
## Command Reference
|
||||
|
||||
### migration_simple_reset.py Options
|
||||
|
||||
```bash
|
||||
# Complete workflow
|
||||
python migration_simple_reset.py --full
|
||||
|
||||
# Backup only
|
||||
python migration_simple_reset.py --backup-only
|
||||
|
||||
# Reset only (requires existing backup)
|
||||
python migration_simple_reset.py --reset-only
|
||||
|
||||
# Apply only (requires simple migration to exist)
|
||||
python migration_simple_reset.py --apply-only
|
||||
```
|
||||
|
||||
### Docker Compose Commands
|
||||
|
||||
```bash
|
||||
# Check service status
|
||||
docker compose ps
|
||||
|
||||
# Execute commands in app container
|
||||
docker compose exec app [command]
|
||||
|
||||
# Execute commands in database container
|
||||
docker compose exec postgres-db [command]
|
||||
|
||||
# Restart specific service
|
||||
docker compose restart [service_name]
|
||||
|
||||
# View logs
|
||||
docker compose logs [service_name]
|
||||
```
|
||||
|
||||
### Database Operations
|
||||
|
||||
```bash
|
||||
# Create database backup
|
||||
docker compose exec postgres-db pg_dump -U admin rogaining_db > backup.sql
|
||||
|
||||
# Restore database
|
||||
docker compose exec postgres-db psql -U admin -d rogaining_db < backup.sql
|
||||
|
||||
# Connect to database shell
|
||||
docker compose exec postgres-db psql -U admin -d rogaining_db
|
||||
```
|
||||
|
||||
## Error Scenarios and Solutions
|
||||
|
||||
### Scenario 1: Migration Dependency Error
|
||||
**Error**: `NodeNotFoundError: Migration rog.0010_auto_20250827_1510 dependencies reference nonexistent parent node`
|
||||
|
||||
**Solution**:
|
||||
```bash
|
||||
docker compose exec app python migration_simple_reset.py --full
|
||||
```
|
||||
|
||||
### Scenario 2: Database Connection Error
|
||||
**Error**: Database connection issues during migration
|
||||
|
||||
**Solution**:
|
||||
```bash
|
||||
# Check database status
|
||||
docker compose ps postgres-db
|
||||
|
||||
# Restart database if needed
|
||||
docker compose restart postgres-db
|
||||
|
||||
# Wait for database to be ready
|
||||
docker compose exec postgres-db pg_isready -U admin
|
||||
```
|
||||
|
||||
### Scenario 3: Disk Space Issues
|
||||
**Error**: Insufficient disk space during backup or migration
|
||||
|
||||
**Solution**:
|
||||
```bash
|
||||
# Check disk usage
|
||||
df -h
|
||||
|
||||
# Clean up Docker resources
|
||||
docker system prune
|
||||
|
||||
# Remove old backups if safe
|
||||
rm old_backup_files.sql
|
||||
```
|
||||
|
||||
### Scenario 4: Permission Issues
|
||||
**Error**: Permission denied when executing scripts
|
||||
|
||||
**Solution**:
|
||||
```bash
|
||||
# Make script executable
|
||||
chmod +x migration_simple_reset.py
|
||||
|
||||
# Check file ownership
|
||||
ls -la migration_simple_reset.py
|
||||
|
||||
# Fix ownership if needed
|
||||
chown user:group migration_simple_reset.py
|
||||
```
|
||||
|
||||
## Best Practices
|
||||
|
||||
### 1. Always Create Backups
|
||||
- Database backup before any migration operation
|
||||
- Migration files backup for rollback capability
|
||||
- Configuration files backup
|
||||
|
||||
### 2. Test in Staging Environment
|
||||
- Verify the migration procedure in staging first
|
||||
- Test with production-like data volume
|
||||
- Validate application functionality after migration
|
||||
|
||||
### 3. Monitor During Deployment
|
||||
- Watch container logs during migration
|
||||
- Monitor database performance
|
||||
- Check application health endpoints
|
||||
|
||||
### 4. Document Changes
|
||||
- Record migration procedure execution
|
||||
- Note any deviations from standard procedure
|
||||
- Update deployment documentation
|
||||
|
||||
### 5. Plan for Rollback
|
||||
- Have clear rollback procedures ready
|
||||
- Test rollback in staging environment
|
||||
- Ensure backups are valid and accessible
|
||||
|
||||
This guide ensures safe and reliable deployment of the rogaining_srv application with proper migration handling.
|
||||
@ -1,8 +1,7 @@
|
||||
# FROM python:3.9.9-slim-buster
|
||||
FROM osgeo/gdal:ubuntu-small-3.4.0
|
||||
# Install GDAL dependencies
|
||||
WORKDIR /app
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
LABEL maintainer="nouffer@gmail.com"
|
||||
LABEL description="Development image for the Rogaining JP"
|
||||
@ -24,7 +23,7 @@ ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
|
||||
ENV C_INCLUDE_PATH=/usr/include/gdal
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get -y install netcat gcc postgresql curl \
|
||||
&& apt-get -y install netcat gcc postgresql \
|
||||
&& apt-get clean
|
||||
|
||||
RUN apt-get update \
|
||||
@ -39,70 +38,12 @@ RUN apt-get install -y python3
|
||||
RUN apt-get update && apt-get install -y \
|
||||
python3-pip
|
||||
|
||||
# libpqをアップグレード Added by Akira 2025-5-13
|
||||
RUN apt-get update && apt-get install -y \
|
||||
postgresql-client \
|
||||
libpq-dev \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# ベースイメージの更新とパッケージのインストール
|
||||
RUN apt-get update && \
|
||||
apt-get install -y \
|
||||
libreoffice \
|
||||
libreoffice-calc \
|
||||
libreoffice-writer \
|
||||
libreoffice-java-common \
|
||||
fonts-ipafont \
|
||||
fonts-ipafont-gothic \
|
||||
fonts-ipafont-mincho \
|
||||
language-pack-ja \
|
||||
fontconfig \
|
||||
locales \
|
||||
python3-uno # LibreOffice Python バインディング
|
||||
|
||||
|
||||
# 日本語ロケールの設定
|
||||
RUN locale-gen ja_JP.UTF-8
|
||||
ENV LANG=ja_JP.UTF-8
|
||||
ENV LC_ALL=ja_JP.UTF-8
|
||||
ENV LANGUAGE=ja_JP:ja
|
||||
|
||||
# フォント設定ファイルをコピー
|
||||
COPY config/fonts.conf /etc/fonts/local.conf
|
||||
|
||||
# フォントキャッシュの更新
|
||||
RUN fc-cache -f -v
|
||||
|
||||
# LibreOfficeの作業ディレクトリを作成
|
||||
RUN mkdir -p /var/cache/libreoffice && \
|
||||
chmod 777 /var/cache/libreoffice
|
||||
|
||||
# フォント設定の権限を設定
|
||||
RUN chmod 644 /etc/fonts/local.conf
|
||||
|
||||
|
||||
# 作業ディレクトリとパーミッションの設定
|
||||
RUN mkdir -p /app/docbase /tmp/libreoffice && \
|
||||
chmod -R 777 /app/docbase /tmp/libreoffice
|
||||
|
||||
|
||||
RUN pip install --upgrade pip
|
||||
|
||||
# Copy the package directory first
|
||||
COPY SumasenLibs/excel_lib /app/SumasenLibs/excel_lib
|
||||
COPY ./docbase /app/docbase
|
||||
|
||||
# Install the package in editable mode
|
||||
RUN pip install -e /app/SumasenLibs/excel_lib
|
||||
|
||||
|
||||
RUN apt-get update
|
||||
|
||||
COPY ./requirements.txt /app/requirements.txt
|
||||
|
||||
RUN pip install boto3==1.26.137
|
||||
|
||||
# Install Gunicorn
|
||||
RUN pip install gunicorn
|
||||
|
||||
|
||||
@ -30,6 +30,6 @@ RUN chown -R nginx:nginx /usr/share/nginx/html \
|
||||
&& chown -R nginx:nginx /var/log/nginx \
|
||||
&& chown -R nginx:nginx /etc/nginx/conf.d
|
||||
|
||||
#EXPOSE 8100
|
||||
EXPOSE 80
|
||||
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
@ -1,559 +0,0 @@
|
||||
# Integrated Database Design Document (Updated Version)
|
||||
|
||||
## 1. Overview
|
||||
|
||||
### 1.1 Purpose
|
||||
Solve the "impossible passage data" issue by migrating past GPS check-in data from gifuroge (MobServer) to rogdb (Django).
|
||||
Achieve accurate Japan Standard Time (JST) location information management through timezone conversion and data cleansing.
|
||||
|
||||
### 1.2 Basic Policy
|
||||
- **GPS-Only Migration**: Target only reliable GPS data (serial_number < 20000)
|
||||
- **Timezone Unification**: Accurate UTC → JST conversion for Japan time standardization
|
||||
- **Data Cleansing**: Complete removal of 2023 test data contamination
|
||||
- **PostGIS Integration**: Continuous operation of geographic information system
|
||||
|
||||
### 1.3 Migration Approach
|
||||
- **Selective Integration**: Exclude contaminated photo records, migrate GPS records only
|
||||
- **Timezone Correction**: UTC→JST conversion using pytz library
|
||||
- **Staged Verification**: Event-by-event and team-by-team data integrity verification
|
||||
|
||||
## 2. Migration Results and Achievements
|
||||
|
||||
### 2.1 Migration Data Statistics (Updated August 24, 2025)
|
||||
|
||||
#### GPS Migration Results (Note: GPS data migration not completed)
|
||||
```
|
||||
❌ GPS Migration Status: INCOMPLETE
|
||||
📊 gps_information table: 0 records (documented as completed but actual data absent)
|
||||
📊 rog_gpslog table: 0 records
|
||||
⚠️ GPS migration documentation was inaccurate - no actual GPS data found in database
|
||||
```
|
||||
|
||||
#### Location2025 Migration Results (Completed August 24, 2025)
|
||||
```
|
||||
✅ Location2025 Migration Status: INITIATED
|
||||
📊 Original Location records: 7,740 checkpoint records
|
||||
<EFBFBD> Migrated Location2025 records: 99 records (1.3% completed)
|
||||
<EFBFBD> Target event: 関ケ原２ (Sekigahara 2)
|
||||
🎯 API compatibility: Verified and functional with Location2025
|
||||
🔄 Remaining migration: 7,641 records pending
|
||||
```
|
||||
|
||||
#### Event-wise Migration Results (Top 10 Events)
|
||||
```
|
||||
1. Gujo: 2,751 records (41 teams)
|
||||
2. Minokamo: 1,671 records (74 teams)
|
||||
3. Yoro Roge: 1,536 records (56 teams)
|
||||
4. Gifu City: 1,368 records (67 teams)
|
||||
5. Ogaki 2: 1,074 records (64 teams)
|
||||
6. Kakamigahara: 845 records (51 teams)
|
||||
7. Gero: 814 records (32 teams)
|
||||
8. Nakatsugawa: 662 records (30 teams)
|
||||
9. Ibigawa: 610 records (38 teams)
|
||||
10. Takayama: 589 records (28 teams)
|
||||
```
|
||||
|
||||
### 2.2 Current Issues Identified (Updated August 24, 2025)
|
||||
|
||||
#### GPS Migration Status Issue
|
||||
- **Documentation vs Reality**: Document claimed successful GPS migration but database shows 0 GPS records
|
||||
- **Missing GPS Data**: Neither gps_information nor rog_gpslog tables contain any records
|
||||
- **Investigation Required**: Original gifuroge GPS data migration needs to be re-executed
|
||||
|
||||
#### Location2025 Migration Progress
|
||||
- **API Dependency Resolved**: Location2025 table now has 99 functional records supporting API operations
|
||||
- **Partial Migration Completed**: 1.3% of Location records successfully migrated to Location2025
|
||||
- **Model Structure Verified**: Correct field mapping established (Location.cp → Location2025.cp_number)
|
||||
- **Geographic Data Integrity**: PostGIS Point fields correctly configured and functional
|
||||
|
||||
### 2.3 Successful Solutions Implemented (Updated August 24, 2025)
|
||||
|
||||
#### Location2025 Migration Architecture
|
||||
- **Field Mapping Corrections**:
|
||||
- Location.cp → Location2025.cp_number
|
||||
- Location.location_name → Location2025.cp_name
|
||||
- Location.longitude/latitude → Location2025.location (Point field)
|
||||
- **Event Association**: All Location2025 records correctly linked to 関ケ原２ event
|
||||
- **API Compatibility**: get_checkpoint_list function verified working with Location2025 data
|
||||
- **Geographic Data Format**: SRID=4326 Point format: `POINT (136.610666 35.405467)`
|
||||
|
||||
### 2.3 Existing Data Protection Issues and Solutions (Added August 22, 2025)
|
||||
|
||||
#### Critical Issues Discovered
|
||||
- **Core Application Data Deletion**: Migration program was deleting existing entry, team, member data
|
||||
- **Backup Data Not Restored**: 243 entry records existing in testdb/rogdb.sql were not restored
|
||||
- **Supervisor Function Stopped**: Zekken number candidate display functionality was not working
|
||||
|
||||
#### Implemented Protection Measures
|
||||
- **Selective Deletion**: Clean up GPS check-in data only, protect core data
|
||||
- **Existing Data Verification**: Check existence of entry, team, member data before migration
|
||||
- **Migration Identification**: Add 'migrated_from_gifuroge' marker to migrated GPS data
|
||||
- **Dedicated Restoration Script**: Selectively restore core data only from testdb/rogdb.sql
|
||||
|
||||
#### Solution File List
|
||||
1. **migration_data_protection.py**: Existing data protection version migration program
|
||||
2. **restore_core_data.py**: Core data restoration script from backup
|
||||
3. **Integrated_Database_Design_Document.md**: Record of issues and solutions (this document)
|
||||
4. **Integrated_Migration_Operation_Manual.md**: Updated migration operation manual
|
||||
|
||||
#### Root Cause Analysis
|
||||
```
|
||||
Root Cause of the Problem:
|
||||
1. clean_target_database() function in migration_clean_final.py
|
||||
2. Indiscriminate DELETE statements removing core application data
|
||||
3. testdb/rogdb.sql backup data not restored
|
||||
|
||||
Solutions:
|
||||
1. Selective deletion by migration_data_protection.py
|
||||
2. Existing data restoration by restore_core_data.py
|
||||
3. Migration process review and manual updates
|
||||
```
|
||||
|
||||
## 3. Technical Implementation
|
||||
|
||||
### 3.1 Existing Data Protection Migration Program (migration_data_protection.py)
|
||||
|
||||
```python
|
||||
def clean_target_database_selective(target_cursor):
|
||||
"""Selective cleanup of target database (protecting existing data)"""
|
||||
print("=== Selective Target Database Cleanup ===")
|
||||
|
||||
# Temporarily disable foreign key constraints
|
||||
target_cursor.execute("SET session_replication_role = replica;")
|
||||
|
||||
try:
|
||||
# Clean up GPS check-in data only (prevent duplicate migration)
|
||||
target_cursor.execute("DELETE FROM rog_gpscheckin WHERE comment = 'migrated_from_gifuroge'")
|
||||
deleted_checkins = target_cursor.rowcount
|
||||
print(f"Deleted previous migration GPS check-in data: {deleted_checkins} records")
|
||||
|
||||
# Note: rog_entry, rog_team, rog_member are NOT deleted!
|
||||
print("Note: Existing entry, team, member data are protected")
|
||||
|
||||
finally:
|
||||
# Re-enable foreign key constraints
|
||||
target_cursor.execute("SET session_replication_role = DEFAULT;")
|
||||
|
||||
def backup_existing_data(target_cursor):
|
||||
"""Check existing data backup status"""
|
||||
print("\n=== Existing Data Protection Check ===")
|
||||
|
||||
# Check existing data counts
|
||||
target_cursor.execute("SELECT COUNT(*) FROM rog_entry")
|
||||
entry_count = target_cursor.fetchone()[0]
|
||||
|
||||
target_cursor.execute("SELECT COUNT(*) FROM rog_team")
|
||||
team_count = target_cursor.fetchone()[0]
|
||||
|
||||
target_cursor.execute("SELECT COUNT(*) FROM rog_member")
|
||||
member_count = target_cursor.fetchone()[0]
|
||||
|
||||
if entry_count > 0 or team_count > 0 or member_count > 0:
|
||||
print("✅ Existing core application data detected. These will be protected.")
|
||||
return True
|
||||
else:
|
||||
print("⚠️ No existing core application data found.")
|
||||
print(" Separate restoration from testdb/rogdb.sql is required")
|
||||
return False
|
||||
```
|
||||
|
||||
### 3.2 Core Data Restoration from Backup (restore_core_data.py)
|
||||
|
||||
```python
|
||||
def extract_core_data_from_backup():
|
||||
"""Extract core data sections from backup file"""
|
||||
backup_file = '/app/testdb/rogdb.sql'
|
||||
temp_file = '/tmp/core_data_restore.sql'
|
||||
|
||||
with open(backup_file, 'r', encoding='utf-8') as f_in, open(temp_file, 'w', encoding='utf-8') as f_out:
|
||||
in_data_section = False
|
||||
current_table = None
|
||||
|
||||
for line_num, line in enumerate(f_in, 1):
|
||||
# Detect start of COPY command
|
||||
if line.startswith('COPY public.rog_entry '):
|
||||
current_table = 'rog_entry'
|
||||
in_data_section = True
|
||||
f_out.write(line)
|
||||
elif line.startswith('COPY public.rog_team '):
|
||||
current_table = 'rog_team'
|
||||
in_data_section = True
|
||||
f_out.write(line)
|
||||
elif in_data_section:
|
||||
f_out.write(line)
|
||||
# Detect end of data section
|
||||
if line.strip() == '\\.':
|
||||
in_data_section = False
|
||||
current_table = None
|
||||
|
||||
def restore_core_data(cursor, restore_file):
|
||||
"""Restore core data"""
|
||||
# Temporarily disable foreign key constraints
|
||||
cursor.execute("SET session_replication_role = replica;")
|
||||
|
||||
try:
|
||||
# Clean up existing core data
|
||||
cursor.execute("DELETE FROM rog_entrymember")
|
||||
cursor.execute("DELETE FROM rog_entry")
|
||||
cursor.execute("DELETE FROM rog_member")
|
||||
cursor.execute("DELETE FROM rog_team")
|
||||
|
||||
# Execute SQL file
|
||||
with open(restore_file, 'r', encoding='utf-8') as f:
|
||||
sql_content = f.read()
|
||||
cursor.execute(sql_content)
|
||||
|
||||
finally:
|
||||
# Re-enable foreign key constraints
|
||||
cursor.execute("SET session_replication_role = DEFAULT;")
|
||||
```
|
||||
|
||||
### 3.3 Legacy Migration Program (migration_final_simple.py) - PROHIBITED
|
||||
|
||||
### 3.3 Legacy Migration Program (migration_final_simple.py) - PROHIBITED
|
||||
|
||||
**⚠️ CRITICAL WARNING**: This program is prohibited due to existing data deletion
|
||||
|
||||
```python
|
||||
def clean_target_database(target_cursor):
|
||||
"""❌ DANGEROUS: Problematic code that deletes existing data"""
|
||||
|
||||
# ❌ The following code deletes existing core application data
|
||||
target_cursor.execute("DELETE FROM rog_entry") # Deletes existing entry data
|
||||
target_cursor.execute("DELETE FROM rog_team") # Deletes existing team data
|
||||
target_cursor.execute("DELETE FROM rog_member") # Deletes existing member data
|
||||
|
||||
# This deletion causes zekken number candidates to not display in supervisor screen
|
||||
```
|
||||
|
||||
### 3.4 Database Schema Design
|
||||
```python
|
||||
class GpsCheckin(models.Model):
|
||||
serial_number = models.AutoField(primary_key=True)
|
||||
event_code = models.CharField(max_length=50)
|
||||
zekken = models.CharField(max_length=20) # Team number
|
||||
cp_number = models.IntegerField() # Checkpoint number
|
||||
|
||||
# Timezone-corrected timestamps
|
||||
checkin_time = models.DateTimeField() # JST converted time
|
||||
record_time = models.DateTimeField() # Original record time
|
||||
goal_time = models.CharField(max_length=20, blank=True)
|
||||
|
||||
# Scoring and flags
|
||||
late_point = models.IntegerField(default=0)
|
||||
buy_flag = models.BooleanField(default=False)
|
||||
minus_photo_flag = models.BooleanField(default=False)
|
||||
|
||||
# Media and metadata
|
||||
image_address = models.CharField(max_length=500, blank=True)
|
||||
create_user = models.CharField(max_length=100, blank=True)
|
||||
update_user = models.CharField(max_length=100, blank=True)
|
||||
colabo_company_memo = models.TextField(blank=True)
|
||||
|
||||
class Meta:
|
||||
db_table = 'rog_gpscheckin'
|
||||
indexes = [
|
||||
models.Index(fields=['event_code', 'zekken']),
|
||||
models.Index(fields=['checkin_time']),
|
||||
models.Index(fields=['cp_number']),
|
||||
]
|
||||
```
|
||||
|
||||
### 3.2 Timezone Conversion Logic
|
||||
|
||||
#### UTC to JST Conversion Implementation
|
||||
```python
|
||||
import pytz
|
||||
from datetime import datetime
|
||||
|
||||
def convert_utc_to_jst(utc_time):
|
||||
"""Convert UTC datetime to JST with proper timezone handling"""
|
||||
if not utc_time:
|
||||
return None
|
||||
|
||||
# Ensure UTC timezone
|
||||
if utc_time.tzinfo is None:
|
||||
utc_time = utc_time.replace(tzinfo=pytz.UTC)
|
||||
|
||||
# Convert to JST
|
||||
jst_tz = pytz.timezone('Asia/Tokyo')
|
||||
jst_time = utc_time.astimezone(jst_tz)
|
||||
|
||||
return jst_time
|
||||
|
||||
def get_event_date(team_name):
|
||||
"""Map team names to event dates for accurate timezone conversion"""
|
||||
event_mapping = {
|
||||
'郡上': '2024-05-19',
|
||||
'美濃加茂': '2024-11-03',
|
||||
'養老ロゲ': '2024-04-07',
|
||||
'岐阜市': '2023-11-19',
|
||||
'大垣２': '2023-05-14',
|
||||
'各務原': '2023-02-19',
|
||||
'下呂': '2024-10-27',
|
||||
'中津川': '2024-09-08',
|
||||
'揖斐川': '2023-10-01',
|
||||
'高山': '2024-03-03',
|
||||
'恵那': '2023-04-09',
|
||||
'可児': '2023-06-11'
|
||||
}
|
||||
return event_mapping.get(team_name, '2024-01-01')
|
||||
```
|
||||
|
||||
### 3.3 Data Quality Assurance
|
||||
|
||||
#### GPS Data Filtering Strategy
|
||||
```python
|
||||
def migrate_gps_data():
|
||||
"""Migrate GPS-only data with contamination filtering"""
|
||||
|
||||
# Filter reliable GPS data only (serial_number < 20000)
|
||||
source_cursor.execute("""
|
||||
SELECT serial_number, team_name, cp_number, record_time,
|
||||
goal_time, late_point, buy_flag, image_address,
|
||||
minus_photo_flag, create_user, update_user,
|
||||
colabo_company_memo
|
||||
FROM gps_information
|
||||
WHERE serial_number < 20000 -- GPS data only
|
||||
AND record_time IS NOT NULL
|
||||
ORDER BY serial_number
|
||||
""")
|
||||
|
||||
gps_records = source_cursor.fetchall()
|
||||
|
||||
for record in gps_records:
|
||||
# Apply timezone conversion
|
||||
if record[3]: # record_time
|
||||
jst_time = convert_utc_to_jst(record[3])
|
||||
checkin_time = jst_time.strftime('%Y-%m-%d %H:%M:%S+00:00')
|
||||
|
||||
# Insert into target database with proper schema
|
||||
target_cursor.execute("""
|
||||
INSERT INTO rog_gpscheckin
|
||||
(serial_number, event_code, zekken, cp_number,
|
||||
checkin_time, record_time, goal_time, late_point,
|
||||
buy_flag, image_address, minus_photo_flag,
|
||||
create_user, update_user, colabo_company_memo)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", migration_data)
|
||||
```
|
||||
|
||||
## 4. Performance Optimization
|
||||
|
||||
### 4.1 Database Indexing Strategy
|
||||
|
||||
#### Optimized Index Design
|
||||
```sql
|
||||
-- Primary indexes for GPS check-in data
|
||||
CREATE INDEX idx_gps_event_team ON rog_gpscheckin(event_code, zekken);
|
||||
CREATE INDEX idx_gps_checkin_time ON rog_gpscheckin(checkin_time);
|
||||
CREATE INDEX idx_gps_checkpoint ON rog_gpscheckin(cp_number);
|
||||
CREATE INDEX idx_gps_serial ON rog_gpscheckin(serial_number);
|
||||
|
||||
-- Performance indexes for queries
|
||||
CREATE INDEX idx_gps_team_checkpoint ON rog_gpscheckin(zekken, cp_number);
|
||||
CREATE INDEX idx_gps_time_range ON rog_gpscheckin(checkin_time, event_code);
|
||||
```
|
||||
|
||||
### 4.2 Query Optimization
|
||||
|
||||
#### Ranking Calculation Optimization
|
||||
```python
|
||||
class RankingManager(models.Manager):
|
||||
def get_team_ranking(self, event_code):
|
||||
"""Optimized team ranking calculation"""
|
||||
return self.filter(
|
||||
event_code=event_code
|
||||
).values(
|
||||
'zekken', 'event_code'
|
||||
).annotate(
|
||||
total_checkins=models.Count('cp_number', distinct=True),
|
||||
total_late_points=models.Sum('late_point'),
|
||||
last_checkin=models.Max('checkin_time')
|
||||
).order_by('-total_checkins', 'total_late_points')
|
||||
|
||||
def get_checkpoint_statistics(self, event_code):
|
||||
"""Checkpoint visit statistics"""
|
||||
return self.filter(
|
||||
event_code=event_code
|
||||
).values(
|
||||
'cp_number'
|
||||
).annotate(
|
||||
visit_count=models.Count('zekken', distinct=True),
|
||||
total_visits=models.Count('serial_number')
|
||||
).order_by('cp_number')
|
||||
```
|
||||
|
||||
## 5. Data Validation and Quality Control
|
||||
|
||||
### 5.1 Migration Validation Results
|
||||
|
||||
#### Data Integrity Verification
|
||||
```sql
|
||||
-- Timezone conversion validation
|
||||
SELECT
|
||||
COUNT(*) as total_records,
|
||||
COUNT(CASE WHEN EXTRACT(hour FROM checkin_time) = 0 THEN 1 END) as zero_hour_records,
|
||||
COUNT(CASE WHEN checkin_time IS NOT NULL THEN 1 END) as valid_timestamps
|
||||
FROM rog_gpscheckin;
|
||||
|
||||
-- Expected Results:
|
||||
-- total_records: 12,665
|
||||
-- zero_hour_records: 1 (one legacy test record)
|
||||
-- valid_timestamps: 12,665
|
||||
```
|
||||
|
||||
#### Event Distribution Validation
|
||||
```sql
|
||||
-- Event-wise data distribution
|
||||
SELECT
|
||||
event_code,
|
||||
COUNT(*) as record_count,
|
||||
COUNT(DISTINCT zekken) as team_count,
|
||||
MIN(checkin_time) as earliest_checkin,
|
||||
MAX(checkin_time) as latest_checkin
|
||||
FROM rog_gpscheckin
|
||||
GROUP BY event_code
|
||||
ORDER BY record_count DESC;
|
||||
```
|
||||
|
||||
### 5.2 Data Quality Metrics
|
||||
|
||||
#### Quality Assurance KPIs
|
||||
- **Timezone Accuracy**: 99.99% (12,664/12,665 records correctly converted)
|
||||
- **Data Completeness**: 100% of GPS records migrated
|
||||
- **Contamination Removal**: 2,136 photo test records excluded
|
||||
- **Foreign Key Integrity**: All records properly linked to events and teams
|
||||
|
||||
## 6. Monitoring and Maintenance
|
||||
|
||||
### 6.1 Performance Monitoring
|
||||
|
||||
#### Key Performance Indicators
|
||||
```python
|
||||
# Performance monitoring queries
|
||||
def check_migration_health():
|
||||
"""Health check for migrated data"""
|
||||
|
||||
# Check for timezone anomalies
|
||||
zero_hour_count = GpsCheckin.objects.filter(
|
||||
checkin_time__hour=0
|
||||
).count()
|
||||
|
||||
# Check for data completeness
|
||||
total_records = GpsCheckin.objects.count()
|
||||
|
||||
# Check for foreign key integrity
|
||||
orphaned_records = GpsCheckin.objects.filter(
|
||||
event_code__isnull=True
|
||||
).count()
|
||||
|
||||
return {
|
||||
'total_records': total_records,
|
||||
'zero_hour_anomalies': zero_hour_count,
|
||||
'orphaned_records': orphaned_records,
|
||||
'health_status': 'healthy' if zero_hour_count <= 1 and orphaned_records == 0 else 'warning'
|
||||
}
|
||||
```
|
||||
|
||||
### 6.2 Backup and Recovery
|
||||
|
||||
#### Automated Backup Strategy
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# backup_migrated_data.sh
|
||||
|
||||
BACKUP_DIR="/backup/rogaining_migrated"
|
||||
DATE=$(date +%Y%m%d_%H%M%S)
|
||||
|
||||
# PostgreSQL backup with GPS data
|
||||
pg_dump \
|
||||
--host=postgres-db \
|
||||
--port=5432 \
|
||||
--username=admin \
|
||||
--dbname=rogdb \
|
||||
--table=rog_gpscheckin \
|
||||
--format=custom \
|
||||
--file="${BACKUP_DIR}/gps_data_${DATE}.dump"
|
||||
|
||||
# Verify backup integrity
|
||||
pg_restore --list "${BACKUP_DIR}/gps_data_${DATE}.dump" > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "Backup verification successful: gps_data_${DATE}.dump"
|
||||
else
|
||||
echo "Backup verification failed: gps_data_${DATE}.dump"
|
||||
exit 1
|
||||
fi
|
||||
```
|
||||
|
||||
## 7. Future Enhancements
|
||||
|
||||
### 7.1 Scalability Considerations
|
||||
|
||||
#### Horizontal Scaling Preparation
|
||||
```python
|
||||
class GpsCheckinPartitioned(models.Model):
|
||||
"""Future partitioned model for large-scale data"""
|
||||
|
||||
class Meta:
|
||||
db_table = 'rog_gpscheckin_partitioned'
|
||||
# Partition by event_code or year for better performance
|
||||
|
||||
@classmethod
|
||||
def create_partition(cls, event_code):
|
||||
"""Create partition for specific event"""
|
||||
with connection.cursor() as cursor:
|
||||
cursor.execute(f"""
|
||||
CREATE TABLE rog_gpscheckin_{event_code}
|
||||
PARTITION OF rog_gpscheckin_partitioned
|
||||
FOR VALUES IN ('{event_code}')
|
||||
""")
|
||||
```
|
||||
|
||||
### 7.2 Real-time Integration
|
||||
|
||||
#### Future Real-time GPS Integration
|
||||
```python
|
||||
class RealtimeGpsHandler:
|
||||
"""Future real-time GPS data processing"""
|
||||
|
||||
@staticmethod
|
||||
def process_gps_stream(gps_data):
|
||||
"""Process real-time GPS data with timezone conversion"""
|
||||
jst_time = convert_utc_to_jst(gps_data['timestamp'])
|
||||
|
||||
GpsCheckin.objects.create(
|
||||
event_code=gps_data['event_code'],
|
||||
zekken=gps_data['team_number'],
|
||||
cp_number=gps_data['checkpoint'],
|
||||
checkin_time=jst_time,
|
||||
# Additional real-time fields
|
||||
)
|
||||
```
|
||||
|
||||
## 8. Conclusion
|
||||
|
||||
### 8.1 Migration Success Summary
|
||||
|
||||
The database integration project successfully achieved its primary objectives:
|
||||
|
||||
1. **Problem Resolution**: Completely solved the "impossible passage data" issue through accurate timezone conversion
|
||||
2. **Data Quality**: Achieved 99.99% data quality with proper contamination removal
|
||||
3. **System Unification**: Successfully migrated 12,665 GPS records across 12 events
|
||||
4. **Performance**: Optimized database structure with proper indexing for efficient queries
|
||||
|
||||
### 8.2 Technical Achievements
|
||||
|
||||
- **Timezone Accuracy**: UTC to JST conversion with pytz library ensuring accurate Japan time
|
||||
- **Data Cleansing**: Complete removal of contaminated photo test data
|
||||
- **Schema Optimization**: Proper database design with appropriate indexes and constraints
|
||||
- **Scalability**: Future-ready architecture for additional features and data growth
|
||||
|
||||
### 8.3 Operational Benefits
|
||||
|
||||
- **Unified Management**: Single Django interface for all GPS check-in data
|
||||
- **Improved Accuracy**: Accurate timestamp display resolving user confusion
|
||||
- **Enhanced Performance**: Optimized queries and indexing for fast data retrieval
|
||||
- **Maintainability**: Clean codebase with proper documentation and validation
|
||||
|
||||
The integrated database design provides a solid foundation for continued operation of the rogaining system with accurate, reliable GPS check-in data management.
|
||||
@ -1,545 +0,0 @@
|
||||
# Integrated Migration Operation Manual (Updated Implementation & Verification Status)
|
||||
|
||||
## 📋 Overview
|
||||
|
||||
Implementation record and verification results for migration processes from gifuroge (MobServer) to rogdb (Django) and Location2025 model migration
|
||||
|
||||
**Target System**: Rogaining Migration Verification & Correction
|
||||
**Implementation Date**: August 21, 2025 (Updated: August 24, 2025)
|
||||
**Version**: v4.0 (Verification & Correction Version)
|
||||
**Migration Status**: ⚠️ Partially Completed with Critical Issues Found
|
||||
|
||||
## 🎯 Migration Status Summary
|
||||
|
||||
### 📊 Current Migration Status (Updated August 24, 2025)
|
||||
- **GPS Migration**: ❌ **FAILED** - Document claimed success but database shows 0 records
|
||||
- **Location2025 Migration**: ✅ **INITIATED** - 99/7740 records (1.3%) successfully migrated
|
||||
- **API Compatibility**: ✅ **VERIFIED** - Location2025 integration confirmed functional
|
||||
- **Documentation Accuracy**: ❌ **INACCURATE** - GPS migration claims were false
|
||||
|
||||
### ⚠️ Critical Issues Identified
|
||||
1. **GPS Migration Documentation Error**: Claims of 12,665 migrated GPS records were false
|
||||
2. **Empty GPS Tables**: Both gps_information and rog_gpslog tables contain 0 records
|
||||
3. **Location2025 API Dependency**: System requires Location2025 data for checkpoint APIs
|
||||
4. **Incomplete Migration**: 7,641 Location records still need Location2025 migration
|
||||
|
||||
### ✅ Successful Implementations
|
||||
1. **Location2025 Model Migration**: 99 records successfully migrated with correct geographic data
|
||||
2. **API Integration**: get_checkpoint_list function verified working with Location2025
|
||||
3. **Geographic Data Format**: PostGIS Point fields correctly configured (SRID=4326)
|
||||
4. **Event Association**: All Location2025 records properly linked to 関ケ原２ event
|
||||
|
||||
## 🔧 Current Migration Procedures (Updated August 24, 2025)
|
||||
|
||||
### Phase 1: Migration Status Verification (Completed August 24, 2025)
|
||||
|
||||
#### 1.1 GPS Migration Status Verification
|
||||
```sql
|
||||
-- Verify claimed GPS migration results
|
||||
SELECT COUNT(*) FROM gps_information; -- Result: 0 (not 12,665 as documented)
|
||||
SELECT COUNT(*) FROM rog_gpslog; -- Result: 0
|
||||
SELECT COUNT(*) FROM rog_gpscheckin; -- Result: 0
|
||||
|
||||
-- Conclusion: GPS migration documentation was inaccurate
|
||||
```
|
||||
|
||||
#### 1.2 Location2025 Migration Status Verification
|
||||
```sql
|
||||
-- Verify Location2025 migration progress
|
||||
SELECT COUNT(*) FROM rog_location; -- Result: 7,740 original records
|
||||
SELECT COUNT(*) FROM rog_location2025; -- Result: 99 migrated records
|
||||
|
||||
-- Verify API-critical data structure
|
||||
SELECT cp_number, cp_name, ST_AsText(location) as coordinates
|
||||
FROM rog_location2025
|
||||
LIMIT 3;
|
||||
-- Result: Proper Point geometry and checkpoint data confirmed
|
||||
```
|
||||
|
||||
### Phase 2: Location2025 Migration Implementation (Completed August 24, 2025)
|
||||
|
||||
#### 2.1 Model Structure Verification
|
||||
```python
|
||||
# Field mapping corrections identified:
|
||||
# Location.cp → Location2025.cp_number
|
||||
# Location.location_name → Location2025.cp_name
|
||||
# Location.longitude/latitude → Location2025.location (Point field)
|
||||
|
||||
# Successful migration pattern:
|
||||
from django.contrib.gis.geos import Point
|
||||
from rog.models import Location, Location2025, NewEvent2
|
||||
|
||||
target_event = NewEvent2.objects.get(event_name='関ケ原２')
|
||||
|
||||
for old_location in Location.objects.all()[:100]: # Test batch
|
||||
Location2025.objects.create(
|
||||
event=target_event,
|
||||
cp_number=old_location.cp, # Correct field mapping
|
||||
cp_name=old_location.location_name,
|
||||
location=Point(old_location.longitude, old_location.latitude),
|
||||
# ... other field mappings
|
||||
)
|
||||
```
|
||||
|
||||
#### 2.2 API Integration Verification
|
||||
```python
|
||||
# Verified working API endpoint:
|
||||
from rog.views_apis.api_play import get_checkpoint_list
|
||||
|
||||
# API successfully returns checkpoint data from Location2025 table
|
||||
# Geographic data properly formatted as SRID=4326 Point objects
|
||||
# Event association correctly implemented
|
||||
```
|
||||
|
||||
### Phase 3: Existing Data Protection Procedures (Added August 22, 2025)
|
||||
|
||||
#### 3.1 Pre-Migration Existing Data Verification
|
||||
|
||||
```bash
|
||||
# Verify existing core application data
|
||||
docker compose exec postgres-db psql -h localhost -p 5432 -U admin -d rogdb -c "
|
||||
SELECT
|
||||
'rog_entry' as table_name, COUNT(*) as count FROM rog_entry
|
||||
UNION ALL
|
||||
SELECT
|
||||
'rog_team' as table_name, COUNT(*) as count FROM rog_team
|
||||
UNION ALL
|
||||
SELECT
|
||||
'rog_member' as table_name, COUNT(*) as count FROM rog_member;
|
||||
"
|
||||
|
||||
# Expected results (if backup data has been restored):
|
||||
# table_name | count
|
||||
# ------------+-------
|
||||
# rog_entry | 243
|
||||
# rog_team | 215
|
||||
# rog_member | 259
|
||||
```
|
||||
|
||||
#### 3.2 Data Restoration from Backup (if needed)
|
||||
|
||||
```bash
|
||||
# Method 1: Use dedicated restoration script (recommended)
|
||||
docker compose exec app python restore_core_data.py
|
||||
|
||||
# Expected results:
|
||||
# ✅ Restoration successful: Entry 243 records, Team 215 records restored
|
||||
# 🎉 Core data restoration completed
|
||||
# Zekken number candidates will now display in supervisor screen
|
||||
|
||||
# Method 2: Manual restoration (full backup)
|
||||
docker compose exec postgres-db psql -h localhost -p 5432 -U admin -d rogdb < testdb/rogdb.sql
|
||||
|
||||
# Post-restoration verification
|
||||
docker compose exec postgres-db psql -h localhost -p 5432 -U admin -d rogdb -c "
|
||||
SELECT COUNT(*) as restored_entries FROM rog_entry;
|
||||
SELECT COUNT(*) as restored_teams FROM rog_team;
|
||||
SELECT COUNT(*) as restored_members FROM rog_member;
|
||||
"
|
||||
```
|
||||
|
||||
#### 3.3 Execute Existing Data Protection Migration
|
||||
|
||||
```bash
|
||||
# Migrate GPS data only while protecting existing data
|
||||
docker compose exec app python migration_data_protection.py
|
||||
|
||||
# Expected results:
|
||||
# ✅ Existing entry, team, member data are protected
|
||||
# ✅ GPS-only data migration completed: 12,665 records
|
||||
# ✅ Timezone conversion successful: UTC → JST
|
||||
```
|
||||
|
||||
### Phase 4: Legacy Migration Procedures (PROHIBITED)
|
||||
|
||||
#### 4.1 Dangerous Legacy Migration Commands (PROHIBITED)
|
||||
|
||||
```bash
|
||||
# ❌ PROHIBITED: Deletes existing data
|
||||
docker compose exec app python migration_final_simple.py
|
||||
# This execution will delete existing entry, team, member data!
|
||||
```
|
||||
|
||||
### Phase 5: Successful Implementation Records (Reference)
|
||||
|
||||
return jst_dt
|
||||
```
|
||||
|
||||
#### 2.2 Execution Command (Successful Implementation)
|
||||
|
||||
```bash
|
||||
# Final migration execution (actual successful command)
|
||||
docker compose exec app python migration_final_simple.py
|
||||
|
||||
# Execution Results:
|
||||
# ✅ GPS-only data migration completed: 12,665 records
|
||||
# ✅ Timezone conversion successful: UTC → JST
|
||||
# ✅ Data cleansing completed: Photo records excluded
|
||||
```
|
||||
|
||||
### Phase 3: Data Validation and Quality Assurance (Completed)
|
||||
|
||||
#### 3.1 Migration Success Verification
|
||||
|
||||
```bash
|
||||
# Final migration results report
|
||||
docker compose exec app python -c "
|
||||
import psycopg2
|
||||
import os
|
||||
|
||||
conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='rogdb',
|
||||
user=os.environ.get('POSTGRES_USER'),
|
||||
password=os.environ.get('POSTGRES_PASS')
|
||||
)
|
||||
cur = conn.cursor()
|
||||
|
||||
print('🎉 Final Migration Results Report')
|
||||
print('='*60)
|
||||
|
||||
# Total migrated records
|
||||
cur.execute('SELECT COUNT(*) FROM rog_gpscheckin;')
|
||||
total_records = cur.fetchone()[0]
|
||||
print(f'📊 Total Migration Records: {total_records:,}')
|
||||
|
||||
# Event-wise statistics
|
||||
cur.execute('''
|
||||
SELECT
|
||||
event_code,
|
||||
COUNT(*) as record_count,
|
||||
COUNT(DISTINCT zekken) as team_count,
|
||||
MIN(checkin_time) as start_time,
|
||||
MAX(checkin_time) as end_time
|
||||
FROM rog_gpscheckin
|
||||
GROUP BY event_code
|
||||
ORDER BY record_count DESC
|
||||
LIMIT 10;
|
||||
''')
|
||||
|
||||
print('\n📋 Top 10 Events:')
|
||||
for row in cur.fetchall():
|
||||
event_code, count, teams, start, end = row
|
||||
print(f' {event_code}: {count:,} records ({teams} teams)')
|
||||
|
||||
# Zero-hour data check
|
||||
cur.execute('''
|
||||
SELECT COUNT(*)
|
||||
FROM rog_gpscheckin
|
||||
WHERE EXTRACT(hour FROM checkin_time) = 0;
|
||||
''')
|
||||
zero_hour = cur.fetchone()[0]
|
||||
|
||||
print(f'\n🔍 Data Quality:')
|
||||
print(f' Zero-hour data: {zero_hour} records')
|
||||
|
||||
if zero_hour == 0:
|
||||
print(' ✅ Timezone conversion successful')
|
||||
else:
|
||||
print(' ⚠️ Some zero-hour data still remaining')
|
||||
|
||||
cur.close()
|
||||
conn.close()
|
||||
"
|
||||
```
|
||||
|
||||
#### 3.2 Data Integrity Verification
|
||||
|
||||
```sql
|
||||
-- Timezone conversion validation
|
||||
SELECT
|
||||
COUNT(*) as total_records,
|
||||
COUNT(CASE WHEN EXTRACT(hour FROM checkin_time) = 0 THEN 1 END) as zero_hour_records,
|
||||
COUNT(CASE WHEN checkin_time IS NOT NULL THEN 1 END) as valid_timestamps,
|
||||
ROUND(
|
||||
100.0 * COUNT(CASE WHEN EXTRACT(hour FROM checkin_time) != 0 THEN 1 END) / COUNT(*),
|
||||
2
|
||||
) as timezone_accuracy_percent
|
||||
FROM rog_gpscheckin;
|
||||
|
||||
-- Expected Results:
|
||||
-- total_records: 12,665
|
||||
-- zero_hour_records: 1 (one legacy test record)
|
||||
-- valid_timestamps: 12,665
|
||||
-- timezone_accuracy_percent: 99.99%
|
||||
```
|
||||
|
||||
#### 3.3 Event Distribution Validation
|
||||
|
||||
```sql
|
||||
-- Event-wise data distribution verification
|
||||
SELECT
|
||||
event_code,
|
||||
COUNT(*) as record_count,
|
||||
COUNT(DISTINCT zekken) as unique_teams,
|
||||
MIN(checkin_time) as earliest_checkin,
|
||||
MAX(checkin_time) as latest_checkin,
|
||||
EXTRACT(YEAR FROM MIN(checkin_time)) as event_year
|
||||
FROM rog_gpscheckin
|
||||
GROUP BY event_code
|
||||
ORDER BY record_count DESC;
|
||||
|
||||
-- Sample expected results:
|
||||
-- 郡上: 2,751 records, 41 teams, 2024
|
||||
-- 美濃加茂: 1,671 records, 74 teams, 2024
|
||||
-- 養老ロゲ: 1,536 records, 56 teams, 2024
|
||||
```
|
||||
|
||||
## 🔍 Technical Implementation Details
|
||||
|
||||
### Database Schema Corrections
|
||||
|
||||
#### 3.4 Schema Alignment Resolution
|
||||
|
||||
During migration, several schema mismatches were identified and resolved:
|
||||
|
||||
```python
|
||||
# Original schema issues resolved:
|
||||
# 1. rog_gpscheckin table required serial_number field
|
||||
# 2. Column names: checkin_time, record_time (not create_at, goal_time)
|
||||
# 3. Event and team foreign key relationships
|
||||
|
||||
# Corrected table structure:
|
||||
class GpsCheckin(models.Model):
|
||||
serial_number = models.AutoField(primary_key=True) # Added required field
|
||||
event_code = models.CharField(max_length=50)
|
||||
zekken = models.CharField(max_length=20)
|
||||
cp_number = models.IntegerField()
|
||||
checkin_time = models.DateTimeField() # Corrected column name
|
||||
record_time = models.DateTimeField() # Corrected column name
|
||||
goal_time = models.CharField(max_length=20, blank=True)
|
||||
late_point = models.IntegerField(default=0)
|
||||
buy_flag = models.BooleanField(default=False)
|
||||
image_address = models.CharField(max_length=500, blank=True)
|
||||
minus_photo_flag = models.BooleanField(default=False)
|
||||
create_user = models.CharField(max_length=100, blank=True)
|
||||
update_user = models.CharField(max_length=100, blank=True)
|
||||
colabo_company_memo = models.TextField(blank=True)
|
||||
```
|
||||
|
||||
## 📊 Performance Optimization
|
||||
|
||||
### 4.1 Database Indexing Strategy
|
||||
|
||||
```sql
|
||||
-- Optimized indexes created for efficient queries
|
||||
CREATE INDEX idx_gps_event_team ON rog_gpscheckin(event_code, zekken);
|
||||
CREATE INDEX idx_gps_checkin_time ON rog_gpscheckin(checkin_time);
|
||||
CREATE INDEX idx_gps_checkpoint ON rog_gpscheckin(cp_number);
|
||||
CREATE INDEX idx_gps_serial ON rog_gpscheckin(serial_number);
|
||||
|
||||
-- Performance verification
|
||||
EXPLAIN ANALYZE SELECT * FROM rog_gpscheckin
|
||||
WHERE event_code = '郡上' AND zekken = 'MF5-204'
|
||||
ORDER BY checkin_time;
|
||||
```
|
||||
|
||||
### 4.2 Query Performance Testing
|
||||
|
||||
```sql
|
||||
-- Sample performance test queries
|
||||
-- 1. Team ranking calculation
|
||||
SELECT
|
||||
zekken,
|
||||
COUNT(DISTINCT cp_number) as checkpoints_visited,
|
||||
SUM(late_point) as total_late_points,
|
||||
MAX(checkin_time) as last_checkin
|
||||
FROM rog_gpscheckin
|
||||
WHERE event_code = '郡上'
|
||||
GROUP BY zekken
|
||||
ORDER BY checkpoints_visited DESC, total_late_points ASC;
|
||||
|
||||
-- 2. Checkpoint statistics
|
||||
SELECT
|
||||
cp_number,
|
||||
COUNT(DISTINCT zekken) as teams_visited,
|
||||
COUNT(*) as total_visits,
|
||||
AVG(late_point) as avg_late_points
|
||||
FROM rog_gpscheckin
|
||||
WHERE event_code = '美濃加茂'
|
||||
GROUP BY cp_number
|
||||
ORDER BY cp_number;
|
||||
```
|
||||
|
||||
## 🔄 Quality Assurance Checklist
|
||||
|
||||
### Migration Completion Verification
|
||||
|
||||
- [x] **GPS Data Migration**: 12,665 records successfully migrated
|
||||
- [x] **Timezone Conversion**: 99.99% accuracy (12,664/12,665 correct)
|
||||
- [x] **Data Contamination Removal**: 2,136 photo test records excluded
|
||||
- [x] **Schema Alignment**: All database constraints properly configured
|
||||
- [x] **Foreign Key Integrity**: All relationships properly established
|
||||
- [x] **Index Optimization**: Performance indexes created and verified
|
||||
|
||||
### Functional Verification
|
||||
|
||||
- [x] **Supervisor Interface**: "Impossible passage data" issue resolved
|
||||
- [x] **Time Display**: All timestamps now show accurate Japan time
|
||||
- [x] **Event Selection**: Past events display correct check-in times
|
||||
- [x] **Team Data**: All 535 teams properly linked to events
|
||||
- [x] **Checkpoint Data**: GPS check-ins properly linked to checkpoints
|
||||
|
||||
### Performance Verification
|
||||
|
||||
- [x] **Query Response Time**: < 2 seconds for typical queries
|
||||
- [x] **Index Usage**: All critical queries use appropriate indexes
|
||||
- [x] **Data Consistency**: No orphaned records or integrity violations
|
||||
- [x] **Memory Usage**: Efficient memory utilization during queries
|
||||
|
||||
## 🚨 Troubleshooting Guide
|
||||
|
||||
### Common Issues and Solutions
|
||||
|
||||
#### 1. Timezone Conversion Issues
|
||||
|
||||
```python
|
||||
# Issue: Incorrect timezone display
|
||||
# Solution: Verify pytz timezone conversion
|
||||
def verify_timezone_conversion():
|
||||
"""Verify timezone conversion accuracy"""
|
||||
|
||||
# Check for remaining UTC timestamps
|
||||
utc_records = GpsCheckin.objects.filter(
|
||||
checkin_time__hour=0,
|
||||
checkin_time__minute__lt=30 # Likely UTC timestamps
|
||||
).count()
|
||||
|
||||
if utc_records > 1: # Allow 1 legacy record
|
||||
print(f"Warning: {utc_records} potential UTC timestamps found")
|
||||
return False
|
||||
|
||||
return True
|
||||
```
|
||||
|
||||
#### 2. Schema Mismatch Errors
|
||||
|
||||
```sql
|
||||
-- Issue: Column not found errors
|
||||
-- Solution: Verify table structure
|
||||
SELECT column_name, data_type, is_nullable
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_gpscheckin'
|
||||
ORDER BY ordinal_position;
|
||||
|
||||
-- Ensure required columns exist:
|
||||
-- serial_number, event_code, zekken, cp_number,
|
||||
-- checkin_time, record_time, goal_time, late_point
|
||||
```
|
||||
|
||||
#### 3. Foreign Key Constraint Violations
|
||||
|
||||
```sql
|
||||
-- Issue: Foreign key violations during cleanup
|
||||
-- Solution: Disable constraints temporarily
|
||||
SET session_replication_role = replica;
|
||||
-- Perform cleanup operations
|
||||
SET session_replication_role = DEFAULT;
|
||||
```
|
||||
|
||||
## 📈 Monitoring and Maintenance
|
||||
|
||||
### 6.1 Ongoing Monitoring
|
||||
|
||||
```python
|
||||
# Health check script for migrated data
|
||||
def check_migration_health():
|
||||
"""Regular health check for migrated GPS data"""
|
||||
|
||||
health_report = {
|
||||
'total_records': GpsCheckin.objects.count(),
|
||||
'zero_hour_anomalies': GpsCheckin.objects.filter(
|
||||
checkin_time__hour=0
|
||||
).count(),
|
||||
'recent_activity': GpsCheckin.objects.filter(
|
||||
checkin_time__gte=timezone.now() - timedelta(days=30)
|
||||
).count(),
|
||||
'data_integrity': True
|
||||
}
|
||||
|
||||
# Check for data integrity issues
|
||||
orphaned_records = GpsCheckin.objects.filter(
|
||||
event_code__isnull=True
|
||||
).count()
|
||||
|
||||
if orphaned_records > 0:
|
||||
health_report['data_integrity'] = False
|
||||
health_report['orphaned_records'] = orphaned_records
|
||||
|
||||
return health_report
|
||||
|
||||
# Automated monitoring script
|
||||
def daily_health_check():
|
||||
"""Daily automated health check"""
|
||||
report = check_migration_health()
|
||||
|
||||
if report['zero_hour_anomalies'] > 1:
|
||||
send_alert(f"Timezone anomalies detected: {report['zero_hour_anomalies']}")
|
||||
|
||||
if not report['data_integrity']:
|
||||
send_alert(f"Data integrity issues: {report.get('orphaned_records', 0)} orphaned records")
|
||||
```
|
||||
|
||||
### 6.2 Backup Strategy
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
# GPS data backup script
|
||||
|
||||
BACKUP_DIR="/backup/rogaining_gps"
|
||||
DATE=$(date +%Y%m%d_%H%M%S)
|
||||
|
||||
# Create GPS data backup
|
||||
docker compose exec postgres-db pg_dump \
|
||||
--host=postgres-db \
|
||||
--port=5432 \
|
||||
--username=admin \
|
||||
--dbname=rogdb \
|
||||
--table=rog_gpscheckin \
|
||||
--format=custom \
|
||||
--file="${BACKUP_DIR}/gps_checkin_${DATE}.dump"
|
||||
|
||||
# Verify backup
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "GPS data backup successful: gps_checkin_${DATE}.dump"
|
||||
|
||||
# Upload to S3 (if configured)
|
||||
# aws s3 cp "${BACKUP_DIR}/gps_checkin_${DATE}.dump" s3://rogaining-backups/gps/
|
||||
|
||||
# Clean old backups (keep 30 days)
|
||||
find $BACKUP_DIR -name "gps_checkin_*.dump" -mtime +30 -delete
|
||||
else
|
||||
echo "GPS data backup failed"
|
||||
exit 1
|
||||
fi
|
||||
```
|
||||
|
||||
## 🎯 Summary and Achievements
|
||||
|
||||
### Migration Success Metrics
|
||||
|
||||
1. **Data Volume**: Successfully migrated 12,665 GPS check-in records
|
||||
2. **Data Quality**: Achieved 99.99% timezone conversion accuracy
|
||||
3. **Problem Resolution**: Completely resolved "impossible passage data" issue
|
||||
4. **Performance**: Optimized database structure with efficient indexing
|
||||
5. **Contamination Removal**: Eliminated 2,136 test data records
|
||||
|
||||
### Technical Achievements
|
||||
|
||||
- **Timezone Accuracy**: UTC to JST conversion using pytz library
|
||||
- **Data Cleansing**: Systematic removal of contaminated photo records
|
||||
- **Schema Optimization**: Proper database design with appropriate constraints
|
||||
- **Performance Optimization**: Efficient indexing strategy for fast queries
|
||||
|
||||
### Operational Benefits
|
||||
|
||||
- **User Experience**: Resolved confusing "impossible passage data" display
|
||||
- **Data Integrity**: Consistent and accurate timestamp representation
|
||||
- **System Reliability**: Robust data validation and error handling
|
||||
- **Maintainability**: Clean, documented migration process for future reference
|
||||
|
||||
The migration project successfully achieved all primary objectives, providing a solid foundation for continued rogaining system operation with accurate, reliable GPS check-in data management.
|
||||
|
||||
---
|
||||
|
||||
**Note**: This manual documents the actual successful implementation completed on August 21, 2025. All procedures and code samples have been verified through successful execution in the production environment.
|
||||
@ -1,202 +0,0 @@
|
||||
# Location Interaction System - evaluation_value Based Implementation
|
||||
|
||||
## 概要
|
||||
|
||||
LocationモデルのDestinationにuse_qr_codeフラグとevaluation_valueフィールドを使用した、拡張されたロケーションインタラクションシステムを実装しました。
|
||||
|
||||
## システム構成
|
||||
|
||||
### 1. Locationモデル拡張
|
||||
|
||||
**ファイル**: `rog/models.py`
|
||||
|
||||
- `evaluation_value` フィールドを使用してインタラクションタイプを決定
|
||||
- 値の意味:
|
||||
- `"0"` または `null`: 通常ポイント
|
||||
- `"1"`: 写真撮影 + 買い物ポイント
|
||||
- `"2"`: QRコードスキャン + クイズ回答
|
||||
|
||||
### 2. ビジネスロジック
|
||||
|
||||
**ファイル**: `rog/location_interaction.py`
|
||||
|
||||
```python
|
||||
# インタラクションタイプ定数
|
||||
INTERACTION_TYPE_NORMAL = "0" # 通常ポイント
|
||||
INTERACTION_TYPE_PHOTO = "1" # 写真撮影ポイント
|
||||
INTERACTION_TYPE_QR_QUIZ = "2" # QRコード + クイズポイント
|
||||
|
||||
# 主要関数
|
||||
- get_interaction_type(location): ロケーションのインタラクションタイプを判定
|
||||
- validate_interaction_requirements(location, request_data): 必要なデータの検証
|
||||
- get_point_calculation(location, interaction_result): ポイント計算
|
||||
```
|
||||
|
||||
### 3. チェックインAPI
|
||||
|
||||
**ファイル**: `rog/location_checkin_view.py`
|
||||
|
||||
**エンドポイント**: `POST /api/location-checkin/`
|
||||
|
||||
**リクエスト形式**:
|
||||
```json
|
||||
{
|
||||
"location_id": 123,
|
||||
"latitude": 35.1234,
|
||||
"longitude": 136.5678,
|
||||
"photo": "base64_encoded_image_data", // evaluation_value="1"の場合必須
|
||||
"qr_code_data": "{\"quiz_id\": 1, \"correct_answer\": \"答え\"}", // evaluation_value="2"の場合必須
|
||||
"quiz_answer": "ユーザーの回答" // evaluation_value="2"の場合必須
|
||||
}
|
||||
```
|
||||
|
||||
**レスポンス形式**:
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"checkin_id": 456,
|
||||
"points_awarded": 10,
|
||||
"point_type": "photo_shopping",
|
||||
"message": "写真撮影が完了しました。買い物ポイントを獲得！",
|
||||
"location_name": "ロケーション名",
|
||||
"interaction_type": "1",
|
||||
"interaction_result": {
|
||||
"photo_saved": true,
|
||||
"photo_filename": "checkin_123_20250103_143022.jpg"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 4. APIデータ拡張
|
||||
|
||||
**ファイル**: `rog/serializers.py`
|
||||
|
||||
LocationSerializerを拡張して、以下の情報を追加:
|
||||
- `interaction_type`: インタラクションタイプ ("0", "1", "2")
|
||||
- `requires_photo`: 写真撮影が必要かどうか
|
||||
- `requires_qr_code`: QRコードスキャンが必要かどうか
|
||||
- `interaction_instructions`: ユーザー向け指示メッセージ
|
||||
|
||||
### 5. テスト用Webインターフェース
|
||||
|
||||
**ファイル**: `templates/location_checkin_test.html`
|
||||
|
||||
**アクセス**: `/api/location-checkin-test/`
|
||||
|
||||
機能:
|
||||
- ロケーション一覧の表示
|
||||
- evaluation_valueに基づく要件の表示
|
||||
- 写真アップロード (evaluation_value="1")
|
||||
- QRデータ・クイズ入力 (evaluation_value="2")
|
||||
- チェックイン実行とテスト
|
||||
|
||||
## 使用方法
|
||||
|
||||
### 1. 通常ポイント (evaluation_value="0")
|
||||
|
||||
```javascript
|
||||
const data = {
|
||||
location_id: 123,
|
||||
latitude: 35.1234,
|
||||
longitude: 136.5678
|
||||
};
|
||||
|
||||
fetch('/api/location-checkin/', {
|
||||
method: 'POST',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify(data)
|
||||
});
|
||||
```
|
||||
|
||||
### 2. 写真撮影ポイント (evaluation_value="1")
|
||||
|
||||
```javascript
|
||||
const data = {
|
||||
location_id: 123,
|
||||
latitude: 35.1234,
|
||||
longitude: 136.5678,
|
||||
photo: "base64_encoded_image_data" // 写真必須
|
||||
};
|
||||
```
|
||||
|
||||
### 3. QRコード + クイズポイント (evaluation_value="2")
|
||||
|
||||
```javascript
|
||||
const data = {
|
||||
location_id: 123,
|
||||
latitude: 35.1234,
|
||||
longitude: 136.5678,
|
||||
qr_code_data: '{"quiz_id": 1, "correct_answer": "岐阜城"}', // QRコードデータ
|
||||
quiz_answer: "岐阜城" // ユーザーの回答
|
||||
};
|
||||
```
|
||||
|
||||
## ポイント計算システム
|
||||
|
||||
### 基本ポイント
|
||||
- 通常ポイント: 10ポイント
|
||||
- 写真撮影ポイント: 15ポイント
|
||||
- QRコード + クイズポイント: 20ポイント (正解時)
|
||||
|
||||
### ボーナスポイント
|
||||
- クイズ正解ボーナス: +5ポイント
|
||||
- 写真保存成功ボーナス: +2ポイント
|
||||
|
||||
## エラーハンドリング
|
||||
|
||||
### 検証エラー
|
||||
- 必須フィールド不足
|
||||
- 距離制限外
|
||||
- 写真データ不正
|
||||
- QRコードデータ不正
|
||||
|
||||
### 処理エラー
|
||||
- 写真保存失敗
|
||||
- データベースエラー
|
||||
- ネットワークエラー
|
||||
|
||||
## セキュリティ考慮事項
|
||||
|
||||
1. **認証**: `@login_required`デコレータでユーザー認証必須
|
||||
2. **CSRF**: `@csrf_exempt`だが、トークン検証推奨
|
||||
3. **距離検証**: Haversine公式による正確な距離計算
|
||||
4. **データ検証**: 入力データの厳密な検証
|
||||
|
||||
## データベース影響
|
||||
|
||||
### 新規追加なし
|
||||
- 既存の`evaluation_value`フィールドを活用
|
||||
- `Useractions`テーブルでチェックイン記録
|
||||
|
||||
### 推奨される追加フィールド (今後の拡張)
|
||||
- `Location.checkin_radius`: チェックイン許可範囲
|
||||
- `Location.use_qr_code`: QRコード使用フラグ
|
||||
- `Location.quiz_data`: クイズデータ
|
||||
|
||||
## 今後の拡張予定
|
||||
|
||||
1. **写真検証**: AI による撮影内容検証
|
||||
2. **QRコード生成**: 動的QRコード生成システム
|
||||
3. **ゲーミフィケーション**: バッジ・称号システム
|
||||
4. **リアルタイム**: WebSocket による即座反映
|
||||
5. **統計**: インタラクション統計・分析
|
||||
|
||||
## テスト手順
|
||||
|
||||
1. テストページにアクセス: `/api/location-checkin-test/`
|
||||
2. evaluation_valueが異なるロケーションを選択
|
||||
3. 各インタラクションタイプでチェックイン実行
|
||||
4. レスポンスの確認
|
||||
|
||||
## 関連ファイル
|
||||
|
||||
- `rog/models.py`: Locationモデル定義
|
||||
- `rog/serializers.py`: LocationSerializer拡張
|
||||
- `rog/location_interaction.py`: ビジネスロジック
|
||||
- `rog/location_checkin_view.py`: チェックインAPI
|
||||
- `rog/urls.py`: URL設定
|
||||
- `templates/location_checkin_test.html`: テストインターフェース
|
||||
|
||||
---
|
||||
|
||||
この実装により、evaluation_valueに基づく柔軟なロケーションインタラクションシステムが完成しました。各ロケーションで異なるユーザー体験を提供し、ゲーミフィケーション要素を追加することで、より魅力的なロゲイニング体験を実現します。
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,293 +0,0 @@
|
||||
# Old RogDB → RogDB 移行手順書
|
||||
|
||||
## 概要
|
||||
|
||||
old_rogdb から rogdb へのデータ移行を行います。テーブル構造の違いにより、一部テーブルは専用スクリプトで処理します。
|
||||
|
||||
## 移行対象テーブル
|
||||
|
||||
### 通常移行（migrate_old_rogdb_to_rogdb.py）
|
||||
- rog_customuser
|
||||
- rog_newcategory
|
||||
- rog_newevent2
|
||||
- rog_member
|
||||
- rog_useractions
|
||||
- その他 rog_* テーブル
|
||||
|
||||
### 専用移行スクリプト
|
||||
|
||||
#### 1. rog_team (migrate_rog_team_enhanced.py)
|
||||
**理由**: 新DBで追加フィールドあり
|
||||
- `class_name` (character varying(100))
|
||||
- `event_id` (bigint) - rog_newevent2への外部キー
|
||||
- `location` (geometry(Point,4326)) - PostGIS座標
|
||||
- `password` (character varying(100))
|
||||
- `trial` (boolean)
|
||||
- `zekken_number` (character varying(50))
|
||||
- `created_at` (timestamp with time zone)
|
||||
- `updated_at` (timestamp with time zone)
|
||||
|
||||
#### 2. rog_entry (migrate_rog_entry_enhanced.py)
|
||||
**理由**: camelCaseカラム名の予約語問題
|
||||
- `hasGoaled` (boolean)
|
||||
- `hasParticipated` (boolean)
|
||||
|
||||
#### 3. rog_goalimages (migrate_rog_goalimages_enhanced.py)
|
||||
**理由**: team_name → zekken_number 変換ロジック
|
||||
- 旧DBで`zekken_number`がブランク/NULLの場合
|
||||
- `team_name`を使用してrog_entryから対応する`zekken_number`を検索・取得
|
||||
- team_name → zekken_numberマッピングキャッシュを事前構築
|
||||
|
||||
## 移行手順
|
||||
|
||||
### 事前チェック
|
||||
|
||||
```bash
|
||||
# NULL値チェック
|
||||
make null-check
|
||||
|
||||
# カラム名チェック
|
||||
make column-check
|
||||
|
||||
# Docker コンテナ状況確認
|
||||
docker compose ps
|
||||
```
|
||||
|
||||
### 段階的移行
|
||||
|
||||
#### ステップ1: 基本テーブル移行
|
||||
```bash
|
||||
# 通常テーブル移行（rog_team, rog_entry除く）
|
||||
make migrate-old-rogdb
|
||||
```
|
||||
|
||||
#### ステップ2: rog_team構造変換移行
|
||||
```bash
|
||||
# rog_team専用移行
|
||||
make migrate-rog-team
|
||||
```
|
||||
|
||||
#### ステップ3: rog_entry camelCase対応移行
|
||||
```bash
|
||||
# rog_entry専用移行
|
||||
make migrate-rog-entry
|
||||
```
|
||||
|
||||
#### ステップ4: rog_goalimages team_name変換移行
|
||||
```bash
|
||||
# rog_goalimages専用移行（team_name→zekken_number変換）
|
||||
make migrate-rog-goalimages
|
||||
```
|
||||
|
||||
### 一括移行
|
||||
|
||||
```bash
|
||||
# 全テーブル一括移行
|
||||
make migrate-full
|
||||
```
|
||||
|
||||
## 外部キー依存関係
|
||||
|
||||
移行順序に注意が必要な依存関係：
|
||||
|
||||
1. **rog_customuser** → 他テーブルのowner_id, user_id参照
|
||||
2. **rog_newcategory** → rog_team, rog_entryのcategory_id参照
|
||||
3. **rog_newevent2** → rog_team, rog_entryのevent_id参照
|
||||
4. **rog_team** → rog_entryのteam_id参照
|
||||
5. **rog_entry** → rog_entrymemberのentry_id参照、rog_goalimadesのzekken_number解決
|
||||
6. **rog_goalimages** → rog_customuserのuser_id参照、team_name→zekken_number変換
|
||||
|
||||
## トラブルシューティング
|
||||
|
||||
### エラー対応
|
||||
|
||||
#### NULL値制約違反
|
||||
```bash
|
||||
# NULL値の詳細チェック
|
||||
docker compose exec app python check_null_values.py
|
||||
|
||||
# 個別テーブルのNULL値確認
|
||||
docker compose exec postgres-db psql -U admin -d old_rogdb -c "
|
||||
SELECT column_name, COUNT(*)
|
||||
FROM rog_team t, information_schema.columns c
|
||||
WHERE c.table_name = 'rog_team' AND t.column_name IS NULL
|
||||
GROUP BY column_name;
|
||||
"
|
||||
```
|
||||
|
||||
#### 外部キー制約違反
|
||||
```bash
|
||||
# 参照整合性チェック
|
||||
docker compose exec postgres-db psql -U admin -d old_rogdb -c "
|
||||
SELECT t.team_id, COUNT(*)
|
||||
FROM rog_entry t
|
||||
LEFT JOIN rog_team tt ON t.team_id = tt.id
|
||||
WHERE tt.id IS NULL
|
||||
GROUP BY t.team_id;
|
||||
"
|
||||
```
|
||||
|
||||
#### team_name → zekken_number変換失敗
|
||||
```bash
|
||||
# rog_goalimagesのteam_name一覧確認
|
||||
docker compose exec postgres-db psql -U admin -d old_rogdb -c "
|
||||
SELECT DISTINCT team_name, zekken_number
|
||||
FROM rog_goalimages
|
||||
WHERE zekken_number IS NULL OR zekken_number = ''
|
||||
ORDER BY team_name;
|
||||
"
|
||||
|
||||
# 新DBでのteam_name → zekken_numberマッピング確認
|
||||
docker compose exec postgres-db psql -U admin -d rogdb -c "
|
||||
SELECT t.team_name, e.zekken_number
|
||||
FROM rog_team t
|
||||
JOIN rog_entry e ON t.id = e.team_id
|
||||
ORDER BY t.team_name;
|
||||
"
|
||||
```
|
||||
|
||||
#### PostgreSQL予約語エラー
|
||||
- camelCaseカラムや予約語は自動でダブルクォートで囲まれます
|
||||
- エラーが発生した場合は該当スクリプトで quote_column_if_needed() を確認
|
||||
|
||||
### ログ確認
|
||||
|
||||
```bash
|
||||
# 移行ログのリアルタイム確認
|
||||
docker compose logs -f app
|
||||
|
||||
# 特定期間のログ確認
|
||||
docker compose logs --since="2025-08-25T08:00:00" app
|
||||
```
|
||||
|
||||
## 設定値
|
||||
|
||||
### 環境変数
|
||||
|
||||
```bash
|
||||
# データベース接続設定
|
||||
OLD_ROGDB_HOST=postgres-db
|
||||
OLD_ROGDB_NAME=old_rogdb
|
||||
OLD_ROGDB_USER=admin
|
||||
OLD_ROGDB_PASSWORD=admin123456
|
||||
|
||||
ROGDB_HOST=postgres-db
|
||||
ROGDB_NAME=rogdb
|
||||
ROGDB_USER=admin
|
||||
ROGDB_PASSWORD=admin123456
|
||||
|
||||
# 除外テーブル設定（カンマ区切り）
|
||||
EXCLUDE_TABLES=rog_session,django_migrations
|
||||
```
|
||||
|
||||
### デフォルト値設定
|
||||
|
||||
#### rog_team
|
||||
- `trial`: False
|
||||
- `event_id`: 最初のイベントID
|
||||
- `location`: NULL
|
||||
- `password`: ''
|
||||
- `class_name`: ''
|
||||
- `zekken_number`: ''
|
||||
|
||||
#### rog_entry
|
||||
- `hasGoaled`: False
|
||||
- `hasParticipated`: False
|
||||
- `is_active`: True
|
||||
- `is_trial`: False
|
||||
- `zekken_label`: ''
|
||||
|
||||
## 移行後確認
|
||||
|
||||
### データ件数確認
|
||||
|
||||
```bash
|
||||
# テーブル別レコード数比較
|
||||
docker compose exec postgres-db psql -U admin -d old_rogdb -c "
|
||||
SELECT 'rog_team' as table_name, COUNT(*) as old_count FROM rog_team
|
||||
UNION ALL
|
||||
SELECT 'rog_entry', COUNT(*) FROM rog_entry
|
||||
UNION ALL
|
||||
SELECT 'rog_goalimages', COUNT(*) FROM rog_goalimages;
|
||||
"
|
||||
|
||||
docker compose exec postgres-db psql -U admin -d rogdb -c "
|
||||
SELECT 'rog_team' as table_name, COUNT(*) as new_count FROM rog_team
|
||||
UNION ALL
|
||||
SELECT 'rog_entry', COUNT(*) FROM rog_entry
|
||||
UNION ALL
|
||||
SELECT 'rog_goalimages', COUNT(*) FROM rog_goalimages;
|
||||
"
|
||||
```
|
||||
|
||||
### 制約確認
|
||||
|
||||
```bash
|
||||
# 外部キー制約確認
|
||||
docker compose exec postgres-db psql -U admin -d rogdb -c "
|
||||
SELECT conname, contype
|
||||
FROM pg_constraint
|
||||
WHERE conrelid IN (
|
||||
SELECT oid FROM pg_class WHERE relname IN ('rog_team', 'rog_entry', 'rog_goalimages')
|
||||
);
|
||||
"
|
||||
```
|
||||
|
||||
### team_name → zekken_number 変換確認
|
||||
|
||||
```bash
|
||||
# rog_goalimadesでzekken_number変換結果確認
|
||||
docker compose exec postgres-db psql -U admin -d rogdb -c "
|
||||
SELECT team_name, zekken_number, COUNT(*) as count
|
||||
FROM rog_goalimages
|
||||
GROUP BY team_name, zekken_number
|
||||
ORDER BY team_name;
|
||||
"
|
||||
|
||||
# 変換できなかったレコード確認
|
||||
docker compose exec postgres-db psql -U admin -d rogdb -c "
|
||||
SELECT team_name, COUNT(*) as blank_zekken_count
|
||||
FROM rog_goalimages
|
||||
WHERE zekken_number IS NULL OR zekken_number = ''
|
||||
GROUP BY team_name
|
||||
ORDER BY blank_zekken_count DESC;
|
||||
"
|
||||
```
|
||||
|
||||
## バックアップ・ロールバック
|
||||
|
||||
### 移行前バックアップ
|
||||
|
||||
```bash
|
||||
# rogdbのバックアップ
|
||||
docker compose exec postgres-db pg_dump -U admin rogdb > rogdb_backup_$(date +%Y%m%d_%H%M%S).sql
|
||||
```
|
||||
|
||||
### ロールバック
|
||||
|
||||
```bash
|
||||
# 移行テーブルのクリア
|
||||
docker compose exec postgres-db psql -U admin -d rogdb -c "
|
||||
TRUNCATE rog_team, rog_entry, rog_goalimages CASCADE;
|
||||
"
|
||||
|
||||
# バックアップからの復元
|
||||
docker compose exec -T postgres-db psql -U admin -d rogdb < rogdb_backup_YYYYMMDD_HHMMSS.sql
|
||||
```
|
||||
|
||||
## よくある問題
|
||||
|
||||
1. **メモリ不足**: docker-compose.ymlでPostgreSQLのメモリ制限を確認
|
||||
2. **コンテナ再起動**: 移行中にコンテナが再起動する場合はresources設定を調整
|
||||
3. **文字化け**: PostgreSQLの文字エンコーディング設定確認
|
||||
4. **タイムアウト**: 大量データの場合はバッチサイズを調整
|
||||
|
||||
## 参考ファイル
|
||||
|
||||
- `docker-compose.yml`: データベース設定
|
||||
- `migrate_old_rogdb_to_rogdb.py`: 通常テーブル移行
|
||||
- `migrate_rog_team_enhanced.py`: rog_team専用移行
|
||||
- `migrate_rog_entry_enhanced.py`: rog_entry専用移行
|
||||
- `migrate_rog_goalimages_enhanced.py`: rog_goalimages専用移行（team_name→zekken変換）
|
||||
- `check_null_values.py`: NULL値事前チェック
|
||||
- `Makefile`: 移行タスク定義
|
||||
@ -1,205 +0,0 @@
|
||||
# Old RogDB → RogDB データ移行ガイド (エラー修正版)
|
||||
|
||||
## 概要
|
||||
old_rogdb データベースの `rog_*` テーブルから rogdb データベースの `rog_*` テーブルへデータを移行するスクリプトです。
|
||||
|
||||
## 修正点 (v3)
|
||||
- PostgreSQL予約語（`like`など）のカラム名をクォートで囲む対応
|
||||
- **キャメルケースカラム名**（`hasGoaled`, `deadlineDateTime`など）の自動クォート対応
|
||||
- **NULL値の自動処理**：NOT NULL制約違反を防ぐデフォルト値設定
|
||||
- トランザクションエラー時の自動ロールバック機能強化
|
||||
- データベース接続のautocommit設定でトランザクション問題を回避
|
||||
- より堅牢なエラーハンドリング
|
||||
- カラム名事前チェック機能の追加
|
||||
- NULL値事前チェック機能の追加
|
||||
|
||||
### NULL値デフォルト設定
|
||||
以下のカラムで自動的にデフォルト値を設定：
|
||||
- `trial`, `is_trial`: `False`
|
||||
- `is_active`: `True`
|
||||
- `hasGoaled`, `hasParticipated`: `False`
|
||||
- `public`, `class_*`: `True`
|
||||
- その他のBoolean型: 一般的なデフォルト値
|
||||
|
||||
## 機能
|
||||
- 自動テーブル構造比較
|
||||
- UPSERT操作（存在する場合は更新、しない場合は挿入）
|
||||
- 主キーベースの重複チェック
|
||||
- 詳細な移行統計レポート
|
||||
- 予約語カラムの自動クォート処理
|
||||
- エラーハンドリングとロールバック
|
||||
|
||||
## 使用方法
|
||||
|
||||
### 1. Docker Compose での実行
|
||||
|
||||
```bash
|
||||
# 基本実行
|
||||
docker compose exec app python migrate_old_rogdb_to_rogdb.py
|
||||
|
||||
# 環境変数を使用した実行
|
||||
docker compose exec -e OLD_ROGDB_HOST=old-postgres app python migrate_old_rogdb_to_rogdb.py
|
||||
|
||||
# 特定テーブルを除外
|
||||
docker compose exec -e EXCLUDE_TABLES=rog_customuser,rog_session app python migrate_old_rogdb_to_rogdb.py
|
||||
```
|
||||
|
||||
### 2. Makefileタスクの使用
|
||||
|
||||
```bash
|
||||
# 基本移行
|
||||
make migrate-old-rogdb
|
||||
|
||||
# カラム名チェックのみ
|
||||
make check-columns
|
||||
|
||||
# NULL値チェックのみ
|
||||
make check-null-values
|
||||
|
||||
# 完全な移行前チェック（カラム名 + NULL値）
|
||||
make pre-migration-check
|
||||
|
||||
# 安全な移行（カラム名チェック + 移行実行）
|
||||
make migrate-old-rogdb-safe
|
||||
|
||||
# 統計情報のみ表示
|
||||
make migrate-rogdb-stats
|
||||
|
||||
# ドライラン（テーブル一覧のみ表示）
|
||||
make migrate-rogdb-dryrun
|
||||
```
|
||||
|
||||
## 環境変数
|
||||
|
||||
### Old RogDB 接続設定
|
||||
```bash
|
||||
OLD_ROGDB_HOST=postgres-db # デフォルト: postgres-db
|
||||
OLD_ROGDB_NAME=old_rogdb # デフォルト: old_rogdb
|
||||
OLD_ROGDB_USER=admin # デフォルト: admin
|
||||
OLD_ROGDB_PASSWORD=admin123456 # デフォルト: admin123456
|
||||
OLD_ROGDB_PORT=5432 # デフォルト: 5432
|
||||
```
|
||||
|
||||
### RogDB 接続設定
|
||||
```bash
|
||||
ROGDB_HOST=postgres-db # デフォルト: postgres-db
|
||||
ROGDB_NAME=rogdb # デフォルト: rogdb
|
||||
ROGDB_USER=admin # デフォルト: admin
|
||||
ROGDB_PASSWORD=admin123456 # デフォルト: admin123456
|
||||
ROGDB_PORT=5432 # デフォルト: 5432
|
||||
```
|
||||
|
||||
### その他の設定
|
||||
```bash
|
||||
EXCLUDE_TABLES=table1,table2 # 除外するテーブル（カンマ区切り）
|
||||
```
|
||||
|
||||
## 移行対象テーブル
|
||||
|
||||
スクリプトは `rog_` で始まる全てのテーブルを自動検出し、以下の処理を行います：
|
||||
|
||||
### 主要テーブル（例）
|
||||
- `rog_customuser` - ユーザー情報
|
||||
- `rog_newevent2` - イベント情報
|
||||
- `rog_team` - チーム情報
|
||||
- `rog_member` - メンバー情報
|
||||
- `rog_entry` - エントリー情報
|
||||
- `rog_location2025` - チェックポイント情報
|
||||
- `rog_checkpoint` - チェックポイント記録
|
||||
- その他 `rog_*` テーブル
|
||||
|
||||
### 移行ロジック
|
||||
1. **テーブル構造比較**: 共通カラムのみを移行対象とする
|
||||
2. **主キーチェック**: 既存レコードの有無を確認
|
||||
3. **UPSERT操作**:
|
||||
- 存在する場合: UPDATE（主キー以外のカラムを更新）
|
||||
- 存在しない場合: INSERT（新規追加）
|
||||
|
||||
## 出力例
|
||||
|
||||
```
|
||||
================================================================================
|
||||
Old RogDB → RogDB データ移行開始
|
||||
================================================================================
|
||||
データベースに接続中...
|
||||
✅ データベース接続成功
|
||||
old_rogdb rog_テーブル: 15個
|
||||
rogdb rog_テーブル: 15個
|
||||
共通 rog_テーブル: 15個
|
||||
移行対象テーブル (15個): ['rog_customuser', 'rog_newevent2', ...]
|
||||
|
||||
=== rog_customuser データ移行開始 ===
|
||||
共通カラム (12個): ['date_joined', 'email', 'first_name', ...]
|
||||
主キー: ['id']
|
||||
移行対象レコード数: 50件
|
||||
進捗: 50/50 件処理完了
|
||||
✅ rog_customuser 移行完了:
|
||||
挿入: 25件
|
||||
更新: 25件
|
||||
エラー: 0件
|
||||
|
||||
================================================================================
|
||||
移行完了サマリー
|
||||
================================================================================
|
||||
処理対象テーブル: 15個
|
||||
総挿入件数: 1250件
|
||||
総更新件数: 750件
|
||||
総エラー件数: 0件
|
||||
|
||||
--- テーブル別詳細 ---
|
||||
rog_customuser: 挿入25, 更新25, エラー0
|
||||
rog_newevent2: 挿入10, 更新5, エラー0
|
||||
...
|
||||
✅ 全ての移行が正常に完了しました！
|
||||
```
|
||||
|
||||
## 注意事項
|
||||
|
||||
1. **バックアップ推奨**: 移行前にrogdbのバックアップを取得してください
|
||||
2. **権限確認**: 両データベースへの読み書き権限が必要です
|
||||
3. **外部キー制約**: 移行順序によっては外部キー制約エラーが発生する可能性があります
|
||||
4. **大量データ**: 大量データの場合は時間がかかる場合があります
|
||||
|
||||
## トラブルシューティング
|
||||
|
||||
### よくあるエラー
|
||||
|
||||
#### 1. 接続エラー
|
||||
```
|
||||
❌ データベース接続エラー: connection refused
|
||||
```
|
||||
**対処法**: データベースサービスが起動していることを確認
|
||||
|
||||
#### 2. 権限エラー
|
||||
```
|
||||
❌ テーブル移行エラー: permission denied
|
||||
```
|
||||
**対処法**: データベースユーザーの権限を確認
|
||||
|
||||
#### 3. 外部キー制約エラー
|
||||
```
|
||||
❌ レコード処理エラー: foreign key constraint
|
||||
```
|
||||
**対処法**: 依存関係のあるテーブルから先に移行
|
||||
|
||||
### デバッグ方法
|
||||
|
||||
```bash
|
||||
# ログレベルを上げて詳細情報を表示
|
||||
docker compose exec app python -c "
|
||||
import logging
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
exec(open('migrate_old_rogdb_to_rogdb.py').read())
|
||||
"
|
||||
|
||||
# 特定テーブルのみテスト
|
||||
docker compose exec app python -c "
|
||||
from migrate_old_rogdb_to_rogdb import RogTableMigrator
|
||||
migrator = RogTableMigrator()
|
||||
migrator.connect_databases()
|
||||
migrator.migrate_table_data('rog_customuser')
|
||||
"
|
||||
```
|
||||
|
||||
## ライセンス
|
||||
このスクリプトはMITライセンスの下で公開されています。
|
||||
@ -1,116 +0,0 @@
|
||||
# Location2025移行最終結果報告書
|
||||
|
||||
## 📋 実施概要
|
||||
|
||||
**実施日**: 2025年8月24日
|
||||
**実施プログラム**: `simple_location2025_migration.py`
|
||||
**移行対象**: rog_location → rog_location2025
|
||||
**実施者**: システム移行プログラム
|
||||
|
||||
## 🎯 移行結果
|
||||
|
||||
### ✅ 成功実績
|
||||
- **総対象データ**: 7,740件
|
||||
- **移行成功**: 7,601件
|
||||
- **移行率**: 98.2%
|
||||
- **新規移行**: 7,502件
|
||||
- **既存保持**: 99件
|
||||
|
||||
### ⚠️ エラー詳細
|
||||
- **エラー件数**: 139件
|
||||
- **エラー原因**: 座標データ（latitude/longitude）がNull
|
||||
- **エラー例**: Location ID 8012, 9383-9390など
|
||||
|
||||
## 📊 詳細分析
|
||||
|
||||
### データ分布
|
||||
- **高山２イベント紐づけ**: 7,502件
|
||||
- **既存データ（高山２）**: 99件
|
||||
- **座標データNull**: 139件
|
||||
|
||||
### フィールドマッピング成功事例
|
||||
```python
|
||||
# Locationモデルフィールド → Location2025フィールド
|
||||
location.location_id → cp_number
|
||||
location.latitude → latitude
|
||||
location.longitude → longitude
|
||||
location.cp → cp_point
|
||||
location.location_name → cp_name (自動生成: "CP{location_id}")
|
||||
location.address → address
|
||||
location.phone → phone
|
||||
```
|
||||
|
||||
## 🔧 技術的解決
|
||||
|
||||
### 課題と対応
|
||||
1. **フィールド名不一致**
|
||||
- 課題: Locationモデルに`cp_number`フィールドが存在しない
|
||||
- 解決: `location_id`フィールドを`cp_number`として使用
|
||||
|
||||
2. **座標データNone値**
|
||||
- 課題: Point()作成時にNone値でエラー
|
||||
- 解決: 事前チェックとエラーハンドリングでスキップ
|
||||
|
||||
3. **イベント紐づけ**
|
||||
- 課題: 既存の高山２イベントとの整合性
|
||||
- 解決: NewEvent2テーブルの高山２イベントに一括紐づけ
|
||||
|
||||
## 📝 実行ログ抜粋
|
||||
|
||||
```
|
||||
=== Location2025簡単移行プログラム ===
|
||||
移行対象: 7641件 (全7740件中99件移行済み)
|
||||
✅ 高山２イベント (ID: X) を使用
|
||||
|
||||
移行進捗: 7271/7740件完了
|
||||
移行進捗: 7371/7740件完了
|
||||
⚠️ Location ID 8012 変換エラー: float() argument must be a string or a number, not 'NoneType'
|
||||
移行進捗: 7470/7740件完了
|
||||
移行進捗: 7502/7740件完了
|
||||
|
||||
✅ 移行完了: Location2025テーブルに7601件のデータ
|
||||
今回移行: 7502件
|
||||
|
||||
=== 移行結果検証 ===
|
||||
Location (旧): 7740件
|
||||
Location2025 (新): 7601件
|
||||
⚠️ 139件が未移行
|
||||
|
||||
Location2025サンプルデータ:
|
||||
CP71: (136.610666, 35.405467) - 10点
|
||||
CP91: (136.604264, 35.420340) - 10点
|
||||
CP161: (136.608530, 35.417340) - 10点
|
||||
|
||||
🎉 Location2025移行プログラム完了
|
||||
```
|
||||
|
||||
## 🚀 運用への影響
|
||||
|
||||
### 利用可能機能
|
||||
- ✅ get_checkpoint_list API（7,601箇所利用可能）
|
||||
- ✅ チェックポイント管理機能
|
||||
- ✅ 地図表示機能
|
||||
- ✅ GPS位置データ連携
|
||||
|
||||
### 制約事項
|
||||
- ❌ 139件の座標データなしチェックポイント（要データ修正）
|
||||
- ⚠️ 全データが高山２イベントに紐づけられているため、イベント別管理が必要な場合は追加作業が必要
|
||||
|
||||
## 📋 今後の課題
|
||||
|
||||
1. **座標データ修正**: 139件のNull座標データの手動修正
|
||||
2. **イベント分離**: 必要に応じて他イベントへのデータ分離
|
||||
3. **データ検証**: 移行データの妥当性確認
|
||||
4. **パフォーマンス最適化**: 7,601件データでのAPI応答性能確認
|
||||
|
||||
## 📞 完了報告
|
||||
|
||||
**移行完了**: ✅ 98.2%完了（7,601/7,740件）
|
||||
**システム稼働**: ✅ 本格運用可能
|
||||
**データ保護**: ✅ 既存データ完全保護
|
||||
**追加作業**: 139件の座標データ修正のみ
|
||||
|
||||
---
|
||||
|
||||
**作成日**: 2025年8月24日
|
||||
**最終更新**: 2025年8月24日
|
||||
@ -1,141 +0,0 @@
|
||||
# Location2025対応版移行プログラム
|
||||
|
||||
Location2025へのシステム拡張に伴い、移行プログラムもアップデートされました。
|
||||
|
||||
## 📋 更新されたプログラム
|
||||
|
||||
### 1. migration_location2025_support.py (新規)
|
||||
Location2025完全対応版の移行プログラム。最新機能と最高レベルの互換性確認を提供。
|
||||
|
||||
**特徴:**
|
||||
- Location2025テーブルとの整合性確認
|
||||
- チェックポイント参照の妥当性検証
|
||||
- 詳細な移行レポート生成
|
||||
- Location2025対応マーカー付きでGPSデータ移行
|
||||
|
||||
### 2. migration_data_protection.py (更新)
|
||||
既存の保護版移行プログラムにLocation2025サポートを追加。
|
||||
|
||||
**更新内容:**
|
||||
- Location2025互換性確認機能追加
|
||||
- 既存データ保護にLocation2025を含める
|
||||
- 移行前の確認プロンプト追加
|
||||
|
||||
### 3. restore_core_data.py (更新)
|
||||
コアデータ復元プログラムにLocation2025整合性確認を追加。
|
||||
|
||||
**更新内容:**
|
||||
- 復元後のLocation2025整合性確認
|
||||
- チェックポイント定義状況の確認
|
||||
- Location2025設定ガイダンス
|
||||
|
||||
## 🚀 使用方法
|
||||
|
||||
### 推奨手順 (Location2025対応環境)
|
||||
|
||||
```bash
|
||||
# 1. 新しいLocation2025完全対応版を使用
|
||||
docker compose exec app python migration_location2025_support.py
|
||||
|
||||
# 2. 必要に応じてコアデータ復元 (Location2025整合性確認付き)
|
||||
docker compose exec app python restore_core_data.py
|
||||
```
|
||||
|
||||
### 従来の環境 (Location2025未対応)
|
||||
|
||||
```bash
|
||||
# 1. 既存の保護版プログラム (Location2025確認機能付き)
|
||||
docker compose exec app python migration_data_protection.py
|
||||
|
||||
# 2. 必要に応じてコアデータ復元
|
||||
docker compose exec app python restore_core_data.py
|
||||
```
|
||||
|
||||
## 🆕 Location2025拡張機能
|
||||
|
||||
### チェックポイント管理の現代化
|
||||
- **CSV一括アップロード**: Django管理画面でチェックポイント定義を一括インポート
|
||||
- **空間データ統合**: 緯度経度とPostGIS PointFieldの自動同期
|
||||
- **イベント連携**: rog_newevent2との外部キー制約で整合性保証
|
||||
|
||||
### 移行プログラム拡張
|
||||
- **互換性確認**: Location2025テーブルの存在と設定状況を自動確認
|
||||
- **チェックポイント検証**: 移行データとLocation2025の整合性チェック
|
||||
- **詳細レポート**: イベント別統計とLocation2025連携状況の詳細表示
|
||||
|
||||
## ⚠️ 注意事項
|
||||
|
||||
### Location2025未対応環境での実行
|
||||
Location2025テーブルが存在しない環境でも移行は実行可能ですが、以下の制限があります：
|
||||
- チェックポイント参照整合性確認がスキップされます
|
||||
- 新しいCSVベース管理機能は利用できません
|
||||
- Django管理画面でのチェックポイント管理機能が制限されます
|
||||
|
||||
### 推奨移行パス
|
||||
1. Django migrationsを実行してLocation2025テーブルを作成
|
||||
2. Django管理画面でサンプルチェックポイントをCSVアップロード
|
||||
3. Location2025完全対応版移行プログラムを実行
|
||||
4. 移行後にLocation2025整合性を確認
|
||||
|
||||
## 📊 移行結果の確認
|
||||
|
||||
### 移行データ確認
|
||||
```sql
|
||||
-- 移行されたGPSデータ確認
|
||||
SELECT COUNT(*) FROM rog_gpscheckin
|
||||
WHERE comment LIKE 'migrated_from_gifuroge%';
|
||||
|
||||
-- Location2025チェックポイント確認
|
||||
SELECT COUNT(*) FROM rog_location2025;
|
||||
|
||||
-- イベント別チェックポイント分布
|
||||
SELECT e.event_code, COUNT(l.id) as checkpoint_count
|
||||
FROM rog_location2025 l
|
||||
JOIN rog_newevent2 e ON l.event_id = e.id
|
||||
GROUP BY e.event_code;
|
||||
```
|
||||
|
||||
### Django Admin確認
|
||||
1. http://localhost:8000/admin/ にアクセス
|
||||
2. Location2025セクションでチェックポイント管理画面を確認
|
||||
3. CSV一括アップロード機能が利用可能かテスト
|
||||
|
||||
## 🔧 トラブルシューティング
|
||||
|
||||
### Location2025テーブルが見つからない
|
||||
```bash
|
||||
# Django migrationsを実行
|
||||
docker compose exec app python manage.py makemigrations
|
||||
docker compose exec app python manage.py migrate
|
||||
```
|
||||
|
||||
### チェックポイントが未定義
|
||||
1. Django管理画面にアクセス
|
||||
2. Location2025 > "CSV一括アップロード"を選択
|
||||
3. サンプルCSVファイルをアップロード
|
||||
|
||||
### 移行データの整合性エラー
|
||||
```bash
|
||||
# データベース接続確認
|
||||
docker compose exec db psql -U postgres -d rogdb -c "SELECT version();"
|
||||
|
||||
# テーブル存在確認
|
||||
docker compose exec db psql -U postgres -d rogdb -c "\dt rog_*"
|
||||
```
|
||||
|
||||
## 📈 パフォーマンス最適化
|
||||
|
||||
Location2025システムは以下の最適化が適用されています：
|
||||
- PostGIS空間インデックスによる高速位置検索
|
||||
- イベント・チェックポイント複合インデックス
|
||||
- CSV一括処理による大量データ投入の高速化
|
||||
|
||||
移行プログラムも同様に最適化されており、大量のGPSデータも効率的に処理できます。
|
||||
|
||||
---
|
||||
|
||||
## 📞 サポート
|
||||
|
||||
Location2025移行に関する技術的な問題やご質問は、システム管理者までお問い合わせください。
|
||||
|
||||
Location2025の導入により、ロゲイニングシステムがより使いやすく、拡張性の高いシステムへと進化しました。
|
||||
@ -1,156 +0,0 @@
|
||||
# Migration Reset - 完了報告書
|
||||
|
||||
## 実行日時
|
||||
2025年8月28日 13:33:05 - 13:43:58
|
||||
|
||||
## 実行された作業内容
|
||||
|
||||
### 1. 問題の特定
|
||||
- **問題**: Migration 0011_auto_20250827_1459.py が存在しない依存関係 0010_auto_20250827_1510 を参照していた
|
||||
- **エラー内容**: `NodeNotFoundError: Migration rog.0010_auto_20250827_1510 dependencies reference nonexistent parent node`
|
||||
|
||||
### 2. Migrationリセット作業
|
||||
|
||||
#### バックアップ作成
|
||||
- **バックアップディレクトリ**: `rog/migrations_backup_20250828_042950`
|
||||
- **内容**: 既存の11個のmigrationファイルをバックアップ
|
||||
|
||||
#### データベース履歴クリア
|
||||
- **削除レコード数**: 72件の`django_migrations`レコード
|
||||
- **対象**: `rog`アプリの全migration履歴
|
||||
|
||||
#### 新しいシンプルなMigration作成
|
||||
- **ファイル**: `rog/migrations/0001_simple_initial.py`
|
||||
- **内容**: Core modelsのみ (managed=True models)
|
||||
- `CustomUser`
|
||||
- `Category`
|
||||
- `NewEvent`
|
||||
- `Team`
|
||||
- `Location`
|
||||
- `Entry`
|
||||
|
||||
### 3. Migration適用結果
|
||||
|
||||
```
|
||||
Operations to perform:
|
||||
Apply all migrations: admin, auth, contenttypes, knox, rog, sessions
|
||||
Running migrations:
|
||||
Applying rog.0001_simple_initial... FAKED
|
||||
Applying admin.0001_initial... FAKED
|
||||
Applying admin.0002_logentry_remove_auto_add... OK
|
||||
Applying admin.0003_logentry_add_action_flag_choices... OK
|
||||
Applying knox.0001_initial... FAKED
|
||||
Applying knox.0002_auto_20150916_1425... OK
|
||||
Applying knox.0003_auto_20150916_1526... OK
|
||||
Applying knox.0004_authtoken_expires... OK
|
||||
Applying knox.0005_authtoken_token_key... OK
|
||||
Applying knox.0006_auto_20160818_0932... OK
|
||||
Applying knox.0007_auto_20190111_0542... OK
|
||||
Applying knox.0008_remove_authtoken_salt... OK
|
||||
```
|
||||
|
||||
### 4. 最終状態確認
|
||||
|
||||
#### Migration状態
|
||||
```
|
||||
admin
|
||||
[X] 0001_initial
|
||||
[X] 0002_logentry_remove_auto_add
|
||||
[X] 0003_logentry_add_action_flag_choices
|
||||
auth
|
||||
[X] 0001_initial
|
||||
[X] 0002_alter_permission_name_max_length
|
||||
[X] 0003_alter_user_email_max_length
|
||||
[X] 0004_alter_user_username_opts
|
||||
[X] 0005_alter_user_last_login_null
|
||||
[X] 0006_require_contenttypes_0002
|
||||
[X] 0007_alter_validators_add_error_messages
|
||||
[X] 0008_alter_user_username_max_length
|
||||
[X] 0009_alter_user_last_name_max_length
|
||||
[X] 0010_alter_group_name_max_length
|
||||
[X] 0011_update_proxy_permissions
|
||||
[X] 0012_alter_user_first_name_max_length
|
||||
contenttypes
|
||||
[X] 0001_initial
|
||||
[X] 0002_remove_content_type_name
|
||||
knox
|
||||
[X] 0001_initial
|
||||
[X] 0002_auto_20150916_1425
|
||||
[X] 0003_auto_20150916_1526
|
||||
[X] 0004_authtoken_expires
|
||||
[X] 0005_authtoken_token_key
|
||||
[X] 0006_auto_20160818_0932
|
||||
[X] 0007_auto_20190111_0542
|
||||
[X] 0008_remove_authtoken_salt
|
||||
rog
|
||||
[X] 0001_simple_initial
|
||||
sessions
|
||||
[X] 0001_initial
|
||||
```
|
||||
|
||||
## 解決されたポイント
|
||||
|
||||
### 1. managed=False modelの除外
|
||||
- **問題**: 初期migrationに`managed=False`のモデル（GifuAreas、JpnAdminMainPerf、JpnSubPerf）が含まれていた
|
||||
- **解決**: これらのモデルを除外したクリーンなmigrationを作成
|
||||
|
||||
### 2. 依存関係の修正
|
||||
- **問題**: 存在しないmigrationへの参照
|
||||
- **解決**: 正しい依存関係でmigrationを再構築
|
||||
|
||||
### 3. コアモデルの確立
|
||||
- **成果**: 最低限必要なモデル構造を確立
|
||||
- **含有モデル**: ユーザー、イベント、チーム、ロケーション、エントリー
|
||||
|
||||
## 作成されたツール
|
||||
|
||||
### migration_simple_reset.py
|
||||
- **目的**: Migration reset作業の自動化
|
||||
- **機能**:
|
||||
- バックアップ作成
|
||||
- Migration履歴クリア
|
||||
- シンプルなmigration作成
|
||||
- Migration適用
|
||||
- 状態確認
|
||||
|
||||
### 使用方法
|
||||
```bash
|
||||
# 完全なリセット workflow
|
||||
python migration_simple_reset.py --full
|
||||
|
||||
# バックアップのみ
|
||||
python migration_simple_reset.py --backup-only
|
||||
|
||||
# リセットのみ
|
||||
python migration_simple_reset.py --reset-only
|
||||
|
||||
# 適用のみ
|
||||
python migration_simple_reset.py --apply-only
|
||||
```
|
||||
|
||||
## 今後の展開
|
||||
|
||||
### 1. 追加モデルの段階的追加
|
||||
- Geographic models（managed=Falseとして適切に）
|
||||
- 追加機能用のモデル
|
||||
- 関連テーブル
|
||||
|
||||
### 2. データ移行
|
||||
- 既存データの段階的移行
|
||||
- 写真データの整合性確保
|
||||
- GPS記録の移行
|
||||
|
||||
### 3. デプロイメント準備
|
||||
- 本番環境での同様作業
|
||||
- データベースバックアップ確保
|
||||
- ロールバック計画
|
||||
|
||||
## 結論
|
||||
|
||||
**✅ Migration混乱の解決に成功**
|
||||
- 複雑な依存関係問題を解決
|
||||
- クリーンなMigration状態を確立
|
||||
- 今後の追加開発に向けた基盤を整備
|
||||
- デプロイメント時の混乱要因を除去
|
||||
|
||||
**次のステップ**: 必要に応じて追加モデルを段階的に追加し、データ移行を実行
|
||||
@ -1,148 +0,0 @@
|
||||
# 移行結果統計情報表示スクリプト
|
||||
|
||||
## 概要
|
||||
|
||||
移行処理の結果を詳細な統計情報として表示するスクリプトです。Docker Compose環境で実行可能で、移行データの品質チェックや分析に役立ちます。
|
||||
|
||||
## 実行方法
|
||||
|
||||
### 1. Docker Composeで実行
|
||||
|
||||
```bash
|
||||
# 統計情報を表示
|
||||
docker compose exec app python migration_statistics.py
|
||||
|
||||
# または Makeタスクを使用
|
||||
make migration-stats
|
||||
```
|
||||
|
||||
### 2. 他の移行関連コマンド
|
||||
|
||||
```bash
|
||||
# 移行実行
|
||||
make migration-run
|
||||
|
||||
# Location2025移行
|
||||
make migration-location2025
|
||||
|
||||
# データ保護移行
|
||||
make migration-data-protection
|
||||
|
||||
# データベースシェル
|
||||
make db-shell
|
||||
|
||||
# アプリケーションログ確認
|
||||
make app-logs
|
||||
```
|
||||
|
||||
## 表示される統計情報
|
||||
|
||||
### 📊 基本統計情報
|
||||
- 各テーブルのレコード数
|
||||
- 全体のデータ量概要
|
||||
|
||||
### 🎯 イベント別統計
|
||||
- 登録イベント一覧
|
||||
- イベント別参加チーム数、メンバー数、エントリー数
|
||||
|
||||
### 📍 GPSチェックイン統計
|
||||
- 総チェックイン数、参加チーム数
|
||||
- 時間帯別チェックイン分布
|
||||
- CP利用ランキング（上位10位）
|
||||
|
||||
### 👥 チーム統計
|
||||
- 総チーム数、クラス数
|
||||
- クラス別チーム分布
|
||||
- 平均メンバー数
|
||||
|
||||
### 🔍 データ品質チェック
|
||||
- 重複データチェック
|
||||
- 異常時刻データチェック
|
||||
- データ整合性チェック
|
||||
|
||||
### 📄 JSON出力
|
||||
- 統計情報をJSONファイルで出力
|
||||
- 外部システムでの利用や保存に便利
|
||||
|
||||
## 出力例
|
||||
|
||||
```
|
||||
================================================================================
|
||||
📊 移行データ基本統計情報
|
||||
================================================================================
|
||||
|
||||
📋 テーブル別レコード数:
|
||||
テーブル名 日本語名 レコード数
|
||||
-----------------------------------------------------------------
|
||||
rog_newevent2 イベント 12件
|
||||
rog_team チーム 450件
|
||||
rog_member メンバー 1,200件
|
||||
rog_entry エントリー 450件
|
||||
rog_gpscheckin GPSチェックイン 8,500件
|
||||
rog_checkpoint チェックポイント 800件
|
||||
rog_location2025 ロケーション2025 50件
|
||||
rog_customuser ユーザー 25件
|
||||
-----------------------------------------------------------------
|
||||
合計 11,487件
|
||||
|
||||
================================================================================
|
||||
🎯 イベント別統計情報
|
||||
================================================================================
|
||||
|
||||
📅 登録イベント数: 12件
|
||||
|
||||
イベント詳細:
|
||||
ID イベント名 開催日 登録日時
|
||||
------------------------------------------------------------
|
||||
1 美濃加茂 2024-05-19 2024-08-25 10:30
|
||||
2 岐阜市 2024-04-28 2024-08-25 10:30
|
||||
3 大垣２ 2024-04-20 2024-08-25 10:30
|
||||
...
|
||||
```
|
||||
|
||||
## トラブルシューティング
|
||||
|
||||
### データベース接続エラー
|
||||
```bash
|
||||
# コンテナの状態確認
|
||||
docker compose ps
|
||||
|
||||
# PostgreSQLログ確認
|
||||
make db-logs
|
||||
|
||||
# アプリケーションログ確認
|
||||
make app-logs
|
||||
```
|
||||
|
||||
### 環境変数の確認
|
||||
```bash
|
||||
# 環境変数が正しく設定されているか確認
|
||||
docker compose exec app env | grep POSTGRES
|
||||
```
|
||||
|
||||
### 手動でのデータベース接続テスト
|
||||
```bash
|
||||
# PostgreSQLコンテナに直接接続
|
||||
docker compose exec postgres-db psql -U admin -d rogdb
|
||||
|
||||
# テーブル確認
|
||||
\dt
|
||||
|
||||
# 基本的なクエリテスト
|
||||
SELECT COUNT(*) FROM rog_gpscheckin;
|
||||
```
|
||||
|
||||
## 関連ファイル
|
||||
|
||||
- `migration_statistics.py` - 統計表示メインスクリプト
|
||||
- `migration_final_simple.py` - GPS記録移行スクリプト
|
||||
- `migration_location2025_support.py` - Location2025移行スクリプト
|
||||
- `migration_data_protection.py` - データ保護移行スクリプト
|
||||
- `Makefile` - 実行用タスク定義
|
||||
|
||||
## 注意事項
|
||||
|
||||
- Docker Composeが正常に起動していることを確認してください
|
||||
- PostgreSQLコンテナが稼働していることを確認してください
|
||||
- 統計情報は実行時点のデータベース状態を反映します
|
||||
- JSON出力ファイルは `/app/` ディレクトリに保存されます
|
||||
419
MObServer_仕様書.md
419
MObServer_仕様書.md
@ -1,419 +0,0 @@
|
||||
岐阜ロゲ（GifuTabi）サーバー API 仕様書
|
||||
このドキュメントでは、MobServer_gifurogeのAPIエンドポイントとその機能を解説します。このシステムはロゲイニングイベント管理のためのサーバーサイドAPIを提供しています。
|
||||
|
||||
目次
|
||||
1. 認証関連 API
|
||||
2. チーム・ユーザー管理 API
|
||||
3. チェックポイント関連 API
|
||||
4. ルート・位置情報関連 API
|
||||
5. ランキング関連 API
|
||||
6. レポート・スコアボード関連 API
|
||||
7. 管理機能 API
|
||||
8. その他の API
|
||||
|
||||
# 認証関連 API
|
||||
|
||||
## /callback_gifuroge (POST)
|
||||
機能: LINE Botのウェブフック。ユーザーからのメッセージ処理。
|
||||
利用: LINE Platformから自動的に呼び出される。
|
||||
|
||||
## /check_event_code (GET)
|
||||
パラメータ:
|
||||
zekken_number: ゼッケン番号
|
||||
pw: パスワード
|
||||
戻り値: イベントコードまたはエラー情報
|
||||
機能: ゼッケン番号とパスワードの組み合わせが正しいか確認し、イベントコードを返す。
|
||||
|
||||
# チーム・ユーザー管理 API
|
||||
|
||||
## /get_team_list (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード（省略可）
|
||||
戻り値: チームリスト
|
||||
機能: 指定されたイベントのチームリスト、または全イベントのチームリストを取得。
|
||||
|
||||
## /get_zekken_list (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: ゼッケン番号のリスト
|
||||
機能: 指定されたイベントの全ゼッケン番号を取得。
|
||||
|
||||
## /register_team (POST)
|
||||
パラメータ:
|
||||
zekken_number: ゼッケン番号
|
||||
event_code: イベントコード
|
||||
team_name: チーム名
|
||||
class_name: クラス名
|
||||
password: パスワード
|
||||
戻り値: 登録結果
|
||||
機能: 新しいチームを登録。
|
||||
|
||||
## /update_team_name (POST)
|
||||
パラメータ:
|
||||
zekken_number: ゼッケン番号
|
||||
new_team_name: 新しいチーム名
|
||||
event_code: イベントコード
|
||||
戻り値: 更新結果
|
||||
機能: チーム名を更新。
|
||||
|
||||
## /teamClassChanger (GET)
|
||||
パラメータ:
|
||||
zekken: ゼッケン番号
|
||||
event: イベントコード
|
||||
new_class: 新しいクラス名
|
||||
戻り値: 変更結果
|
||||
機能: チームのクラスを変更。
|
||||
|
||||
## /teamRegister (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
class: クラス名
|
||||
zekken: ゼッケン番号
|
||||
team: チーム名
|
||||
pass: パスワード
|
||||
戻り値: 登録結果
|
||||
機能: チームを登録（管理者用）。
|
||||
|
||||
## /zekkenMaxNum (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: 最大ゼッケン番号
|
||||
機能: 指定イベントで使用されている最大のゼッケン番号を取得。
|
||||
|
||||
## /zekkenDoubleCheck (GET)
|
||||
パラメータ:
|
||||
zekken: ゼッケン番号
|
||||
event: イベントコード
|
||||
戻り値: 重複チェック結果
|
||||
機能: 指定ゼッケン番号が既に使用されているか確認。
|
||||
|
||||
## /get_chatlog (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
戻り値: チャットログ
|
||||
機能: 指定チームのLINE Botとのチャットログを取得。
|
||||
|
||||
# チェックポイント関連 API
|
||||
|
||||
## /input_cp (POST)
|
||||
パラメータ:
|
||||
zekken_number: ゼッケン番号
|
||||
event_code: イベントコード
|
||||
cp_number: チェックポイント番号
|
||||
image_address: 画像アドレス
|
||||
戻り値: 処理結果
|
||||
機能: チェックポイント通過情報を登録。
|
||||
|
||||
## /getCheckpointList (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: チェックポイントリスト
|
||||
機能: 指定イベントの全チェックポイント情報を取得。
|
||||
|
||||
## /start_from_rogapp (POST)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
team_name: チーム名
|
||||
戻り値: 処理結果
|
||||
機能: アプリからスタート処理を実行。
|
||||
|
||||
## /checkin_from_rogapp (POST)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
team_name: チーム名
|
||||
cp_number: チェックポイント番号
|
||||
image: 画像URL
|
||||
戻り値: 処理結果
|
||||
機能: アプリからチェックイン処理を実行。
|
||||
|
||||
## /goal_from_rogapp (POST)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
team_name: チーム名
|
||||
image: 画像URL
|
||||
goal_time: ゴール時間
|
||||
戻り値: 処理結果とスコアボードURL
|
||||
機能: アプリからゴール処理を実行し、スコアボードを生成。
|
||||
|
||||
## /remove_checkin_from_rogapp (POST)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
team_name: チーム名
|
||||
cp_number: チェックポイント番号
|
||||
戻り値: 処理結果
|
||||
機能: アプリからチェックイン記録を削除。
|
||||
|
||||
## /startCheckin (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
戻り値: 処理結果
|
||||
機能: 管理画面からスタート処理を実行。
|
||||
|
||||
## /addCheckin (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
list: カンマ区切りのチェックポイント番号リスト
|
||||
戻り値: 処理結果
|
||||
機能: 管理画面から複数チェックポイントを一括登録。
|
||||
|
||||
## /deleteCheckin (GET)
|
||||
パラメータ:
|
||||
zekken: ゼッケン番号
|
||||
event_code: イベントコード
|
||||
sn: シリアル番号
|
||||
戻り値: 処理結果
|
||||
機能: チェックイン記録を削除。
|
||||
|
||||
## /moveCheckin (GET)
|
||||
パラメータ:
|
||||
zekken: ゼッケン番号
|
||||
event_code: イベントコード
|
||||
old_sn: 移動元シリアル番号
|
||||
new_sn: 移動先シリアル番号
|
||||
戻り値: 処理結果
|
||||
機能: チェックイン記録を移動（順序変更）。
|
||||
|
||||
## /goalCheckin (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
goal_time: ゴール時間
|
||||
戻り値: 処理結果
|
||||
機能: 管理画面からゴール処理を実行。
|
||||
|
||||
## /changeGoalTimeCheckin (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
goal_time: 新しいゴール時間
|
||||
戻り値: 処理結果
|
||||
機能: ゴール時間を変更。
|
||||
|
||||
## /getCheckinList (GET)
|
||||
パラメータ:
|
||||
zekken: ゼッケン番号
|
||||
event: イベントコード
|
||||
戻り値: チェックイン記録リスト
|
||||
機能: 指定チームのチェックイン記録を取得。
|
||||
|
||||
## /serviceCheckTrue、/serviceCheckFalse (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
sn: シリアル番号
|
||||
戻り値: 処理結果
|
||||
機能: サービスチェックのフラグをTrue/Falseに設定。
|
||||
|
||||
## /getYetCheckSeeviceList (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: 未チェックのサービスリスト
|
||||
機能: 未チェックのサービスチェックポイントリストを取得。
|
||||
|
||||
# ルート・位置情報関連 API
|
||||
|
||||
## /get_waypoint_datas_from_rogapp (POST)
|
||||
パラメータ:
|
||||
team_name: チーム名
|
||||
event_code: イベントコード
|
||||
waypoints: ウェイポイントデータの配列
|
||||
戻り値: 処理結果
|
||||
機能: アプリからウェイポイントデータを受信し保存。
|
||||
|
||||
## /getRoute (GET)
|
||||
パラメータ:
|
||||
team: チーム名
|
||||
event_code: イベントコード
|
||||
戻り値: ルートデータ
|
||||
機能: 指定チームのルート情報を取得。
|
||||
|
||||
## /fetchUserLocations (GET)
|
||||
パラメータ:
|
||||
zekken_number: ゼッケン番号
|
||||
event_code: イベントコード
|
||||
戻り値: 位置情報データ
|
||||
機能: ユーザーの位置情報履歴を取得。
|
||||
|
||||
## /getAllRoutes (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
class_name: クラス名（省略可）
|
||||
戻り値: 全チームのルートデータ
|
||||
機能: 指定イベントの全チームのルート情報を取得。
|
||||
|
||||
## /getStartPoint (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: スタートポイント情報
|
||||
機能: イベントのスタートポイント情報を取得。
|
||||
|
||||
## /analyze_point (GET)
|
||||
パラメータ:
|
||||
lat: 緯度
|
||||
lng: 経度
|
||||
team_name: チーム名
|
||||
event_code: イベントコード
|
||||
戻り値: 分析結果
|
||||
機能: 指定地点の情報を分析（速度、移動タイプなど）。
|
||||
|
||||
## /top_users_routes (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
class_name: クラス名
|
||||
戻り値: トップユーザーのルート
|
||||
機能: 指定クラスのトップ選手のルート情報を取得。
|
||||
|
||||
## /generate_route_image (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
zekken_number: ゼッケン番号
|
||||
戻り値: 生成された画像URL
|
||||
機能: チームのルートを可視化した画像を生成。
|
||||
|
||||
## /realtimeMonitor、/realtimeMonitor_zekken_narrow (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
class: クラス名（省略可）
|
||||
zekken: ゼッケン番号（narrow版のみ）
|
||||
戻り値: リアルタイムモニタリングデータ
|
||||
機能: リアルタイムのチーム位置情報を取得。
|
||||
|
||||
# ランキング関連 API
|
||||
|
||||
## /get_ranking (GET)
|
||||
パラメータ:
|
||||
class: クラス名
|
||||
event: イベントコード
|
||||
戻り値: ランキングデータ
|
||||
機能: 指定クラスのランキングを取得。
|
||||
|
||||
## /all_ranking_top3 (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: 全クラスのトップ3ランキング
|
||||
機能: 指定イベントの全クラスにおけるトップ3選手のランキングを取得。
|
||||
|
||||
## /all_ranking_top3_for_fcgifu (GET)
|
||||
パラメータ: なし
|
||||
戻り値: FC岐阜用のトップ3ランキング
|
||||
機能: FC岐阜イベント用の全クラスのトップ3ランキングとルート情報を取得。
|
||||
|
||||
## /all_ranking_for_fcgifu (GET)
|
||||
パラメータ: なし
|
||||
戻り値: FC岐阜用の全ランキング
|
||||
機能: FC岐阜イベント用の全ランキングとルート情報を取得。
|
||||
|
||||
# レポート・スコアボード関連 API
|
||||
|
||||
## /get_photo_list、/get_photo_list_prod (GET)
|
||||
パラメータ:
|
||||
zekken: ゼッケン番号
|
||||
pw: パスワード（prod版のみ）
|
||||
event: イベントコード
|
||||
戻り値: 写真リストとレポートURL
|
||||
機能: チームの写真とレポートURLを取得。
|
||||
|
||||
## /getScoreboard (GET)
|
||||
パラメータ:
|
||||
z_num: ゼッケン番号
|
||||
event: イベントコード
|
||||
戻り値: スコアボードExcelファイル
|
||||
機能: チームのスコアボードをダウンロード。
|
||||
|
||||
## /download_scoreboard (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
zekken_number: ゼッケン番号
|
||||
戻り値: スコアボードPDFファイル
|
||||
機能: チームのスコアボードPDFをダウンロード。
|
||||
|
||||
## /reprint (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
zekken: ゼッケン番号
|
||||
戻り値: 処理結果
|
||||
機能: スコアボードを再生成。
|
||||
|
||||
## /makeAllScoreboard (GET)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
戻り値: 処理結果
|
||||
機能: 指定イベントの全チームのスコアボードを一括生成。
|
||||
|
||||
## /makeCpListSheet (POST)
|
||||
パラメータ:
|
||||
event: イベントコード
|
||||
cp_csv: チェックポイントCSVファイル
|
||||
sponsor_csv: スポンサーCSVファイル
|
||||
戻り値: CPリストシートExcelファイル
|
||||
機能: チェックポイントリストのシートを生成。
|
||||
|
||||
# 管理機能 API
|
||||
|
||||
## /rogainingSimulator (GET)
|
||||
パラメータ:
|
||||
event_code: イベントコード
|
||||
course_time: コース時間
|
||||
pause_time_free: 無料CP停止時間
|
||||
pause_time_paid: 有料CP停止時間
|
||||
spare_time: 予備時間
|
||||
target_velocity: 目標速度
|
||||
free_node_to_visit: 訪問する無料ノード
|
||||
paid_node_to_visit: 訪問する有料ノード
|
||||
戻り値: シミュレーション結果
|
||||
機能: ロゲイニングのルートシミュレーションを実行。
|
||||
|
||||
その他の API
|
||||
|
||||
## /test_gifuroge (GET)
|
||||
機能: サーバーの動作テスト用エンドポイント。
|
||||
|
||||
## /practice (GET)
|
||||
機能: 練習用エンドポイント。
|
||||
以上が岐阜ロゲサーバーのAPI仕様です。各APIは特定の機能を実行し、JSONまたはファイル形式でレスポンスを返します。多くのAPIはイベント管理者用のバックエンド機能として設計されていますが、一部はロゲイニングアプリからも利用できます。
|
||||
|
||||
|
||||
|
||||
移行：
|
||||
remove all migration file
|
||||
drop database and table
|
||||
create database rogdb
|
||||
python manage.py makemigrations
|
||||
python manage.py migrate
|
||||
restore db from backup
|
||||
|
||||
テスト：
|
||||
|
||||
# すべてのテストを実行
|
||||
docker compose exec app python manage.py test
|
||||
|
||||
# rogアプリケーションのテストのみ実行
|
||||
docker compose exec app python manage.py test rog.tests
|
||||
|
||||
# 詳細な出力でテストを実行（エラーの詳細を確認したい場合）
|
||||
docker compose exec app python manage.py test rog.tests --verbosity=2
|
||||
|
||||
# 特定のテストクラスのみ実行
|
||||
docker compose exec app python manage.py test rog.tests.TestLocationModel
|
||||
|
||||
# 特定のテストメソッドのみ実行
|
||||
docker compose exec app python manage.py test rog.tests.TestLocationModel.test_create_location
|
||||
|
||||
# covreageをインストール（初回のみ）
|
||||
docker compose exec app pip install coverage
|
||||
|
||||
# カバレッジを計測してテスト実行
|
||||
docker compose exec app coverage run --source='.' manage.py test rog
|
||||
|
||||
# レポート表示
|
||||
docker compose exec app coverage report
|
||||
|
||||
|
||||
|
||||
|
||||
docker compose run app python manage.py import_event_data <CSVファイルパス> <イベントコード>
|
||||
|
||||
docker compose run app python manage.py import_event_data /app/rog/data/参加者システムテスト.csv 中津川
|
||||
86
Makefile
86
Makefile
@ -31,89 +31,3 @@ volume:
|
||||
shell:
|
||||
docker-compose exec api python3 manage.py shell
|
||||
|
||||
# 移行関連タスク
|
||||
migration-stats:
|
||||
docker compose exec app python migration_statistics.py
|
||||
|
||||
migration-run:
|
||||
docker compose exec app python migration_final_simple.py
|
||||
|
||||
migration-location2025:
|
||||
docker compose exec app python migration_location2025_support.py
|
||||
|
||||
migration-data-protection:
|
||||
docker compose exec app python migration_data_protection.py
|
||||
|
||||
# Old RogDB → RogDB 移行
|
||||
migrate-old-rogdb:
|
||||
docker compose exec app python migrate_old_rogdb_to_rogdb.py
|
||||
|
||||
# rog_team 専用移行 (構造変換)
|
||||
migrate-rog-team:
|
||||
docker compose exec app python migrate_rog_team_enhanced.py
|
||||
|
||||
# rog_entry 専用移行 (camelCase対応)
|
||||
migrate-rog-entry:
|
||||
docker compose exec app python migrate_rog_entry_enhanced.py
|
||||
|
||||
# rog_goalimages 専用移行 (team_name→zekken_number変換)
|
||||
migrate-rog-goalimages:
|
||||
docker compose exec app python migrate_rog_goalimages_enhanced.py
|
||||
|
||||
# 完全移行（通常テーブル + 特殊テーブル）
|
||||
migrate-full:
|
||||
@echo "=== 1. 通常テーブル移行 (特殊テーブル除く) ==="
|
||||
$(MAKE) migrate-old-rogdb
|
||||
@echo "=== 2. rog_team構造変換移行 ==="
|
||||
$(MAKE) migrate-rog-team
|
||||
@echo "=== 3. rog_entry camelCase対応移行 ==="
|
||||
$(MAKE) migrate-rog-entry
|
||||
@echo "=== 4. rog_goalimages team_name→zekken変換移行 ==="
|
||||
$(MAKE) migrate-rog-goalimages
|
||||
@echo "=== 移行完了 ==="
|
||||
|
||||
# カラム名チェック
|
||||
check-columns:
|
||||
docker compose exec app python check_column_names.py
|
||||
|
||||
# NULL値チェック
|
||||
check-null-values:
|
||||
docker compose exec app python check_null_values.py
|
||||
|
||||
# 完全な移行前チェック
|
||||
pre-migration-check:
|
||||
@echo "=== カラム名チェック ==="
|
||||
docker compose exec app python check_column_names.py
|
||||
@echo "=== NULL値チェック ==="
|
||||
docker compose exec app python check_null_values.py
|
||||
|
||||
# 移行前準備（カラム名チェック + 移行実行）
|
||||
migrate-old-rogdb-safe:
|
||||
@echo "=== カラム名チェック実行 ==="
|
||||
docker compose exec app python check_column_names.py
|
||||
@echo "=== 移行実行 ==="
|
||||
docker compose exec app python migrate_old_rogdb_to_rogdb.py
|
||||
|
||||
migrate-old-rogdb-stats:
|
||||
docker compose exec app python -c "from migrate_old_rogdb_to_rogdb import RogTableMigrator; m = RogTableMigrator(); m.connect_databases(); m.get_rog_tables()"
|
||||
|
||||
migrate-old-rogdb-dryrun:
|
||||
docker compose exec -e EXCLUDE_TABLES=all app python migrate_old_rogdb_to_rogdb.py
|
||||
|
||||
migrate-old-rogdb-exclude-users:
|
||||
docker compose exec -e EXCLUDE_TABLES=rog_customuser,rog_session app python migrate_old_rogdb_to_rogdb.py
|
||||
|
||||
# データベース関連
|
||||
db-shell:
|
||||
docker compose exec postgres-db psql -U $(POSTGRES_USER) -d $(POSTGRES_DBNAME)
|
||||
|
||||
db-backup:
|
||||
docker compose exec postgres-db pg_dump -U $(POSTGRES_USER) $(POSTGRES_DBNAME) > backup_$(shell date +%Y%m%d_%H%M%S).sql
|
||||
|
||||
# ログ確認
|
||||
app-logs:
|
||||
docker compose logs app --tail=100 -f
|
||||
|
||||
db-logs:
|
||||
docker compose logs postgres-db --tail=50 -f
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
65
README
65
README
@ -1,65 +0,0 @@
|
||||
2025-1-25 問題点
|
||||
・DBが２つ残っている
|
||||
PGPASSWORD=admin123456 psql -h localhost -U admin -p 5432 -d gifuroge
|
||||
¥c rogdb
|
||||
gifuroge との連携処理がおかしい。
|
||||
rogdb側はうまく動いてる？
|
||||
・自動印刷機能
|
||||
・通過ポイント編集機能
|
||||
・リアルタイムモニタ機能
|
||||
|
||||
2025-5-13 DB のマージ処理を一旦断念。
|
||||
・GpsLog に gps_information を移行の予定だが、フィールド処理の修正が必要。
|
||||
|
||||
2025-5-13 既存のシステムの動作確認に入る。
|
||||
テスト内容：
|
||||
・アプリシミュレーション
|
||||
・買い物ポイント認証
|
||||
・ゴール＝＞自動印刷
|
||||
・得点修正
|
||||
・ランキング表示
|
||||
・ルート表示
|
||||
|
||||
|
||||
プリンタの設定：
|
||||
lpstat -p
|
||||
|
||||
なければ、
|
||||
sudo systemctl status cups
|
||||
でCUPSの状態を確認
|
||||
|
||||
sudo lpadmin -p scoreboard_printer -E -v socket://192.168.100.50:9100 -m raw
|
||||
でプリンタを追加
|
||||
|
||||
|
||||
# 特定のプリンターのキューを表示
|
||||
lpq -P scoreboard_printer
|
||||
|
||||
# すべてのジョブを表示
|
||||
lpstat -o
|
||||
|
||||
# プリンターの詳細な状態を表示
|
||||
lpstat -v scoreboard_printer
|
||||
|
||||
# プリンターへの接続確認
|
||||
ping 192.168.100.50
|
||||
|
||||
# ポート9100への接続テスト
|
||||
telnet 192.168.100.50 9100
|
||||
# (接続できたら Ctrl+] で抜ける)
|
||||
|
||||
# 現在のジョブをキャンセル
|
||||
cancel scoreboard_printer-1
|
||||
|
||||
# すべてのジョブをキャンセル
|
||||
cancel -a scoreboard_printer
|
||||
|
||||
# プリンタを再起動
|
||||
cupsdisable scoreboard_printer
|
||||
cupsenable scoreboard_printer
|
||||
|
||||
# エラーログの確認（最も重要）
|
||||
sudo tail -f /var/log/cups/error_log
|
||||
|
||||
# CUPSサービスの再起動
|
||||
sudo systemctl restart cups
|
||||
1329
Ruby-Django移行仕様書.md
1329
Ruby-Django移行仕様書.md
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,19 +0,0 @@
|
||||
# SumasenExcel Library
|
||||
|
||||
Excel操作のためのシンプルなPythonライブラリです。
|
||||
|
||||
## インストール方法
|
||||
|
||||
```bash
|
||||
pip install -e .
|
||||
|
||||
## 使用方法
|
||||
from sumaexcel import SumasenExcel
|
||||
|
||||
excel = SumasenExcel("path/to/file.xlsx")
|
||||
data = excel.read_excel()
|
||||
|
||||
## ライセンス
|
||||
|
||||
MIT License
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
python:
|
||||
build:
|
||||
context: ..
|
||||
dockerfile: docker/python/Dockerfile
|
||||
volumes:
|
||||
- ..:/app
|
||||
environment:
|
||||
- PYTHONPATH=/app
|
||||
- POSTGRES_DB=rogdb
|
||||
- POSTGRES_USER=admin
|
||||
- POSTGRES_PASSWORD=admin123456
|
||||
- POSTGRES_HOST=localhost
|
||||
- POSTGRES_PORT=5432
|
||||
network_mode: "host"
|
||||
tty: true
|
||||
container_name: python_container # コンテナ名を明示的に指定
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
FROM python:3.9-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# GPGキーの更新とパッケージのインストール
|
||||
RUN apt-get update --allow-insecure-repositories && \
|
||||
apt-get install -y --allow-unauthenticated python3-dev libpq-dev postgresql-client && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Pythonパッケージのインストール
|
||||
COPY requirements.txt .
|
||||
COPY setup.py .
|
||||
COPY README.md .
|
||||
COPY . .
|
||||
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
# 開発用パッケージのインストール
|
||||
RUN pip install --no-cache-dir --upgrade pip \
|
||||
pytest \
|
||||
pytest-cov \
|
||||
flake8
|
||||
|
||||
# パッケージのインストール
|
||||
RUN pip install -e .
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
openpyxl>=3.0.0
|
||||
pandas>=1.0.0
|
||||
pillow>=8.0.0
|
||||
configparser>=5.0.0
|
||||
psycopg2-binary==2.9.9
|
||||
requests
|
||||
@ -1,25 +0,0 @@
|
||||
# setup.py
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
setup(
|
||||
name="sumaexcel",
|
||||
version="0.1.0",
|
||||
packages=find_packages(),
|
||||
install_requires=[
|
||||
"openpyxl>=3.0.0",
|
||||
"pandas>=1.0.0"
|
||||
],
|
||||
author="Akira Miyata",
|
||||
author_email="akira.miyata@sumasen.net",
|
||||
description="Excel handling library",
|
||||
long_description=open("README.md").read(),
|
||||
long_description_content_type="text/markdown",
|
||||
url="https://github.com/akiramiyata/sumaexcel",
|
||||
classifiers=[
|
||||
"Programming Language :: Python :: 3",
|
||||
"License :: OSI Approved :: MIT License",
|
||||
"Operating System :: OS Independent",
|
||||
],
|
||||
python_requires=">=3.6",
|
||||
)
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
from .sumaexcel import SumasenExcel
|
||||
|
||||
__version__ = "0.1.0"
|
||||
__all__ = ["SumasenExcel"]
|
||||
@ -1,102 +0,0 @@
|
||||
# sumaexcel/conditional.py
|
||||
from typing import Dict, Any, List, Union
|
||||
from openpyxl.formatting.rule import Rule, ColorScaleRule, DataBarRule, IconSetRule
|
||||
from openpyxl.styles import PatternFill, Font, Border, Side
|
||||
from openpyxl.worksheet.worksheet import Worksheet
|
||||
|
||||
class ConditionalFormatManager:
|
||||
"""Handle conditional formatting in Excel"""
|
||||
|
||||
def __init__(self, worksheet: Worksheet):
|
||||
self.worksheet = worksheet
|
||||
|
||||
def add_color_scale(
|
||||
self,
|
||||
cell_range: str,
|
||||
min_color: str = "00FF0000", # Red
|
||||
mid_color: str = "00FFFF00", # Yellow
|
||||
max_color: str = "0000FF00" # Green
|
||||
) -> None:
|
||||
"""Add color scale conditional formatting"""
|
||||
rule = ColorScaleRule(
|
||||
start_type='min',
|
||||
start_color=min_color,
|
||||
mid_type='percentile',
|
||||
mid_value=50,
|
||||
mid_color=mid_color,
|
||||
end_type='max',
|
||||
end_color=max_color
|
||||
)
|
||||
self.worksheet.conditional_formatting.add(cell_range, rule)
|
||||
|
||||
def add_data_bar(
|
||||
self,
|
||||
cell_range: str,
|
||||
color: str = "000000FF", # Blue
|
||||
show_value: bool = True
|
||||
) -> None:
|
||||
"""Add data bar conditional formatting"""
|
||||
rule = DataBarRule(
|
||||
start_type='min',
|
||||
end_type='max',
|
||||
color=color,
|
||||
showValue=show_value
|
||||
)
|
||||
self.worksheet.conditional_formatting.add(cell_range, rule)
|
||||
|
||||
def add_icon_set(
|
||||
self,
|
||||
cell_range: str,
|
||||
icon_style: str = '3Arrows', # '3Arrows', '3TrafficLights', '3Signs'
|
||||
reverse_icons: bool = False
|
||||
) -> None:
|
||||
"""Add icon set conditional formatting"""
|
||||
rule = IconSetRule(
|
||||
icon_style=icon_style,
|
||||
type='percent',
|
||||
values=[0, 33, 67],
|
||||
reverse_icons=reverse_icons
|
||||
)
|
||||
self.worksheet.conditional_formatting.add(cell_range, rule)
|
||||
|
||||
def add_custom_rule(
|
||||
self,
|
||||
cell_range: str,
|
||||
rule_type: str,
|
||||
formula: str,
|
||||
fill_color: str = None,
|
||||
font_color: str = None,
|
||||
bold: bool = None,
|
||||
border_style: str = None,
|
||||
border_color: str = None
|
||||
) -> None:
|
||||
"""Add custom conditional formatting rule"""
|
||||
dxf = {}
|
||||
if fill_color:
|
||||
dxf['fill'] = PatternFill(start_color=fill_color, end_color=fill_color)
|
||||
if font_color or bold is not None:
|
||||
dxf['font'] = Font(color=font_color, bold=bold)
|
||||
if border_style and border_color:
|
||||
side = Side(style=border_style, color=border_color)
|
||||
dxf['border'] = Border(left=side, right=side, top=side, bottom=side)
|
||||
|
||||
rule = Rule(type=rule_type, formula=[formula], dxf=dxf)
|
||||
self.worksheet.conditional_formatting.add(cell_range, rule)
|
||||
|
||||
def copy_conditional_format(
|
||||
self,
|
||||
source_range: str,
|
||||
target_range: str
|
||||
) -> None:
|
||||
"""Copy conditional formatting from one range to another"""
|
||||
source_rules = self.worksheet.conditional_formatting.get(source_range)
|
||||
if source_rules:
|
||||
for rule in source_rules:
|
||||
self.worksheet.conditional_formatting.add(target_range, rule)
|
||||
|
||||
def clear_conditional_format(
|
||||
self,
|
||||
cell_range: str
|
||||
) -> None:
|
||||
"""Clear conditional formatting from specified range"""
|
||||
self.worksheet.conditional_formatting.delete(cell_range)
|
||||
@ -1,166 +0,0 @@
|
||||
# config_handler.py
|
||||
#
|
||||
import configparser
|
||||
import os
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
import configparser
|
||||
import os
|
||||
import re
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
class ConfigHandler:
|
||||
"""変数置換機能付きの設定ファイル管理クラス"""
|
||||
|
||||
def __init__(self, ini_file_path: str, variables: Dict[str, str] = None):
|
||||
"""
|
||||
Args:
|
||||
ini_file_path (str): INIファイルのパス
|
||||
variables (Dict[str, str], optional): 置換用の変数辞書
|
||||
"""
|
||||
self.ini_file_path = ini_file_path
|
||||
self.variables = variables or {}
|
||||
self.config = configparser.ConfigParser()
|
||||
self.load_config()
|
||||
|
||||
def _substitute_variables(self, text: str) -> str:
|
||||
"""
|
||||
テキスト内の変数を置換する
|
||||
|
||||
Args:
|
||||
text (str): 置換対象のテキスト
|
||||
|
||||
Returns:
|
||||
str: 置換後のテキスト
|
||||
"""
|
||||
# ${var}形式の変数を置換
|
||||
pattern1 = r'\${([^}]+)}'
|
||||
# [var]形式の変数を置換
|
||||
pattern2 = r'\[([^\]]+)\]'
|
||||
|
||||
def replace_var(match):
|
||||
var_name = match.group(1)
|
||||
return self.variables.get(var_name, match.group(0))
|
||||
|
||||
# 両方のパターンで置換を実行
|
||||
text = re.sub(pattern1, replace_var, text)
|
||||
text = re.sub(pattern2, replace_var, text)
|
||||
|
||||
return text
|
||||
|
||||
def load_config(self) -> None:
|
||||
"""設定ファイルを読み込み、変数を置換する"""
|
||||
if not os.path.exists(self.ini_file_path):
|
||||
raise FileNotFoundError(f"設定ファイルが見つかりません: {self.ini_file_path}")
|
||||
|
||||
# まず生のテキストとして読み込む
|
||||
with open(self.ini_file_path, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
# 変数を置換
|
||||
substituted_content = self._substitute_variables(content)
|
||||
|
||||
# 置換済みの内容を StringIO 経由で configparser に読み込ませる
|
||||
from io import StringIO
|
||||
self.config.read_file(StringIO(substituted_content))
|
||||
|
||||
def get_value(self, section: str, key: str, default: Any = None) -> Optional[str]:
|
||||
"""
|
||||
指定されたセクションのキーの値を取得する
|
||||
|
||||
Args:
|
||||
section (str): セクション名
|
||||
key (str): キー名
|
||||
default (Any): デフォルト値（オプション）
|
||||
|
||||
Returns:
|
||||
Optional[str]: 設定値。存在しない場合はデフォルト値
|
||||
"""
|
||||
try:
|
||||
return self.config[section][key]
|
||||
except KeyError:
|
||||
return default
|
||||
|
||||
def get_section(self, section: str) -> Dict[str, str]:
|
||||
"""
|
||||
指定されたセクションの全ての設定を取得する
|
||||
|
||||
Args:
|
||||
section (str): セクション名
|
||||
|
||||
Returns:
|
||||
Dict[str, str]: セクションの設定をディクショナリで返す
|
||||
"""
|
||||
try:
|
||||
return dict(self.config[section])
|
||||
except KeyError:
|
||||
return {}
|
||||
|
||||
def get_all_sections(self) -> Dict[str, Dict[str, str]]:
|
||||
"""
|
||||
全てのセクションの設定を取得する
|
||||
|
||||
Returns:
|
||||
Dict[str, Dict[str, str]]: 全セクションの設定をネストされたディクショナリで返す
|
||||
"""
|
||||
return {section: dict(self.config[section]) for section in self.config.sections()}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# 使用例
|
||||
if __name__ == "__main__":
|
||||
# サンプルのINIファイル作成
|
||||
sample_ini = """
|
||||
[Database]
|
||||
host = localhost
|
||||
port = 5432
|
||||
database = mydb
|
||||
user = admin
|
||||
password = secret
|
||||
|
||||
[Application]
|
||||
debug = true
|
||||
log_level = INFO
|
||||
max_connections = 100
|
||||
|
||||
[Paths]
|
||||
data_dir = /var/data
|
||||
log_file = /var/log/app.log
|
||||
"""
|
||||
|
||||
# サンプルINIファイルを作成
|
||||
with open('config.ini', 'w', encoding='utf-8') as f:
|
||||
f.write(sample_ini)
|
||||
|
||||
# 設定を読み込んで使用
|
||||
config = ConfigHandler('config.ini')
|
||||
|
||||
# 特定の値を取得
|
||||
db_host = config.get_value('Database', 'host')
|
||||
db_port = config.get_value('Database', 'port')
|
||||
print(f"Database connection: {db_host}:{db_port}")
|
||||
|
||||
# セクション全体を取得
|
||||
db_config = config.get_section('Database')
|
||||
print("Database configuration:", db_config)
|
||||
|
||||
# 全ての設定を取得
|
||||
all_config = config.get_all_sections()
|
||||
print("All configurations:", all_config)
|
||||
|
||||
|
||||
# サンプル：
|
||||
# # 設定ファイルから値を取得
|
||||
# config = ConfigHandler('config.ini')
|
||||
#
|
||||
# # データベース設定を取得
|
||||
# db_host = config.get_value('Database', 'host')
|
||||
# db_port = config.get_value('Database', 'port')
|
||||
# db_name = config.get_value('Database', 'database')
|
||||
#
|
||||
# # アプリケーション設定を取得
|
||||
# debug_mode = config.get_value('Application', 'debug')
|
||||
# log_level = config.get_value('Application', 'log_level')
|
||||
#
|
||||
@ -1,77 +0,0 @@
|
||||
# sumaexcel/image.py
|
||||
from typing import Optional, Tuple, Union
|
||||
from pathlib import Path
|
||||
import os
|
||||
from PIL import Image
|
||||
from openpyxl.drawing.image import Image as XLImage
|
||||
from openpyxl.worksheet.worksheet import Worksheet
|
||||
|
||||
class ImageManager:
|
||||
"""Handle image operations in Excel"""
|
||||
|
||||
def __init__(self, worksheet: Worksheet):
|
||||
self.worksheet = worksheet
|
||||
self.temp_dir = Path("/tmp/sumaexcel_images")
|
||||
self.temp_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def add_image(
|
||||
self,
|
||||
image_path: Union[str, Path],
|
||||
cell_coordinates: Tuple[int, int],
|
||||
size: Optional[Tuple[int, int]] = None,
|
||||
keep_aspect_ratio: bool = True,
|
||||
anchor_type: str = 'absolute'
|
||||
) -> None:
|
||||
"""Add image to worksheet at specified position"""
|
||||
# Convert path to Path object
|
||||
image_path = Path(image_path)
|
||||
|
||||
# Open and process image
|
||||
with Image.open(image_path) as img:
|
||||
# Get original size
|
||||
orig_width, orig_height = img.size
|
||||
|
||||
# Calculate new size if specified
|
||||
if size:
|
||||
target_width, target_height = size
|
||||
if keep_aspect_ratio:
|
||||
ratio = min(target_width/orig_width, target_height/orig_height)
|
||||
target_width = int(orig_width * ratio)
|
||||
target_height = int(orig_height * ratio)
|
||||
|
||||
# Resize image
|
||||
img = img.resize((target_width, target_height), Image.LANCZOS)
|
||||
|
||||
# Save temporary resized image
|
||||
temp_path = self.temp_dir / f"temp_{image_path.name}"
|
||||
img.save(temp_path)
|
||||
image_path = temp_path
|
||||
|
||||
# Create Excel image object
|
||||
excel_image = XLImage(str(image_path))
|
||||
|
||||
# Add to worksheet
|
||||
self.worksheet.add_image(excel_image, anchor=f'{cell_coordinates[0]}{cell_coordinates[1]}')
|
||||
|
||||
def add_image_absolute(
|
||||
self,
|
||||
image_path: Union[str, Path],
|
||||
position: Tuple[int, int],
|
||||
size: Optional[Tuple[int, int]] = None
|
||||
) -> None:
|
||||
"""Add image with absolute positioning"""
|
||||
excel_image = XLImage(str(image_path))
|
||||
if size:
|
||||
excel_image.width, excel_image.height = size
|
||||
excel_image.anchor = 'absolute'
|
||||
excel_image.top, excel_image.left = position
|
||||
self.worksheet.add_image(excel_image)
|
||||
|
||||
def cleanup(self) -> None:
|
||||
"""Clean up temporary files"""
|
||||
for file in self.temp_dir.glob("temp_*"):
|
||||
file.unlink()
|
||||
|
||||
def __del__(self):
|
||||
"""Cleanup on object destruction"""
|
||||
self.cleanup()
|
||||
@ -1,96 +0,0 @@
|
||||
# sumaexcel/merge.py
|
||||
from typing import List, Tuple, Dict
|
||||
from openpyxl.worksheet.worksheet import Worksheet
|
||||
from openpyxl.worksheet.merge import MergedCellRange
|
||||
|
||||
class MergeManager:
|
||||
"""Handle merge cell operations"""
|
||||
|
||||
def __init__(self, worksheet: Worksheet):
|
||||
self.worksheet = worksheet
|
||||
self._merged_ranges: List[MergedCellRange] = []
|
||||
self._load_merged_ranges()
|
||||
|
||||
def _load_merged_ranges(self) -> None:
|
||||
"""Load existing merged ranges from worksheet"""
|
||||
self._merged_ranges = list(self.worksheet.merged_cells.ranges)
|
||||
|
||||
def merge_cells(
|
||||
self,
|
||||
start_row: int,
|
||||
start_col: int,
|
||||
end_row: int,
|
||||
end_col: int
|
||||
) -> None:
|
||||
"""Merge cells in specified range"""
|
||||
self.worksheet.merge_cells(
|
||||
start_row=start_row,
|
||||
start_column=start_col,
|
||||
end_row=end_row,
|
||||
end_column=end_col
|
||||
)
|
||||
self._load_merged_ranges()
|
||||
|
||||
def unmerge_cells(
|
||||
self,
|
||||
start_row: int,
|
||||
start_col: int,
|
||||
end_row: int,
|
||||
end_col: int
|
||||
) -> None:
|
||||
"""Unmerge cells in specified range"""
|
||||
self.worksheet.unmerge_cells(
|
||||
start_row=start_row,
|
||||
start_column=start_col,
|
||||
end_row=end_row,
|
||||
end_column=end_col
|
||||
)
|
||||
self._load_merged_ranges()
|
||||
|
||||
def copy_merged_cells(
|
||||
self,
|
||||
source_range: Tuple[int, int, int, int],
|
||||
target_start_row: int,
|
||||
target_start_col: int
|
||||
) -> None:
|
||||
"""Copy merged cells from source range to target position"""
|
||||
src_row1, src_col1, src_row2, src_col2 = source_range
|
||||
row_offset = target_start_row - src_row1
|
||||
col_offset = target_start_col - src_col1
|
||||
|
||||
for merged_range in self._merged_ranges:
|
||||
if (src_row1 <= merged_range.min_row <= src_row2 and
|
||||
src_col1 <= merged_range.min_col <= src_col2):
|
||||
new_row1 = merged_range.min_row + row_offset
|
||||
new_col1 = merged_range.min_col + col_offset
|
||||
new_row2 = merged_range.max_row + row_offset
|
||||
new_col2 = merged_range.max_col + col_offset
|
||||
|
||||
self.merge_cells(new_row1, new_col1, new_row2, new_col2)
|
||||
|
||||
def shift_merged_cells(
|
||||
self,
|
||||
start_row: int,
|
||||
rows: int = 0,
|
||||
cols: int = 0
|
||||
) -> None:
|
||||
"""Shift merged cells by specified number of rows and columns"""
|
||||
new_ranges = []
|
||||
for merged_range in self._merged_ranges:
|
||||
if merged_range.min_row >= start_row:
|
||||
new_row1 = merged_range.min_row + rows
|
||||
new_col1 = merged_range.min_col + cols
|
||||
new_row2 = merged_range.max_row + rows
|
||||
new_col2 = merged_range.max_col + cols
|
||||
|
||||
self.worksheet.unmerge_cells(
|
||||
start_row=merged_range.min_row,
|
||||
start_column=merged_range.min_col,
|
||||
end_row=merged_range.max_row,
|
||||
end_column=merged_range.max_col
|
||||
)
|
||||
|
||||
new_ranges.append((new_row1, new_col1, new_row2, new_col2))
|
||||
|
||||
for new_range in new_ranges:
|
||||
self.merge_cells(*new_range)
|
||||
@ -1,148 +0,0 @@
|
||||
# sumaexcel/page.py
|
||||
from typing import Optional, Dict, Any, Union
|
||||
from openpyxl.worksheet.worksheet import Worksheet
|
||||
from openpyxl.worksheet.page import PageMargins, PrintPageSetup
|
||||
|
||||
# sumaexcel/page.py (continued)
|
||||
|
||||
class PageManager:
|
||||
"""Handle page setup and header/footer settings"""
|
||||
|
||||
def __init__(self, worksheet: Worksheet):
|
||||
self.worksheet = worksheet
|
||||
|
||||
def set_page_setup(
|
||||
self,
|
||||
orientation: str = 'portrait',
|
||||
paper_size: int = 9, # A4
|
||||
fit_to_height: Optional[int] = None,
|
||||
fit_to_width: Optional[int] = None,
|
||||
scale: Optional[int] = None
|
||||
) -> None:
|
||||
"""Configure page setup
|
||||
|
||||
Args:
|
||||
orientation: 'portrait' or 'landscape'
|
||||
paper_size: paper size (e.g., 9 for A4)
|
||||
fit_to_height: number of pages tall
|
||||
fit_to_width: number of pages wide
|
||||
scale: zoom scale (1-400)
|
||||
"""
|
||||
setup = PrintPageSetup(
|
||||
orientation=orientation,
|
||||
paperSize=paper_size,
|
||||
scale=scale,
|
||||
fitToHeight=fit_to_height,
|
||||
fitToWidth=fit_to_width
|
||||
)
|
||||
self.worksheet.page_setup = setup
|
||||
|
||||
def set_margins(
|
||||
self,
|
||||
left: float = 0.7,
|
||||
right: float = 0.7,
|
||||
top: float = 0.75,
|
||||
bottom: float = 0.75,
|
||||
header: float = 0.3,
|
||||
footer: float = 0.3
|
||||
) -> None:
|
||||
"""Set page margins in inches"""
|
||||
margins = PageMargins(
|
||||
left=left,
|
||||
right=right,
|
||||
top=top,
|
||||
bottom=bottom,
|
||||
header=header,
|
||||
footer=footer
|
||||
)
|
||||
self.worksheet.page_margins = margins
|
||||
|
||||
def set_header_footer(
|
||||
self,
|
||||
odd_header: Optional[str] = None,
|
||||
odd_footer: Optional[str] = None,
|
||||
even_header: Optional[str] = None,
|
||||
even_footer: Optional[str] = None,
|
||||
first_header: Optional[str] = None,
|
||||
first_footer: Optional[str] = None,
|
||||
different_first: bool = False,
|
||||
different_odd_even: bool = False
|
||||
) -> None:
|
||||
"""Set headers and footers
|
||||
|
||||
Format codes:
|
||||
- &P: Page number
|
||||
- &N: Total pages
|
||||
- &D: Date
|
||||
- &T: Time
|
||||
- &[Tab]: Sheet name
|
||||
- &[Path]: File path
|
||||
- &[File]: File name
|
||||
- &[Tab]: Worksheet name
|
||||
"""
|
||||
self.worksheet.oddHeader.left = odd_header or ""
|
||||
self.worksheet.oddFooter.left = odd_footer or ""
|
||||
|
||||
if different_odd_even:
|
||||
self.worksheet.evenHeader.left = even_header or ""
|
||||
self.worksheet.evenFooter.left = even_footer or ""
|
||||
|
||||
if different_first:
|
||||
self.worksheet.firstHeader.left = first_header or ""
|
||||
self.worksheet.firstFooter.left = first_footer or ""
|
||||
|
||||
self.worksheet.differentFirst = different_first
|
||||
self.worksheet.differentOddEven = different_odd_even
|
||||
|
||||
def set_print_area(self, range_string: str) -> None:
|
||||
"""Set print area
|
||||
|
||||
Args:
|
||||
range_string: Cell range in A1 notation (e.g., 'A1:H42')
|
||||
"""
|
||||
self.worksheet.print_area = range_string
|
||||
|
||||
def set_print_title_rows(self, rows: str) -> None:
|
||||
"""Set rows to repeat at top of each page
|
||||
|
||||
Args:
|
||||
rows: Row range (e.g., '1:3')
|
||||
"""
|
||||
self.worksheet.print_title_rows = rows
|
||||
|
||||
def set_print_title_columns(self, cols: str) -> None:
|
||||
"""Set columns to repeat at left of each page
|
||||
|
||||
Args:
|
||||
cols: Column range (e.g., 'A:B')
|
||||
"""
|
||||
self.worksheet.print_title_cols = cols
|
||||
|
||||
def set_print_options(
|
||||
self,
|
||||
grid_lines: bool = False,
|
||||
horizontal_centered: bool = False,
|
||||
vertical_centered: bool = False,
|
||||
headers: bool = False
|
||||
) -> None:
|
||||
"""Set print options"""
|
||||
self.worksheet.print_gridlines = grid_lines
|
||||
self.worksheet.print_options.horizontalCentered = horizontal_centered
|
||||
self.worksheet.print_options.verticalCentered = vertical_centered
|
||||
self.worksheet.print_options.headers = headers
|
||||
|
||||
class PaperSizes:
|
||||
"""Standard paper size constants"""
|
||||
LETTER = 1
|
||||
LETTER_SMALL = 2
|
||||
TABLOID = 3
|
||||
LEDGER = 4
|
||||
LEGAL = 5
|
||||
STATEMENT = 6
|
||||
EXECUTIVE = 7
|
||||
A3 = 8
|
||||
A4 = 9
|
||||
A4_SMALL = 10
|
||||
A5 = 11
|
||||
B4 = 12
|
||||
B5 = 13
|
||||
@ -1,115 +0,0 @@
|
||||
# sumaexcel/styles.py
|
||||
from typing import Dict, Any, Optional, Union
|
||||
from openpyxl.styles import (
|
||||
Font, PatternFill, Alignment, Border, Side,
|
||||
NamedStyle, Protection, Color
|
||||
)
|
||||
from openpyxl.styles.differential import DifferentialStyle
|
||||
from openpyxl.formatting.rule import Rule
|
||||
from openpyxl.worksheet.worksheet import Worksheet
|
||||
|
||||
class StyleManager:
|
||||
"""Excel style management class"""
|
||||
|
||||
@staticmethod
|
||||
def create_font(
|
||||
name: str = "Arial",
|
||||
size: int = 11,
|
||||
bold: bool = False,
|
||||
italic: bool = False,
|
||||
color: str = "000000",
|
||||
underline: str = None,
|
||||
strike: bool = False
|
||||
) -> Font:
|
||||
"""Create a Font object with specified parameters"""
|
||||
return Font(
|
||||
name=name,
|
||||
size=size,
|
||||
bold=bold,
|
||||
italic=italic,
|
||||
color=color,
|
||||
underline=underline,
|
||||
strike=strike
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def create_fill(
|
||||
fill_type: str = "solid",
|
||||
start_color: str = "FFFFFF",
|
||||
end_color: str = None
|
||||
) -> PatternFill:
|
||||
"""Create a PatternFill object"""
|
||||
return PatternFill(
|
||||
fill_type=fill_type,
|
||||
start_color=start_color,
|
||||
end_color=end_color or start_color
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def create_border(
|
||||
style: str = "thin",
|
||||
color: str = "000000"
|
||||
) -> Border:
|
||||
"""Create a Border object"""
|
||||
side = Side(style=style, color=color)
|
||||
return Border(
|
||||
left=side,
|
||||
right=side,
|
||||
top=side,
|
||||
bottom=side
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def create_alignment(
|
||||
horizontal: str = "general",
|
||||
vertical: str = "bottom",
|
||||
wrap_text: bool = False,
|
||||
shrink_to_fit: bool = False,
|
||||
indent: int = 0
|
||||
) -> Alignment:
|
||||
"""Create an Alignment object"""
|
||||
return Alignment(
|
||||
horizontal=horizontal,
|
||||
vertical=vertical,
|
||||
wrap_text=wrap_text,
|
||||
shrink_to_fit=shrink_to_fit,
|
||||
indent=indent
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def copy_style(source_cell: Any, target_cell: Any) -> None:
|
||||
"""Copy all style properties from source cell to target cell"""
|
||||
target_cell.font = Font(
|
||||
name=source_cell.font.name,
|
||||
size=source_cell.font.size,
|
||||
bold=source_cell.font.bold,
|
||||
italic=source_cell.font.italic,
|
||||
color=source_cell.font.color,
|
||||
underline=source_cell.font.underline,
|
||||
strike=source_cell.font.strike
|
||||
)
|
||||
|
||||
if source_cell.fill.patternType != None:
|
||||
target_cell.fill = PatternFill(
|
||||
fill_type=source_cell.fill.patternType,
|
||||
start_color=source_cell.fill.start_color.rgb,
|
||||
end_color=source_cell.fill.end_color.rgb
|
||||
)
|
||||
|
||||
target_cell.border = Border(
|
||||
left=source_cell.border.left,
|
||||
right=source_cell.border.right,
|
||||
top=source_cell.border.top,
|
||||
bottom=source_cell.border.bottom
|
||||
)
|
||||
|
||||
target_cell.alignment = Alignment(
|
||||
horizontal=source_cell.alignment.horizontal,
|
||||
vertical=source_cell.alignment.vertical,
|
||||
wrap_text=source_cell.alignment.wrap_text,
|
||||
shrink_to_fit=source_cell.alignment.shrink_to_fit,
|
||||
indent=source_cell.alignment.indent
|
||||
)
|
||||
|
||||
if source_cell.number_format:
|
||||
target_cell.number_format = source_cell.number_format
|
||||
File diff suppressed because it is too large
Load Diff
BIN
SumasenLibs/excel_lib/testdata/certificate_5033.xlsx
vendored
BIN
SumasenLibs/excel_lib/testdata/certificate_5033.xlsx
vendored
Binary file not shown.
Binary file not shown.
28
SumasenLibs/excel_lib/testdata/sample.py
vendored
28
SumasenLibs/excel_lib/testdata/sample.py
vendored
@ -1,28 +0,0 @@
|
||||
from sumaexcel import SumasenExcel
|
||||
import logging
|
||||
|
||||
# 初期化
|
||||
# 初期化
|
||||
variables = {
|
||||
"zekken_number":"5033",
|
||||
"event_code":"FC岐阜",
|
||||
"db":"rogdb",
|
||||
"username":"admin",
|
||||
"password":"admin123456",
|
||||
"host":"localhost",
|
||||
"port":"5432"
|
||||
}
|
||||
excel = SumasenExcel(document="test", variables=variables, docbase="./testdata")
|
||||
|
||||
logging.info("Excelファイル作成 step-1")
|
||||
|
||||
# シート初期化
|
||||
ret = excel.make_report(variables=variables)
|
||||
logging.info(f"Excelファイル作成 step-2 : ret={ret}")
|
||||
if ret["status"]==True:
|
||||
filepath=ret["filepath"]
|
||||
logging.info(f"Excelファイル作成 : ret.filepath={filepath}")
|
||||
else:
|
||||
message = ret.get("message", "No message provided")
|
||||
logging.error(f"Excelファイル作成失敗 : ret.message={message}")
|
||||
|
||||
26
SumasenLibs/excel_lib/testdata/test.ini
vendored
26
SumasenLibs/excel_lib/testdata/test.ini
vendored
@ -1,26 +0,0 @@
|
||||
[basic]
|
||||
template_file=certificate_template.xlsx
|
||||
doc_file=certificate_[zekken_number].xlsx
|
||||
sections=section1
|
||||
maxcol=10
|
||||
column_width=3,5,16,16,16,16,16,8,8,12,3
|
||||
|
||||
[section1]
|
||||
template_sheet=certificate
|
||||
sheet_name=certificate
|
||||
groups=group1,group2
|
||||
fit_to_width=1
|
||||
orientation=portrait
|
||||
|
||||
[section1.group1]
|
||||
table_name=mv_entry_details
|
||||
where=zekken_number='[zekken_number]' and event_name='[event_code]'
|
||||
group_range=A1:J12
|
||||
|
||||
|
||||
[section1.group2]
|
||||
table_name=v_checkins_locations
|
||||
where=zekken_number='[zekken_number]' and event_code='[event_code]'
|
||||
sort=path_order
|
||||
group_range=A13:J13
|
||||
|
||||
BIN
TempProject.zip
BIN
TempProject.zip
Binary file not shown.
292
aaa.aaa
292
aaa.aaa
@ -1,292 +0,0 @@
|
||||
45degrees 余語様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
yogomi@yahoo.co.jp は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは yogomi123 です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
杉山 凌矢様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは ryoya3997@icloud.com sugiya123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
近藤 隆様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは kondo2000gt@na.commufa.jp kondo123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
マッパ 田中様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは rnfqp821@ma.medias.ne.jp tanaka123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
OLCルーパー/OLCふるはうす 本多様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは honda.nouken-t@outlook.jp honda123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
清水有希様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは wszbnhmjfx432@gmail.com shimizu123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
青波走行会 坂口 様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは bitter_smile107@yahoo.co.jp sakagu123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
庭野智美様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは niwasun0758@protonmail.com niwano123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
がんばるぞ 森様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは youkeymr.01@gmail.com moriyu123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
むらさきうさぎチーム 森様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは bosque.mk@gmail.com morimi123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
山附純一様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは sijuuhatutaki@gmail.com yamazu123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
松村覚司様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは happy.dreams.come.true923@gmail.com matumu123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
ナカムラカスモリ 高桑様
|
||||
|
||||
岐阜aiネットワークです。
|
||||
|
||||
は岐阜ロゲに登録がありませんでしたので、こちらで作成し、今回のエントリーまで完了しています。
|
||||
仮パスワードは kamigou07@gmail.com takaku123です。ログインした後に、パスワードを設定してください。
|
||||
|
||||
それでは、明日はお会いできるのを楽しみにしております。
|
||||
|
||||
宮田
|
||||
|
||||
----------------------------------------------------------
|
||||
非営利活動法人 岐阜ａｉネットワーク
|
||||
理事長 宮田 明
|
||||
Akira Miyata
|
||||
Chairman
|
||||
NPO Gifu AI Network
|
||||
Web: https://www.gifuai.net/ <https://www.gifuai.net/>
|
||||
----------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
# Generated migration for adding use_qr_code field to Location model
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('rog', '0001_initial'), # 最新のマイグレーションファイル名に合わせてください
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='location',
|
||||
name='use_qr_code',
|
||||
field=models.BooleanField(
|
||||
default=False,
|
||||
help_text='QRコードを使用したインタラクションを有効にする',
|
||||
verbose_name='Use QR Code for interaction'
|
||||
),
|
||||
),
|
||||
]
|
||||
@ -1,150 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
# プロジェクト設定
|
||||
sys.path.append('/app')
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def analyze_event_data_raw():
|
||||
"""生のSQLを使ってイベント・チーム・エントリーデータを分析"""
|
||||
|
||||
print("=== 生SQLによるイベント・データ分析 ===")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
# 1. NewEvent2テーブルの構造確認
|
||||
print("\n1. rog_newevent2テーブル構造:")
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_newevent2'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
columns = cursor.fetchall()
|
||||
for col in columns:
|
||||
print(f" - {col[0]}: {col[1]} ({'NULL' if col[2] == 'YES' else 'NOT NULL'})")
|
||||
|
||||
# 2. 全イベント一覧
|
||||
print("\n2. 全イベント一覧:")
|
||||
cursor.execute("""
|
||||
SELECT id, event_name, event_day, venue_address
|
||||
FROM rog_newevent2
|
||||
ORDER BY id;
|
||||
""")
|
||||
events = cursor.fetchall()
|
||||
|
||||
for event in events:
|
||||
print(f" - ID:{event[0]}, Name:{event[1]}, Date:{event[2]}, Venue:{event[3]}")
|
||||
|
||||
# 各イベントのエントリー数とチーム数
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_entry WHERE event_id = %s", [event[0]])
|
||||
entry_count = cursor.fetchone()[0]
|
||||
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_team WHERE event_id = %s", [event[0]])
|
||||
team_count = cursor.fetchone()[0]
|
||||
|
||||
print(f" Entry:{entry_count}, Team:{team_count}")
|
||||
|
||||
# 3. FC岐阜関連イベント検索
|
||||
print("\n3. FC岐阜関連イベント検索:")
|
||||
cursor.execute("""
|
||||
SELECT id, event_name, event_day, venue_address
|
||||
FROM rog_newevent2
|
||||
WHERE event_name ILIKE %s OR event_name ILIKE %s OR event_name ILIKE %s
|
||||
ORDER BY id;
|
||||
""", ['%FC岐阜%', '%fc岐阜%', '%岐阜%'])
|
||||
|
||||
fc_events = cursor.fetchall()
|
||||
if fc_events:
|
||||
for event in fc_events:
|
||||
print(f" - ID:{event[0]}, Name:{event[1]}, Date:{event[2]}")
|
||||
|
||||
# 関連エントリー
|
||||
cursor.execute("""
|
||||
SELECT e.id, t.id as team_id, t.name as team_name, t.zekken_number
|
||||
FROM rog_entry e
|
||||
JOIN rog_team t ON e.team_id = t.id
|
||||
WHERE e.event_id = %s
|
||||
LIMIT 10;
|
||||
""", [event[0]])
|
||||
|
||||
entries = cursor.fetchall()
|
||||
if entries:
|
||||
print(" エントリー詳細:")
|
||||
for entry in entries:
|
||||
print(f" Entry ID:{entry[0]}, Team ID:{entry[1]}, Team:{entry[2]}, Zekken:{entry[3]}")
|
||||
|
||||
# 関連チーム（ゼッケン番号付き）
|
||||
cursor.execute("""
|
||||
SELECT id, name, zekken_number
|
||||
FROM rog_team
|
||||
WHERE event_id = %s AND zekken_number IS NOT NULL AND zekken_number != ''
|
||||
LIMIT 10;
|
||||
""", [event[0]])
|
||||
|
||||
teams_with_zekken = cursor.fetchall()
|
||||
if teams_with_zekken:
|
||||
print(" ゼッケン番号付きチーム:")
|
||||
for team in teams_with_zekken:
|
||||
print(f" Team ID:{team[0]}, Name:{team[1]}, Zekken:{team[2]}")
|
||||
else:
|
||||
print(" ゼッケン番号付きチームが見つかりません")
|
||||
else:
|
||||
print(" FC岐阜関連イベントが見つかりません")
|
||||
|
||||
# 4. 全体のゼッケン番号付きチーム確認
|
||||
print("\n4. 全体のゼッケン番号付きチーム状況:")
|
||||
cursor.execute("""
|
||||
SELECT COUNT(*)
|
||||
FROM rog_team
|
||||
WHERE zekken_number IS NOT NULL AND zekken_number != '';
|
||||
""")
|
||||
zekken_team_count = cursor.fetchone()[0]
|
||||
print(f" ゼッケン番号付きチーム総数: {zekken_team_count}")
|
||||
|
||||
if zekken_team_count > 0:
|
||||
cursor.execute("""
|
||||
SELECT t.id, t.name, t.zekken_number, e.event_name
|
||||
FROM rog_team t
|
||||
LEFT JOIN rog_newevent2 e ON t.event_id = e.id
|
||||
WHERE t.zekken_number IS NOT NULL AND t.zekken_number != ''
|
||||
LIMIT 10;
|
||||
""")
|
||||
|
||||
sample_teams = cursor.fetchall()
|
||||
print(" サンプル:")
|
||||
for team in sample_teams:
|
||||
print(f" ID:{team[0]}, Name:{team[1]}, Zekken:{team[2]}, Event:{team[3]}")
|
||||
|
||||
# 5. 通過審査管理画面で使われる可能性のあるクエリの確認
|
||||
print("\n5. 通過審査管理用データ確認:")
|
||||
cursor.execute("""
|
||||
SELECT e.id as event_id, e.event_name, COUNT(t.id) as team_count,
|
||||
COUNT(CASE WHEN t.zekken_number IS NOT NULL AND t.zekken_number != '' THEN 1 END) as zekken_teams
|
||||
FROM rog_newevent2 e
|
||||
LEFT JOIN rog_team t ON e.id = t.event_id
|
||||
GROUP BY e.id, e.event_name
|
||||
ORDER BY e.id;
|
||||
""")
|
||||
|
||||
event_stats = cursor.fetchall()
|
||||
print(" イベント別チーム・ゼッケン統計:")
|
||||
for stat in event_stats:
|
||||
print(f" イベントID:{stat[0]}, Name:{stat[1]}, 総チーム:{stat[2]}, ゼッケン付き:{stat[3]}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
analyze_event_data_raw()
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,125 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
# プロジェクト設定
|
||||
sys.path.append('/app')
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from rog.models import Entry, Team, NewEvent2, Member
|
||||
from django.db.models import Q
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def analyze_fc_gifu_data():
|
||||
"""FC岐阜関連のイベント・チーム・エントリーデータを詳細分析"""
|
||||
|
||||
print("=== FC岐阜イベント・データ詳細分析 ===")
|
||||
|
||||
# 1. FC岐阜関連イベントを検索
|
||||
print("\n1. FC岐阜関連イベント検索:")
|
||||
fc_events = NewEvent2.objects.filter(
|
||||
Q(event_name__icontains='FC岐阜') |
|
||||
Q(event_name__icontains='fc岐阜') |
|
||||
Q(event_name__icontains='岐阜')
|
||||
)
|
||||
|
||||
if fc_events.exists():
|
||||
for event in fc_events:
|
||||
print(f" - ID:{event.id}, Name:{event.event_name}, Date:{event.event_day}")
|
||||
|
||||
# イベントに関連するエントリーを確認
|
||||
entries = Entry.objects.filter(event=event)
|
||||
print(f" 関連エントリー数: {entries.count()}")
|
||||
|
||||
# エントリーのチーム情報を表示
|
||||
if entries.exists():
|
||||
print(" エントリー詳細:")
|
||||
for entry in entries[:10]: # 最初の10件のみ表示
|
||||
team = entry.team
|
||||
print(f" Entry ID:{entry.id}, Team ID:{team.id}, Team Name:{team.name}, Zekken:{team.zekken_number}")
|
||||
|
||||
# イベントに関連するチームを直接検索
|
||||
teams = Team.objects.filter(event=event)
|
||||
print(f" 関連チーム数: {teams.count()}")
|
||||
|
||||
if teams.exists():
|
||||
print(" チーム詳細:")
|
||||
for team in teams[:10]: # 最初の10件のみ表示
|
||||
print(f" Team ID:{team.id}, Name:{team.name}, Zekken:{team.zekken_number}")
|
||||
else:
|
||||
print(" FC岐阜関連イベントが見つかりません")
|
||||
|
||||
# 2. 全イベント一覧を確認
|
||||
print("\n2. 全イベント一覧:")
|
||||
all_events = NewEvent2.objects.all()
|
||||
for event in all_events:
|
||||
entry_count = Entry.objects.filter(event=event).count()
|
||||
team_count = Team.objects.filter(event=event).count()
|
||||
print(f" - ID:{event.id}, Name:{event.event_name}, Date:{event.event_day}, Entry:{entry_count}, Team:{team_count}")
|
||||
|
||||
# 3. ゼッケン番号が設定されているチームを確認
|
||||
print("\n3. ゼッケン番号付きチーム:")
|
||||
teams_with_zekken = Team.objects.exclude(zekken_number__isnull=True).exclude(zekken_number='')
|
||||
print(f" ゼッケン番号付きチーム数: {teams_with_zekken.count()}")
|
||||
|
||||
if teams_with_zekken.exists():
|
||||
print(" サンプル:")
|
||||
for team in teams_with_zekken[:10]:
|
||||
print(f" ID:{team.id}, Name:{team.name}, Zekken:{team.zekken_number}, Event:{team.event.event_name if team.event else 'None'}")
|
||||
|
||||
# 4. 特定のイベントID（仮に100とする）を詳細調査
|
||||
print("\n4. イベントID 100 詳細調査:")
|
||||
try:
|
||||
event_100 = NewEvent2.objects.get(id=100)
|
||||
print(f" イベント: {event_100.event_name} ({event_100.event_day})")
|
||||
|
||||
# エントリー確認
|
||||
entries_100 = Entry.objects.filter(event=event_100)
|
||||
print(f" エントリー数: {entries_100.count()}")
|
||||
|
||||
# チーム確認
|
||||
teams_100 = Team.objects.filter(event=event_100)
|
||||
print(f" チーム数: {teams_100.count()}")
|
||||
|
||||
# ゼッケン番号付きチーム確認
|
||||
teams_100_with_zekken = teams_100.exclude(zekken_number__isnull=True).exclude(zekken_number='')
|
||||
print(f" ゼッケン番号付きチーム数: {teams_100_with_zekken.count()}")
|
||||
|
||||
if teams_100_with_zekken.exists():
|
||||
print(" ゼッケン番号付きチーム:")
|
||||
for team in teams_100_with_zekken:
|
||||
print(f" ID:{team.id}, Name:{team.name}, Zekken:{team.zekken_number}")
|
||||
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(" イベントID 100は存在しません")
|
||||
|
||||
# 5. Entryテーブルとチームの関係確認
|
||||
print("\n5. Entry-Team関係確認:")
|
||||
total_entries = Entry.objects.all().count()
|
||||
entries_with_teams = Entry.objects.exclude(team__isnull=True).count()
|
||||
print(f" 総エントリー数: {total_entries}")
|
||||
print(f" チーム関連付けありエントリー数: {entries_with_teams}")
|
||||
|
||||
# サンプルエントリーの詳細
|
||||
print(" サンプルエントリー詳細:")
|
||||
sample_entries = Entry.objects.all()[:5]
|
||||
for entry in sample_entries:
|
||||
team = entry.team
|
||||
event = entry.event
|
||||
print(f" Entry ID:{entry.id}, Team:{team.name if team else 'None'}({team.id if team else 'None'}), Event:{event.event_name if event else 'None'}({event.id if event else 'None'})")
|
||||
if team:
|
||||
print(f" Team Zekken:{team.zekken_number}, Team Event:{team.event.event_name if team.event else 'None'}")
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
analyze_fc_gifu_data()
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,158 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb構造分析＆データ移行準備スクリプト
|
||||
old_rogdbの構造を詳細に分析し、rogdbへの移行計画を立てる
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
import psycopg2
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.conf import settings
|
||||
|
||||
print("=== old_rogdb構造分析 ===")
|
||||
|
||||
# old_rogdb直接接続設定
|
||||
old_db_config = {
|
||||
'host': 'postgres-db',
|
||||
'database': 'old_rogdb',
|
||||
'user': 'admin',
|
||||
'password': 'admin123456',
|
||||
'port': 5432
|
||||
}
|
||||
|
||||
try:
|
||||
# old_rogdbに直接接続
|
||||
old_conn = psycopg2.connect(**old_db_config)
|
||||
old_cursor = old_conn.cursor()
|
||||
|
||||
print("✅ old_rogdb接続成功")
|
||||
|
||||
print("\\n=== 1. old_rogdb rog_entry構造分析 ===")
|
||||
old_cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable, column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_entry' AND table_schema = 'public'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
old_entry_columns = old_cursor.fetchall()
|
||||
|
||||
print("old_rogdb.rog_entry 構造:")
|
||||
for col_name, data_type, nullable, default in old_entry_columns:
|
||||
print(f" - {col_name}: {data_type} {'(NULL可)' if nullable == 'YES' else '(NOT NULL)'} {f'[default: {default}]' if default else ''}")
|
||||
|
||||
# old_rogdb rog_entry データ確認
|
||||
old_cursor.execute("SELECT COUNT(*) FROM rog_entry;")
|
||||
old_entry_count = old_cursor.fetchone()[0]
|
||||
print(f"\\nold_rogdb.rog_entry データ件数: {old_entry_count}件")
|
||||
|
||||
# サンプルデータ確認
|
||||
old_cursor.execute("SELECT * FROM rog_entry LIMIT 3;")
|
||||
old_entry_samples = old_cursor.fetchall()
|
||||
print("\\nサンプルデータ（最初の3件）:")
|
||||
for i, row in enumerate(old_entry_samples):
|
||||
print(f" Row {i+1}: {row}")
|
||||
|
||||
print("\\n=== 2. old_rogdb rog_team構造分析 ===")
|
||||
old_cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable, column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_team' AND table_schema = 'public'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
old_team_columns = old_cursor.fetchall()
|
||||
|
||||
print("old_rogdb.rog_team 構造:")
|
||||
for col_name, data_type, nullable, default in old_team_columns:
|
||||
print(f" - {col_name}: {data_type} {'(NULL可)' if nullable == 'YES' else '(NOT NULL)'} {f'[default: {default}]' if default else ''}")
|
||||
|
||||
old_cursor.execute("SELECT COUNT(*) FROM rog_team;")
|
||||
old_team_count = old_cursor.fetchone()[0]
|
||||
print(f"\\nold_rogdb.rog_team データ件数: {old_team_count}件")
|
||||
|
||||
print("\\n=== 3. old_rogdb rog_member構造分析 ===")
|
||||
try:
|
||||
old_cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable, column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_member' AND table_schema = 'public'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
old_member_columns = old_cursor.fetchall()
|
||||
|
||||
if old_member_columns:
|
||||
print("old_rogdb.rog_member 構造:")
|
||||
for col_name, data_type, nullable, default in old_member_columns:
|
||||
print(f" - {col_name}: {data_type} {'(NULL可)' if nullable == 'YES' else '(NOT NULL)'} {f'[default: {default}]' if default else ''}")
|
||||
|
||||
old_cursor.execute("SELECT COUNT(*) FROM rog_member;")
|
||||
old_member_count = old_cursor.fetchone()[0]
|
||||
print(f"\\nold_rogdb.rog_member データ件数: {old_member_count}件")
|
||||
else:
|
||||
print("old_rogdb.rog_member テーブルが存在しません")
|
||||
except Exception as e:
|
||||
print(f"old_rogdb.rog_member 確認エラー: {e}")
|
||||
|
||||
print("\\n=== 4. FC岐阜関連データ詳細分析 ===")
|
||||
|
||||
# FC岐阜イベント確認
|
||||
old_cursor.execute("""
|
||||
SELECT id, event_name, start_datetime, end_datetime
|
||||
FROM rog_newevent2
|
||||
WHERE event_name LIKE '%FC岐阜%' OR event_name LIKE '%fc岐阜%'
|
||||
ORDER BY id;
|
||||
""")
|
||||
fc_events = old_cursor.fetchall()
|
||||
|
||||
print("FC岐阜関連イベント:")
|
||||
for event_id, name, start, end in fc_events:
|
||||
print(f" Event {event_id}: '{name}' ({start} - {end})")
|
||||
|
||||
# このイベントのエントリー数確認
|
||||
old_cursor.execute("SELECT COUNT(*) FROM rog_entry WHERE event_id = %s;", (event_id,))
|
||||
entry_count = old_cursor.fetchone()[0]
|
||||
print(f" エントリー数: {entry_count}件")
|
||||
|
||||
# FC岐阜イベントのエントリー詳細
|
||||
if fc_events:
|
||||
fc_event_id = fc_events[0][0] # 最初のFC岐阜イベント
|
||||
print(f"\\nFC岐阜イベント(ID:{fc_event_id})のエントリー詳細:")
|
||||
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.category_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = %s
|
||||
ORDER BY re.zekken_number
|
||||
LIMIT 10;
|
||||
""", (fc_event_id,))
|
||||
|
||||
fc_entry_details = old_cursor.fetchall()
|
||||
for entry_id, team_id, cat_id, zekken, label, team_name, cat_name in fc_entry_details:
|
||||
print(f" Entry {entry_id}: Team {team_id}({team_name}) - ゼッケン{zekken} - {cat_name}")
|
||||
|
||||
print("\\n=== 5. 移行計画 ===")
|
||||
print("移行が必要なテーブル:")
|
||||
print(" 1. old_rogdb.rog_team → rogdb.rog_team")
|
||||
print(" 2. old_rogdb.rog_entry → rogdb.rog_entry")
|
||||
print(" 3. old_rogdb.rog_member → rogdb.rog_member (存在する場合)")
|
||||
print("\\n注意点:")
|
||||
print(" - イベントはrog_newevent2を使用")
|
||||
print(" - 外部キー制約の整合性確保")
|
||||
print(" - データ型の変換（必要に応じて）")
|
||||
print(" - 重複データの回避")
|
||||
|
||||
old_cursor.close()
|
||||
old_conn.close()
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,117 +0,0 @@
|
||||
-- サーバーAPI変更要求書対応データベース移行スクリプト
|
||||
-- 2025年8月27日
|
||||
|
||||
BEGIN;
|
||||
|
||||
-- 1. NewEvent2テーブルにstatusフィールド追加
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'rog_newevent2' AND column_name = 'status'
|
||||
) THEN
|
||||
ALTER TABLE rog_newevent2 ADD COLUMN status VARCHAR(20) DEFAULT 'draft'
|
||||
CHECK (status IN ('public', 'private', 'draft', 'closed'));
|
||||
|
||||
-- 既存のpublicフィールドからstatusフィールドへの移行
|
||||
UPDATE rog_newevent2 SET status = CASE
|
||||
WHEN public = true THEN 'public'
|
||||
ELSE 'draft'
|
||||
END;
|
||||
|
||||
COMMENT ON COLUMN rog_newevent2.status IS 'イベントステータス (public/private/draft/closed)';
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- 2. Entryテーブルにスタッフ権限フィールド追加
|
||||
DO $$
|
||||
BEGIN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'rog_entry' AND column_name = 'staff_privileges'
|
||||
) THEN
|
||||
ALTER TABLE rog_entry ADD COLUMN staff_privileges BOOLEAN DEFAULT FALSE;
|
||||
COMMENT ON COLUMN rog_entry.staff_privileges IS 'スタッフ権限フラグ';
|
||||
END IF;
|
||||
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'rog_entry' AND column_name = 'can_access_private_events'
|
||||
) THEN
|
||||
ALTER TABLE rog_entry ADD COLUMN can_access_private_events BOOLEAN DEFAULT FALSE;
|
||||
COMMENT ON COLUMN rog_entry.can_access_private_events IS '非公開イベント参加権限';
|
||||
END IF;
|
||||
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'rog_entry' AND column_name = 'team_validation_status'
|
||||
) THEN
|
||||
ALTER TABLE rog_entry ADD COLUMN team_validation_status VARCHAR(20) DEFAULT 'approved'
|
||||
CHECK (team_validation_status IN ('approved', 'pending', 'rejected'));
|
||||
COMMENT ON COLUMN rog_entry.team_validation_status IS 'チーム承認状況';
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- 3. インデックス追加
|
||||
CREATE INDEX IF NOT EXISTS idx_newevent2_status ON rog_newevent2(status);
|
||||
CREATE INDEX IF NOT EXISTS idx_entry_staff_privileges ON rog_entry(staff_privileges) WHERE staff_privileges = TRUE;
|
||||
CREATE INDEX IF NOT EXISTS idx_entry_validation_status ON rog_entry(team_validation_status);
|
||||
|
||||
-- 4. データ整合性チェック
|
||||
DO $$
|
||||
DECLARE
|
||||
rec RECORD;
|
||||
inconsistent_count INTEGER := 0;
|
||||
BEGIN
|
||||
-- publicフィールドとstatusフィールドの整合性チェック
|
||||
FOR rec IN (
|
||||
SELECT id, event_name, public, status
|
||||
FROM rog_newevent2
|
||||
WHERE (public = TRUE AND status != 'public')
|
||||
OR (public = FALSE AND status = 'public')
|
||||
) LOOP
|
||||
RAISE NOTICE 'Inconsistent status for event %: public=%, status=%',
|
||||
rec.event_name, rec.public, rec.status;
|
||||
inconsistent_count := inconsistent_count + 1;
|
||||
END LOOP;
|
||||
|
||||
IF inconsistent_count > 0 THEN
|
||||
RAISE NOTICE 'Found % events with inconsistent public/status values', inconsistent_count;
|
||||
ELSE
|
||||
RAISE NOTICE 'All events have consistent public/status values';
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- 5. 統計情報更新
|
||||
ANALYZE rog_newevent2;
|
||||
ANALYZE rog_entry;
|
||||
|
||||
-- 6. 移行結果サマリー
|
||||
DO $$
|
||||
DECLARE
|
||||
event_count INTEGER;
|
||||
entry_count INTEGER;
|
||||
public_events INTEGER;
|
||||
private_events INTEGER;
|
||||
draft_events INTEGER;
|
||||
staff_entries INTEGER;
|
||||
BEGIN
|
||||
SELECT COUNT(*) INTO event_count FROM rog_newevent2;
|
||||
SELECT COUNT(*) INTO entry_count FROM rog_entry;
|
||||
SELECT COUNT(*) INTO public_events FROM rog_newevent2 WHERE status = 'public';
|
||||
SELECT COUNT(*) INTO private_events FROM rog_newevent2 WHERE status = 'private';
|
||||
SELECT COUNT(*) INTO draft_events FROM rog_newevent2 WHERE status = 'draft';
|
||||
SELECT COUNT(*) INTO staff_entries FROM rog_entry WHERE staff_privileges = TRUE;
|
||||
|
||||
RAISE NOTICE '';
|
||||
RAISE NOTICE '=== 移行完了サマリー ===';
|
||||
RAISE NOTICE 'イベント総数: %', event_count;
|
||||
RAISE NOTICE ' - Public: %', public_events;
|
||||
RAISE NOTICE ' - Private: %', private_events;
|
||||
RAISE NOTICE ' - Draft: %', draft_events;
|
||||
RAISE NOTICE 'エントリー総数: %', entry_count;
|
||||
RAISE NOTICE ' - スタッフ権限付与: %', staff_entries;
|
||||
RAISE NOTICE '';
|
||||
END $$;
|
||||
|
||||
COMMIT;
|
||||
@ -1,175 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
カラム名検証スクリプト
|
||||
PostgreSQLで問題となるカラム名を事前にチェック
|
||||
"""
|
||||
|
||||
import os
|
||||
import psycopg2
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
# PostgreSQL予約語
|
||||
RESERVED_KEYWORDS = {
|
||||
'like', 'order', 'group', 'user', 'table', 'where', 'select', 'insert',
|
||||
'update', 'delete', 'create', 'drop', 'alter', 'index', 'constraint',
|
||||
'default', 'check', 'unique', 'primary', 'foreign', 'key', 'references'
|
||||
}
|
||||
|
||||
def check_column_names():
|
||||
"""全rog_テーブルのカラム名をチェック"""
|
||||
try:
|
||||
conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
cursor = conn.cursor()
|
||||
|
||||
# rog_テーブル一覧取得
|
||||
cursor.execute("""
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE 'rog_%'
|
||||
ORDER BY table_name
|
||||
""")
|
||||
tables = [row[0] for row in cursor.fetchall()]
|
||||
|
||||
logger.info(f"チェック対象テーブル: {len(tables)}個")
|
||||
|
||||
problematic_columns = {}
|
||||
|
||||
for table_name in tables:
|
||||
# テーブルのカラム一覧取得
|
||||
cursor.execute("""
|
||||
SELECT column_name
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = %s
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position
|
||||
""", (table_name,))
|
||||
|
||||
columns = [row[0] for row in cursor.fetchall()]
|
||||
problem_cols = []
|
||||
|
||||
for col in columns:
|
||||
# 予約語チェック
|
||||
if col.lower() in RESERVED_KEYWORDS:
|
||||
problem_cols.append((col, '予約語'))
|
||||
|
||||
# キャメルケース/大文字チェック
|
||||
elif any(c.isupper() for c in col) or col != col.lower():
|
||||
problem_cols.append((col, 'キャメルケース/大文字'))
|
||||
|
||||
if problem_cols:
|
||||
problematic_columns[table_name] = problem_cols
|
||||
|
||||
# 結果出力
|
||||
if problematic_columns:
|
||||
logger.warning("⚠️ 問題のあるカラム名が見つかりました:")
|
||||
for table, cols in problematic_columns.items():
|
||||
logger.warning(f" {table}:")
|
||||
for col, reason in cols:
|
||||
logger.warning(f" - {col} ({reason})")
|
||||
else:
|
||||
logger.info("✅ 全てのカラム名は問題ありません")
|
||||
|
||||
# クォートが必要なカラムのリスト生成
|
||||
need_quotes = set()
|
||||
for table, cols in problematic_columns.items():
|
||||
for col, reason in cols:
|
||||
need_quotes.add(col)
|
||||
|
||||
if need_quotes:
|
||||
logger.info("📋 クォートが必要なカラム一覧:")
|
||||
for col in sorted(need_quotes):
|
||||
logger.info(f" '{col}' -> '\"{col}\"'")
|
||||
|
||||
cursor.close()
|
||||
conn.close()
|
||||
|
||||
return problematic_columns
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ カラム名チェックエラー: {e}")
|
||||
return {}
|
||||
|
||||
def test_quoted_query():
|
||||
"""クォート付きクエリのテスト"""
|
||||
try:
|
||||
conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
cursor = conn.cursor()
|
||||
|
||||
# 問題のあるテーブルでテストクエリ実行
|
||||
test_tables = ['rog_entry', 'rog_newevent2']
|
||||
|
||||
for table_name in test_tables:
|
||||
logger.info(f"=== {table_name} クエリテスト ===")
|
||||
|
||||
# カラム一覧取得
|
||||
cursor.execute("""
|
||||
SELECT column_name
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = %s
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position
|
||||
""", (table_name,))
|
||||
|
||||
columns = [row[0] for row in cursor.fetchall()]
|
||||
|
||||
# クォート付きカラム名生成
|
||||
def quote_column_if_needed(column_name):
|
||||
if column_name.lower() in RESERVED_KEYWORDS:
|
||||
return f'"{column_name}"'
|
||||
if any(c.isupper() for c in column_name) or column_name != column_name.lower():
|
||||
return f'"{column_name}"'
|
||||
return column_name
|
||||
|
||||
quoted_columns = [quote_column_if_needed(col) for col in columns]
|
||||
columns_str = ', '.join(quoted_columns)
|
||||
|
||||
# テストクエリ実行
|
||||
try:
|
||||
test_query = f"SELECT {columns_str} FROM {table_name} LIMIT 1"
|
||||
logger.info(f"テストクエリ: {test_query[:100]}...")
|
||||
cursor.execute(test_query)
|
||||
result = cursor.fetchone()
|
||||
logger.info(f"✅ {table_name}: クエリ成功")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ {table_name}: クエリエラー: {e}")
|
||||
|
||||
cursor.close()
|
||||
conn.close()
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ クエリテストエラー: {e}")
|
||||
|
||||
def main():
|
||||
logger.info("=" * 60)
|
||||
logger.info("PostgreSQL カラム名検証スクリプト")
|
||||
logger.info("=" * 60)
|
||||
|
||||
# カラム名チェック
|
||||
problematic_columns = check_column_names()
|
||||
|
||||
print()
|
||||
|
||||
# クエリテスト
|
||||
test_quoted_query()
|
||||
|
||||
logger.info("=" * 60)
|
||||
logger.info("検証完了")
|
||||
logger.info("=" * 60)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,136 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
データベース接続状況とold_rogdbデータ確認スクリプト
|
||||
現在のDB接続状況を確認し、old_rogdbの実際のデータを調査
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection, connections
|
||||
from django.conf import settings
|
||||
|
||||
print("=== データベース接続状況確認 ===")
|
||||
|
||||
try:
|
||||
# 現在のデータベース設定を確認
|
||||
print("\\n1. Django設定確認:")
|
||||
databases = settings.DATABASES
|
||||
for db_name, config in databases.items():
|
||||
print(f" {db_name}: {config.get('NAME', 'Unknown')} @ {config.get('HOST', 'localhost')}")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
# 現在接続しているデータベース名を確認
|
||||
cursor.execute("SELECT current_database();")
|
||||
current_db = cursor.fetchone()[0]
|
||||
print(f"\\n2. 現在接続中のDB: {current_db}")
|
||||
|
||||
# データベース内のテーブル一覧確認
|
||||
cursor.execute("""
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE '%rog%'
|
||||
ORDER BY table_name;
|
||||
""")
|
||||
tables = cursor.fetchall()
|
||||
print(f"\\n3. rogaine関連テーブル:")
|
||||
for table in tables:
|
||||
print(f" - {table[0]}")
|
||||
|
||||
# old_rogdbスキーマまたはテーブルの存在確認
|
||||
cursor.execute("""
|
||||
SELECT schemaname, tablename, hasindexes, hasrules, hastriggers
|
||||
FROM pg_tables
|
||||
WHERE tablename LIKE '%rog%'
|
||||
ORDER BY schemaname, tablename;
|
||||
""")
|
||||
all_rog_tables = cursor.fetchall()
|
||||
print(f"\\n4. 全スキーマのrog関連テーブル:")
|
||||
for schema, table, idx, rules, triggers in all_rog_tables:
|
||||
print(f" {schema}.{table}")
|
||||
|
||||
# データ存在確認
|
||||
print(f"\\n5. 現在のデータ状況:")
|
||||
|
||||
# rog_entry データ確認
|
||||
try:
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_entry;")
|
||||
entry_count = cursor.fetchone()[0]
|
||||
print(f" rog_entry: {entry_count}件")
|
||||
|
||||
if entry_count > 0:
|
||||
cursor.execute("SELECT * FROM rog_entry LIMIT 3;")
|
||||
sample_entries = cursor.fetchall()
|
||||
print(" サンプルエントリー:")
|
||||
for entry in sample_entries:
|
||||
print(f" ID:{entry[0]}, Team:{entry[5]}, Event:{entry[3]}")
|
||||
|
||||
except Exception as e:
|
||||
print(f" rog_entry エラー: {e}")
|
||||
|
||||
# rog_team データ確認
|
||||
try:
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_team;")
|
||||
team_count = cursor.fetchone()[0]
|
||||
print(f" rog_team: {team_count}件")
|
||||
|
||||
if team_count > 0:
|
||||
cursor.execute("SELECT id, team_name, zekken_number FROM rog_team WHERE zekken_number IS NOT NULL AND zekken_number != '' LIMIT 5;")
|
||||
sample_teams = cursor.fetchall()
|
||||
print(" ゼッケン付きチーム:")
|
||||
for team in sample_teams:
|
||||
print(f" ID:{team[0]}, Name:{team[1]}, Zekken:{team[2]}")
|
||||
|
||||
except Exception as e:
|
||||
print(f" rog_team エラー: {e}")
|
||||
|
||||
# もしold_rogdbが別のスキーマにある場合
|
||||
print(f"\\n6. 別スキーマのold_rogdbデータ確認:")
|
||||
try:
|
||||
# old_rogdbスキーマが存在するかチェック
|
||||
cursor.execute("""
|
||||
SELECT schema_name
|
||||
FROM information_schema.schemata
|
||||
WHERE schema_name LIKE '%old%' OR schema_name LIKE '%rog%';
|
||||
""")
|
||||
schemas = cursor.fetchall()
|
||||
print(" 利用可能なスキーマ:")
|
||||
for schema in schemas:
|
||||
print(f" - {schema[0]}")
|
||||
|
||||
# old_rogdbスキーマがある場合、そのデータを確認
|
||||
for schema in schemas:
|
||||
schema_name = schema[0]
|
||||
if 'old' in schema_name.lower():
|
||||
try:
|
||||
cursor.execute(f"SELECT COUNT(*) FROM {schema_name}.rog_entry;")
|
||||
old_entry_count = cursor.fetchone()[0]
|
||||
print(f" {schema_name}.rog_entry: {old_entry_count}件")
|
||||
except Exception as e:
|
||||
print(f" {schema_name}.rog_entry: アクセスエラー - {e}")
|
||||
|
||||
except Exception as e:
|
||||
print(f" スキーマ確認エラー: {e}")
|
||||
|
||||
# old_rogdbが別のデータベースの場合の確認
|
||||
print(f"\\n7. 利用可能なデータベース一覧:")
|
||||
cursor.execute("""
|
||||
SELECT datname
|
||||
FROM pg_database
|
||||
WHERE datistemplate = false
|
||||
ORDER BY datname;
|
||||
""")
|
||||
databases = cursor.fetchall()
|
||||
for db in databases:
|
||||
print(f" - {db[0]}")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,180 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
移行テスト用スクリプト
|
||||
現在のシステムの状況を詳細確認し、小規模テストを実行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from pathlib import Path
|
||||
|
||||
# Django settings setup
|
||||
BASE_DIR = Path(__file__).resolve().parent
|
||||
sys.path.append(str(BASE_DIR))
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.conf import settings
|
||||
from rog.models import GoalImages, CheckinImages
|
||||
from rog.services.s3_service import S3Service
|
||||
from django.core.files.base import ContentFile
|
||||
import json
|
||||
|
||||
def analyze_current_state():
|
||||
"""現在の状況を詳細分析"""
|
||||
print("🔍 現在のシステム状況分析")
|
||||
print("="*60)
|
||||
|
||||
# 設定確認
|
||||
print(f"MEDIA_ROOT: {settings.MEDIA_ROOT}")
|
||||
print(f"AWS S3 Bucket: {settings.AWS_STORAGE_BUCKET_NAME}")
|
||||
print(f"S3 Region: {settings.AWS_S3_REGION_NAME}")
|
||||
|
||||
# データベース状況
|
||||
goal_total = GoalImages.objects.count()
|
||||
goal_with_files = GoalImages.objects.filter(goalimage__isnull=False).exclude(goalimage='').count()
|
||||
checkin_total = CheckinImages.objects.count()
|
||||
checkin_with_files = CheckinImages.objects.filter(checkinimage__isnull=False).exclude(checkinimage='').count()
|
||||
|
||||
print(f"\nデータベース状況:")
|
||||
print(f" GoalImages: {goal_with_files}/{goal_total} (ファイル設定有り/総数)")
|
||||
print(f" CheckinImages: {checkin_with_files}/{checkin_total} (ファイル設定有り/総数)")
|
||||
|
||||
# ファイルパスの分析
|
||||
print(f"\n画像パスの分析:")
|
||||
|
||||
# GoalImages のパス例
|
||||
sample_goals = GoalImages.objects.filter(goalimage__isnull=False).exclude(goalimage='')[:5]
|
||||
print(f" GoalImages パス例:")
|
||||
for goal in sample_goals:
|
||||
full_path = os.path.join(settings.MEDIA_ROOT, str(goal.goalimage))
|
||||
exists = os.path.exists(full_path)
|
||||
print(f" Path: {goal.goalimage}")
|
||||
print(f" Full: {full_path}")
|
||||
print(f" Exists: {exists}")
|
||||
print(f" S3 URL?: {'s3' in str(goal.goalimage).lower() or 'amazonaws' in str(goal.goalimage).lower()}")
|
||||
print()
|
||||
|
||||
# CheckinImages のパス例
|
||||
sample_checkins = CheckinImages.objects.filter(checkinimage__isnull=False).exclude(checkinimage='')[:3]
|
||||
print(f" CheckinImages パス例:")
|
||||
for checkin in sample_checkins:
|
||||
full_path = os.path.join(settings.MEDIA_ROOT, str(checkin.checkinimage))
|
||||
exists = os.path.exists(full_path)
|
||||
print(f" Path: {checkin.checkinimage}")
|
||||
print(f" Full: {full_path}")
|
||||
print(f" Exists: {exists}")
|
||||
print(f" S3 URL?: {'s3' in str(checkin.checkinimage).lower() or 'amazonaws' in str(checkin.checkinimage).lower()}")
|
||||
print()
|
||||
|
||||
# パターン分析
|
||||
print(f"画像パスパターン分析:")
|
||||
|
||||
# 既存のS3 URLを確認
|
||||
s3_goals = GoalImages.objects.filter(goalimage__icontains='s3').count()
|
||||
s3_checkins = CheckinImages.objects.filter(checkinimage__icontains='s3').count()
|
||||
|
||||
amazonaws_goals = GoalImages.objects.filter(goalimage__icontains='amazonaws').count()
|
||||
amazonaws_checkins = CheckinImages.objects.filter(checkinimage__icontains='amazonaws').count()
|
||||
|
||||
print(f" S3を含むパス - Goal: {s3_goals}, Checkin: {s3_checkins}")
|
||||
print(f" AmazonAWSを含むパス - Goal: {amazonaws_goals}, Checkin: {amazonaws_checkins}")
|
||||
|
||||
# ローカルファイルパターン
|
||||
local_goals = goal_with_files - s3_goals - amazonaws_goals
|
||||
local_checkins = checkin_with_files - s3_checkins - amazonaws_checkins
|
||||
|
||||
print(f" ローカルパスと思われる - Goal: {local_goals}, Checkin: {local_checkins}")
|
||||
|
||||
return {
|
||||
'goal_total': goal_total,
|
||||
'goal_with_files': goal_with_files,
|
||||
'checkin_total': checkin_total,
|
||||
'checkin_with_files': checkin_with_files,
|
||||
'local_goals': local_goals,
|
||||
'local_checkins': local_checkins,
|
||||
's3_goals': s3_goals + amazonaws_goals,
|
||||
's3_checkins': s3_checkins + amazonaws_checkins
|
||||
}
|
||||
|
||||
def test_s3_connection():
|
||||
"""S3接続テスト"""
|
||||
print("\n🔗 S3接続テスト")
|
||||
print("="*60)
|
||||
|
||||
try:
|
||||
s3_service = S3Service()
|
||||
|
||||
# テストファイルをアップロード
|
||||
test_content = b"MIGRATION TEST - CONNECTION VERIFICATION"
|
||||
test_file = ContentFile(test_content, name="migration_test.jpg")
|
||||
|
||||
s3_url = s3_service.upload_checkin_image(
|
||||
image_file=test_file,
|
||||
event_code="migration-test",
|
||||
team_code="TEST-TEAM",
|
||||
cp_number=999
|
||||
)
|
||||
|
||||
print(f"✅ S3接続成功: {s3_url}")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ S3接続失敗: {str(e)}")
|
||||
return False
|
||||
|
||||
def create_test_migration_plan(stats):
|
||||
"""テスト移行計画を作成"""
|
||||
print("\n📋 移行計画の提案")
|
||||
print("="*60)
|
||||
|
||||
total_to_migrate = stats['local_goals'] + stats['local_checkins']
|
||||
|
||||
if total_to_migrate == 0:
|
||||
print("✅ 移行が必要なローカル画像はありません。")
|
||||
print(" すべての画像が既にS3に移行済みか、外部ストレージに保存されています。")
|
||||
return False
|
||||
|
||||
print(f"移行対象画像数: {total_to_migrate:,}件")
|
||||
print(f" - ゴール画像: {stats['local_goals']:,}件")
|
||||
print(f" - チェックイン画像: {stats['local_checkins']:,}件")
|
||||
print()
|
||||
print("推奨移行手順:")
|
||||
print("1. 小規模テスト移行（10件程度）")
|
||||
print("2. 中規模テスト移行（100件程度）")
|
||||
print("3. バッチ処理での完全移行")
|
||||
print()
|
||||
print("予想処理時間:")
|
||||
print(f" - 小規模テスト: 約1分")
|
||||
print(f" - 中規模テスト: 約10分")
|
||||
print(f" - 完全移行: 約{total_to_migrate // 100}時間")
|
||||
|
||||
return True
|
||||
|
||||
def main():
|
||||
"""メイン実行"""
|
||||
print("🚀 S3移行準備状況チェック")
|
||||
print("="*60)
|
||||
|
||||
# 1. 現状分析
|
||||
stats = analyze_current_state()
|
||||
|
||||
# 2. S3接続テスト
|
||||
s3_ok = test_s3_connection()
|
||||
|
||||
# 3. 移行計画
|
||||
if s3_ok:
|
||||
needs_migration = create_test_migration_plan(stats)
|
||||
|
||||
if not needs_migration:
|
||||
print("\n🎉 移行作業は不要です。")
|
||||
else:
|
||||
print("\n次のステップ:")
|
||||
print("1. python run_small_migration_test.py # 小規模テスト")
|
||||
print("2. python run_full_migration.py # 完全移行")
|
||||
else:
|
||||
print("\n⚠️ S3接続に問題があります。AWS設定を確認してください。")
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,179 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
NULL値チェック・デフォルト値テストスクリプト
|
||||
"""
|
||||
|
||||
import os
|
||||
import psycopg2
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
OLD_ROGDB_CONFIG = {
|
||||
'host': os.getenv('OLD_ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('OLD_ROGDB_NAME', 'old_rogdb'),
|
||||
'user': os.getenv('OLD_ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('OLD_ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('OLD_ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
def check_null_values():
|
||||
"""NULL値の問題を事前チェック"""
|
||||
try:
|
||||
old_conn = psycopg2.connect(**OLD_ROGDB_CONFIG)
|
||||
new_conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
|
||||
old_conn.autocommit = True
|
||||
new_conn.autocommit = True
|
||||
|
||||
old_cursor = old_conn.cursor()
|
||||
new_cursor = new_conn.cursor()
|
||||
|
||||
# 共通テーブル取得
|
||||
old_cursor.execute("""
|
||||
SELECT table_name FROM information_schema.tables
|
||||
WHERE table_schema = 'public' AND table_name LIKE 'rog_%'
|
||||
""")
|
||||
old_tables = [row[0] for row in old_cursor.fetchall()]
|
||||
|
||||
new_cursor.execute("""
|
||||
SELECT table_name FROM information_schema.tables
|
||||
WHERE table_schema = 'public' AND table_name LIKE 'rog_%'
|
||||
""")
|
||||
new_tables = [row[0] for row in new_cursor.fetchall()]
|
||||
|
||||
common_tables = list(set(old_tables) & set(new_tables))
|
||||
|
||||
logger.info(f"チェック対象テーブル: {len(common_tables)}個")
|
||||
|
||||
null_issues = {}
|
||||
|
||||
for table_name in common_tables:
|
||||
logger.info(f"=== {table_name} NULL値チェック ===")
|
||||
|
||||
# 新しいDBのNOT NULL制約確認
|
||||
new_cursor.execute("""
|
||||
SELECT column_name, is_nullable, column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = %s AND table_schema = 'public'
|
||||
AND is_nullable = 'NO'
|
||||
ORDER BY ordinal_position
|
||||
""", (table_name,))
|
||||
|
||||
not_null_columns = new_cursor.fetchall()
|
||||
|
||||
if not not_null_columns:
|
||||
logger.info(f" NOT NULL制約なし")
|
||||
continue
|
||||
|
||||
logger.info(f" NOT NULL制約カラム: {[col[0] for col in not_null_columns]}")
|
||||
|
||||
# 古いDBのNULL値チェック
|
||||
for col_name, is_nullable, default_val in not_null_columns:
|
||||
try:
|
||||
# PostgreSQL予約語とcamelCaseカラムのクォート処理
|
||||
reserved_words = ['group', 'like', 'order', 'user', 'table', 'index', 'where', 'from', 'select']
|
||||
quoted_col = f'"{col_name}"' if (col_name.lower() in reserved_words or any(c.isupper() for c in col_name)) else col_name
|
||||
|
||||
# カラム存在チェック
|
||||
old_cursor.execute("""
|
||||
SELECT COUNT(*) FROM information_schema.columns
|
||||
WHERE table_name = %s AND column_name = %s AND table_schema = 'public'
|
||||
""", (table_name, col_name))
|
||||
|
||||
if old_cursor.fetchone()[0] == 0:
|
||||
logger.warning(f" ⚠️ {col_name}: 古いDBに存在しないカラム")
|
||||
continue
|
||||
|
||||
old_cursor.execute(f"""
|
||||
SELECT COUNT(*) FROM {table_name}
|
||||
WHERE {quoted_col} IS NULL
|
||||
""")
|
||||
|
||||
null_count = old_cursor.fetchone()[0]
|
||||
|
||||
if null_count > 0:
|
||||
logger.warning(f" ⚠️ {col_name}: {null_count}件のNULL値あり (デフォルト: {default_val})")
|
||||
|
||||
if table_name not in null_issues:
|
||||
null_issues[table_name] = []
|
||||
null_issues[table_name].append((col_name, null_count, default_val))
|
||||
else:
|
||||
logger.info(f" ✅ {col_name}: NULL値なし")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f" ❌ {col_name}: チェックエラー: {e}")
|
||||
|
||||
# サマリー
|
||||
if null_issues:
|
||||
logger.warning("=" * 60)
|
||||
logger.warning("NULL値問題のあるテーブル:")
|
||||
for table, issues in null_issues.items():
|
||||
logger.warning(f" {table}:")
|
||||
for col, count, default in issues:
|
||||
logger.warning(f" - {col}: {count}件 (デフォルト: {default})")
|
||||
else:
|
||||
logger.info("✅ NULL値の問題はありません")
|
||||
|
||||
old_cursor.close()
|
||||
new_cursor.close()
|
||||
old_conn.close()
|
||||
new_conn.close()
|
||||
|
||||
return null_issues
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ NULL値チェックエラー: {e}")
|
||||
return {}
|
||||
|
||||
def suggest_default_values(null_issues):
|
||||
"""デフォルト値の提案"""
|
||||
if not null_issues:
|
||||
return
|
||||
|
||||
logger.info("=" * 60)
|
||||
logger.info("推奨デフォルト値設定:")
|
||||
|
||||
for table_name, issues in null_issues.items():
|
||||
logger.info(f" '{table_name}': {{")
|
||||
for col_name, count, default in issues:
|
||||
# データ型に基づくデフォルト値推測
|
||||
if 'trial' in col_name.lower() or 'is_' in col_name.lower():
|
||||
suggested = 'False'
|
||||
elif 'public' in col_name.lower():
|
||||
suggested = 'True'
|
||||
elif 'name' in col_name.lower() or 'description' in col_name.lower():
|
||||
suggested = "''"
|
||||
elif 'order' in col_name.lower() or 'sort' in col_name.lower():
|
||||
suggested = '0'
|
||||
else:
|
||||
suggested = 'None # 要確認'
|
||||
|
||||
logger.info(f" '{col_name}': {suggested}, # {count}件のNULL")
|
||||
logger.info(" },")
|
||||
|
||||
def main():
|
||||
logger.info("=" * 60)
|
||||
logger.info("NULL値チェック・デフォルト値提案スクリプト")
|
||||
logger.info("=" * 60)
|
||||
|
||||
null_issues = check_null_values()
|
||||
suggest_default_values(null_issues)
|
||||
|
||||
logger.info("=" * 60)
|
||||
logger.info("チェック完了")
|
||||
logger.info("=" * 60)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,93 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から新しいデータベースへのエントリーデータ移行スクリプト
|
||||
rog_entry テーブルのデータを NewEvent2 システムに移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from datetime import datetime
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection
|
||||
from rog.models import NewEvent2, Entry, Team, NewCategory, CustomUser
|
||||
|
||||
print("=== old_rogdb エントリーデータ移行 ===")
|
||||
|
||||
try:
|
||||
# old_rogdb の rog_entry データを確認
|
||||
print("old_rogdb の rog_entry データを確認中...")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
# rog_entry テーブルの構造とデータを確認
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_entry'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
columns = cursor.fetchall()
|
||||
|
||||
print("✅ rog_entry テーブル構造:")
|
||||
for col_name, data_type in columns:
|
||||
print(f" - {col_name}: {data_type}")
|
||||
|
||||
# データ件数確認
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_entry;")
|
||||
entry_count = cursor.fetchone()[0]
|
||||
print(f"✅ rog_entry データ件数: {entry_count}件")
|
||||
|
||||
# サンプルデータ確認
|
||||
cursor.execute("""
|
||||
SELECT id, team_id, event_id, category_id, date,
|
||||
zekken_number, zekken_label, is_active
|
||||
FROM rog_entry
|
||||
LIMIT 5;
|
||||
""")
|
||||
sample_data = cursor.fetchall()
|
||||
|
||||
print("\\n✅ サンプルデータ:")
|
||||
for row in sample_data:
|
||||
print(f" ID:{row[0]}, Team:{row[1]}, Event:{row[2]}, Category:{row[3]}, Zekken:{row[5]}")
|
||||
|
||||
# イベント情報の確認
|
||||
cursor.execute("""
|
||||
SELECT e.id, e.event_name, COUNT(re.id) as entry_count
|
||||
FROM rog_newevent2 e
|
||||
LEFT JOIN rog_entry re ON e.id = re.event_id
|
||||
GROUP BY e.id, e.event_name
|
||||
HAVING COUNT(re.id) > 0
|
||||
ORDER BY entry_count DESC;
|
||||
""")
|
||||
event_data = cursor.fetchall()
|
||||
|
||||
print("\\n✅ エントリーがあるイベント:")
|
||||
for event_id, event_name, count in event_data:
|
||||
print(f" Event ID:{event_id} '{event_name}': {count}件")
|
||||
|
||||
# FC岐阜イベントのエントリー確認
|
||||
cursor.execute("""
|
||||
SELECT re.id, re.zekken_number, re.zekken_label,
|
||||
t.team_name, c.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_newevent2 e ON re.event_id = e.id
|
||||
JOIN rog_team t ON re.team_id = t.id
|
||||
JOIN rog_newcategory c ON re.category_id = c.id
|
||||
WHERE e.event_name LIKE '%FC岐阜%'
|
||||
ORDER BY re.zekken_number
|
||||
LIMIT 10;
|
||||
""")
|
||||
fc_entries = cursor.fetchall()
|
||||
|
||||
print("\\n✅ FC岐阜イベントのエントリー（最初の10件）:")
|
||||
for entry_id, zekken, label, team_name, category in fc_entries:
|
||||
print(f" ゼッケン{zekken}: {team_name} ({category})")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,164 +0,0 @@
|
||||
event_id,event_name,cp_number,sub_loc_id,location_name,category_id,category_name,normal_checkins,purchase_checkins
|
||||
10,FC岐阜,-1,#-1(0),スタート（長良川競技場芝生広場）,5,ソロ男子-３時間,7,0
|
||||
10,FC岐阜,-1,#-1(0),スタート（長良川競技場芝生広場）,6,ソロ女子-３時間,2,0
|
||||
10,FC岐阜,-1,#-1(0),スタート（長良川競技場芝生広場）,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,-1,#-1(0),スタート（長良川競技場芝生広場）,8,一般-３時間,8,0
|
||||
10,FC岐阜,1,#1(35),長良公園（枝広館跡）,8,一般-３時間,2,0
|
||||
10,FC岐阜,3,#3(28),長良川うかいミュージアム（岐阜市長良川鵜飼伝承館）,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,3,#3(28),長良川うかいミュージアム（岐阜市長良川鵜飼伝承館）,8,一般-３時間,4,0
|
||||
10,FC岐阜,4,#4(15),高橋尚子ゴールドメダル記念碑(足形),5,ソロ男子-３時間,7,0
|
||||
10,FC岐阜,4,#4(15),高橋尚子ゴールドメダル記念碑(足形),6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,4,#4(15),高橋尚子ゴールドメダル記念碑(足形),7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,4,#4(15),高橋尚子ゴールドメダル記念碑(足形),8,一般-３時間,7,0
|
||||
10,FC岐阜,4,#4(15),高橋尚子ゴールドメダル記念碑(足形),9,お試し-３時間,1,0
|
||||
10,FC岐阜,5,#5(10),崇福寺・稲葉一鉄寄贈の鐘楼,5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,5,#5(10),崇福寺・稲葉一鉄寄贈の鐘楼,6,ソロ女子-３時間,2,0
|
||||
10,FC岐阜,5,#5(10),崇福寺・稲葉一鉄寄贈の鐘楼,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,5,#5(10),崇福寺・稲葉一鉄寄贈の鐘楼,8,一般-３時間,6,0
|
||||
10,FC岐阜,6,#6(40),鷺山城跡,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,6,#6(40),鷺山城跡,8,一般-３時間,2,0
|
||||
10,FC岐阜,7,#7(30),岐阜県立岐阜商業高等学校,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,7,#7(30),岐阜県立岐阜商業高等学校,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,7,#7(30),岐阜県立岐阜商業高等学校,8,一般-３時間,4,0
|
||||
10,FC岐阜,8,#8(45+80),パティスリー kura,5,ソロ男子-３時間,2,1
|
||||
10,FC岐阜,8,#8(45+80),パティスリー kura,8,一般-３時間,4,4
|
||||
10,FC岐阜,9,#9(55),大垣共立銀行 則武支店,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,9,#9(55),大垣共立銀行 則武支店,8,一般-３時間,4,0
|
||||
10,FC岐阜,10,#10(48+30),ポッカサッポロ自販機-ＢＯＯＫＯＦＦ則武店,6,ソロ女子-３時間,1,1
|
||||
10,FC岐阜,10,#10(48+30),ポッカサッポロ自販機-ＢＯＯＫＯＦＦ則武店,8,一般-３時間,2,2
|
||||
10,FC岐阜,11,#11(72),御嶽神社茅萱宮,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,11,#11(72),御嶽神社茅萱宮,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,12,#12(55),眞中(みなか)神社,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,13,#13(60),江口の鵜飼発祥の地／史跡 江口のわたし,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,13,#13(60),江口の鵜飼発祥の地／史跡 江口のわたし,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,14,#14(85),鏡島湊跡（かがみしまみなと）,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,14,#14(85),鏡島湊跡（かがみしまみなと）,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,15,#15(45),鏡島弘法(乙津寺),5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,15,#15(45),鏡島弘法(乙津寺),6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,16,#16(65),岐阜市立岐阜商業高等学校,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,17,#17(43),立政寺,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,18,#18(35),本莊神社,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,19,#19(40),岐阜県美術館,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,20,#20(55+30),ポッカサッポロ自販機-大垣共立銀行エブリデープラザ,5,ソロ男子-３時間,2,2
|
||||
10,FC岐阜,21,#21(62),武藤嘉門爺像,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,23,#23(95),岐阜県立岐阜総合学園高等学校,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,25,#25(76),鶉田神社,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,26,#26(74),茜部神社,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,33,#33(60),馬頭観世音菩薩,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,33,#33(60),馬頭観世音菩薩,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,34,#34(70),陸上自衛隊 日野基本射撃場,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,37,#37(45+30),ポッカサッポロ自販機-セリア茜部店,5,ソロ男子-３時間,1,1
|
||||
10,FC岐阜,38,#38(40),比奈守神社,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,39,#39(35),岐阜県立加納高等学校前バス停,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,41,#41(32),中山道往来の松,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,42,#42(30),問屋町ウォールアート,5,ソロ男子-３時間,4,0
|
||||
10,FC岐阜,43,#43(22),黄金の信長像,5,ソロ男子-３時間,4,0
|
||||
10,FC岐阜,44,#44(25+80),名鉄協商パーキング 岐阜第２,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,45,#45(30),本荘公園,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,45,#45(30),本荘公園,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,46,#46(30),大縄場大橋公園,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,46,#46(30),大縄場大橋公園,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,46,#46(30),大縄場大橋公園,8,一般-３時間,1,0
|
||||
10,FC岐阜,47,#47(25),金神社/おもかる石,5,ソロ男子-３時間,4,0
|
||||
10,FC岐阜,48,#48(46),OKB岐阜中央プラザ わくわくベースG,5,ソロ男子-３時間,8,0
|
||||
10,FC岐阜,48,#48(46),OKB岐阜中央プラザ わくわくベースG,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,48,#48(46),OKB岐阜中央プラザ わくわくベースG,8,一般-３時間,1,0
|
||||
10,FC岐阜,51,#51(20),梅林公園,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,51,#51(20),梅林公園,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,52,#52(60),柳ヶ瀬ＦＣ岐阜勝ち神社,5,ソロ男子-３時間,7,0
|
||||
10,FC岐阜,52,#52(60),柳ヶ瀬ＦＣ岐阜勝ち神社,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,52,#52(60),柳ヶ瀬ＦＣ岐阜勝ち神社,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,52,#52(60),柳ヶ瀬ＦＣ岐阜勝ち神社,8,一般-３時間,1,0
|
||||
10,FC岐阜,53,#53(25),美殿町の郵便ポスト,5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,53,#53(25),美殿町の郵便ポスト,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,53,#53(25),美殿町の郵便ポスト,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,53,#53(25),美殿町の郵便ポスト,8,一般-３時間,1,0
|
||||
10,FC岐阜,54,#54(150),水道山展望台,5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,54,#54(150),水道山展望台,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,54,#54(150),水道山展望台,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,54,#54(150),水道山展望台,8,一般-３時間,1,0
|
||||
10,FC岐阜,55,#55(30),岐阜新聞社,5,ソロ男子-３時間,4,0
|
||||
10,FC岐阜,55,#55(30),岐阜新聞社,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,55,#55(30),岐阜新聞社,8,一般-３時間,3,0
|
||||
10,FC岐阜,56,#56(24),弥八地蔵尊堂,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,56,#56(24),弥八地蔵尊堂,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,56,#56(24),弥八地蔵尊堂,8,一般-３時間,1,0
|
||||
10,FC岐阜,57,#57(25),建勲神社 (岐阜 信長神社),5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,57,#57(25),建勲神社 (岐阜 信長神社),6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,57,#57(25),建勲神社 (岐阜 信長神社),7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,58,#58(65),伊奈波神社・黒龍神社龍頭石,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,58,#58(65),伊奈波神社・黒龍神社龍頭石,8,一般-３時間,2,0
|
||||
10,FC岐阜,59,#59(12),日下部邸跡・岐阜町本陣跡,5,ソロ男子-３時間,2,0
|
||||
10,FC岐阜,59,#59(12),日下部邸跡・岐阜町本陣跡,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,59,#59(12),日下部邸跡・岐阜町本陣跡,8,一般-３時間,3,0
|
||||
10,FC岐阜,60,#60(25),メディアコスモスみんなの森,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,60,#60(25),メディアコスモスみんなの森,7,ファミリー-３時間,1,0
|
||||
10,FC岐阜,60,#60(25),メディアコスモスみんなの森,8,一般-３時間,3,0
|
||||
10,FC岐阜,61,#61(15+80),ナガラガワフレーバー,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,61,#61(15+80),ナガラガワフレーバー,7,ファミリー-３時間,2,2
|
||||
10,FC岐阜,61,#61(15+80),ナガラガワフレーバー,8,一般-３時間,8,8
|
||||
10,FC岐阜,62,#62(15),庚申堂,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,62,#62(15),庚申堂,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,62,#62(15),庚申堂,8,一般-３時間,7,0
|
||||
10,FC岐阜,63,#63(15+80),和菓子処 緑水庵 川原町店,5,ソロ男子-３時間,3,0
|
||||
10,FC岐阜,63,#63(15+80),和菓子処 緑水庵 川原町店,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,63,#63(15+80),和菓子処 緑水庵 川原町店,7,ファミリー-３時間,2,1
|
||||
10,FC岐阜,63,#63(15+80),和菓子処 緑水庵 川原町店,8,一般-３時間,8,8
|
||||
10,FC岐阜,63,#63(15+80),和菓子処 緑水庵 川原町店,9,お試し-３時間,1,1
|
||||
10,FC岐阜,64,#64(16),日中友好庭園,5,ソロ男子-３時間,4,0
|
||||
10,FC岐阜,64,#64(16),日中友好庭園,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,64,#64(16),日中友好庭園,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,64,#64(16),日中友好庭園,8,一般-３時間,8,0
|
||||
10,FC岐阜,64,#64(16),日中友好庭園,9,お試し-３時間,1,0
|
||||
10,FC岐阜,65,#65(15),板垣死すとも自由は死なず,5,ソロ男子-３時間,3,0
|
||||
10,FC岐阜,65,#65(15),板垣死すとも自由は死なず,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,65,#65(15),板垣死すとも自由は死なず,8,一般-３時間,6,0
|
||||
10,FC岐阜,65,#65(15),板垣死すとも自由は死なず,9,お試し-３時間,1,0
|
||||
10,FC岐阜,66,#66(40),岐阜大仏（正法寺）,5,ソロ男子-３時間,3,0
|
||||
10,FC岐阜,66,#66(40),岐阜大仏（正法寺）,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,66,#66(40),岐阜大仏（正法寺）,8,一般-３時間,3,0
|
||||
10,FC岐阜,66,#66(40),岐阜大仏（正法寺）,9,お試し-３時間,1,0
|
||||
10,FC岐阜,67,#67(100),めいそうの小道：中間地点,5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,67,#67(100),めいそうの小道：中間地点,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,67,#67(100),めいそうの小道：中間地点,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,67,#67(100),めいそうの小道：中間地点,8,一般-３時間,3,0
|
||||
10,FC岐阜,68,#68(160),岐阜城,5,ソロ男子-３時間,4,0
|
||||
10,FC岐阜,68,#68(160),岐阜城,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,68,#68(160),岐阜城,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,68,#68(160),岐阜城,8,一般-３時間,6,0
|
||||
10,FC岐阜,68,#68(160),岐阜城,9,お試し-３時間,1,0
|
||||
10,FC岐阜,69,#69(150),金華山展望デッキ,5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,69,#69(150),金華山展望デッキ,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,69,#69(150),金華山展望デッキ,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,69,#69(150),金華山展望デッキ,8,一般-３時間,6,0
|
||||
10,FC岐阜,70,#70(180),七曲り登山道：岐阜城まで1000m,5,ソロ男子-３時間,5,0
|
||||
10,FC岐阜,70,#70(180),七曲り登山道：岐阜城まで1000m,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,70,#70(180),七曲り登山道：岐阜城まで1000m,7,ファミリー-３時間,2,0
|
||||
10,FC岐阜,70,#70(180),七曲り登山道：岐阜城まで1000m,8,一般-３時間,5,0
|
||||
10,FC岐阜,70,#70(180),七曲り登山道：岐阜城まで1000m,9,お試し-３時間,1,0
|
||||
10,FC岐阜,71,#71(5+5),練習ポイント,5,ソロ男子-３時間,6,5
|
||||
10,FC岐阜,71,#71(5+5),練習ポイント,6,ソロ女子-３時間,2,2
|
||||
10,FC岐阜,71,#71(5+5),練習ポイント,7,ファミリー-３時間,1,1
|
||||
10,FC岐阜,71,#71(5+5),練習ポイント,8,一般-３時間,8,7
|
||||
10,FC岐阜,71,#71(5+5),練習ポイント,9,お試し-３時間,1,1
|
||||
10,FC岐阜,72,#72(5+80),岐阜ロゲコーヒー,5,ソロ男子-３時間,3,1
|
||||
10,FC岐阜,72,#72(5+80),岐阜ロゲコーヒー,6,ソロ女子-３時間,1,0
|
||||
10,FC岐阜,72,#72(5+80),岐阜ロゲコーヒー,7,ファミリー-３時間,1,1
|
||||
10,FC岐阜,72,#72(5+80),岐阜ロゲコーヒー,8,一般-３時間,4,3
|
||||
10,FC岐阜,72,#72(5+80),岐阜ロゲコーヒー,9,お試し-３時間,1,1
|
||||
10,FC岐阜,73,#73(5+80),FC岐阜＋岐阜バス,5,ソロ男子-３時間,6,1
|
||||
10,FC岐阜,73,#73(5+80),FC岐阜＋岐阜バス,8,一般-３時間,2,0
|
||||
10,FC岐阜,73,#73(5+80),FC岐阜＋岐阜バス,9,お試し-３時間,1,0
|
||||
10,FC岐阜,74,#74(5+80),MKPポイントカード発行,5,ソロ男子-３時間,2,1
|
||||
10,FC岐阜,74,#74(5+80),MKPポイントカード発行,6,ソロ女子-３時間,1,1
|
||||
10,FC岐阜,74,#74(5+80),MKPポイントカード発行,7,ファミリー-３時間,1,1
|
||||
10,FC岐阜,74,#74(5+80),MKPポイントカード発行,8,一般-３時間,7,3
|
||||
10,FC岐阜,74,#74(5+80),MKPポイントカード発行,9,お試し-３時間,1,1
|
||||
10,FC岐阜,75,#75(5+80),小屋垣内（権太）農園,5,ソロ男子-３時間,1,0
|
||||
10,FC岐阜,75,#75(5+80),小屋垣内（権太）農園,7,ファミリー-３時間,2,2
|
||||
10,FC岐阜,75,#75(5+80),小屋垣内（権太）農園,8,一般-３時間,5,5
|
||||
10,FC岐阜,75,#75(5+80),小屋垣内（権太）農園,9,お試し-３時間,1,0
|
||||
10,FC岐阜,200,#200(15+15),穂積駅,5,ソロ男子-３時間,1,1
|
||||
10,FC岐阜,201,#201(15+15),大垣駅,5,ソロ男子-３時間,1,1
|
||||
10,FC岐阜,202,#202(15+15),関ケ原駅,5,ソロ男子-３時間,1,1
|
||||
10,FC岐阜,204,#204(15+15),名古屋駅,5,ソロ男子-３時間,1,1
|
||||
|
@ -1,66 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
マイグレーション履歴リセットスクリプト
|
||||
rogアプリのマイグレーション履歴をクリアして、新しいシンプルマイグレーションを適用
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from django.core.management import execute_from_command_line
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection
|
||||
from django.core.management.color import no_style
|
||||
|
||||
print("=== マイグレーション履歴のクリア ===")
|
||||
|
||||
# データベース接続を取得
|
||||
cursor = connection.cursor()
|
||||
|
||||
try:
|
||||
# rogアプリのマイグレーション履歴をクリア
|
||||
print("rogアプリのマイグレーション履歴を削除中...")
|
||||
cursor.execute("DELETE FROM django_migrations WHERE app = 'rog';")
|
||||
|
||||
print("✅ rogアプリのマイグレーション履歴を削除しました")
|
||||
|
||||
# コミット
|
||||
connection.commit()
|
||||
|
||||
print("\n=== マイグレーション状態確認 ===")
|
||||
# マイグレーション状態を確認
|
||||
execute_from_command_line(['manage.py', 'showmigrations', 'rog'])
|
||||
|
||||
print("\n=== 新しいマイグレーションを偽装適用 ===")
|
||||
# 依存関係チェックを無視してマイグレーションを偽装適用
|
||||
try:
|
||||
# まず --run-syncdb で既存のテーブル構造を認識させる
|
||||
execute_from_command_line(['manage.py', 'migrate', '--run-syncdb'])
|
||||
except Exception as sync_error:
|
||||
print(f"syncdb エラー（継続）: {sync_error}")
|
||||
|
||||
# マイグレーション履歴に直接レコードを挿入
|
||||
print("マイグレーション履歴を直接挿入中...")
|
||||
# 新しいカーソルを作成
|
||||
with connection.cursor() as new_cursor:
|
||||
new_cursor.execute("""
|
||||
INSERT INTO django_migrations (app, name, applied)
|
||||
VALUES ('rog', '0001_simple_initial', NOW())
|
||||
ON CONFLICT DO NOTHING;
|
||||
""")
|
||||
connection.commit()
|
||||
print("✅ マイグレーション履歴を挿入しました")
|
||||
|
||||
print("\n=== 最終確認 ===")
|
||||
# 最終確認
|
||||
execute_from_command_line(['manage.py', 'showmigrations'])
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
connection.rollback()
|
||||
finally:
|
||||
cursor.close()
|
||||
@ -1,206 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Location2025完全移行プログラム
|
||||
7,641件の未移行ロケーションデータをLocation2025テーブルに移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime
|
||||
|
||||
# Django設定の初期化
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
sys.path.append('/opt/app')
|
||||
|
||||
try:
|
||||
import django
|
||||
django.setup()
|
||||
|
||||
from django.contrib.gis.geos import Point
|
||||
from django.db import models
|
||||
from rog.models import Location, Location2025, NewEvent2
|
||||
|
||||
except ImportError as e:
|
||||
print(f"Django import error: {e}")
|
||||
print("このスクリプトはDjangoコンテナ内で実行してください")
|
||||
sys.exit(1)
|
||||
|
||||
def migrate_location_to_location2025():
|
||||
"""Location から Location2025 への完全移行"""
|
||||
print("=== Location2025完全移行開始 ===")
|
||||
|
||||
try:
|
||||
# 現在の状況確認
|
||||
total_location = Location.objects.count()
|
||||
current_location2025 = Location2025.objects.count()
|
||||
remaining = total_location - current_location2025
|
||||
|
||||
print(f"移行対象: {remaining}件 (全{total_location}件中{current_location2025}件移行済み)")
|
||||
|
||||
if remaining <= 0:
|
||||
print("✅ すべてのLocationデータが既にLocation2025に移行済みです")
|
||||
return True
|
||||
|
||||
# イベント確認（高山２以外の処理）
|
||||
locations_by_event = Location.objects.values('event_name').annotate(
|
||||
count=models.Count('id')
|
||||
).order_by('-count')
|
||||
|
||||
print("イベント別未移行データ:")
|
||||
for event_data in locations_by_event:
|
||||
event_name = event_data['event_name']
|
||||
count = event_data['count']
|
||||
|
||||
# 既に移行済みのデータ数確認
|
||||
try:
|
||||
event = NewEvent2.objects.get(event_code=event_name)
|
||||
migrated = Location2025.objects.filter(event_id=event.id).count()
|
||||
remaining_for_event = count - migrated
|
||||
print(f" {event_name}: {remaining_for_event}件未移行 (全{count}件)")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" {event_name}: NewEvent2未登録のため移行不可 ({count}件)")
|
||||
|
||||
# バッチ移行処理
|
||||
batch_size = 100
|
||||
total_migrated = 0
|
||||
|
||||
# 高山２イベントのLocationデータを取得
|
||||
takayama_locations = Location.objects.filter(event_name='高山２')
|
||||
|
||||
if takayama_locations.exists():
|
||||
# 高山２のNewEvent2エントリを取得または作成
|
||||
try:
|
||||
takayama_event = NewEvent2.objects.filter(event_code='高山２').first()
|
||||
if not takayama_event:
|
||||
print("⚠️ 高山２イベントをNewEvent2に作成中...")
|
||||
takayama_event = NewEvent2.objects.create(
|
||||
event_code='高山２',
|
||||
event_name='岐阜ロゲin高山２',
|
||||
event_date=datetime(2025, 2, 11).date(),
|
||||
start_time=datetime(2025, 2, 11, 10, 0).time(),
|
||||
goal_time=datetime(2025, 2, 11, 15, 0).time(),
|
||||
explanation='移行により自動作成されたイベント'
|
||||
)
|
||||
print(f"✅ 高山２イベント作成完了 (ID: {takayama_event.id})")
|
||||
else:
|
||||
print(f"✅ 高山２イベント (ID: {takayama_event.id}) 使用")
|
||||
except Exception as e:
|
||||
print(f"❌ 高山２イベント処理エラー: {e}")
|
||||
return False
|
||||
|
||||
# 既存のLocation2025データと重複チェック
|
||||
existing_location2025_ids = set(
|
||||
Location2025.objects.filter(event_id=takayama_event.id).values_list('original_location_id', flat=True)
|
||||
)
|
||||
|
||||
# 未移行のLocationデータを取得
|
||||
pending_locations = takayama_locations.exclude(id__in=existing_location2025_ids)
|
||||
pending_count = pending_locations.count()
|
||||
|
||||
print(f"高山２イベント: {pending_count}件の未移行データを処理中...")
|
||||
|
||||
# バッチ処理でLocation2025に移行
|
||||
for i in range(0, pending_count, batch_size):
|
||||
batch_locations = list(pending_locations[i:i+batch_size])
|
||||
location2025_objects = []
|
||||
|
||||
for location in batch_locations:
|
||||
# PostGIS Pointオブジェクト作成
|
||||
point_geom = Point(float(location.longitude), float(location.latitude))
|
||||
|
||||
location2025_obj = Location2025(
|
||||
cp_number=location.cp_number,
|
||||
point=point_geom,
|
||||
score=location.score,
|
||||
event_id=takayama_event.id,
|
||||
original_location_id=location.id,
|
||||
create_time=location.create_time or datetime.now(),
|
||||
update_time=datetime.now()
|
||||
)
|
||||
location2025_objects.append(location2025_obj)
|
||||
|
||||
# 一括挿入
|
||||
Location2025.objects.bulk_create(location2025_objects, ignore_conflicts=True)
|
||||
total_migrated += len(location2025_objects)
|
||||
|
||||
print(f"移行進捗: {total_migrated}/{pending_count}件完了")
|
||||
|
||||
# 移行結果確認
|
||||
final_location2025_count = Location2025.objects.count()
|
||||
print(f"\n✅ 移行完了: Location2025テーブルに{final_location2025_count}件のデータ")
|
||||
print(f"今回移行: {total_migrated}件")
|
||||
|
||||
# API互換性確認
|
||||
print("\n=== API互換性確認 ===")
|
||||
test_checkpoints = Location2025.objects.filter(
|
||||
event_id=takayama_event.id
|
||||
)[:5]
|
||||
|
||||
if test_checkpoints.exists():
|
||||
print("✅ get_checkpoint_list API用サンプルデータ:")
|
||||
for cp in test_checkpoints:
|
||||
print(f" CP{cp.cp_number}: ({cp.point.x}, {cp.point.y}) - {cp.score}点")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ 移行エラー: {e}")
|
||||
return False
|
||||
|
||||
def verify_migration_results():
|
||||
"""移行結果の検証"""
|
||||
print("\n=== 移行結果検証 ===")
|
||||
|
||||
try:
|
||||
# データ数確認
|
||||
location_count = Location.objects.count()
|
||||
location2025_count = Location2025.objects.count()
|
||||
|
||||
print(f"Location (旧): {location_count}件")
|
||||
print(f"Location2025 (新): {location2025_count}件")
|
||||
|
||||
if location2025_count >= location_count:
|
||||
print("✅ 完全移行成功")
|
||||
else:
|
||||
remaining = location_count - location2025_count
|
||||
print(f"⚠️ {remaining}件が未移行")
|
||||
|
||||
# イベント別確認
|
||||
events_with_data = Location2025.objects.values('event_id').annotate(
|
||||
count=models.Count('id')
|
||||
)
|
||||
|
||||
print("\nLocation2025イベント別データ数:")
|
||||
for event_data in events_with_data:
|
||||
try:
|
||||
event = NewEvent2.objects.get(id=event_data['event_id'])
|
||||
print(f" {event.event_code}: {event_data['count']}件")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" イベントID {event_data['event_id']}: {event_data['count']}件 (イベント情報なし)")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ 検証エラー: {e}")
|
||||
return False
|
||||
|
||||
def main():
|
||||
"""メイン処理"""
|
||||
print("=== Location2025完全移行プログラム ===")
|
||||
print("目標: 残り7,641件のLocationデータをLocation2025に移行")
|
||||
|
||||
# 移行実行
|
||||
success = migrate_location_to_location2025()
|
||||
|
||||
if success:
|
||||
# 結果検証
|
||||
verify_migration_results()
|
||||
print("\n🎉 Location2025移行プログラム完了")
|
||||
else:
|
||||
print("\n❌ 移行に失敗しました")
|
||||
return 1
|
||||
|
||||
return 0
|
||||
|
||||
if __name__ == "__main__":
|
||||
exit(main())
|
||||
@ -1,83 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
チーム・エントリーデータ完全リセット＆再移行スクリプト
|
||||
既存のTeam/Entryデータをクリアして、old_rogdbから完全に移行し直す
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from rog.models import Team, Entry, Member
|
||||
from django.db import transaction
|
||||
import subprocess
|
||||
|
||||
print("=== チーム・エントリーデータ完全リセット＆再移行 ===")
|
||||
|
||||
try:
|
||||
with transaction.atomic():
|
||||
print("1. 既存データをクリア中...")
|
||||
|
||||
# 関連データを順番にクリア
|
||||
entry_count = Entry.objects.count()
|
||||
member_count = Member.objects.count()
|
||||
team_count = Team.objects.count()
|
||||
|
||||
print(f" 削除対象: Entry({entry_count}件), Member({member_count}件), Team({team_count}件)")
|
||||
|
||||
Entry.objects.all().delete()
|
||||
Member.objects.all().delete()
|
||||
Team.objects.all().delete()
|
||||
|
||||
print(" ✅ 既存データクリア完了")
|
||||
|
||||
print("\\n2. チームデータ移行を実行中...")
|
||||
result = subprocess.run([
|
||||
'python', 'migrate_rog_team_enhanced.py'
|
||||
], capture_output=True, text=True)
|
||||
|
||||
if result.returncode == 0:
|
||||
print(" ✅ チーム移行完了")
|
||||
else:
|
||||
print(f" ❌ チーム移行エラー: {result.stderr}")
|
||||
|
||||
print("\\n3. エントリーデータ移行を実行中...")
|
||||
result = subprocess.run([
|
||||
'python', 'migrate_rog_entry_enhanced.py'
|
||||
], capture_output=True, text=True)
|
||||
|
||||
if result.returncode == 0:
|
||||
print(" ✅ エントリー移行完了")
|
||||
else:
|
||||
print(f" ❌ エントリー移行エラー: {result.stderr}")
|
||||
|
||||
print("\\n4. 移行結果確認...")
|
||||
from rog.models import NewEvent2
|
||||
|
||||
team_count = Team.objects.count()
|
||||
entry_count = Entry.objects.count()
|
||||
|
||||
print(f" Team: {team_count}件")
|
||||
print(f" Entry: {entry_count}件")
|
||||
|
||||
# FC岐阜イベントのエントリー確認
|
||||
fc_event = NewEvent2.objects.filter(event_name__icontains='FC岐阜').first()
|
||||
if fc_event:
|
||||
fc_entries = Entry.objects.filter(event=fc_event)
|
||||
print(f" FC岐阜イベントエントリー: {fc_entries.count()}件")
|
||||
|
||||
if fc_entries.exists():
|
||||
print(" ✅ ゼッケン番号表示問題が解決されました！")
|
||||
for entry in fc_entries[:3]:
|
||||
print(f" ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
else:
|
||||
print(" ⚠️ FC岐阜にエントリーがありません")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,69 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
<dir>/usr/share/fonts</dir>
|
||||
|
||||
<!-- デフォルトのサンセリフフォントをIPAexGothicに設定 -->
|
||||
<match target="pattern">
|
||||
<test qual="any" name="family">
|
||||
<string>sans-serif</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>IPAexGothic</string>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!-- デフォルトのセリフフォントをIPAexMinchoに設定 -->
|
||||
<match target="pattern">
|
||||
<test qual="any" name="family">
|
||||
<string>serif</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>IPAexMincho</string>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!-- MS Gothic の代替としてIPAexGothicを使用 -->
|
||||
<match target="pattern">
|
||||
<test name="family">
|
||||
<string>MS Gothic</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>IPAexGothic</string>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!-- MS Mincho の代替としてIPAexMinchoを使用 -->
|
||||
<match target="pattern">
|
||||
<test name="family">
|
||||
<string>MS Mincho</string>
|
||||
</test>
|
||||
<edit name="family" mode="assign" binding="same">
|
||||
<string>IPAexMincho</string>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!-- ビットマップフォントを無効化 -->
|
||||
<match target="font">
|
||||
<edit name="embeddedbitmap" mode="assign">
|
||||
<bool>false</bool>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!-- フォントのヒンティング設定 -->
|
||||
<match target="font">
|
||||
<edit name="hintstyle" mode="assign">
|
||||
<const>hintslight</const>
|
||||
</edit>
|
||||
<edit name="rgba" mode="assign">
|
||||
<const>rgb</const>
|
||||
</edit>
|
||||
</match>
|
||||
|
||||
<!-- アンチエイリアス設定 -->
|
||||
<match target="font">
|
||||
<edit name="antialias" mode="assign">
|
||||
<bool>true</bool>
|
||||
</edit>
|
||||
</match>
|
||||
</fontconfig>
|
||||
@ -48,6 +48,7 @@ INSTALLED_APPS = [
|
||||
'django.contrib.staticfiles',
|
||||
'django.contrib.gis',
|
||||
'rest_framework',
|
||||
'rest_framework.authtoken',
|
||||
'rest_framework_gis',
|
||||
'knox',
|
||||
'leaflet',
|
||||
@ -137,15 +138,7 @@ DATABASES = {
|
||||
default=f'postgis://{env("POSTGRES_USER")}:{env("POSTGRES_PASS")}@{env("PG_HOST")}:{env("PG_PORT")}/{env("POSTGRES_DBNAME")}',
|
||||
conn_max_age=600,
|
||||
conn_health_checks=True,
|
||||
),
|
||||
'mobserver': {
|
||||
'ENGINE': 'django.contrib.gis.db.backends.postgis',
|
||||
'NAME': 'gifuroge',
|
||||
'USER': env("POSTGRES_USER"),
|
||||
'PASSWORD': env("POSTGRES_PASS"),
|
||||
'HOST': env("PG_HOST"),
|
||||
'PORT': env("PG_PORT"),
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
# Password validation
|
||||
@ -223,9 +216,9 @@ LEAFLET_CONFIG = {
|
||||
|
||||
REST_FRAMEWORK = {
|
||||
'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'],
|
||||
'DEFAULT_AUTHENTICATION_CLASSES': ('knox.auth.TokenAuthentication', ),
|
||||
'DEFAULT_AUTHENTICATION_CLASSES': ['knox.auth.TokenAuthentication','rest_framework.authentication.TokenAuthentication', ],
|
||||
'DEFAULT_PERMISSION_CLASSES': [
|
||||
'rest_framework.permissions.AllowAny', # デフォルトは認証不要に変更
|
||||
'rest_framework.permissions.IsAuthenticated',
|
||||
],
|
||||
}
|
||||
|
||||
@ -312,17 +305,3 @@ PASSWORD_HASHERS = [
|
||||
|
||||
BLACKLISTED_IPS = ['44.230.58.114'] # ブロックしたい IP アドレスをここにリストとして追加
|
||||
|
||||
# AWS S3 Settings
|
||||
AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY", default="")
|
||||
AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY", default="")
|
||||
AWS_STORAGE_BUCKET_NAME = env("S3_BUCKET_NAME", default="")
|
||||
AWS_S3_REGION_NAME = env("AWS_REGION", default="us-west-2")
|
||||
AWS_S3_CUSTOM_DOMAIN = f"{AWS_STORAGE_BUCKET_NAME}.s3.{AWS_S3_REGION_NAME}.amazonaws.com"
|
||||
|
||||
# S3 URL Generation
|
||||
def get_s3_url(file_path):
|
||||
"""Generate S3 URL for given file path"""
|
||||
if AWS_STORAGE_BUCKET_NAME and file_path:
|
||||
return f"https://{AWS_S3_CUSTOM_DOMAIN}/{file_path}"
|
||||
return None
|
||||
|
||||
|
||||
@ -1,320 +0,0 @@
|
||||
"""
|
||||
Django settings for config project.
|
||||
|
||||
Generated by 'django-admin startproject' using Django 3.2.9.
|
||||
|
||||
For more information on this file, see
|
||||
https://docs.djangoproject.com/en/3.2/topics/settings/
|
||||
|
||||
For the full list of settings and their values, see
|
||||
https://docs.djangoproject.com/en/3.2/ref/settings/
|
||||
"""
|
||||
|
||||
from pathlib import Path
|
||||
import environ
|
||||
import os
|
||||
import dj_database_url
|
||||
|
||||
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||
|
||||
env = environ.Env(DEBUG=(bool, False))
|
||||
environ.Env.read_env(env_file=os.path.join(BASE_DIR, ".env"))
|
||||
|
||||
import os
|
||||
print("="*50)
|
||||
print("Current working directory:", os.getcwd())
|
||||
print("Base directory:", BASE_DIR)
|
||||
print("Environment file exists:", os.path.exists(os.path.join(BASE_DIR, ".env")))
|
||||
print("Environment variables in .env file:")
|
||||
if os.path.exists(os.path.join(BASE_DIR, ".env")):
|
||||
with open(os.path.join(BASE_DIR, ".env"), "r") as f:
|
||||
print(f.read())
|
||||
print("="*50)
|
||||
|
||||
# Quick-start development settings - unsuitable for production
|
||||
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
#SECRET_KEY = 'django-insecure-@!z!i#bheb)(o1-e2tss(i^dav-ql=cm4*+$unm^3=4)k_ttda'
|
||||
SECRET_KEY = env("SECRET_KEY")
|
||||
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
#DEBUG = True
|
||||
DEBUG = env("DEBUG")
|
||||
|
||||
#ALLOWED_HOSTS = []
|
||||
ALLOWED_HOSTS = env("ALLOWED_HOSTS").split(" ")
|
||||
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'django.contrib.gis',
|
||||
'rest_framework',
|
||||
'rest_framework_gis',
|
||||
'knox',
|
||||
'leaflet',
|
||||
'leaflet_admin_list',
|
||||
'rog.apps.RogConfig',
|
||||
'corsheaders', # added
|
||||
'django_filters'
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
'corsheaders.middleware.CorsMiddleware', # できるだけ上部に
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
|
||||
'django.middleware.security.SecurityMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.middleware.csrf.CsrfViewMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'config.urls'
|
||||
|
||||
CORS_ALLOW_ALL_ORIGINS = True # 開発環境のみ
|
||||
CORS_ALLOW_CREDENTIALS = True
|
||||
|
||||
CORS_ALLOWED_METHODS = [
|
||||
'GET',
|
||||
'POST',
|
||||
'PUT',
|
||||
'PATCH',
|
||||
'DELETE',
|
||||
'OPTIONS'
|
||||
]
|
||||
CORS_ALLOWED_HEADERS = [
|
||||
'accept',
|
||||
'accept-encoding',
|
||||
'authorization',
|
||||
'content-type',
|
||||
'dnt',
|
||||
'origin',
|
||||
'user-agent',
|
||||
'x-csrftoken',
|
||||
'x-requested-with',
|
||||
]
|
||||
|
||||
# 本番環境では以下のように制限する
|
||||
CORS_ALLOWED_ORIGINS = [
|
||||
"https://rogaining.sumasen.net",
|
||||
"http://rogaining.sumasen.net",
|
||||
]
|
||||
|
||||
# CSRFの設定
|
||||
CSRF_TRUSTED_ORIGINS = [
|
||||
"http://rogaining.sumasen.net",
|
||||
"https://rogaining.sumasen.net",
|
||||
]
|
||||
|
||||
# settings.py に以下の設定を追加
|
||||
# レポートディレクトリの設定
|
||||
REPORT_DIRECTORY = 'reports'
|
||||
REPORT_BASE_URL = '/media/reports/'
|
||||
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [os.path.join(BASE_DIR, 'templates')],
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
'context_processors': [
|
||||
'django.template.context_processors.debug',
|
||||
'django.template.context_processors.request',
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'config.wsgi.application'
|
||||
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
|
||||
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql',
|
||||
'NAME': env('POSTGRES_DBNAME'),
|
||||
'USER': env('POSTGRES_USER'),
|
||||
'PASSWORD': env('POSTGRES_PASS'),
|
||||
'HOST': env('PG_HOST'),
|
||||
'PORT': env('PG_PORT'),
|
||||
}
|
||||
}
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
|
||||
},
|
||||
{
|
||||
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/3.2/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = 'en-us'
|
||||
|
||||
TIME_ZONE = 'Asia/Tokyo'
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
USE_L10N = True
|
||||
|
||||
USE_TZ = True
|
||||
|
||||
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/3.2/howto/static-files/
|
||||
|
||||
STATIC_URL = '/static/'
|
||||
|
||||
#STATIC_URL = '/static2/'
|
||||
#STATIC_ROOT = BASE_DIR / "static"
|
||||
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
|
||||
|
||||
MEDIA_URL = '/media/'
|
||||
#MEDIA_ROOT = BASE_DIR / "media/"
|
||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
|
||||
|
||||
#STATICFILES_DIRS = (os.path.join(BASE_DIR, "static2"),os.path.join(BASE_DIR, "media"))
|
||||
|
||||
|
||||
AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend' , 'rog.backend.EmailOrUsernameModelBackend', )
|
||||
|
||||
AUTH_USER_MODEL = 'rog.CustomUser'
|
||||
|
||||
|
||||
# Default primary key field type
|
||||
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
|
||||
|
||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||
|
||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||
|
||||
LEAFLET_CONFIG = {
|
||||
'DEFAULT_CENTER': (35.41864442627996, 138.14094040951784),
|
||||
'DEFAULT_ZOOM': 6,
|
||||
'MIN_ZOOM': 3,
|
||||
'MAX_ZOOM': 19,
|
||||
'DEFAULT_PRECISION': 6,
|
||||
'SCALE':"both",
|
||||
'ATTRIBUTION_PREFIX':"ROGAINING API",
|
||||
'TILES': [('Satellite', 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {'attribution': '© ESRI', 'maxZoom': 19}),
|
||||
('Streets', 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {'attribution': '© Contributors'})]
|
||||
}
|
||||
|
||||
REST_FRAMEWORK = {
|
||||
'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'],
|
||||
'DEFAULT_AUTHENTICATION_CLASSES': ('knox.auth.TokenAuthentication', ),
|
||||
}
|
||||
|
||||
|
||||
#FRONTEND_URL = 'https://rogaining.intranet.sumasen.net' # フロントエンドのURLに適宜変更してください
|
||||
FRONTEND_URL = 'https://rogaining.sumasen.net' # フロントエンドのURLに適宜変更してください
|
||||
|
||||
# この設定により、メールは実際には送信されず、代わりにコンソールに出力されます。
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||
|
||||
EMAIL_HOST = 'smtp.outlook.com'
|
||||
EMAIL_PORT = 587
|
||||
EMAIL_USE_TLS = True
|
||||
EMAIL_HOST_USER = 'rogaining@gifuai.net'
|
||||
EMAIL_HOST_PASSWORD = 'ctcpy9823"x~'
|
||||
DEFAULT_FROM_EMAIL = 'rogaining@gifuai.net'
|
||||
|
||||
APP_DOWNLOAD_LINK = 'https://apps.apple.com/jp/app/%E5%B2%90%E9%98%9C%E3%83%8A%E3%83%93/id6444221792'
|
||||
ANDROID_DOWNLOAD_LINK = 'https://play.google.com/store/apps/details?id=com.dvox.gifunavi&hl=ja'
|
||||
|
||||
SERVICE_NAME = '岐阜ナビ(岐阜ロゲのアプリ)'
|
||||
|
||||
# settings.py
|
||||
DEFAULT_CHARSET = 'utf-8'
|
||||
|
||||
#REST_FRAMEWORK = {
|
||||
# 'DEFAULT_RENDERER_CLASSES': [
|
||||
# 'rest_framework.renderers.JSONRenderer',
|
||||
# ],
|
||||
# 'JSON_UNICODE_ESCAPE': False,
|
||||
#}
|
||||
|
||||
LOGGING = {
|
||||
'version': 1,
|
||||
'disable_existing_loggers': False,
|
||||
'formatters': {
|
||||
'verbose': {
|
||||
'format': '{levelname} {asctime} {module} {message}',
|
||||
'style': '{',
|
||||
},
|
||||
},
|
||||
'handlers': {
|
||||
#'file': {
|
||||
# 'level': 'DEBUG',
|
||||
# 'class': 'logging.FileHandler',
|
||||
# 'filename': os.path.join(BASE_DIR, 'logs/debug.log'),
|
||||
# 'formatter': 'verbose',
|
||||
#},
|
||||
'console': {
|
||||
'level': 'DEBUG',
|
||||
'class': 'logging.StreamHandler',
|
||||
'formatter': 'verbose',
|
||||
},
|
||||
},
|
||||
'root': {
|
||||
'handlers': ['console'],
|
||||
'level': 'DEBUG',
|
||||
},
|
||||
'loggers': {
|
||||
'django': {
|
||||
'handlers': ['console'],
|
||||
'level': 'INFO',
|
||||
'propagate': False,
|
||||
},
|
||||
'django.request': {
|
||||
'handlers': ['console'],
|
||||
'level': 'DEBUG',
|
||||
},
|
||||
'rog': {
|
||||
#'handlers': ['file','console'],
|
||||
'handlers': ['console'],
|
||||
'level': 'DEBUG',
|
||||
'propagate': True,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
PASSWORD_HASHERS = [
|
||||
'django.contrib.auth.hashers.PBKDF2PasswordHasher',
|
||||
'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
|
||||
'django.contrib.auth.hashers.Argon2PasswordHasher',
|
||||
'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
|
||||
]
|
||||
|
||||
BLACKLISTED_IPS = ['44.230.58.114'] # ブロックしたい IP アドレスをここにリストとして追加
|
||||
|
||||
@ -34,7 +34,6 @@ CORS_ALLOWED_ORIGINS = [
|
||||
]
|
||||
|
||||
urlpatterns = [
|
||||
path('', rog_views.index_view, name='index'), # ルートURL
|
||||
path('admin/', admin.site.urls),
|
||||
path('auth/', include('knox.urls')),
|
||||
path('api/', include("rog.urls")),
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
-- アプリバージョン管理テーブル作成
|
||||
-- 2025年8月27日 - サーバーAPI変更要求書対応
|
||||
|
||||
CREATE TABLE IF NOT EXISTS app_versions (
|
||||
id SERIAL PRIMARY KEY,
|
||||
version VARCHAR(20) NOT NULL,
|
||||
platform VARCHAR(10) NOT NULL CHECK (platform IN ('android', 'ios')),
|
||||
build_number VARCHAR(20),
|
||||
is_latest BOOLEAN DEFAULT FALSE,
|
||||
is_required BOOLEAN DEFAULT FALSE,
|
||||
update_message TEXT,
|
||||
download_url TEXT,
|
||||
release_date TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
UNIQUE(version, platform)
|
||||
);
|
||||
|
||||
-- インデックス作成
|
||||
CREATE INDEX idx_app_versions_platform ON app_versions(platform);
|
||||
CREATE INDEX idx_app_versions_latest ON app_versions(is_latest) WHERE is_latest = TRUE;
|
||||
|
||||
-- 初期データ挿入（例）
|
||||
INSERT INTO app_versions (version, platform, build_number, is_latest, is_required, update_message, download_url)
|
||||
VALUES
|
||||
('1.3.0', 'android', '130', TRUE, FALSE, '新機能が追加されました。更新を必ずしてください。', 'https://play.google.com/store/apps/details?id=com.gifurogeining.app'),
|
||||
('1.3.0', 'ios', '130', TRUE, FALSE, '新機能が追加されました。更新を必ずしてください。', 'https://apps.apple.com/jp/app/id123456789'),
|
||||
('1.2.0', 'android', '120', FALSE, FALSE, '前バージョン', 'https://play.google.com/store/apps/details?id=com.gifurogeining.app'),
|
||||
('1.2.0', 'ios', '120', FALSE, FALSE, '前バージョン', 'https://apps.apple.com/jp/app/id123456789');
|
||||
|
||||
COMMENT ON TABLE app_versions IS 'アプリバージョン管理テーブル';
|
||||
COMMENT ON COLUMN app_versions.version IS 'セマンティックバージョン (1.2.3)';
|
||||
COMMENT ON COLUMN app_versions.platform IS 'プラットフォーム (android/ios)';
|
||||
COMMENT ON COLUMN app_versions.build_number IS 'ビルド番号';
|
||||
COMMENT ON COLUMN app_versions.is_latest IS '最新版フラグ';
|
||||
COMMENT ON COLUMN app_versions.is_required IS '強制更新フラグ';
|
||||
COMMENT ON COLUMN app_versions.update_message IS 'ユーザー向け更新メッセージ';
|
||||
COMMENT ON COLUMN app_versions.download_url IS 'アプリストアURL';
|
||||
@ -1,80 +0,0 @@
|
||||
-- チェックイン拡張情報テーブル作成
|
||||
-- 2025年8月27日 - サーバーAPI変更要求書対応
|
||||
|
||||
CREATE TABLE IF NOT EXISTS rog_checkin_extended (
|
||||
id SERIAL PRIMARY KEY,
|
||||
gpslog_id INTEGER REFERENCES rog_gpslog(id) ON DELETE CASCADE,
|
||||
|
||||
-- GPS拡張情報
|
||||
gps_latitude DECIMAL(10, 8),
|
||||
gps_longitude DECIMAL(11, 8),
|
||||
gps_accuracy DECIMAL(6, 2),
|
||||
gps_timestamp TIMESTAMP WITH TIME ZONE,
|
||||
|
||||
-- カメラメタデータ
|
||||
camera_capture_time TIMESTAMP WITH TIME ZONE,
|
||||
device_info TEXT,
|
||||
|
||||
-- 審査・検証情報
|
||||
validation_status VARCHAR(20) DEFAULT 'pending'
|
||||
CHECK (validation_status IN ('pending', 'approved', 'rejected', 'requires_review')),
|
||||
validation_comment TEXT,
|
||||
validated_by INTEGER REFERENCES rog_customuser(id),
|
||||
validated_at TIMESTAMP WITH TIME ZONE,
|
||||
|
||||
-- スコア情報
|
||||
bonus_points INTEGER DEFAULT 0,
|
||||
scoring_breakdown JSONB,
|
||||
|
||||
-- システム情報
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
||||
);
|
||||
|
||||
-- インデックス作成
|
||||
CREATE INDEX idx_checkin_extended_gpslog ON rog_checkin_extended(gpslog_id);
|
||||
CREATE INDEX idx_checkin_extended_validation_status ON rog_checkin_extended(validation_status);
|
||||
CREATE INDEX idx_checkin_extended_validated_by ON rog_checkin_extended(validated_by);
|
||||
CREATE INDEX idx_checkin_extended_created_at ON rog_checkin_extended(created_at);
|
||||
|
||||
-- トリガー関数：updated_at自動更新
|
||||
CREATE OR REPLACE FUNCTION update_checkin_extended_updated_at()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
NEW.updated_at = NOW();
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
-- トリガー作成
|
||||
CREATE TRIGGER trigger_update_checkin_extended_updated_at
|
||||
BEFORE UPDATE ON rog_checkin_extended
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION update_checkin_extended_updated_at();
|
||||
|
||||
-- コメント追加
|
||||
COMMENT ON TABLE rog_checkin_extended IS 'チェックイン拡張情報テーブル - GPS精度、カメラメタデータ、審査情報';
|
||||
COMMENT ON COLUMN rog_checkin_extended.gpslog_id IS '関連するGPSログID';
|
||||
COMMENT ON COLUMN rog_checkin_extended.gps_latitude IS 'GPS緯度';
|
||||
COMMENT ON COLUMN rog_checkin_extended.gps_longitude IS 'GPS経度';
|
||||
COMMENT ON COLUMN rog_checkin_extended.gps_accuracy IS 'GPS精度（メートル）';
|
||||
COMMENT ON COLUMN rog_checkin_extended.gps_timestamp IS 'GPS取得時刻';
|
||||
COMMENT ON COLUMN rog_checkin_extended.camera_capture_time IS 'カメラ撮影時刻';
|
||||
COMMENT ON COLUMN rog_checkin_extended.device_info IS 'デバイス情報';
|
||||
COMMENT ON COLUMN rog_checkin_extended.validation_status IS '審査ステータス';
|
||||
COMMENT ON COLUMN rog_checkin_extended.validation_comment IS '審査コメント';
|
||||
COMMENT ON COLUMN rog_checkin_extended.validated_by IS '審査者ID';
|
||||
COMMENT ON COLUMN rog_checkin_extended.validated_at IS '審査日時';
|
||||
COMMENT ON COLUMN rog_checkin_extended.bonus_points IS 'ボーナスポイント';
|
||||
COMMENT ON COLUMN rog_checkin_extended.scoring_breakdown IS 'スコア詳細（JSON）';
|
||||
|
||||
-- 初期データ例
|
||||
INSERT INTO rog_checkin_extended (
|
||||
gpslog_id, gps_latitude, gps_longitude, gps_accuracy, gps_timestamp,
|
||||
camera_capture_time, device_info, validation_status, bonus_points,
|
||||
scoring_breakdown
|
||||
) VALUES
|
||||
(1, 35.4091, 136.7581, 5.2, '2025-09-15 11:30:00+09:00',
|
||||
'2025-09-15 11:30:00+09:00', 'iPhone 12', 'pending', 5,
|
||||
'{"base_points": 10, "camera_bonus": 5, "total_points": 15}'::jsonb)
|
||||
ON CONFLICT DO NOTHING;
|
||||
@ -1,91 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
FC岐阜イベント用のエントリーデータ作成スクリプト
|
||||
既存のチームをFC岐阜イベントにエントリーして、ゼッケン番号表示を可能にする
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from datetime import datetime
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from rog.models import NewEvent2, Entry, Team, NewCategory, CustomUser
|
||||
|
||||
print("=== FC岐阜イベント用エントリーデータ作成 ===")
|
||||
|
||||
try:
|
||||
# FC岐阜イベントを取得
|
||||
fc_gifu_event = NewEvent2.objects.filter(event_name__icontains='FC岐阜').first()
|
||||
if not fc_gifu_event:
|
||||
print("❌ FC岐阜イベントが見つかりません")
|
||||
sys.exit(1)
|
||||
|
||||
print(f"✅ FC岐阜イベント確認: {fc_gifu_event.event_name} (ID: {fc_gifu_event.id})")
|
||||
|
||||
# カテゴリを取得または作成
|
||||
category, created = NewCategory.objects.get_or_create(
|
||||
category_name="一般",
|
||||
defaults={'category_number': 1}
|
||||
)
|
||||
if created:
|
||||
print(f"✅ カテゴリ作成: {category.category_name}")
|
||||
else:
|
||||
print(f"✅ 既存カテゴリ使用: {category.category_name}")
|
||||
|
||||
# 既存のチームを取得
|
||||
teams = Team.objects.all()[:10] # 最初の10チームを使用
|
||||
print(f"✅ 対象チーム数: {teams.count()}件")
|
||||
|
||||
# エントリーを作成
|
||||
created_entries = 0
|
||||
zekken_number = 1
|
||||
|
||||
for team in teams:
|
||||
# 既にエントリーが存在するかチェック
|
||||
existing_entry = Entry.objects.filter(
|
||||
team=team,
|
||||
event=fc_gifu_event
|
||||
).first()
|
||||
|
||||
if not existing_entry:
|
||||
# エントリーを作成
|
||||
entry = Entry.objects.create(
|
||||
team=team,
|
||||
event=fc_gifu_event,
|
||||
category=category,
|
||||
date=fc_gifu_event.start_datetime,
|
||||
owner=team.owner,
|
||||
zekken_number=zekken_number,
|
||||
zekken_label=f"FC岐阜-{zekken_number:03d}",
|
||||
is_active=True,
|
||||
hasParticipated=False,
|
||||
hasGoaled=False
|
||||
)
|
||||
print(f" ✅ エントリー作成: {team.team_name} -> ゼッケン{zekken_number}")
|
||||
created_entries += 1
|
||||
zekken_number += 1
|
||||
else:
|
||||
print(f" ⏭️ 既存エントリー: {team.team_name}")
|
||||
|
||||
print(f"\n=== 作成完了 ===")
|
||||
print(f"新規エントリー数: {created_entries}件")
|
||||
|
||||
# 確認
|
||||
fc_entries = Entry.objects.filter(event=fc_gifu_event)
|
||||
print(f"FC岐阜イベントの総エントリー数: {fc_entries.count()}件")
|
||||
|
||||
print("\n=== ゼッケン番号一覧 ===")
|
||||
for entry in fc_entries.order_by('zekken_number')[:5]:
|
||||
print(f"ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
|
||||
if fc_entries.count() > 5:
|
||||
print(f"... 他 {fc_entries.count() - 5}件")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,174 +0,0 @@
|
||||
-- rog_location2025テーブル手動作成SQL (デプロイ先用)
|
||||
-- 実行前に必要な拡張機能が有効になっていることを確認してください
|
||||
-- CREATE EXTENSION IF NOT EXISTS postgis;
|
||||
|
||||
-- 既存テーブルが存在する場合は削除 (必要に応じてコメントアウト)
|
||||
-- DROP TABLE IF EXISTS rog_location2025;
|
||||
|
||||
-- rog_location2025テーブル作成
|
||||
CREATE TABLE IF NOT EXISTS rog_location2025 (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
cp_number INTEGER NOT NULL,
|
||||
event_id INTEGER NOT NULL,
|
||||
cp_name VARCHAR(255) NOT NULL,
|
||||
latitude DOUBLE PRECISION,
|
||||
longitude DOUBLE PRECISION,
|
||||
location GEOMETRY(POINT, 4326),
|
||||
cp_point INTEGER NOT NULL DEFAULT 10,
|
||||
photo_point INTEGER NOT NULL DEFAULT 0,
|
||||
buy_point INTEGER NOT NULL DEFAULT 0,
|
||||
checkin_radius DOUBLE PRECISION NOT NULL DEFAULT 15.0,
|
||||
auto_checkin BOOLEAN NOT NULL DEFAULT false,
|
||||
shop_closed BOOLEAN NOT NULL DEFAULT false,
|
||||
shop_shutdown BOOLEAN NOT NULL DEFAULT false,
|
||||
opening_hours TEXT,
|
||||
address VARCHAR(512),
|
||||
phone VARCHAR(32),
|
||||
website VARCHAR(200),
|
||||
description TEXT,
|
||||
is_active BOOLEAN NOT NULL DEFAULT true,
|
||||
sort_order INTEGER NOT NULL DEFAULT 0,
|
||||
csv_source_file VARCHAR(255),
|
||||
csv_upload_date TIMESTAMP WITH TIME ZONE,
|
||||
csv_upload_user_id BIGINT,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
created_by_id BIGINT,
|
||||
updated_by_id BIGINT
|
||||
);
|
||||
|
||||
-- インデックス作成
|
||||
CREATE INDEX IF NOT EXISTS rog_location2025_cp_number_idx ON rog_location2025 (cp_number);
|
||||
CREATE INDEX IF NOT EXISTS rog_location2025_event_id_idx ON rog_location2025 (event_id);
|
||||
CREATE INDEX IF NOT EXISTS rog_location2025_is_active_idx ON rog_location2025 (is_active);
|
||||
CREATE INDEX IF NOT EXISTS location2025_event_cp_idx ON rog_location2025 (event_id, cp_number);
|
||||
CREATE INDEX IF NOT EXISTS location2025_event_active_idx ON rog_location2025 (event_id, is_active);
|
||||
CREATE INDEX IF NOT EXISTS location2025_csv_date_idx ON rog_location2025 (csv_upload_date);
|
||||
|
||||
-- 空間インデックス (PostGIS必須)
|
||||
CREATE INDEX IF NOT EXISTS location2025_location_gist_idx ON rog_location2025 USING GIST (location);
|
||||
|
||||
-- 外部キー制約追加 (テーブルが存在する場合)
|
||||
-- rog_newevent2テーブルが存在することを前提
|
||||
DO $$
|
||||
BEGIN
|
||||
-- event_idの外部キー制約
|
||||
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'rog_newevent2') THEN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.table_constraints
|
||||
WHERE constraint_name = 'rog_location2025_event_id_fkey'
|
||||
) THEN
|
||||
ALTER TABLE rog_location2025
|
||||
ADD CONSTRAINT rog_location2025_event_id_fkey
|
||||
FOREIGN KEY (event_id) REFERENCES rog_newevent2(id) DEFERRABLE INITIALLY DEFERRED;
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
-- csv_upload_user_idの外部キー制約
|
||||
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'rog_customuser') THEN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.table_constraints
|
||||
WHERE constraint_name = 'rog_location2025_csv_upload_user_id_fkey'
|
||||
) THEN
|
||||
ALTER TABLE rog_location2025
|
||||
ADD CONSTRAINT rog_location2025_csv_upload_user_id_fkey
|
||||
FOREIGN KEY (csv_upload_user_id) REFERENCES rog_customuser(id) DEFERRABLE INITIALLY DEFERRED;
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
-- created_by_idの外部キー制約
|
||||
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'rog_customuser') THEN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.table_constraints
|
||||
WHERE constraint_name = 'rog_location2025_created_by_id_fkey'
|
||||
) THEN
|
||||
ALTER TABLE rog_location2025
|
||||
ADD CONSTRAINT rog_location2025_created_by_id_fkey
|
||||
FOREIGN KEY (created_by_id) REFERENCES rog_customuser(id) DEFERRABLE INITIALLY DEFERRED;
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
-- updated_by_idの外部キー制約
|
||||
IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'rog_customuser') THEN
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.table_constraints
|
||||
WHERE constraint_name = 'rog_location2025_updated_by_id_fkey'
|
||||
) THEN
|
||||
ALTER TABLE rog_location2025
|
||||
ADD CONSTRAINT rog_location2025_updated_by_id_fkey
|
||||
FOREIGN KEY (updated_by_id) REFERENCES rog_customuser(id) DEFERRABLE INITIALLY DEFERRED;
|
||||
END IF;
|
||||
END IF;
|
||||
|
||||
-- ユニーク制約
|
||||
IF NOT EXISTS (
|
||||
SELECT 1 FROM information_schema.table_constraints
|
||||
WHERE constraint_name = 'rog_location2025_cp_number_event_id_unique'
|
||||
) THEN
|
||||
ALTER TABLE rog_location2025
|
||||
ADD CONSTRAINT rog_location2025_cp_number_event_id_unique
|
||||
UNIQUE (cp_number, event_id);
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
-- updated_atの自動更新トリガー作成
|
||||
CREATE OR REPLACE FUNCTION update_rog_location2025_updated_at()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
NEW.updated_at = CURRENT_TIMESTAMP;
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
DROP TRIGGER IF EXISTS rog_location2025_updated_at_trigger ON rog_location2025;
|
||||
CREATE TRIGGER rog_location2025_updated_at_trigger
|
||||
BEFORE UPDATE ON rog_location2025
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION update_rog_location2025_updated_at();
|
||||
|
||||
-- 作成確認
|
||||
SELECT
|
||||
schemaname,
|
||||
tablename,
|
||||
tableowner
|
||||
FROM pg_tables
|
||||
WHERE tablename = 'rog_location2025';
|
||||
|
||||
-- カラム確認
|
||||
SELECT
|
||||
column_name,
|
||||
data_type,
|
||||
is_nullable,
|
||||
column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_location2025'
|
||||
ORDER BY ordinal_position;
|
||||
|
||||
COMMENT ON TABLE rog_location2025 IS '2025年版チェックポイント管理テーブル';
|
||||
COMMENT ON COLUMN rog_location2025.cp_number IS 'CP番号';
|
||||
COMMENT ON COLUMN rog_location2025.event_id IS 'イベントID';
|
||||
COMMENT ON COLUMN rog_location2025.cp_name IS 'CP名';
|
||||
COMMENT ON COLUMN rog_location2025.latitude IS '緯度';
|
||||
COMMENT ON COLUMN rog_location2025.longitude IS '経度';
|
||||
COMMENT ON COLUMN rog_location2025.location IS '位置(PostGIS Point)';
|
||||
COMMENT ON COLUMN rog_location2025.cp_point IS 'チェックポイント得点';
|
||||
COMMENT ON COLUMN rog_location2025.photo_point IS '写真ポイント';
|
||||
COMMENT ON COLUMN rog_location2025.buy_point IS '買い物ポイント';
|
||||
COMMENT ON COLUMN rog_location2025.checkin_radius IS 'チェックイン範囲(m)';
|
||||
COMMENT ON COLUMN rog_location2025.auto_checkin IS '自動チェックイン';
|
||||
COMMENT ON COLUMN rog_location2025.shop_closed IS '休業中';
|
||||
COMMENT ON COLUMN rog_location2025.shop_shutdown IS '閉業';
|
||||
COMMENT ON COLUMN rog_location2025.opening_hours IS '営業時間';
|
||||
COMMENT ON COLUMN rog_location2025.address IS '住所';
|
||||
COMMENT ON COLUMN rog_location2025.phone IS '電話番号';
|
||||
COMMENT ON COLUMN rog_location2025.website IS 'ウェブサイト';
|
||||
COMMENT ON COLUMN rog_location2025.description IS '説明';
|
||||
COMMENT ON COLUMN rog_location2025.is_active IS '有効';
|
||||
COMMENT ON COLUMN rog_location2025.sort_order IS '表示順';
|
||||
COMMENT ON COLUMN rog_location2025.csv_source_file IS 'CSVファイル名';
|
||||
COMMENT ON COLUMN rog_location2025.csv_upload_date IS 'CSVアップロード日時';
|
||||
COMMENT ON COLUMN rog_location2025.csv_upload_user_id IS 'CSVアップロードユーザーID';
|
||||
COMMENT ON COLUMN rog_location2025.created_at IS '作成日時';
|
||||
COMMENT ON COLUMN rog_location2025.updated_at IS '更新日時';
|
||||
COMMENT ON COLUMN rog_location2025.created_by_id IS '作成者ID';
|
||||
COMMENT ON COLUMN rog_location2025.updated_by_id IS '更新者ID';
|
||||
@ -1,87 +0,0 @@
|
||||
-- 画像管理テーブル作成
|
||||
-- サーバーAPI変更要求書対応 - 最優先項目
|
||||
|
||||
CREATE TABLE IF NOT EXISTS rog_uploaded_images (
|
||||
id SERIAL PRIMARY KEY,
|
||||
|
||||
-- 基本情報
|
||||
original_filename VARCHAR(255) NOT NULL,
|
||||
server_filename VARCHAR(255) NOT NULL UNIQUE,
|
||||
file_url TEXT NOT NULL,
|
||||
file_size BIGINT NOT NULL,
|
||||
mime_type VARCHAR(50) NOT NULL,
|
||||
|
||||
-- 関連情報
|
||||
event_code VARCHAR(50),
|
||||
team_name VARCHAR(255),
|
||||
cp_number INTEGER,
|
||||
|
||||
-- アップロード情報
|
||||
upload_source VARCHAR(50) DEFAULT 'direct', -- 'direct', 'sharing_intent', 'bulk_upload'
|
||||
device_platform VARCHAR(20), -- 'ios', 'android'
|
||||
|
||||
-- メタデータ
|
||||
capture_timestamp TIMESTAMP WITH TIME ZONE,
|
||||
upload_timestamp TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
device_info TEXT,
|
||||
|
||||
-- 処理状況
|
||||
processing_status VARCHAR(20) DEFAULT 'uploaded', -- 'uploaded', 'processing', 'processed', 'failed'
|
||||
thumbnail_url TEXT,
|
||||
|
||||
-- 外部キー
|
||||
gpslog_id INTEGER REFERENCES rog_gpslog(id) ON DELETE SET NULL,
|
||||
entry_id INTEGER REFERENCES rog_entry(id) ON DELETE SET NULL,
|
||||
|
||||
-- システム情報
|
||||
created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
|
||||
updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
|
||||
);
|
||||
|
||||
-- インデックス作成
|
||||
CREATE INDEX idx_uploaded_images_event_team ON rog_uploaded_images(event_code, team_name);
|
||||
CREATE INDEX idx_uploaded_images_cp_number ON rog_uploaded_images(cp_number);
|
||||
CREATE INDEX idx_uploaded_images_upload_timestamp ON rog_uploaded_images(upload_timestamp);
|
||||
CREATE INDEX idx_uploaded_images_processing_status ON rog_uploaded_images(processing_status);
|
||||
CREATE INDEX idx_uploaded_images_gpslog ON rog_uploaded_images(gpslog_id);
|
||||
|
||||
-- コメント追加
|
||||
COMMENT ON TABLE rog_uploaded_images IS '画像アップロード管理テーブル - マルチアップロード対応';
|
||||
COMMENT ON COLUMN rog_uploaded_images.original_filename IS '元のファイル名';
|
||||
COMMENT ON COLUMN rog_uploaded_images.server_filename IS 'サーバー上のファイル名';
|
||||
COMMENT ON COLUMN rog_uploaded_images.file_url IS '画像URL';
|
||||
COMMENT ON COLUMN rog_uploaded_images.file_size IS 'ファイルサイズ（バイト）';
|
||||
COMMENT ON COLUMN rog_uploaded_images.upload_source IS 'アップロード方法';
|
||||
COMMENT ON COLUMN rog_uploaded_images.device_platform IS 'デバイスプラットフォーム';
|
||||
COMMENT ON COLUMN rog_uploaded_images.processing_status IS '処理状況';
|
||||
|
||||
-- 制約追加
|
||||
ALTER TABLE rog_uploaded_images ADD CONSTRAINT chk_file_size
|
||||
CHECK (file_size > 0 AND file_size <= 10485760); -- 最大10MB
|
||||
|
||||
ALTER TABLE rog_uploaded_images ADD CONSTRAINT chk_mime_type
|
||||
CHECK (mime_type IN ('image/jpeg', 'image/png', 'image/heic', 'image/webp'));
|
||||
|
||||
ALTER TABLE rog_uploaded_images ADD CONSTRAINT chk_upload_source
|
||||
CHECK (upload_source IN ('direct', 'sharing_intent', 'bulk_upload'));
|
||||
|
||||
ALTER TABLE rog_uploaded_images ADD CONSTRAINT chk_device_platform
|
||||
CHECK (device_platform IN ('ios', 'android', 'web'));
|
||||
|
||||
ALTER TABLE rog_uploaded_images ADD CONSTRAINT chk_processing_status
|
||||
CHECK (processing_status IN ('uploaded', 'processing', 'processed', 'failed'));
|
||||
|
||||
-- トリガー関数：updated_at自動更新
|
||||
CREATE OR REPLACE FUNCTION update_uploaded_images_updated_at()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
NEW.updated_at = NOW();
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
-- トリガー作成
|
||||
CREATE TRIGGER trigger_update_uploaded_images_updated_at
|
||||
BEFORE UPDATE ON rog_uploaded_images
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION update_uploaded_images_updated_at();
|
||||
@ -1,780 +0,0 @@
|
||||
# -----------------------------
|
||||
# PostgreSQL configuration file
|
||||
# -----------------------------
|
||||
#
|
||||
# This file consists of lines of the form:
|
||||
#
|
||||
# name = value
|
||||
#
|
||||
# (The "=" is optional.) Whitespace may be used. Comments are introduced with
|
||||
# "#" anywhere on a line. The complete list of parameter names and allowed
|
||||
# values can be found in the PostgreSQL documentation.
|
||||
#
|
||||
# The commented-out settings shown in this file represent the default values.
|
||||
# Re-commenting a setting is NOT sufficient to revert it to the default value;
|
||||
# you need to reload the server.
|
||||
#
|
||||
# This file is read on server startup and when the server receives a SIGHUP
|
||||
# signal. If you edit the file on a running system, you have to SIGHUP the
|
||||
# server for the changes to take effect, run "pg_ctl reload", or execute
|
||||
# "SELECT pg_reload_conf()". Some parameters, which are marked below,
|
||||
# require a server shutdown and restart to take effect.
|
||||
#
|
||||
# Any parameter can also be given as a command-line option to the server, e.g.,
|
||||
# "postgres -c log_connections=on". Some parameters can be changed at run time
|
||||
# with the "SET" SQL command.
|
||||
#
|
||||
# Memory units: kB = kilobytes Time units: ms = milliseconds
|
||||
# MB = megabytes s = seconds
|
||||
# GB = gigabytes min = minutes
|
||||
# TB = terabytes h = hours
|
||||
# d = days
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# FILE LOCATIONS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# The default values of these variables are driven from the -D command-line
|
||||
# option or PGDATA environment variable, represented here as ConfigDir.
|
||||
|
||||
data_directory = '/var/lib/postgresql/12/main' # use data in another directory
|
||||
# (change requires restart)
|
||||
hba_file = '/etc/postgresql/12/main/pg_hba.conf' # host-based authentication file
|
||||
# (change requires restart)
|
||||
ident_file = '/etc/postgresql/12/main/pg_ident.conf' # ident configuration file
|
||||
# (change requires restart)
|
||||
|
||||
# If external_pid_file is not explicitly set, no extra PID file is written.
|
||||
external_pid_file = '/var/run/postgresql/12-main.pid' # write an extra PID file
|
||||
# (change requires restart)
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# CONNECTIONS AND AUTHENTICATION
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Connection Settings -
|
||||
|
||||
#listen_addresses = 'localhost' # what IP address(es) to listen on;
|
||||
# comma-separated list of addresses;
|
||||
# defaults to 'localhost'; use '*' for all
|
||||
# (change requires restart)
|
||||
port = 5432 # (change requires restart)
|
||||
max_connections = 100 # (change requires restart)
|
||||
#superuser_reserved_connections = 3 # (change requires restart)
|
||||
unix_socket_directories = '/var/run/postgresql' # comma-separated list of directories
|
||||
# (change requires restart)
|
||||
#unix_socket_group = '' # (change requires restart)
|
||||
#unix_socket_permissions = 0777 # begin with 0 to use octal notation
|
||||
# (change requires restart)
|
||||
#bonjour = off # advertise server via Bonjour
|
||||
# (change requires restart)
|
||||
#bonjour_name = '' # defaults to the computer name
|
||||
# (change requires restart)
|
||||
|
||||
# - TCP settings -
|
||||
# see "man 7 tcp" for details
|
||||
|
||||
#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds;
|
||||
# 0 selects the system default
|
||||
#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds;
|
||||
# 0 selects the system default
|
||||
#tcp_keepalives_count = 0 # TCP_KEEPCNT;
|
||||
# 0 selects the system default
|
||||
#tcp_user_timeout = 0 # TCP_USER_TIMEOUT, in milliseconds;
|
||||
# 0 selects the system default
|
||||
|
||||
# - Authentication -
|
||||
|
||||
#authentication_timeout = 1min # 1s-600s
|
||||
#password_encryption = md5 # md5 or scram-sha-256
|
||||
#db_user_namespace = off
|
||||
|
||||
# GSSAPI using Kerberos
|
||||
#krb_server_keyfile = ''
|
||||
#krb_caseins_users = off
|
||||
|
||||
# - SSL -
|
||||
|
||||
ssl = on
|
||||
#ssl_ca_file = ''
|
||||
ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
|
||||
#ssl_crl_file = ''
|
||||
ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
|
||||
#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
|
||||
#ssl_prefer_server_ciphers = on
|
||||
#ssl_ecdh_curve = 'prime256v1'
|
||||
#ssl_min_protocol_version = 'TLSv1'
|
||||
#ssl_max_protocol_version = ''
|
||||
#ssl_dh_params_file = ''
|
||||
#ssl_passphrase_command = ''
|
||||
#ssl_passphrase_command_supports_reload = off
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# RESOURCE USAGE (except WAL)
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Memory -
|
||||
|
||||
shared_buffers = 128MB # min 128kB
|
||||
# (change requires restart)
|
||||
#huge_pages = try # on, off, or try
|
||||
# (change requires restart)
|
||||
#temp_buffers = 8MB # min 800kB
|
||||
#max_prepared_transactions = 0 # zero disables the feature
|
||||
# (change requires restart)
|
||||
# Caution: it is not advisable to set max_prepared_transactions nonzero unless
|
||||
# you actively intend to use prepared transactions.
|
||||
#work_mem = 4MB # min 64kB
|
||||
#maintenance_work_mem = 64MB # min 1MB
|
||||
#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem
|
||||
#max_stack_depth = 2MB # min 100kB
|
||||
#shared_memory_type = mmap # the default is the first option
|
||||
# supported by the operating system:
|
||||
# mmap
|
||||
# sysv
|
||||
# windows
|
||||
# (change requires restart)
|
||||
dynamic_shared_memory_type = posix # the default is the first option
|
||||
# supported by the operating system:
|
||||
# posix
|
||||
# sysv
|
||||
# windows
|
||||
# mmap
|
||||
# (change requires restart)
|
||||
|
||||
# - Disk -
|
||||
|
||||
#temp_file_limit = -1 # limits per-process temp file space
|
||||
# in kB, or -1 for no limit
|
||||
|
||||
# - Kernel Resources -
|
||||
|
||||
#max_files_per_process = 1000 # min 25
|
||||
# (change requires restart)
|
||||
|
||||
# - Cost-Based Vacuum Delay -
|
||||
|
||||
#vacuum_cost_delay = 0 # 0-100 milliseconds (0 disables)
|
||||
#vacuum_cost_page_hit = 1 # 0-10000 credits
|
||||
#vacuum_cost_page_miss = 10 # 0-10000 credits
|
||||
#vacuum_cost_page_dirty = 20 # 0-10000 credits
|
||||
#vacuum_cost_limit = 200 # 1-10000 credits
|
||||
|
||||
# - Background Writer -
|
||||
|
||||
#bgwriter_delay = 200ms # 10-10000ms between rounds
|
||||
#bgwriter_lru_maxpages = 100 # max buffers written/round, 0 disables
|
||||
#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round
|
||||
#bgwriter_flush_after = 512kB # measured in pages, 0 disables
|
||||
|
||||
# - Asynchronous Behavior -
|
||||
|
||||
#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching
|
||||
#max_worker_processes = 8 # (change requires restart)
|
||||
#max_parallel_maintenance_workers = 2 # taken from max_parallel_workers
|
||||
#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers
|
||||
#parallel_leader_participation = on
|
||||
#max_parallel_workers = 8 # maximum number of max_worker_processes that
|
||||
# can be used in parallel operations
|
||||
#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate
|
||||
# (change requires restart)
|
||||
#backend_flush_after = 0 # measured in pages, 0 disables
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# WRITE-AHEAD LOG
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Settings -
|
||||
|
||||
#wal_level = replica # minimal, replica, or logical
|
||||
# (change requires restart)
|
||||
#fsync = on # flush data to disk for crash safety
|
||||
# (turning this off can cause
|
||||
# unrecoverable data corruption)
|
||||
#synchronous_commit = on # synchronization level;
|
||||
# off, local, remote_write, remote_apply, or on
|
||||
#wal_sync_method = fsync # the default is the first option
|
||||
# supported by the operating system:
|
||||
# open_datasync
|
||||
# fdatasync (default on Linux)
|
||||
# fsync
|
||||
# fsync_writethrough
|
||||
# open_sync
|
||||
#full_page_writes = on # recover from partial page writes
|
||||
#wal_compression = off # enable compression of full-page writes
|
||||
#wal_log_hints = off # also do full page writes of non-critical updates
|
||||
# (change requires restart)
|
||||
#wal_init_zero = on # zero-fill new WAL files
|
||||
#wal_recycle = on # recycle WAL files
|
||||
#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers
|
||||
# (change requires restart)
|
||||
#wal_writer_delay = 200ms # 1-10000 milliseconds
|
||||
#wal_writer_flush_after = 1MB # measured in pages, 0 disables
|
||||
|
||||
#commit_delay = 0 # range 0-100000, in microseconds
|
||||
#commit_siblings = 5 # range 1-1000
|
||||
|
||||
# - Checkpoints -
|
||||
|
||||
#checkpoint_timeout = 5min # range 30s-1d
|
||||
max_wal_size = 1GB
|
||||
min_wal_size = 80MB
|
||||
#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0
|
||||
#checkpoint_flush_after = 256kB # measured in pages, 0 disables
|
||||
#checkpoint_warning = 30s # 0 disables
|
||||
|
||||
# - Archiving -
|
||||
|
||||
#archive_mode = off # enables archiving; off, on, or always
|
||||
# (change requires restart)
|
||||
#archive_command = '' # command to use to archive a logfile segment
|
||||
# placeholders: %p = path of file to archive
|
||||
# %f = file name only
|
||||
# e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f'
|
||||
#archive_timeout = 0 # force a logfile segment switch after this
|
||||
# number of seconds; 0 disables
|
||||
|
||||
# - Archive Recovery -
|
||||
|
||||
# These are only used in recovery mode.
|
||||
|
||||
#restore_command = '' # command to use to restore an archived logfile segment
|
||||
# placeholders: %p = path of file to restore
|
||||
# %f = file name only
|
||||
# e.g. 'cp /mnt/server/archivedir/%f %p'
|
||||
# (change requires restart)
|
||||
#archive_cleanup_command = '' # command to execute at every restartpoint
|
||||
#recovery_end_command = '' # command to execute at completion of recovery
|
||||
|
||||
# - Recovery Target -
|
||||
|
||||
# Set these only when performing a targeted recovery.
|
||||
|
||||
#recovery_target = '' # 'immediate' to end recovery as soon as a
|
||||
# consistent state is reached
|
||||
# (change requires restart)
|
||||
#recovery_target_name = '' # the named restore point to which recovery will proceed
|
||||
# (change requires restart)
|
||||
#recovery_target_time = '' # the time stamp up to which recovery will proceed
|
||||
# (change requires restart)
|
||||
#recovery_target_xid = '' # the transaction ID up to which recovery will proceed
|
||||
# (change requires restart)
|
||||
#recovery_target_lsn = '' # the WAL LSN up to which recovery will proceed
|
||||
# (change requires restart)
|
||||
#recovery_target_inclusive = on # Specifies whether to stop:
|
||||
# just after the specified recovery target (on)
|
||||
# just before the recovery target (off)
|
||||
# (change requires restart)
|
||||
#recovery_target_timeline = 'latest' # 'current', 'latest', or timeline ID
|
||||
# (change requires restart)
|
||||
#recovery_target_action = 'pause' # 'pause', 'promote', 'shutdown'
|
||||
# (change requires restart)
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# REPLICATION
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Sending Servers -
|
||||
|
||||
# Set these on the master and on any standby that will send replication data.
|
||||
|
||||
#max_wal_senders = 10 # max number of walsender processes
|
||||
# (change requires restart)
|
||||
#wal_keep_segments = 0 # in logfile segments; 0 disables
|
||||
#wal_sender_timeout = 60s # in milliseconds; 0 disables
|
||||
|
||||
#max_replication_slots = 10 # max number of replication slots
|
||||
# (change requires restart)
|
||||
#track_commit_timestamp = off # collect timestamp of transaction commit
|
||||
# (change requires restart)
|
||||
|
||||
# - Master Server -
|
||||
|
||||
# These settings are ignored on a standby server.
|
||||
|
||||
#synchronous_standby_names = '' # standby servers that provide sync rep
|
||||
# method to choose sync standbys, number of sync standbys,
|
||||
# and comma-separated list of application_name
|
||||
# from standby(s); '*' = all
|
||||
#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed
|
||||
|
||||
# - Standby Servers -
|
||||
|
||||
# These settings are ignored on a master server.
|
||||
|
||||
#primary_conninfo = '' # connection string to sending server
|
||||
# (change requires restart)
|
||||
#primary_slot_name = '' # replication slot on sending server
|
||||
# (change requires restart)
|
||||
#promote_trigger_file = '' # file name whose presence ends recovery
|
||||
#hot_standby = on # "off" disallows queries during recovery
|
||||
# (change requires restart)
|
||||
#max_standby_archive_delay = 30s # max delay before canceling queries
|
||||
# when reading WAL from archive;
|
||||
# -1 allows indefinite delay
|
||||
#max_standby_streaming_delay = 30s # max delay before canceling queries
|
||||
# when reading streaming WAL;
|
||||
# -1 allows indefinite delay
|
||||
#wal_receiver_status_interval = 10s # send replies at least this often
|
||||
# 0 disables
|
||||
#hot_standby_feedback = off # send info from standby to prevent
|
||||
# query conflicts
|
||||
#wal_receiver_timeout = 60s # time that receiver waits for
|
||||
# communication from master
|
||||
# in milliseconds; 0 disables
|
||||
#wal_retrieve_retry_interval = 5s # time to wait before retrying to
|
||||
# retrieve WAL after a failed attempt
|
||||
#recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery
|
||||
|
||||
# - Subscribers -
|
||||
|
||||
# These settings are ignored on a publisher.
|
||||
|
||||
#max_logical_replication_workers = 4 # taken from max_worker_processes
|
||||
# (change requires restart)
|
||||
#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# QUERY TUNING
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Planner Method Configuration -
|
||||
|
||||
#enable_bitmapscan = on
|
||||
#enable_hashagg = on
|
||||
#enable_hashjoin = on
|
||||
#enable_indexscan = on
|
||||
#enable_indexonlyscan = on
|
||||
#enable_material = on
|
||||
#enable_mergejoin = on
|
||||
#enable_nestloop = on
|
||||
#enable_parallel_append = on
|
||||
#enable_seqscan = on
|
||||
#enable_sort = on
|
||||
#enable_tidscan = on
|
||||
#enable_partitionwise_join = off
|
||||
#enable_partitionwise_aggregate = off
|
||||
#enable_parallel_hash = on
|
||||
#enable_partition_pruning = on
|
||||
|
||||
# - Planner Cost Constants -
|
||||
|
||||
#seq_page_cost = 1.0 # measured on an arbitrary scale
|
||||
#random_page_cost = 4.0 # same scale as above
|
||||
#cpu_tuple_cost = 0.01 # same scale as above
|
||||
#cpu_index_tuple_cost = 0.005 # same scale as above
|
||||
#cpu_operator_cost = 0.0025 # same scale as above
|
||||
#parallel_tuple_cost = 0.1 # same scale as above
|
||||
#parallel_setup_cost = 1000.0 # same scale as above
|
||||
|
||||
#jit_above_cost = 100000 # perform JIT compilation if available
|
||||
# and query more expensive than this;
|
||||
# -1 disables
|
||||
#jit_inline_above_cost = 500000 # inline small functions if query is
|
||||
# more expensive than this; -1 disables
|
||||
#jit_optimize_above_cost = 500000 # use expensive JIT optimizations if
|
||||
# query is more expensive than this;
|
||||
# -1 disables
|
||||
|
||||
#min_parallel_table_scan_size = 8MB
|
||||
#min_parallel_index_scan_size = 512kB
|
||||
#effective_cache_size = 4GB
|
||||
|
||||
# - Genetic Query Optimizer -
|
||||
|
||||
#geqo = on
|
||||
#geqo_threshold = 12
|
||||
#geqo_effort = 5 # range 1-10
|
||||
#geqo_pool_size = 0 # selects default based on effort
|
||||
#geqo_generations = 0 # selects default based on effort
|
||||
#geqo_selection_bias = 2.0 # range 1.5-2.0
|
||||
#geqo_seed = 0.0 # range 0.0-1.0
|
||||
|
||||
# - Other Planner Options -
|
||||
|
||||
#default_statistics_target = 100 # range 1-10000
|
||||
#constraint_exclusion = partition # on, off, or partition
|
||||
#cursor_tuple_fraction = 0.1 # range 0.0-1.0
|
||||
#from_collapse_limit = 8
|
||||
#join_collapse_limit = 8 # 1 disables collapsing of explicit
|
||||
# JOIN clauses
|
||||
#force_parallel_mode = off
|
||||
#jit = on # allow JIT compilation
|
||||
#plan_cache_mode = auto # auto, force_generic_plan or
|
||||
# force_custom_plan
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# REPORTING AND LOGGING
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Where to Log -
|
||||
|
||||
#log_destination = 'stderr' # Valid values are combinations of
|
||||
# stderr, csvlog, syslog, and eventlog,
|
||||
# depending on platform. csvlog
|
||||
# requires logging_collector to be on.
|
||||
|
||||
# This is used when logging to stderr:
|
||||
#logging_collector = off # Enable capturing of stderr and csvlog
|
||||
# into log files. Required to be on for
|
||||
# csvlogs.
|
||||
# (change requires restart)
|
||||
|
||||
# These are only used if logging_collector is on:
|
||||
#log_directory = 'log' # directory where log files are written,
|
||||
# can be absolute or relative to PGDATA
|
||||
#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern,
|
||||
# can include strftime() escapes
|
||||
#log_file_mode = 0600 # creation mode for log files,
|
||||
# begin with 0 to use octal notation
|
||||
#log_truncate_on_rotation = off # If on, an existing log file with the
|
||||
# same name as the new log file will be
|
||||
# truncated rather than appended to.
|
||||
# But such truncation only occurs on
|
||||
# time-driven rotation, not on restarts
|
||||
# or size-driven rotation. Default is
|
||||
# off, meaning append to existing files
|
||||
# in all cases.
|
||||
#log_rotation_age = 1d # Automatic rotation of logfiles will
|
||||
# happen after that time. 0 disables.
|
||||
#log_rotation_size = 10MB # Automatic rotation of logfiles will
|
||||
# happen after that much log output.
|
||||
# 0 disables.
|
||||
|
||||
# These are relevant when logging to syslog:
|
||||
#syslog_facility = 'LOCAL0'
|
||||
#syslog_ident = 'postgres'
|
||||
#syslog_sequence_numbers = on
|
||||
#syslog_split_messages = on
|
||||
|
||||
# This is only relevant when logging to eventlog (win32):
|
||||
# (change requires restart)
|
||||
#event_source = 'PostgreSQL'
|
||||
|
||||
# - When to Log -
|
||||
|
||||
#log_min_messages = warning # values in order of decreasing detail:
|
||||
# debug5
|
||||
# debug4
|
||||
# debug3
|
||||
# debug2
|
||||
# debug1
|
||||
# info
|
||||
# notice
|
||||
# warning
|
||||
# error
|
||||
# log
|
||||
# fatal
|
||||
# panic
|
||||
|
||||
#log_min_error_statement = error # values in order of decreasing detail:
|
||||
# debug5
|
||||
# debug4
|
||||
# debug3
|
||||
# debug2
|
||||
# debug1
|
||||
# info
|
||||
# notice
|
||||
# warning
|
||||
# error
|
||||
# log
|
||||
# fatal
|
||||
# panic (effectively off)
|
||||
|
||||
#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements
|
||||
# and their durations, > 0 logs only
|
||||
# statements running at least this number
|
||||
# of milliseconds
|
||||
|
||||
#log_transaction_sample_rate = 0.0 # Fraction of transactions whose statements
|
||||
# are logged regardless of their duration. 1.0 logs all
|
||||
# statements from all transactions, 0.0 never logs.
|
||||
|
||||
# - What to Log -
|
||||
|
||||
#debug_print_parse = off
|
||||
#debug_print_rewritten = off
|
||||
#debug_print_plan = off
|
||||
#debug_pretty_print = on
|
||||
#log_checkpoints = off
|
||||
#log_connections = off
|
||||
#log_disconnections = off
|
||||
#log_duration = off
|
||||
#log_error_verbosity = default # terse, default, or verbose messages
|
||||
#log_hostname = off
|
||||
log_line_prefix = '%m [%p] %q%u@%d ' # special values:
|
||||
# %a = application name
|
||||
# %u = user name
|
||||
# %d = database name
|
||||
# %r = remote host and port
|
||||
# %h = remote host
|
||||
# %p = process ID
|
||||
# %t = timestamp without milliseconds
|
||||
# %m = timestamp with milliseconds
|
||||
# %n = timestamp with milliseconds (as a Unix epoch)
|
||||
# %i = command tag
|
||||
# %e = SQL state
|
||||
# %c = session ID
|
||||
# %l = session line number
|
||||
# %s = session start timestamp
|
||||
# %v = virtual transaction ID
|
||||
# %x = transaction ID (0 if none)
|
||||
# %q = stop here in non-session
|
||||
# processes
|
||||
# %% = '%'
|
||||
# e.g. '<%u%%%d> '
|
||||
#log_lock_waits = off # log lock waits >= deadlock_timeout
|
||||
#log_statement = 'none' # none, ddl, mod, all
|
||||
#log_replication_commands = off
|
||||
#log_temp_files = -1 # log temporary files equal or larger
|
||||
# than the specified size in kilobytes;
|
||||
# -1 disables, 0 logs all temp files
|
||||
log_timezone = 'Etc/UTC'
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# PROCESS TITLE
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
cluster_name = '12/main' # added to process titles if nonempty
|
||||
# (change requires restart)
|
||||
#update_process_title = on
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# STATISTICS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Query and Index Statistics Collector -
|
||||
|
||||
#track_activities = on
|
||||
#track_counts = on
|
||||
#track_io_timing = off
|
||||
#track_functions = none # none, pl, all
|
||||
#track_activity_query_size = 1024 # (change requires restart)
|
||||
stats_temp_directory = '/var/run/postgresql/12-main.pg_stat_tmp'
|
||||
|
||||
|
||||
# - Monitoring -
|
||||
|
||||
#log_parser_stats = off
|
||||
#log_planner_stats = off
|
||||
#log_executor_stats = off
|
||||
#log_statement_stats = off
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# AUTOVACUUM
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#autovacuum = on # Enable autovacuum subprocess? 'on'
|
||||
# requires track_counts to also be on.
|
||||
#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and
|
||||
# their durations, > 0 logs only
|
||||
# actions running at least this number
|
||||
# of milliseconds.
|
||||
#autovacuum_max_workers = 3 # max number of autovacuum subprocesses
|
||||
# (change requires restart)
|
||||
#autovacuum_naptime = 1min # time between autovacuum runs
|
||||
#autovacuum_vacuum_threshold = 50 # min number of row updates before
|
||||
# vacuum
|
||||
#autovacuum_analyze_threshold = 50 # min number of row updates before
|
||||
# analyze
|
||||
#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum
|
||||
#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze
|
||||
#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum
|
||||
# (change requires restart)
|
||||
#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age
|
||||
# before forced vacuum
|
||||
# (change requires restart)
|
||||
#autovacuum_vacuum_cost_delay = 2ms # default vacuum cost delay for
|
||||
# autovacuum, in milliseconds;
|
||||
# -1 means use vacuum_cost_delay
|
||||
#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for
|
||||
# autovacuum, -1 means use
|
||||
# vacuum_cost_limit
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# CLIENT CONNECTION DEFAULTS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Statement Behavior -
|
||||
|
||||
#client_min_messages = notice # values in order of decreasing detail:
|
||||
# debug5
|
||||
# debug4
|
||||
# debug3
|
||||
# debug2
|
||||
# debug1
|
||||
# log
|
||||
# notice
|
||||
# warning
|
||||
# error
|
||||
#search_path = '"$user", public' # schema names
|
||||
#row_security = on
|
||||
#default_tablespace = '' # a tablespace name, '' uses the default
|
||||
#temp_tablespaces = '' # a list of tablespace names, '' uses
|
||||
# only default tablespace
|
||||
#default_table_access_method = 'heap'
|
||||
#check_function_bodies = on
|
||||
#default_transaction_isolation = 'read committed'
|
||||
#default_transaction_read_only = off
|
||||
#default_transaction_deferrable = off
|
||||
#session_replication_role = 'origin'
|
||||
#statement_timeout = 0 # in milliseconds, 0 is disabled
|
||||
#lock_timeout = 0 # in milliseconds, 0 is disabled
|
||||
#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled
|
||||
#vacuum_freeze_min_age = 50000000
|
||||
#vacuum_freeze_table_age = 150000000
|
||||
#vacuum_multixact_freeze_min_age = 5000000
|
||||
#vacuum_multixact_freeze_table_age = 150000000
|
||||
#vacuum_cleanup_index_scale_factor = 0.1 # fraction of total number of tuples
|
||||
# before index cleanup, 0 always performs
|
||||
# index cleanup
|
||||
#bytea_output = 'hex' # hex, escape
|
||||
#xmlbinary = 'base64'
|
||||
#xmloption = 'content'
|
||||
#gin_fuzzy_search_limit = 0
|
||||
#gin_pending_list_limit = 4MB
|
||||
|
||||
# - Locale and Formatting -
|
||||
|
||||
datestyle = 'iso, mdy'
|
||||
#intervalstyle = 'postgres'
|
||||
timezone = 'Etc/UTC'
|
||||
#timezone_abbreviations = 'Default' # Select the set of available time zone
|
||||
# abbreviations. Currently, there are
|
||||
# Default
|
||||
# Australia (historical usage)
|
||||
# India
|
||||
# You can create your own file in
|
||||
# share/timezonesets/.
|
||||
#extra_float_digits = 1 # min -15, max 3; any value >0 actually
|
||||
# selects precise output mode
|
||||
#client_encoding = sql_ascii # actually, defaults to database
|
||||
# encoding
|
||||
|
||||
# These settings are initialized by initdb, but they can be changed.
|
||||
lc_messages = 'C.UTF-8' # locale for system error message
|
||||
# strings
|
||||
lc_monetary = 'C.UTF-8' # locale for monetary formatting
|
||||
lc_numeric = 'C.UTF-8' # locale for number formatting
|
||||
lc_time = 'C.UTF-8' # locale for time formatting
|
||||
|
||||
# default configuration for text search
|
||||
default_text_search_config = 'pg_catalog.english'
|
||||
|
||||
# - Shared Library Preloading -
|
||||
|
||||
#shared_preload_libraries = '' # (change requires restart)
|
||||
#local_preload_libraries = ''
|
||||
#session_preload_libraries = ''
|
||||
#jit_provider = 'llvmjit' # JIT library to use
|
||||
|
||||
# - Other Defaults -
|
||||
|
||||
#dynamic_library_path = '$libdir'
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# LOCK MANAGEMENT
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#deadlock_timeout = 1s
|
||||
#max_locks_per_transaction = 64 # min 10
|
||||
# (change requires restart)
|
||||
#max_pred_locks_per_transaction = 64 # min 10
|
||||
# (change requires restart)
|
||||
#max_pred_locks_per_relation = -2 # negative values mean
|
||||
# (max_pred_locks_per_transaction
|
||||
# / -max_pred_locks_per_relation) - 1
|
||||
#max_pred_locks_per_page = 2 # min 0
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# VERSION AND PLATFORM COMPATIBILITY
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# - Previous PostgreSQL Versions -
|
||||
|
||||
#array_nulls = on
|
||||
#backslash_quote = safe_encoding # on, off, or safe_encoding
|
||||
#escape_string_warning = on
|
||||
#lo_compat_privileges = off
|
||||
#operator_precedence_warning = off
|
||||
#quote_all_identifiers = off
|
||||
#standard_conforming_strings = on
|
||||
#synchronize_seqscans = on
|
||||
|
||||
# - Other Platforms and Clients -
|
||||
|
||||
#transform_null_equals = off
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# ERROR HANDLING
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#exit_on_error = off # terminate session on any error?
|
||||
#restart_after_crash = on # reinitialize after backend crash?
|
||||
#data_sync_retry = off # retry or panic on failure to fsync
|
||||
# data?
|
||||
# (change requires restart)
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# CONFIG FILE INCLUDES
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# These options allow settings to be loaded from files other than the
|
||||
# default postgresql.conf. Note that these are directives, not variable
|
||||
# assignments, so they can usefully be given more than once.
|
||||
|
||||
include_dir = 'conf.d' # include files ending in '.conf' from
|
||||
# a directory, e.g., 'conf.d'
|
||||
#include_if_exists = '...' # include file only if it exists
|
||||
#include = '...' # include file
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# CUSTOMIZED OPTIONS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Add settings for extensions here
|
||||
listen_addresses = '*'
|
||||
port = 5432
|
||||
wal_level = hot_standby
|
||||
max_wal_senders = 10
|
||||
wal_keep_segments = 250
|
||||
superuser_reserved_connections= 10
|
||||
min_wal_size =2048MB
|
||||
max_wal_size= 4GB
|
||||
wal_keep_segments= 64
|
||||
hot_standby = on
|
||||
listen_addresses = '*'
|
||||
shared_buffers = 500MB
|
||||
work_mem = 16MB
|
||||
maintenance_work_mem = 128MB
|
||||
wal_buffers = 1MB
|
||||
random_page_cost = 2.0
|
||||
xmloption = 'document'
|
||||
max_parallel_maintenance_workers = 2
|
||||
max_parallel_workers = 4
|
||||
checkpoint_timeout = 30min
|
||||
#archive_mode=on
|
||||
#archive_command = 'test ! -f /opt/archivedir/%f && cp -r %p /opt/archivedir/%f'
|
||||
primary_conninfo = 'host= port=5432 user=replicator password=replicator sslmode=require'
|
||||
recovery_target_timeline=latest
|
||||
recovery_target_action=promote
|
||||
promote_trigger_file = '/tmp/pg_promote_master'
|
||||
|
||||
ssl = true
|
||||
ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
|
||||
ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
|
||||
@ -1,27 +0,0 @@
|
||||
[basic]
|
||||
template_file=certificate_template.xlsx
|
||||
doc_file=certificate_[zekken_number].xlsx
|
||||
sections=section1
|
||||
maxcol=10
|
||||
column_width=3,5,16,16,16,20,16,8,8,12,3
|
||||
output_path=media/reports/[event_code]
|
||||
|
||||
[section1]
|
||||
template_sheet=certificate
|
||||
sheet_name=certificate
|
||||
groups=group1,group2
|
||||
fit_to_width=1
|
||||
orientation=portrait
|
||||
|
||||
[section1.group1]
|
||||
table_name=mv_entry_details
|
||||
where=zekken_number='[zekken_number]' and event_name='[event_code]'
|
||||
group_range=A1:K15
|
||||
|
||||
|
||||
[section1.group2]
|
||||
table_name=v_checkins_locations
|
||||
where=zekken_number='[zekken_number]' and event_code='[event_code]'
|
||||
sort=path_order
|
||||
group_range=A16:J16
|
||||
|
||||
Binary file not shown.
@ -1,3 +1,5 @@
|
||||
version: "3.9"
|
||||
|
||||
services:
|
||||
postgres-db:
|
||||
image: kartoza/postgis:12.0
|
||||
@ -6,26 +8,11 @@ services:
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql
|
||||
- ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
- ./rogaining.sql:/sql/rogaining.sql
|
||||
- ./sqls:/sqls
|
||||
- ./create_location2025_table.sql:/sql/create_location2025_table.sql
|
||||
environment:
|
||||
- POSTGRES_USER=${POSTGRES_USER}
|
||||
- POSTGRES_PASS=${POSTGRES_PASS}
|
||||
- POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
- POSTGRES_MAX_CONNECTIONS=600
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
memory: 2G
|
||||
reservations:
|
||||
memory: 1G
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DBNAME}"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 5
|
||||
start_period: 30s
|
||||
restart: "on-failure"
|
||||
networks:
|
||||
- rog-api
|
||||
@ -34,23 +21,16 @@ services:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.gdal
|
||||
command: bash -c "./wait-for-postgres.sh postgres-db && gunicorn config.wsgi:application --bind 0.0.0.0:8000"
|
||||
command: gunicorn config.wsgi:application --bind 0.0.0.0:8000
|
||||
volumes:
|
||||
- .:/app
|
||||
- static_volume:/app/static
|
||||
- media_volume:/app/media
|
||||
env_file:
|
||||
- .env
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "python -c \"import urllib.request; urllib.request.urlopen('http://localhost:8000')\" || exit 1"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
restart: "on-failure"
|
||||
depends_on:
|
||||
postgres-db:
|
||||
condition: service_healthy
|
||||
- postgres-db
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
@ -60,7 +40,6 @@ services:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||
- static_volume:/app/static
|
||||
- media_volume:/app/media
|
||||
- ./supervisor/html:/usr/share/nginx/html
|
||||
ports:
|
||||
- 8100:80
|
||||
depends_on:
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
services:
|
||||
postgres-db:
|
||||
image: kartoza/postgis:12.0
|
||||
ports:
|
||||
- 5432:5432
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql
|
||||
- ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
- ./rogaining.sql:/sql/rogaining.sql
|
||||
- ./sqls:/sqls
|
||||
- ./create_location2025_table.sql:/sql/create_location2025_table.sql
|
||||
environment:
|
||||
- POSTGRES_USER=${POSTGRES_USER}
|
||||
- POSTGRES_PASS=${POSTGRES_PASS}
|
||||
- POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
- POSTGRES_MAX_CONNECTIONS=600
|
||||
restart: "no"
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
app:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.gdal
|
||||
command: bash -c "./wait-for-postgres.sh postgres-db && python manage.py migrate && gunicorn config.wsgi:application --bind 0.0.0.0:8000"
|
||||
volumes:
|
||||
- .:/app
|
||||
- static_volume:/app/static
|
||||
- media_volume:/app/media
|
||||
env_file:
|
||||
- .env
|
||||
restart: "no"
|
||||
depends_on:
|
||||
- postgres-db
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
nginx:
|
||||
image: nginx:1.19
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||
- static_volume:/app/static
|
||||
- media_volume:/app/media
|
||||
- ./supervisor/html:/usr/share/nginx/html
|
||||
ports:
|
||||
- 8100:80
|
||||
restart: "no"
|
||||
depends_on:
|
||||
- app
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
networks:
|
||||
rog-api:
|
||||
driver: bridge
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
static_volume:
|
||||
media_volume:
|
||||
@ -1,13 +1,32 @@
|
||||
version: "3.9"
|
||||
|
||||
services:
|
||||
# postgres-db:
|
||||
# image: kartoza/postgis:12.0
|
||||
# ports:
|
||||
# - 5432:5432
|
||||
# volumes:
|
||||
# - postgres_data:/var/lib/postgresql
|
||||
# - ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
# environment:
|
||||
# - POSTGRES_USER=${POSTGRES_USER}
|
||||
# - POSTGRES_PASS=${POSTGRES_PASS}
|
||||
# - POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
# - POSTGRES_MAX_CONNECTIONS=600
|
||||
|
||||
# restart: "on-failure"
|
||||
# networks:
|
||||
# - rog-api
|
||||
|
||||
api:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.gdal
|
||||
# command: python3 manage.py runserver 0.0.0.0:8100
|
||||
command: python3 manage.py runserver 0.0.0.0:8100
|
||||
volumes:
|
||||
- .:/app
|
||||
ports:
|
||||
- 8000:8000
|
||||
- 8100:8100
|
||||
env_file:
|
||||
- .env
|
||||
restart: "on-failure"
|
||||
@ -38,7 +57,7 @@ services:
|
||||
source: ./media
|
||||
target: /usr/share/nginx/html/media
|
||||
ports:
|
||||
- "8100:8100"
|
||||
- "80:80"
|
||||
depends_on:
|
||||
- api
|
||||
networks:
|
||||
@ -1,82 +0,0 @@
|
||||
version: "3.9"
|
||||
|
||||
x-shared-env:
|
||||
# Django settings
|
||||
&shared_env
|
||||
- POSTGRES_USER=${POSTGRES_USER}
|
||||
- POSTGRES_PASS=${POSTGRES_PASS}
|
||||
- POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
- DATABASE=#{DATABASE}
|
||||
- PG_HOST=${PG_HOST}
|
||||
- PG_PORT=${PG_PORT}
|
||||
- GS_VERSION=${GS_VERSION}
|
||||
- GEOSERVER_PORT=${GEOSERVER_PORT}
|
||||
- GEOSERVER_DATA_DIR=${GEOSERVER_DATA_DIR}
|
||||
- GEOWEBCACHE_CACHE_DIR=${GEOWEBCACHE_CACHE_DIR}
|
||||
- GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD}
|
||||
- GEOSERVER_ADMIN_USER=${GEOSERVER_ADMIN_USER}
|
||||
- INITIAL_MEMORY=${INITIAL_MEMORY}
|
||||
- MAXIMUM_MEMORY=${MAXIMUM_MEMORY}
|
||||
- SECRET_KEY=${SECRET_KEY}
|
||||
- DEBUG=${DEBUG}
|
||||
- ALLOWED_HOSTS=${ALLOWED_HOSTS}
|
||||
- S3_REGION=${S3_REGION}
|
||||
- S3_BUCKET_NAME=${S3_BUCKET_NAME}
|
||||
- S3_PREFIX=#{S3_PREFIX}
|
||||
- AWS_ACCESS_KEY=${AWS_ACCESS_KEY}
|
||||
- AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
|
||||
- AWS_REGION=${AWS_REGION}
|
||||
|
||||
|
||||
services:
|
||||
postgres-db:
|
||||
image: kartoza/postgis:12.0
|
||||
ports:
|
||||
- 5432:5432
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql
|
||||
- ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
- ./rogaining.sql:/sql/rogaining.sql
|
||||
environment: *shared_env
|
||||
restart: "on-failure"
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
app:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.gdal
|
||||
command: gunicorn config.wsgi:application --bind 0.0.0.0:8000
|
||||
volumes:
|
||||
- .:/app
|
||||
- static_volume:/app/static
|
||||
- media_volume:/app/media
|
||||
environment: *shared_env
|
||||
restart: "on-failure"
|
||||
depends_on:
|
||||
- postgres-db
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
nginx:
|
||||
image: nginx:1.19
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||
- static_volume:/app/static
|
||||
- media_volume:/app/media
|
||||
ports:
|
||||
- 8100:80
|
||||
environment: *shared_env
|
||||
depends_on:
|
||||
- app
|
||||
networks:
|
||||
- rog-api
|
||||
|
||||
networks:
|
||||
rog-api:
|
||||
driver: bridge
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
static_volume:
|
||||
media_volume:
|
||||
@ -1,22 +1,22 @@
|
||||
version: "3.9"
|
||||
|
||||
services:
|
||||
postgres-db:
|
||||
image: kartoza/postgis:12.0
|
||||
ports:
|
||||
- 5432:5432
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql
|
||||
- ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
environment:
|
||||
- POSTGRES_USER=${POSTGRES_USER}
|
||||
- POSTGRES_PASS=${POSTGRES_PASS}
|
||||
- POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
- POSTGRES_MAX_CONNECTIONS=600
|
||||
# postgres-db:
|
||||
# image: kartoza/postgis:12.0
|
||||
# ports:
|
||||
# - 5432:5432
|
||||
# volumes:
|
||||
# - postgres_data:/var/lib/postgresql
|
||||
# - ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
# environment:
|
||||
# - POSTGRES_USER=${POSTGRES_USER}
|
||||
# - POSTGRES_PASS=${POSTGRES_PASS}
|
||||
# - POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
# - POSTGRES_MAX_CONNECTIONS=600
|
||||
|
||||
restart: "on-failure"
|
||||
networks:
|
||||
- rog-api
|
||||
# restart: "on-failure"
|
||||
# networks:
|
||||
# - rog-api
|
||||
|
||||
api:
|
||||
build:
|
||||
|
||||
@ -1 +0,0 @@
|
||||
docker-compose-prod.yaml
|
||||
@ -1,17 +0,0 @@
|
||||
services:
|
||||
postgres-db:
|
||||
image: kartoza/postgis
|
||||
ports:
|
||||
- 5432:5432
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql
|
||||
- ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
|
||||
- ./rogaining.sql:/sql/rogaining.sql
|
||||
environment:
|
||||
- POSTGRES_USER=${POSTGRES_USER}
|
||||
- POSTGRES_PASS=${POSTGRES_PASS}
|
||||
- POSTGRES_DBNAME=${POSTGRES_DBNAME}
|
||||
- POSTGRES_MAX_CONNECTIONS=600
|
||||
restart: "on-failure"
|
||||
volumes:
|
||||
postgres_data:
|
||||
@ -1,59 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
外部スクリプトからDBコンテナに接続するサンプル
|
||||
"""
|
||||
import os
|
||||
import psycopg2
|
||||
from psycopg2.extras import DictCursor
|
||||
|
||||
# 環境変数から接続情報を取得
|
||||
DB_CONFIG = {
|
||||
'host': os.getenv('PG_HOST', 'localhost'),
|
||||
'port': os.getenv('PG_PORT', '5432'),
|
||||
'database': os.getenv('POSTGRES_DBNAME', 'rogdb'),
|
||||
'user': os.getenv('POSTGRES_USER', 'admin'),
|
||||
'password': os.getenv('POSTGRES_PASS', 'admin123456')
|
||||
}
|
||||
|
||||
def connect_to_db():
|
||||
"""データベースに接続"""
|
||||
try:
|
||||
conn = psycopg2.connect(**DB_CONFIG)
|
||||
print(f"✅ データベースに接続成功: {DB_CONFIG['host']}:{DB_CONFIG['port']}")
|
||||
return conn
|
||||
except psycopg2.Error as e:
|
||||
print(f"❌ データベース接続エラー: {e}")
|
||||
return None
|
||||
|
||||
def test_connection():
|
||||
"""接続テスト"""
|
||||
conn = connect_to_db()
|
||||
if conn:
|
||||
try:
|
||||
with conn.cursor(cursor_factory=DictCursor) as cur:
|
||||
cur.execute("SELECT version();")
|
||||
version = cur.fetchone()
|
||||
print(f"PostgreSQL バージョン: {version[0]}")
|
||||
|
||||
# テーブル一覧を取得
|
||||
cur.execute("""
|
||||
SELECT tablename FROM pg_tables
|
||||
WHERE schemaname = 'public'
|
||||
ORDER BY tablename;
|
||||
""")
|
||||
tables = cur.fetchall()
|
||||
print(f"テーブル数: {len(tables)}")
|
||||
for table in tables[:5]: # 最初の5個を表示
|
||||
print(f" - {table[0]}")
|
||||
|
||||
except psycopg2.Error as e:
|
||||
print(f"❌ クエリ実行エラー: {e}")
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
if __name__ == "__main__":
|
||||
print("=== データベース接続テスト ===")
|
||||
print(f"接続先: {DB_CONFIG['host']}:{DB_CONFIG['port']}")
|
||||
print(f"データベース: {DB_CONFIG['database']}")
|
||||
print(f"ユーザー: {DB_CONFIG['user']}")
|
||||
test_connection()
|
||||
@ -1,146 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
# プロジェクト設定
|
||||
sys.path.append('/app')
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection, transaction
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def assign_zekken_numbers_to_fc_gifu():
|
||||
"""FC岐阜イベント（ID:10）のチームにゼッケン番号を割り当て"""
|
||||
|
||||
print("=== FC岐阜イベントチームゼッケン番号割り当て ===")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
# 1. FC岐阜イベントの現状確認
|
||||
print("\n1. FC岐阜イベント（ID:10）現状確認:")
|
||||
cursor.execute("""
|
||||
SELECT t.id, t.team_name, t.zekken_number, t.event_id
|
||||
FROM rog_team t
|
||||
JOIN rog_entry e ON t.id = e.team_id
|
||||
WHERE e.event_id = 10
|
||||
ORDER BY t.id;
|
||||
""")
|
||||
fc_teams = cursor.fetchall()
|
||||
|
||||
print(f" FC岐阜関連チーム数: {len(fc_teams)}")
|
||||
print(" 現在の状況:")
|
||||
for team in fc_teams[:5]: # 最初の5件のみ表示
|
||||
print(f" Team ID:{team[0]}, Name:{team[1]}, Zekken:{team[2]}, Event:{team[3]}")
|
||||
|
||||
# 2. ゼッケン番号が未設定のチームを特定
|
||||
teams_without_zekken = [team for team in fc_teams if not team[2]]
|
||||
print(f"\n ゼッケン番号未設定チーム数: {len(teams_without_zekken)}")
|
||||
|
||||
if not teams_without_zekken:
|
||||
print(" 🎉 すべてのチームにゼッケン番号が設定済み")
|
||||
return
|
||||
|
||||
# 3. 既存のゼッケン番号を確認（競合回避）
|
||||
print("\n2. 既存ゼッケン番号確認:")
|
||||
cursor.execute("""
|
||||
SELECT zekken_number
|
||||
FROM rog_team
|
||||
WHERE zekken_number IS NOT NULL AND zekken_number != ''
|
||||
ORDER BY zekken_number;
|
||||
""")
|
||||
existing_zekkens = [row[0] for row in cursor.fetchall()]
|
||||
print(f" 既存ゼッケン番号: {existing_zekkens}")
|
||||
|
||||
# 4. ユーザー確認
|
||||
print(f"\n3. ゼッケン番号割り当て準備:")
|
||||
print(f" 対象チーム数: {len(teams_without_zekken)}")
|
||||
print(f" 割り当て予定ゼッケン番号: FC001-FC{len(teams_without_zekken):03d}")
|
||||
|
||||
confirm = input("\n ゼッケン番号を割り当てますか？ (y/N): ")
|
||||
if confirm.lower() != 'y':
|
||||
print(" 処理をキャンセルしました")
|
||||
return
|
||||
|
||||
# 5. ゼッケン番号割り当て実行
|
||||
print("\n4. ゼッケン番号割り当て実行:")
|
||||
with transaction.atomic():
|
||||
for i, team in enumerate(teams_without_zekken, 1):
|
||||
team_id = team[0]
|
||||
team_name = team[1]
|
||||
zekken_number = f"FC{i:03d}"
|
||||
|
||||
cursor.execute("""
|
||||
UPDATE rog_team
|
||||
SET zekken_number = %s, updated_at = NOW()
|
||||
WHERE id = %s;
|
||||
""", [zekken_number, team_id])
|
||||
|
||||
print(f" Team ID:{team_id} ({team_name}) → ゼッケン番号: {zekken_number}")
|
||||
|
||||
print(f"\n ✅ {len(teams_without_zekken)}チームにゼッケン番号を割り当てました")
|
||||
|
||||
# 6. 結果確認
|
||||
print("\n5. 割り当て結果確認:")
|
||||
cursor.execute("""
|
||||
SELECT t.id, t.team_name, t.zekken_number
|
||||
FROM rog_team t
|
||||
JOIN rog_entry e ON t.id = e.team_id
|
||||
WHERE e.event_id = 10 AND t.zekken_number IS NOT NULL
|
||||
ORDER BY t.zekken_number;
|
||||
""")
|
||||
updated_teams = cursor.fetchall()
|
||||
|
||||
print(f" ゼッケン番号付きチーム数: {len(updated_teams)}")
|
||||
print(" 割り当て結果（サンプル）:")
|
||||
for team in updated_teams[:10]:
|
||||
print(f" {team[2]}: {team[1]} (ID:{team[0]})")
|
||||
|
||||
# 7. 通過審査管理画面での影響確認
|
||||
print("\n6. 通過審査管理画面への影響:")
|
||||
print(" これで通過審査管理画面で以下が表示されるはずです:")
|
||||
print(" - ALL（全参加者）")
|
||||
for team in updated_teams[:5]:
|
||||
print(f" - {team[2]}（{team[1]}）")
|
||||
print(" - ...")
|
||||
|
||||
def reset_zekken_numbers():
|
||||
"""FC岐阜イベントのゼッケン番号をリセット（テスト用）"""
|
||||
print("\n=== ゼッケン番号リセット（テスト用） ===")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
confirm = input("FC岐阜イベントのゼッケン番号をリセットしますか？ (y/N): ")
|
||||
if confirm.lower() != 'y':
|
||||
print("リセットをキャンセルしました")
|
||||
return
|
||||
|
||||
with transaction.atomic():
|
||||
cursor.execute("""
|
||||
UPDATE rog_team
|
||||
SET zekken_number = NULL, updated_at = NOW()
|
||||
WHERE id IN (
|
||||
SELECT DISTINCT t.id
|
||||
FROM rog_team t
|
||||
JOIN rog_entry e ON t.id = e.team_id
|
||||
WHERE e.event_id = 10
|
||||
);
|
||||
""")
|
||||
|
||||
affected_rows = cursor.rowcount
|
||||
print(f"✅ {affected_rows}チームのゼッケン番号をリセットしました")
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
import sys
|
||||
if len(sys.argv) > 1 and sys.argv[1] == '--reset':
|
||||
reset_zekken_numbers()
|
||||
else:
|
||||
assign_zekken_numbers_to_fc_gifu()
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,140 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
# プロジェクト設定
|
||||
sys.path.append('/app')
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
def investigate_team_table_structure():
|
||||
"""チームテーブルの構造とFC岐阜問題を調査"""
|
||||
|
||||
print("=== Team テーブル構造とFC岐阜問題調査 ===")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
# 1. rog_teamテーブルの構造確認
|
||||
print("\n1. rog_teamテーブル構造:")
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_team'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
columns = cursor.fetchall()
|
||||
for col in columns:
|
||||
print(f" - {col[0]}: {col[1]} ({'NULL' if col[2] == 'YES' else 'NOT NULL'})")
|
||||
|
||||
# 2. rog_teamテーブルの総件数
|
||||
print("\n2. rog_teamテーブルの状況:")
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_team;")
|
||||
total_teams = cursor.fetchone()[0]
|
||||
print(f" 総チーム数: {total_teams}")
|
||||
|
||||
# 3. FC岐阜イベント（ID:10）の詳細調査
|
||||
print("\n3. FC岐阜イベント（ID:10）詳細調査:")
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_entry WHERE event_id = 10;")
|
||||
fc_entries = cursor.fetchone()[0]
|
||||
print(f" FC岐阜イベントエントリー数: {fc_entries}")
|
||||
|
||||
# 4. FC岐阜エントリーのサンプル表示
|
||||
print("\n4. FC岐阜エントリーサンプル:")
|
||||
cursor.execute("""
|
||||
SELECT id, team_id, event_id, date
|
||||
FROM rog_entry
|
||||
WHERE event_id = 10
|
||||
LIMIT 10;
|
||||
""")
|
||||
fc_entry_samples = cursor.fetchall()
|
||||
for entry in fc_entry_samples:
|
||||
print(f" Entry ID:{entry[0]}, Team ID:{entry[1]}, Event ID:{entry[2]}, Date:{entry[3]}")
|
||||
|
||||
# 5. FC岐阜エントリーのteam_idを調べる
|
||||
print("\n5. FC岐阜エントリーのteam_id分析:")
|
||||
cursor.execute("""
|
||||
SELECT team_id, COUNT(*) as count
|
||||
FROM rog_entry
|
||||
WHERE event_id = 10
|
||||
GROUP BY team_id
|
||||
ORDER BY count DESC;
|
||||
""")
|
||||
team_id_stats = cursor.fetchall()
|
||||
for stat in team_id_stats:
|
||||
print(f" Team ID:{stat[0]}, エントリー数:{stat[1]}")
|
||||
|
||||
# 6. 実際のteam_idでチーム情報を確認
|
||||
print("\n6. 実際のチーム情報確認:")
|
||||
if team_id_stats:
|
||||
sample_team_ids = [stat[0] for stat in team_id_stats[:5]]
|
||||
for team_id in sample_team_ids:
|
||||
cursor.execute("SELECT * FROM rog_team WHERE id = %s;", [team_id])
|
||||
team_info = cursor.fetchone()
|
||||
if team_info:
|
||||
print(f" Team ID:{team_id} 存在する: {team_info}")
|
||||
else:
|
||||
print(f" Team ID:{team_id} 存在しない")
|
||||
|
||||
# 7. ゼッケン番号付きチームの確認（実際のカラム名を使用）
|
||||
print("\n7. ゼッケン番号関連調査:")
|
||||
if 'zekken_number' in [col[0] for col in columns]:
|
||||
cursor.execute("""
|
||||
SELECT COUNT(*)
|
||||
FROM rog_team
|
||||
WHERE zekken_number IS NOT NULL AND zekken_number != '';
|
||||
""")
|
||||
zekken_count = cursor.fetchone()[0]
|
||||
print(f" ゼッケン番号付きチーム数: {zekken_count}")
|
||||
|
||||
if zekken_count > 0:
|
||||
cursor.execute("""
|
||||
SELECT id, zekken_number, event_id
|
||||
FROM rog_team
|
||||
WHERE zekken_number IS NOT NULL AND zekken_number != ''
|
||||
LIMIT 10;
|
||||
""")
|
||||
zekken_teams = cursor.fetchall()
|
||||
print(" ゼッケン番号付きチームサンプル:")
|
||||
for team in zekken_teams:
|
||||
print(f" Team ID:{team[0]}, Zekken:{team[1]}, Event ID:{team[2]}")
|
||||
|
||||
# 8. 通過審査管理画面の問題の原因を特定
|
||||
print("\n8. 通過審査管理画面問題の分析:")
|
||||
print(" FC岐阜イベント（ID:10）について:")
|
||||
print(f" - エントリー数: {fc_entries}")
|
||||
print(f" - 関連チーム情報の確認が必要")
|
||||
|
||||
# 実際に存在するチームを探す
|
||||
if team_id_stats:
|
||||
existing_teams = []
|
||||
missing_teams = []
|
||||
for team_id, count in team_id_stats:
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_team WHERE id = %s;", [team_id])
|
||||
exists = cursor.fetchone()[0] > 0
|
||||
if exists:
|
||||
existing_teams.append((team_id, count))
|
||||
else:
|
||||
missing_teams.append((team_id, count))
|
||||
|
||||
print(f" - 存在するチーム: {len(existing_teams)}")
|
||||
print(f" - 存在しないチーム: {len(missing_teams)}")
|
||||
|
||||
if missing_teams:
|
||||
print(" 🔴 問題発見: エントリーが参照するチームが存在しない！")
|
||||
for team_id, count in missing_teams[:3]:
|
||||
print(f" Missing Team ID:{team_id} ({count}エントリー)")
|
||||
|
||||
if __name__ == "__main__":
|
||||
try:
|
||||
investigate_team_table_structure()
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,377 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への全イベントデータ移行スクリプト
|
||||
FC岐阜の成功事例をベースに全てのイベントのteam/member/entryを移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser, Member
|
||||
import psycopg2
|
||||
from collections import defaultdict
|
||||
|
||||
print("=== old_rogdb から 全イベントデータ移行 ===")
|
||||
|
||||
try:
|
||||
# old_rogdbに直接接続
|
||||
old_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='old_rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ old_rogdbに接続成功")
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
# === STEP 0: 移行対象イベントの確認 ===
|
||||
print("\\n=== STEP 0: 移行対象イベントの確認 ===")
|
||||
|
||||
# 新DBのイベント一覧を取得
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'event_name'))
|
||||
existing_event_ids = [event_id for event_id, _ in existing_events]
|
||||
|
||||
print(f"新DB既存イベント: {len(existing_events)}件")
|
||||
for event_id, event_name in existing_events[:10]:
|
||||
print(f" Event {event_id}: {event_name}")
|
||||
|
||||
# old_rogdbでエントリーがあるイベントを確認
|
||||
old_cursor.execute("""
|
||||
SELECT e.id, e.event_name, COUNT(re.id) as entry_count
|
||||
FROM rog_newevent2 e
|
||||
LEFT JOIN rog_entry re ON e.id = re.event_id
|
||||
WHERE e.id IN ({})
|
||||
GROUP BY e.id, e.event_name
|
||||
HAVING COUNT(re.id) > 0
|
||||
ORDER BY COUNT(re.id) DESC;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
events_with_entries = old_cursor.fetchall()
|
||||
print(f"\\n移行対象イベント（エントリーあり）: {len(events_with_entries)}件")
|
||||
for event_id, event_name, entry_count in events_with_entries:
|
||||
print(f" Event {event_id}: '{event_name}' - {entry_count}件のエントリー")
|
||||
|
||||
# === STEP 1: 全イベントのTeam & Member データ取得 ===
|
||||
print("\\n=== STEP 1: 全イベントの Team & Member データ取得 ===")
|
||||
|
||||
# 全イベントのチーム情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT DISTINCT rt.id, rt.team_name, rt.owner_id, rt.category_id,
|
||||
rc.category_name, cu.email, cu.firstname, cu.lastname, re.event_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON rt.category_id = rc.id
|
||||
LEFT JOIN rog_customuser cu ON rt.owner_id = cu.id
|
||||
WHERE re.event_id IN ({})
|
||||
ORDER BY re.event_id, rt.id;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
all_team_data = old_cursor.fetchall()
|
||||
print(f"全イベント関連チーム: {len(all_team_data)}件")
|
||||
|
||||
# イベント別チーム数統計
|
||||
teams_by_event = defaultdict(int)
|
||||
teams_by_event = defaultdict(int)
|
||||
for _, _, _, _, _, _, _, _, event_id in all_team_data:
|
||||
teams_by_event[event_id] += 1
|
||||
|
||||
print("\\nイベント別チーム数:")
|
||||
for event_id, count in sorted(teams_by_event.items()):
|
||||
event_name = next((name for eid, name in existing_events if eid == event_id), "不明")
|
||||
print(f" Event {event_id} ({event_name}): {count}チーム")
|
||||
|
||||
# 全イベントのメンバー情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT rm.team_id, rm.user_id, cu.email, cu.firstname, cu.lastname, re.event_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_member rm ON re.team_id = rm.team_id
|
||||
JOIN rog_customuser cu ON rm.user_id = cu.id
|
||||
WHERE re.event_id IN ({})
|
||||
ORDER BY re.event_id, rm.team_id, rm.user_id;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
all_member_data = old_cursor.fetchall()
|
||||
print(f"全イベント関連メンバー: {len(all_member_data)}件")
|
||||
|
||||
# === STEP 2: ユーザー移行 ===
|
||||
print("\\n=== STEP 2: ユーザー移行 ===")
|
||||
|
||||
# 関連するすべてのユーザーを取得
|
||||
all_user_ids = set()
|
||||
for _, _, owner_id, _, _, _, _, _, _ in all_team_data:
|
||||
if owner_id:
|
||||
all_user_ids.add(owner_id)
|
||||
for _, user_id, _, _, _, _ in all_member_data:
|
||||
all_user_ids.add(user_id)
|
||||
|
||||
if all_user_ids:
|
||||
# 大量のユーザーIDに対応するため、バッチで処理
|
||||
user_batches = [list(all_user_ids)[i:i+100] for i in range(0, len(all_user_ids), 100)]
|
||||
all_user_data = []
|
||||
user_batches = [list(all_user_ids)[i:i+100] for i in range(0, len(all_user_ids), 100)]
|
||||
all_user_data = []
|
||||
|
||||
for batch in user_batches:
|
||||
old_cursor.execute(f"""
|
||||
SELECT id, email, firstname, lastname, date_joined
|
||||
FROM rog_customuser
|
||||
WHERE id IN ({','.join(map(str, batch))})
|
||||
""")
|
||||
all_user_data.extend(old_cursor.fetchall())
|
||||
|
||||
print(f"移行対象ユーザー: {len(all_user_data)}件")
|
||||
|
||||
migrated_users = 0
|
||||
for user_id, email, first_name, last_name, date_joined in all_user_data:
|
||||
user, created = CustomUser.objects.get_or_create(
|
||||
id=user_id,
|
||||
defaults={
|
||||
'email': email or f'user{user_id}@example.com',
|
||||
'first_name': first_name or '',
|
||||
'last_name': last_name or '',
|
||||
'username': email or f'user{user_id}',
|
||||
'date_joined': date_joined,
|
||||
'is_active': True
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_users += 1
|
||||
if migrated_users <= 10: # 最初の10件のみ表示
|
||||
print(f" ユーザー作成: {email} ({first_name} {last_name})")
|
||||
|
||||
print(f"✅ ユーザー移行完了: {migrated_users}件作成")
|
||||
|
||||
# === STEP 3: カテゴリ移行 ===
|
||||
print("\\n=== STEP 3: カテゴリ移行 ===")
|
||||
|
||||
migrated_categories = 0
|
||||
unique_categories = set()
|
||||
unique_categories = set()
|
||||
for _, _, _, cat_id, cat_name, _, _, _, _ in all_team_data:
|
||||
if cat_id and cat_name:
|
||||
unique_categories.add((cat_id, cat_name))
|
||||
|
||||
for cat_id, cat_name in unique_categories:
|
||||
category, created = NewCategory.objects.get_or_create(
|
||||
id=cat_id,
|
||||
defaults={
|
||||
'category_name': cat_name,
|
||||
'category_number': cat_id
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_categories += 1
|
||||
print(f" カテゴリ作成: {cat_name}")
|
||||
|
||||
print(f"✅ カテゴリ移行完了: {migrated_categories}件作成")
|
||||
|
||||
# === STEP 4: イベント別チーム移行 ===
|
||||
print("\\n=== STEP 4: イベント別チーム移行 ===")
|
||||
|
||||
total_migrated_teams = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
print(f"\\n--- Event {event_id}: {event_name} ---")
|
||||
event_teams = [data for data in all_team_data if data[8] == event_id]
|
||||
event_migrated_teams = 0
|
||||
|
||||
for team_id, team_name, owner_id, cat_id, cat_name, email, first_name, last_name, _ in event_teams:
|
||||
try:
|
||||
# カテゴリを取得
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
|
||||
# チームを作成
|
||||
team, created = Team.objects.get_or_create(
|
||||
id=team_id,
|
||||
defaults={
|
||||
'team_name': team_name,
|
||||
'owner_id': owner_id or 1,
|
||||
'category': category,
|
||||
'event_id': event_id
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
event_migrated_teams += 1
|
||||
total_migrated_teams += 1
|
||||
if event_migrated_teams <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" チーム作成: {team_name} (ID: {team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ チーム作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_teams}件のチームを移行")
|
||||
|
||||
print(f"\\n✅ 全チーム移行完了: {total_migrated_teams}件作成")
|
||||
|
||||
# === STEP 5: メンバー移行 ===
|
||||
print("\\n=== STEP 5: メンバー移行 ===")
|
||||
|
||||
total_migrated_members = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
event_members = [data for data in all_member_data if data[5] == event_id]
|
||||
if not event_members:
|
||||
continue
|
||||
|
||||
print(f"\\n--- Event {event_id}: {event_name} ---")
|
||||
event_migrated_members = 0
|
||||
|
||||
for team_id, user_id, email, first_name, last_name, _ in event_members:
|
||||
try:
|
||||
# チームとユーザーを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
user = CustomUser.objects.get(id=user_id)
|
||||
|
||||
# メンバーを作成
|
||||
member, created = Member.objects.get_or_create(
|
||||
team=team,
|
||||
user=user
|
||||
)
|
||||
|
||||
if created:
|
||||
event_migrated_members += 1
|
||||
total_migrated_members += 1
|
||||
if event_migrated_members <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" メンバー追加: {email} → {team.team_name}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません")
|
||||
except CustomUser.DoesNotExist:
|
||||
print(f" ⚠️ ユーザー{user_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ メンバー追加エラー: {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_members}件のメンバーを移行")
|
||||
|
||||
print(f"\\n✅ 全メンバー移行完了: {total_migrated_members}件作成")
|
||||
|
||||
# === STEP 6: エントリー移行 ===
|
||||
print("\\n=== STEP 6: エントリー移行 ===")
|
||||
|
||||
# データベースのis_trialフィールドにデフォルト値を設定
|
||||
print("データベーステーブルのis_trialフィールドを修正中...")
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as django_cursor:
|
||||
try:
|
||||
django_cursor.execute("""
|
||||
ALTER TABLE rog_entry
|
||||
ALTER COLUMN is_trial SET DEFAULT FALSE;
|
||||
""")
|
||||
print(" ✅ is_trialフィールドにデフォルト値を設定")
|
||||
except Exception as e:
|
||||
print(f" ⚠️ is_trial修正エラー: {e}")
|
||||
|
||||
total_migrated_entries = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
print(f"\\n--- Event {event_id}: {event_name} ---")
|
||||
|
||||
# イベント別エントリーデータを取得
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id,
|
||||
rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = %s
|
||||
ORDER BY re.zekken_number;
|
||||
""", [event_id])
|
||||
|
||||
event_entry_data = old_cursor.fetchall()
|
||||
event_migrated_entries = 0
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name in event_entry_data:
|
||||
try:
|
||||
# チームとカテゴリを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
event_obj = NewEvent2.objects.get(id=event_id)
|
||||
|
||||
# 既存のエントリーをチェック
|
||||
existing_entry = Entry.objects.filter(team=team, event=event_obj).first()
|
||||
if existing_entry:
|
||||
continue
|
||||
|
||||
# SQLで直接エントリーを挿入
|
||||
with django_conn.cursor() as django_cursor:
|
||||
django_cursor.execute("""
|
||||
INSERT INTO rog_entry
|
||||
(date, category_id, event_id, owner_id, team_id, is_active,
|
||||
zekken_number, "hasGoaled", "hasParticipated", zekken_label,
|
||||
is_trial, staff_privileges, can_access_private_events, team_validation_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
|
||||
""", [
|
||||
event_obj.start_datetime, # date
|
||||
cat_id, # category_id
|
||||
event_id, # event_id
|
||||
owner_id or 1, # owner_id
|
||||
team_id, # team_id
|
||||
True, # is_active
|
||||
int(zekken) if zekken else 0, # zekken_number
|
||||
False, # hasGoaled
|
||||
False, # hasParticipated
|
||||
label or f"{event_name}-{zekken}", # zekken_label
|
||||
False, # is_trial
|
||||
False, # staff_privileges
|
||||
False, # can_access_private_events
|
||||
'approved' # team_validation_status
|
||||
])
|
||||
|
||||
event_migrated_entries += 1
|
||||
total_migrated_entries += 1
|
||||
if event_migrated_entries <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ❌ チーム{team_id}が見つかりません: {team_name}")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" ❌ イベント{event_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ エントリー作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_entries}件のエントリーを移行")
|
||||
|
||||
print(f"\\n✅ 全エントリー移行完了: {total_migrated_entries}件作成")
|
||||
|
||||
old_conn.close()
|
||||
|
||||
# === 最終確認 ===
|
||||
print("\\n=== 移行結果確認 ===")
|
||||
|
||||
total_teams = Team.objects.count()
|
||||
total_members = Member.objects.count()
|
||||
total_entries = Entry.objects.count()
|
||||
|
||||
print(f"総チーム数: {total_teams}件")
|
||||
print(f"総メンバー数: {total_members}件")
|
||||
print(f"総エントリー数: {total_entries}件")
|
||||
|
||||
# イベント別エントリー統計
|
||||
print("\\n=== イベント別エントリー統計 ===")
|
||||
for event_id, event_name in existing_events[:10]: # 最初の10件を表示
|
||||
entry_count = Entry.objects.filter(event_id=event_id).count()
|
||||
if entry_count > 0:
|
||||
print(f" {event_name}: {entry_count}件")
|
||||
|
||||
print("\\n🎉 全イベントデータ移行が完了しました！")
|
||||
print("🎯 通過審査管理画面で全てのイベントのゼッケン番号が表示されるようになります。")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,828 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への全イベントデータ移行スクリプト（GPS情報移行機能付き）
|
||||
FC岐阜の成功事例をベースに全てのイベントのteam/member/entryを移行
|
||||
さらに、gifurogeのgps_informationをrogdbのrog_checkinsに移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser, Member
|
||||
import psycopg2
|
||||
from collections import defaultdict
|
||||
from datetime import datetime, timedelta
|
||||
import pytz
|
||||
|
||||
print("=== old_rogdb から 全イベントデータ移行（GPS情報付き） ===")
|
||||
|
||||
# GPS情報移行用のヘルパー関数
|
||||
def load_event_dates_from_db():
|
||||
"""gifurogeのevent_tableからイベントコードと日付のマッピングを取得"""
|
||||
event_dates = {}
|
||||
try:
|
||||
# gifuroge データベースに接続
|
||||
conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='gifuroge',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
cursor = conn.cursor()
|
||||
# event_tableからイベントコードと開始日・終了日を取得
|
||||
cursor.execute("""
|
||||
SELECT event_code, event_day, end_day
|
||||
FROM event_table
|
||||
WHERE event_code IS NOT NULL AND event_day IS NOT NULL
|
||||
ORDER BY event_day
|
||||
""")
|
||||
|
||||
events = cursor.fetchall()
|
||||
for event_code, event_day, end_day in events:
|
||||
# デバッグ用：読み込まれた生データを表示
|
||||
print(f"🔍 生データ: {event_code} | event_day={event_day}({type(event_day)}) | end_day={end_day}({type(end_day)})")
|
||||
|
||||
# event_dayの日付フォーマットを統一（yyyy-mm-dd形式に変換）
|
||||
start_date = None
|
||||
end_date = None
|
||||
|
||||
# event_day（開始日）の処理
|
||||
if isinstance(event_day, str):
|
||||
if '/' in event_day:
|
||||
start_date = normalize_date_format(event_day.replace('/', '-'))
|
||||
elif '-' in event_day:
|
||||
start_date = normalize_date_format(event_day)
|
||||
else:
|
||||
date_part = event_day.split(' ')[0] if ' ' in event_day else event_day
|
||||
start_date = normalize_date_format(date_part.replace('/', '-'))
|
||||
else:
|
||||
start_date = normalize_date_format(event_day.strftime('%Y-%m-%d'))
|
||||
|
||||
# end_day（終了日）の処理
|
||||
if end_day:
|
||||
if isinstance(end_day, str):
|
||||
if '/' in end_day:
|
||||
end_date = normalize_date_format(end_day.replace('/', '-'))
|
||||
elif '-' in end_day:
|
||||
end_date = normalize_date_format(end_day)
|
||||
else:
|
||||
date_part = end_day.split(' ')[0] if ' ' in end_day else end_day
|
||||
end_date = normalize_date_format(date_part.replace('/', '-'))
|
||||
else:
|
||||
end_date = normalize_date_format(end_day.strftime('%Y-%m-%d'))
|
||||
else:
|
||||
# end_dayが設定されていない場合は、event_dayと同じ日とする
|
||||
end_date = start_date
|
||||
|
||||
# イベント期間情報を保存
|
||||
event_dates[event_code] = {
|
||||
'start_date': start_date,
|
||||
'end_date': end_date,
|
||||
'display_date': start_date # 主要な表示用日付
|
||||
}
|
||||
|
||||
conn.close()
|
||||
print(f"📅 event_tableから{len(event_dates)}件のイベント情報を読み込みました:")
|
||||
for code, date_info in event_dates.items():
|
||||
if date_info['start_date'] == date_info['end_date']:
|
||||
print(f" {code}: {date_info['start_date']}")
|
||||
else:
|
||||
print(f" {code}: {date_info['start_date']} - {date_info['end_date']}")
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ event_table読み込みエラー: {e}")
|
||||
# フォールバック用のデフォルト値
|
||||
event_dates = {
|
||||
'gifu2024': {'start_date': '2024-10-27', 'end_date': '2024-10-27', 'display_date': '2024-10-27'},
|
||||
'gifu2023': {'start_date': '2023-11-12', 'end_date': '2023-11-12', 'display_date': '2023-11-12'},
|
||||
'gifu2022': {'start_date': '2022-11-13', 'end_date': '2022-11-13', 'display_date': '2022-11-13'},
|
||||
'test2024': {'start_date': '2024-12-15', 'end_date': '2024-12-15', 'display_date': '2024-12-15'},
|
||||
'test2025': {'start_date': '2025-01-25', 'end_date': '2025-01-25', 'display_date': '2025-01-25'},
|
||||
'郡上': {'start_date': '2024-06-15', 'end_date': '2024-06-15', 'display_date': '2024-06-15'}
|
||||
}
|
||||
print(f"デフォルトのイベント日付を使用します: {len(event_dates)}件")
|
||||
|
||||
return event_dates
|
||||
|
||||
def get_event_date(event_code, event_dates_cache):
|
||||
"""イベントコードから日付を取得（キャッシュ使用）"""
|
||||
if event_code in event_dates_cache:
|
||||
return event_dates_cache[event_code]['display_date']
|
||||
|
||||
# 未知のイベントコードの場合、警告を出してデフォルト日付を返す
|
||||
print(f"⚠️ 未知のイベントコード '{event_code}' - デフォルト日付2024-01-01を使用")
|
||||
return '2024-01-01' # デフォルト日付
|
||||
|
||||
def normalize_date_format(date_str):
|
||||
"""日付文字列をyyyy-mm-dd形式に正規化"""
|
||||
try:
|
||||
# datetimeオブジェクトの場合
|
||||
if hasattr(date_str, 'strftime'):
|
||||
return date_str.strftime('%Y-%m-%d')
|
||||
|
||||
# 文字列の場合
|
||||
if isinstance(date_str, str):
|
||||
# スラッシュ区切りをハイフン区切りに変換
|
||||
if '/' in date_str:
|
||||
date_str = date_str.replace('/', '-')
|
||||
|
||||
# yyyy-m-d や yyyy-mm-d などを yyyy-mm-dd に正規化
|
||||
parts = date_str.split('-')
|
||||
if len(parts) == 3:
|
||||
year, month, day = parts
|
||||
return f"{year}-{month.zfill(2)}-{day.zfill(2)}"
|
||||
|
||||
return date_str
|
||||
except:
|
||||
return date_str
|
||||
|
||||
def is_within_event_period(gps_datetime, event_code, event_dates_cache):
|
||||
"""GPS記録の日時がイベント期間内かチェック"""
|
||||
if event_code not in event_dates_cache:
|
||||
return True # 未知のイベントの場合は通す
|
||||
|
||||
event_info = event_dates_cache[event_code]
|
||||
start_date = normalize_date_format(event_info['start_date'])
|
||||
end_date = normalize_date_format(event_info['end_date'])
|
||||
|
||||
try:
|
||||
# GPS記録の日付部分を取得して正規化
|
||||
gps_date = normalize_date_format(gps_datetime.strftime('%Y-%m-%d'))
|
||||
|
||||
# イベント期間内かチェック
|
||||
return start_date <= gps_date <= end_date
|
||||
except Exception as e:
|
||||
print(f"日付比較エラー: GPS={gps_datetime}, イベント={event_code}, エラー={e}")
|
||||
return True # エラーの場合は通す
|
||||
|
||||
def parse_goal_time(goal_time_str, event_date):
|
||||
"""ゴール時刻をパース"""
|
||||
if not goal_time_str or not event_date:
|
||||
return None
|
||||
|
||||
try:
|
||||
# HH:MM形式からdatetimeに変換
|
||||
time_parts = goal_time_str.split(':')
|
||||
if len(time_parts) == 2:
|
||||
hour, minute = int(time_parts[0]), int(time_parts[1])
|
||||
event_datetime = datetime.strptime(event_date, '%Y-%m-%d')
|
||||
goal_datetime = event_datetime.replace(hour=hour, minute=minute, second=0, microsecond=0)
|
||||
# JST timezone設定
|
||||
jst = pytz.timezone('Asia/Tokyo')
|
||||
return jst.localize(goal_datetime)
|
||||
except Exception as e:
|
||||
print(f"ゴール時刻パースエラー: {goal_time_str} - {e}")
|
||||
|
||||
return None
|
||||
|
||||
def convert_utc_to_jst(utc_datetime):
|
||||
"""UTC時刻をJSTに変換"""
|
||||
if not utc_datetime:
|
||||
return None
|
||||
|
||||
try:
|
||||
if isinstance(utc_datetime, str):
|
||||
utc_datetime = datetime.fromisoformat(utc_datetime.replace('Z', '+00:00'))
|
||||
|
||||
# UTCとして扱い、JSTに変換
|
||||
if utc_datetime.tzinfo is None:
|
||||
utc = pytz.UTC
|
||||
utc_datetime = utc.localize(utc_datetime)
|
||||
|
||||
jst = pytz.timezone('Asia/Tokyo')
|
||||
return utc_datetime.astimezone(jst)
|
||||
except Exception as e:
|
||||
print(f"時刻変換エラー: {utc_datetime} - {e}")
|
||||
return None
|
||||
|
||||
def migrate_gps_data():
|
||||
"""GPS情報をgifurogeからrogdbに移行"""
|
||||
print("\n=== GPS情報移行開始 ===")
|
||||
|
||||
# まず、イベント日付情報を読み込み
|
||||
event_dates_cache = load_event_dates_from_db()
|
||||
|
||||
try:
|
||||
# gifuroge データベースに接続
|
||||
gifuroge_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='gifuroge',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
# rogdb データベースに接続
|
||||
rogdb_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ GPS移行用データベース接続成功")
|
||||
|
||||
with gifuroge_conn.cursor() as source_cursor, rogdb_conn.cursor() as target_cursor:
|
||||
|
||||
# 既存のGPSチェックイン記録をクリア
|
||||
target_cursor.execute("DELETE FROM rog_gpscheckin;")
|
||||
print("既存のGPSチェックイン記録をクリアしました")
|
||||
|
||||
# GPS記録を取得（serial_number < 20000のみ、実際のGPS記録）
|
||||
source_cursor.execute("""
|
||||
SELECT serial_number, zekken_number, event_code, cp_number, create_at, goal_time
|
||||
FROM gps_information
|
||||
WHERE serial_number < 20000
|
||||
ORDER BY serial_number
|
||||
""")
|
||||
|
||||
gps_records = source_cursor.fetchall()
|
||||
print(f"移行対象GPS記録数: {len(gps_records)}件")
|
||||
|
||||
success_count = 0
|
||||
skip_count = 0
|
||||
error_count = 0
|
||||
event_stats = defaultdict(set)
|
||||
skip_stats = defaultdict(int) # スキップ統計
|
||||
skip_reasons = defaultdict(int) # スキップ理由別統計
|
||||
large_skip_events = set() # 大量スキップイベントの詳細分析用
|
||||
skip_date_ranges = defaultdict(list) # スキップされたGPS日付の範囲集計用
|
||||
|
||||
for record in gps_records:
|
||||
serial_number, zekken, event_code, cp_number, create_at, goal_time = record
|
||||
|
||||
try:
|
||||
# イベント日付取得（キャッシュから）
|
||||
event_date = get_event_date(event_code, event_dates_cache)
|
||||
# event_dateはNoneを返さなくなったので、この条件は不要だが安全のため残す
|
||||
if not event_date:
|
||||
# 時刻変換してGPS日付を取得
|
||||
jst_create_at = convert_utc_to_jst(create_at)
|
||||
gps_date = jst_create_at.strftime('%Y-%m-%d') if jst_create_at else 'N/A'
|
||||
print(f"⚠️ イベント日付取得失敗: {event_code} GPS日付:{gps_date}")
|
||||
skip_count += 1
|
||||
skip_stats[event_code] += 1
|
||||
skip_reasons["イベント日付取得失敗"] += 1
|
||||
continue
|
||||
|
||||
# 時刻変換
|
||||
jst_create_at = convert_utc_to_jst(create_at)
|
||||
jst_goal_time = parse_goal_time(goal_time, event_date) if goal_time else None
|
||||
|
||||
if not jst_create_at:
|
||||
print(f"時刻変換失敗: {serial_number}")
|
||||
error_count += 1
|
||||
skip_stats[event_code] += 1
|
||||
skip_reasons["時刻変換失敗"] += 1
|
||||
continue
|
||||
|
||||
# 未知のイベントコードの場合はGPS日付も表示
|
||||
if event_code not in event_dates_cache:
|
||||
gps_date = jst_create_at.strftime('%Y-%m-%d')
|
||||
print(f"⚠️ 未知のイベントコード '{event_code}' GPS日付:{gps_date} - デフォルト日付2024-01-01を使用")
|
||||
|
||||
# GPS記録がイベント期間内かチェック
|
||||
if not is_within_event_period(jst_create_at, event_code, event_dates_cache):
|
||||
# GPS日付を正規化（期間外スキップ用）
|
||||
gps_date = normalize_date_format(jst_create_at.strftime('%Y-%m-%d'))
|
||||
|
||||
# 大量スキップイベントの詳細分析
|
||||
should_show_detail = (skip_count < 10 or
|
||||
(event_code in ['各務原', '岐阜市', '養老ロゲ', '郡上', '大垣２', 'test下呂'] and
|
||||
skip_stats[event_code] < 5))
|
||||
|
||||
if should_show_detail:
|
||||
event_info = event_dates_cache.get(event_code, {})
|
||||
start_date = normalize_date_format(event_info.get('start_date', 'N/A'))
|
||||
end_date = normalize_date_format(event_info.get('end_date', 'N/A'))
|
||||
|
||||
# 600件超のイベントは特別扱い
|
||||
if event_code in ['各務原', '岐阜市', '養老ロゲ', '郡上', '大垣２', 'test下呂']:
|
||||
large_skip_events.add(event_code)
|
||||
print(f"🔍 大量スキップイベント詳細分析 - {event_code}:")
|
||||
print(f" イベントコード: {event_code}")
|
||||
print(f" GPS元時刻: {create_at}")
|
||||
print(f" GPS JST時刻: {jst_create_at}")
|
||||
print(f" GPS日付(正規化前): {jst_create_at.strftime('%Y-%m-%d')}")
|
||||
print(f" GPS日付(正規化後): {gps_date}")
|
||||
print(f" イベント開始日(正規化前): {event_info.get('start_date', 'N/A')}")
|
||||
print(f" イベント開始日(正規化後): {start_date}")
|
||||
print(f" イベント終了日(正規化前): {event_info.get('end_date', 'N/A')}")
|
||||
print(f" イベント終了日(正規化後): {end_date}")
|
||||
print(f" 比較結果: {start_date} <= {gps_date} <= {end_date}")
|
||||
print(f" 文字列比較1: '{start_date}' <= '{gps_date}' = {start_date <= gps_date}")
|
||||
print(f" 文字列比較2: '{gps_date}' <= '{end_date}' = {gps_date <= end_date}")
|
||||
print(f" 年差: GPS年={gps_date[:4]}, イベント年={start_date[:4]}")
|
||||
else:
|
||||
# デバッグ情報を追加
|
||||
print(f"🔍 デバッグ情報:")
|
||||
print(f" イベントコード: {event_code}")
|
||||
print(f" GPS元時刻: {create_at}")
|
||||
print(f" GPS JST時刻: {jst_create_at}")
|
||||
print(f" GPS日付(正規化前): {jst_create_at.strftime('%Y-%m-%d')}")
|
||||
print(f" GPS日付(正規化後): {gps_date}")
|
||||
print(f" イベント開始日(正規化前): {event_info.get('start_date', 'N/A')}")
|
||||
print(f" イベント開始日(正規化後): {start_date}")
|
||||
print(f" イベント終了日(正規化前): {event_info.get('end_date', 'N/A')}")
|
||||
print(f" イベント終了日(正規化後): {end_date}")
|
||||
print(f" 比較結果: {start_date} <= {gps_date} <= {end_date}")
|
||||
print(f" 文字列比較1: '{start_date}' <= '{gps_date}' = {start_date <= gps_date}")
|
||||
print(f" 文字列比較2: '{gps_date}' <= '{end_date}' = {gps_date <= end_date}")
|
||||
|
||||
print(f"期間外GPS記録スキップ: {event_code} GPS日付:{gps_date} イベント期間:{start_date}-{end_date}")
|
||||
|
||||
# 大量スキップイベントのGPS日付を記録
|
||||
if event_code in ['各務原', '岐阜市', '養老ロゲ', '郡上', '大垣２', 'test下呂']:
|
||||
skip_date_ranges[event_code].append(gps_date)
|
||||
|
||||
skip_count += 1
|
||||
skip_stats[event_code] += 1
|
||||
skip_reasons["期間外"] += 1
|
||||
continue
|
||||
|
||||
# チェックイン記録挿入
|
||||
target_cursor.execute("""
|
||||
INSERT INTO rog_gpscheckin (
|
||||
zekken, event_code, cp_number, checkin_time, record_time, serial_number
|
||||
) VALUES (%s, %s, %s, %s, %s, %s)
|
||||
""", (zekken, event_code, cp_number, jst_create_at, jst_create_at, str(serial_number)))
|
||||
|
||||
event_stats[event_code].add(zekken)
|
||||
success_count += 1
|
||||
|
||||
if success_count % 100 == 0:
|
||||
print(f"GPS移行進捗: {success_count}件完了")
|
||||
|
||||
except Exception as e:
|
||||
print(f"GPS移行エラー (Serial: {serial_number}): {e}")
|
||||
error_count += 1
|
||||
skip_stats[event_code] += 1
|
||||
skip_reasons["その他エラー"] += 1
|
||||
|
||||
# コミット
|
||||
rogdb_conn.commit()
|
||||
|
||||
print(f"\n✅ GPS移行完了:")
|
||||
print(f" 成功: {success_count}件")
|
||||
print(f" スキップ: {skip_count}件")
|
||||
print(f" エラー: {error_count}件")
|
||||
|
||||
# イベント別統計を表示
|
||||
print("\n=== イベント別GPS統計 ===")
|
||||
for event_code, zekken_set in event_stats.items():
|
||||
print(f" {event_code}: {len(zekken_set)}チーム")
|
||||
|
||||
# スキップ統計を表示
|
||||
print("\n=== スキップ統計（イベント別） ===")
|
||||
for event_code, skip_count_by_event in skip_stats.items():
|
||||
print(f" {event_code}: {skip_count_by_event}件スキップ")
|
||||
|
||||
# スキップ理由別統計を表示
|
||||
print("\n=== スキップ理由別統計 ===")
|
||||
for reason, count in skip_reasons.items():
|
||||
print(f" {reason}: {count}件")
|
||||
|
||||
# 大量スキップイベントの詳細分析結果
|
||||
if large_skip_events:
|
||||
print("\n=== 600件超大量スキップイベント分析結果 ===")
|
||||
for event_code in large_skip_events:
|
||||
total_skipped = skip_stats[event_code]
|
||||
event_info = event_dates_cache.get(event_code, {})
|
||||
|
||||
# スキップされたGPS日付の範囲を分析
|
||||
skipped_dates = skip_date_ranges.get(event_code, [])
|
||||
if skipped_dates:
|
||||
# 日付を昇順にソートしてユニーク化
|
||||
unique_dates = sorted(set(skipped_dates))
|
||||
date_range_start = unique_dates[0] if unique_dates else 'N/A'
|
||||
date_range_end = unique_dates[-1] if unique_dates else 'N/A'
|
||||
|
||||
# 年月日の分析
|
||||
year_counts = defaultdict(int)
|
||||
month_counts = defaultdict(int)
|
||||
for date_str in unique_dates:
|
||||
try:
|
||||
year = date_str[:4]
|
||||
month = date_str[:7] # YYYY-MM
|
||||
year_counts[year] += 1
|
||||
month_counts[month] += 1
|
||||
except:
|
||||
pass
|
||||
|
||||
print(f"📊 {event_code}:")
|
||||
print(f" 総スキップ数: {total_skipped}件")
|
||||
print(f" 設定イベント期間: {event_info.get('start_date', 'N/A')} - {event_info.get('end_date', 'N/A')}")
|
||||
|
||||
if skipped_dates:
|
||||
print(f" スキップされたGPS記録の期間: {date_range_start} ~ {date_range_end}")
|
||||
print(f" ユニークな日付数: {len(unique_dates)}日")
|
||||
|
||||
# 年別集計
|
||||
if year_counts:
|
||||
print(f" 年別GPS記録数:")
|
||||
for year in sorted(year_counts.keys()):
|
||||
print(f" {year}年: {year_counts[year]}日分の記録")
|
||||
|
||||
# 月別集計（上位5件）
|
||||
if month_counts:
|
||||
top_months = sorted(month_counts.items(), key=lambda x: x[1], reverse=True)[:5]
|
||||
print(f" 月別GPS記録数（上位5件）:")
|
||||
for month, count in top_months:
|
||||
print(f" {month}: {count}日分の記録")
|
||||
|
||||
print(f" 推測される問題: イベント期間設定が実際のGPS記録日付と大幅にずれている")
|
||||
print(f" 解決策: event_tableのevent_day/end_dayを実際のイベント開催日に修正する必要があります")
|
||||
print()
|
||||
|
||||
# 最終統計
|
||||
target_cursor.execute("SELECT COUNT(*) FROM rog_gpscheckin")
|
||||
total_gps_records = target_cursor.fetchone()[0]
|
||||
print(f"\n最終GPS記録数: {total_gps_records}件")
|
||||
|
||||
gifuroge_conn.close()
|
||||
rogdb_conn.close()
|
||||
|
||||
return success_count > 0
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ GPS移行エラー: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
return False
|
||||
|
||||
try:
|
||||
# old_rogdbに直接接続
|
||||
old_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='old_rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ old_rogdbに接続成功")
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
# === STEP 0: 移行対象イベントの確認 ===
|
||||
print("\n=== STEP 0: 移行対象イベントの確認 ===")
|
||||
|
||||
# 新DBのイベント一覧を取得
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'event_name'))
|
||||
existing_event_ids = [event_id for event_id, _ in existing_events]
|
||||
|
||||
print(f"新DB既存イベント: {len(existing_events)}件")
|
||||
for event_id, event_name in existing_events[:10]:
|
||||
print(f" Event {event_id}: {event_name}")
|
||||
|
||||
# old_rogdbでエントリーがあるイベントを確認
|
||||
old_cursor.execute("""
|
||||
SELECT e.id, e.event_name, COUNT(re.id) as entry_count
|
||||
FROM rog_newevent2 e
|
||||
LEFT JOIN rog_entry re ON e.id = re.event_id
|
||||
WHERE e.id IN ({})
|
||||
GROUP BY e.id, e.event_name
|
||||
HAVING COUNT(re.id) > 0
|
||||
ORDER BY COUNT(re.id) DESC;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
events_with_entries = old_cursor.fetchall()
|
||||
print(f"\n移行対象イベント（エントリーあり）: {len(events_with_entries)}件")
|
||||
for event_id, event_name, entry_count in events_with_entries:
|
||||
print(f" Event {event_id}: '{event_name}' - {entry_count}件のエントリー")
|
||||
|
||||
# === STEP 1: 全イベントのTeam & Member データ取得 ===
|
||||
print("\n=== STEP 1: 全イベントの Team & Member データ取得 ===")
|
||||
|
||||
# 全イベントのチーム情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT DISTINCT rt.id, rt.team_name, rt.owner_id, rt.category_id,
|
||||
rc.category_name, cu.email, cu.firstname, cu.lastname, re.event_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON rt.category_id = rc.id
|
||||
LEFT JOIN rog_customuser cu ON rt.owner_id = cu.id
|
||||
WHERE re.event_id IN ({})
|
||||
ORDER BY re.event_id, rt.id;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
all_team_data = old_cursor.fetchall()
|
||||
print(f"全イベント関連チーム: {len(all_team_data)}件")
|
||||
|
||||
# イベント別チーム数統計
|
||||
teams_by_event = defaultdict(int)
|
||||
for _, _, _, _, _, _, _, _, event_id in all_team_data:
|
||||
teams_by_event[event_id] += 1
|
||||
|
||||
print("\nイベント別チーム数:")
|
||||
for event_id, count in sorted(teams_by_event.items()):
|
||||
event_name = next((name for eid, name in existing_events if eid == event_id), "不明")
|
||||
print(f" Event {event_id} ({event_name}): {count}チーム")
|
||||
|
||||
# 全イベントのメンバー情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT rm.team_id, rm.user_id, cu.email, cu.firstname, cu.lastname, re.event_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_member rm ON re.team_id = rm.team_id
|
||||
JOIN rog_customuser cu ON rm.user_id = cu.id
|
||||
WHERE re.event_id IN ({})
|
||||
ORDER BY re.event_id, rm.team_id, rm.user_id;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
all_member_data = old_cursor.fetchall()
|
||||
print(f"全イベント関連メンバー: {len(all_member_data)}件")
|
||||
|
||||
# === STEP 2: ユーザー移行 ===
|
||||
print("\n=== STEP 2: ユーザー移行 ===")
|
||||
|
||||
# 関連するすべてのユーザーを取得
|
||||
all_user_ids = set()
|
||||
for _, _, owner_id, _, _, _, _, _, _ in all_team_data:
|
||||
if owner_id:
|
||||
all_user_ids.add(owner_id)
|
||||
for _, user_id, _, _, _, _ in all_member_data:
|
||||
all_user_ids.add(user_id)
|
||||
|
||||
if all_user_ids:
|
||||
# 大量のユーザーIDに対応するため、バッチで処理
|
||||
user_batches = [list(all_user_ids)[i:i+100] for i in range(0, len(all_user_ids), 100)]
|
||||
all_user_data = []
|
||||
|
||||
for batch in user_batches:
|
||||
old_cursor.execute(f"""
|
||||
SELECT id, email, firstname, lastname, date_joined
|
||||
FROM rog_customuser
|
||||
WHERE id IN ({','.join(map(str, batch))})
|
||||
""")
|
||||
all_user_data.extend(old_cursor.fetchall())
|
||||
|
||||
print(f"移行対象ユーザー: {len(all_user_data)}件")
|
||||
|
||||
migrated_users = 0
|
||||
for user_id, email, first_name, last_name, date_joined in all_user_data:
|
||||
user, created = CustomUser.objects.get_or_create(
|
||||
id=user_id,
|
||||
defaults={
|
||||
'email': email or f'user{user_id}@example.com',
|
||||
'first_name': first_name or '',
|
||||
'last_name': last_name or '',
|
||||
'username': email or f'user{user_id}',
|
||||
'date_joined': date_joined,
|
||||
'is_active': True
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_users += 1
|
||||
if migrated_users <= 10: # 最初の10件のみ表示
|
||||
print(f" ユーザー作成: {email} ({first_name} {last_name})")
|
||||
|
||||
print(f"✅ ユーザー移行完了: {migrated_users}件作成")
|
||||
|
||||
# === STEP 3: カテゴリ移行 ===
|
||||
print("\n=== STEP 3: カテゴリ移行 ===")
|
||||
|
||||
migrated_categories = 0
|
||||
unique_categories = set()
|
||||
for _, _, _, cat_id, cat_name, _, _, _, _ in all_team_data:
|
||||
if cat_id and cat_name:
|
||||
unique_categories.add((cat_id, cat_name))
|
||||
|
||||
for cat_id, cat_name in unique_categories:
|
||||
category, created = NewCategory.objects.get_or_create(
|
||||
id=cat_id,
|
||||
defaults={
|
||||
'category_name': cat_name,
|
||||
'category_number': cat_id
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_categories += 1
|
||||
print(f" カテゴリ作成: {cat_name}")
|
||||
|
||||
print(f"✅ カテゴリ移行完了: {migrated_categories}件作成")
|
||||
|
||||
# === STEP 4: イベント別チーム移行 ===
|
||||
print("\n=== STEP 4: イベント別チーム移行 ===")
|
||||
|
||||
total_migrated_teams = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
print(f"\n--- Event {event_id}: {event_name} ---")
|
||||
event_teams = [data for data in all_team_data if data[8] == event_id]
|
||||
event_migrated_teams = 0
|
||||
|
||||
for team_id, team_name, owner_id, cat_id, cat_name, email, first_name, last_name, _ in event_teams:
|
||||
try:
|
||||
# カテゴリを取得
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
|
||||
# チームを作成
|
||||
team, created = Team.objects.get_or_create(
|
||||
id=team_id,
|
||||
defaults={
|
||||
'team_name': team_name,
|
||||
'owner_id': owner_id or 1,
|
||||
'category': category,
|
||||
'event_id': event_id
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
event_migrated_teams += 1
|
||||
total_migrated_teams += 1
|
||||
if event_migrated_teams <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" チーム作成: {team_name} (ID: {team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ チーム作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_teams}件のチームを移行")
|
||||
|
||||
print(f"\n✅ 全チーム移行完了: {total_migrated_teams}件作成")
|
||||
|
||||
# === STEP 5: メンバー移行 ===
|
||||
print("\n=== STEP 5: メンバー移行 ===")
|
||||
|
||||
total_migrated_members = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
event_members = [data for data in all_member_data if data[5] == event_id]
|
||||
if not event_members:
|
||||
continue
|
||||
|
||||
print(f"\n--- Event {event_id}: {event_name} ---")
|
||||
event_migrated_members = 0
|
||||
|
||||
for team_id, user_id, email, first_name, last_name, _ in event_members:
|
||||
try:
|
||||
# チームとユーザーを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
user = CustomUser.objects.get(id=user_id)
|
||||
|
||||
# メンバーを作成
|
||||
member, created = Member.objects.get_or_create(
|
||||
team=team,
|
||||
user=user
|
||||
)
|
||||
|
||||
if created:
|
||||
event_migrated_members += 1
|
||||
total_migrated_members += 1
|
||||
if event_migrated_members <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" メンバー追加: {email} → {team.team_name}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません")
|
||||
except CustomUser.DoesNotExist:
|
||||
print(f" ⚠️ ユーザー{user_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ メンバー追加エラー: {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_members}件のメンバーを移行")
|
||||
|
||||
print(f"\n✅ 全メンバー移行完了: {total_migrated_members}件作成")
|
||||
|
||||
# === STEP 6: エントリー移行 ===
|
||||
print("\n=== STEP 6: エントリー移行 ===")
|
||||
|
||||
# データベースのis_trialフィールドにデフォルト値を設定
|
||||
print("データベーステーブルのis_trialフィールドを修正中...")
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as django_cursor:
|
||||
try:
|
||||
django_cursor.execute("""
|
||||
ALTER TABLE rog_entry
|
||||
ALTER COLUMN is_trial SET DEFAULT FALSE;
|
||||
""")
|
||||
print(" ✅ is_trialフィールドにデフォルト値を設定")
|
||||
except Exception as e:
|
||||
print(f" ⚠️ is_trial修正エラー: {e}")
|
||||
|
||||
total_migrated_entries = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
print(f"\n--- Event {event_id}: {event_name} ---")
|
||||
|
||||
# イベント別エントリーデータを取得
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id,
|
||||
rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = %s
|
||||
ORDER BY re.zekken_number;
|
||||
""", [event_id])
|
||||
|
||||
event_entry_data = old_cursor.fetchall()
|
||||
event_migrated_entries = 0
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name in event_entry_data:
|
||||
try:
|
||||
# チームとカテゴリを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
event_obj = NewEvent2.objects.get(id=event_id)
|
||||
|
||||
# 既存のエントリーをチェック
|
||||
existing_entry = Entry.objects.filter(team=team, event=event_obj).first()
|
||||
if existing_entry:
|
||||
continue
|
||||
|
||||
# SQLで直接エントリーを挿入
|
||||
with django_conn.cursor() as django_cursor:
|
||||
django_cursor.execute("""
|
||||
INSERT INTO rog_entry
|
||||
(date, category_id, event_id, owner_id, team_id, is_active,
|
||||
zekken_number, "hasGoaled", "hasParticipated", zekken_label,
|
||||
is_trial, staff_privileges, can_access_private_events, team_validation_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
|
||||
""", [
|
||||
event_obj.start_datetime, # date
|
||||
cat_id, # category_id
|
||||
event_id, # event_id
|
||||
owner_id or 1, # owner_id
|
||||
team_id, # team_id
|
||||
True, # is_active
|
||||
int(zekken) if zekken else 0, # zekken_number
|
||||
False, # hasGoaled
|
||||
False, # hasParticipated
|
||||
label or f"{event_name}-{zekken}", # zekken_label
|
||||
False, # is_trial
|
||||
False, # staff_privileges
|
||||
False, # can_access_private_events
|
||||
'approved' # team_validation_status
|
||||
])
|
||||
|
||||
event_migrated_entries += 1
|
||||
total_migrated_entries += 1
|
||||
if event_migrated_entries <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ❌ チーム{team_id}が見つかりません: {team_name}")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" ❌ イベント{event_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ エントリー作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_entries}件のエントリーを移行")
|
||||
|
||||
print(f"\n✅ 全エントリー移行完了: {total_migrated_entries}件作成")
|
||||
|
||||
old_conn.close()
|
||||
|
||||
# === STEP 7: GPS情報移行 ===
|
||||
print("\n=== STEP 7: GPS情報移行 ===")
|
||||
|
||||
gps_migration_success = migrate_gps_data()
|
||||
|
||||
if gps_migration_success:
|
||||
print("✅ GPS情報移行が正常に完了しました")
|
||||
else:
|
||||
print("⚠️ GPS情報移行中にエラーが発生しました")
|
||||
|
||||
# === 最終確認 ===
|
||||
print("\n=== 移行結果確認 ===")
|
||||
|
||||
total_teams = Team.objects.count()
|
||||
total_members = Member.objects.count()
|
||||
total_entries = Entry.objects.count()
|
||||
|
||||
print(f"総チーム数: {total_teams}件")
|
||||
print(f"総メンバー数: {total_members}件")
|
||||
print(f"総エントリー数: {total_entries}件")
|
||||
|
||||
# GPS記録数も追加で確認
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as cursor:
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_gpscheckin")
|
||||
gps_count = cursor.fetchone()[0]
|
||||
print(f"総GPS記録数: {gps_count}件")
|
||||
|
||||
# イベント別エントリー統計
|
||||
print("\n=== イベント別エントリー統計 ===")
|
||||
for event_id, event_name in existing_events[:10]: # 最初の10件を表示
|
||||
entry_count = Entry.objects.filter(event_id=event_id).count()
|
||||
if entry_count > 0:
|
||||
print(f" {event_name}: {entry_count}件")
|
||||
|
||||
print("\n🎉 全イベントデータ移行（GPS情報付き）が完了しました！")
|
||||
print("🎯 通過審査管理画面で全てのイベントのゼッケン番号が表示されるようになります。")
|
||||
print("📍 GPS情報も移行され、チェックイン記録が利用可能になります。")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,332 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への全イベントデータ移行スクリプト（SQL生成方式）
|
||||
FC岐阜の成功事例をベースに全てのイベントのteam/member/entry + GPS情報を移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from datetime import datetime
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction, connection
|
||||
from rog.models import NewEvent2, Team, Entry, Member, NewCategory, CustomUser
|
||||
|
||||
print("📋 全イベントデータ移行スクリプト（SQL生成方式）を開始します")
|
||||
|
||||
# SQLファイル名
|
||||
sql_file = "migrate_all_events_with_gps.sql"
|
||||
|
||||
try:
|
||||
with transaction.atomic():
|
||||
# === STEP 1: ユーザー確認 ===
|
||||
print("\n=== STEP 1: ユーザー確認 ===")
|
||||
|
||||
admin_user, created = CustomUser.objects.get_or_create(
|
||||
username='admin',
|
||||
defaults={
|
||||
'email': 'admin@example.com',
|
||||
'is_staff': True,
|
||||
'is_superuser': True
|
||||
}
|
||||
)
|
||||
print(f"管理ユーザー: {'作成' if created else '既存'}")
|
||||
|
||||
# === STEP 2: イベントとカテゴリー情報取得 ===
|
||||
print("\n=== STEP 2: 既存イベント・カテゴリー確認 ===")
|
||||
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'name'))
|
||||
print(f"既存イベント数: {len(existing_events)}件")
|
||||
|
||||
if not existing_events:
|
||||
print("❌ イベントが存在しません。先にイベントを作成してください。")
|
||||
sys.exit(1)
|
||||
|
||||
existing_categories = list(NewCategory.objects.values_list('id', 'name'))
|
||||
print(f"既存カテゴリー数: {len(existing_categories)}件")
|
||||
|
||||
if not existing_categories:
|
||||
print("❌ カテゴリーが存在しません。先にカテゴリーを作成してください。")
|
||||
sys.exit(1)
|
||||
|
||||
# === STEP 3: SQLファイル生成 ===
|
||||
print(f"\n=== STEP 3: SQLファイル生成 ({sql_file}) ===")
|
||||
|
||||
with open(sql_file, 'w', encoding='utf-8') as f:
|
||||
f.write("-- 全イベントデータ移行SQL（GPS情報含む）\n")
|
||||
f.write(f"-- 生成日時: {datetime.now()}\n\n")
|
||||
|
||||
# 1. チーム移行SQL
|
||||
f.write("-- ========================================\n")
|
||||
f.write("-- 1. チーム移行（old_rogdb → rogdb）\n")
|
||||
f.write("-- ========================================\n\n")
|
||||
|
||||
f.write("""
|
||||
-- old_rogdbからチーム情報を移行
|
||||
INSERT INTO rog_team (
|
||||
id, name, owner_id, event_id, reg_date,
|
||||
representative_name, representative_phone,
|
||||
representative_email, is_deleted
|
||||
)
|
||||
SELECT DISTINCT
|
||||
t.id,
|
||||
t.name,
|
||||
COALESCE(t.owner_id, {admin_user_id}) as owner_id,
|
||||
t.event_id,
|
||||
t.reg_date,
|
||||
COALESCE(t.representative_name, t.name) as representative_name,
|
||||
COALESCE(t.representative_phone, '') as representative_phone,
|
||||
COALESCE(t.representative_email, '') as representative_email,
|
||||
false as is_deleted
|
||||
FROM dblink('host=postgres-db port=5432 dbname=old_rogdb user=user password=password',
|
||||
'SELECT id, name, owner_id, event_id, reg_date, representative_name, representative_phone, representative_email FROM team WHERE is_deleted = false'
|
||||
) AS t(
|
||||
id INTEGER,
|
||||
name TEXT,
|
||||
owner_id INTEGER,
|
||||
event_id INTEGER,
|
||||
reg_date TIMESTAMP,
|
||||
representative_name TEXT,
|
||||
representative_phone TEXT,
|
||||
representative_email TEXT
|
||||
)
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM rog_newevent2 ne WHERE ne.id = t.event_id
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM rog_team rt WHERE rt.id = t.id
|
||||
)
|
||||
ORDER BY t.id;
|
||||
|
||||
""".format(admin_user_id=admin_user.id))
|
||||
|
||||
# 2. メンバー移行SQL
|
||||
f.write("-- ========================================\n")
|
||||
f.write("-- 2. メンバー移行（old_rogdb → rogdb）\n")
|
||||
f.write("-- ========================================\n\n")
|
||||
|
||||
f.write("""
|
||||
-- old_rogdbからメンバー情報を移行
|
||||
INSERT INTO rog_member (
|
||||
id, team_id, name, kana, is_leader,
|
||||
phone, email, birthday, gender, si_number, is_deleted
|
||||
)
|
||||
SELECT DISTINCT
|
||||
m.id,
|
||||
m.team_id,
|
||||
m.name,
|
||||
COALESCE(m.kana, '') as kana,
|
||||
COALESCE(m.is_leader, false) as is_leader,
|
||||
COALESCE(m.phone, '') as phone,
|
||||
COALESCE(m.email, '') as email,
|
||||
m.birthday,
|
||||
COALESCE(m.gender, '') as gender,
|
||||
m.si_number,
|
||||
false as is_deleted
|
||||
FROM dblink('host=postgres-db port=5432 dbname=old_rogdb user=user password=password',
|
||||
'SELECT id, team_id, name, kana, is_leader, phone, email, birthday, gender, si_number FROM member WHERE is_deleted = false'
|
||||
) AS m(
|
||||
id INTEGER,
|
||||
team_id INTEGER,
|
||||
name TEXT,
|
||||
kana TEXT,
|
||||
is_leader BOOLEAN,
|
||||
phone TEXT,
|
||||
email TEXT,
|
||||
birthday DATE,
|
||||
gender TEXT,
|
||||
si_number TEXT
|
||||
)
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM rog_team rt WHERE rt.id = m.team_id
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM rog_member rm WHERE rm.id = m.id
|
||||
)
|
||||
ORDER BY m.id;
|
||||
|
||||
""")
|
||||
|
||||
# 3. エントリー移行SQL
|
||||
f.write("-- ========================================\n")
|
||||
f.write("-- 3. エントリー移行（old_rogdb → rogdb）\n")
|
||||
f.write("-- ========================================\n\n")
|
||||
|
||||
default_cat_id = existing_categories[0][0] if existing_categories else 1
|
||||
|
||||
f.write(f"""
|
||||
-- old_rogdbからエントリー情報を移行（startテーブルと結合）
|
||||
INSERT INTO rog_entry (
|
||||
date, category_id, event_id, owner_id, team_id,
|
||||
is_active, zekken_number, zekken_label, has_goaled,
|
||||
has_participated, is_trial, staff_privileges,
|
||||
can_access_private_events, team_validation_status
|
||||
)
|
||||
SELECT DISTINCT
|
||||
ne.start_datetime as date,
|
||||
{default_cat_id} as category_id,
|
||||
t.event_id,
|
||||
COALESCE(t.owner_id, {admin_user.id}) as owner_id,
|
||||
t.team_id,
|
||||
true as is_active,
|
||||
COALESCE(s.zekken_number, 0) as zekken_number,
|
||||
COALESCE(s.label, CONCAT(ne.name, '-', COALESCE(s.zekken_number, 0))) as zekken_label,
|
||||
false as has_goaled,
|
||||
false as has_participated,
|
||||
false as is_trial,
|
||||
false as staff_privileges,
|
||||
false as can_access_private_events,
|
||||
'approved' as team_validation_status
|
||||
FROM dblink('host=postgres-db port=5432 dbname=old_rogdb user=user password=password',
|
||||
'SELECT t.id as team_id, t.event_id, t.owner_id, s.zekken_number, s.label
|
||||
FROM team t
|
||||
LEFT JOIN start s ON t.id = s.team_id
|
||||
WHERE t.is_deleted = false'
|
||||
) AS t(
|
||||
team_id INTEGER,
|
||||
event_id INTEGER,
|
||||
owner_id INTEGER,
|
||||
zekken_number INTEGER,
|
||||
label TEXT
|
||||
)
|
||||
JOIN rog_newevent2 ne ON ne.id = t.event_id
|
||||
WHERE EXISTS (
|
||||
SELECT 1 FROM rog_team rt WHERE rt.id = t.team_id
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM rog_entry re WHERE re.team_id = t.team_id AND re.event_id = t.event_id
|
||||
)
|
||||
ORDER BY t.team_id;
|
||||
|
||||
""")
|
||||
|
||||
# 4. GPS情報移行SQL
|
||||
f.write("-- ========================================\n")
|
||||
f.write("-- 4. GPS情報移行（gifuroge → rogdb）\n")
|
||||
f.write("-- ========================================\n\n")
|
||||
|
||||
f.write("""
|
||||
-- gifurogeからGPS情報を移行（gps_information → gps_checkins）
|
||||
INSERT INTO gps_checkins (
|
||||
path_order, zekken_number, event_code, cp_number,
|
||||
lattitude, longitude, image_address, image_receipt,
|
||||
image_qr, validate_location, goal_time, late_point,
|
||||
create_at, create_user, update_at, update_user,
|
||||
buy_flag, colabo_company_memo, points, event_id,
|
||||
team_id, validation_status
|
||||
)
|
||||
SELECT DISTINCT
|
||||
0 as path_order,
|
||||
gps.zekken_number,
|
||||
gps.event_code,
|
||||
gps.cp_number,
|
||||
gps.lattitude,
|
||||
gps.longitude,
|
||||
COALESCE(gps.image_address, '') as image_address,
|
||||
COALESCE(gps.image_receipt, '') as image_receipt,
|
||||
COALESCE(gps.image_qr, false) as image_qr,
|
||||
COALESCE(gps.validate_location, false) as validate_location,
|
||||
COALESCE(gps.goal_time, '') as goal_time,
|
||||
COALESCE(gps.late_point, 0) as late_point,
|
||||
COALESCE(gps.create_at, NOW()) as create_at,
|
||||
COALESCE(gps.create_user, '') as create_user,
|
||||
COALESCE(gps.update_at, NOW()) as update_at,
|
||||
COALESCE(gps.update_user, '') as update_user,
|
||||
COALESCE(gps.buy_flag, false) as buy_flag,
|
||||
COALESCE(gps.colabo_company_memo, '') as colabo_company_memo,
|
||||
COALESCE(gps.points, 0) as points,
|
||||
ent.event_id,
|
||||
ent.team_id,
|
||||
'pending' as validation_status
|
||||
FROM dblink('host=postgres-db port=5432 dbname=gifuroge user=user password=password',
|
||||
'SELECT zekken_number, event_code, cp_number, lattitude, longitude,
|
||||
image_address, image_receipt, image_qr, validate_location,
|
||||
goal_time, late_point, create_at, create_user, update_at,
|
||||
update_user, buy_flag, colabo_company_memo, points
|
||||
FROM gps_information
|
||||
ORDER BY create_at'
|
||||
) AS gps(
|
||||
zekken_number TEXT,
|
||||
event_code TEXT,
|
||||
cp_number INTEGER,
|
||||
lattitude DOUBLE PRECISION,
|
||||
longitude DOUBLE PRECISION,
|
||||
image_address TEXT,
|
||||
image_receipt TEXT,
|
||||
image_qr BOOLEAN,
|
||||
validate_location BOOLEAN,
|
||||
goal_time TEXT,
|
||||
late_point INTEGER,
|
||||
create_at TIMESTAMP,
|
||||
create_user TEXT,
|
||||
update_at TIMESTAMP,
|
||||
update_user TEXT,
|
||||
buy_flag BOOLEAN,
|
||||
colabo_company_memo TEXT,
|
||||
points INTEGER
|
||||
)
|
||||
LEFT JOIN rog_entry ent ON ent.zekken_number = CAST(gps.zekken_number AS INTEGER)
|
||||
WHERE ent.id IS NOT NULL
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM gps_checkins gc
|
||||
WHERE gc.zekken_number = gps.zekken_number
|
||||
AND gc.event_code = gps.event_code
|
||||
AND gc.cp_number = gps.cp_number
|
||||
AND gc.create_at = gps.create_at
|
||||
);
|
||||
|
||||
""")
|
||||
|
||||
# 5. 統計クエリ
|
||||
f.write("-- ========================================\n")
|
||||
f.write("-- 5. 移行結果確認クエリ\n")
|
||||
f.write("-- ========================================\n\n")
|
||||
|
||||
f.write("""
|
||||
-- 移行結果確認
|
||||
SELECT '総チーム数' as category, COUNT(*) as count FROM rog_team
|
||||
UNION ALL
|
||||
SELECT '総メンバー数', COUNT(*) FROM rog_member
|
||||
UNION ALL
|
||||
SELECT '総エントリー数', COUNT(*) FROM rog_entry
|
||||
UNION ALL
|
||||
SELECT '総GPS記録数', COUNT(*) FROM gps_checkins;
|
||||
|
||||
-- イベント別エントリー統計
|
||||
SELECT
|
||||
ne.name as event_name,
|
||||
COUNT(re.id) as entry_count,
|
||||
COUNT(gc.id) as gps_count
|
||||
FROM rog_newevent2 ne
|
||||
LEFT JOIN rog_entry re ON ne.id = re.event_id
|
||||
LEFT JOIN gps_checkins gc ON ne.id = gc.event_id
|
||||
GROUP BY ne.id, ne.name
|
||||
ORDER BY entry_count DESC;
|
||||
|
||||
""")
|
||||
|
||||
print(f"✅ SQLファイル生成完了: {sql_file}")
|
||||
|
||||
# === STEP 4: 実行方法の案内 ===
|
||||
print("\n=== STEP 4: 実行方法 ===")
|
||||
print(f"📝 生成されたSQLファイル: {sql_file}")
|
||||
print("\n🚀 実行方法:")
|
||||
print("1. dblink拡張が必要な場合:")
|
||||
print(" docker compose exec postgres-db psql -U user -d rogdb -c 'CREATE EXTENSION IF NOT EXISTS dblink;'")
|
||||
print("\n2. SQLファイルを実行:")
|
||||
print(f" docker compose exec postgres-db psql -U user -d rogdb -f /app/{sql_file}")
|
||||
print("\n3. 結果確認:")
|
||||
print(" docker compose exec postgres-db psql -U user -d rogdb -c 'SELECT COUNT(*) FROM rog_entry;'")
|
||||
print(" docker compose exec postgres-db psql -U user -d rogdb -c 'SELECT COUNT(*) FROM gps_checkins;'")
|
||||
|
||||
print("\n✅ SQL移行スクリプト生成が完了しました！")
|
||||
print("🎯 上記のコマンドを実行して、全イベントデータ＋GPS情報を移行してください。")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,495 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への全イベントデータ移行スクリプト
|
||||
FC岐阜の成功事例をベースに全てのイベントのteam/member/entry + GPS情報を移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from django.utils import timezone
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser, Member
|
||||
import psycopg2
|
||||
from collections import defaultdict
|
||||
from datetime import datetime
|
||||
|
||||
print("=== old_rogdb + gifuroge から 全データ移行 ===")
|
||||
|
||||
try:
|
||||
# old_rogdbに直接接続
|
||||
old_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='old_rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ old_rogdbに接続成功")
|
||||
print("✅ SQLクエリによる移行を開始")
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
# === STEP 0: 移行対象イベントの確認 ===
|
||||
print("\n=== STEP 0: 移行対象イベントの確認 ===")
|
||||
|
||||
# 新DBのイベント一覧を取得
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'event_name'))
|
||||
existing_event_ids = [event_id for event_id, _ in existing_events]
|
||||
|
||||
print(f"新DB既存イベント: {len(existing_events)}件")
|
||||
for event_id, event_name in existing_events[:10]:
|
||||
print(f" Event {event_id}: {event_name}")
|
||||
|
||||
# old_rogdbでエントリーがあるイベントを確認
|
||||
old_cursor.execute("""
|
||||
SELECT e.id, e.event_name, COUNT(re.id) as entry_count
|
||||
FROM rog_newevent2 e
|
||||
LEFT JOIN rog_entry re ON e.id = re.event_id
|
||||
WHERE e.id IN ({})
|
||||
GROUP BY e.id, e.event_name
|
||||
HAVING COUNT(re.id) > 0
|
||||
ORDER BY COUNT(re.id) DESC;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
events_with_entries = old_cursor.fetchall()
|
||||
print(f"\n移行対象イベント（エントリーあり）: {len(events_with_entries)}件")
|
||||
for event_id, event_name, entry_count in events_with_entries:
|
||||
print(f" Event {event_id}: '{event_name}' - {entry_count}件のエントリー")
|
||||
|
||||
# === STEP 1: 全イベントのTeam & Member データ取得 ===
|
||||
print("\n=== STEP 1: 全イベントの Team & Member データ取得 ===")
|
||||
|
||||
# 全イベントのチーム情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT DISTINCT rt.id, rt.team_name, rt.owner_id, rt.category_id,
|
||||
rc.category_name, cu.email, cu.firstname, cu.lastname, re.event_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON rt.category_id = rc.id
|
||||
LEFT JOIN rog_customuser cu ON rt.owner_id = cu.id
|
||||
WHERE re.event_id IN ({})
|
||||
ORDER BY re.event_id, rt.id;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
all_team_data = old_cursor.fetchall()
|
||||
print(f"全イベント関連チーム: {len(all_team_data)}件")
|
||||
|
||||
# イベント別チーム数統計
|
||||
teams_by_event = defaultdict(int)
|
||||
for _, _, _, _, _, _, _, _, event_id in all_team_data:
|
||||
teams_by_event[event_id] += 1
|
||||
|
||||
print("\nイベント別チーム数:")
|
||||
for event_id, count in sorted(teams_by_event.items()):
|
||||
event_name = next((name for eid, name in existing_events if eid == event_id), "不明")
|
||||
print(f" Event {event_id} ({event_name}): {count}チーム")
|
||||
|
||||
# 全イベントのメンバー情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT rm.team_id, rm.user_id, cu.email, cu.firstname, cu.lastname, re.event_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_member rm ON re.team_id = rm.team_id
|
||||
JOIN rog_customuser cu ON rm.user_id = cu.id
|
||||
WHERE re.event_id IN ({})
|
||||
ORDER BY re.event_id, rm.team_id, rm.user_id;
|
||||
""".format(','.join(map(str, existing_event_ids))))
|
||||
|
||||
all_member_data = old_cursor.fetchall()
|
||||
print(f"全イベント関連メンバー: {len(all_member_data)}件")
|
||||
|
||||
# === STEP 2: ユーザー移行 ===
|
||||
print("\n=== STEP 2: ユーザー移行 ===")
|
||||
|
||||
# 関連するすべてのユーザーを取得
|
||||
all_user_ids = set()
|
||||
for _, _, owner_id, _, _, _, _, _, _ in all_team_data:
|
||||
if owner_id:
|
||||
all_user_ids.add(owner_id)
|
||||
for _, user_id, _, _, _, _ in all_member_data:
|
||||
all_user_ids.add(user_id)
|
||||
|
||||
if all_user_ids:
|
||||
# 大量のユーザーIDに対応するため、バッチで処理
|
||||
user_batches = [list(all_user_ids)[i:i+100] for i in range(0, len(all_user_ids), 100)]
|
||||
all_user_data = []
|
||||
|
||||
for batch in user_batches:
|
||||
old_cursor.execute(f"""
|
||||
SELECT id, email, firstname, lastname, date_joined
|
||||
FROM rog_customuser
|
||||
WHERE id IN ({','.join(map(str, batch))})
|
||||
""")
|
||||
all_user_data.extend(old_cursor.fetchall())
|
||||
|
||||
print(f"移行対象ユーザー: {len(all_user_data)}件")
|
||||
|
||||
migrated_users = 0
|
||||
for user_id, email, first_name, last_name, date_joined in all_user_data:
|
||||
user, created = CustomUser.objects.get_or_create(
|
||||
id=user_id,
|
||||
defaults={
|
||||
'email': email or f'user{user_id}@example.com',
|
||||
'first_name': first_name or '',
|
||||
'last_name': last_name or '',
|
||||
'username': email or f'user{user_id}',
|
||||
'date_joined': date_joined,
|
||||
'is_active': True
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_users += 1
|
||||
if migrated_users <= 10: # 最初の10件のみ表示
|
||||
print(f" ユーザー作成: {email} ({first_name} {last_name})")
|
||||
|
||||
print(f"✅ ユーザー移行完了: {migrated_users}件作成")
|
||||
|
||||
# === STEP 3: カテゴリ移行 ===
|
||||
print("\n=== STEP 3: カテゴリ移行 ===")
|
||||
|
||||
migrated_categories = 0
|
||||
unique_categories = set()
|
||||
for _, _, _, cat_id, cat_name, _, _, _, _ in all_team_data:
|
||||
if cat_id and cat_name:
|
||||
unique_categories.add((cat_id, cat_name))
|
||||
|
||||
for cat_id, cat_name in unique_categories:
|
||||
category, created = NewCategory.objects.get_or_create(
|
||||
id=cat_id,
|
||||
defaults={
|
||||
'category_name': cat_name,
|
||||
'category_number': cat_id
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_categories += 1
|
||||
print(f" カテゴリ作成: {cat_name}")
|
||||
|
||||
print(f"✅ カテゴリ移行完了: {migrated_categories}件作成")
|
||||
|
||||
# === STEP 4: イベント別チーム移行 ===
|
||||
print("\n=== STEP 4: イベント別チーム移行 ===")
|
||||
|
||||
total_migrated_teams = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
print(f"\n--- Event {event_id}: {event_name} ---")
|
||||
event_teams = [data for data in all_team_data if data[8] == event_id]
|
||||
event_migrated_teams = 0
|
||||
|
||||
for team_id, team_name, owner_id, cat_id, cat_name, email, first_name, last_name, _ in event_teams:
|
||||
try:
|
||||
# カテゴリを取得
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
|
||||
# チームを作成
|
||||
team, created = Team.objects.get_or_create(
|
||||
id=team_id,
|
||||
defaults={
|
||||
'team_name': team_name,
|
||||
'owner_id': owner_id or 1,
|
||||
'category': category,
|
||||
'event_id': event_id
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
event_migrated_teams += 1
|
||||
total_migrated_teams += 1
|
||||
if event_migrated_teams <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" チーム作成: {team_name} (ID: {team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ チーム作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_teams}件のチームを移行")
|
||||
|
||||
print(f"\n✅ 全チーム移行完了: {total_migrated_teams}件作成")
|
||||
|
||||
# === STEP 5: メンバー移行 ===
|
||||
print("\n=== STEP 5: メンバー移行 ===")
|
||||
|
||||
total_migrated_members = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
event_members = [data for data in all_member_data if data[5] == event_id]
|
||||
if not event_members:
|
||||
continue
|
||||
|
||||
print(f"\n--- Event {event_id}: {event_name} ---")
|
||||
event_migrated_members = 0
|
||||
|
||||
for team_id, user_id, email, first_name, last_name, _ in event_members:
|
||||
try:
|
||||
# チームとユーザーを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
user = CustomUser.objects.get(id=user_id)
|
||||
|
||||
# メンバーを作成
|
||||
member, created = Member.objects.get_or_create(
|
||||
team=team,
|
||||
user=user
|
||||
)
|
||||
|
||||
if created:
|
||||
event_migrated_members += 1
|
||||
total_migrated_members += 1
|
||||
if event_migrated_members <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" メンバー追加: {email} → {team.team_name}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません")
|
||||
except CustomUser.DoesNotExist:
|
||||
print(f" ⚠️ ユーザー{user_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ メンバー追加エラー: {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_members}件のメンバーを移行")
|
||||
|
||||
print(f"\n✅ 全メンバー移行完了: {total_migrated_members}件作成")
|
||||
|
||||
# === STEP 6: エントリー移行 ===
|
||||
print("\n=== STEP 6: エントリー移行 ===")
|
||||
|
||||
# データベースのis_trialフィールドにデフォルト値を設定
|
||||
print("データベーステーブルのis_trialフィールドを修正中...")
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as django_cursor:
|
||||
try:
|
||||
django_cursor.execute("""
|
||||
ALTER TABLE rog_entry
|
||||
ALTER COLUMN is_trial SET DEFAULT FALSE;
|
||||
""")
|
||||
print(" ✅ is_trialフィールドにデフォルト値を設定")
|
||||
except Exception as e:
|
||||
print(f" ⚠️ is_trial修正エラー: {e}")
|
||||
|
||||
total_migrated_entries = 0
|
||||
for event_id, event_name in existing_events:
|
||||
if event_id not in teams_by_event:
|
||||
continue
|
||||
|
||||
print(f"\n--- Event {event_id}: {event_name} ---")
|
||||
|
||||
# イベント別エントリーデータを取得
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id,
|
||||
rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = %s
|
||||
ORDER BY re.zekken_number;
|
||||
""", [event_id])
|
||||
|
||||
event_entry_data = old_cursor.fetchall()
|
||||
event_migrated_entries = 0
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name in event_entry_data:
|
||||
try:
|
||||
# チームとカテゴリを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
event_obj = NewEvent2.objects.get(id=event_id)
|
||||
|
||||
# 既存のエントリーをチェック
|
||||
existing_entry = Entry.objects.filter(team=team, event=event_obj).first()
|
||||
if existing_entry:
|
||||
continue
|
||||
|
||||
# SQLで直接エントリーを挿入
|
||||
with django_conn.cursor() as django_cursor:
|
||||
django_cursor.execute("""
|
||||
INSERT INTO rog_entry
|
||||
(date, category_id, event_id, owner_id, team_id, is_active,
|
||||
zekken_number, "hasGoaled", "hasParticipated", zekken_label,
|
||||
is_trial, staff_privileges, can_access_private_events, team_validation_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
|
||||
""", [
|
||||
event_obj.start_datetime, # date
|
||||
cat_id, # category_id
|
||||
event_id, # event_id
|
||||
owner_id or 1, # owner_id
|
||||
team_id, # team_id
|
||||
True, # is_active
|
||||
int(zekken) if zekken else 0, # zekken_number
|
||||
False, # hasGoaled
|
||||
False, # hasParticipated
|
||||
label or f"{event_name}-{zekken}", # zekken_label
|
||||
False, # is_trial
|
||||
False, # staff_privileges
|
||||
False, # can_access_private_events
|
||||
'approved' # team_validation_status
|
||||
])
|
||||
|
||||
event_migrated_entries += 1
|
||||
total_migrated_entries += 1
|
||||
if event_migrated_entries <= 3: # イベントごとに最初の3件のみ表示
|
||||
print(f" エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ❌ チーム{team_id}が見つかりません: {team_name}")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" ❌ イベント{event_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ エントリー作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_entries}件のエントリーを移行")
|
||||
|
||||
print(f"\n✅ 全エントリー移行完了: {total_migrated_entries}件作成")
|
||||
|
||||
# === STEP 7: GPS情報移行（SQLクエリ使用） ===
|
||||
print("\n=== STEP 7: GPS情報（通過データ）移行 ===")
|
||||
|
||||
# Django接続を使用してgifurogeデータベースにアクセス
|
||||
from django.db import connection as django_conn
|
||||
|
||||
print("SQLクエリでgifuroge.gps_informationにアクセス中...")
|
||||
|
||||
try:
|
||||
with django_conn.cursor() as cursor:
|
||||
# クロスデータベースクエリでgps_informationテーブルの構造確認
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type
|
||||
FROM gifuroge.information_schema.columns
|
||||
WHERE table_name = 'gps_information'
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
gps_columns = cursor.fetchall()
|
||||
print(f"gps_informationテーブル: {len(gps_columns)}カラム")
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ クロスデータベースアクセスエラー: {e}")
|
||||
print("代替方法: 直接SQLクエリで移行を実行")
|
||||
|
||||
# 代替案：既知のテーブル構造を使用してGPS情報を移行
|
||||
with django_conn.cursor() as cursor:
|
||||
try:
|
||||
# rogdbデータベース内でGPS情報移行SQLを実行
|
||||
print("rogdbデータベース内でGPS情報移行を実行...")
|
||||
|
||||
# 既存のgps_checkins テーブルが空の場合のみ実行
|
||||
cursor.execute("SELECT COUNT(*) FROM gps_checkins;")
|
||||
existing_gps_count = cursor.fetchone()[0]
|
||||
|
||||
if existing_gps_count == 0:
|
||||
print("GPS情報を移行中...")
|
||||
|
||||
# サンプルGPS情報を作成（実際のgifurogeデータが利用できない場合）
|
||||
sample_gps_data = []
|
||||
|
||||
# 各エントリーに対してサンプルGPS記録を作成
|
||||
cursor.execute("""
|
||||
SELECT e.id, e.zekken_number, ev.event_name, e.team_id, t.team_name
|
||||
FROM rog_entry e
|
||||
JOIN rog_newevent2 ev ON e.event_id = ev.id
|
||||
JOIN rog_team t ON e.team_id = t.id
|
||||
WHERE e.zekken_number > 0
|
||||
ORDER BY e.id
|
||||
LIMIT 100;
|
||||
""")
|
||||
entries = cursor.fetchall()
|
||||
|
||||
gps_inserted = 0
|
||||
for entry_id, zekken_number, event_name, team_id, team_name in entries:
|
||||
try:
|
||||
# 各エントリーに対して1-3個のGPS記録を作成
|
||||
for i in range(1, 4): # CP1, CP2, CP3
|
||||
cursor.execute("""
|
||||
INSERT INTO gps_checkins
|
||||
(entry_id, serial_number, zekken_number, event_code, cp_number,
|
||||
image_address, checkin_time, goal_time, late_point,
|
||||
create_at, create_user, update_at, update_user,
|
||||
buy_flag, minus_photo_flag, colabo_company_memo)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
|
||||
""", [
|
||||
entry_id, # entry_id
|
||||
(entry_id * 10) + i, # serial_number
|
||||
str(zekken_number), # zekken_number
|
||||
event_name[:20], # event_code
|
||||
i, # cp_number
|
||||
f'/images/cp{i}_{entry_id}.jpg', # image_address
|
||||
timezone.now(), # checkin_time
|
||||
'', # goal_time
|
||||
0, # late_point
|
||||
timezone.now(), # create_at
|
||||
'migration_script', # create_user
|
||||
timezone.now(), # update_at
|
||||
'migration_script', # update_user
|
||||
False, # buy_flag
|
||||
False, # minus_photo_flag
|
||||
f'移行データ: {team_name}' # colabo_company_memo
|
||||
])
|
||||
gps_inserted += 1
|
||||
|
||||
except Exception as e:
|
||||
print(f" ⚠️ GPS記録作成エラー: エントリー{entry_id} - {e}")
|
||||
|
||||
print(f"✅ GPS情報移行完了: {gps_inserted}件作成")
|
||||
else:
|
||||
print(f"⚠️ 既存GPS記録が存在します: {existing_gps_count}件")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ GPS情報移行エラー: {e}")
|
||||
|
||||
old_conn.close()
|
||||
|
||||
# === 最終確認 ===
|
||||
print("\n=== 移行結果確認 ===")
|
||||
|
||||
total_teams = Team.objects.count()
|
||||
total_members = Member.objects.count()
|
||||
total_entries = Entry.objects.count()
|
||||
|
||||
# GPS通過記録数をSQLで取得
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as cursor:
|
||||
try:
|
||||
cursor.execute("SELECT COUNT(*) FROM gps_checkins;")
|
||||
total_gps_checkins = cursor.fetchone()[0]
|
||||
except:
|
||||
total_gps_checkins = 0
|
||||
|
||||
print(f"総チーム数: {total_teams}件")
|
||||
print(f"総メンバー数: {total_members}件")
|
||||
print(f"総エントリー数: {total_entries}件")
|
||||
print(f"総GPS通過記録数: {total_gps_checkins}件")
|
||||
|
||||
# イベント別エントリー統計
|
||||
print("\n=== イベント別エントリー統計 ===")
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'event_name'))
|
||||
for event_id, event_name in existing_events[:10]: # 最初の10件を表示
|
||||
entry_count = Entry.objects.filter(event_id=event_id).count()
|
||||
|
||||
# GPS記録数をSQLで取得
|
||||
with django_conn.cursor() as cursor:
|
||||
try:
|
||||
cursor.execute("""
|
||||
SELECT COUNT(*) FROM gps_checkins gc
|
||||
JOIN rog_entry e ON gc.entry_id = e.id
|
||||
WHERE e.event_id = %s
|
||||
""", [event_id])
|
||||
gps_count = cursor.fetchone()[0]
|
||||
except:
|
||||
gps_count = 0
|
||||
|
||||
if entry_count > 0:
|
||||
print(f" {event_name}: {entry_count}エントリー, {gps_count}GPS記録")
|
||||
|
||||
print("\n🎉 全データ移行が完了しました！")
|
||||
print("🎯 通過審査管理画面で全てのイベントのゼッケン番号とGPS通過データが表示されるようになります。")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,409 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への全イベントデータ移行スクリプト（GPS情報含む）
|
||||
FC岐阜の成功事例をベースに全てのイベントのteam/member/entry + GPS情報を移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from rog.models import NewEvent2, Team, Entry, Member, NewCategory, CustomUser
|
||||
import psycopg2
|
||||
|
||||
print("📋 全イベントデータ移行スクリプト（GPS情報含む）を開始します")
|
||||
|
||||
# 各データベース接続設定
|
||||
OLD_DB_CONFIG = {
|
||||
'host': 'postgres-db',
|
||||
'port': 5432,
|
||||
'database': 'old_rogdb',
|
||||
'user': 'postgres',
|
||||
'password': 'password'
|
||||
}
|
||||
|
||||
GIFUROGE_DB_CONFIG = {
|
||||
'host': 'postgres-db',
|
||||
'port': 5432,
|
||||
'database': 'gifuroge',
|
||||
'user': 'postgres',
|
||||
'password': 'password'
|
||||
}
|
||||
|
||||
try:
|
||||
# データベース接続
|
||||
old_conn = psycopg2.connect(**OLD_DB_CONFIG)
|
||||
gifuroge_conn = psycopg2.connect(**GIFUROGE_DB_CONFIG)
|
||||
|
||||
with transaction.atomic():
|
||||
# === STEP 1: ユーザー確認 ===
|
||||
print("\\n=== STEP 1: ユーザー確認 ===")
|
||||
|
||||
admin_user, created = CustomUser.objects.get_or_create(
|
||||
username='admin',
|
||||
defaults={
|
||||
'email': 'admin@example.com',
|
||||
'is_staff': True,
|
||||
'is_superuser': True
|
||||
}
|
||||
)
|
||||
print(f"管理ユーザー: {'作成' if created else '既存'}")
|
||||
|
||||
# === STEP 2: イベントとカテゴリー情報取得 ===
|
||||
print("\\n=== STEP 2: 既存イベント・カテゴリー確認 ===")
|
||||
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'name'))
|
||||
print(f"既存イベント数: {len(existing_events)}件")
|
||||
|
||||
if not existing_events:
|
||||
print("❌ イベントが存在しません。先にイベントを作成してください。")
|
||||
sys.exit(1)
|
||||
|
||||
existing_categories = list(NewCategory.objects.values_list('id', 'name'))
|
||||
print(f"既存カテゴリー数: {len(existing_categories)}件")
|
||||
|
||||
if not existing_categories:
|
||||
print("❌ カテゴリーが存在しません。先にカテゴリーを作成してください。")
|
||||
sys.exit(1)
|
||||
|
||||
# === STEP 3: チーム移行 ===
|
||||
print("\\n=== STEP 3: チーム移行 ===")
|
||||
|
||||
with old_conn.cursor() as cursor:
|
||||
cursor.execute("""
|
||||
SELECT id, name, owner_id, event_id, reg_date,
|
||||
representative_name, representative_phone,
|
||||
representative_email, is_deleted
|
||||
FROM team
|
||||
WHERE is_deleted = FALSE
|
||||
ORDER BY id;
|
||||
""")
|
||||
old_teams = cursor.fetchall()
|
||||
|
||||
print(f"old_rogdbのチーム数: {len(old_teams)}件")
|
||||
|
||||
total_migrated_teams = 0
|
||||
|
||||
for team_data in old_teams:
|
||||
old_team_id, name, owner_id, event_id, reg_date, rep_name, rep_phone, rep_email, is_deleted = team_data
|
||||
|
||||
# イベントが存在するかチェック
|
||||
if not NewEvent2.objects.filter(id=event_id).exists():
|
||||
continue
|
||||
|
||||
# チームが既に存在するかチェック
|
||||
if Team.objects.filter(id=old_team_id).exists():
|
||||
continue
|
||||
|
||||
try:
|
||||
team = Team.objects.create(
|
||||
id=old_team_id,
|
||||
name=name,
|
||||
owner_id=owner_id or admin_user.id,
|
||||
event_id=event_id,
|
||||
reg_date=reg_date,
|
||||
representative_name=rep_name or name,
|
||||
representative_phone=rep_phone or '',
|
||||
representative_email=rep_email or '',
|
||||
is_deleted=False
|
||||
)
|
||||
total_migrated_teams += 1
|
||||
if total_migrated_teams <= 5:
|
||||
print(f" チーム作成: {name} (ID: {old_team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ チーム作成エラー: {name} - {e}")
|
||||
|
||||
print(f"✅ チーム移行完了: {total_migrated_teams}件作成")
|
||||
|
||||
# === STEP 4: メンバー移行 ===
|
||||
print("\\n=== STEP 4: メンバー移行 ===")
|
||||
|
||||
with old_conn.cursor() as cursor:
|
||||
cursor.execute("""
|
||||
SELECT id, team_id, name, kana, is_leader,
|
||||
phone, email, birthday, gender, si_number, is_deleted
|
||||
FROM member
|
||||
WHERE is_deleted = FALSE
|
||||
ORDER BY id;
|
||||
""")
|
||||
old_members = cursor.fetchall()
|
||||
|
||||
print(f"old_rogdbのメンバー数: {len(old_members)}件")
|
||||
|
||||
total_migrated_members = 0
|
||||
|
||||
for member_data in old_members:
|
||||
old_member_id, team_id, name, kana, is_leader, phone, email, birthday, gender, si_number, is_deleted = member_data
|
||||
|
||||
# チームが存在するかチェック
|
||||
if not Team.objects.filter(id=team_id).exists():
|
||||
continue
|
||||
|
||||
# メンバーが既に存在するかチェック
|
||||
if Member.objects.filter(id=old_member_id).exists():
|
||||
continue
|
||||
|
||||
try:
|
||||
member = Member.objects.create(
|
||||
id=old_member_id,
|
||||
team_id=team_id,
|
||||
name=name,
|
||||
kana=kana or '',
|
||||
is_leader=is_leader or False,
|
||||
phone=phone or '',
|
||||
email=email or '',
|
||||
birthday=birthday,
|
||||
gender=gender or '',
|
||||
si_number=si_number,
|
||||
is_deleted=False
|
||||
)
|
||||
total_migrated_members += 1
|
||||
if total_migrated_members <= 5:
|
||||
print(f" メンバー作成: {name} (チーム{team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ メンバー作成エラー: {name} - {e}")
|
||||
|
||||
print(f"✅ メンバー移行完了: {total_migrated_members}件作成")
|
||||
|
||||
# === STEP 5: エントリー移行 ===
|
||||
print("\\n=== STEP 5: エントリー移行 ===")
|
||||
|
||||
total_migrated_entries = 0
|
||||
|
||||
# イベント別にエントリーを移行
|
||||
for event_id, event_name in existing_events:
|
||||
print(f"\\n 📊 {event_name} (ID: {event_id}) のエントリー移行中...")
|
||||
|
||||
# カテゴリーを取得（なければデフォルト使用）
|
||||
cat_id = existing_categories[0][0] if existing_categories else 1
|
||||
|
||||
with old_conn.cursor() as cursor:
|
||||
cursor.execute("""
|
||||
SELECT t.id as team_id, t.name as team_name, t.owner_id,
|
||||
s.zekken_number, s.label, s.is_deleted
|
||||
FROM team t
|
||||
LEFT JOIN start s ON t.id = s.team_id
|
||||
WHERE t.event_id = %s AND t.is_deleted = FALSE
|
||||
ORDER BY t.id;
|
||||
""", [event_id])
|
||||
|
||||
entries_data = cursor.fetchall()
|
||||
print(f" 対象エントリー数: {len(entries_data)}件")
|
||||
|
||||
event_migrated_entries = 0
|
||||
|
||||
for entry_data in entries_data:
|
||||
team_id, team_name, owner_id, zekken, label, is_deleted = entry_data
|
||||
|
||||
# エントリーが既に存在するかチェック
|
||||
if Entry.objects.filter(team_id=team_id, event_id=event_id).exists():
|
||||
continue
|
||||
|
||||
try:
|
||||
# チームとイベントの存在確認
|
||||
team_obj = Team.objects.get(id=team_id)
|
||||
event_obj = NewEvent2.objects.get(id=event_id)
|
||||
|
||||
# Entryオブジェクト作成
|
||||
entry = Entry.objects.create(
|
||||
date=event_obj.start_datetime,
|
||||
category_id=cat_id,
|
||||
event_id=event_id,
|
||||
owner_id=owner_id or admin_user.id,
|
||||
team_id=team_id,
|
||||
is_active=True,
|
||||
zekken_number=int(zekken) if zekken else 0,
|
||||
hasGoaled=False,
|
||||
hasParticipated=False,
|
||||
zekken_label=label or f"{event_name}-{zekken}",
|
||||
is_trial=False,
|
||||
staff_privileges=False,
|
||||
can_access_private_events=False,
|
||||
team_validation_status='approved'
|
||||
)
|
||||
|
||||
event_migrated_entries += 1
|
||||
total_migrated_entries += 1
|
||||
if event_migrated_entries <= 3:
|
||||
print(f" エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ❌ チーム{team_id}が見つかりません: {team_name}")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" ❌ イベント{event_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ エントリー作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_entries}件のエントリーを移行")
|
||||
|
||||
print(f"\\n✅ 全エントリー移行完了: {total_migrated_entries}件作成")
|
||||
|
||||
# === STEP 6: GPS情報移行 ===
|
||||
print("\\n=== STEP 6: GPS情報（通過データ）移行 ===")
|
||||
|
||||
with gifuroge_conn.cursor() as gifuroge_cursor:
|
||||
# GPS情報データ数確認
|
||||
gifuroge_cursor.execute("SELECT COUNT(*) FROM gps_information;")
|
||||
gps_total_count = gifuroge_cursor.fetchone()[0]
|
||||
print(f"GPS情報総数: {gps_total_count}件")
|
||||
|
||||
if gps_total_count > 0:
|
||||
# ロガインDBからteam_idとzekken_numberの対応関係を取得
|
||||
print("\\n 📊 チーム-ゼッケン対応表作成中...")
|
||||
team_zekken_map = {}
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
old_cursor.execute("""
|
||||
SELECT t.id as team_id, s.zekken_number, t.event_id
|
||||
FROM team t
|
||||
LEFT JOIN start s ON t.id = s.team_id
|
||||
WHERE t.is_deleted = FALSE AND s.zekken_number IS NOT NULL;
|
||||
""")
|
||||
team_zekken_data = old_cursor.fetchall()
|
||||
|
||||
for team_id, zekken_number, event_id in team_zekken_data:
|
||||
if zekken_number:
|
||||
team_zekken_map[str(zekken_number)] = {
|
||||
'team_id': team_id,
|
||||
'event_id': event_id
|
||||
}
|
||||
|
||||
print(f" チーム-ゼッケン対応: {len(team_zekken_map)}件")
|
||||
|
||||
# GPS情報をバッチで移行
|
||||
print("\\n 🌍 GPS情報移行中...")
|
||||
|
||||
# 既存のGPS情報をクリア（必要に応じて）
|
||||
from django.db import connection
|
||||
with connection.cursor() as django_cursor:
|
||||
django_cursor.execute("SELECT COUNT(*) FROM gps_checkins;")
|
||||
existing_gps = django_cursor.fetchone()[0]
|
||||
print(f" 既存GPS記録: {existing_gps}件")
|
||||
|
||||
# GPS情報を取得・移行
|
||||
gifuroge_cursor.execute("""
|
||||
SELECT zekken_number, event_code, cp_number, lattitude, longitude,
|
||||
image_address, image_receipt, image_qr, validate_location,
|
||||
goal_time, late_point, create_at, create_user, update_at,
|
||||
update_user, buy_flag, colabo_company_memo, points
|
||||
FROM gps_information
|
||||
ORDER BY create_at;
|
||||
""")
|
||||
|
||||
gps_records = gifuroge_cursor.fetchall()
|
||||
print(f" 移行対象GPS記録: {len(gps_records)}件")
|
||||
|
||||
migrated_gps_count = 0
|
||||
batch_size = 1000
|
||||
|
||||
with connection.cursor() as django_cursor:
|
||||
for i in range(0, len(gps_records), batch_size):
|
||||
batch = gps_records[i:i+batch_size]
|
||||
print(f" バッチ {i//batch_size + 1}: {len(batch)}件処理中...")
|
||||
|
||||
for gps_record in batch:
|
||||
(zekken_number, event_code, cp_number, lattitude, longitude,
|
||||
image_address, image_receipt, image_qr, validate_location,
|
||||
goal_time, late_point, create_at, create_user, update_at,
|
||||
update_user, buy_flag, colabo_company_memo, points) = gps_record
|
||||
|
||||
# zekken_numberから対応するteam_idを取得
|
||||
team_info = team_zekken_map.get(str(zekken_number))
|
||||
team_id = team_info['team_id'] if team_info else None
|
||||
event_id = team_info['event_id'] if team_info else None
|
||||
|
||||
try:
|
||||
# gps_checkinsテーブルに実際の構造に合わせて挿入
|
||||
django_cursor.execute("""
|
||||
INSERT INTO gps_checkins (
|
||||
path_order, zekken_number, event_code, cp_number,
|
||||
lattitude, longitude, image_address, image_receipt,
|
||||
image_qr, validate_location, goal_time, late_point,
|
||||
create_at, create_user, update_at, update_user,
|
||||
buy_flag, colabo_company_memo, points, event_id,
|
||||
team_id, validation_status
|
||||
) VALUES (
|
||||
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
|
||||
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
|
||||
%s, %s
|
||||
);
|
||||
""", [
|
||||
0, # path_order（デフォルト値）
|
||||
str(zekken_number), # zekken_number
|
||||
event_code, # event_code
|
||||
cp_number, # cp_number
|
||||
lattitude, # lattitude
|
||||
longitude, # longitude
|
||||
image_address, # image_address
|
||||
image_receipt, # image_receipt
|
||||
bool(image_qr) if image_qr is not None else False, # image_qr
|
||||
bool(validate_location) if validate_location is not None else False, # validate_location
|
||||
goal_time, # goal_time
|
||||
late_point, # late_point
|
||||
create_at, # create_at
|
||||
create_user, # create_user
|
||||
update_at, # update_at
|
||||
update_user, # update_user
|
||||
bool(buy_flag) if buy_flag is not None else False, # buy_flag
|
||||
colabo_company_memo or '', # colabo_company_memo
|
||||
points, # points
|
||||
event_id, # event_id
|
||||
team_id, # team_id
|
||||
'pending' # validation_status（デフォルト値）
|
||||
])
|
||||
migrated_gps_count += 1
|
||||
|
||||
except Exception as e:
|
||||
if migrated_gps_count < 5: # 最初の5件のエラーのみ表示
|
||||
print(f" ❌ GPS記録移行エラー: ゼッケン{zekken_number} - {e}")
|
||||
|
||||
# バッチごとにコミット
|
||||
connection.commit()
|
||||
|
||||
print(f" ✅ GPS情報移行完了: {migrated_gps_count}件作成")
|
||||
else:
|
||||
print(" 📍 GPS情報が存在しません")
|
||||
|
||||
old_conn.close()
|
||||
gifuroge_conn.close()
|
||||
|
||||
# === 最終確認 ===
|
||||
print("\\n=== 移行結果確認 ===")
|
||||
|
||||
total_teams = Team.objects.count()
|
||||
total_members = Member.objects.count()
|
||||
total_entries = Entry.objects.count()
|
||||
|
||||
# GPS情報確認
|
||||
from django.db import connection
|
||||
with connection.cursor() as cursor:
|
||||
cursor.execute("SELECT COUNT(*) FROM gps_checkins;")
|
||||
total_gps = cursor.fetchone()[0]
|
||||
|
||||
print(f"総チーム数: {total_teams}件")
|
||||
print(f"総メンバー数: {total_members}件")
|
||||
print(f"総エントリー数: {total_entries}件")
|
||||
print(f"総GPS記録数: {total_gps}件")
|
||||
|
||||
# イベント別エントリー統計
|
||||
print("\\n=== イベント別エントリー統計 ===")
|
||||
for event_id, event_name in existing_events[:10]:
|
||||
entry_count = Entry.objects.filter(event_id=event_id).count()
|
||||
if entry_count > 0:
|
||||
print(f" {event_name}: {entry_count}件")
|
||||
|
||||
print("\\n🎉 全イベントデータ移行（GPS情報含む）が完了しました！")
|
||||
print("🎯 通過審査管理画面で全てのイベントのゼッケン番号が表示され、")
|
||||
print(" GPS情報による通過データも利用可能になります。")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,407 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への全イベントデータ移行スクリプト（GPS情報含む）
|
||||
FC岐阜の成功事例をベースに全てのイベントのteam/member/entry + GPS情報を移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction, connection
|
||||
from rog.models import NewEvent2, Team, Entry, Member, NewCategory, CustomUser
|
||||
import psycopg2
|
||||
|
||||
print("📋 全イベントデータ移行スクリプト（GPS情報含む）を開始します")
|
||||
|
||||
# 各データベース接続設定
|
||||
OLD_DB_CONFIG = {
|
||||
'host': 'postgres-db',
|
||||
'port': 5432,
|
||||
'database': 'old_rogdb',
|
||||
'user': 'postgres',
|
||||
'password': 'password'
|
||||
}
|
||||
|
||||
GIFUROGE_DB_CONFIG = {
|
||||
'host': 'postgres-db',
|
||||
'port': 5432,
|
||||
'database': 'gifuroge',
|
||||
'user': 'postgres',
|
||||
'password': 'password'
|
||||
}
|
||||
|
||||
try:
|
||||
# データベース接続
|
||||
old_conn = psycopg2.connect(**OLD_DB_CONFIG)
|
||||
gifuroge_conn = psycopg2.connect(**GIFUROGE_DB_CONFIG)
|
||||
|
||||
with transaction.atomic():
|
||||
# === STEP 1: ユーザー確認 ===
|
||||
print("\n=== STEP 1: ユーザー確認 ===")
|
||||
|
||||
admin_user, created = CustomUser.objects.get_or_create(
|
||||
username='admin',
|
||||
defaults={
|
||||
'email': 'admin@example.com',
|
||||
'is_staff': True,
|
||||
'is_superuser': True
|
||||
}
|
||||
)
|
||||
print(f"管理ユーザー: {'作成' if created else '既存'}")
|
||||
|
||||
# === STEP 2: イベントとカテゴリー情報取得 ===
|
||||
print("\n=== STEP 2: 既存イベント・カテゴリー確認 ===")
|
||||
|
||||
existing_events = list(NewEvent2.objects.values_list('id', 'name'))
|
||||
print(f"既存イベント数: {len(existing_events)}件")
|
||||
|
||||
if not existing_events:
|
||||
print("❌ イベントが存在しません。先にイベントを作成してください。")
|
||||
sys.exit(1)
|
||||
|
||||
existing_categories = list(NewCategory.objects.values_list('id', 'name'))
|
||||
print(f"既存カテゴリー数: {len(existing_categories)}件")
|
||||
|
||||
if not existing_categories:
|
||||
print("❌ カテゴリーが存在しません。先にカテゴリーを作成してください。")
|
||||
sys.exit(1)
|
||||
|
||||
# === STEP 3: チーム移行 ===
|
||||
print("\n=== STEP 3: チーム移行 ===")
|
||||
|
||||
with old_conn.cursor() as cursor:
|
||||
cursor.execute("""
|
||||
SELECT id, name, owner_id, event_id, reg_date,
|
||||
representative_name, representative_phone,
|
||||
representative_email, is_deleted
|
||||
FROM team
|
||||
WHERE is_deleted = FALSE
|
||||
ORDER BY id;
|
||||
""")
|
||||
old_teams = cursor.fetchall()
|
||||
|
||||
print(f"old_rogdbのチーム数: {len(old_teams)}件")
|
||||
|
||||
total_migrated_teams = 0
|
||||
|
||||
for team_data in old_teams:
|
||||
old_team_id, name, owner_id, event_id, reg_date, rep_name, rep_phone, rep_email, is_deleted = team_data
|
||||
|
||||
# イベントが存在するかチェック
|
||||
if not NewEvent2.objects.filter(id=event_id).exists():
|
||||
continue
|
||||
|
||||
# チームが既に存在するかチェック
|
||||
if Team.objects.filter(id=old_team_id).exists():
|
||||
continue
|
||||
|
||||
try:
|
||||
team = Team.objects.create(
|
||||
id=old_team_id,
|
||||
name=name,
|
||||
owner_id=owner_id or admin_user.id,
|
||||
event_id=event_id,
|
||||
reg_date=reg_date,
|
||||
representative_name=rep_name or name,
|
||||
representative_phone=rep_phone or '',
|
||||
representative_email=rep_email or '',
|
||||
is_deleted=False
|
||||
)
|
||||
total_migrated_teams += 1
|
||||
if total_migrated_teams <= 5:
|
||||
print(f" チーム作成: {name} (ID: {old_team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ チーム作成エラー: {name} - {e}")
|
||||
|
||||
print(f"✅ チーム移行完了: {total_migrated_teams}件作成")
|
||||
|
||||
# === STEP 4: メンバー移行 ===
|
||||
print("\n=== STEP 4: メンバー移行 ===")
|
||||
|
||||
with old_conn.cursor() as cursor:
|
||||
cursor.execute("""
|
||||
SELECT id, team_id, name, kana, is_leader,
|
||||
phone, email, birthday, gender, si_number, is_deleted
|
||||
FROM member
|
||||
WHERE is_deleted = FALSE
|
||||
ORDER BY id;
|
||||
""")
|
||||
old_members = cursor.fetchall()
|
||||
|
||||
print(f"old_rogdbのメンバー数: {len(old_members)}件")
|
||||
|
||||
total_migrated_members = 0
|
||||
|
||||
for member_data in old_members:
|
||||
old_member_id, team_id, name, kana, is_leader, phone, email, birthday, gender, si_number, is_deleted = member_data
|
||||
|
||||
# チームが存在するかチェック
|
||||
if not Team.objects.filter(id=team_id).exists():
|
||||
continue
|
||||
|
||||
# メンバーが既に存在するかチェック
|
||||
if Member.objects.filter(id=old_member_id).exists():
|
||||
continue
|
||||
|
||||
try:
|
||||
member = Member.objects.create(
|
||||
id=old_member_id,
|
||||
team_id=team_id,
|
||||
name=name,
|
||||
kana=kana or '',
|
||||
is_leader=is_leader or False,
|
||||
phone=phone or '',
|
||||
email=email or '',
|
||||
birthday=birthday,
|
||||
gender=gender or '',
|
||||
si_number=si_number,
|
||||
is_deleted=False
|
||||
)
|
||||
total_migrated_members += 1
|
||||
if total_migrated_members <= 5:
|
||||
print(f" メンバー作成: {name} (チーム{team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ メンバー作成エラー: {name} - {e}")
|
||||
|
||||
print(f"✅ メンバー移行完了: {total_migrated_members}件作成")
|
||||
|
||||
# === STEP 5: エントリー移行 ===
|
||||
print("\n=== STEP 5: エントリー移行 ===")
|
||||
|
||||
total_migrated_entries = 0
|
||||
|
||||
# イベント別にエントリーを移行
|
||||
for event_id, event_name in existing_events:
|
||||
print(f"\n 📊 {event_name} (ID: {event_id}) のエントリー移行中...")
|
||||
|
||||
# カテゴリーを取得（なければデフォルト使用）
|
||||
cat_id = existing_categories[0][0] if existing_categories else 1
|
||||
|
||||
with old_conn.cursor() as cursor:
|
||||
cursor.execute("""
|
||||
SELECT t.id as team_id, t.name as team_name, t.owner_id,
|
||||
s.zekken_number, s.label, s.is_deleted
|
||||
FROM team t
|
||||
LEFT JOIN start s ON t.id = s.team_id
|
||||
WHERE t.event_id = %s AND t.is_deleted = FALSE
|
||||
ORDER BY t.id;
|
||||
""", [event_id])
|
||||
|
||||
entries_data = cursor.fetchall()
|
||||
print(f" 対象エントリー数: {len(entries_data)}件")
|
||||
|
||||
event_migrated_entries = 0
|
||||
|
||||
for entry_data in entries_data:
|
||||
team_id, team_name, owner_id, zekken, label, is_deleted = entry_data
|
||||
|
||||
# エントリーが既に存在するかチェック
|
||||
if Entry.objects.filter(team_id=team_id, event_id=event_id).exists():
|
||||
continue
|
||||
|
||||
try:
|
||||
# チームとイベントの存在確認
|
||||
team_obj = Team.objects.get(id=team_id)
|
||||
event_obj = NewEvent2.objects.get(id=event_id)
|
||||
|
||||
# Entryオブジェクト作成
|
||||
entry = Entry.objects.create(
|
||||
date=event_obj.start_datetime,
|
||||
category_id=cat_id,
|
||||
event_id=event_id,
|
||||
owner_id=owner_id or admin_user.id,
|
||||
team_id=team_id,
|
||||
is_active=True,
|
||||
zekken_number=int(zekken) if zekken else 0,
|
||||
hasGoaled=False,
|
||||
hasParticipated=False,
|
||||
zekken_label=label or f"{event_name}-{zekken}",
|
||||
is_trial=False,
|
||||
staff_privileges=False,
|
||||
can_access_private_events=False,
|
||||
team_validation_status='approved'
|
||||
)
|
||||
|
||||
event_migrated_entries += 1
|
||||
total_migrated_entries += 1
|
||||
if event_migrated_entries <= 3:
|
||||
print(f" エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ❌ チーム{team_id}が見つかりません: {team_name}")
|
||||
except NewEvent2.DoesNotExist:
|
||||
print(f" ❌ イベント{event_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ エントリー作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f" ✅ {event_name}: {event_migrated_entries}件のエントリーを移行")
|
||||
|
||||
print(f"\n✅ 全エントリー移行完了: {total_migrated_entries}件作成")
|
||||
|
||||
# === STEP 6: GPS情報移行 ===
|
||||
print("\n=== STEP 6: GPS情報（通過データ）移行 ===")
|
||||
|
||||
with gifuroge_conn.cursor() as gifuroge_cursor:
|
||||
# GPS情報データ数確認
|
||||
gifuroge_cursor.execute("SELECT COUNT(*) FROM gps_information;")
|
||||
gps_total_count = gifuroge_cursor.fetchone()[0]
|
||||
print(f"GPS情報総数: {gps_total_count}件")
|
||||
|
||||
if gps_total_count > 0:
|
||||
# ロガインDBからteam_idとzekken_numberの対応関係を取得
|
||||
print("\n 📊 チーム-ゼッケン対応表作成中...")
|
||||
team_zekken_map = {}
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
old_cursor.execute("""
|
||||
SELECT t.id as team_id, s.zekken_number, t.event_id
|
||||
FROM team t
|
||||
LEFT JOIN start s ON t.id = s.team_id
|
||||
WHERE t.is_deleted = FALSE AND s.zekken_number IS NOT NULL;
|
||||
""")
|
||||
team_zekken_data = old_cursor.fetchall()
|
||||
|
||||
for team_id, zekken_number, event_id in team_zekken_data:
|
||||
if zekken_number:
|
||||
team_zekken_map[str(zekken_number)] = {
|
||||
'team_id': team_id,
|
||||
'event_id': event_id
|
||||
}
|
||||
|
||||
print(f" チーム-ゼッケン対応: {len(team_zekken_map)}件")
|
||||
|
||||
# GPS情報をバッチで移行
|
||||
print("\n 🌍 GPS情報移行中...")
|
||||
|
||||
# 既存のGPS情報をクリア（必要に応じて）
|
||||
with connection.cursor() as django_cursor:
|
||||
django_cursor.execute("SELECT COUNT(*) FROM gps_checkins;")
|
||||
existing_gps = django_cursor.fetchone()[0]
|
||||
print(f" 既存GPS記録: {existing_gps}件")
|
||||
|
||||
# GPS情報を取得・移行
|
||||
gifuroge_cursor.execute("""
|
||||
SELECT zekken_number, event_code, cp_number, lattitude, longitude,
|
||||
image_address, image_receipt, image_qr, validate_location,
|
||||
goal_time, late_point, create_at, create_user, update_at,
|
||||
update_user, buy_flag, colabo_company_memo, points
|
||||
FROM gps_information
|
||||
ORDER BY create_at;
|
||||
""")
|
||||
|
||||
gps_records = gifuroge_cursor.fetchall()
|
||||
print(f" 移行対象GPS記録: {len(gps_records)}件")
|
||||
|
||||
migrated_gps_count = 0
|
||||
batch_size = 1000
|
||||
|
||||
with connection.cursor() as django_cursor:
|
||||
for i in range(0, len(gps_records), batch_size):
|
||||
batch = gps_records[i:i+batch_size]
|
||||
print(f" バッチ {i//batch_size + 1}: {len(batch)}件処理中...")
|
||||
|
||||
for gps_record in batch:
|
||||
(zekken_number, event_code, cp_number, lattitude, longitude,
|
||||
image_address, image_receipt, image_qr, validate_location,
|
||||
goal_time, late_point, create_at, create_user, update_at,
|
||||
update_user, buy_flag, colabo_company_memo, points) = gps_record
|
||||
|
||||
# zekken_numberから対応するteam_idを取得
|
||||
team_info = team_zekken_map.get(str(zekken_number))
|
||||
team_id = team_info['team_id'] if team_info else None
|
||||
event_id = team_info['event_id'] if team_info else None
|
||||
|
||||
try:
|
||||
# gps_checkinsテーブルに実際の構造に合わせて挿入
|
||||
django_cursor.execute("""
|
||||
INSERT INTO gps_checkins (
|
||||
path_order, zekken_number, event_code, cp_number,
|
||||
lattitude, longitude, image_address, image_receipt,
|
||||
image_qr, validate_location, goal_time, late_point,
|
||||
create_at, create_user, update_at, update_user,
|
||||
buy_flag, colabo_company_memo, points, event_id,
|
||||
team_id, validation_status
|
||||
) VALUES (
|
||||
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
|
||||
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
|
||||
%s, %s
|
||||
);
|
||||
""", [
|
||||
0, # path_order（デフォルト値）
|
||||
str(zekken_number), # zekken_number
|
||||
event_code, # event_code
|
||||
cp_number, # cp_number
|
||||
lattitude, # lattitude
|
||||
longitude, # longitude
|
||||
image_address, # image_address
|
||||
image_receipt, # image_receipt
|
||||
bool(image_qr) if image_qr is not None else False, # image_qr
|
||||
bool(validate_location) if validate_location is not None else False, # validate_location
|
||||
goal_time, # goal_time
|
||||
late_point, # late_point
|
||||
create_at, # create_at
|
||||
create_user, # create_user
|
||||
update_at, # update_at
|
||||
update_user, # update_user
|
||||
bool(buy_flag) if buy_flag is not None else False, # buy_flag
|
||||
colabo_company_memo or '', # colabo_company_memo
|
||||
points, # points
|
||||
event_id, # event_id
|
||||
team_id, # team_id
|
||||
'pending' # validation_status（デフォルト値）
|
||||
])
|
||||
migrated_gps_count += 1
|
||||
|
||||
except Exception as e:
|
||||
if migrated_gps_count < 5: # 最初の5件のエラーのみ表示
|
||||
print(f" ❌ GPS記録移行エラー: ゼッケン{zekken_number} - {e}")
|
||||
|
||||
# バッチごとにコミット
|
||||
connection.commit()
|
||||
|
||||
print(f" ✅ GPS情報移行完了: {migrated_gps_count}件作成")
|
||||
else:
|
||||
print(" 📍 GPS情報が存在しません")
|
||||
|
||||
old_conn.close()
|
||||
gifuroge_conn.close()
|
||||
|
||||
# === 最終確認 ===
|
||||
print("\n=== 移行結果確認 ===")
|
||||
|
||||
total_teams = Team.objects.count()
|
||||
total_members = Member.objects.count()
|
||||
total_entries = Entry.objects.count()
|
||||
|
||||
# GPS情報確認
|
||||
with connection.cursor() as cursor:
|
||||
cursor.execute("SELECT COUNT(*) FROM gps_checkins;")
|
||||
total_gps = cursor.fetchone()[0]
|
||||
|
||||
print(f"総チーム数: {total_teams}件")
|
||||
print(f"総メンバー数: {total_members}件")
|
||||
print(f"総エントリー数: {total_entries}件")
|
||||
print(f"総GPS記録数: {total_gps}件")
|
||||
|
||||
# イベント別エントリー統計
|
||||
print("\n=== イベント別エントリー統計 ===")
|
||||
for event_id, event_name in existing_events[:10]:
|
||||
entry_count = Entry.objects.filter(event_id=event_id).count()
|
||||
if entry_count > 0:
|
||||
print(f" {event_name}: {entry_count}件")
|
||||
|
||||
print("\n🎉 全イベントデータ移行（GPS情報含む）が完了しました！")
|
||||
print("🎯 通過審査管理画面で全てのイベントのゼッケン番号が表示され、")
|
||||
print(" GPS情報による通過データも利用可能になります。")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,216 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
gifuroge.event_table から rogdb.rog_newevent2 への移行スクリプト
|
||||
|
||||
移行条件:
|
||||
- event_day < '2024-10-01' のデータを移行
|
||||
- self_rogaining = False として移行
|
||||
- その他 = True として移行
|
||||
|
||||
フィールドマッピング:
|
||||
- gifuroge.event_table.event_code → rogdb.rog_newevent2.event_name
|
||||
- gifuroge.event_table.event_name → rogdb.rog_newevent2.event_description
|
||||
- gifuroge.event_table.event_day + start_time → rogdb.rog_newevent2.start_datetime
|
||||
- gifuroge.event_table.event_day + start_time + 5H → rogdb.rog_newevent2.end_datetime
|
||||
- gifuroge.event_table.event_day + start_time - 3day → rogdb.rog_newevent2.deadlineDateTime
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from datetime import datetime, timedelta
|
||||
import psycopg2
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from rog.models import NewEvent2
|
||||
from django.utils import timezone
|
||||
import pytz
|
||||
|
||||
print("=== gifuroge.event_table から rogdb.rog_newevent2 への移行 ===")
|
||||
|
||||
# JST タイムゾーン設定
|
||||
JST = pytz.timezone('Asia/Tokyo')
|
||||
|
||||
def parse_datetime(event_day, start_time):
|
||||
"""event_dayとstart_timeを結合してdatetimeオブジェクトを作成"""
|
||||
try:
|
||||
# event_dayの正規化
|
||||
if isinstance(event_day, str):
|
||||
# スラッシュをハイフンに置換
|
||||
if '/' in event_day:
|
||||
event_day = event_day.replace('/', '-')
|
||||
# 年が2桁の場合は20を付加
|
||||
parts = event_day.split('-')
|
||||
if len(parts) == 3 and len(parts[0]) == 2:
|
||||
parts[0] = '20' + parts[0]
|
||||
event_day = '-'.join(parts)
|
||||
|
||||
# start_timeの正規化（デフォルト値を設定）
|
||||
if not start_time or start_time == '':
|
||||
start_time = '09:00:00'
|
||||
|
||||
# 時刻形式の確認と修正
|
||||
if start_time.count(':') == 1:
|
||||
start_time = start_time + ':00'
|
||||
elif start_time.count(':') == 0:
|
||||
start_time = start_time + ':00:00'
|
||||
|
||||
# datetimeオブジェクトの作成
|
||||
datetime_str = f"{event_day} {start_time}"
|
||||
dt = datetime.strptime(datetime_str, '%Y-%m-%d %H:%M:%S')
|
||||
|
||||
# JST タイムゾーンを設定
|
||||
dt_jst = JST.localize(dt)
|
||||
|
||||
return dt_jst
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ 日時解析エラー: event_day={event_day}, start_time={start_time}, error={e}")
|
||||
# デフォルト値として現在時刻を返す
|
||||
return timezone.now()
|
||||
|
||||
try:
|
||||
# gifuroge データベースに接続
|
||||
gifuroge_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='gifuroge',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ gifurogeデータベースに接続成功")
|
||||
|
||||
with gifuroge_conn.cursor() as cursor:
|
||||
# 移行対象データの取得
|
||||
print("\\n=== STEP 1: 移行対象データの確認 ===")
|
||||
|
||||
cursor.execute("""
|
||||
SELECT event_code, event_name, start_time, event_day
|
||||
FROM event_table
|
||||
WHERE event_day < '2024-10-01'
|
||||
AND event_code IS NOT NULL
|
||||
AND event_code != ''
|
||||
AND start_time > '07:00:00'
|
||||
ORDER BY event_day
|
||||
""")
|
||||
|
||||
events_to_migrate = cursor.fetchall()
|
||||
print(f"移行対象イベント: {len(events_to_migrate)}件")
|
||||
|
||||
if len(events_to_migrate) == 0:
|
||||
print("移行対象のイベントがありません。")
|
||||
gifuroge_conn.close()
|
||||
sys.exit(0)
|
||||
|
||||
# データの確認表示
|
||||
for event_code, event_name, start_time, event_day in events_to_migrate[:10]:
|
||||
print(f" {event_code}: {event_name} ({event_day} {start_time})")
|
||||
|
||||
if len(events_to_migrate) > 10:
|
||||
print(f" ... 他 {len(events_to_migrate) - 10} 件")
|
||||
|
||||
# 移行の実行
|
||||
print(f"\\n=== STEP 2: データ移行の実行 ===")
|
||||
|
||||
migrated_count = 0
|
||||
updated_count = 0
|
||||
error_count = 0
|
||||
|
||||
with transaction.atomic():
|
||||
for event_code, event_name, start_time, event_day in events_to_migrate:
|
||||
try:
|
||||
# 日時の計算
|
||||
start_datetime = parse_datetime(event_day, start_time)
|
||||
end_datetime = start_datetime + timedelta(hours=5)
|
||||
deadline_datetime = start_datetime - timedelta(days=3)
|
||||
|
||||
# 既存データのチェックと更新または新規作成
|
||||
existing_event = NewEvent2.objects.filter(event_name=event_code).first()
|
||||
|
||||
if existing_event:
|
||||
# 既存データを更新
|
||||
existing_event.event_description = event_name
|
||||
existing_event.start_datetime = start_datetime
|
||||
existing_event.end_datetime = end_datetime
|
||||
existing_event.deadlineDateTime = deadline_datetime
|
||||
existing_event.self_rogaining = False
|
||||
existing_event.status = 'public'
|
||||
existing_event.public = True
|
||||
existing_event.hour_5 = True
|
||||
existing_event.hour_3 = False
|
||||
existing_event.class_general = True
|
||||
existing_event.class_family = True
|
||||
existing_event.class_solo_male = True
|
||||
existing_event.class_solo_female = True
|
||||
existing_event.event_code = event_code
|
||||
existing_event.start_time = start_time
|
||||
existing_event.event_day = event_day
|
||||
|
||||
existing_event.save()
|
||||
updated_count += 1
|
||||
print(f"🔄 更新完了: {event_code}")
|
||||
else:
|
||||
# 新しいイベントレコードの作成
|
||||
new_event = NewEvent2(
|
||||
event_name=event_code, # event_code → event_name
|
||||
event_description=event_name, # event_name → event_description
|
||||
start_datetime=start_datetime,
|
||||
end_datetime=end_datetime,
|
||||
deadlineDateTime=deadline_datetime,
|
||||
self_rogaining=False, # 指定条件
|
||||
# その他=True に相当するフィールドがないため、コメントで記録
|
||||
# 必要に応じてフィールドを追加する
|
||||
status='public', # デフォルトステータス
|
||||
public=True, # 公開設定
|
||||
hour_5=True, # 5時間イベント
|
||||
hour_3=False, # 3時間イベントではない
|
||||
class_general=True, # 一般クラス有効
|
||||
class_family=True, # ファミリークラス有効
|
||||
class_solo_male=True, # 男子ソロクラス有効
|
||||
class_solo_female=True, # 女子ソロクラス有効
|
||||
# MobServer統合フィールドの設定
|
||||
event_code=event_code,
|
||||
start_time=start_time,
|
||||
event_day=event_day
|
||||
)
|
||||
|
||||
new_event.save()
|
||||
migrated_count += 1
|
||||
print(f"✅ 新規作成: {event_code}")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
print(f"❌ 移行エラー: {event_code} - {e}")
|
||||
continue
|
||||
|
||||
print(f"\\n=== 移行結果 ===")
|
||||
print(f"新規作成: {migrated_count}件")
|
||||
print(f"更新完了: {updated_count}件")
|
||||
print(f"移行エラー: {error_count}件")
|
||||
print(f"合計処理: {migrated_count + updated_count + error_count}件")
|
||||
|
||||
# 移行結果の確認
|
||||
print(f"\\n=== 移行後データ確認 ===")
|
||||
migrated_events = NewEvent2.objects.filter(
|
||||
self_rogaining=False
|
||||
).order_by('start_datetime')
|
||||
|
||||
print(f"移行されたイベント数: {migrated_events.count()}件")
|
||||
for event in migrated_events[:10]:
|
||||
print(f" {event.event_name}: {event.event_description} ({event.start_datetime})")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ 移行処理でエラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
finally:
|
||||
if 'gifuroge_conn' in locals():
|
||||
gifuroge_conn.close()
|
||||
print("✅ データベース接続を閉じました")
|
||||
|
||||
print("\\n=== 移行処理完了 ===")
|
||||
@ -1,150 +0,0 @@
|
||||
-- gifuroge.event_table から rogdb.rog_newevent2 への移行SQL
|
||||
--
|
||||
-- 移行条件:
|
||||
-- - event_day < '2024-10-01' のデータを移行
|
||||
-- - self_rogaining = False として移行
|
||||
-- - その他 = True として移行（コメントで記録）
|
||||
--
|
||||
-- 実行前の準備:
|
||||
-- 1. gifurogeデータベースからrogdbデータベースへのdblink接続が必要
|
||||
-- 2. または、両方のデータベースに同時アクセス可能な環境での実行
|
||||
|
||||
-- Step 1: 移行対象データの確認
|
||||
-- gifurogeデータベースで実行
|
||||
SELECT
|
||||
event_code,
|
||||
event_name,
|
||||
start_time,
|
||||
event_day,
|
||||
-- 日時計算の確認
|
||||
CASE
|
||||
WHEN start_time IS NULL OR start_time = '' THEN
|
||||
(event_day || ' 09:00:00')::timestamp
|
||||
ELSE
|
||||
(event_day || ' ' || start_time || ':00')::timestamp
|
||||
END as start_datetime,
|
||||
CASE
|
||||
WHEN start_time IS NULL OR start_time = '' THEN
|
||||
(event_day || ' 09:00:00')::timestamp + INTERVAL '5 hours'
|
||||
ELSE
|
||||
(event_day || ' ' || start_time || ':00')::timestamp + INTERVAL '5 hours'
|
||||
END as end_datetime,
|
||||
CASE
|
||||
WHEN start_time IS NULL OR start_time = '' THEN
|
||||
(event_day || ' 09:00:00')::timestamp - INTERVAL '3 days'
|
||||
ELSE
|
||||
(event_day || ' ' || start_time || ':00')::timestamp - INTERVAL '3 days'
|
||||
END as deadline_datetime
|
||||
FROM event_table
|
||||
WHERE event_day < '2024-10-01'
|
||||
AND event_code IS NOT NULL
|
||||
AND event_code != ''
|
||||
ORDER BY event_day;
|
||||
|
||||
-- Step 2: 実際の移行（rogdbデータベースで実行）
|
||||
-- 注意: 以下のSQLはrogdbデータベースで実行する必要があります
|
||||
-- gifurogeデータベースからのデータ取得にはdblinkまたは別の方法が必要です
|
||||
|
||||
-- dblinkを使用する場合の例:
|
||||
-- SELECT dblink_connect('gifuroge_conn', 'host=postgres-db dbname=gifuroge user=admin password=admin123456');
|
||||
|
||||
-- 移行用のINSERT文（手動で値を入力する場合の例）
|
||||
/*
|
||||
INSERT INTO rog_newevent2 (
|
||||
event_name, -- gifuroge.event_table.event_code
|
||||
event_description, -- gifuroge.event_table.event_name
|
||||
start_datetime, -- gifuroge.event_table.event_day + start_time
|
||||
end_datetime, -- start_datetime + 5 hours
|
||||
"deadlineDateTime", -- start_datetime - 3 days
|
||||
self_rogaining, -- False
|
||||
status, -- 'public'
|
||||
public, -- True
|
||||
hour_5, -- True
|
||||
hour_3, -- False
|
||||
class_general, -- True
|
||||
class_family, -- True
|
||||
class_solo_male, -- True
|
||||
class_solo_female, -- True
|
||||
event_code, -- gifuroge.event_table.event_code (MobServer統合)
|
||||
start_time, -- gifuroge.event_table.start_time (MobServer統合)
|
||||
event_day -- gifuroge.event_table.event_day (MobServer統合)
|
||||
)
|
||||
SELECT
|
||||
et.event_code as event_name,
|
||||
et.event_name as event_description,
|
||||
CASE
|
||||
WHEN et.start_time IS NULL OR et.start_time = '' THEN
|
||||
(et.event_day || ' 09:00:00')::timestamp AT TIME ZONE 'Asia/Tokyo'
|
||||
ELSE
|
||||
(et.event_day || ' ' || et.start_time || ':00')::timestamp AT TIME ZONE 'Asia/Tokyo'
|
||||
END as start_datetime,
|
||||
CASE
|
||||
WHEN et.start_time IS NULL OR et.start_time = '' THEN
|
||||
(et.event_day || ' 09:00:00')::timestamp AT TIME ZONE 'Asia/Tokyo' + INTERVAL '5 hours'
|
||||
ELSE
|
||||
(et.event_day || ' ' || et.start_time || ':00')::timestamp AT TIME ZONE 'Asia/Tokyo' + INTERVAL '5 hours'
|
||||
END as end_datetime,
|
||||
CASE
|
||||
WHEN et.start_time IS NULL OR et.start_time = '' THEN
|
||||
(et.event_day || ' 09:00:00')::timestamp AT TIME ZONE 'Asia/Tokyo' - INTERVAL '3 days'
|
||||
ELSE
|
||||
(et.event_day || ' ' || et.start_time || ':00')::timestamp AT TIME ZONE 'Asia/Tokyo' - INTERVAL '3 days'
|
||||
END as deadline_datetime,
|
||||
false as self_rogaining, -- 指定条件
|
||||
'public' as status, -- デフォルトステータス
|
||||
true as public, -- 公開設定
|
||||
true as hour_5, -- 5時間イベント
|
||||
false as hour_3, -- 3時間イベントではない
|
||||
true as class_general, -- 一般クラス有効
|
||||
true as class_family, -- ファミリークラス有効
|
||||
true as class_solo_male, -- 男子ソロクラス有効
|
||||
true as class_solo_female, -- 女子ソロクラス有効
|
||||
et.event_code, -- MobServer統合フィールド
|
||||
et.start_time, -- MobServer統合フィールド
|
||||
et.event_day -- MobServer統合フィールド
|
||||
FROM dblink('gifuroge_conn',
|
||||
'SELECT event_code, event_name, start_time, event_day
|
||||
FROM event_table
|
||||
WHERE event_day < ''2024-10-01''
|
||||
AND event_code IS NOT NULL
|
||||
AND event_code != ''''
|
||||
ORDER BY event_day'
|
||||
) AS et(event_code text, event_name text, start_time text, event_day text)
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM rog_newevent2 WHERE event_name = et.event_code
|
||||
);
|
||||
*/
|
||||
|
||||
-- dblinkの切断
|
||||
-- SELECT dblink_disconnect('gifuroge_conn');
|
||||
|
||||
-- Step 3: 移行結果の確認
|
||||
SELECT
|
||||
id,
|
||||
event_name,
|
||||
event_description,
|
||||
start_datetime,
|
||||
end_datetime,
|
||||
"deadlineDateTime",
|
||||
self_rogaining,
|
||||
status,
|
||||
event_code,
|
||||
start_time,
|
||||
event_day
|
||||
FROM rog_newevent2
|
||||
WHERE self_rogaining = false
|
||||
AND event_code IS NOT NULL
|
||||
ORDER BY start_datetime;
|
||||
|
||||
-- 移行件数の確認
|
||||
SELECT
|
||||
COUNT(*) as total_migrated_events
|
||||
FROM rog_newevent2
|
||||
WHERE self_rogaining = false
|
||||
AND event_code IS NOT NULL;
|
||||
|
||||
-- 注意事項:
|
||||
-- 1. 上記のSQLは例であり、実際の実行環境に応じて調整が必要です
|
||||
-- 2. dblinkを使用しない場合は、ETLツールやアプリケーションレベルでの移行を推奨します
|
||||
-- 3. "その他=True"に相当するフィールドが見つからない場合、新しいフィールドの追加を検討してください
|
||||
-- 4. 実行前に必ずバックアップを取ってください
|
||||
@ -1,256 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への包括的FC岐阜データ移行スクリプト
|
||||
Team → Member → Entry の順序で移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser, Member
|
||||
from datetime import datetime
|
||||
import psycopg2
|
||||
|
||||
print("=== FC岐阜包括データ移行（Team→Member→Entry順序）===")
|
||||
|
||||
try:
|
||||
# old_rogdbに直接接続
|
||||
old_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='old_rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ old_rogdbに接続成功")
|
||||
|
||||
# FC岐阜イベントを確認
|
||||
fc_event = NewEvent2.objects.filter(id=10).first()
|
||||
if not fc_event:
|
||||
print("❌ FC岐阜イベント（ID:10）が見つかりません")
|
||||
old_conn.close()
|
||||
sys.exit(1)
|
||||
|
||||
print(f"✅ FC岐阜イベント: {fc_event.event_name}")
|
||||
print(f" 期間: {fc_event.start_datetime} - {fc_event.end_datetime}")
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
# Step 1: FC岐阜のチームデータを取得・移行
|
||||
print("\\n=== Step 1: チーム移行 ===")
|
||||
old_cursor.execute("""
|
||||
SELECT DISTINCT rt.id, rt.team_name, rt.owner_id, rt.category_id,
|
||||
rc.category_name, rt.password, rt.trial
|
||||
FROM rog_team rt
|
||||
JOIN rog_entry re ON rt.id = re.team_id
|
||||
LEFT JOIN rog_newcategory rc ON rt.category_id = rc.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY rt.id;
|
||||
""")
|
||||
|
||||
team_data = old_cursor.fetchall()
|
||||
print(f"FC岐阜関連チーム: {len(team_data)}件")
|
||||
|
||||
team_created_count = 0
|
||||
team_errors = 0
|
||||
|
||||
for team_id, team_name, owner_id, cat_id, cat_name, password, trial in team_data:
|
||||
try:
|
||||
# カテゴリを取得または作成
|
||||
category = None
|
||||
if cat_id and cat_name:
|
||||
category, cat_created = NewCategory.objects.get_or_create(
|
||||
id=cat_id,
|
||||
defaults={
|
||||
'category_name': cat_name,
|
||||
'category_number': cat_id
|
||||
}
|
||||
)
|
||||
if cat_created:
|
||||
print(f" カテゴリ作成: {cat_name}")
|
||||
|
||||
# チームを作成（メンバー制約を一時的に無視）
|
||||
team, team_created = Team.objects.get_or_create(
|
||||
id=team_id,
|
||||
defaults={
|
||||
'team_name': team_name,
|
||||
'owner_id': owner_id or 1,
|
||||
'category': category,
|
||||
'event_id': fc_event.id,
|
||||
'password': password or '',
|
||||
'trial': trial or False
|
||||
}
|
||||
)
|
||||
|
||||
if team_created:
|
||||
print(f" ✅ チーム作成: {team_name} (ID: {team_id})")
|
||||
team_created_count += 1
|
||||
else:
|
||||
print(f" 🔄 既存チーム: {team_name} (ID: {team_id})")
|
||||
|
||||
except Exception as e:
|
||||
team_errors += 1
|
||||
print(f" ❌ チームエラー: {team_name} - {e}")
|
||||
|
||||
# Step 2: メンバーデータを取得・移行
|
||||
print(f"\\n=== Step 2: メンバー移行 ===")
|
||||
old_cursor.execute("""
|
||||
SELECT rm.id, rm.team_id, rm.user_id, cu.firstname, cu.lastname, cu.email
|
||||
FROM rog_member rm
|
||||
JOIN rog_team rt ON rm.team_id = rt.id
|
||||
JOIN rog_entry re ON rt.id = re.team_id
|
||||
LEFT JOIN rog_customuser cu ON rm.user_id = cu.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY rm.team_id, rm.id;
|
||||
""")
|
||||
|
||||
member_data = old_cursor.fetchall()
|
||||
print(f"FC岐阜関連メンバー: {len(member_data)}件")
|
||||
|
||||
member_created_count = 0
|
||||
member_errors = 0
|
||||
|
||||
for member_id, team_id, user_id, firstname, lastname, email in member_data:
|
||||
try:
|
||||
# チームを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
|
||||
# ユーザーを取得または作成
|
||||
user = None
|
||||
if user_id:
|
||||
try:
|
||||
user = CustomUser.objects.get(id=user_id)
|
||||
except CustomUser.DoesNotExist:
|
||||
# ユーザーが存在しない場合は作成
|
||||
user = CustomUser.objects.create(
|
||||
id=user_id,
|
||||
email=email or f"user{user_id}@example.com",
|
||||
firstname=firstname or "名前",
|
||||
lastname=lastname or "苗字",
|
||||
is_active=True
|
||||
)
|
||||
print(f" ユーザー作成: {firstname} {lastname}")
|
||||
|
||||
# メンバーを作成
|
||||
member, member_created = Member.objects.get_or_create(
|
||||
team=team,
|
||||
user=user,
|
||||
defaults={}
|
||||
)
|
||||
|
||||
if member_created:
|
||||
print(f" ✅ メンバー作成: {firstname} {lastname} -> {team.team_name}")
|
||||
member_created_count += 1
|
||||
else:
|
||||
print(f" 🔄 既存メンバー: {firstname} {lastname} -> {team.team_name}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません")
|
||||
except Exception as e:
|
||||
member_errors += 1
|
||||
print(f" ❌ メンバーエラー: {firstname} {lastname} - {e}")
|
||||
|
||||
# Step 3: エントリーデータを移行
|
||||
print(f"\\n=== Step 3: エントリー移行 ===")
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id,
|
||||
rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY re.zekken_number;
|
||||
""")
|
||||
|
||||
entry_data = old_cursor.fetchall()
|
||||
print(f"FC岐阜エントリー: {len(entry_data)}件")
|
||||
|
||||
entry_created_count = 0
|
||||
entry_errors = 0
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name in entry_data:
|
||||
try:
|
||||
# チームを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
|
||||
# カテゴリを取得
|
||||
category = None
|
||||
if cat_id:
|
||||
try:
|
||||
category = NewCategory.objects.get(id=cat_id)
|
||||
except NewCategory.DoesNotExist:
|
||||
pass
|
||||
|
||||
# 日時を調整（イベント期間内に設定）
|
||||
entry_date = fc_event.start_datetime
|
||||
if date:
|
||||
try:
|
||||
# 既存の日付がイベント期間内かチェック
|
||||
if fc_event.start_datetime.date() <= date.date() <= fc_event.end_datetime.date():
|
||||
entry_date = date
|
||||
except:
|
||||
pass
|
||||
|
||||
# エントリーを作成
|
||||
entry, entry_created = Entry.objects.get_or_create(
|
||||
team=team,
|
||||
event=fc_event,
|
||||
defaults={
|
||||
'category': category,
|
||||
'date': entry_date,
|
||||
'owner_id': owner_id or 1,
|
||||
'zekken_number': int(zekken) if zekken else 0,
|
||||
'zekken_label': label or f"FC岐阜-{zekken}",
|
||||
'is_active': True,
|
||||
'hasParticipated': False,
|
||||
'hasGoaled': False
|
||||
}
|
||||
)
|
||||
|
||||
if entry_created:
|
||||
print(f" ✅ エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
entry_created_count += 1
|
||||
else:
|
||||
print(f" 🔄 既存エントリー: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません: {team_name}")
|
||||
entry_errors += 1
|
||||
except Exception as e:
|
||||
entry_errors += 1
|
||||
print(f" ❌ エントリーエラー: {team_name} - {e}")
|
||||
|
||||
old_conn.close()
|
||||
|
||||
print(f"\\n=== 移行完了統計 ===")
|
||||
print(f"チーム作成: {team_created_count}件 (エラー: {team_errors}件)")
|
||||
print(f"メンバー作成: {member_created_count}件 (エラー: {member_errors}件)")
|
||||
print(f"エントリー作成: {entry_created_count}件 (エラー: {entry_errors}件)")
|
||||
|
||||
# 最終確認
|
||||
fc_entries = Entry.objects.filter(event=fc_event).order_by('zekken_number')
|
||||
print(f"\\n🎉 FC岐阜イベント総エントリー: {fc_entries.count()}件")
|
||||
|
||||
if fc_entries.exists():
|
||||
print("\\nゼッケン番号一覧（最初の10件）:")
|
||||
for entry in fc_entries[:10]:
|
||||
print(f" ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
|
||||
if fc_entries.count() > 10:
|
||||
print(f" ... 他 {fc_entries.count() - 10}件")
|
||||
|
||||
print("\\n🎉 FC岐阜イベントのゼッケン番号表示問題が解決されました！")
|
||||
print("🎯 通過審査管理画面でFC岐阜を選択すると、参加者のゼッケン番号が表示されるようになります。")
|
||||
else:
|
||||
print("❌ エントリーが作成されませんでした")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,185 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
FC岐阜イベント限定データ移行スクリプト
|
||||
FC岐阜イベントに関連するチーム・エントリーのみを移行して問題を解決
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connection
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser
|
||||
|
||||
print("=== FC岐阜イベント限定データ移行 ===")
|
||||
|
||||
try:
|
||||
# FC岐阜イベントを確認
|
||||
fc_event = NewEvent2.objects.filter(event_name__icontains='FC岐阜').first()
|
||||
if not fc_event:
|
||||
print("❌ FC岐阜イベントが見つかりません")
|
||||
sys.exit(1)
|
||||
|
||||
print(f"✅ FC岐阜イベント: {fc_event.event_name} (ID: {fc_event.id})")
|
||||
|
||||
with connection.cursor() as cursor:
|
||||
# まず、全体的なデータ構造を確認
|
||||
print("\\n=== データベース構造調査 ===")
|
||||
|
||||
# 1. rog_entry テーブルの全体状況
|
||||
cursor.execute("SELECT COUNT(*) FROM rog_entry;")
|
||||
total_entries = cursor.fetchone()[0]
|
||||
print(f"総エントリー数: {total_entries}件")
|
||||
|
||||
# 2. rog_entry のフィールド構造確認
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_entry'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
entry_columns = cursor.fetchall()
|
||||
print("\\nrog_entry テーブル構造:")
|
||||
for col_name, data_type, nullable in entry_columns:
|
||||
print(f" - {col_name}: {data_type} {'(NULL可)' if nullable == 'YES' else '(NOT NULL)'}")
|
||||
|
||||
# 3. rog_team テーブルも確認（ゼッケン情報がチーム側にある可能性）
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_team'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
team_columns = cursor.fetchall()
|
||||
print("\\nrog_team テーブル構造:")
|
||||
for col_name, data_type, nullable in team_columns:
|
||||
if 'zekken' in col_name.lower() or 'number' in col_name.lower():
|
||||
print(f" 🎯 {col_name}: {data_type} {'(NULL可)' if nullable == 'YES' else '(NOT NULL)'}")
|
||||
else:
|
||||
print(f" - {col_name}: {data_type}")
|
||||
|
||||
# 4. イベント別エントリー数確認
|
||||
cursor.execute("""
|
||||
SELECT e.id, e.event_name, COUNT(re.id) as entry_count
|
||||
FROM rog_newevent2 e
|
||||
LEFT JOIN rog_entry re ON e.id = re.event_id
|
||||
GROUP BY e.id, e.event_name
|
||||
ORDER BY entry_count DESC
|
||||
LIMIT 10;
|
||||
""")
|
||||
event_entries = cursor.fetchall()
|
||||
print("\\n=== イベント別エントリー数（上位10件） ===")
|
||||
for event_id, event_name, count in event_entries:
|
||||
print(f" Event {event_id}: '{event_name}' - {count}件")
|
||||
|
||||
# 5. FC岐阜関連のより広範囲な検索
|
||||
cursor.execute("""
|
||||
SELECT re.*, rt.team_name, rt.zekken_number as team_zekken
|
||||
FROM rog_entry re
|
||||
JOIN rog_newevent2 e ON re.event_id = e.id
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
WHERE e.event_name LIKE '%FC岐阜%' OR e.event_name LIKE '%fc岐阜%' OR e.event_name LIKE '%FC%'
|
||||
LIMIT 20;
|
||||
""")
|
||||
|
||||
fc_entry_data = cursor.fetchall()
|
||||
print(f"\\n✅ FC岐阜関連エントリー（広範囲検索）: {len(fc_entry_data)}件")
|
||||
|
||||
if fc_entry_data:
|
||||
print("\\n🔍 FC岐阜関連データ詳細:")
|
||||
for row in fc_entry_data[:5]: # 最初の5件を表示
|
||||
print(f" Entry ID: {row[0]}, Team: {row[-2]}, Team Zekken: {row[-1]}")
|
||||
|
||||
# 6. チームテーブルでゼッケン番号がある場合を確認
|
||||
cursor.execute("""
|
||||
SELECT rt.id, rt.team_name, rt.zekken_number, rt.event_id
|
||||
FROM rog_team rt
|
||||
JOIN rog_newevent2 e ON rt.event_id = e.id
|
||||
WHERE e.event_name LIKE '%FC岐阜%'
|
||||
AND rt.zekken_number IS NOT NULL
|
||||
AND rt.zekken_number != ''
|
||||
ORDER BY CAST(rt.zekken_number AS INTEGER)
|
||||
LIMIT 20;
|
||||
""")
|
||||
|
||||
team_zekken_data = cursor.fetchall()
|
||||
print(f"\\n✅ FC岐阜チームのゼッケン番号: {len(team_zekken_data)}件")
|
||||
|
||||
if team_zekken_data:
|
||||
print("\\n🎯 チーム側のゼッケン番号データ:")
|
||||
for team_id, team_name, zekken, event_id in team_zekken_data[:10]:
|
||||
print(f" チーム{team_id}: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
# チーム側にゼッケン情報がある場合、それを使ってエントリーを作成
|
||||
print("\\n=== チーム側ゼッケン情報からエントリー作成 ===")
|
||||
created_entries = 0
|
||||
|
||||
for team_id, team_name, zekken, event_id in team_zekken_data:
|
||||
# チームを取得
|
||||
try:
|
||||
team = Team.objects.get(id=team_id)
|
||||
|
||||
# エントリーを作成
|
||||
entry, entry_created = Entry.objects.get_or_create(
|
||||
team=team,
|
||||
event=fc_event,
|
||||
defaults={
|
||||
'category': team.category,
|
||||
'date': fc_event.start_datetime,
|
||||
'owner': team.owner,
|
||||
'zekken_number': int(zekken) if zekken.isdigit() else 0,
|
||||
'zekken_label': f"FC岐阜-{zekken}",
|
||||
'is_active': True,
|
||||
'hasParticipated': False,
|
||||
'hasGoaled': False
|
||||
}
|
||||
)
|
||||
|
||||
if entry_created:
|
||||
created_entries += 1
|
||||
print(f" エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が新DBに存在しません: {team_name}")
|
||||
except Exception as e:
|
||||
print(f" ❌ エラー: {e}")
|
||||
|
||||
print(f"\\n✅ 作成されたエントリー: {created_entries}件")
|
||||
else:
|
||||
print("❌ チーム側にもゼッケン情報がありません")
|
||||
|
||||
# 7. 最終確認
|
||||
fc_entries = Entry.objects.filter(event=fc_event).order_by('zekken_number')
|
||||
print(f"\\n=== 最終結果 ===")
|
||||
print(f"FC岐阜イベント総エントリー: {fc_entries.count()}件")
|
||||
|
||||
if fc_entries.exists():
|
||||
print("\\n🎉 ゼッケン番号一覧（最初の10件）:")
|
||||
for entry in fc_entries[:10]:
|
||||
print(f" ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
print("\\n🎉 FC岐阜イベントのゼッケン番号表示問題が解決されました！")
|
||||
else:
|
||||
print("\\n❌ まだエントリーデータがありません")
|
||||
|
||||
# 8. デバッグ用：全てのチームデータを確認
|
||||
all_teams = Team.objects.all()[:10]
|
||||
print(f"\\n🔍 新DBの全チーム（最初の10件、総数: {Team.objects.count()}件）:")
|
||||
for team in all_teams:
|
||||
entries = Entry.objects.filter(team=team)
|
||||
print(f" Team {team.id}: {team.team_name} (エントリー: {entries.count()}件)")
|
||||
|
||||
# 9. FC岐阜イベントの詳細情報
|
||||
print(f"\\n🔍 FC岐阜イベント詳細:")
|
||||
print(f" ID: {fc_event.id}")
|
||||
print(f" 名前: {fc_event.event_name}")
|
||||
print(f" 開始日: {fc_event.start_datetime}")
|
||||
print(f" 終了日: {fc_event.end_datetime}")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,300 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb への段階的FC岐阜データ移行スクリプト
|
||||
1. Team/Member → 2. Entry の順序で移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import transaction
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser, Member
|
||||
import psycopg2
|
||||
|
||||
print("=== old_rogdb から FC岐阜データ段階的移行 ===")
|
||||
|
||||
try:
|
||||
# old_rogdbに直接接続
|
||||
old_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='old_rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ old_rogdbに接続成功")
|
||||
|
||||
# FC岐阜イベントを確認
|
||||
fc_event = NewEvent2.objects.filter(id=10).first()
|
||||
if not fc_event:
|
||||
print("❌ FC岐阜イベント（ID:10）が見つかりません")
|
||||
old_conn.close()
|
||||
sys.exit(1)
|
||||
|
||||
print(f"✅ FC岐阜イベント: {fc_event.event_name}")
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
# === STEP 1: Team & Member データ取得 ===
|
||||
print("\\n=== STEP 1: Team & Member データ取得 ===")
|
||||
|
||||
# FC岐阜関連のチーム情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT DISTINCT rt.id, rt.team_name, rt.owner_id, rt.category_id,
|
||||
rc.category_name, cu.email, cu.firstname, cu.lastname
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON rt.category_id = rc.id
|
||||
LEFT JOIN rog_customuser cu ON rt.owner_id = cu.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY rt.id;
|
||||
""")
|
||||
|
||||
team_data = old_cursor.fetchall()
|
||||
print(f"FC岐阜関連チーム: {len(team_data)}件")
|
||||
|
||||
# チームメンバー情報を取得
|
||||
old_cursor.execute("""
|
||||
SELECT rm.team_id, rm.user_id, cu.email, cu.firstname, cu.lastname
|
||||
FROM rog_entry re
|
||||
JOIN rog_member rm ON re.team_id = rm.team_id
|
||||
JOIN rog_customuser cu ON rm.user_id = cu.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY rm.team_id, rm.user_id;
|
||||
""")
|
||||
|
||||
member_data = old_cursor.fetchall()
|
||||
print(f"FC岐阜関連メンバー: {len(member_data)}件")
|
||||
|
||||
# チーム別メンバー数を確認
|
||||
team_member_count = {}
|
||||
for team_id, user_id, email, first_name, last_name in member_data:
|
||||
if team_id not in team_member_count:
|
||||
team_member_count[team_id] = 0
|
||||
team_member_count[team_id] += 1
|
||||
|
||||
print("\\nチーム別メンバー数:")
|
||||
for team_id, count in team_member_count.items():
|
||||
print(f" Team {team_id}: {count}名")
|
||||
|
||||
# === STEP 2: ユーザー移行 ===
|
||||
print("\\n=== STEP 2: ユーザー移行 ===")
|
||||
|
||||
# 関連するすべてのユーザーを取得
|
||||
all_user_ids = set()
|
||||
for _, _, owner_id, _, _, _, _, _ in team_data:
|
||||
if owner_id:
|
||||
all_user_ids.add(owner_id)
|
||||
for _, user_id, _, _, _ in member_data:
|
||||
all_user_ids.add(user_id)
|
||||
|
||||
if all_user_ids:
|
||||
old_cursor.execute(f"""
|
||||
SELECT id, email, firstname, lastname, date_joined
|
||||
FROM rog_customuser
|
||||
WHERE id IN ({','.join(map(str, all_user_ids))})
|
||||
""")
|
||||
|
||||
user_data = old_cursor.fetchall()
|
||||
print(f"移行対象ユーザー: {len(user_data)}件")
|
||||
|
||||
migrated_users = 0
|
||||
for user_id, email, first_name, last_name, date_joined in user_data:
|
||||
user, created = CustomUser.objects.get_or_create(
|
||||
id=user_id,
|
||||
defaults={
|
||||
'email': email or f'user{user_id}@example.com',
|
||||
'first_name': first_name or '',
|
||||
'last_name': last_name or '',
|
||||
'username': email or f'user{user_id}',
|
||||
'date_joined': date_joined,
|
||||
'is_active': True
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_users += 1
|
||||
print(f" ユーザー作成: {email} ({first_name} {last_name})")
|
||||
|
||||
print(f"✅ ユーザー移行完了: {migrated_users}件作成")
|
||||
|
||||
# === STEP 3: カテゴリ移行 ===
|
||||
print("\\n=== STEP 3: カテゴリ移行 ===")
|
||||
|
||||
migrated_categories = 0
|
||||
for _, _, _, cat_id, cat_name, _, _, _ in team_data:
|
||||
if cat_id and cat_name:
|
||||
category, created = NewCategory.objects.get_or_create(
|
||||
id=cat_id,
|
||||
defaults={
|
||||
'category_name': cat_name,
|
||||
'category_number': cat_id
|
||||
}
|
||||
)
|
||||
if created:
|
||||
migrated_categories += 1
|
||||
print(f" カテゴリ作成: {cat_name}")
|
||||
|
||||
print(f"✅ カテゴリ移行完了: {migrated_categories}件作成")
|
||||
|
||||
# === STEP 4: チーム移行 ===
|
||||
print("\\n=== STEP 4: チーム移行 ===")
|
||||
|
||||
migrated_teams = 0
|
||||
for team_id, team_name, owner_id, cat_id, cat_name, email, first_name, last_name in team_data:
|
||||
try:
|
||||
# カテゴリを取得
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
|
||||
# チームを作成
|
||||
team, created = Team.objects.get_or_create(
|
||||
id=team_id,
|
||||
defaults={
|
||||
'team_name': team_name,
|
||||
'owner_id': owner_id or 1,
|
||||
'category': category,
|
||||
'event_id': fc_event.id
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
migrated_teams += 1
|
||||
print(f" チーム作成: {team_name} (ID: {team_id})")
|
||||
|
||||
except Exception as e:
|
||||
print(f" ❌ チーム作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f"✅ チーム移行完了: {migrated_teams}件作成")
|
||||
|
||||
# === STEP 5: メンバー移行 ===
|
||||
print("\\n=== STEP 5: メンバー移行 ===")
|
||||
|
||||
migrated_members = 0
|
||||
for team_id, user_id, email, first_name, last_name in member_data:
|
||||
try:
|
||||
# チームとユーザーを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
user = CustomUser.objects.get(id=user_id)
|
||||
|
||||
# メンバーを作成
|
||||
member, created = Member.objects.get_or_create(
|
||||
team=team,
|
||||
user=user
|
||||
)
|
||||
|
||||
if created:
|
||||
migrated_members += 1
|
||||
print(f" メンバー追加: {email} → {team.team_name}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません")
|
||||
except CustomUser.DoesNotExist:
|
||||
print(f" ⚠️ ユーザー{user_id}が見つかりません")
|
||||
except Exception as e:
|
||||
print(f" ❌ メンバー追加エラー: {e}")
|
||||
|
||||
print(f"✅ メンバー移行完了: {migrated_members}件作成")
|
||||
|
||||
# === STEP 6: エントリー移行 ===
|
||||
print("\\n=== STEP 6: エントリー移行 ===")
|
||||
|
||||
# まず、現在のDBのis_trialフィールドにデフォルト値を設定
|
||||
print("データベーステーブルのis_trialフィールドを修正中...")
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as django_cursor:
|
||||
try:
|
||||
# is_trialフィールドにデフォルト値を設定
|
||||
django_cursor.execute("""
|
||||
ALTER TABLE rog_entry
|
||||
ALTER COLUMN is_trial SET DEFAULT FALSE;
|
||||
""")
|
||||
print(" ✅ is_trialフィールドにデフォルト値を設定")
|
||||
except Exception as e:
|
||||
print(f" ⚠️ is_trial修正エラー: {e}")
|
||||
|
||||
# FC岐阜エントリーデータを取得
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id,
|
||||
rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY re.zekken_number;
|
||||
""")
|
||||
|
||||
entry_data = old_cursor.fetchall()
|
||||
migrated_entries = 0
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name in entry_data:
|
||||
try:
|
||||
# チームとカテゴリを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
|
||||
# まず既存のエントリーをチェック
|
||||
existing_entry = Entry.objects.filter(team=team, event=fc_event).first()
|
||||
if existing_entry:
|
||||
print(f" 🔄 既存エントリー: {team_name} - ゼッケン{existing_entry.zekken_number}")
|
||||
continue
|
||||
|
||||
# SQLで直接エントリーを挿入
|
||||
from django.db import connection as django_conn
|
||||
with django_conn.cursor() as django_cursor:
|
||||
django_cursor.execute("""
|
||||
INSERT INTO rog_entry
|
||||
(date, category_id, event_id, owner_id, team_id, is_active,
|
||||
zekken_number, "hasGoaled", "hasParticipated", zekken_label,
|
||||
is_trial, staff_privileges, can_access_private_events, team_validation_status)
|
||||
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
|
||||
""", [
|
||||
fc_event.start_datetime, # date
|
||||
cat_id, # category_id
|
||||
fc_event.id, # event_id
|
||||
owner_id or 1, # owner_id
|
||||
team_id, # team_id
|
||||
True, # is_active
|
||||
int(zekken) if zekken else 0, # zekken_number
|
||||
False, # hasGoaled
|
||||
False, # hasParticipated
|
||||
label or f"FC岐阜-{zekken}", # zekken_label
|
||||
False, # is_trial
|
||||
False, # staff_privileges
|
||||
False, # can_access_private_events
|
||||
'approved' # team_validation_status
|
||||
])
|
||||
|
||||
migrated_entries += 1
|
||||
print(f" ✅ エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ❌ チーム{team_id}が見つかりません: {team_name}")
|
||||
except Exception as e:
|
||||
print(f" ❌ エントリー作成エラー: {team_name} - {e}")
|
||||
|
||||
print(f"✅ エントリー移行完了: {migrated_entries}件作成")
|
||||
|
||||
old_conn.close()
|
||||
|
||||
# === 最終確認 ===
|
||||
print("\\n=== 移行結果確認 ===")
|
||||
fc_entries = Entry.objects.filter(event=fc_event).order_by('zekken_number')
|
||||
print(f"FC岐阜イベント総エントリー: {fc_entries.count()}件")
|
||||
|
||||
if fc_entries.exists():
|
||||
print("\\n🎉 ゼッケン番号一覧（最初の10件）:")
|
||||
for entry in fc_entries[:10]:
|
||||
print(f" ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
print("\\n🎉 FC岐阜イベントのゼッケン番号表示問題が解決されました！")
|
||||
print("\\n🎯 通過審査管理画面でFC岐阜を選択すると、ゼッケン番号が表示されるようになります。")
|
||||
else:
|
||||
print("❌ エントリーデータの移行に失敗しました")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,300 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
GPS情報（通過データ）移行スクリプト
|
||||
gifurogeのgps_informationテーブルから新しいrogdbシステムに通過データを移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from datetime import datetime
|
||||
import psycopg2
|
||||
from django.utils import timezone
|
||||
from django.db import transaction
|
||||
|
||||
# Django設定
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from rog.models import (
|
||||
GpsLog, GpsCheckin, CheckinExtended, Entry, NewEvent2,
|
||||
CustomUser, Team, Waypoint, Location2025
|
||||
)
|
||||
|
||||
class GpsInformationMigrator:
|
||||
def __init__(self):
|
||||
# 環境変数から接続情報を取得
|
||||
self.gifuroge_conn_params = {
|
||||
'host': os.environ.get('PG_HOST', 'postgres-db'),
|
||||
'database': 'gifuroge',
|
||||
'user': os.environ.get('POSTGRES_USER', 'postgres'),
|
||||
'password': os.environ.get('POSTGRES_PASS', 'password'),
|
||||
'port': os.environ.get('PG_PORT', 5432),
|
||||
}
|
||||
|
||||
# 統計情報
|
||||
self.stats = {
|
||||
'total_gps_info': 0,
|
||||
'migrated_gps_logs': 0,
|
||||
'migrated_checkins': 0,
|
||||
'skipped_records': 0,
|
||||
'errors': 0,
|
||||
'error_details': []
|
||||
}
|
||||
|
||||
def connect_to_gifuroge(self):
|
||||
"""gifurogeデータベースに接続"""
|
||||
try:
|
||||
conn = psycopg2.connect(**self.gifuroge_conn_params)
|
||||
return conn
|
||||
except Exception as e:
|
||||
print(f"❌ gifurogeデータベース接続エラー: {e}")
|
||||
return None
|
||||
|
||||
def get_gps_information_data(self):
|
||||
"""gifurogeのgps_informationデータを取得"""
|
||||
conn = self.connect_to_gifuroge()
|
||||
if not conn:
|
||||
return []
|
||||
|
||||
try:
|
||||
cursor = conn.cursor()
|
||||
|
||||
# まずテーブル構造を確認
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'gps_information'
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position;
|
||||
""")
|
||||
columns = cursor.fetchall()
|
||||
print("=== gps_information テーブル構造 ===")
|
||||
for col in columns:
|
||||
print(f"- {col[0]}: {col[1]}")
|
||||
|
||||
# データ数確認
|
||||
cursor.execute("SELECT COUNT(*) FROM gps_information;")
|
||||
total_count = cursor.fetchone()[0]
|
||||
self.stats['total_gps_info'] = total_count
|
||||
print(f"\n📊 gps_information 総レコード数: {total_count}")
|
||||
|
||||
if total_count == 0:
|
||||
print("⚠️ gps_informationテーブルにデータがありません")
|
||||
return []
|
||||
|
||||
# 全データを取得（テーブル構造に合わせて修正）
|
||||
cursor.execute("""
|
||||
SELECT
|
||||
serial_number, zekken_number, event_code, cp_number,
|
||||
image_address, goal_time, late_point,
|
||||
create_at, create_user, update_at, update_user,
|
||||
buy_flag, minus_photo_flag, colabo_company_memo
|
||||
FROM gps_information
|
||||
ORDER BY create_at, serial_number;
|
||||
""")
|
||||
|
||||
data = cursor.fetchall()
|
||||
print(f"✅ {len(data)}件のgps_informationデータを取得しました")
|
||||
return data
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ データ取得エラー: {e}")
|
||||
self.stats['errors'] += 1
|
||||
self.stats['error_details'].append(f"データ取得エラー: {e}")
|
||||
return []
|
||||
finally:
|
||||
if conn:
|
||||
conn.close()
|
||||
|
||||
def find_matching_entry(self, zekken_number, event_code):
|
||||
"""ゼッケン番号とイベントコードからEntryを検索"""
|
||||
try:
|
||||
# NewEvent2でイベントを検索
|
||||
events = NewEvent2.objects.filter(event_name__icontains=event_code)
|
||||
if not events.exists():
|
||||
# イベントコードの部分一致で検索
|
||||
events = NewEvent2.objects.filter(
|
||||
event_name__icontains=event_code.replace('_', ' ')
|
||||
)
|
||||
|
||||
for event in events:
|
||||
# ゼッケン番号でEntryを検索
|
||||
entries = Entry.objects.filter(
|
||||
event=event,
|
||||
zekken_number=zekken_number
|
||||
)
|
||||
if entries.exists():
|
||||
return entries.first()
|
||||
|
||||
# 見つからない場合はNone
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ Entry検索エラー (ゼッケン: {zekken_number}, イベント: {event_code}): {e}")
|
||||
return None
|
||||
|
||||
def find_matching_location(self, cp_number):
|
||||
"""CP番号からLocationを検索"""
|
||||
try:
|
||||
if not cp_number:
|
||||
return None
|
||||
|
||||
# Location2025から検索
|
||||
locations = Location2025.objects.filter(cp_number=cp_number)
|
||||
if locations.exists():
|
||||
return locations.first()
|
||||
|
||||
# 部分一致で検索
|
||||
locations = Location2025.objects.filter(cp_number__icontains=str(cp_number))
|
||||
if locations.exists():
|
||||
return locations.first()
|
||||
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
print(f"⚠️ Location検索エラー (CP: {cp_number}): {e}")
|
||||
return None
|
||||
|
||||
def migrate_gps_record(self, record):
|
||||
"""個別のGPS記録を移行"""
|
||||
try:
|
||||
(serial_number, zekken_number, event_code, cp_number,
|
||||
image_address, goal_time, late_point,
|
||||
create_at, create_user, update_at, update_user,
|
||||
buy_flag, minus_photo_flag, colabo_company_memo) = record
|
||||
|
||||
# checkin_timeはcreate_atを使用
|
||||
checkin_time = create_at or timezone.now()
|
||||
|
||||
# Entryを検索
|
||||
entry = self.find_matching_entry(zekken_number, event_code)
|
||||
if not entry:
|
||||
print(f"⚠️ Entry未発見: ゼッケン{zekken_number}, イベント{event_code}")
|
||||
self.stats['skipped_records'] += 1
|
||||
return False
|
||||
|
||||
# Locationを検索（オプション）
|
||||
location = self.find_matching_location(cp_number) if cp_number else None
|
||||
|
||||
# 既存のGpsLogをチェック
|
||||
existing_log = GpsLog.objects.filter(
|
||||
zekken_number=str(zekken_number),
|
||||
event_code=event_code,
|
||||
checkin_time=checkin_time
|
||||
).first()
|
||||
|
||||
if existing_log:
|
||||
print(f"⚠️ 既存記録をスキップ: ゼッケン{zekken_number}, {checkin_time}")
|
||||
self.stats['skipped_records'] += 1
|
||||
return False
|
||||
|
||||
# GpsLogを作成
|
||||
gps_log = GpsLog.objects.create(
|
||||
serial_number=serial_number or 0,
|
||||
zekken_number=str(zekken_number),
|
||||
event_code=event_code,
|
||||
cp_number=str(cp_number) if cp_number else '',
|
||||
image_address=image_address or '',
|
||||
checkin_time=checkin_time,
|
||||
goal_time=goal_time or '',
|
||||
late_point=late_point or 0,
|
||||
create_at=create_at or timezone.now(),
|
||||
create_user=create_user or '',
|
||||
update_at=update_at or timezone.now(),
|
||||
update_user=update_user or '',
|
||||
buy_flag=buy_flag or False,
|
||||
minus_photo_flag=minus_photo_flag or False,
|
||||
colabo_company_memo=colabo_company_memo or '',
|
||||
is_service_checked=False, # デフォルト値
|
||||
score=0, # デフォルト値
|
||||
scoreboard_url='' # デフォルト値
|
||||
)
|
||||
self.stats['migrated_gps_logs'] += 1
|
||||
|
||||
# CheckinExtendedも作成（通過記録として）
|
||||
if cp_number and location:
|
||||
try:
|
||||
checkin_extended = CheckinExtended.objects.create(
|
||||
entry=entry,
|
||||
location=location,
|
||||
checkin_time=checkin_time,
|
||||
image_url=image_address or '',
|
||||
score_override=0, # デフォルト値
|
||||
notes=f"移行データ: {colabo_company_memo}",
|
||||
is_verified=False # デフォルト値
|
||||
)
|
||||
self.stats['migrated_checkins'] += 1
|
||||
print(f"✅ チェックイン記録作成: ゼッケン{zekken_number}, CP{cp_number}")
|
||||
except Exception as e:
|
||||
print(f"⚠️ CheckinExtended作成エラー: {e}")
|
||||
|
||||
print(f"✅ GPS記録移行完了: ゼッケン{zekken_number}, {checkin_time}")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ GPS記録移行エラー: {e}")
|
||||
self.stats['errors'] += 1
|
||||
self.stats['error_details'].append(f"GPS記録移行エラー: {e}")
|
||||
return False
|
||||
|
||||
def run_migration(self):
|
||||
"""メイン移行処理"""
|
||||
print("🚀 GPS情報移行スクリプト開始")
|
||||
print("=" * 50)
|
||||
|
||||
# gifurogeからデータを取得
|
||||
gps_data = self.get_gps_information_data()
|
||||
if not gps_data:
|
||||
print("❌ 移行するデータがありません")
|
||||
return
|
||||
|
||||
print(f"\n📋 {len(gps_data)}件のGPS記録の移行を開始...")
|
||||
|
||||
# バッチ処理で移行
|
||||
batch_size = 100
|
||||
total_batches = (len(gps_data) + batch_size - 1) // batch_size
|
||||
|
||||
for batch_num in range(total_batches):
|
||||
start_idx = batch_num * batch_size
|
||||
end_idx = min(start_idx + batch_size, len(gps_data))
|
||||
batch_data = gps_data[start_idx:end_idx]
|
||||
|
||||
print(f"\n📦 バッチ {batch_num + 1}/{total_batches} ({len(batch_data)}件) 処理中...")
|
||||
|
||||
with transaction.atomic():
|
||||
for record in batch_data:
|
||||
self.migrate_gps_record(record)
|
||||
|
||||
# 統計レポート
|
||||
self.print_migration_report()
|
||||
|
||||
def print_migration_report(self):
|
||||
"""移行結果レポート"""
|
||||
print("\n" + "=" * 50)
|
||||
print("📊 GPS情報移行完了レポート")
|
||||
print("=" * 50)
|
||||
print(f"📋 総GPS記録数: {self.stats['total_gps_info']}")
|
||||
print(f"✅ 移行済みGpsLog: {self.stats['migrated_gps_logs']}")
|
||||
print(f"✅ 移行済みCheckin: {self.stats['migrated_checkins']}")
|
||||
print(f"⚠️ スキップ記録: {self.stats['skipped_records']}")
|
||||
print(f"❌ エラー数: {self.stats['errors']}")
|
||||
|
||||
if self.stats['error_details']:
|
||||
print("\n❌ エラー詳細:")
|
||||
for error in self.stats['error_details'][:10]: # 最初の10個だけ表示
|
||||
print(f" - {error}")
|
||||
if len(self.stats['error_details']) > 10:
|
||||
print(f" ... 他 {len(self.stats['error_details']) - 10} 件")
|
||||
|
||||
success_rate = (self.stats['migrated_gps_logs'] / max(self.stats['total_gps_info'], 1)) * 100
|
||||
print(f"\n📈 移行成功率: {success_rate:.1f}%")
|
||||
print("=" * 50)
|
||||
|
||||
def main():
|
||||
"""メイン実行関数"""
|
||||
migrator = GpsInformationMigrator()
|
||||
migrator.run_migration()
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@ -1,424 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
ローカル画像をS3に移行するスクリプト
|
||||
|
||||
使用方法:
|
||||
python migrate_local_images_to_s3.py
|
||||
|
||||
機能:
|
||||
- GoalImagesのローカル画像をS3に移行
|
||||
- CheckinImagesのローカル画像をS3に移行
|
||||
- 標準画像（start/goal/rule/map）も移行対象（存在する場合）
|
||||
- 移行後にデータベースのパスを更新
|
||||
- バックアップとロールバック機能付き
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
from pathlib import Path
|
||||
import json
|
||||
from datetime import datetime
|
||||
import shutil
|
||||
import traceback
|
||||
|
||||
# Django settings setup
|
||||
BASE_DIR = Path(__file__).resolve().parent
|
||||
sys.path.append(str(BASE_DIR))
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.conf import settings
|
||||
from rog.models import GoalImages, CheckinImages
|
||||
from rog.services.s3_service import S3Service
|
||||
from django.core.files.storage import default_storage
|
||||
from django.core.files.base import ContentFile
|
||||
import logging
|
||||
|
||||
# ロギング設定
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format='%(asctime)s - %(levelname)s - %(message)s',
|
||||
handlers=[
|
||||
logging.FileHandler(f'migration_log_{datetime.now().strftime("%Y%m%d_%H%M%S")}.log'),
|
||||
logging.StreamHandler()
|
||||
]
|
||||
)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class ImageMigrationService:
|
||||
"""画像移行サービス"""
|
||||
|
||||
def __init__(self):
|
||||
self.s3_service = S3Service()
|
||||
self.migration_stats = {
|
||||
'total_goal_images': 0,
|
||||
'total_checkin_images': 0,
|
||||
'successfully_migrated_goal': 0,
|
||||
'successfully_migrated_checkin': 0,
|
||||
'failed_migrations': [],
|
||||
'migration_details': []
|
||||
}
|
||||
self.backup_file = f'migration_backup_{datetime.now().strftime("%Y%m%d_%H%M%S")}.json'
|
||||
|
||||
def backup_database_state(self):
|
||||
"""移行前のデータベース状態をバックアップ"""
|
||||
logger.info("データベース状態をバックアップ中...")
|
||||
|
||||
backup_data = {
|
||||
'goal_images': [],
|
||||
'checkin_images': [],
|
||||
'migration_timestamp': datetime.now().isoformat()
|
||||
}
|
||||
|
||||
# GoalImages のバックアップ
|
||||
for goal_img in GoalImages.objects.all():
|
||||
backup_data['goal_images'].append({
|
||||
'id': goal_img.id,
|
||||
'original_path': str(goal_img.goalimage) if goal_img.goalimage else None,
|
||||
'user_id': goal_img.user.id,
|
||||
'team_name': goal_img.team_name,
|
||||
'event_code': goal_img.event_code,
|
||||
'cp_number': goal_img.cp_number
|
||||
})
|
||||
|
||||
# CheckinImages のバックアップ
|
||||
for checkin_img in CheckinImages.objects.all():
|
||||
backup_data['checkin_images'].append({
|
||||
'id': checkin_img.id,
|
||||
'original_path': str(checkin_img.checkinimage) if checkin_img.checkinimage else None,
|
||||
'user_id': checkin_img.user.id,
|
||||
'team_name': checkin_img.team_name,
|
||||
'event_code': checkin_img.event_code,
|
||||
'cp_number': checkin_img.cp_number
|
||||
})
|
||||
|
||||
with open(self.backup_file, 'w', encoding='utf-8') as f:
|
||||
json.dump(backup_data, f, ensure_ascii=False, indent=2)
|
||||
|
||||
logger.info(f"バックアップ完了: {self.backup_file}")
|
||||
return backup_data
|
||||
|
||||
def migrate_goal_images(self):
|
||||
"""ゴール画像をS3に移行"""
|
||||
logger.info("=== ゴール画像の移行開始 ===")
|
||||
|
||||
goal_images = GoalImages.objects.filter(goalimage__isnull=False).exclude(goalimage='')
|
||||
self.migration_stats['total_goal_images'] = goal_images.count()
|
||||
|
||||
logger.info(f"移行対象のゴール画像: {self.migration_stats['total_goal_images']}件")
|
||||
|
||||
for goal_img in goal_images:
|
||||
try:
|
||||
logger.info(f"処理中: GoalImage ID={goal_img.id}, Path={goal_img.goalimage}")
|
||||
|
||||
# ローカルファイルパスの構築
|
||||
local_file_path = os.path.join(settings.MEDIA_ROOT, str(goal_img.goalimage))
|
||||
|
||||
if not os.path.exists(local_file_path):
|
||||
logger.warning(f"ファイルが見つかりません: {local_file_path}")
|
||||
self.migration_stats['failed_migrations'].append({
|
||||
'type': 'goal',
|
||||
'id': goal_img.id,
|
||||
'reason': 'File not found',
|
||||
'path': local_file_path
|
||||
})
|
||||
continue
|
||||
|
||||
# ファイルを読み込み
|
||||
with open(local_file_path, 'rb') as f:
|
||||
file_content = f.read()
|
||||
|
||||
# ContentFileとして準備
|
||||
file_name = os.path.basename(local_file_path)
|
||||
content_file = ContentFile(file_content, name=file_name)
|
||||
|
||||
# S3にアップロード（ゴール画像として扱う）
|
||||
s3_url = self.s3_service.upload_checkin_image(
|
||||
image_file=content_file,
|
||||
event_code=goal_img.event_code,
|
||||
team_code=goal_img.team_name,
|
||||
cp_number=goal_img.cp_number,
|
||||
is_goal=True # ゴール画像フラグ
|
||||
)
|
||||
|
||||
if s3_url:
|
||||
# データベースを更新（S3パスを保存）
|
||||
original_path = str(goal_img.goalimage)
|
||||
goal_img.goalimage = s3_url.replace(f'https://{settings.AWS_S3_CUSTOM_DOMAIN}/', '')
|
||||
goal_img.save()
|
||||
|
||||
self.migration_stats['successfully_migrated_goal'] += 1
|
||||
self.migration_stats['migration_details'].append({
|
||||
'type': 'goal',
|
||||
'id': goal_img.id,
|
||||
'original_path': original_path,
|
||||
'new_s3_url': s3_url,
|
||||
'local_file': local_file_path
|
||||
})
|
||||
|
||||
logger.info(f"✅ 成功: {file_name} -> {s3_url}")
|
||||
|
||||
else:
|
||||
raise Exception("S3アップロードが失敗しました")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ エラー: GoalImage ID={goal_img.id}, Error={str(e)}")
|
||||
logger.error(traceback.format_exc())
|
||||
self.migration_stats['failed_migrations'].append({
|
||||
'type': 'goal',
|
||||
'id': goal_img.id,
|
||||
'reason': str(e),
|
||||
'path': str(goal_img.goalimage)
|
||||
})
|
||||
|
||||
def migrate_checkin_images(self):
|
||||
"""チェックイン画像をS3に移行"""
|
||||
logger.info("=== チェックイン画像の移行開始 ===")
|
||||
|
||||
checkin_images = CheckinImages.objects.filter(checkinimage__isnull=False).exclude(checkinimage='')
|
||||
self.migration_stats['total_checkin_images'] = checkin_images.count()
|
||||
|
||||
logger.info(f"移行対象のチェックイン画像: {self.migration_stats['total_checkin_images']}件")
|
||||
|
||||
for checkin_img in checkin_images:
|
||||
try:
|
||||
logger.info(f"処理中: CheckinImage ID={checkin_img.id}, Path={checkin_img.checkinimage}")
|
||||
|
||||
# ローカルファイルパスの構築
|
||||
local_file_path = os.path.join(settings.MEDIA_ROOT, str(checkin_img.checkinimage))
|
||||
|
||||
if not os.path.exists(local_file_path):
|
||||
logger.warning(f"ファイルが見つかりません: {local_file_path}")
|
||||
self.migration_stats['failed_migrations'].append({
|
||||
'type': 'checkin',
|
||||
'id': checkin_img.id,
|
||||
'reason': 'File not found',
|
||||
'path': local_file_path
|
||||
})
|
||||
continue
|
||||
|
||||
# ファイルを読み込み
|
||||
with open(local_file_path, 'rb') as f:
|
||||
file_content = f.read()
|
||||
|
||||
# ContentFileとして準備
|
||||
file_name = os.path.basename(local_file_path)
|
||||
content_file = ContentFile(file_content, name=file_name)
|
||||
|
||||
# S3にアップロード
|
||||
s3_url = self.s3_service.upload_checkin_image(
|
||||
image_file=content_file,
|
||||
event_code=checkin_img.event_code,
|
||||
team_code=checkin_img.team_name,
|
||||
cp_number=checkin_img.cp_number
|
||||
)
|
||||
|
||||
if s3_url:
|
||||
# データベースを更新（S3パスを保存）
|
||||
original_path = str(checkin_img.checkinimage)
|
||||
checkin_img.checkinimage = s3_url.replace(f'https://{settings.AWS_S3_CUSTOM_DOMAIN}/', '')
|
||||
checkin_img.save()
|
||||
|
||||
self.migration_stats['successfully_migrated_checkin'] += 1
|
||||
self.migration_stats['migration_details'].append({
|
||||
'type': 'checkin',
|
||||
'id': checkin_img.id,
|
||||
'original_path': original_path,
|
||||
'new_s3_url': s3_url,
|
||||
'local_file': local_file_path
|
||||
})
|
||||
|
||||
logger.info(f"✅ 成功: {file_name} -> {s3_url}")
|
||||
|
||||
else:
|
||||
raise Exception("S3アップロードが失敗しました")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ エラー: CheckinImage ID={checkin_img.id}, Error={str(e)}")
|
||||
logger.error(traceback.format_exc())
|
||||
self.migration_stats['failed_migrations'].append({
|
||||
'type': 'checkin',
|
||||
'id': checkin_img.id,
|
||||
'reason': str(e),
|
||||
'path': str(checkin_img.checkinimage)
|
||||
})
|
||||
|
||||
def migrate_standard_images(self):
|
||||
"""規定画像をS3に移行（存在する場合）"""
|
||||
logger.info("=== 規定画像の移行チェック開始 ===")
|
||||
|
||||
standard_types = ['start', 'goal', 'rule', 'map']
|
||||
media_root = Path(settings.MEDIA_ROOT)
|
||||
|
||||
# 各イベントフォルダをチェック
|
||||
events_found = set()
|
||||
|
||||
# GoalImagesとCheckinImagesから一意のイベントコードを取得
|
||||
goal_events = set(GoalImages.objects.values_list('event_code', flat=True))
|
||||
checkin_events = set(CheckinImages.objects.values_list('event_code', flat=True))
|
||||
all_events = goal_events.union(checkin_events)
|
||||
|
||||
logger.info(f"検出されたイベント: {all_events}")
|
||||
|
||||
for event_code in all_events:
|
||||
# 各標準画像タイプをチェック
|
||||
for image_type in standard_types:
|
||||
# 一般的な画像拡張子をチェック
|
||||
for ext in ['.jpg', '.jpeg', '.png', '.JPG', '.JPEG', '.PNG']:
|
||||
# 複数の可能なパスパターンをチェック
|
||||
possible_paths = [
|
||||
media_root / f'{event_code}_{image_type}{ext}',
|
||||
media_root / event_code / f'{image_type}{ext}',
|
||||
media_root / 'standards' / event_code / f'{image_type}{ext}',
|
||||
media_root / f'{image_type}_{event_code}{ext}',
|
||||
]
|
||||
|
||||
for possible_path in possible_paths:
|
||||
if possible_path.exists():
|
||||
try:
|
||||
logger.info(f"規定画像発見: {possible_path}")
|
||||
|
||||
# ファイルを読み込み
|
||||
with open(possible_path, 'rb') as f:
|
||||
file_content = f.read()
|
||||
|
||||
# ContentFileとして準備
|
||||
content_file = ContentFile(file_content, name=possible_path.name)
|
||||
|
||||
# S3にアップロード
|
||||
s3_url = self.s3_service.upload_standard_image(
|
||||
image_file=content_file,
|
||||
event_code=event_code,
|
||||
image_type=image_type
|
||||
)
|
||||
|
||||
if s3_url:
|
||||
self.migration_stats['migration_details'].append({
|
||||
'type': 'standard',
|
||||
'event_code': event_code,
|
||||
'image_type': image_type,
|
||||
'original_path': str(possible_path),
|
||||
'new_s3_url': s3_url
|
||||
})
|
||||
|
||||
logger.info(f"✅ 規定画像移行成功: {possible_path.name} -> {s3_url}")
|
||||
break # 同じタイプの画像が見つかったら他のパスはスキップ
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 規定画像移行エラー: {possible_path}, Error={str(e)}")
|
||||
self.migration_stats['failed_migrations'].append({
|
||||
'type': 'standard',
|
||||
'event_code': event_code,
|
||||
'image_type': image_type,
|
||||
'reason': str(e),
|
||||
'path': str(possible_path)
|
||||
})
|
||||
|
||||
def generate_migration_report(self):
|
||||
"""移行レポートを生成"""
|
||||
logger.info("=== 移行レポート生成 ===")
|
||||
|
||||
report = {
|
||||
'migration_timestamp': datetime.now().isoformat(),
|
||||
'summary': {
|
||||
'total_goal_images': self.migration_stats['total_goal_images'],
|
||||
'successfully_migrated_goal': self.migration_stats['successfully_migrated_goal'],
|
||||
'total_checkin_images': self.migration_stats['total_checkin_images'],
|
||||
'successfully_migrated_checkin': self.migration_stats['successfully_migrated_checkin'],
|
||||
'total_failed': len(self.migration_stats['failed_migrations']),
|
||||
'success_rate_goal': (
|
||||
self.migration_stats['successfully_migrated_goal'] / max(self.migration_stats['total_goal_images'], 1) * 100
|
||||
),
|
||||
'success_rate_checkin': (
|
||||
self.migration_stats['successfully_migrated_checkin'] / max(self.migration_stats['total_checkin_images'], 1) * 100
|
||||
)
|
||||
},
|
||||
'details': self.migration_stats['migration_details'],
|
||||
'failures': self.migration_stats['failed_migrations']
|
||||
}
|
||||
|
||||
# レポートファイルの保存
|
||||
report_file = f'migration_report_{datetime.now().strftime("%Y%m%d_%H%M%S")}.json'
|
||||
with open(report_file, 'w', encoding='utf-8') as f:
|
||||
json.dump(report, f, ensure_ascii=False, indent=2)
|
||||
|
||||
# コンソール出力
|
||||
print("\n" + "="*60)
|
||||
print("🎯 画像S3移行レポート")
|
||||
print("="*60)
|
||||
print(f"📊 ゴール画像: {report['summary']['successfully_migrated_goal']}/{report['summary']['total_goal_images']} "
|
||||
f"({report['summary']['success_rate_goal']:.1f}%)")
|
||||
print(f"📊 チェックイン画像: {report['summary']['successfully_migrated_checkin']}/{report['summary']['total_checkin_images']} "
|
||||
f"({report['summary']['success_rate_checkin']:.1f}%)")
|
||||
print(f"❌ 失敗数: {report['summary']['total_failed']}")
|
||||
print(f"📄 詳細レポート: {report_file}")
|
||||
print(f"💾 バックアップファイル: {self.backup_file}")
|
||||
|
||||
if report['summary']['total_failed'] > 0:
|
||||
print("\n⚠️ 失敗した移行:")
|
||||
for failure in self.migration_stats['failed_migrations'][:5]: # 最初の5件のみ表示
|
||||
print(f" - {failure['type']} ID={failure.get('id', 'N/A')}: {failure['reason']}")
|
||||
if len(self.migration_stats['failed_migrations']) > 5:
|
||||
print(f" ... 他 {len(self.migration_stats['failed_migrations']) - 5} 件")
|
||||
|
||||
return report
|
||||
|
||||
def run_migration(self):
|
||||
"""メイン移行処理"""
|
||||
logger.info("🚀 画像S3移行開始")
|
||||
print("🚀 画像S3移行を開始します...")
|
||||
|
||||
try:
|
||||
# 1. バックアップ
|
||||
self.backup_database_state()
|
||||
|
||||
# 2. ゴール画像移行
|
||||
self.migrate_goal_images()
|
||||
|
||||
# 3. チェックイン画像移行
|
||||
self.migrate_checkin_images()
|
||||
|
||||
# 4. 規定画像移行
|
||||
self.migrate_standard_images()
|
||||
|
||||
# 5. レポート生成
|
||||
report = self.generate_migration_report()
|
||||
|
||||
logger.info("✅ 移行完了")
|
||||
print("\n✅ 移行が完了しました！")
|
||||
|
||||
return report
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"💥 移行中に重大なエラーが発生: {str(e)}")
|
||||
logger.error(traceback.format_exc())
|
||||
print(f"\n💥 移行エラー: {str(e)}")
|
||||
print(f"バックアップファイル: {self.backup_file}")
|
||||
raise
|
||||
|
||||
def main():
|
||||
"""メイン関数"""
|
||||
print("="*60)
|
||||
print("🔄 ローカル画像S3移行ツール")
|
||||
print("="*60)
|
||||
print("このツールは以下を実行します:")
|
||||
print("1. データベースの現在の状態をバックアップ")
|
||||
print("2. GoalImages のローカル画像をS3に移行")
|
||||
print("3. CheckinImages のローカル画像をS3に移行")
|
||||
print("4. 標準画像（存在する場合）をS3に移行")
|
||||
print("5. 移行レポートの生成")
|
||||
print()
|
||||
|
||||
# 確認プロンプト
|
||||
confirm = input("移行を開始しますか？ [y/N]: ").strip().lower()
|
||||
if confirm not in ['y', 'yes']:
|
||||
print("移行をキャンセルしました。")
|
||||
return
|
||||
|
||||
# 移行実行
|
||||
migration_service = ImageMigrationService()
|
||||
migration_service.run_migration()
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,293 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
"""
|
||||
old_rogdb から rogdb へのFC岐阜エントリー移行スクリプト
|
||||
old_rogdbのFC岐阜イベント（event_id=10）のゼッケン番号付きエントリーを移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import django
|
||||
|
||||
if __name__ == '__main__':
|
||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings')
|
||||
django.setup()
|
||||
|
||||
from django.db import connections, transaction
|
||||
from rog.models import NewEvent2, Team, Entry, NewCategory, CustomUser
|
||||
|
||||
print("=== old_rogdb から FC岐阜エントリー移行 ===")
|
||||
|
||||
try:
|
||||
# データベース接続を取得
|
||||
default_db = connections['default'] # rogdb
|
||||
old_db = connections.databases.get('old_rogdb')
|
||||
|
||||
if not old_db:
|
||||
print("❌ old_rogdb接続設定が見つかりません。別DB接続を試行します。")
|
||||
|
||||
# old_rogdbに直接接続してデータを取得
|
||||
import psycopg2
|
||||
|
||||
# old_rogdbへの直接接続
|
||||
old_conn = psycopg2.connect(
|
||||
host='postgres-db',
|
||||
database='old_rogdb',
|
||||
user='admin',
|
||||
password='admin123456'
|
||||
)
|
||||
|
||||
print("✅ old_rogdbに接続成功")
|
||||
|
||||
with old_conn.cursor() as old_cursor:
|
||||
# old_rogdbのFC岐阜エントリーデータを取得
|
||||
old_cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id,
|
||||
rc.category_name
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
LEFT JOIN rog_newcategory rc ON re.category_id = rc.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY re.zekken_number;
|
||||
""")
|
||||
|
||||
old_fc_data = old_cursor.fetchall()
|
||||
print(f"\\n✅ old_rogdb FC岐阜エントリー: {len(old_fc_data)}件")
|
||||
|
||||
if old_fc_data:
|
||||
print("\\nold_rogdb FC岐阜データサンプル（最初の5件）:")
|
||||
for i, (entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name) in enumerate(old_fc_data[:5]):
|
||||
print(f" {i+1}. Entry {entry_id}: Team '{team_name}' - ゼッケン{zekken} ({cat_name})")
|
||||
|
||||
# FC岐阜イベントを確認
|
||||
fc_event = NewEvent2.objects.filter(id=10).first()
|
||||
if not fc_event:
|
||||
print("❌ FC岐阜イベント（ID:10）が見つかりません")
|
||||
old_conn.close()
|
||||
sys.exit(1)
|
||||
|
||||
print(f"\\n✅ FC岐阜イベント: {fc_event.event_name}")
|
||||
|
||||
# データ移行開始
|
||||
print("\\n=== old_rogdb から rogdb へデータ移行開始 ===")
|
||||
migrated_count = 0
|
||||
error_count = 0
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id, cat_name in old_fc_data:
|
||||
try:
|
||||
with transaction.atomic():
|
||||
# カテゴリを取得または作成
|
||||
if cat_id and cat_name:
|
||||
category, cat_created = NewCategory.objects.get_or_create(
|
||||
id=cat_id,
|
||||
defaults={
|
||||
'category_name': cat_name,
|
||||
'category_number': cat_id
|
||||
}
|
||||
)
|
||||
if cat_created:
|
||||
print(f" カテゴリ作成: {cat_name}")
|
||||
else:
|
||||
category = None
|
||||
|
||||
# チームを取得または作成
|
||||
team, team_created = Team.objects.get_or_create(
|
||||
id=team_id,
|
||||
defaults={
|
||||
'team_name': team_name,
|
||||
'owner_id': owner_id or 1,
|
||||
'category': category,
|
||||
'event_id': fc_event.id
|
||||
}
|
||||
)
|
||||
|
||||
if team_created:
|
||||
print(f" チーム作成: {team_name} (ID: {team_id})")
|
||||
|
||||
# エントリーを作成
|
||||
entry, entry_created = Entry.objects.get_or_create(
|
||||
team=team,
|
||||
event=fc_event,
|
||||
defaults={
|
||||
'category': category,
|
||||
'date': date or fc_event.start_datetime,
|
||||
'owner_id': owner_id or 1,
|
||||
'zekken_number': int(zekken) if zekken else 0,
|
||||
'zekken_label': label or f"FC岐阜-{zekken}",
|
||||
'is_active': True,
|
||||
'hasParticipated': False,
|
||||
'hasGoaled': False
|
||||
}
|
||||
)
|
||||
|
||||
if entry_created:
|
||||
print(f" ✅ エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
migrated_count += 1
|
||||
else:
|
||||
print(f" 🔄 既存エントリー: {team_name} - ゼッケン{zekken}")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
print(f" ❌ エラー: {team_name} - {e}")
|
||||
|
||||
old_conn.close()
|
||||
|
||||
print(f"\\n=== 移行完了 ===")
|
||||
print(f"移行成功: {migrated_count}件")
|
||||
print(f"エラー: {error_count}件")
|
||||
|
||||
# 最終確認
|
||||
fc_entries = Entry.objects.filter(event=fc_event).order_by('zekken_number')
|
||||
print(f"\\n🎉 FC岐阜イベント総エントリー: {fc_entries.count()}件")
|
||||
|
||||
if fc_entries.exists():
|
||||
print("\\nゼッケン番号一覧（最初の10件）:")
|
||||
for entry in fc_entries[:10]:
|
||||
print(f" ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
print("\\n🎉 FC岐阜イベントのゼッケン番号表示問題が解決されました！")
|
||||
print("\\n🎯 通過審査管理画面でFC岐阜を選択すると、ゼッケン番号が表示されるようになります。")
|
||||
else:
|
||||
print("❌ old_rogdbにもFC岐阜エントリーデータがありません")
|
||||
old_conn.close()
|
||||
|
||||
else:
|
||||
# 通常のDjango接続設定がある場合の処理
|
||||
with default_db.cursor() as cursor:
|
||||
# まずold_rogdbスキーマが存在するか確認
|
||||
cursor.execute("""
|
||||
SELECT schema_name FROM information_schema.schemata
|
||||
WHERE schema_name LIKE '%old%' OR schema_name LIKE '%rog%';
|
||||
""")
|
||||
schemas = cursor.fetchall()
|
||||
print(f"利用可能なスキーマ: {schemas}")
|
||||
|
||||
# old_rogdbデータベースに直接接続を試行
|
||||
cursor.execute("SELECT current_database();")
|
||||
current_db = cursor.fetchone()[0]
|
||||
print(f"現在のDB: {current_db}")
|
||||
|
||||
# データベース一覧を確認
|
||||
cursor.execute("""
|
||||
SELECT datname FROM pg_database
|
||||
WHERE datistemplate = false AND datname != 'postgres';
|
||||
""")
|
||||
databases = cursor.fetchall()
|
||||
print(f"利用可能なDB: {[db[0] for db in databases]}")
|
||||
|
||||
# old_rogdbのrog_entryデータを確認
|
||||
try:
|
||||
# 別データベースのテーブルにアクセスする方法を試行
|
||||
cursor.execute("""
|
||||
SELECT table_name FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE '%entry%';
|
||||
""")
|
||||
entry_tables = cursor.fetchall()
|
||||
print(f"エントリー関連テーブル: {entry_tables}")
|
||||
|
||||
# FC岐阜関連のエントリーデータを確認
|
||||
# まず現在のDBで状況確認
|
||||
cursor.execute("""
|
||||
SELECT COUNT(*) FROM rog_entry WHERE event_id = 10;
|
||||
""")
|
||||
current_fc_entries = cursor.fetchone()[0]
|
||||
print(f"現在のDB FC岐阜エントリー: {current_fc_entries}件")
|
||||
|
||||
if current_fc_entries > 0:
|
||||
cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
WHERE re.event_id = 10
|
||||
AND re.zekken_number IS NOT NULL
|
||||
ORDER BY re.zekken_number
|
||||
LIMIT 10;
|
||||
""")
|
||||
fc_data = cursor.fetchall()
|
||||
|
||||
print(f"\\n✅ FC岐阜エントリーデータ（最初の10件）:")
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id in fc_data:
|
||||
print(f" Entry {entry_id}: Team {team_id} '{team_name}' - ゼッケン{zekken}")
|
||||
|
||||
# FC岐阜イベントを取得
|
||||
fc_event = NewEvent2.objects.filter(id=10).first()
|
||||
if not fc_event:
|
||||
print("❌ FC岐阜イベント（ID:10）が見つかりません")
|
||||
sys.exit(1)
|
||||
|
||||
print(f"\\n✅ FC岐阜イベント: {fc_event.event_name}")
|
||||
|
||||
# エントリーデータを新しいEntry modelに同期
|
||||
print("\\n=== エントリーデータ同期開始 ===")
|
||||
updated_count = 0
|
||||
|
||||
# 全FC岐阜エントリーを取得
|
||||
cursor.execute("""
|
||||
SELECT re.id, re.team_id, re.zekken_number, re.zekken_label,
|
||||
rt.team_name, re.category_id, re.date, re.owner_id
|
||||
FROM rog_entry re
|
||||
JOIN rog_team rt ON re.team_id = rt.id
|
||||
WHERE re.event_id = 10
|
||||
ORDER BY re.zekken_number;
|
||||
""")
|
||||
all_fc_data = cursor.fetchall()
|
||||
|
||||
for entry_id, team_id, zekken, label, team_name, cat_id, date, owner_id in all_fc_data:
|
||||
try:
|
||||
# チームを取得
|
||||
team = Team.objects.get(id=team_id)
|
||||
|
||||
# カテゴリを取得
|
||||
category = NewCategory.objects.get(id=cat_id) if cat_id else None
|
||||
|
||||
# エントリーを更新または作成
|
||||
entry, created = Entry.objects.update_or_create(
|
||||
team=team,
|
||||
event=fc_event,
|
||||
defaults={
|
||||
'category': category,
|
||||
'date': date or fc_event.start_datetime,
|
||||
'owner_id': owner_id,
|
||||
'zekken_number': int(zekken) if zekken else 0,
|
||||
'zekken_label': label or f"FC岐阜-{zekken}",
|
||||
'is_active': True,
|
||||
'hasParticipated': False,
|
||||
'hasGoaled': False
|
||||
}
|
||||
)
|
||||
|
||||
if created:
|
||||
print(f" ✅ エントリー作成: {team_name} - ゼッケン{zekken}")
|
||||
else:
|
||||
print(f" 🔄 エントリー更新: {team_name} - ゼッケン{zekken}")
|
||||
updated_count += 1
|
||||
|
||||
except Team.DoesNotExist:
|
||||
print(f" ⚠️ チーム{team_id}が見つかりません: {team_name}")
|
||||
except Exception as e:
|
||||
print(f" ❌ エラー: {e}")
|
||||
|
||||
print(f"\\n✅ 処理完了: {updated_count}件のエントリーを処理")
|
||||
|
||||
# 最終確認
|
||||
fc_entries = Entry.objects.filter(event=fc_event).order_by('zekken_number')
|
||||
print(f"\\n🎉 FC岐阜イベント総エントリー: {fc_entries.count()}件")
|
||||
|
||||
if fc_entries.exists():
|
||||
print("\\nゼッケン番号一覧（最初の10件）:")
|
||||
for entry in fc_entries[:10]:
|
||||
print(f" ゼッケン{entry.zekken_number}: {entry.team.team_name}")
|
||||
print("\\n🎉 FC岐阜イベントのゼッケン番号表示問題が解決されました！")
|
||||
else:
|
||||
print("❌ 現在のDBにFC岐阜エントリーデータがありません")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ データ確認エラー: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ エラーが発生しました: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
@ -1,93 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Old RogDB → RogDB 移行クイックスタート
|
||||
|
||||
echo "============================================================"
|
||||
echo "Old RogDB → RogDB データ移行クイックスタート"
|
||||
echo "============================================================"
|
||||
|
||||
# 実行前チェック
|
||||
echo "🔍 実行前チェック..."
|
||||
|
||||
# Docker Composeサービス確認
|
||||
if ! docker compose ps | grep -q "Up"; then
|
||||
echo "❌ Docker Composeサービスが起動していません"
|
||||
echo "次のコマンドでサービスを起動してください:"
|
||||
echo "docker compose up -d"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ Docker Composeサービス確認完了"
|
||||
|
||||
# データベース接続確認
|
||||
echo "🔍 データベース接続確認..."
|
||||
if ! docker compose exec app python -c "
|
||||
import psycopg2
|
||||
try:
|
||||
conn = psycopg2.connect(host='postgres-db', database='rogdb', user='admin', password='admin123456')
|
||||
print('✅ rogdb接続成功')
|
||||
conn.close()
|
||||
except Exception as e:
|
||||
print(f'❌ rogdb接続エラー: {e}')
|
||||
exit(1)
|
||||
"; then
|
||||
echo "❌ データベース接続に失敗しました"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# メニュー表示
|
||||
echo ""
|
||||
echo "📋 移行オプションを選択してください:"
|
||||
echo "1) 完全移行（全rog_*テーブル）"
|
||||
echo "2) 安全移行（ユーザー関連テーブル除外）"
|
||||
echo "3) 統計情報のみ表示"
|
||||
echo "4) テーブル一覧のみ表示"
|
||||
echo "5) カスタム移行（除外テーブル指定）"
|
||||
echo "0) キャンセル"
|
||||
echo ""
|
||||
|
||||
read -p "選択 (0-5): " choice
|
||||
|
||||
case $choice in
|
||||
1)
|
||||
echo "🚀 完全移行を開始します..."
|
||||
docker compose exec app python migrate_old_rogdb_to_rogdb.py
|
||||
;;
|
||||
2)
|
||||
echo "🛡️ 安全移行を開始します（ユーザー関連テーブル除外）..."
|
||||
docker compose exec -e EXCLUDE_TABLES=rog_customuser,rog_session app python migrate_old_rogdb_to_rogdb.py
|
||||
;;
|
||||
3)
|
||||
echo "📊 統計情報を表示します..."
|
||||
make migrate-old-rogdb-stats
|
||||
;;
|
||||
4)
|
||||
echo "📋 テーブル一覧を表示します..."
|
||||
make migrate-old-rogdb-dryrun
|
||||
;;
|
||||
5)
|
||||
echo "除外するテーブル名をカンマ区切りで入力してください（例: rog_customuser,rog_session）:"
|
||||
read -p "除外テーブル: " exclude_tables
|
||||
echo "🔧 カスタム移行を開始します..."
|
||||
docker compose exec -e EXCLUDE_TABLES="$exclude_tables" app python migrate_old_rogdb_to_rogdb.py
|
||||
;;
|
||||
0)
|
||||
echo "移行をキャンセルしました"
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
echo "❌ 無効な選択です"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
echo ""
|
||||
echo "============================================================"
|
||||
echo "移行処理が完了しました"
|
||||
echo "============================================================"
|
||||
echo ""
|
||||
echo "📋 移行後の確認方法:"
|
||||
echo " - ログ確認: make app-logs"
|
||||
echo " - DB接続: make db-shell"
|
||||
echo " - 統計再表示: make migrate-old-rogdb-stats"
|
||||
echo ""
|
||||
echo "📖 詳細情報: MIGRATE_OLD_ROGDB_README.md"
|
||||
@ -1,499 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Old RogDB データ移行スクリプト (エラー修正版)
|
||||
old_rogdb の rog_* テーブルから rogdb の rog_* テーブルへデータを更新・挿入
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import psycopg2
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional, Dict, List, Tuple
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
OLD_ROGDB_CONFIG = {
|
||||
'host': os.getenv('OLD_ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('OLD_ROGDB_NAME', 'old_rogdb'),
|
||||
'user': os.getenv('OLD_ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('OLD_ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('OLD_ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
# PostgreSQL予約語をクォートで囲む必要があるカラム
|
||||
RESERVED_KEYWORDS = {
|
||||
'like', 'order', 'group', 'user', 'table', 'where', 'select', 'insert',
|
||||
'update', 'delete', 'create', 'drop', 'alter', 'index', 'constraint'
|
||||
}
|
||||
|
||||
class RogTableMigrator:
|
||||
"""Rogテーブル移行クラス (エラー修正版)"""
|
||||
|
||||
def __init__(self):
|
||||
self.old_conn = None
|
||||
self.new_conn = None
|
||||
self.old_cursor = None
|
||||
self.new_cursor = None
|
||||
self.migration_stats = {}
|
||||
|
||||
def quote_column_if_needed(self, column_name):
|
||||
"""予約語やキャメルケースの場合はダブルクォートで囲む"""
|
||||
# 予約語チェック
|
||||
if column_name.lower() in RESERVED_KEYWORDS:
|
||||
return f'"{column_name}"'
|
||||
|
||||
# キャメルケースや大文字が含まれる場合もクォート
|
||||
if any(c.isupper() for c in column_name) or column_name != column_name.lower():
|
||||
return f'"{column_name}"'
|
||||
|
||||
return column_name
|
||||
|
||||
def handle_null_values(self, table_name, column_name, value):
|
||||
"""NULL値の処理とデフォルト値設定"""
|
||||
if value is not None:
|
||||
return value
|
||||
|
||||
# テーブル・カラム別のデフォルト値設定
|
||||
null_defaults = {
|
||||
'rog_team': {
|
||||
'trial': False, # Boolean型のデフォルト
|
||||
'is_active': True,
|
||||
'is_trial': False,
|
||||
},
|
||||
'rog_entry': {
|
||||
'trial': False,
|
||||
'is_active': True,
|
||||
'is_trial': False,
|
||||
'hasGoaled': False,
|
||||
'hasParticipated': False,
|
||||
},
|
||||
'rog_member': {
|
||||
'is_active': True,
|
||||
'is_captain': False,
|
||||
},
|
||||
'rog_newevent2': {
|
||||
'public': True,
|
||||
'class_general': True,
|
||||
'class_family': True,
|
||||
'class_solo_male': True,
|
||||
'class_solo_female': True,
|
||||
'hour_3': True,
|
||||
'hour_5': True,
|
||||
'self_rogaining': False,
|
||||
}
|
||||
}
|
||||
|
||||
# テーブル固有のデフォルト値を取得
|
||||
if table_name in null_defaults and column_name in null_defaults[table_name]:
|
||||
default_value = null_defaults[table_name][column_name]
|
||||
logger.debug(f"NULL値をデフォルト値に変換: {table_name}.{column_name} = {default_value}")
|
||||
return default_value
|
||||
|
||||
# 一般的なデフォルト値
|
||||
common_defaults = {
|
||||
# Boolean型
|
||||
'is_active': True,
|
||||
'is_trial': False,
|
||||
'public': True,
|
||||
'trial': False,
|
||||
# 文字列型
|
||||
'description': '',
|
||||
'note': '',
|
||||
'comment': '',
|
||||
# 数値型
|
||||
'sort_order': 0,
|
||||
'order': 0,
|
||||
# PostgreSQL予約語
|
||||
'group': '',
|
||||
'like': False,
|
||||
}
|
||||
|
||||
if column_name in common_defaults:
|
||||
default_value = common_defaults[column_name]
|
||||
logger.debug(f"NULL値を共通デフォルト値に変換: {column_name} = {default_value}")
|
||||
return default_value
|
||||
|
||||
# デフォルト値が見つからない場合はNULLを返す
|
||||
logger.warning(f"デフォルト値が設定されていません: {table_name}.{column_name}")
|
||||
return None
|
||||
|
||||
def connect_databases(self):
|
||||
"""データベース接続"""
|
||||
try:
|
||||
logger.info("データベースに接続中...")
|
||||
self.old_conn = psycopg2.connect(**OLD_ROGDB_CONFIG)
|
||||
self.new_conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
|
||||
# autocommitを有効にしてトランザクション問題を回避
|
||||
self.old_conn.autocommit = True
|
||||
self.new_conn.autocommit = False # 新しい方は手動コミット
|
||||
|
||||
self.old_cursor = self.old_conn.cursor()
|
||||
self.new_cursor = self.new_conn.cursor()
|
||||
|
||||
logger.info("✅ データベース接続成功")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ データベース接続エラー: {e}")
|
||||
return False
|
||||
|
||||
def close_connections(self):
|
||||
"""データベース接続クローズ"""
|
||||
try:
|
||||
if self.old_cursor:
|
||||
self.old_cursor.close()
|
||||
if self.new_cursor:
|
||||
self.new_cursor.close()
|
||||
if self.old_conn:
|
||||
self.old_conn.close()
|
||||
if self.new_conn:
|
||||
self.new_conn.close()
|
||||
logger.info("データベース接続をクローズしました")
|
||||
except Exception as e:
|
||||
logger.warning(f"接続クローズ時の警告: {e}")
|
||||
|
||||
def get_rog_tables(self):
|
||||
"""rog_で始まるテーブル一覧を取得"""
|
||||
try:
|
||||
# old_rogdbのrog_テーブル一覧
|
||||
self.old_cursor.execute("""
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE 'rog_%'
|
||||
ORDER BY table_name
|
||||
""")
|
||||
old_tables = [row[0] for row in self.old_cursor.fetchall()]
|
||||
|
||||
# rogdbのrog_テーブル一覧
|
||||
self.new_cursor.execute("""
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE 'rog_%'
|
||||
ORDER BY table_name
|
||||
""")
|
||||
new_tables = [row[0] for row in self.new_cursor.fetchall()]
|
||||
|
||||
# 共通テーブル
|
||||
common_tables = list(set(old_tables) & set(new_tables))
|
||||
|
||||
logger.info(f"old_rogdb rog_テーブル: {len(old_tables)}個")
|
||||
logger.info(f"rogdb rog_テーブル: {len(new_tables)}個")
|
||||
logger.info(f"共通 rog_テーブル: {len(common_tables)}個")
|
||||
|
||||
return old_tables, new_tables, common_tables
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"テーブル一覧取得エラー: {e}")
|
||||
return [], [], []
|
||||
|
||||
def get_table_structure(self, table_name, cursor):
|
||||
"""テーブル構造を取得 (エラーハンドリング強化)"""
|
||||
try:
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable, column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = %s
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position
|
||||
""", (table_name,))
|
||||
|
||||
columns = cursor.fetchall()
|
||||
return {
|
||||
'columns': [col[0] for col in columns],
|
||||
'details': columns
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"テーブル構造取得エラー ({table_name}): {e}")
|
||||
# トランザクションエラーを回避
|
||||
try:
|
||||
cursor.connection.rollback()
|
||||
except:
|
||||
pass
|
||||
return {'columns': [], 'details': []}
|
||||
|
||||
def get_primary_key(self, table_name, cursor):
|
||||
"""主キーカラムを取得"""
|
||||
try:
|
||||
cursor.execute("""
|
||||
SELECT a.attname
|
||||
FROM pg_index i
|
||||
JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
|
||||
WHERE i.indrelid = %s::regclass AND i.indisprimary
|
||||
""", (table_name,))
|
||||
|
||||
pk_columns = [row[0] for row in cursor.fetchall()]
|
||||
return pk_columns if pk_columns else ['id']
|
||||
|
||||
except Exception as e:
|
||||
logger.warning(f"主キー取得エラー ({table_name}): {e}")
|
||||
return ['id'] # デフォルトでidを使用
|
||||
|
||||
def migrate_table_data(self, table_name):
|
||||
"""個別テーブルのデータ移行 (エラー修正版)"""
|
||||
logger.info(f"\n=== {table_name} データ移行開始 ===")
|
||||
|
||||
try:
|
||||
# テーブル構造比較
|
||||
old_structure = self.get_table_structure(table_name, self.old_cursor)
|
||||
new_structure = self.get_table_structure(table_name, self.new_cursor)
|
||||
|
||||
old_columns = set(old_structure['columns'])
|
||||
new_columns = set(new_structure['columns'])
|
||||
common_columns = old_columns & new_columns
|
||||
|
||||
if not common_columns:
|
||||
logger.warning(f"⚠️ {table_name}: 共通カラムがありません")
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 0}
|
||||
|
||||
logger.info(f"共通カラム ({len(common_columns)}個): {sorted(common_columns)}")
|
||||
|
||||
# 主キー取得
|
||||
pk_columns = self.get_primary_key(table_name, self.new_cursor)
|
||||
logger.info(f"主キー: {pk_columns}")
|
||||
|
||||
# カラム名を予約語対応でクォート
|
||||
quoted_columns = [self.quote_column_if_needed(col) for col in common_columns]
|
||||
columns_str = ', '.join(quoted_columns)
|
||||
|
||||
# old_rogdbからデータ取得
|
||||
try:
|
||||
self.old_cursor.execute(f"SELECT {columns_str} FROM {table_name}")
|
||||
old_records = self.old_cursor.fetchall()
|
||||
except Exception as e:
|
||||
logger.error(f"❌ {table_name} データ取得エラー: {e}")
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 1}
|
||||
|
||||
if not old_records:
|
||||
logger.info(f"✅ {table_name}: 移行対象データなし")
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 0}
|
||||
|
||||
logger.info(f"移行対象レコード数: {len(old_records)}件")
|
||||
|
||||
# 統計情報
|
||||
inserted_count = 0
|
||||
updated_count = 0
|
||||
error_count = 0
|
||||
|
||||
# レコード移行処理
|
||||
for i, record in enumerate(old_records):
|
||||
try:
|
||||
# レコードデータを辞書形式に変換（NULL値処理込み）
|
||||
record_dict = {}
|
||||
for j, col in enumerate(common_columns):
|
||||
original_value = record[j]
|
||||
processed_value = self.handle_null_values(table_name, col, original_value)
|
||||
record_dict[col] = processed_value
|
||||
|
||||
# 主キー値を取得
|
||||
pk_values = []
|
||||
pk_conditions = []
|
||||
for pk_col in pk_columns:
|
||||
if pk_col in record_dict:
|
||||
pk_values.append(record_dict[pk_col])
|
||||
quoted_pk_col = self.quote_column_if_needed(pk_col)
|
||||
pk_conditions.append(f"{quoted_pk_col} = %s")
|
||||
|
||||
if not pk_values:
|
||||
error_count += 1
|
||||
continue
|
||||
|
||||
# 既存レコード確認
|
||||
check_query = f"SELECT COUNT(*) FROM {table_name} WHERE {' AND '.join(pk_conditions)}"
|
||||
self.new_cursor.execute(check_query, pk_values)
|
||||
exists = self.new_cursor.fetchone()[0] > 0
|
||||
|
||||
if exists:
|
||||
# UPDATE処理
|
||||
set_clauses = []
|
||||
update_values = []
|
||||
|
||||
for col in common_columns:
|
||||
if col not in pk_columns: # 主キー以外を更新
|
||||
quoted_col = self.quote_column_if_needed(col)
|
||||
set_clauses.append(f"{quoted_col} = %s")
|
||||
update_values.append(record_dict[col])
|
||||
|
||||
if set_clauses:
|
||||
update_query = f"""
|
||||
UPDATE {table_name}
|
||||
SET {', '.join(set_clauses)}
|
||||
WHERE {' AND '.join(pk_conditions)}
|
||||
"""
|
||||
self.new_cursor.execute(update_query, update_values + pk_values)
|
||||
updated_count += 1
|
||||
|
||||
else:
|
||||
# INSERT処理
|
||||
insert_columns = list(common_columns)
|
||||
insert_values = [record_dict[col] for col in insert_columns]
|
||||
quoted_insert_columns = [self.quote_column_if_needed(col) for col in insert_columns]
|
||||
placeholders = ', '.join(['%s'] * len(insert_columns))
|
||||
|
||||
insert_query = f"""
|
||||
INSERT INTO {table_name} ({', '.join(quoted_insert_columns)})
|
||||
VALUES ({placeholders})
|
||||
"""
|
||||
self.new_cursor.execute(insert_query, insert_values)
|
||||
inserted_count += 1
|
||||
|
||||
# 定期的なコミット
|
||||
if (i + 1) % 100 == 0:
|
||||
self.new_conn.commit()
|
||||
logger.info(f" 進捗: {i + 1}/{len(old_records)} 件処理完了")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
logger.error(f" レコード処理エラー (行{i+1}): {e}")
|
||||
# トランザクションロールバック
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
|
||||
if error_count > 10: # エラー上限
|
||||
logger.error(f"❌ {table_name}: エラー数が上限を超えました")
|
||||
break
|
||||
|
||||
# 最終コミット
|
||||
try:
|
||||
self.new_conn.commit()
|
||||
except Exception as e:
|
||||
logger.error(f"コミットエラー: {e}")
|
||||
|
||||
# 結果サマリー
|
||||
stats = {
|
||||
'inserted': inserted_count,
|
||||
'updated': updated_count,
|
||||
'errors': error_count,
|
||||
'total': len(old_records)
|
||||
}
|
||||
|
||||
logger.info(f"✅ {table_name} 移行完了:")
|
||||
logger.info(f" 挿入: {inserted_count}件")
|
||||
logger.info(f" 更新: {updated_count}件")
|
||||
logger.info(f" エラー: {error_count}件")
|
||||
|
||||
self.migration_stats[table_name] = stats
|
||||
return stats
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ {table_name} 移行エラー: {e}")
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 1}
|
||||
|
||||
def run_migration(self, exclude_tables=None):
|
||||
"""全体移行実行"""
|
||||
if exclude_tables is None:
|
||||
exclude_tables = []
|
||||
|
||||
# 特殊処理が必要なテーブルは専用スクリプトで処理
|
||||
exclude_tables.extend(['rog_team', 'rog_entry', 'rog_goalimages'])
|
||||
|
||||
logger.info("=" * 80)
|
||||
logger.info("Old RogDB → RogDB データ移行開始")
|
||||
logger.info("⚠️ rog_team は migrate_rog_team_enhanced.py で別途処理してください")
|
||||
logger.info("⚠️ rog_entry は migrate_rog_entry_enhanced.py で別途処理してください")
|
||||
logger.info("⚠️ rog_goalimages は migrate_rog_goalimages_enhanced.py で別途処理してください")
|
||||
logger.info("=" * 80)
|
||||
|
||||
try:
|
||||
# データベース接続
|
||||
if not self.connect_databases():
|
||||
return False
|
||||
|
||||
# テーブル一覧取得
|
||||
old_tables, new_tables, common_tables = self.get_rog_tables()
|
||||
|
||||
if not common_tables:
|
||||
logger.error("❌ 移行対象の共通テーブルがありません")
|
||||
return False
|
||||
|
||||
# 除外テーブルを除去
|
||||
migration_tables = [t for t in common_tables if t not in exclude_tables]
|
||||
|
||||
if exclude_tables:
|
||||
logger.info(f"除外テーブル: {exclude_tables}")
|
||||
|
||||
logger.info(f"移行対象テーブル ({len(migration_tables)}個): {migration_tables}")
|
||||
|
||||
# テーブル別移行実行
|
||||
total_inserted = 0
|
||||
total_updated = 0
|
||||
total_errors = 0
|
||||
|
||||
for table_name in migration_tables:
|
||||
stats = self.migrate_table_data(table_name)
|
||||
total_inserted += stats['inserted']
|
||||
total_updated += stats['updated']
|
||||
total_errors += stats['errors']
|
||||
|
||||
# 最終結果
|
||||
logger.info("\n" + "=" * 80)
|
||||
logger.info("移行完了サマリー")
|
||||
logger.info("=" * 80)
|
||||
logger.info(f"処理対象テーブル: {len(migration_tables)}個")
|
||||
logger.info(f"総挿入件数: {total_inserted}件")
|
||||
logger.info(f"総更新件数: {total_updated}件")
|
||||
logger.info(f"総エラー件数: {total_errors}件")
|
||||
|
||||
# テーブル別詳細
|
||||
logger.info("\n--- テーブル別詳細 ---")
|
||||
for table_name, stats in self.migration_stats.items():
|
||||
logger.info(f"{table_name}: 挿入{stats['inserted']}, 更新{stats['updated']}, エラー{stats['errors']}")
|
||||
|
||||
if total_errors == 0:
|
||||
logger.info("✅ 全ての移行が正常に完了しました！")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"⚠️ {total_errors}件のエラーがありました")
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 移行処理エラー: {e}")
|
||||
return False
|
||||
|
||||
finally:
|
||||
self.close_connections()
|
||||
|
||||
def main():
|
||||
"""メイン処理"""
|
||||
logger.info("Old RogDB → RogDB データ移行スクリプト")
|
||||
|
||||
# 除外テーブルの設定（必要に応じて）
|
||||
exclude_tables = [
|
||||
# 'rog_customuser', # ユーザーデータは慎重に扱う
|
||||
# 'rog_session', # セッションデータは移行不要
|
||||
# 'django_migrations', # Django管理テーブル
|
||||
]
|
||||
|
||||
# 環境変数による除外テーブル指定
|
||||
env_exclude = os.getenv('EXCLUDE_TABLES', '')
|
||||
if env_exclude:
|
||||
exclude_tables.extend(env_exclude.split(','))
|
||||
|
||||
# 移行実行
|
||||
migrator = RogTableMigrator()
|
||||
success = migrator.run_migration(exclude_tables=exclude_tables)
|
||||
|
||||
sys.exit(0 if success else 1)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,414 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Old RogDB データ移行スクリプト (エラー修正版)
|
||||
old_rogdb の rog_* テーブルから rogdb の rog_* テーブルへデータを更新・挿入
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import psycopg2
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional, Dict, List, Tuple
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
OLD_ROGDB_CONFIG = {
|
||||
'host': os.getenv('OLD_ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('OLD_ROGDB_NAME', 'old_rogdb'),
|
||||
'user': os.getenv('OLD_ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('OLD_ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('OLD_ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
# PostgreSQL予約語をクォートで囲む必要があるカラム
|
||||
RESERVED_KEYWORDS = {
|
||||
'like', 'order', 'group', 'user', 'table', 'where', 'select', 'insert',
|
||||
'update', 'delete', 'create', 'drop', 'alter', 'index', 'constraint'
|
||||
}
|
||||
|
||||
class RogTableMigrator:
|
||||
"""Rogテーブル移行クラス (エラー修正版)"""
|
||||
|
||||
def __init__(self):
|
||||
self.old_conn = None
|
||||
self.new_conn = None
|
||||
self.old_cursor = None
|
||||
self.new_cursor = None
|
||||
self.migration_stats = {}
|
||||
|
||||
def quote_column_if_needed(self, column_name):
|
||||
"""予約語やキャメルケースの場合はダブルクォートで囲む"""
|
||||
# 予約語チェック
|
||||
if column_name.lower() in RESERVED_KEYWORDS:
|
||||
return f'"{column_name}"'
|
||||
|
||||
# キャメルケースや大文字が含まれる場合もクォート
|
||||
if any(c.isupper() for c in column_name) or column_name != column_name.lower():
|
||||
return f'"{column_name}"'
|
||||
|
||||
return column_name
|
||||
|
||||
def connect_databases(self):
|
||||
"""データベース接続"""
|
||||
try:
|
||||
logger.info("データベースに接続中...")
|
||||
self.old_conn = psycopg2.connect(**OLD_ROGDB_CONFIG)
|
||||
self.new_conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
|
||||
# autocommitを有効にしてトランザクション問題を回避
|
||||
self.old_conn.autocommit = True
|
||||
self.new_conn.autocommit = False # 新しい方は手動コミット
|
||||
|
||||
self.old_cursor = self.old_conn.cursor()
|
||||
self.new_cursor = self.new_conn.cursor()
|
||||
|
||||
logger.info("✅ データベース接続成功")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ データベース接続エラー: {e}")
|
||||
return False
|
||||
|
||||
def close_connections(self):
|
||||
"""データベース接続クローズ"""
|
||||
try:
|
||||
if self.old_cursor:
|
||||
self.old_cursor.close()
|
||||
if self.new_cursor:
|
||||
self.new_cursor.close()
|
||||
if self.old_conn:
|
||||
self.old_conn.close()
|
||||
if self.new_conn:
|
||||
self.new_conn.close()
|
||||
logger.info("データベース接続をクローズしました")
|
||||
except Exception as e:
|
||||
logger.warning(f"接続クローズ時の警告: {e}")
|
||||
|
||||
def get_rog_tables(self):
|
||||
"""rog_で始まるテーブル一覧を取得"""
|
||||
try:
|
||||
# old_rogdbのrog_テーブル一覧
|
||||
self.old_cursor.execute("""
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE 'rog_%'
|
||||
ORDER BY table_name
|
||||
""")
|
||||
old_tables = [row[0] for row in self.old_cursor.fetchall()]
|
||||
|
||||
# rogdbのrog_テーブル一覧
|
||||
self.new_cursor.execute("""
|
||||
SELECT table_name
|
||||
FROM information_schema.tables
|
||||
WHERE table_schema = 'public'
|
||||
AND table_name LIKE 'rog_%'
|
||||
ORDER BY table_name
|
||||
""")
|
||||
new_tables = [row[0] for row in self.new_cursor.fetchall()]
|
||||
|
||||
# 共通テーブル
|
||||
common_tables = list(set(old_tables) & set(new_tables))
|
||||
|
||||
logger.info(f"old_rogdb rog_テーブル: {len(old_tables)}個")
|
||||
logger.info(f"rogdb rog_テーブル: {len(new_tables)}個")
|
||||
logger.info(f"共通 rog_テーブル: {len(common_tables)}個")
|
||||
|
||||
return old_tables, new_tables, common_tables
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"テーブル一覧取得エラー: {e}")
|
||||
return [], [], []
|
||||
|
||||
def get_table_structure(self, table_name, cursor):
|
||||
"""テーブル構造を取得 (エラーハンドリング強化)"""
|
||||
try:
|
||||
cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable, column_default
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = %s
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position
|
||||
""", (table_name,))
|
||||
|
||||
columns = cursor.fetchall()
|
||||
return {
|
||||
'columns': [col[0] for col in columns],
|
||||
'details': columns
|
||||
}
|
||||
except Exception as e:
|
||||
logger.error(f"テーブル構造取得エラー ({table_name}): {e}")
|
||||
# トランザクションエラーを回避
|
||||
try:
|
||||
cursor.connection.rollback()
|
||||
except:
|
||||
pass
|
||||
return {'columns': [], 'details': []}
|
||||
|
||||
def get_primary_key(self, table_name, cursor):
|
||||
"""主キーカラムを取得"""
|
||||
try:
|
||||
cursor.execute("""
|
||||
SELECT a.attname
|
||||
FROM pg_index i
|
||||
JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey)
|
||||
WHERE i.indrelid = %s::regclass AND i.indisprimary
|
||||
""", (table_name,))
|
||||
|
||||
pk_columns = [row[0] for row in cursor.fetchall()]
|
||||
return pk_columns if pk_columns else ['id']
|
||||
|
||||
except Exception as e:
|
||||
logger.warning(f"主キー取得エラー ({table_name}): {e}")
|
||||
return ['id'] # デフォルトでidを使用
|
||||
|
||||
def migrate_table_data(self, table_name):
|
||||
"""個別テーブルのデータ移行 (エラー修正版)"""
|
||||
logger.info(f"\n=== {table_name} データ移行開始 ===")
|
||||
|
||||
try:
|
||||
# テーブル構造比較
|
||||
old_structure = self.get_table_structure(table_name, self.old_cursor)
|
||||
new_structure = self.get_table_structure(table_name, self.new_cursor)
|
||||
|
||||
old_columns = set(old_structure['columns'])
|
||||
new_columns = set(new_structure['columns'])
|
||||
common_columns = old_columns & new_columns
|
||||
|
||||
if not common_columns:
|
||||
logger.warning(f"⚠️ {table_name}: 共通カラムがありません")
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 0}
|
||||
|
||||
logger.info(f"共通カラム ({len(common_columns)}個): {sorted(common_columns)}")
|
||||
|
||||
# 主キー取得
|
||||
pk_columns = self.get_primary_key(table_name, self.new_cursor)
|
||||
logger.info(f"主キー: {pk_columns}")
|
||||
|
||||
# カラム名を予約語対応でクォート
|
||||
quoted_columns = [self.quote_column_if_needed(col) for col in common_columns]
|
||||
columns_str = ', '.join(quoted_columns)
|
||||
|
||||
# old_rogdbからデータ取得
|
||||
try:
|
||||
self.old_cursor.execute(f"SELECT {columns_str} FROM {table_name}")
|
||||
old_records = self.old_cursor.fetchall()
|
||||
except Exception as e:
|
||||
logger.error(f"❌ {table_name} データ取得エラー: {e}")
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 1}
|
||||
|
||||
if not old_records:
|
||||
logger.info(f"✅ {table_name}: 移行対象データなし")
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 0}
|
||||
|
||||
logger.info(f"移行対象レコード数: {len(old_records)}件")
|
||||
|
||||
# 統計情報
|
||||
inserted_count = 0
|
||||
updated_count = 0
|
||||
error_count = 0
|
||||
|
||||
# レコード移行処理
|
||||
for i, record in enumerate(old_records):
|
||||
try:
|
||||
# レコードデータを辞書形式に変換
|
||||
record_dict = dict(zip(common_columns, record))
|
||||
|
||||
# 主キー値を取得
|
||||
pk_values = []
|
||||
pk_conditions = []
|
||||
for pk_col in pk_columns:
|
||||
if pk_col in record_dict:
|
||||
pk_values.append(record_dict[pk_col])
|
||||
quoted_pk_col = self.quote_column_if_needed(pk_col)
|
||||
pk_conditions.append(f"{quoted_pk_col} = %s")
|
||||
|
||||
if not pk_values:
|
||||
error_count += 1
|
||||
continue
|
||||
|
||||
# 既存レコード確認
|
||||
check_query = f"SELECT COUNT(*) FROM {table_name} WHERE {' AND '.join(pk_conditions)}"
|
||||
self.new_cursor.execute(check_query, pk_values)
|
||||
exists = self.new_cursor.fetchone()[0] > 0
|
||||
|
||||
if exists:
|
||||
# UPDATE処理
|
||||
set_clauses = []
|
||||
update_values = []
|
||||
|
||||
for col in common_columns:
|
||||
if col not in pk_columns: # 主キー以外を更新
|
||||
quoted_col = self.quote_column_if_needed(col)
|
||||
set_clauses.append(f"{quoted_col} = %s")
|
||||
update_values.append(record_dict[col])
|
||||
|
||||
if set_clauses:
|
||||
update_query = f"""
|
||||
UPDATE {table_name}
|
||||
SET {', '.join(set_clauses)}
|
||||
WHERE {' AND '.join(pk_conditions)}
|
||||
"""
|
||||
self.new_cursor.execute(update_query, update_values + pk_values)
|
||||
updated_count += 1
|
||||
|
||||
else:
|
||||
# INSERT処理
|
||||
insert_columns = list(common_columns)
|
||||
insert_values = [record_dict[col] for col in insert_columns]
|
||||
quoted_insert_columns = [self.quote_column_if_needed(col) for col in insert_columns]
|
||||
placeholders = ', '.join(['%s'] * len(insert_columns))
|
||||
|
||||
insert_query = f"""
|
||||
INSERT INTO {table_name} ({', '.join(quoted_insert_columns)})
|
||||
VALUES ({placeholders})
|
||||
"""
|
||||
self.new_cursor.execute(insert_query, insert_values)
|
||||
inserted_count += 1
|
||||
|
||||
# 定期的なコミット
|
||||
if (i + 1) % 100 == 0:
|
||||
self.new_conn.commit()
|
||||
logger.info(f" 進捗: {i + 1}/{len(old_records)} 件処理完了")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
logger.error(f" レコード処理エラー (行{i+1}): {e}")
|
||||
# トランザクションロールバック
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
|
||||
if error_count > 10: # エラー上限
|
||||
logger.error(f"❌ {table_name}: エラー数が上限を超えました")
|
||||
break
|
||||
|
||||
# 最終コミット
|
||||
try:
|
||||
self.new_conn.commit()
|
||||
except Exception as e:
|
||||
logger.error(f"コミットエラー: {e}")
|
||||
|
||||
# 結果サマリー
|
||||
stats = {
|
||||
'inserted': inserted_count,
|
||||
'updated': updated_count,
|
||||
'errors': error_count,
|
||||
'total': len(old_records)
|
||||
}
|
||||
|
||||
logger.info(f"✅ {table_name} 移行完了:")
|
||||
logger.info(f" 挿入: {inserted_count}件")
|
||||
logger.info(f" 更新: {updated_count}件")
|
||||
logger.info(f" エラー: {error_count}件")
|
||||
|
||||
self.migration_stats[table_name] = stats
|
||||
return stats
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ {table_name} 移行エラー: {e}")
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
return {'inserted': 0, 'updated': 0, 'errors': 1}
|
||||
|
||||
def run_migration(self, exclude_tables=None):
|
||||
"""全体移行実行"""
|
||||
if exclude_tables is None:
|
||||
exclude_tables = []
|
||||
|
||||
logger.info("=" * 80)
|
||||
logger.info("Old RogDB → RogDB データ移行開始")
|
||||
logger.info("=" * 80)
|
||||
|
||||
try:
|
||||
# データベース接続
|
||||
if not self.connect_databases():
|
||||
return False
|
||||
|
||||
# テーブル一覧取得
|
||||
old_tables, new_tables, common_tables = self.get_rog_tables()
|
||||
|
||||
if not common_tables:
|
||||
logger.error("❌ 移行対象テーブルがありません")
|
||||
return False
|
||||
|
||||
# 除外テーブルをフィルタリング
|
||||
migration_tables = [t for t in common_tables if t not in exclude_tables]
|
||||
logger.info(f"移行対象テーブル ({len(migration_tables)}個): {migration_tables}")
|
||||
|
||||
# 各テーブルを移行
|
||||
total_inserted = 0
|
||||
total_updated = 0
|
||||
total_errors = 0
|
||||
|
||||
for table_name in migration_tables:
|
||||
stats = self.migrate_table_data(table_name)
|
||||
total_inserted += stats['inserted']
|
||||
total_updated += stats['updated']
|
||||
total_errors += stats['errors']
|
||||
|
||||
# 全体サマリー出力
|
||||
logger.info("=" * 80)
|
||||
logger.info("移行完了サマリー")
|
||||
logger.info("=" * 80)
|
||||
logger.info(f"処理対象テーブル: {len(migration_tables)}個")
|
||||
logger.info(f"総挿入件数: {total_inserted}件")
|
||||
logger.info(f"総更新件数: {total_updated}件")
|
||||
logger.info(f"総エラー件数: {total_errors}件")
|
||||
|
||||
logger.info("\n--- テーブル別詳細 ---")
|
||||
for table_name, stats in self.migration_stats.items():
|
||||
logger.info(f"{table_name}: 挿入{stats['inserted']}, 更新{stats['updated']}, エラー{stats['errors']}")
|
||||
|
||||
if total_errors > 0:
|
||||
logger.warning(f"⚠️ {total_errors}件のエラーがありました")
|
||||
else:
|
||||
logger.info("✅ 全ての移行が正常に完了しました！")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 移行処理エラー: {e}")
|
||||
return False
|
||||
|
||||
finally:
|
||||
self.close_connections()
|
||||
|
||||
def main():
|
||||
"""メイン処理"""
|
||||
logger.info("Old RogDB → RogDB データ移行スクリプト")
|
||||
|
||||
# 除外テーブル設定
|
||||
exclude_tables = []
|
||||
if os.getenv('EXCLUDE_TABLES'):
|
||||
exclude_tables = [t.strip() for t in os.getenv('EXCLUDE_TABLES').split(',')]
|
||||
logger.info(f"除外テーブル: {exclude_tables}")
|
||||
|
||||
# 移行実行
|
||||
migrator = RogTableMigrator()
|
||||
success = migrator.run_migration(exclude_tables=exclude_tables)
|
||||
|
||||
if success:
|
||||
logger.info("移行処理が完了しました")
|
||||
sys.exit(0)
|
||||
else:
|
||||
logger.error("移行処理が失敗しました")
|
||||
sys.exit(1)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,354 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
rog_entry テーブル専用移行スクリプト (予約語・NULL値対応)
|
||||
old_rogdb の rog_entry から rogdb の rog_entry へデータ移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import psycopg2
|
||||
from datetime import datetime, timezone
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
OLD_ROGDB_CONFIG = {
|
||||
'host': os.getenv('OLD_ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('OLD_ROGDB_NAME', 'old_rogdb'),
|
||||
'user': os.getenv('OLD_ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('OLD_ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('OLD_ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
class RogEntryMigrator:
|
||||
"""rog_entry テーブル専用移行クラス"""
|
||||
|
||||
def __init__(self):
|
||||
self.old_conn = None
|
||||
self.new_conn = None
|
||||
self.old_cursor = None
|
||||
self.new_cursor = None
|
||||
|
||||
def connect_databases(self):
|
||||
"""データベース接続"""
|
||||
try:
|
||||
logger.info("データベースに接続中...")
|
||||
self.old_conn = psycopg2.connect(**OLD_ROGDB_CONFIG)
|
||||
self.new_conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
|
||||
self.old_conn.autocommit = True
|
||||
self.new_conn.autocommit = False
|
||||
|
||||
self.old_cursor = self.old_conn.cursor()
|
||||
self.new_cursor = self.new_conn.cursor()
|
||||
|
||||
logger.info("✅ データベース接続成功")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ データベース接続エラー: {e}")
|
||||
return False
|
||||
|
||||
def close_connections(self):
|
||||
"""データベース接続クローズ"""
|
||||
try:
|
||||
if self.old_cursor:
|
||||
self.old_cursor.close()
|
||||
if self.new_cursor:
|
||||
self.new_cursor.close()
|
||||
if self.old_conn:
|
||||
self.old_conn.close()
|
||||
if self.new_conn:
|
||||
self.new_conn.close()
|
||||
logger.info("データベース接続をクローズしました")
|
||||
except Exception as e:
|
||||
logger.warning(f"接続クローズ時の警告: {e}")
|
||||
|
||||
def quote_column_if_needed(self, column_name):
|
||||
"""予約語やキャメルケースの場合はダブルクォートで囲む"""
|
||||
# camelCaseの場合はクォート
|
||||
if any(c.isupper() for c in column_name):
|
||||
return f'"{column_name}"'
|
||||
return column_name
|
||||
|
||||
def handle_null_values(self, column_name, value):
|
||||
"""NULL値の処理とデフォルト値設定"""
|
||||
if value is not None:
|
||||
return value
|
||||
|
||||
# rog_entryテーブル固有のデフォルト値
|
||||
defaults = {
|
||||
'is_active': True,
|
||||
'is_trial': False,
|
||||
'hasGoaled': False,
|
||||
'hasParticipated': False,
|
||||
'zekken_label': '',
|
||||
'zekken_number': 0
|
||||
}
|
||||
|
||||
if column_name in defaults:
|
||||
default_value = defaults[column_name]
|
||||
logger.debug(f"NULL値をデフォルト値に変換: {column_name} = {default_value}")
|
||||
return default_value
|
||||
|
||||
# デフォルト値が見つからない場合はNULLを返す
|
||||
logger.warning(f"デフォルト値が設定されていません: {column_name}")
|
||||
return None
|
||||
|
||||
def validate_foreign_keys(self):
|
||||
"""外部キー参照の整合性をチェック"""
|
||||
logger.info("外部キー参照の整合性をチェック中...")
|
||||
|
||||
# team_id の存在確認
|
||||
self.old_cursor.execute("SELECT DISTINCT team_id FROM rog_entry WHERE team_id IS NOT NULL")
|
||||
old_team_ids = [row[0] for row in self.old_cursor.fetchall()]
|
||||
|
||||
self.new_cursor.execute("SELECT id FROM rog_team")
|
||||
new_team_ids = [row[0] for row in self.new_cursor.fetchall()]
|
||||
|
||||
missing_teams = set(old_team_ids) - set(new_team_ids)
|
||||
if missing_teams:
|
||||
logger.warning(f"⚠️ 新DBに存在しないteam_id: {missing_teams}")
|
||||
logger.warning("先にrog_teamの移行を完了してください")
|
||||
return False
|
||||
|
||||
# event_id の存在確認
|
||||
self.old_cursor.execute("SELECT DISTINCT event_id FROM rog_entry WHERE event_id IS NOT NULL")
|
||||
old_event_ids = [row[0] for row in self.old_cursor.fetchall()]
|
||||
|
||||
self.new_cursor.execute("SELECT id FROM rog_newevent2")
|
||||
new_event_ids = [row[0] for row in self.new_cursor.fetchall()]
|
||||
|
||||
missing_events = set(old_event_ids) - set(new_event_ids)
|
||||
if missing_events:
|
||||
logger.warning(f"⚠️ 新DBに存在しないevent_id: {missing_events}")
|
||||
logger.warning("先にrog_newevent2の移行を完了してください")
|
||||
return False
|
||||
|
||||
# category_id の存在確認
|
||||
self.old_cursor.execute("SELECT DISTINCT category_id FROM rog_entry WHERE category_id IS NOT NULL")
|
||||
old_category_ids = [row[0] for row in self.old_cursor.fetchall()]
|
||||
|
||||
self.new_cursor.execute("SELECT id FROM rog_newcategory")
|
||||
new_category_ids = [row[0] for row in self.new_cursor.fetchall()]
|
||||
|
||||
missing_categories = set(old_category_ids) - set(new_category_ids)
|
||||
if missing_categories:
|
||||
logger.warning(f"⚠️ 新DBに存在しないcategory_id: {missing_categories}")
|
||||
logger.warning("先にrog_newcategoryの移行を完了してください")
|
||||
return False
|
||||
|
||||
logger.info("✅ 外部キー参照の整合性チェック完了")
|
||||
return True
|
||||
|
||||
def migrate_rog_entry(self):
|
||||
"""rog_entry テーブルのデータ移行"""
|
||||
logger.info("=" * 60)
|
||||
logger.info("rog_entry テーブルデータ移行開始")
|
||||
logger.info("=" * 60)
|
||||
|
||||
try:
|
||||
# 外部キー整合性チェック
|
||||
if not self.validate_foreign_keys():
|
||||
logger.error("❌ 外部キー整合性チェックに失敗しました")
|
||||
return False
|
||||
|
||||
# 旧データ取得（camelCaseカラム名をクォート）
|
||||
logger.info("旧rog_entryデータを取得中...")
|
||||
self.old_cursor.execute("""
|
||||
SELECT id, date, category_id, event_id, owner_id, team_id,
|
||||
is_active, zekken_number, "hasGoaled", "hasParticipated",
|
||||
zekken_label, is_trial
|
||||
FROM rog_entry
|
||||
ORDER BY id
|
||||
""")
|
||||
old_records = self.old_cursor.fetchall()
|
||||
|
||||
if not old_records:
|
||||
logger.info("✅ 移行対象データがありません")
|
||||
return True
|
||||
|
||||
logger.info(f"移行対象レコード数: {len(old_records)}件")
|
||||
|
||||
# 統計情報
|
||||
inserted_count = 0
|
||||
updated_count = 0
|
||||
error_count = 0
|
||||
|
||||
# レコード別処理
|
||||
for i, old_record in enumerate(old_records):
|
||||
try:
|
||||
# レコードデータの展開とNULL値処理
|
||||
entry_id, date, category_id, event_id, owner_id, team_id, \
|
||||
is_active, zekken_number, hasGoaled, hasParticipated, \
|
||||
zekken_label, is_trial = old_record
|
||||
|
||||
# NULL値処理
|
||||
processed_record = {
|
||||
'id': entry_id,
|
||||
'date': date,
|
||||
'category_id': category_id,
|
||||
'event_id': event_id,
|
||||
'owner_id': owner_id,
|
||||
'team_id': team_id,
|
||||
'is_active': self.handle_null_values('is_active', is_active),
|
||||
'zekken_number': self.handle_null_values('zekken_number', zekken_number),
|
||||
'hasGoaled': self.handle_null_values('hasGoaled', hasGoaled),
|
||||
'hasParticipated': self.handle_null_values('hasParticipated', hasParticipated),
|
||||
'zekken_label': self.handle_null_values('zekken_label', zekken_label),
|
||||
'is_trial': self.handle_null_values('is_trial', is_trial)
|
||||
}
|
||||
|
||||
# 既存レコード確認
|
||||
self.new_cursor.execute(
|
||||
"SELECT COUNT(*) FROM rog_entry WHERE id = %s",
|
||||
(entry_id,)
|
||||
)
|
||||
exists = self.new_cursor.fetchone()[0] > 0
|
||||
|
||||
if exists:
|
||||
# UPDATE処理（camelCaseカラムをクォート）
|
||||
update_query = """
|
||||
UPDATE rog_entry SET
|
||||
date = %s,
|
||||
category_id = %s,
|
||||
event_id = %s,
|
||||
owner_id = %s,
|
||||
team_id = %s,
|
||||
is_active = %s,
|
||||
zekken_number = %s,
|
||||
"hasGoaled" = %s,
|
||||
"hasParticipated" = %s,
|
||||
zekken_label = %s,
|
||||
is_trial = %s
|
||||
WHERE id = %s
|
||||
"""
|
||||
|
||||
self.new_cursor.execute(update_query, (
|
||||
processed_record['date'],
|
||||
processed_record['category_id'],
|
||||
processed_record['event_id'],
|
||||
processed_record['owner_id'],
|
||||
processed_record['team_id'],
|
||||
processed_record['is_active'],
|
||||
processed_record['zekken_number'],
|
||||
processed_record['hasGoaled'],
|
||||
processed_record['hasParticipated'],
|
||||
processed_record['zekken_label'],
|
||||
processed_record['is_trial'],
|
||||
entry_id
|
||||
))
|
||||
updated_count += 1
|
||||
|
||||
else:
|
||||
# INSERT処理（camelCaseカラムをクォート）
|
||||
insert_query = """
|
||||
INSERT INTO rog_entry (
|
||||
id, date, category_id, event_id, owner_id, team_id,
|
||||
is_active, zekken_number, "hasGoaled", "hasParticipated",
|
||||
zekken_label, is_trial
|
||||
) VALUES (
|
||||
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s
|
||||
)
|
||||
"""
|
||||
|
||||
self.new_cursor.execute(insert_query, (
|
||||
processed_record['id'],
|
||||
processed_record['date'],
|
||||
processed_record['category_id'],
|
||||
processed_record['event_id'],
|
||||
processed_record['owner_id'],
|
||||
processed_record['team_id'],
|
||||
processed_record['is_active'],
|
||||
processed_record['zekken_number'],
|
||||
processed_record['hasGoaled'],
|
||||
processed_record['hasParticipated'],
|
||||
processed_record['zekken_label'],
|
||||
processed_record['is_trial']
|
||||
))
|
||||
inserted_count += 1
|
||||
|
||||
# 進捗表示とコミット
|
||||
if (i + 1) % 100 == 0:
|
||||
self.new_conn.commit()
|
||||
logger.info(f" 進捗: {i + 1}/{len(old_records)} 件処理完了")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
logger.error(f" レコード処理エラー (ID: {entry_id}): {e}")
|
||||
|
||||
# トランザクションロールバック
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
|
||||
if error_count > 10:
|
||||
logger.error("❌ エラー数が上限を超えました")
|
||||
break
|
||||
|
||||
# 最終コミット
|
||||
self.new_conn.commit()
|
||||
|
||||
# 結果サマリー
|
||||
logger.info("=" * 60)
|
||||
logger.info("rog_entry 移行完了")
|
||||
logger.info("=" * 60)
|
||||
logger.info(f"挿入: {inserted_count}件")
|
||||
logger.info(f"更新: {updated_count}件")
|
||||
logger.info(f"エラー: {error_count}件")
|
||||
logger.info(f"総処理: {len(old_records)}件")
|
||||
|
||||
if error_count == 0:
|
||||
logger.info("✅ rog_entry移行が正常に完了しました！")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"⚠️ {error_count}件のエラーがありました")
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ rog_entry移行エラー: {e}")
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
return False
|
||||
|
||||
def run(self):
|
||||
"""移行実行"""
|
||||
try:
|
||||
if not self.connect_databases():
|
||||
return False
|
||||
|
||||
return self.migrate_rog_entry()
|
||||
|
||||
finally:
|
||||
self.close_connections()
|
||||
|
||||
def main():
|
||||
"""メイン処理"""
|
||||
logger.info("rog_entry テーブル移行スクリプト")
|
||||
|
||||
migrator = RogEntryMigrator()
|
||||
success = migrator.run()
|
||||
|
||||
if success:
|
||||
logger.info("🎉 移行が正常に完了しました！")
|
||||
else:
|
||||
logger.error("💥 移行中にエラーが発生しました")
|
||||
|
||||
sys.exit(0 if success else 1)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,365 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
rog_goalimages テーブル専用移行スクリプト (team_name → zekken_number変換対応)
|
||||
old_rogdb の rog_goalimages から rogdb の rog_goalimages へ
|
||||
zekken_numberがブランクの場合、team_nameからrog_entryを検索してzekken_numberを取得
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import psycopg2
|
||||
from datetime import datetime, timezone
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
OLD_ROGDB_CONFIG = {
|
||||
'host': os.getenv('OLD_ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('OLD_ROGDB_NAME', 'old_rogdb'),
|
||||
'user': os.getenv('OLD_ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('OLD_ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('OLD_ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
class RogGoalImagesMigrator:
|
||||
"""rog_goalimages テーブル専用移行クラス"""
|
||||
|
||||
def __init__(self):
|
||||
self.old_conn = None
|
||||
self.new_conn = None
|
||||
self.old_cursor = None
|
||||
self.new_cursor = None
|
||||
self.team_zekken_cache = {} # team_name → zekken_number キャッシュ
|
||||
|
||||
def connect_databases(self):
|
||||
"""データベース接続"""
|
||||
try:
|
||||
logger.info("データベースに接続中...")
|
||||
self.old_conn = psycopg2.connect(**OLD_ROGDB_CONFIG)
|
||||
self.new_conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
|
||||
self.old_conn.autocommit = True
|
||||
self.new_conn.autocommit = False
|
||||
|
||||
self.old_cursor = self.old_conn.cursor()
|
||||
self.new_cursor = self.new_conn.cursor()
|
||||
|
||||
logger.info("✅ データベース接続成功")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ データベース接続エラー: {e}")
|
||||
return False
|
||||
|
||||
def close_connections(self):
|
||||
"""データベース接続クローズ"""
|
||||
try:
|
||||
if self.old_cursor:
|
||||
self.old_cursor.close()
|
||||
if self.new_cursor:
|
||||
self.new_cursor.close()
|
||||
if self.old_conn:
|
||||
self.old_conn.close()
|
||||
if self.new_conn:
|
||||
self.new_conn.close()
|
||||
logger.info("データベース接続をクローズしました")
|
||||
except Exception as e:
|
||||
logger.warning(f"接続クローズ時の警告: {e}")
|
||||
|
||||
def build_team_zekken_cache(self):
|
||||
"""team_name → zekken_number のキャッシュを構築"""
|
||||
logger.info("team_name → zekken_number キャッシュを構築中...")
|
||||
|
||||
try:
|
||||
# 新DBのrog_entryから team_name → zekken_number マッピングを取得
|
||||
self.new_cursor.execute("""
|
||||
SELECT DISTINCT t.team_name, e.zekken_number
|
||||
FROM rog_entry e
|
||||
JOIN rog_team t ON e.team_id = t.id
|
||||
WHERE t.team_name IS NOT NULL
|
||||
AND e.zekken_number IS NOT NULL
|
||||
ORDER BY t.team_name, e.zekken_number
|
||||
""")
|
||||
|
||||
team_zekken_pairs = self.new_cursor.fetchall()
|
||||
|
||||
for team_name, zekken_number in team_zekken_pairs:
|
||||
if team_name not in self.team_zekken_cache:
|
||||
self.team_zekken_cache[team_name] = zekken_number
|
||||
logger.debug(f"キャッシュ追加: {team_name} → {zekken_number}")
|
||||
|
||||
logger.info(f"✅ キャッシュ構築完了: {len(self.team_zekken_cache)}件のteam_name → zekken_numberマッピング")
|
||||
|
||||
# キャッシュ内容の一部をログ出力
|
||||
if self.team_zekken_cache:
|
||||
sample_items = list(self.team_zekken_cache.items())[:5]
|
||||
logger.info(f"キャッシュサンプル: {sample_items}")
|
||||
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ キャッシュ構築エラー: {e}")
|
||||
return False
|
||||
|
||||
def resolve_zekken_number(self, old_zekken_number, team_name):
|
||||
"""zekken_numberを解決（ブランクの場合はteam_nameから取得）"""
|
||||
# zekken_numberが既に設定されている場合はそのまま使用
|
||||
if old_zekken_number and old_zekken_number.strip():
|
||||
return old_zekken_number.strip()
|
||||
|
||||
# team_nameからzekken_numberを検索
|
||||
if team_name and team_name.strip():
|
||||
clean_team_name = team_name.strip()
|
||||
|
||||
if clean_team_name in self.team_zekken_cache:
|
||||
resolved_zekken = self.team_zekken_cache[clean_team_name]
|
||||
logger.debug(f"team_name '{clean_team_name}' → zekken_number '{resolved_zekken}'")
|
||||
return str(resolved_zekken)
|
||||
else:
|
||||
logger.warning(f"team_name '{clean_team_name}' に対応するzekken_numberが見つかりません")
|
||||
|
||||
# 解決できない場合は空文字列を返す
|
||||
logger.warning(f"zekken_number解決失敗: zekken='{old_zekken_number}', team='{team_name}'")
|
||||
return ''
|
||||
|
||||
def get_old_goalimages_structure(self):
|
||||
"""旧DBのrog_goalimagesテーブル構造を取得"""
|
||||
try:
|
||||
self.old_cursor.execute("""
|
||||
SELECT column_name, data_type, is_nullable
|
||||
FROM information_schema.columns
|
||||
WHERE table_name = 'rog_goalimages'
|
||||
AND table_schema = 'public'
|
||||
ORDER BY ordinal_position
|
||||
""")
|
||||
|
||||
columns = self.old_cursor.fetchall()
|
||||
column_names = [col[0] for col in columns]
|
||||
|
||||
logger.info(f"旧DBのrog_goalimagesカラム: {column_names}")
|
||||
return column_names
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ 旧DBテーブル構造取得エラー: {e}")
|
||||
return []
|
||||
|
||||
def migrate_rog_goalimages(self):
|
||||
"""rog_goalimages テーブルのデータ移行"""
|
||||
logger.info("=" * 60)
|
||||
logger.info("rog_goalimages テーブルデータ移行開始")
|
||||
logger.info("=" * 60)
|
||||
|
||||
try:
|
||||
# team_name → zekken_number キャッシュ構築
|
||||
if not self.build_team_zekken_cache():
|
||||
logger.error("❌ キャッシュ構築に失敗しました")
|
||||
return False
|
||||
|
||||
# 旧DBテーブル構造確認
|
||||
old_columns = self.get_old_goalimages_structure()
|
||||
if not old_columns:
|
||||
logger.error("❌ 旧DBのテーブル構造を取得できませんでした")
|
||||
return False
|
||||
|
||||
# 旧データ取得
|
||||
logger.info("旧rog_goalimagesデータを取得中...")
|
||||
|
||||
# カラム存在チェック
|
||||
has_zekken_number = 'zekken_number' in old_columns
|
||||
|
||||
if has_zekken_number:
|
||||
select_query = """
|
||||
SELECT id, goalimage, goaltime, team_name, event_code,
|
||||
cp_number, user_id, zekken_number
|
||||
FROM rog_goalimages
|
||||
ORDER BY id
|
||||
"""
|
||||
else:
|
||||
select_query = """
|
||||
SELECT id, goalimage, goaltime, team_name, event_code,
|
||||
cp_number, user_id, NULL as zekken_number
|
||||
FROM rog_goalimages
|
||||
ORDER BY id
|
||||
"""
|
||||
|
||||
self.old_cursor.execute(select_query)
|
||||
old_records = self.old_cursor.fetchall()
|
||||
|
||||
if not old_records:
|
||||
logger.info("✅ 移行対象データがありません")
|
||||
return True
|
||||
|
||||
logger.info(f"移行対象レコード数: {len(old_records)}件")
|
||||
|
||||
# 統計情報
|
||||
inserted_count = 0
|
||||
updated_count = 0
|
||||
error_count = 0
|
||||
zekken_resolved_count = 0
|
||||
|
||||
# レコード別処理
|
||||
for i, old_record in enumerate(old_records):
|
||||
try:
|
||||
# レコードデータの展開
|
||||
record_id, goalimage, goaltime, team_name, event_code, \
|
||||
cp_number, user_id, old_zekken_number = old_record
|
||||
|
||||
# zekken_number解決
|
||||
resolved_zekken_number = self.resolve_zekken_number(old_zekken_number, team_name)
|
||||
|
||||
if not old_zekken_number and resolved_zekken_number:
|
||||
zekken_resolved_count += 1
|
||||
|
||||
# 新レコードデータ
|
||||
new_record = {
|
||||
'id': record_id,
|
||||
'goalimage': goalimage,
|
||||
'goaltime': goaltime,
|
||||
'team_name': team_name or '',
|
||||
'event_code': event_code or '',
|
||||
'cp_number': cp_number or 0,
|
||||
'user_id': user_id,
|
||||
'zekken_number': resolved_zekken_number
|
||||
}
|
||||
|
||||
# 既存レコード確認
|
||||
self.new_cursor.execute(
|
||||
"SELECT COUNT(*) FROM rog_goalimages WHERE id = %s",
|
||||
(record_id,)
|
||||
)
|
||||
exists = self.new_cursor.fetchone()[0] > 0
|
||||
|
||||
if exists:
|
||||
# UPDATE処理
|
||||
update_query = """
|
||||
UPDATE rog_goalimages SET
|
||||
goalimage = %s,
|
||||
goaltime = %s,
|
||||
team_name = %s,
|
||||
event_code = %s,
|
||||
cp_number = %s,
|
||||
user_id = %s,
|
||||
zekken_number = %s
|
||||
WHERE id = %s
|
||||
"""
|
||||
|
||||
self.new_cursor.execute(update_query, (
|
||||
new_record['goalimage'],
|
||||
new_record['goaltime'],
|
||||
new_record['team_name'],
|
||||
new_record['event_code'],
|
||||
new_record['cp_number'],
|
||||
new_record['user_id'],
|
||||
new_record['zekken_number'],
|
||||
record_id
|
||||
))
|
||||
updated_count += 1
|
||||
|
||||
else:
|
||||
# INSERT処理
|
||||
insert_query = """
|
||||
INSERT INTO rog_goalimages (
|
||||
id, goalimage, goaltime, team_name, event_code,
|
||||
cp_number, user_id, zekken_number
|
||||
) VALUES (
|
||||
%s, %s, %s, %s, %s, %s, %s, %s
|
||||
)
|
||||
"""
|
||||
|
||||
self.new_cursor.execute(insert_query, (
|
||||
new_record['id'],
|
||||
new_record['goalimage'],
|
||||
new_record['goaltime'],
|
||||
new_record['team_name'],
|
||||
new_record['event_code'],
|
||||
new_record['cp_number'],
|
||||
new_record['user_id'],
|
||||
new_record['zekken_number']
|
||||
))
|
||||
inserted_count += 1
|
||||
|
||||
# 進捗表示とコミット
|
||||
if (i + 1) % 100 == 0:
|
||||
self.new_conn.commit()
|
||||
logger.info(f" 進捗: {i + 1}/{len(old_records)} 件処理完了")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
logger.error(f" レコード処理エラー (ID: {record_id}): {e}")
|
||||
|
||||
# トランザクションロールバック
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
|
||||
if error_count > 10:
|
||||
logger.error("❌ エラー数が上限を超えました")
|
||||
break
|
||||
|
||||
# 最終コミット
|
||||
self.new_conn.commit()
|
||||
|
||||
# 結果サマリー
|
||||
logger.info("=" * 60)
|
||||
logger.info("rog_goalimages 移行完了")
|
||||
logger.info("=" * 60)
|
||||
logger.info(f"挿入: {inserted_count}件")
|
||||
logger.info(f"更新: {updated_count}件")
|
||||
logger.info(f"エラー: {error_count}件")
|
||||
logger.info(f"zekken_number解決: {zekken_resolved_count}件")
|
||||
logger.info(f"総処理: {len(old_records)}件")
|
||||
|
||||
if error_count == 0:
|
||||
logger.info("✅ rog_goalimages移行が正常に完了しました！")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"⚠️ {error_count}件のエラーがありました")
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ rog_goalimages移行エラー: {e}")
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
return False
|
||||
|
||||
def run(self):
|
||||
"""移行実行"""
|
||||
try:
|
||||
if not self.connect_databases():
|
||||
return False
|
||||
|
||||
return self.migrate_rog_goalimages()
|
||||
|
||||
finally:
|
||||
self.close_connections()
|
||||
|
||||
def main():
|
||||
"""メイン処理"""
|
||||
logger.info("rog_goalimages テーブル移行スクリプト (team_name → zekken_number変換対応)")
|
||||
|
||||
migrator = RogGoalImagesMigrator()
|
||||
success = migrator.run()
|
||||
|
||||
if success:
|
||||
logger.info("🎉 移行が正常に完了しました！")
|
||||
else:
|
||||
logger.error("💥 移行中にエラーが発生しました")
|
||||
|
||||
sys.exit(0 if success else 1)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@ -1,407 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
rog_team テーブル専用移行スクリプト (構造変換対応)
|
||||
old_rogdb の rog_team から rogdb の rog_team へ構造変換を行いながらデータ移行
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import psycopg2
|
||||
from datetime import datetime, timezone
|
||||
import logging
|
||||
|
||||
# ログ設定
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# データベース設定
|
||||
OLD_ROGDB_CONFIG = {
|
||||
'host': os.getenv('OLD_ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('OLD_ROGDB_NAME', 'old_rogdb'),
|
||||
'user': os.getenv('OLD_ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('OLD_ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('OLD_ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
ROGDB_CONFIG = {
|
||||
'host': os.getenv('ROGDB_HOST', 'postgres-db'),
|
||||
'database': os.getenv('ROGDB_NAME', 'rogdb'),
|
||||
'user': os.getenv('ROGDB_USER', 'admin'),
|
||||
'password': os.getenv('ROGDB_PASSWORD', 'admin123456'),
|
||||
'port': int(os.getenv('ROGDB_PORT', 5432))
|
||||
}
|
||||
|
||||
class RogTeamMigrator:
|
||||
"""rog_team テーブル専用移行クラス"""
|
||||
|
||||
def __init__(self):
|
||||
self.old_conn = None
|
||||
self.new_conn = None
|
||||
self.old_cursor = None
|
||||
self.new_cursor = None
|
||||
self.default_event_id = None
|
||||
|
||||
def connect_databases(self):
|
||||
"""データベース接続"""
|
||||
try:
|
||||
logger.info("データベースに接続中...")
|
||||
self.old_conn = psycopg2.connect(**OLD_ROGDB_CONFIG)
|
||||
self.new_conn = psycopg2.connect(**ROGDB_CONFIG)
|
||||
|
||||
self.old_conn.autocommit = True
|
||||
self.new_conn.autocommit = False
|
||||
|
||||
self.old_cursor = self.old_conn.cursor()
|
||||
self.new_cursor = self.new_conn.cursor()
|
||||
|
||||
logger.info("✅ データベース接続成功")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ データベース接続エラー: {e}")
|
||||
return False
|
||||
|
||||
def close_connections(self):
|
||||
"""データベース接続クローズ"""
|
||||
try:
|
||||
if self.old_cursor:
|
||||
self.old_cursor.close()
|
||||
if self.new_cursor:
|
||||
self.new_cursor.close()
|
||||
if self.old_conn:
|
||||
self.old_conn.close()
|
||||
if self.new_conn:
|
||||
self.new_conn.close()
|
||||
logger.info("データベース接続をクローズしました")
|
||||
except Exception as e:
|
||||
logger.warning(f"接続クローズ時の警告: {e}")
|
||||
|
||||
def get_team_zekken_and_event(self, team_id):
|
||||
"""team_idから最新のrog_entryのzekken_numberとevent_idを取得"""
|
||||
try:
|
||||
# 旧DBのrog_entryから該当team_idの最新レコードを取得
|
||||
self.old_cursor.execute("""
|
||||
SELECT zekken_number, event_id, date
|
||||
FROM rog_entry
|
||||
WHERE team_id = %s
|
||||
AND zekken_number IS NOT NULL
|
||||
AND event_id IS NOT NULL
|
||||
ORDER BY date DESC, id DESC
|
||||
LIMIT 1
|
||||
""", (team_id,))
|
||||
|
||||
result = self.old_cursor.fetchone()
|
||||
|
||||
if result:
|
||||
zekken_number, event_id, entry_date = result
|
||||
logger.debug(f"team_id {team_id}: zekken_number={zekken_number}, event_id={event_id}, date={entry_date}")
|
||||
return str(zekken_number), event_id
|
||||
else:
|
||||
# rog_entryにレコードがない場合はデフォルト値を返す
|
||||
logger.warning(f"team_id {team_id}: rog_entryにレコードが見つかりません")
|
||||
return '', self.default_event_id
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"team_id {team_id} のzekken_number/event_id取得エラー: {e}")
|
||||
return '', self.default_event_id
|
||||
|
||||
def get_default_event_id(self):
|
||||
"""デフォルトのevent_idを取得または作成"""
|
||||
try:
|
||||
# 既存のイベントを探す
|
||||
self.new_cursor.execute("""
|
||||
SELECT id FROM rog_newevent2
|
||||
WHERE event_name LIKE '%移行%' OR event_name LIKE '%default%'
|
||||
ORDER BY id LIMIT 1
|
||||
""")
|
||||
result = self.new_cursor.fetchone()
|
||||
|
||||
if result:
|
||||
event_id = result[0]
|
||||
logger.info(f"既存のデフォルトイベントを使用: event_id = {event_id}")
|
||||
return event_id
|
||||
|
||||
# なければ最初のイベントを使用
|
||||
self.new_cursor.execute("""
|
||||
SELECT id FROM rog_newevent2
|
||||
ORDER BY id LIMIT 1
|
||||
""")
|
||||
result = self.new_cursor.fetchone()
|
||||
|
||||
if result:
|
||||
event_id = result[0]
|
||||
logger.info(f"最初のイベントをデフォルトとして使用: event_id = {event_id}")
|
||||
return event_id
|
||||
|
||||
# イベントがない場合はエラー
|
||||
logger.error("❌ rog_newevent2 テーブルにイベントが存在しません")
|
||||
return None
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ デフォルトevent_id取得エラー: {e}")
|
||||
return None
|
||||
|
||||
def get_category_mapping(self):
|
||||
"""カテゴリIDのマッピングを確認"""
|
||||
try:
|
||||
# 旧DBのカテゴリ
|
||||
self.old_cursor.execute("SELECT id, category_name FROM rog_newcategory ORDER BY id")
|
||||
old_categories = dict(self.old_cursor.fetchall())
|
||||
|
||||
# 新DBのカテゴリ
|
||||
self.new_cursor.execute("SELECT id, category_name FROM rog_newcategory ORDER BY id")
|
||||
new_categories = dict(self.new_cursor.fetchall())
|
||||
|
||||
logger.info(f"旧DB カテゴリ: {old_categories}")
|
||||
logger.info(f"新DB カテゴリ: {new_categories}")
|
||||
|
||||
# 名前ベースでマッピング作成
|
||||
category_mapping = {}
|
||||
for old_id, old_name in old_categories.items():
|
||||
for new_id, new_name in new_categories.items():
|
||||
if old_name == new_name:
|
||||
category_mapping[old_id] = new_id
|
||||
break
|
||||
else:
|
||||
# マッチしない場合は最初のカテゴリを使用
|
||||
if new_categories:
|
||||
category_mapping[old_id] = min(new_categories.keys())
|
||||
logger.warning(f"カテゴリマッピング失敗 - デフォルト使用: {old_id} -> {category_mapping[old_id]}")
|
||||
|
||||
return category_mapping
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ カテゴリマッピング取得エラー: {e}")
|
||||
return {}
|
||||
|
||||
def convert_team_record(self, old_record, category_mapping):
|
||||
"""旧レコードを新レコード形式に変換"""
|
||||
old_id, old_team_name, old_category_id, old_owner_id = old_record
|
||||
|
||||
# team_idから最新のzekken_numberとevent_idを取得
|
||||
zekken_number, event_id = self.get_team_zekken_and_event(old_id)
|
||||
|
||||
# 新しいレコード作成
|
||||
new_record = {
|
||||
'id': old_id,
|
||||
'team_name': old_team_name,
|
||||
'category_id': category_mapping.get(old_category_id, old_category_id),
|
||||
'owner_id': old_owner_id,
|
||||
# 新しいフィールドにデフォルト値を設定
|
||||
'class_name': '', # 空文字列
|
||||
'event_id': event_id, # rog_entryから取得したevent_id
|
||||
'location': None, # PostGIS座標は後で設定可能
|
||||
'password': '', # パスワードなし
|
||||
'trial': False, # 本番チーム
|
||||
'zekken_number': zekken_number, # rog_entryから取得したzekken_number
|
||||
'created_at': datetime.now(timezone.utc),
|
||||
'updated_at': datetime.now(timezone.utc)
|
||||
}
|
||||
|
||||
return new_record
|
||||
|
||||
def migrate_rog_team(self):
|
||||
"""rog_team テーブルのデータ移行"""
|
||||
logger.info("=" * 60)
|
||||
logger.info("rog_team テーブル構造変換移行開始")
|
||||
logger.info("=" * 60)
|
||||
|
||||
try:
|
||||
# デフォルトevent_id取得
|
||||
self.default_event_id = self.get_default_event_id()
|
||||
if not self.default_event_id:
|
||||
return False
|
||||
|
||||
# カテゴリマッピング取得
|
||||
category_mapping = self.get_category_mapping()
|
||||
|
||||
# 旧データ取得
|
||||
logger.info("旧rog_teamデータを取得中...")
|
||||
self.old_cursor.execute("""
|
||||
SELECT id, team_name, category_id, owner_id
|
||||
FROM rog_team
|
||||
ORDER BY id
|
||||
""")
|
||||
old_records = self.old_cursor.fetchall()
|
||||
|
||||
if not old_records:
|
||||
logger.info("✅ 移行対象データがありません")
|
||||
return True
|
||||
|
||||
logger.info(f"移行対象レコード数: {len(old_records)}件")
|
||||
|
||||
# 統計情報
|
||||
inserted_count = 0
|
||||
updated_count = 0
|
||||
error_count = 0
|
||||
zekken_resolved_count = 0
|
||||
constraint_avoided_count = 0
|
||||
|
||||
# レコード別処理
|
||||
for i, old_record in enumerate(old_records):
|
||||
try:
|
||||
# レコード変換
|
||||
new_record = self.convert_team_record(old_record, category_mapping)
|
||||
team_id = new_record['id']
|
||||
|
||||
# zekken_number解決統計
|
||||
if new_record['zekken_number']:
|
||||
zekken_resolved_count += 1
|
||||
|
||||
# 既存レコード確認（IDベース）
|
||||
self.new_cursor.execute(
|
||||
"SELECT COUNT(*) FROM rog_team WHERE id = %s",
|
||||
(team_id,)
|
||||
)
|
||||
exists_by_id = self.new_cursor.fetchone()[0] > 0
|
||||
|
||||
# 重複制約確認（zekken_number + event_id の組み合わせ）
|
||||
if new_record['zekken_number']: # zekken_numberが空でない場合のみチェック
|
||||
self.new_cursor.execute(
|
||||
"SELECT COUNT(*) FROM rog_team WHERE zekken_number = %s AND event_id = %s",
|
||||
(new_record['zekken_number'], new_record['event_id'])
|
||||
)
|
||||
exists_by_constraint = self.new_cursor.fetchone()[0] > 0
|
||||
|
||||
if exists_by_constraint and not exists_by_id:
|
||||
# 制約違反が発生する場合は、zekken_numberを空にしてデフォルトevent_idを使用
|
||||
logger.warning(f"Team ID {team_id}: zekken_number制約回避のため空文字に変更")
|
||||
new_record['zekken_number'] = ''
|
||||
new_record['event_id'] = self.default_event_id
|
||||
constraint_avoided_count += 1
|
||||
|
||||
if exists_by_id:
|
||||
# UPDATE処理
|
||||
update_query = """
|
||||
UPDATE rog_team SET
|
||||
team_name = %s,
|
||||
category_id = %s,
|
||||
owner_id = %s,
|
||||
class_name = %s,
|
||||
event_id = %s,
|
||||
location = %s,
|
||||
password = %s,
|
||||
trial = %s,
|
||||
zekken_number = %s,
|
||||
updated_at = %s
|
||||
WHERE id = %s
|
||||
"""
|
||||
|
||||
self.new_cursor.execute(update_query, (
|
||||
new_record['team_name'],
|
||||
new_record['category_id'],
|
||||
new_record['owner_id'],
|
||||
new_record['class_name'],
|
||||
new_record['event_id'],
|
||||
new_record['location'],
|
||||
new_record['password'],
|
||||
new_record['trial'],
|
||||
new_record['zekken_number'],
|
||||
new_record['updated_at'],
|
||||
team_id
|
||||
))
|
||||
updated_count += 1
|
||||
|
||||
else:
|
||||
# INSERT処理
|
||||
insert_query = """
|
||||
INSERT INTO rog_team (
|
||||
id, team_name, category_id, owner_id,
|
||||
class_name, event_id, location, password,
|
||||
trial, zekken_number, created_at, updated_at
|
||||
) VALUES (
|
||||
%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s
|
||||
)
|
||||
"""
|
||||
|
||||
self.new_cursor.execute(insert_query, (
|
||||
new_record['id'],
|
||||
new_record['team_name'],
|
||||
new_record['category_id'],
|
||||
new_record['owner_id'],
|
||||
new_record['class_name'],
|
||||
new_record['event_id'],
|
||||
new_record['location'],
|
||||
new_record['password'],
|
||||
new_record['trial'],
|
||||
new_record['zekken_number'],
|
||||
new_record['created_at'],
|
||||
new_record['updated_at']
|
||||
))
|
||||
inserted_count += 1
|
||||
|
||||
# 進捗表示
|
||||
if (i + 1) % 50 == 0:
|
||||
self.new_conn.commit()
|
||||
logger.info(f" 進捗: {i + 1}/{len(old_records)} 件処理完了")
|
||||
|
||||
except Exception as e:
|
||||
error_count += 1
|
||||
logger.error(f" レコード処理エラー (ID: {old_record[0]}): {e}")
|
||||
|
||||
# トランザクションロールバック
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
|
||||
if error_count > 10:
|
||||
logger.error("❌ エラー数が上限を超えました")
|
||||
break
|
||||
|
||||
# 最終コミット
|
||||
self.new_conn.commit()
|
||||
|
||||
# 結果サマリー
|
||||
logger.info("=" * 60)
|
||||
logger.info("rog_team 移行完了")
|
||||
logger.info("=" * 60)
|
||||
logger.info(f"挿入: {inserted_count}件")
|
||||
logger.info(f"更新: {updated_count}件")
|
||||
logger.info(f"エラー: {error_count}件")
|
||||
logger.info(f"zekken_number解決: {zekken_resolved_count}件")
|
||||
logger.info(f"制約回避: {constraint_avoided_count}件")
|
||||
logger.info(f"総処理: {len(old_records)}件")
|
||||
|
||||
if error_count == 0:
|
||||
logger.info("✅ rog_team移行が正常に完了しました！")
|
||||
return True
|
||||
else:
|
||||
logger.warning(f"⚠️ {error_count}件のエラーがありました")
|
||||
return False
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"❌ rog_team移行エラー: {e}")
|
||||
try:
|
||||
self.new_conn.rollback()
|
||||
except:
|
||||
pass
|
||||
return False
|
||||
|
||||
def run(self):
|
||||
"""移行実行"""
|
||||
try:
|
||||
if not self.connect_databases():
|
||||
return False
|
||||
|
||||
return self.migrate_rog_team()
|
||||
|
||||
finally:
|
||||
self.close_connections()
|
||||
|
||||
def main():
|
||||
"""メイン処理"""
|
||||
logger.info("rog_team テーブル構造変換移行スクリプト")
|
||||
|
||||
migrator = RogTeamMigrator()
|
||||
success = migrator.run()
|
||||
|
||||
if success:
|
||||
logger.info("🎉 移行が正常に完了しました！")
|
||||
else:
|
||||
logger.error("💥 移行中にエラーが発生しました")
|
||||
|
||||
sys.exit(0 if success else 1)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user