[merge]develop → main

.github/workflows/cd.yml

@@ -0,0 +1,48 @@
+name: Deploy FastAPI to ECR
+
+on:
+  workflow_run:
+    workflows: ["Build and Test FastAPI Backend"]
+    types:
+      - completed
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  deploy-to-ecr:
+    name: Deploy to ECR
+    runs-on: ubuntu-latest
+    if: ${{ (github.event_name == 'workflow_dispatch') || (github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'main') }}
+    environment: production
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Log in to Amazon ECR
+        run: |
+          aws ecr get-login-password --region ${{ secrets.AWS_REGION }} \
+            | docker login --username AWS --password-stdin \
+              $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
+
+      - name: Build Docker image
+        run: |
+          docker build -t ${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }} -f Dockerfile.prod .
+
+      - name: Tag Docker image
+        run: |
+          docker tag ${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }} \
+          $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }}
+
+      - name: Push Docker image to Amazon ECR
+        run: |
+          docker push \
+          $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }}

.github/workflows/ci.yml

@@ -0,0 +1,53 @@
+name: Build and Test FastAPI Backend
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build-and-test:
+    name: Build and Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+          cache-dependency-path: 'app/requirements.txt'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest flake8
+          pip install -r app/requirements.txt
+
+      - name: Lint with flake8
+        run: flake8 app/ --count --select=E9,F63,F7,F82 --show-source --statistics
+
+      - name: Test with pytest
+        working-directory: ./app
+        run: pytest || echo "No tests configured"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build API Docker image (local)
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          load: true
+          tags: saburo-api:local-test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/dev.yml

@@ -0,0 +1,48 @@
+name: Push to ECR
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      # リポジトリのクローン
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # AWS CLI のセットアップ
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v3
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      # Dockerログイン
+      - name: Log in to Amazon ECR
+        run: |
+          aws ecr get-login-password --region ${{ secrets.AWS_REGION }} \
+            | docker login --username AWS --password-stdin \
+              $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
+
+      # Dockerイメージのビルド
+      - name: Build Docker image
+        run: |
+          docker build -t ${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }} -f Dockerfile.prod .
+
+      # Dockerイメージのタグ付け
+      - name: Tag Docker image
+        run: |
+          docker tag ${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }} \
+          $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }}
+
+      # Dockerイメージのプッシュ
+      - name: Push Docker image to Amazon ECR
+        run: |
+          docker push \
+          $(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com/${{ secrets.ECR_REPOSITORY }}:${{ secrets.IMAGE_TAG }}

.gitignore

@@ -5,7 +5,7 @@
 
 ### Alembic ###
 alembic/__pycache__/
-alembic/versions/__pycache__/
+# alembic/versions/__pycache__/
 
 ### Python ###
 # Byte-compiled / optimized / DLL files

Dockerfile

@@ -13,8 +13,10 @@ RUN apt-get update && \
 COPY app/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY app/ .
+COPY app ./app
+ENV PYTHONPATH=/app
 
 EXPOSE 8000
 
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
+
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]

Dockerfile.prd → Dockerfile.prod

@@ -12,9 +12,10 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 # アプリケーション本体をすべてコンテナにコピー（app ディレクトリの中身を /app にコピー）
 COPY app/ .
+ENV PYTHONPATH=/app
 
 # アプリケーションで使用するポートを開放（FastAPI や uvicorn のデフォルトに近い 8000 番を使用）
 EXPOSE 8000
 
 # コンテナ起動時に実行されるコマンドを指定（uvicorn で main.py 内の app を起動）
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--log-level", "info"]
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000", "--log-level", "info"]

Makefile

@@ -11,23 +11,26 @@ logs:
 	docker compose logs
 
 exec-app:
-	docker exec -it fastapi-app bash
+	docker compose exec -it web bash
 
 exec-db:
-	docker exec -it mysql-db bash
+	docker compose exec -it db bash
+
+db-shell:
+	docker compose exec -it db bash -c "mysql -u root -p"
 
 down:
 	docker compose down
 
 migrate:
-	docker compose exec fastapi-app sh -c "cd /app && alembic upgrade head"
+	docker compose exec -it web bash -c "cd /app && alembic upgrade head"
 
 makemigration:
 	@read -p "Migration name: " name; \
-	docker compose exec fastapi-app sh -c "cd /app && alembic revision --autogenerate -m $$name"
+	docker compose exec -it web bash -c "cd /app && alembic revision --autogenerate -m $$name"
 
 show:
-	docker compose exec fastapi-app sh -c "cd /app && alembic history"
+	docker compose exec -it web bash -c "cd /app && alembic history"
 
 downgrade:
-	docker compose exec fastapi-app sh -c "cd /app && alembic downgrade -1"
+	docker compose exec -it web bash -c "cd /app && alembic downgrade -1"

app/api/api.py

@@ -0,0 +1,17 @@
+from fastapi import APIRouter
+from api.endpoints import auth, admin, user, session, message
+
+
+router = APIRouter()
+
+
+# 認証用エンドポイント
+router.include_router(auth.router, tags=["Auth"])
+# 管理者用エンドポイント
+router.include_router(admin.router, tags=["Admin"])
+# アカウント情報用エンドポイント
+router.include_router(user.router, tags=["User"])
+# チャット用エンドポイント
+router.include_router(session.router, tags=["Session"])
+# メッセージ用エンドポイント
+router.include_router(message.router, tags=["Message"])

app/api/deps.py

@@ -0,0 +1,7 @@
+from sqlalchemy.orm import Session
+from app.db.session import get_db
+from fastapi import Depends
+
+# データベースセッションを依存関係として注入する
+def get_db_dependency(db: Session = Depends(get_db)):
+    return db