Merge pull request #318 from prgrms-web-devcourse-final-project/develop

개발 서버 배포

Author: DooHyoJeong

backend/.env.default

@@ -77,3 +77,5 @@ CUSTOM_CORS_ALLOWED_ORIGINS=NEED_TO_SET
 CUSTOM_OAUTH2_REDIRECT_URL=NEED_TO_SET
 CUSTOM_OAUTH2_FAILURE_URL=NEED_TO_SET
 CUSTOM_FRONTEND_URL=NEED_TO_SET
+PROD_COOKIE_DOMAIN=NEED_TO_SET
+DEV_COOKIE_DOMAIN=NEED_TO_SET

backend/build.gradle

@@ -41,6 +41,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '3.0.5'
     implementation 'org.springframework.boot:spring-boot-starter-batch'
+    implementation 'org.springframework.kafka:spring-kafka'
+    testImplementation 'org.springframework.kafka:spring-kafka-test'
 
     // API Documentation (문서화)
     implementation 'org.apache.commons:commons-lang3:3.18.0'
@@ -60,8 +62,8 @@ dependencies {
     implementation 'org.springframework.session:spring-session-data-redis'
 
     // Logging & Monitoring (로깅/모니터링)
-    implementation 'io.sentry:sentry-spring-boot-starter:7.16.0'
-    implementation 'io.sentry:sentry-logback:7.16.0'
+    implementation 'io.sentry:sentry-spring-boot-starter:7.18.0'
+    implementation 'io.sentry:sentry-logback:7.18.0'
 
     // Development Tools (개발 도구)
     compileOnly 'org.projectlombok:lombok'

backend/docker-compose.yml

@@ -17,14 +17,14 @@ services:
     volumes:
       - mysql-data:/var/lib/mysql
       - ./sql:/sql      # 호스트 ./sql 폴더를 컨테이너 /sql에 마운트
-    command: > 
+    command: >
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_0900_ai_ci
       --default-time-zone=Asia/Seoul
       --skip-log-bin
       --lower-case-table-names=1
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-p${DEV_DATASOURCE_PASSWORD}"]
+      test: [ "CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-p${DEV_DATASOURCE_PASSWORD}" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -40,7 +40,7 @@ services:
     command: >
       redis-server --appendonly yes
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: [ "CMD", "redis-cli", "ping" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -62,6 +62,10 @@ services:
     image: ollama/ollama:latest
     container_name: ollama
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          memory: 2g
     ports:
       - "11434:11434"
     volumes:
@@ -78,8 +82,40 @@ services:
       timeout: 5s
       retries: 10
 
+  zookeeper:
+    image: confluentinc/cp-zookeeper:7.4.4
+    container_name: zookeeper
+    restart: unless-stopped
+    ports:
+      - "2181:2181"
+    environment:
+      ZOOKEEPER_CLIENT_PORT: 2181
+      ZOOKEEPER_TICK_TIME: 2000
+
+  kafka:
+    image: confluentinc/cp-kafka:7.4.4
+    container_name: kafka
+    restart: unless-stopped
+    depends_on:
+      - zookeeper
+    ports:
+      - "9092:9092"
+    environment:
+      KAFKA_BROKER_ID: 1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT
+      KAFKA_LISTENERS: INTERNAL://0.0.0.0:29092,EXTERNAL://0.0.0.0:9092
+      KAFKA_ADVERTISED_LISTENERS: INTERNAL://kafka:29092,EXTERNAL://localhost:9092
+      KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+    volumes:
+      - kafka-data:/var/lib/kafka/data
+
 volumes:
   mysql-data:
   redis-data:
   qdrant-data:
-  ollama-data:
+  ollama-data:
+  kafka-data:

backend/sql/member_id_sequence.sql

@@ -0,0 +1,17 @@
+-- ============================================
+-- 공유 member_id 시퀀스 테이블 생성
+-- ============================================
+-- 주의: 기존 배포 환경에 데이터가 있다면
+-- backend/sql/migrate_member_id_sequence.sql을 먼저 실행해야 합니다!
+-- ============================================
+
+CREATE TABLE IF NOT EXISTS member_id_sequence (
+    sequence_name VARCHAR(255) NOT NULL PRIMARY KEY,
+    next_val BIGINT NOT NULL
+);
+
+-- 초기값 설정: 신규 설치 시 1부터 시작
+-- 기존 환경은 마이그레이션 스크립트로 처리
+INSERT INTO member_id_sequence (sequence_name, next_val)
+VALUES ('member_id_seq', 1)
+ON DUPLICATE KEY UPDATE sequence_name = sequence_name;

backend/sql/migrate_member_id_sequence.sql

@@ -0,0 +1,107 @@
+-- ============================================
+-- member_id 중복 해결 및 공유 시퀀스 설정 마이그레이션
+-- ============================================
+-- 실행 전 주의사항:
+-- 1. 반드시 데이터베이스 백업을 먼저 수행하세요!
+-- 2. 서비스를 중단한 상태에서 실행하세요 (데이터 정합성)
+-- 3. 실행 후 애플리케이션을 재시작하세요
+-- ============================================
+
+-- 1단계: 현재 상태 확인
+SELECT '=== 현재 member 테이블 ===' as info;
+SELECT COUNT(*) as count, MIN(member_id) as min_id, MAX(member_id) as max_id FROM member;
+
+SELECT '=== 현재 oauth2_member 테이블 ===' as info;
+SELECT COUNT(*) as count, MIN(member_id) as min_id, MAX(member_id) as max_id FROM oauth2_member;
+
+SELECT '=== 중복 확인 ===' as info;
+SELECT m.member_id, 'BOTH' as status
+FROM member m
+INNER JOIN oauth2_member o ON m.member_id = o.member_id;
+
+-- 2단계: oauth2_member의 member_id를 재할당
+-- member 테이블의 최대값 이후부터 시작
+SET @max_member_id := (SELECT COALESCE(MAX(member_id), 0) FROM member);
+
+SELECT CONCAT('member 테이블 최대 ID: ', @max_member_id) as info;
+
+-- 임시 테이블로 매핑 생성
+CREATE TEMPORARY TABLE IF NOT EXISTS oauth2_member_id_mapping (
+    old_member_id BIGINT,
+    new_member_id BIGINT,
+    PRIMARY KEY (old_member_id)
+);
+
+-- 매핑 데이터 생성
+INSERT INTO oauth2_member_id_mapping (old_member_id, new_member_id)
+SELECT
+    member_id as old_member_id,
+    @max_member_id + ROW_NUMBER() OVER (ORDER BY member_id) as new_member_id
+FROM oauth2_member
+ORDER BY member_id;
+
+SELECT '=== 매핑 테이블 ===' as info;
+SELECT * FROM oauth2_member_id_mapping;
+
+-- 3단계: 외래키 제약 확인 (있다면 비활성화)
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- 4단계: 연관 테이블 업데이트 (member_id를 외래키로 가진 테이블만)
+-- Post 테이블 (FK: member_id)
+UPDATE post p
+INNER JOIN oauth2_member_id_mapping m ON p.member_id = m.old_member_id
+SET p.member_id = m.new_member_id;
+
+-- PollVote 테이블 (FK: member_id)
+UPDATE poll_vote pv
+INNER JOIN oauth2_member_id_mapping m ON pv.member_id = m.old_member_id
+SET pv.member_id = m.new_member_id;
+
+-- History 테이블 (FK: member_id)
+UPDATE history h
+INNER JOIN oauth2_member_id_mapping m ON h.member_id = m.old_member_id
+SET h.member_id = m.new_member_id;
+
+-- 5단계: oauth2_member 테이블 업데이트
+UPDATE oauth2_member o
+INNER JOIN oauth2_member_id_mapping m ON o.member_id = m.old_member_id
+SET o.member_id = m.new_member_id;
+
+-- 6단계: 외래키 제약 다시 활성화
+SET FOREIGN_KEY_CHECKS = 1;
+
+-- 7단계: 시퀀스 테이블 생성
+CREATE TABLE IF NOT EXISTS member_id_sequence (
+    sequence_name VARCHAR(255) NOT NULL PRIMARY KEY,
+    next_val BIGINT NOT NULL
+);
+
+-- 8단계: 초기값 설정 (재할당 후 최대값 + 1)
+INSERT INTO member_id_sequence (sequence_name, next_val)
+SELECT 'member_id_seq', COALESCE(MAX(max_id), 0) + 1
+FROM (
+    SELECT COALESCE(MAX(member_id), 0) as max_id FROM member
+    UNION ALL
+    SELECT COALESCE(MAX(member_id), 0) as max_id FROM oauth2_member
+) as max_values
+ON DUPLICATE KEY UPDATE next_val = VALUES(next_val);
+
+-- 9단계: 최종 상태 확인
+SELECT '=== 마이그레이션 후 member 테이블 ===' as info;
+SELECT COUNT(*) as count, MIN(member_id) as min_id, MAX(member_id) as max_id FROM member;
+
+SELECT '=== 마이그레이션 후 oauth2_member 테이블 ===' as info;
+SELECT COUNT(*) as count, MIN(member_id) as min_id, MAX(member_id) as max_id FROM oauth2_member;
+
+SELECT '=== 중복 확인 (0건이어야 함) ===' as info;
+SELECT m.member_id, 'BOTH' as status
+FROM member m
+INNER JOIN oauth2_member o ON m.member_id = o.member_id;
+
+SELECT '=== 시퀀스 초기값 ===' as info;
+SELECT * FROM member_id_sequence;
+
+-- 임시 테이블 삭제
+DROP TEMPORARY TABLE IF EXISTS oauth2_member_id_mapping;
+
+SELECT '=== 마이그레이션 완료! ===' as info;

backend/src/main/java/com/ai/lawyer/BackendApplication.java

@@ -4,7 +4,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.scheduling.annotation.EnableAsync;
 
+@EnableAsync
 @SpringBootApplication
 @EnableJpaAuditing
 @ConfigurationPropertiesScan

backend/src/main/java/com/ai/lawyer/domain/chatbot/controller/HistoryController.java

@@ -2,7 +2,6 @@
 
 import com.ai.lawyer.domain.chatbot.dto.ChatDto.ChatHistoryDto;
 import com.ai.lawyer.domain.chatbot.dto.HistoryDto;
-import com.ai.lawyer.domain.chatbot.service.ChatService;
 import com.ai.lawyer.domain.chatbot.service.HistoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,7 +20,6 @@
 public class HistoryController {
 
     private final HistoryService historyService;
-    private final ChatService chatService;
 
     @Operation(summary = "채팅방 제목 목록 조회")
     @GetMapping("/")
@@ -32,7 +30,7 @@ public ResponseEntity<List<HistoryDto>> getHistoryTitles(@AuthenticationPrincipa
     @Operation(summary = "채팅 조회")
     @GetMapping("/{historyId}")
     public ResponseEntity<List<ChatHistoryDto>> getChatHistory(@AuthenticationPrincipal Long memberId, @PathVariable("historyId") Long roomId) {
-        return chatService.getChatHistory(memberId, roomId);
+        return historyService.getChatHistory(memberId, roomId);
     }
 
     @Operation(summary = "채팅방 삭제")

backend/src/main/java/com/ai/lawyer/domain/chatbot/dto/ChatDto.java

@@ -34,9 +34,6 @@ public static class ChatResponse {
         @Schema(description = "채팅방 ID", example = "1")
         private Long roomId;
 
-        @Schema(description = "History 방 제목", example = "손해배상 청구 관련 문의")
-        private String title;
-
         @Schema(description = "AI 챗봇의 응답 메시지", example = "네, 관련 법령과 판례를 바탕으로 답변해 드리겠습니다.")
         private String message;
 

backend/src/main/java/com/ai/lawyer/domain/chatbot/entity/Chat.java

@@ -33,10 +33,10 @@ public class Chat {
     @Lob
     private String message;
 
-    @OneToMany(mappedBy = "chatId")
+    @OneToMany(mappedBy = "chatId", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<ChatPrecedent> chatPrecedents;
 
-    @OneToMany(mappedBy = "chatId")
+    @OneToMany(mappedBy = "chatId", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<ChatLaw> chatLaws;
 
     @CreationTimestamp

backend/src/main/java/com/ai/lawyer/domain/chatbot/entity/History.java

@@ -25,7 +25,7 @@ public class History {
     private Long historyId;
 
     @ManyToOne
-    @JoinColumn(name = "member_id")
+    @JoinColumn(name = "member_id", foreignKey = @ForeignKey(name = "FK_HISTORY_MEMBER"))
     private Member memberId;
 
     @OneToMany(mappedBy = "historyId", cascade = CascadeType.ALL, orphanRemoval = true)