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

DooHyoJeong · web-flow · commit 6680f656110f · 2025-10-14T10:30:43.000+09:00
배포
diff --git a/backend/src/main/java/com/ai/lawyer/domain/home/controller/HomeController.java b/backend/src/main/java/com/ai/lawyer/domain/home/controller/HomeController.java
@@ -0,0 +1,29 @@
+package com.ai.lawyer.domain.home.controller;
+
+import com.ai.lawyer.domain.home.dto.FullData;
+import com.ai.lawyer.domain.home.service.HomeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/home")
+@RequiredArgsConstructor
+@Tag(name = "홈", description = "홈 화면 API")
+public class HomeController {
+
+    private final HomeService homeService;
+
+    @Operation(summary = "데이터 수", description = "판례 법령 채팅 투표 수 조회")
+    @PostMapping("/data-count")
+    public ResponseEntity<FullData> getDataCount() {
+        return ResponseEntity.ok(homeService.getDataCount());
+    }
+
+}
diff --git a/backend/src/main/java/com/ai/lawyer/domain/home/dto/FullData.java b/backend/src/main/java/com/ai/lawyer/domain/home/dto/FullData.java
@@ -0,0 +1,26 @@
+package com.ai.lawyer.domain.home.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "판례수 법령수 채팅수 투표수 DTO")
+public class FullData {
+
+    @Schema(description = "판례 수", example = "1000")
+    private Long precedentCount;
+
+    @Schema(description = "법령 수", example = "500")
+    private Long lawCount;
+
+    @Schema(description = "채팅 수", example = "2000")
+    private Long chatCount;
+
+    @Schema(description = "투표 수", example = "300")
+    private Long voteCount;
+    
+}
diff --git a/backend/src/main/java/com/ai/lawyer/domain/home/service/HomeService.java b/backend/src/main/java/com/ai/lawyer/domain/home/service/HomeService.java
@@ -0,0 +1,39 @@
+package com.ai.lawyer.domain.home.service;
+
+import com.ai.lawyer.domain.chatbot.repository.ChatRepository;
+import com.ai.lawyer.domain.home.dto.FullData;
+import com.ai.lawyer.domain.law.repository.LawRepository;
+import com.ai.lawyer.domain.poll.repository.PollRepository;
+import com.ai.lawyer.domain.precedent.repository.PrecedentRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class HomeService {
+
+    private final PrecedentRepository precedentRepository;
+    private final LawRepository lawRepository;
+    private final ChatRepository chatRepository;
+    private final PollRepository pollRepository;
+
+
+    public FullData getDataCount() {
+
+        Long precedentCount = precedentRepository.count();
+        Long lawCount = lawRepository.count();
+        Long chatCount = chatRepository.count();
+        Long voteCount = pollRepository.count();
+
+        return FullData.builder()
+                .precedentCount(precedentCount)
+                .lawCount(lawCount)
+                .chatCount(chatCount)
+                .voteCount(voteCount)
+                .build();
+        
+    }
+
+}
diff --git a/backend/src/main/java/com/ai/lawyer/domain/law/controller/LawController.java b/backend/src/main/java/com/ai/lawyer/domain/law/controller/LawController.java
@@ -39,24 +39,35 @@ public ResponseEntity<?> getStatisticsCard(
 
     @PostMapping("/search")
     @Operation(summary = "볍령 목록 검색 기능", description = "조건에 맞는 법령 목록을 가져옵니다")
-    public ResponseEntity<PageResponseDto> searchLaws(@RequestBody LawSearchRequestDto searchRequest) {
-        Page<LawsDto> laws = lawService.searchLaws(searchRequest);
-        PageResponseDto response = PageResponseDto.builder()
-                .content(laws.getContent())
-                .totalElements(laws.getTotalElements())
-                .totalPages(laws.getTotalPages())
-                .pageNumber(laws.getNumber())
-                .pageSize(laws.getSize())
-                .build();
-        return ResponseEntity.ok(response);
+    public ResponseEntity<?> searchLaws(@RequestBody LawSearchRequestDto searchRequest) {
+        try {
+            Page<LawsDto> laws = lawService.searchLaws(searchRequest);
+            PageResponseDto response = PageResponseDto.builder()
+                    .content(laws.getContent())
+                    .totalElements(laws.getTotalElements())
+                    .totalPages(laws.getTotalPages())
+                    .pageNumber(laws.getNumber())
+                    .pageSize(laws.getSize())
+                    .build();
+            return ResponseEntity.ok(response);
+        }catch (Exception e){
+            return ResponseEntity.badRequest().body("법령 목록 검색 에러 : " + e.getMessage());
+        }
+
     }
 
     @GetMapping("/{id}")
     @Operation(summary = "볍령 상세 조회 기능", description = "법령 상세 데이터를 조회합니다 \n" +
             "예시: /api/law/1")
-    public ResponseEntity<Law> getFullLaw(@PathVariable Long id) {
-        Law law = lawService.getLawWithAllChildren(id);
+    public ResponseEntity<?> getFullLaw(@PathVariable Long id) {
+        try {
+            Law law = lawService.getLawWithAllChildren(id);
+            return ResponseEntity.ok(law);
+        }catch (Exception e){
+            return ResponseEntity.badRequest().body("법령 상세 조회 에러 : " + e.getMessage());
+        }
+
+
 
-        return ResponseEntity.ok(law);
     }
 }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/lawWord/controller/LawWordController.java b/backend/src/main/java/com/ai/lawyer/domain/lawWord/controller/LawWordController.java
@@ -26,7 +26,7 @@ public ResponseEntity<?> getPrecedentV1(@PathVariable String  word) {
         try {
             return ResponseEntity.ok(lawWordService.findDefinition(word));
         }catch (Exception e){
-            return ResponseEntity.badRequest().body(e.getMessage());
+            return ResponseEntity.badRequest().body("법령 용어 검색 에러 : " + e.getMessage());
         }
     }
 
@@ -37,7 +37,7 @@ public ResponseEntity<?> getPrecedentV2(@PathVariable String  word) {
         try {
             return ResponseEntity.ok(lawWordService.findDefinitionV2(word));
         }catch (Exception e){
-            return ResponseEntity.badRequest().body(e.getMessage());
+            return ResponseEntity.badRequest().body("법령 용어 검색 에러 : " + e.getMessage());
         }
     }
 }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/lawWord/service/LawWordService.java b/backend/src/main/java/com/ai/lawyer/domain/lawWord/service/LawWordService.java
@@ -153,9 +153,12 @@ private String extractTop3DefinitionsFromJson(String json, String requestedWord)
 
         // 2. 클라이언트가 요청한 단어와 정확히 일치하는 item만 필터링
         List<JsonNode> matchingItems = new ArrayList<>();
+        String normalizedRequestedWord = normalize(requestedWord);
+
         for (JsonNode item : itemsNode) {
             String itemWord = item.path("word").asText();
-            if (requestedWord.equals(itemWord)) {
+            String normalizedItemWord = normalize(itemWord);
+            if (normalizedRequestedWord.equals(normalizedItemWord)) {
                 matchingItems.add(item);
             }
         }
@@ -211,4 +214,9 @@ private void saveDefinition(String word, String definition) {
                 .build();
         lawWordRepository.save(entity);
     }
+
+    // 유틸: 단어 정규화 함수
+    private String normalize(String input) {
+        return input.replaceAll("[\\s\\^]", "");
+    }
 }
diff --git a/backend/src/main/java/com/ai/lawyer/domain/precedent/controller/PrecedentController.java b/backend/src/main/java/com/ai/lawyer/domain/precedent/controller/PrecedentController.java
@@ -37,18 +37,23 @@ public ResponseEntity<?> list(
 
     @PostMapping("/search")
     @Operation(summary = "판례 목록 검색 기능", description = "조건에 맞는 판례 목록을 가져옵니다")
-    public ResponseEntity<PageResponseDto> searchPrecedents(
+    public ResponseEntity<?> searchPrecedents(
             @RequestBody PrecedentSearchRequestDto requestDto) {
+        try {
+            Page<PrecedentSummaryListDto> results = precedentService.searchByKeyword(requestDto);
+            PageResponseDto response = PageResponseDto.builder()
+                    .content(results.getContent())
+                    .totalElements(results.getTotalElements())
+                    .totalPages(results.getTotalPages())
+                    .pageNumber(results.getNumber())
+                    .pageSize(results.getSize())
+                    .build();
+            return ResponseEntity.ok(response);
+        }catch (Exception e){
+            return ResponseEntity.badRequest().body("판례 목록 검색 에러 : " + e.getMessage());
+        }
+
 
-        Page<PrecedentSummaryListDto> results = precedentService.searchByKeyword(requestDto);
-        PageResponseDto response = PageResponseDto.builder()
-                .content(results.getContent())
-                .totalElements(results.getTotalElements())
-                .totalPages(results.getTotalPages())
-                .pageNumber(results.getNumber())
-                .pageSize(results.getSize())
-                .build();
-        return ResponseEntity.ok(response);
     }
 
     /**
@@ -61,8 +66,12 @@ public ResponseEntity<PageResponseDto> searchPrecedents(
     @GetMapping("/{id}")
     @Operation(summary = "판례 상세 조회 기능", description = "판례 상세 데이터를 조회합니다 \n" +
             "예시: /api/precedent/1")
-    public ResponseEntity<Precedent> getPrecedent(@PathVariable Long id) {
-        Precedent precedent = precedentService.getPrecedentById(id);
-        return ResponseEntity.ok(precedent);
+    public ResponseEntity<?> getPrecedent(@PathVariable Long id) {
+        try {
+            Precedent precedent = precedentService.getPrecedentById(id);
+            return ResponseEntity.ok(precedent);
+        }catch (Exception e){
+            return ResponseEntity.badRequest().body("판례 상세 조회 에러 : " + e.getMessage());
+        }
     }
 }
diff --git a/backend/src/main/java/com/ai/lawyer/global/security/SecurityConfig.java b/backend/src/main/java/com/ai/lawyer/global/security/SecurityConfig.java
@@ -57,6 +57,7 @@ public class SecurityConfig {
             "/api/law/**",            // 법령 (공개)
             "/api/law-word/**",       // 법률 용어 (공개)
             "/api/chat/**",           // 챗봇 (공개)
+            "/api/home/**",         // 홈 (공개)
             "/h2-console/**",          // H2 콘솔 (개발용)
             "/actuator/health", "/actuator/health/**", "/actuator/info",    // Spring Actuator
             "/api/actuator/health", "/api/actuator/health/**", "/api/actuator/info"
diff --git a/backend/src/main/java/com/ai/lawyer/global/springDoc/SpringDocConfig.java b/backend/src/main/java/com/ai/lawyer/global/springDoc/SpringDocConfig.java
@@ -68,14 +68,24 @@ public GroupedOpenApi allApi() {
                 .build();
     }
 
-    @Bean GroupedOpenApi chatApi() {
+    @Bean
+    GroupedOpenApi chatApi() {
         return GroupedOpenApi.builder()
                 .group("챗봇과 관련된 API")
                 .pathsToMatch("/api/chat/**")
                 .packagesToScan("com.ai.lawyer.domain.chatbot.controller")
                 .build();
     }
 
+    @Bean
+    GroupedOpenApi homeApi() {
+        return GroupedOpenApi.builder()
+                .group("Home API")
+                .pathsToMatch("/api/home/**")
+                .packagesToScan("com.ai.lawyer.domain.home.controller")
+                .build();
+    }
+
     @Bean
     public OpenAPI customOpenAPI() {
         return new OpenAPI()

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public ResponseEntity<?> getPrecedentV1(@PathVariable String word) {`
`26`	`26`	`try {`
`27`	`27`	`return ResponseEntity.ok(lawWordService.findDefinition(word));`
`28`	`28`	`}catch (Exception e){`
`29`		`- return ResponseEntity.badRequest().body(e.getMessage());`
	`29`	`+ return ResponseEntity.badRequest().body("법령 용어 검색 에러 : " + e.getMessage());`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -37,7 +37,7 @@ public ResponseEntity<?> getPrecedentV2(@PathVariable String word) {`
`37`	`37`	`try {`
`38`	`38`	`return ResponseEntity.ok(lawWordService.findDefinitionV2(word));`
`39`	`39`	`}catch (Exception e){`
`40`		`- return ResponseEntity.badRequest().body(e.getMessage());`
	`40`	`+ return ResponseEntity.badRequest().body("법령 용어 검색 에러 : " + e.getMessage());`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,12 @@ private String extractTop3DefinitionsFromJson(String json, String requestedWord)`
`153`	`153`
`154`	`154`	`// 2. 클라이언트가 요청한 단어와 정확히 일치하는 item만 필터링`
`155`	`155`	`List<JsonNode> matchingItems = new ArrayList<>();`
	`156`	`+ String normalizedRequestedWord = normalize(requestedWord);`
	`157`	`+`
`156`	`158`	`for (JsonNode item : itemsNode) {`
`157`	`159`	`String itemWord = item.path("word").asText();`
`158`		`- if (requestedWord.equals(itemWord)) {`
	`160`	`+ String normalizedItemWord = normalize(itemWord);`
	`161`	`+ if (normalizedRequestedWord.equals(normalizedItemWord)) {`
`159`	`162`	`matchingItems.add(item);`
`160`	`163`	`}`
`161`	`164`	`}`
`@@ -211,4 +214,9 @@ private void saveDefinition(String word, String definition) {`
`211`	`214`	`.build();`
`212`	`215`	`lawWordRepository.save(entity);`
`213`	`216`	`}`
	`217`	`+`
	`218`	`+ // 유틸: 단어 정규화 함수`
	`219`	`+ private String normalize(String input) {`
	`220`	`+ return input.replaceAll("[\\s\\^]", "");`
	`221`	`+ }`
`214`	`222`	`}`