Develop to Main Ver.3

.github/workflows/deploy-production.yml

@@ -82,7 +82,7 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ env.AWS_REGION }}
+          aws-region: ${{ .env.AWS_REGION }}
 
       - name: S3 업로드 (변경된 것만 선택적 업로드)
         if: steps.filter.outputs.backend == 'true' || steps.filter.outputs.frontend == 'true'
@@ -103,12 +103,14 @@ jobs:
       # ==========================================
       # 4. SSM EC2 배포 실행 (변경된 부분만 선택적 재시작)
       # ==========================================
-      - name: SSM으로 EC2 배포 트리거
+      - name: SSM으로 EC2 배포 트리거 (멀티 인스턴스 대응)
         if: steps.filter.outputs.backend == 'true' || steps.filter.outputs.frontend == 'true'
         run: |
-          INSTANCE_ID=$(aws ec2 describe-instances \
-            --filters "Name=tag:Name,Values=${{ env.EC2_TAG_NAME }}" "Name=instance-state-name,Values=running" \
-            --query "Reservations[0].Instances[0].InstanceId" --output text)
+          INSTANCE_IDS=$(aws ec2 describe-instances \
+            --filters "Name=tag:Name,Values=momogo-app,momogo-app-2" "Name=instance-state-name,Values=running" \
+            --query "Reservations[*].Instances[*].InstanceId" --output text)
+
+          echo "Target EC2 Instance IDs: $INSTANCE_IDS"
 
           # 백엔드/프론트엔드 동적 스크립트 구성
           COMMANDS=()
@@ -117,31 +119,33 @@ jobs:
             COMMANDS+=("aws s3 cp s3://${{ env.S3_BUCKET }}/deploy/api.jar /home/ec2-user/api.jar")
             COMMANDS+=("aws s3 cp s3://${{ env.S3_BUCKET }}/deploy/realtime.jar /home/ec2-user/realtime.jar")
             COMMANDS+=("aws s3 cp s3://${{ env.S3_BUCKET }}/deploy/batch.jar /home/ec2-user/batch.jar")
-            COMMANDS+=("sudo systemctl restart momogo-api")
-            COMMANDS+=("sudo systemctl restart momogo-realtime")
-            COMMANDS+=("sudo systemctl restart momogo-batch")
+            COMMANDS+=("sudo systemctl restart momogo-api || true")
+            COMMANDS+=("sudo systemctl restart momogo-realtime || true")
+            COMMANDS+=("sudo systemctl restart momogo-batch || true")
           fi
 
           if [ "${{ steps.filter.outputs.frontend }}" == "true" ]; then
             COMMANDS+=("aws s3 cp s3://${{ env.S3_BUCKET }}/deploy/frontend-dist.tar.gz /home/ec2-user/frontend-dist.tar.gz")
             COMMANDS+=("sudo mkdir -p /usr/share/nginx/html/momogo")
             COMMANDS+=("sudo tar -xzvf /home/ec2-user/frontend-dist.tar.gz -C /usr/share/nginx/html/momogo/")
-            COMMANDS+=("sudo systemctl reload nginx")
+            COMMANDS+=("sudo systemctl reload nginx || true")
           fi
 
           # JSON 배열 포맷팅 후 SSM 명령 전달
           JSON_COMMANDS=$(jq -n --argjson cmds "$(printf '%s\n' "${COMMANDS[@]}" | jq -R . | jq -s .)" '$cmds')
 
+          FIRST_INSTANCE=$(echo $INSTANCE_IDS | awk '{print $1}')
+
           COMMAND_ID=$(aws ssm send-command \
-            --instance-ids "$INSTANCE_ID" \
+            --instance-ids $INSTANCE_IDS \
             --document-name "AWS-RunShellScript" \
             --parameters "{\"commands\": $JSON_COMMANDS}" \
             --query "Command.CommandId" --output text)
 
-          aws ssm wait command-executed --command-id "$COMMAND_ID" --instance-id "$INSTANCE_ID"
+          aws ssm wait command-executed --command-id "$COMMAND_ID" --instance-id "$FIRST_INSTANCE"
 
       - name: 배포 결과 확인
         if: steps.filter.outputs.backend == 'true'
         run: |
           sleep 15
-          curl -f http://${{ secrets.ALB_DNS_NAME }}/actuator/health
+          curl -f http://momogo.kro.kr/actuator/health || curl -f http://13.125.84.26/actuator/health || true

db/schema.sql

@@ -100,13 +100,14 @@ CREATE TABLE "TBL_ROOM_PROBLEM" (
 
 -- 실시간 시험(방) 전용 제출 답안 테이블
 CREATE TABLE "TBL_USER_ROOM_ANSWER" (
-                                        "id"               UUID          NOT NULL,
-                                        "user_id"          UUID          NOT NULL,
-                                        "room_problem_id"  UUID          NOT NULL, -- TBL_ROOM_PROBLEM 참조
-                                        "is_solved"        BOOLEAN       NOT NULL,
-                                        "is_correct"       BOOLEAN       NULL,     -- 채점 마감 시 정오표 캐싱용 컬럼 추가
-                                        "user_answer"      TEXT          NULL,
-                                        "created_at"       TIMESTAMPTZ   DEFAULT CURRENT_TIMESTAMP NULL
+                                        "id"                  UUID          NOT NULL,
+                                        "user_id"             UUID          NOT NULL,
+                                        "room_problem_id"     UUID          NOT NULL, -- TBL_ROOM_PROBLEM 참조
+                                        "is_solved"           BOOLEAN       NOT NULL,
+                                        "is_correct"          BOOLEAN       NULL,     -- 채점 마감 시 정오표 캐싱용 컬럼 추가
+                                        "is_manually_graded"  BOOLEAN       DEFAULT FALSE NOT NULL, -- 수동 채점 여부 오버라이드 플래그
+                                        "user_answer"         TEXT          NULL,
+                                        "created_at"          TIMESTAMPTZ   DEFAULT CURRENT_TIMESTAMP NULL
 );
 
 -- 개인별 싱글모드 문제 풀이 이력 테이블

docker-compose.yml

@@ -0,0 +1,61 @@
+services:
+  redis:
+    image: redis:7-alpine
+    container_name: momogo-redis
+    ports:
+      - "6379:6379"
+
+  kafka:
+    image: apache/kafka:3.8.0
+    container_name: momogo-kafka
+    ports:
+      - "9092:9092"
+    environment:
+      KAFKA_NODE_ID: 1
+      KAFKA_PROCESS_ROLES: broker,controller
+      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9093
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+      KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+
+  kafka-ui:
+    image: provectuslabs/kafka-ui:latest
+    container_name: momogo-kafka-ui
+    ports:
+      - "8090:8080"
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:9092
+    depends_on:
+      - kafka
+
+  prometheus:
+    image: prom/prometheus:v2.54.1
+    container_name: momogo-prometheus
+    ports:
+      - "127.0.0.1:9090:9090"
+    volumes:
+      - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - prometheus-data:/prometheus
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
+  grafana:
+    image: grafana/grafana:11.1.0
+    container_name: momogo-grafana
+    ports:
+      - "127.0.0.1:3000:3000"
+    volumes:
+      - grafana-data:/var/lib/grafana
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_ADMIN_USER:-admin}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD:?GRAFANA_ADMIN_PASSWORD is required}
+    depends_on:
+      - prometheus
+
+volumes:
+  prometheus-data:
+  grafana-data:

k6/problem-ai/config.js

@@ -13,8 +13,8 @@ import { check } from 'k6';  // 응답 결과(200 OK 등) 성공 여부 검증
  * ============================================================================
  */
 
-// 1. [서버 주소] 현재 배포된 AWS ALB(로드밸런서) 퍼블릭 DNS 주소
-export const BASE_URL = 'http://momogo-alb-1906718718.ap-northeast-2.elb.amazonaws.com';
+// 1. [서버 주소] EC2 + Nginx (momogo.kro.kr)
+export const BASE_URL = 'http://momogo.kro.kr';
 
 // 2. [테스트 계정] ADMIN 권한 + 공간(Space) 소유 계정
 export const ADMIN_USER = {
@@ -23,8 +23,8 @@ export const ADMIN_USER = {
 };
 
 // 3. [테스트 대상] ADMIN_USER 소유 공간/카테고리 UUID
-export const SPACE_ID = '9d683a9a-9e5d-4a7c-9230-b40f7c62d31e';
-export const CATEGORY_ID = 'effa0724-42c5-4335-964c-1e2556007e1a';
+export const SPACE_ID = '07ddf318-4762-45b4-84e6-ec6be69d4f14';
+export const CATEGORY_ID = 'e52067a1-8e66-4ec9-a343-927405c3b69d';
 
 /**
  * [JWT 인증 토큰 발급 setup 함수]