From f7a386ce7a632f95d0708aba7e369998a32314db Mon Sep 17 00:00:00 2001 From: eojin0814 Date: Thu, 23 Nov 2023 13:19:42 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=B2=84=EB=B8=94=EC=B0=A8=ED=8A=B8=20?= =?UTF-8?q?API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/dto/res/BubbleFrontRes.java | 7 ++++--- .../presentation/ContentsController.java | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 12 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 index 62efb87..6f1276d 100644 --- 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 @@ -7,8 +7,9 @@ @AllArgsConstructor @Builder public class BubbleFrontRes { - private Long x; - private Long y; - private Long z; private String name; + private int x; + private int y; + private int z; + } diff --git a/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java b/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java index 8302673..812def1 100644 --- a/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java +++ b/src/main/java/gwangjang/server/domain/contents/presentation/ContentsController.java @@ -82,32 +82,33 @@ public ResponseEntity>> getBubbleChart(@Pat List result = new ArrayList<>(); Random rand = new Random(); - result.add(new BubbleFrontRes(6L, null, 0L, "")); + result.add(new BubbleFrontRes(null, 6, 0, 0)); - Set usedRandomValues = new HashSet<>(); // to track used random values + Set usedRandomValues = new HashSet<>(); // to track used random values for (BubbleChartRes bubbleChart : bubbleChartList) { - Long x = Long.parseLong(bubbleChart.getDate()); - Long y; + int x = Integer.parseInt(bubbleChart.getDate()); + Integer y; // Generate a unique random value do { - y = (long) (rand.nextInt(10) + 1); + y = rand.nextInt(10) + 1; } while (!usedRandomValues.add(y)); - Long z = bubbleChart.getRank(); + int z = Math.toIntExact(bubbleChart.getRank()); String name = bubbleChart.getKeyword(); - result.add(new BubbleFrontRes(x, y, z, name)); + result.add(new BubbleFrontRes(name,x, y, z)); } - // Add element at the end with values from the last index +// Add element at the end with values from the last index if (!bubbleChartList.isEmpty()) { BubbleChartRes lastBubbleChart = bubbleChartList.get(bubbleChartList.size() - 1); - result.add(new BubbleFrontRes(12L, null, 0L, "")); + result.add(new BubbleFrontRes("",12, 0, 0 )); } return ResponseEntity.ok(SuccessResponse.create(GET_CONTENTS_SUCCESS.getMessage(), result)); + }