Feat: Add cluster type

hanaTI-team-1 · Jul 17, 2024 · 5fb553a · 5fb553a
1 parent 512358e
commit 5fb553a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 12 deletions.
diff --git a/src/main/java/kr/ac/kopo/jeonse/domain/jeonse/controller/JeonseController.java b/src/main/java/kr/ac/kopo/jeonse/domain/jeonse/controller/JeonseController.java
@@ -4,6 +4,7 @@
 import kr.ac.kopo.jeonse.domain.jeonse.dto.InfraDTO;
 import kr.ac.kopo.jeonse.domain.jeonse.dto.JeonseCheckList;
 import kr.ac.kopo.jeonse.domain.jeonse.dto.RecommendRequest;
+import kr.ac.kopo.jeonse.domain.jeonse.dto.RecommendResponse;
 import kr.ac.kopo.jeonse.domain.jeonse.service.JeonseService;
 import kr.ac.kopo.jeonse.global.payload.ApiResponse;
 import lombok.RequiredArgsConstructor;
@@ -58,7 +59,7 @@ public ApiResponse<List<InfraDTO>> infraList() {
     }
 
     @PostMapping("/recommend")
-    public ApiResponse<List<JeonseCheckList>> recommend(@RequestBody RecommendRequest recommendRequest) {
+    public ApiResponse<RecommendResponse> recommend(@RequestBody RecommendRequest recommendRequest) {
         return ApiResponse.onSuccess(jeonseService.recommendJeonse(recommendRequest));
     }
 

diff --git a/src/main/java/kr/ac/kopo/jeonse/domain/jeonse/dto/RecommendResponse.java b/src/main/java/kr/ac/kopo/jeonse/domain/jeonse/dto/RecommendResponse.java
@@ -0,0 +1,11 @@
+package kr.ac.kopo.jeonse.domain.jeonse.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RecommendResponse {
+    private String clusterType;
+    private List<JeonseCheckList> jeonseCheckList;
+}
diff --git a/src/main/java/kr/ac/kopo/jeonse/domain/jeonse/service/JeonseService.java b/src/main/java/kr/ac/kopo/jeonse/domain/jeonse/service/JeonseService.java
@@ -4,10 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import kr.ac.kopo.jeonse.domain.jeonse.domain.*;
-import kr.ac.kopo.jeonse.domain.jeonse.dto.InfraDTO;
-import kr.ac.kopo.jeonse.domain.jeonse.dto.JeonseCheckList;
-import kr.ac.kopo.jeonse.domain.jeonse.dto.JeonseRateDto;
-import kr.ac.kopo.jeonse.domain.jeonse.dto.RecommendRequest;
+import kr.ac.kopo.jeonse.domain.jeonse.dto.*;
 import kr.ac.kopo.jeonse.domain.jeonse.mapper.BuildingRegisterMapper;
 import kr.ac.kopo.jeonse.domain.jeonse.mapper.JeonseMapper;
 import kr.ac.kopo.jeonse.global.utils.NullToEmptyStringUtil;
@@ -125,7 +122,7 @@ public JeonseCheckList checkJeonse(String actlNo) {
         Jeonse jeonse = jeonseMapper.selectJeonseByAtclNo(actlNo);
         JeonseRateDto jeonseRateDto = calculateJeonseRate(actlNo);
 
-        if(jeonseRateDto.getJeonsePrice() == null) {
+        if (jeonseRateDto.getJeonsePrice() == null) {
             jeonseRateDto.setJeonsePrice("0");
         }
 
@@ -219,12 +216,12 @@ private Jeonse transformJeonse(Jeonse jeonse) {
         String tmp = jeonse.getFlrInfo();
         String[] flrInfo = tmp.split("/");
         if (flrInfo.length == 1) {
-            jeonse.setFlrInfo(flrInfo[0]+"/1");
+            jeonse.setFlrInfo(flrInfo[0] + "/1");
         } else {
             String firstValue = flrInfo[0];
             int secondValue = Integer.parseInt(flrInfo[1]);
             if (firstValue.contains("B")) {
-                jeonse.setFlrInfo(Integer.parseInt(String.valueOf(firstValue.toCharArray()[1])) * -1 +"/1");
+                jeonse.setFlrInfo(Integer.parseInt(String.valueOf(firstValue.toCharArray()[1])) * -1 + "/1");
                 return jeonse;
             }
             String calculatedFloor = switch (firstValue) {
@@ -237,7 +234,7 @@ private Jeonse transformJeonse(Jeonse jeonse) {
             jeonse.setFlrInfo(calculatedFloor + "/1");
         }
 
-        if(!jeonse.getAddress().contains("-")){
+        if (!jeonse.getAddress().contains("-")) {
             jeonse.setAddress(jeonse.getAddress() + "-0");
 
         }
@@ -321,9 +318,14 @@ private List<InfraDTO.BusStation> getBusStations(String gu) {
                 .collect(Collectors.toList());
     }
 
-    public List<JeonseCheckList> recommendJeonse(RecommendRequest recommendRequest) {
+    public RecommendResponse recommendJeonse(RecommendRequest recommendRequest) {
         List<String> atclNos = getRecommendationList(recommendRequest);
 
+        RecommendResponse recommendResponse = new RecommendResponse();
+        recommendResponse.setClusterType(atclNos.get(atclNos.size() - 1));
+
+        atclNos.remove(atclNos.size() - 1);
+
         List<JeonseCheckList> recommendList = new ArrayList<>();
 
         for (String atclNo : atclNos) {
@@ -345,8 +347,8 @@ public List<JeonseCheckList> recommendJeonse(RecommendRequest recommendRequest)
                 recommendList.add(jeonseCheckList);
             }
         }
-
-        return recommendList;
+        recommendResponse.setJeonseCheckList(recommendList);
+        return recommendResponse;
     }
 
     private List<String> getRecommendationList(RecommendRequest recommendRequest) {