refactor : 영어 검색시 와인 영문명 반환

AdultOfNineteen · Oct 13, 2024 · 724bc83 · 724bc83
1 parent fcb35c4
commit 724bc83
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Winey-API/src/main/java/com/example/wineyapi/wine/convertor/WineConvertor.java b/Winey-API/src/main/java/com/example/wineyapi/wine/convertor/WineConvertor.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -75,18 +76,29 @@ public List<RecommendWineDTO> toRecommendWineDto(List<WineRepository.WineList> w
         return recommendWineDTOS;
     }
 
-    public PageResponse<List<WineResponse.SearchWineDto>> SearchWineList(Page<Wine> wines) {
+    public PageResponse<List<WineResponse.SearchWineDto>> SearchWineList(Page<Wine> wines, String content) {
         List<WineResponse.SearchWineDto> wineDtoList = new ArrayList<>();
 
         wines.getContent().forEach(
                 result -> wineDtoList.add(
-                        convertWineInfo(result)
+                        convertWineInfo(result, content)
                 )
         );
         return new PageResponse<>(wines.isLast(), wines.getTotalElements(), wineDtoList);
     }
 
-    private WineResponse.SearchWineDto convertWineInfo(Wine result) {
+    private WineResponse.SearchWineDto convertWineInfo(Wine result, String content) {
+        String name ="";
+        if(content !=null){
+            if (Pattern.matches("^[a-zA-Z]*$", content)
+            ) {
+                name = result.getEngName();
+            } else {
+                name = result.getName();
+            }
+        }else{
+            name = result.getName();
+        }
         return WineResponse.SearchWineDto
                 .builder()
                 .wineId(result.getId())

diff --git a/Winey-API/src/main/java/com/example/wineyapi/wine/service/WineServiceImpl.java b/Winey-API/src/main/java/com/example/wineyapi/wine/service/WineServiceImpl.java
@@ -80,7 +80,7 @@ public PageResponse<List<WineResponse.SearchWineDto>> searchWineList(Integer pag
         }else{
             wines = wineRepository.findByNameContainingOrEngNameContaining(content,content,pageable);
         }
-        return wineConvertor.SearchWineList(wines);
+        return wineConvertor.SearchWineList(wines, content);
     }
 
     @Override