feat: 버블차트 API

kusitms-28th-Meetup-E · Nov 22, 2023 · 1a4001e · 1a4001e
1 parent 40c4c0e
commit 1a4001e
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 17 deletions.
diff --git a/src/main/java/gwangjang/server/domain/contents/application/dto/res/BubbleFrontRes.java b/src/main/java/gwangjang/server/domain/contents/application/dto/res/BubbleFrontRes.java
@@ -0,0 +1,14 @@
+package gwangjang.server.domain.contents.application.dto.res;
+
+import lombok.*;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@Builder
+public class BubbleFrontRes {
+    private Long x;
+    private Long y;
+    private Long z;
+    private String name;
+}
diff --git a/...n/java/gwangjang/server/domain/contents/application/service/ContentsSubscribeUseCase.java b/...n/java/gwangjang/server/domain/contents/application/service/ContentsSubscribeUseCase.java
@@ -8,7 +8,10 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @Service
 @Transactional
@@ -28,6 +31,14 @@ public List<ContentsDataRes> getContentsByIssue(String issue) {
     }
 
     public List<BubbleChartRes> getBubbleChart(String issueTitle) {
-        return contentsQueryService.getBubbleChart(issueTitle);
+        List<BubbleChartRes> list = contentsQueryService.getBubbleChart(issueTitle);
+//        List<BubbleChartRes> selectedList = new ArrayList<>();
+//        for (int i = 39; i < list.size(); i += 40) {
+//            selectedList.add(list.get(i));
+//        }
+        for(int i=0; i<list.size(); i++){
+            list.get(i).setRank((40L*(i+1)));
+        }
+        return list;
     }
 }
diff --git a/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsQueryService.java b/src/main/java/gwangjang/server/domain/contents/domain/service/ContentsQueryService.java
@@ -10,6 +10,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -24,33 +25,34 @@ public class ContentsQueryService {
     public List<ContentsDataRes> getContentsByIssue(String issue) {
         return contentsRepository.getContentsByIssueId(issue);
     }
-    public List<BubbleChartRes> getBubbleChart(String issue) {
+
+    public List<BubbleChartRes> getBubbleChart(String issueTitle) {
         List<TotalReq> keywordList = findKeywordFeignClient.getAll().getBody().getData();
         Map<String, Long> keywordIdMap = keywordList.stream()
                 .collect(Collectors.toMap(keyword -> keyword.getIssueTitle() + " " + keyword.getKeyword(), TotalReq::getKeywordId));
 
-        return contentsRepository.findMaxOccurrencesByIssueAndKeyword().stream()
+        List<BubbleChartRes> bubbleChartList = contentsRepository.findMaxOccurrencesByIssueAndKeyword().stream()
                 .filter(objects -> {
-                    String issueTitle = (String) objects[0];
-                    return issueTitle.contains(issue);
+                    String fetchedIssueTitle = (String) objects[0];
+                    return fetchedIssueTitle.contains(issueTitle);
                 })
                 .map(objects -> {
-                    String issueTitle = (String) objects[0];
+                    String fetchedIssueTitle = (String) objects[0];
                     String keyword = (String) objects[1];
-                    String date = (String) objects[2];
+                    String date = ((String) objects[2]).substring(5, 7);  // Keep only year and month part
                     Long count = (Long) objects[3];
 
                     // Construct the key to look up keywordId in the map
-                    String key = issueTitle + keyword;
+                    String key = fetchedIssueTitle + keyword;
                     Long keywordId = keywordIdMap.getOrDefault(key, null);
 
-                    return new BubbleChartRes(issueTitle, keyword, date, keywordId != null ? keywordId : count);
+                    return new BubbleChartRes(fetchedIssueTitle, keyword, date, keywordId != null ? keywordId : count);
                 })
                 .collect(Collectors.toList());
-    }
-
-
-
 
+        // Sort the list based on rank (assuming 'rank' is a field in BubbleChartRes)
+        bubbleChartList.sort(Comparator.comparing(BubbleChartRes::getRank));
 
+        return bubbleChartList;
+    }
 }
diff --git a/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java b/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java
@@ -1,6 +1,7 @@
 package gwangjang.server.domain.contents.presentation;
 
 import gwangjang.server.domain.contents.application.dto.res.BubbleChartRes;
+import gwangjang.server.domain.contents.application.dto.res.BubbleFrontRes;
 import gwangjang.server.domain.contents.application.dto.res.ContentsDataRes;
 import gwangjang.server.domain.contents.application.dto.res.ContentsRes;
 import gwangjang.server.domain.contents.application.service.ContentsSubscribeUseCase;
@@ -19,7 +20,9 @@
 
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import static gwangjang.server.domain.contents.presentation.constant.ContentsResponse.GET_MY_CONTENTS;
 import static gwangjang.server.domain.contents.presentation.constant.ContentsResponseMessage.GET_CONTENTS_SUCCESS;
@@ -76,8 +79,21 @@ public ResponseEntity<SuccessResponse<List<ContentsDataRes>>> getMySubscribe(@Re
         return ResponseEntity.ok(SuccessResponse.create(GET_MY_CONTENTS.getMessage(), this.contentsSubscribeUseCase.getContentsByIssue(issue)));
     }
     @GetMapping("/bubbleChart/{issue}")
-    public ResponseEntity<SuccessResponse<List<BubbleChartRes>>> getBubbleChart(@PathVariable("issue")String issue) {
-        return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(), this.contentsSubscribeUseCase.getBubbleChart(issue)));
+    public ResponseEntity<SuccessResponse<List<BubbleFrontRes>>> getBubbleChart(@PathVariable("issue") String issue) {
+        List<BubbleChartRes> bubbleChartList = this.contentsSubscribeUseCase.getBubbleChart(issue);
+        List<BubbleFrontRes> result = new ArrayList<>();
+        Random rand = new Random();
+
+        for (BubbleChartRes bubbleChart : bubbleChartList) {
+            Long x = Long.parseLong(bubbleChart.getDate());
+            Long y = (long) (rand.nextInt(10) + 1); // Random value between 1 and 10
+            Long z = bubbleChart.getRank();
+            String name = bubbleChart.getKeyword();
+
+            result.add(new BubbleFrontRes(x, y, z, name));
+        }
+
+        return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(), result));
     }
 
 

diff --git a/.../java/gwangjang/server/domain/contents/presentation/constant/ContentsResponseMessage.java b/.../java/gwangjang/server/domain/contents/presentation/constant/ContentsResponseMessage.java
@@ -7,8 +7,8 @@
 @RequiredArgsConstructor
 public enum ContentsResponseMessage {
 
-    GET_CONTENTS_SUCCESS("컨텐츠 조회 완료");
-
+    GET_CONTENTS_SUCCESS("컨텐츠 조회 완료"),
+    GET_BUBBLE_SUCCESS("버블 조회 완료");
     private final String message;
 
 }