Merge pull request #245 from prgrms-web-devcourse-final-project/release/1.0.0

운영배포

Author: DooHyoJeong

.github/workflows/CI-CD_Pipeline.yml

@@ -85,6 +85,7 @@ dependencies {
     // Testing (테스트)
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
+    testImplementation 'org.mockito:mockito-inline:5.2.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     implementation("it.ozimov:embedded-redis:0.7.3") {
         exclude group: "org.slf4j", module: "slf4j-simple"

backend/build.gradle

@@ -8,8 +8,6 @@
 import org.springframework.ai.document.Document;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 @Schema(description = "채팅 관련 DTO")
 public class ChatDto {
@@ -42,11 +40,10 @@ public static class ChatResponse {
         @Schema(description = "AI 챗봇의 응답 메시지", example = "네, 관련 법령과 판례를 바탕으로 답변해 드리겠습니다.")
         private String message;
 
-        @Schema(description = "응답 생성에 참고한 유사 판례 정보 목록")
-        private List<Document> similarCases;
+        private ChatPrecedentDto precedent;
+
+        private ChatLawDto law;
 
-        @Schema(description = "응답 생성에 참고한 유사 법령 정보 목록")
-        private List<Document> similarLaws;
     }
 
     @Getter
@@ -73,6 +70,14 @@ public static ChatPrecedentDto from(ChatPrecedent cp) {
                     .caseName(cp.getCaseName())
                     .build();
         }
+
+        public static ChatPrecedentDto from(Document doc) {
+            return ChatPrecedentDto.builder()
+                    .precedentContent(doc.getText())
+                    .caseNumber(doc.getMetadata().get("caseNumber").toString())
+                    .caseName(doc.getMetadata().get("caseName").toString())
+                    .build();
+        }
     }
 
     @Data
@@ -93,6 +98,13 @@ public static ChatLawDto from(ChatLaw cl) {
                     .lawName(cl.getLawName())
                     .build();
         }
+
+        public static ChatLawDto from(Document doc) {
+            return ChatLawDto.builder()
+                    .content(doc.getText())
+                    .lawName(doc.getMetadata().get("lawName").toString())
+                    .build();
+        }
     }
 
     @Getter
@@ -109,31 +121,31 @@ public static class ChatHistoryDto {
         @Schema(description = "메시지 내용", example = "안녕하세요~~")
         private String message;
 
-        private List<ChatPrecedentDto> precedents;
+        private ChatPrecedentDto precedent;
 
-        private List<ChatLawDto> laws;
+        private ChatLawDto law;
 
         @Schema(description = "생성 시간")
         private LocalDateTime createdAt;
 
         public static ChatHistoryDto from(Chat chat) {
 
-            List<ChatPrecedentDto> precedentDtos = new ArrayList<>();
-            for (ChatPrecedent cp : chat.getChatPrecedents()) {
-                precedentDtos.add(ChatPrecedentDto.from(cp));
+            ChatPrecedentDto precedentDto = null;
+            if (chat.getChatPrecedents() != null && !chat.getChatPrecedents().isEmpty()) {
+                precedentDto = ChatPrecedentDto.from(chat.getChatPrecedents().get(0));
             }
 
-            List<ChatLawDto> lawDtos = new ArrayList<>();
-            for (ChatLaw cl : chat.getChatLaws()) {
-                lawDtos.add(ChatLawDto.from(cl));
+            ChatLawDto lawDto = null;
+            if (chat.getChatLaws() != null && !chat.getChatLaws().isEmpty()) {
+                lawDto = ChatLawDto.from(chat.getChatLaws().get(0));
             }
 
             return ChatHistoryDto.builder()
                     .type(chat.getType().toString())
                     .message(chat.getMessage())
                     .createdAt(chat.getCreatedAt())
-                    .precedents(precedentDtos)
-                    .laws(lawDtos)
+                    .precedent(precedentDto)
+                    .law(lawDto)
                     .build();
         }
     }

backend/src/main/java/com/ai/lawyer/domain/auth/dto/OAuth2LoginResponse.java

@@ -1,5 +1,7 @@
 package com.ai.lawyer.domain.chatbot.service;
 
+import com.ai.lawyer.domain.chatbot.dto.ChatDto.ChatLawDto;
+import com.ai.lawyer.domain.chatbot.dto.ChatDto.ChatPrecedentDto;
 import com.ai.lawyer.domain.chatbot.dto.ChatDto.ChatRequest;
 import com.ai.lawyer.domain.chatbot.dto.ChatDto.ChatResponse;
 import com.ai.lawyer.domain.chatbot.dto.ExtractionDto.KeywordExtractionDto;
@@ -37,6 +39,7 @@ public class ChatBotService {
 
     private final QdrantService qdrantService;
     private final HistoryService historyService;
+    private final KeywordService keywordService;
 
     private final ChatRepository chatRepository;
     private final HistoryRepository historyRepository;
@@ -91,21 +94,26 @@ public Flux<ChatResponse> sendMessage(Long memberId, ChatRequest chatChatRequest
                 .onErrorResume(throwable -> Flux.just(handleError(history)));  // 에러 발생 시 에러 핸들링 -> 재전송 유도
     }
 
-    // 키워드 추출 메서드
-    public <T> T keywordExtract(String content, String promptTemplate, Class<T> classType) {
-        String prompt = promptTemplate + content;
-        return chatClient.prompt(new Prompt(new UserMessage(prompt)))
-                .call()
-                .entity(classType);
-    }
-
     private ChatResponse ChatResponse(History history, String fullResponse, List<Document> cases, List<Document> laws) {
+
+        ChatPrecedentDto precedentDto = null;
+        if (cases != null && !cases.isEmpty()) {
+            Document firstCase = cases.get(0);
+            precedentDto = ChatPrecedentDto.from(firstCase);
+        }
+
+        ChatLawDto lawDto = null;
+        if (laws != null && !laws.isEmpty()) {
+            Document firstLaw = laws.get(0);
+            lawDto = ChatLawDto.from(firstLaw);
+        }
+
         return ChatResponse.builder()
                 .roomId(history.getHistoryId())
                 .title(history.getTitle())
                 .message(fullResponse)
-                .similarCases(cases)
-                .similarLaws(laws)
+                .precedent(precedentDto)
+                .law(lawDto)
                 .build();
     }
 
@@ -161,7 +169,7 @@ private void handlerTasks(ChatRequest chatDto, History history, String fullRespo
     }
 
     private void extractAndUpdateKeywordRanks(String message) {
-        KeywordExtractionDto keywordResponse = keywordExtract(message, keywordExtraction, KeywordExtractionDto.class);
+        KeywordExtractionDto keywordResponse = keywordService.keywordExtract(message, keywordExtraction, KeywordExtractionDto.class);
 
         KeywordRank keywordRank = keywordRankRepository.findByKeyword(keywordResponse.getKeyword());
 
@@ -180,7 +188,7 @@ private void extractAndUpdateKeywordRanks(String message) {
 
     private void setHistoryTitle(ChatRequest chatDto, History history, String fullResponse) {
         String targetText = fullResponse.contains("해당 질문은 법률") ? chatDto.getMessage() : fullResponse;
-        TitleExtractionDto titleDto = keywordExtract(targetText, titleExtraction, TitleExtractionDto.class);
+        TitleExtractionDto titleDto = keywordService.keywordExtract(targetText, titleExtraction, TitleExtractionDto.class);
         history.setTitle(titleDto.getTitle());
         historyRepository.save(history);
     }

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

@@ -3,6 +3,9 @@
 import com.ai.lawyer.domain.chatbot.entity.KeywordRank;
 import com.ai.lawyer.domain.chatbot.repository.KeywordRankRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -11,10 +14,20 @@
 @RequiredArgsConstructor
 public class KeywordService {
 
+    private final ChatClient chatClient;
+
     private final KeywordRankRepository keywordRepository;
 
     public List<KeywordRank> getTop5KeywordRanks() {
         return keywordRepository.findTop5ByOrderByScoreDesc();
     }
 
+    // 키워드 추출 메서드
+    public <T> T keywordExtract(String content, String promptTemplate, Class<T> classType) {
+        String prompt = promptTemplate + content;
+        return chatClient.prompt(new Prompt(new UserMessage(prompt)))
+                .call()
+                .entity(classType);
+    }
+
 }

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

@@ -15,6 +15,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
@@ -36,8 +37,8 @@ public class LawService {
     private final JoRepository joRepository;
     private final HangRepository hangRepository;
     private final HoRepository hoRepository;
-    private final RestTemplate restTemplate = new RestTemplate();
     private final ObjectMapper objectMapper = new ObjectMapper();
+    private final WebClient webClient = WebClient.builder().build();
 
     // 상수 정의
     private static final String BASE_URL = "http://www.law.go.kr/DRF";
@@ -149,7 +150,11 @@ private String getLawSearchResponse(String query) {
                 .build()
                 .toUriString();
 
-        return restTemplate.getForObject(url, String.class);
+        return webClient.get()
+                .uri(url)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
     }
 
     /**
@@ -167,7 +172,11 @@ private String getLawDetailResponse(String lawId) {
                 .build()
                 .toUriString();
 
-        return restTemplate.getForObject(url, String.class);
+        return webClient.get()
+                .uri(url)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
     }
 
     /**

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

@@ -19,15 +19,25 @@ public class LawWordController {
 
     private final LawWordService lawWordService;
 
-    @GetMapping("/{word}")
-    @Operation(summary = "법령 용어 검색", description = "법령 용어에 대한 정의를 반환합니다. \n" +
-            "예시: /api/law-word/선박")
-    public ResponseEntity<?> getPrecedent(@PathVariable String  word) {
+    @GetMapping("/v1/{word}")
+    @Operation(summary = "법령 용어 검색 version 1", description = "법령 용어에 대한 정의를 반환합니다. \n" +
+            "예시: /api/law-word/승소")
+    public ResponseEntity<?> getPrecedentV1(@PathVariable String  word) {
         try {
             return ResponseEntity.ok(lawWordService.findDefinition(word));
         }catch (Exception e){
             return ResponseEntity.badRequest().body(e.getMessage());
         }
+    }
 
+    @GetMapping("/v2/{word}")
+    @Operation(summary = "법령 용어 검색 version 2", description = "법령 용어에 대한 정의를 반환합니다. \n" +
+            "예시: /api/law-word/승소")
+    public ResponseEntity<?> getPrecedentV2(@PathVariable String  word) {
+        try {
+            return ResponseEntity.ok(lawWordService.findDefinitionV2(word));
+        }catch (Exception e){
+            return ResponseEntity.badRequest().body(e.getMessage());
+        }
     }
 }