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

chore[deploy]

Author: DooHyoJeong

.github/workflows/CI-CD_Pipeline.yml

@@ -263,8 +263,7 @@ jobs:
             PROD_DATASOURCE_DRIVER=com.mysql.cj.jdbc.Driver
             PROD_DATASOURCE_USERNAME=root
             PROD_DATASOURCE_PASSWORD=${{ secrets.DB_PASSWORD }}
-            # 추후 validate 변경
-            PROD_JPA_HIBERNATE_DDL_AUTO=create 
+            PROD_JPA_HIBERNATE_DDL_AUTO=none 
             
             PROD_REDIS_HOST=redis
             PROD_REDIS_PORT=6379
@@ -274,7 +273,6 @@ jobs:
             PROD_QDRANT_PORT=6334
             
             send_email_address=${{ secrets.SEND_EMAIL_ADDRESS }}
-            email_address=${{ secrets.EMAIL_ADDRESS }}
             send_email_password=${{ secrets.EMAIL_PASSWORD }}
             
             PROD_SENTRY_DSN=${{ secrets.SENTRY_DSN }}

backend/src/main/java/com/ai/lawyer/domain/chatbot/service/ChatBotService.java

@@ -57,8 +57,12 @@ public class ChatBotService {
     // 멤버 조회 -> 벡터 검색 (판례, 법령) -> 프롬프트 생성 (시스템, 유저) -> 채팅 클라이언트 호출 (스트림) -> 응답 저장, 제목/키워드 추출
     public Flux<ChatResponse> sendMessage(Long memberId, ChatRequest chatChatRequestDto, Long roomId) {
 
-        Member member = memberRepository.findById(memberId).orElseThrow(
-                () -> new IllegalArgumentException("존재하지 않는 회원입니다.")
+        if(memberId == null) {
+            log.error("해당 멤버는 존재하지 않거나, accessToken이 만료되거나 잘못되었습니다.");
+        }
+
+        Member member = memberRepository.findById(memberId)
+                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 회원입니다.")
         );
 
         // 벡터 검색 (판례, 법령)
@@ -150,11 +154,11 @@ private void handlerTasks(ChatRequest chatDto, History history, String fullRespo
         setHistoryTitle(chatDto, history, fullResponse);
 
         // 채팅 기록 저장
-        saveChat(history, MessageType.USER, chatDto.getMessage(), similarCaseDocuments, similarLawDocuments);
-        saveChat(history, MessageType.ASSISTANT, fullResponse, similarCaseDocuments, similarLawDocuments);
+        saveChatWithDocuments(history, MessageType.USER, chatDto.getMessage(), similarCaseDocuments, similarLawDocuments);
+        saveChatWithDocuments(history, MessageType.ASSISTANT, fullResponse, similarCaseDocuments, similarLawDocuments);
 
         // 키워드 추출 및 키워드 랭킹 저장 (법과 관련 없는 질문은 제외)
-        if (!fullResponse.contains("해당 질문은 법과 관련된")) {
+        if (!fullResponse.contains("해당 질문은 법률")) {
             extractAndUpdateKeywordRanks(chatDto.getMessage());
         }
 
@@ -178,13 +182,13 @@ private void extractAndUpdateKeywordRanks(String message) {
     }
 
     private void setHistoryTitle(ChatRequest chatDto, History history, String fullResponse) {
-        String targetText = fullResponse.contains("해당 질문은 법과 관련된") ? chatDto.getMessage() : fullResponse;
+        String targetText = fullResponse.contains("해당 질문은 법률") ? chatDto.getMessage() : fullResponse;
         TitleExtractionDto titleDto = keywordExtract(targetText, titleExtraction, TitleExtractionDto.class);
         history.setTitle(titleDto.getTitle());
         historyRepository.save(history);
     }
 
-    private void saveChat(History history, MessageType type, String message, List<Document> similarCaseDocuments, List<Document> similarLawDocuments) {
+    private void saveChatWithDocuments(History history, MessageType type, String message, List<Document> similarCaseDocuments, List<Document> similarLawDocuments) {
         Chat chat = chatRepository.save(Chat.builder()
                 .historyId(history)
                 .type(type)

backend/src/main/java/com/ai/lawyer/domain/law/controller/LawController.java

@@ -24,12 +24,11 @@ public class LawController {
     @GetMapping(value = "/list/save")
     @Operation(summary = "키워드 관련 법령 데이터 저장(벡엔드 전용 API)", description = "벡엔드 데이터 저장용 API입니다")
     public ResponseEntity<?> getStatisticsCard(
-            @RequestParam String query,
-            @RequestParam int page
+            @RequestParam String query
     ) throws Exception {
         long startTime = System.currentTimeMillis();
 
-        lawService.saveLaw(query, page);
+        lawService.saveLaw(query);
 
         long endTime = System.currentTimeMillis();
         long elapsedTime = endTime - startTime;

backend/src/main/java/com/ai/lawyer/domain/law/repository/LawRepositoryCustomImpl.java

@@ -107,12 +107,12 @@ public Page<LawsDto> searchLaws(LawSearchRequestDto searchRequest) {
             return new PageImpl<>(content, pageable, 0);
         }
 
-        // 2. 조회한 법령 ID 목록 추출
+        // 조회한 법령 ID 목록 추출
         List<Long> lawIds = content.stream()
                 .map(LawsDto::getId)
-                .collect(Collectors.toList());
+                .toList();
 
-// 3. 법령별 첫 번째 조 내용 조회 - 반복문으로 각각 조회
+        // 3. 법령별 첫 번째 조 내용 조회 - 반복문으로 각각 조회
         Map<Long, String> firstJoContentMap = new HashMap<>();
         for (Long lawId : lawIds) {
             String firstJoContent = queryFactory