merge: main <- develop

.coderabbit.yml

@@ -18,7 +18,7 @@ reviews:
   # Default: {}
   auto_review:
     enabled: true
-    auto_incremental_review: true
+    auto_incremental_review: false # PR 내 새로운 커밋 시 자동리뷰 진행 여부
 
     # Ignore reviewing if the title of the pull request contains any of these keywords (case-insensitive).
     # Default: []
@@ -69,4 +69,4 @@ tools:
     enabled: true
 
 chat:
-  auto_reply: true
+  auto_reply: true

.dockerignore

@@ -0,0 +1,28 @@
+# VCS/IDE
+.git
+.idea
+.gradle
+*.iml
+.DS_Store
+
+# 빌드 산출물
+build
+out
+target
+.gradle/
+
+# 런타임 데이터(이미지 빌드에 불필요)
+mysql_data
+redis_data
+**/*.sock
+**/*.pid
+**/*.log
+
+# 환경파일
+.env
+.env.*
+!.env.sample
+
+# 기타
+node_modules
+__pycache__

.github/workflows/cicd.yml

@@ -0,0 +1,178 @@
+name: Java CI/CD with Docker and GitHub Actions
+
+on:
+  push:
+    branches: [ "develop", "main" ]
+  pull_request:
+    branches: [ "develop", "main" ]
+  workflow_dispatch:
+
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      tag: ${{ steps.vars.outputs.tag }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle Wrapper
+        run: ./gradlew clean build
+
+      - name: Docker login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Set image tag (commit SHA)
+        id: vars
+        run: echo "tag=${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
+
+      - name: Build Docker image
+        run: |
+          docker build \
+            -t ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:${{ steps.vars.outputs.tag }} \
+            -t ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:latest \
+            .
+
+      - name: Push Docker images
+        run: |
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:${{ steps.vars.outputs.tag }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:latest
+
+  deploy-dev:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/develop' && github.event_name != 'pull_request'
+    steps:
+      - name: Checkout code (for docker-compose.dev.yml)
+        uses: actions/checkout@v4
+
+      - name: Create dev config from secrets
+        run: |
+          mkdir -p config
+          printf "%s" "${{ secrets.ONSURVEY_APP_DEV_YML }}" > config/application-dev.yml
+          chmod 600 config/application-dev.yml
+
+      - name: Copy files to EC2
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.DEV_EC2_HOST }}
+          username: ${{ secrets.DEV_EC2_USER }}
+          key: ${{ secrets.DEV_EC2_SSH_KEY }}
+          source: "docker-compose.dev.yml,config/application-dev.yml,blue-green.sh"
+          target: "/deploy/"
+
+      - name: Deploy on EC2 (blue-green)
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.DEV_EC2_HOST }}
+          username: ${{ secrets.DEV_EC2_USER }}
+          key: ${{ secrets.DEV_EC2_SSH_KEY }}
+          script: |
+            set -euo pipefail
+            DEPLOY_DIR=/deploy
+            cd "$DEPLOY_DIR"
+
+            cat > .env <<EOF
+            COMPOSE_PROJECT_NAME=deploy-dev
+            DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+            SPRING_IMAGE_TAG=${{ needs.build-and-push.outputs.tag }}
+            MYSQL_ROOT_PASSWORD=${{ secrets.DEV_MYSQL_ROOT_PASSWORD }}
+            MYSQL_DATABASE=onsurvey
+            MYSQL_USER=${{ secrets.DEV_MYSQL_USER }}
+            MYSQL_PASSWORD=${{ secrets.DEV_MYSQL_PASSWORD }}
+            REDIS_PASSWORD=${{ secrets.DEV_REDIS_PASSWORD }}
+            TZ=Asia/Seoul
+            EOF
+
+            chmod 600 config/application-dev.yml || true
+            chmod +x blue-green.sh || true
+
+            if [ ! -L nginx/upstreams/spring-upstream.conf ]; then
+              ( cd nginx/upstreams && ln -s spring-8080.conf spring-upstream.conf )
+            fi
+
+            docker compose -p deploy-dev -f docker-compose.dev.yml up -d nginx mysql redis
+
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:${{ needs.build-and-push.outputs.tag }} || true
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:latest || true
+
+            bash ./blue-green.sh "${{ needs.build-and-push.outputs.tag }}" deploy-dev docker-compose.dev.yml
+
+            echo "✅ DEV deploy done (tag=${{ needs.build-and-push.outputs.tag }})"
+
+  deploy-ncp:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    steps:
+      - name: Checkout code (for docker-compose.yml)
+        uses: actions/checkout@v4
+
+      - name: Create prod config from secrets
+        run: |
+          mkdir -p config
+          printf "%s" "${{ secrets.ONSURVEY_APP_PROD_YML }}" > config/application-prod.yml
+          chmod 600 config/application-prod.yml
+
+      - name: Copy files to NCP server
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.NCP_HOST }}
+          username: ${{ secrets.NCP_USER }}
+          key: ${{ secrets.NCP_SSH_KEY }}
+          source: "docker-compose.yml,config/application-prod.yml,blue-green.sh"
+          target: "/deploy/"
+
+      - name: Deploy on NCP (blue-green)
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.NCP_HOST }}
+          username: ${{ secrets.NCP_USER }}
+          key: ${{ secrets.NCP_SSH_KEY }}
+          script: |
+            set -euo pipefail
+            DEPLOY_DIR=/deploy
+            cd "$DEPLOY_DIR"
+
+            cat > .env <<EOF
+            COMPOSE_PROJECT_NAME=deploy
+            DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+            SPRING_IMAGE_TAG=${{ needs.build-and-push.outputs.tag }}
+            REDIS_PASSWORD=${{ secrets.PROD_REDIS_PASSWORD }}
+            TZ=Asia/Seoul
+            EOF
+
+            chmod 600 config/application-prod.yml || true
+            chmod +x blue-green.sh || true
+
+            if [ ! -L nginx/upstreams/spring-upstream.conf ]; then
+              ( cd nginx/upstreams && ln -s spring-blue.conf spring-upstream.conf )
+            fi
+
+            docker compose -p deploy -f docker-compose.yml up -d nginx redis
+
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:${{ needs.build-and-push.outputs.tag }} || true
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/onsurvey:latest || true
+
+            bash ./blue-green.sh "${{ needs.build-and-push.outputs.tag }}" deploy docker-compose.yml
+
+            docker network inspect deploy_web | grep -q '"Name": "onsurvey-redis"' || { echo "ERROR: redis not on deploy_web"; exit 1; }
+
+            echo "✅ PROD deploy done (tag=${{ needs.build-and-push.outputs.tag }})"

.gitignore

@@ -1,4 +1,7 @@
 *.pem
+./onsurvey-mTLS_private.key
+./onsurvey-mTLS_public.crt
+./docker-compose.local.yml
 
 HELP.md
 .gradle

Dockerfile

@@ -0,0 +1,17 @@
+FROM gradle:8.10.2-jdk21-alpine AS build
+WORKDIR /src
+COPY . .
+RUN gradle --no-daemon bootJar -x test
+
+FROM eclipse-temurin:21-jre-alpine
+WORKDIR /app
+
+RUN apk add --no-cache tzdata curl && \
+    cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime && echo "Asia/Seoul" > /etc/timezone
+
+ENV TZ=Asia/Seoul
+COPY --from=build /src/build/libs/*.jar /app/app.jar
+EXPOSE 8080
+
+ENV JAVA_OPTS="-XX:+UseG1GC -XX:MaxRAMPercentage=75 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Seoul"
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app/app.jar"]

README.md

@@ -0,0 +1,126 @@
+# ONSURVEY BACKEND REPOSITORY
+
+---
+
+## 1. 프로젝트 개요
+| 항목 | 내용                                                         |
+|------|------------------------------------------------------------|
+| **프로젝트명** | *ON SURVEY*                                                |
+| **주요 기술** | Java 21, Spring Boot 3, Spring JPA, QueryDSL, Redis, MySQL | 
+
+---
+
+## 2. 주요 DOMAIN
+| DOMAIN        | 설명         |
+|---------------|------------|
+| FORM          | 설문 생성 및 수정 |
+| MEMBER        | 사용자 정보 관리  |
+| MANAGEMENT    | 설문 관리 및 집계 |
+| PARTICIPATION | 설문 참여      |
+| PAYMENT       | 결제         |
+| 멱등성 & 분산 락 | PromotionGrant + Redis 락으로 중복 지급 방지 |
+
+---
+
+## 3. 프로젝트 구조 (수정 중)
+```
+Backend/
+├─ src/
+│  └─ main/
+│     ├─ java/OneQ/OnSurvey/
+│     │  ├─ domain/
+│     │  │  ├─ form/                        # 설문 생성 및 수정
+│     │  │  │  ├─ api/  
+│     │  │  │  │  ├─ FormController
+│     │  │  │  │  └─ dto/
+│     │  │  │  │     ├─ request/
+│     │  │  │  │     ├─ response/
+│     │  │  │  │     └─ DefaultSurveyDto
+│     │  │  │  ├─ application/
+│     │  │  │  │  ├─ SurveyService
+│     │  │  │  │  └─ QuestionService
+│     │  │  │  ├─ domain/
+│     │  │  │  │  ├─  model/                # 도메인 엔티티 (POJO)
+│     │  │  │  │  │  ├─ Survey
+│     │  │  │  │  │  └─ Question
+│     │  │  │  │  └─  repository/
+│     │  │  │  │     ├─ SurveyRepository
+│     │  │  │  │     └─ QuestionRepository
+│     │  │  │  └─ infra/
+│     │  │  │     ├─ entity/                # 영속성 엔티티 (@Entity)
+│     │  │  │     │  ├─ SurveyEntity
+│     │  │  │     │  ├─ QuestionEntity
+│     │  │  │     │  └─ ScreeningEntity
+│     │  │  │     ├─ mapper/                # POJO <-> JpaEntity 컨버터
+│     │  │  │     └─ jpa/
+│     │  │  │        └─ SurveyJpaRepository
+│     │  │  ├─ management/                  # 설문 관리 및 집계
+│     │  │  ├─ member/                      # 사용자 관리
+│     │  │  └─ participation/               # 설문 참여
+│     │  └─ global/                         # 공유 설정
+│     │     ├─ annotation/
+│     │     ├─ auth/
+│     │     ├─ config/
+│     │     ├─ entity/
+│     │     ├─ exception/
+│     │     ├─ handler/
+│     │     ├─ infra/
+│     │     ├─ response/
+│     │     └─ util/
+│     └─ resources/
+│        └─ application.yml                 # 환경 설정
+├─ build.gradle
+├─ Dockerfile
+├─ docker-compose.yml
+└─ README.md
+```
+
+---
+
+## 4. 배포·운영
+### Docker 이미지
+```bash
+# JAR 파일 빌드 (Gradle)
+./gradlew bootJar
+
+# 이미지 생성
+docker build -t yourrepo/yourproject:latest .
+```
+
+---
+
+## 4. 테스트
+| 테스트 종류 | 실행 명령 | 비고 |
+|------------|----------|------|
+| 단위 테스트 | `./gradlew test` | JUnit  5 + Mockito |
+| 통합 테스트 | `./gradlew integrationTest` (프로젝트에 정의) | Testcontainers 로 실제 DB 구동 |
+| 커버리지 보고서 | `./gradlew jacocoTestReport` | `build/reports/jacoco/test/html/index.html` 확인 |
+
+---
+
+## 5. 멱등성 & 분산 락 (Promotion)
+
+토스 프로모션 포인트 지급은 다음 조합으로 중복 지급을 방지합니다.
+
+- DB 유니크 제약 + 낙관적 락 기반 멱등 처리
+- Redis 기반 분산 락
+- 토스 API 재시도 및 결과 폴링
+- 포인트 지급 여부 플래그
+
+---
+
+### 5.1 PromotionGrant 기반 멱등 처리
+
+- 엔티티: `promotion_grant`
+- 유니크 제약 (1 유저 · 1 설문 · 1 코드당 1건)
+    - `user_key`, `survey_id`, `promotion_code`
+
+---
+
+## 요약
+| 섹션       | 핵심 내용                                      |
+|----------|--------------------------------------------|
+| 레포지토리 개요 | Java  21 + Spring  Boot  3 기반 백엔드 서버       |
+| 주요 도메인   | 설문 생성, 관리, 참여 / 사용자 및 결제 관리                |
+| 구조       | Bounded Context를 기반으로 한 도메인 분리             |
+| 배포       | Dockerfile, docker‑compose, GitHub Actions |