Merge pull request #201 from Pseudo-Lab/deploy/cert-develop-rebased

chore: resolve merge conflicts in deploy/cert-develop

Author: soohyunme

.github/workflows/deploy-getcloser.yml

@@ -0,0 +1,45 @@
+name: Deploy GetCloser
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+# 같은 브랜치 동시 실행 시 이전 잡 취소(경쟁 배포 방지)
+concurrency:
+  group: cert-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # ========================================
+  # 🚀 Deploy GetCloser Service
+  # ========================================
+  deploy-prod:
+    if: github.ref_name == 'main'
+    name: 🚀 Deploy GetCloser
+    runs-on: oracle
+    environment: getcloser
+    defaults:
+      run:
+        working-directory: ./getcloser
+
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Create .env file for PROD
+        run: |
+          set -e
+          echo "DB_USER=${{ secrets.DB_USER }}" > .env
+          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
+          echo "DB_DATABASE=${{ vars.DB_DATABASE }}" >> .env
+          echo "APP_HOST=${{ vars.APP_HOST }}" >> .env
+
+      - name: 🚀 Deploy to PROD
+        run: |
+          docker compose -f docker-compose.yaml -p getcloser-${{ github.ref_name }} down --remove-orphans || true
+          docker compose -f docker-compose.yaml -p getcloser-${{ github.ref_name }} up -d --build

.gitignore cert/.gitignore.gitignore renamed to cert/.gitignore

@@ -0,0 +1,11 @@
+# === Database Config ===
+DB_USER=user
+DB_PASSWORD=password
+DB_DATABASE=app_db
+
+# === Auth (currently unused) ===
+# SECRET_KEY=secret_key
+# ACCESS_TOKEN_EXPIRE_MINUTES=60
+
+# === App Host ===
+APP_HOST=localhost

getcloser/.env.example

@@ -0,0 +1,75 @@
+node_modules
+.vite
+
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+*.manifest
+*.spec
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# IDE
+.vscode/
+.cursor/
+.idea/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Logs
+*.log
+
+# Temporary files
+*.tmp
+*.temp

getcloser/.gitignore

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 가짜연구소 (Pseudo Lab)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

getcloser/LICENSE

@@ -0,0 +1,14 @@
+FROM python:3.10-slim
+
+WORKDIR /app
+
+# 시스템 의존성 설치
+RUN apt-get update && apt-get install -y build-essential libpq-dev gcc --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY ./app .
+
+EXPOSE 8000
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]

getcloser/backend/Dockerfile

@@ -0,0 +1,15 @@
+FROM python:3.10-slim
+
+WORKDIR /app
+
+# 시스템 의존성 설치
+RUN apt-get update && apt-get install -y build-essential libpq-dev gcc --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir uvicorn[standard] debugpy watchdog
+
+COPY ./app .
+
+EXPOSE 8000 5678
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]

getcloser/backend/Dockerfile.dev

@@ -0,0 +1,74 @@
+
+### Backend 서버 세팅
+1. docker 설치
+2. 프로젝트 루트(`getcloser/`)에서 도커 빌드 및 실행: `docker compose up --build`
+
+3. API 문서:
+`http://localhost:${BACKEND_PORT:-8000}/docs`
+
+4. 초기 구성:
+- FastAPI 기반 REST API 서버
+- PostgreSQL (Docker) 연결 및 SQLAlchemy 지원
+- `/test/ping_db` 엔드포인트로 DB 연결 상태 확인
+- `/health` 헬스체크, `/` 루트 상태 응답
+
+
+### 실행 전 준비 (.env)
+`getcloser/` 루트에 환경변수를 정의한 `.env` 파일을 생성하세요. 없으면 일부 기본값이 적용됩니다.
+
+예시:
+```
+# 서버
+BACKEND_PORT=8000
+CORS_ORIGINS=http://localhost:5173
+
+# Postgres (docker-compose의 db 서비스와 일치)
+DB_USER=app_user
+DB_PASSWORD=app_password
+DB_DATABASE=app_db
+
+# 애플리케이션 설정
+SECRET_KEY=secret_key
+ACCESS_TOKEN_EXPIRE_MINUTES=60
+
+# 선택: 직접 연결문자열을 쓰고 싶다면 아래로 덮어쓰기
+# DATABASE_URL=postgresql+psycopg2://app_user:app_password@db:5432/app_db
+```
+
+### 실행 방법
+프로젝트 루트(`getcloser/`)에서 아래 명령을 실행하세요.
+
+```
+docker compose up --build
+```
+
+정상 실행 시:
+- 백엔드: `http://localhost:${BACKEND_PORT:-8000}`
+- 문서: `http://localhost:${BACKEND_PORT:-8000}/docs`
+- DB는 내부 네트워크에서 호스트명 `db`, 포트 `5432`로 접근합니다.
+
+
+### 유용한 엔드포인트
+- `/` : 서버 상태
+- `/health` : 헬스 체크
+- `/test/ping_db` : DB 연결 확인 (SELECT 1)
+
+
+### Backend 폴더 구조
+```
+.
+├── Dockerfile
+├── README.md
+└── src
+    ├── __init__.py
+    ├── assets
+    ├── config.py
+    ├── database.py
+    ├── main.py
+    ├── models
+    ├── requirements.txt
+    ├── routers
+    │   └── test_db.py
+    ├── services
+    └── utils
+```

getcloser/backend/README.md

@@ -0,0 +1,9 @@
+from api.v1.users import users
+from api.v1.challenge import assign_challenge
+from api.v1.teams import teams
+from fastapi import APIRouter
+
+api_router = APIRouter()
+api_router.include_router(users.router, prefix="/users", tags=["users"])
+api_router.include_router(assign_challenge.router, prefix="/challenge", tags=["challenge"])
+api_router.include_router(teams.router, prefix="/teams", tags=["teams"])

getcloser/backend/app/api/v1/__init__.py

@@ -0,0 +1,29 @@
+from fastapi import APIRouter, HTTPException, Depends
+from sqlalchemy.orm import Session
+from schemas.challenge_schema import ChallengeRequest, ChallengeResponse
+from services.challenge_service import assign_challenges_logic
+from services.user_service import parse_user_id
+from core.database import get_db
+
+router = APIRouter()
+
+@router.post("/assign-challenges", response_model=ChallengeResponse)
+def assign_challenges(request: ChallengeRequest, db: Session = Depends(get_db)):
+    try:
+        # my_id = parse_user_id(request.my_id).get("id")
+        # if not my_id:
+        #     raise HTTPException(status_code=400, detail="올바른 형식의 유저 태그가 아닙니다. 예: 김민준#0001")
+        
+        # members_ids = [request.my_id]  # 팀원에 자기 자신 포함
+        # for tag in request.members_ids:
+        #     parsed = parse_user_id(tag)
+        #     if "error" in parsed:
+        #         raise HTTPException(status_code=400, detail=parsed["error"])
+        #     members_ids.append(parsed["id"])
+
+        members_ids = [request.my_id] + request.members_ids
+        assigned = assign_challenges_logic(request.my_id, members_ids, db)
+        return ChallengeResponse(team_id=request.team_id, my_assigned=assigned)
+    
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))