Merge pull request #69 from nimuy99/fix/3-chartList

nimuyman · web-flow · commit 0ee6b1e05bad · 2025-02-11T00:06:20.000+09:00
#24 Fix: 대시보드 트렌드 api - 순위 방향(rankChangeDirection) 필드 반영
diff --git a/src/main/java/com/memesphere/domain/dashboard/controller/DashboardController.java b/src/main/java/com/memesphere/domain/dashboard/controller/DashboardController.java
@@ -60,9 +60,10 @@ public ApiResponse<DashboardOverviewResponse> getOverview() {
                     - "volume": 밈코인 거래량(확인용)
                     - "price": 밈코인 현재가
                     - "priceChange": 가격 변화량
-                    - "changeAbsolute": 가격 변화량(절대값)
-                    - "changeDirection": 밈코인 상승(up, 0 이상)/하락(down)
-                    - "changeRate": 가격 변화율
+                    - "priceChangeAbsolute": 가격 변화량(절대값)
+                    - "priceChangeDirection": 밈코인 상승(up, 0 이상)/하락(down)
+                    - "priceChangeRate": 가격 변화율
+                    - "rankChangeDirection": 순위 상승(up, 0 이상)/하락(down)
                     ```""")
     public ApiResponse<DashboardTrendListResponse> getTrendList() {
         return ApiResponse.onSuccess(dashboardQueryService.getTrendList());
diff --git a/src/main/java/com/memesphere/domain/dashboard/converter/DashboardConverter.java b/src/main/java/com/memesphere/domain/dashboard/converter/DashboardConverter.java
@@ -6,10 +6,11 @@
 import com.memesphere.domain.dashboard.dto.response.DashboardTrendListResponse;
 import com.memesphere.domain.dashboard.dto.response.DashboardTrendResponse;
 
+
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class DashboardConverter {
     // ** 총 거래량 및 총 개수 응답 형식 ** //
@@ -21,20 +22,46 @@ public static DashboardOverviewResponse toOverView(BigDecimal totalVolume, Long
     }
 
     // ** 트렌드 응답 형식 ** //
-    public static DashboardTrendListResponse toTrendList(LocalDateTime recordedTime, List<ChartData> dataList) {
-        List<DashboardTrendResponse> trendList = dataList.stream()
-                .map(data -> toTrend(data))
-                .collect(Collectors.toList());
+    public static DashboardTrendListResponse toTrendList(LocalDateTime recordedTime,
+                                                         List<ChartData> dataList,
+                                                         List<MemeCoin> prevCoinList) {
+
+        List<DashboardTrendResponse> trendList = new ArrayList<>();
+
+        // 현재 top5에 들지 않는 밈코인 순위 처리
+        List<MemeCoin> currCoinList = dataList.stream().map(ChartData::getMemeCoin).toList();
+        for (MemeCoin prevCoin : prevCoinList) {
+            if (!currCoinList.contains(prevCoin)) prevCoin.updateRank(null);
+        }
+
+
+        // 현재 top5 밈코인
+        for (int i = 0; i < 5; i++) {
+            ChartData data = dataList.get(i);
+            DashboardTrendResponse trend = toTrend(data, prevCoinList, i + 1);
+            trendList.add(trend);
+        }
 
         return DashboardTrendListResponse.builder()
                 .timestamp(recordedTime)
                 .trendList(trendList)
                 .build();
     }
 
-    public static DashboardTrendResponse toTrend(ChartData data) {
+    public static DashboardTrendResponse toTrend(ChartData data,
+                                                 List<MemeCoin> prevCoinList,
+                                                 Integer currRank) {
         MemeCoin memeCoin = data.getMemeCoin();
 
+        // 이전에 기록된 밈코인 순위와 현재 밈코인 순위 변화
+        // prevRank == -1 : 새로 등록 순위
+        Integer prevRank = prevCoinList.indexOf(memeCoin);
+        prevRank = (prevRank == -1) ? null : prevRank + 1;
+        String rankDirection = (prevRank == null || currRank <= prevRank) ? "up" : "down";
+
+        // 순위 업데이트
+        memeCoin.updateRank(currRank);
+
         return DashboardTrendResponse.builder()
                 .coinId(memeCoin.getId())
                 .image(memeCoin.getImage())
@@ -43,9 +70,10 @@ public static DashboardTrendResponse toTrend(ChartData data) {
                 .volume(data.getVolume())
                 .price(data.getPrice())
                 .priceChange(data.getPriceChange())
-                .changeAbsolute(data.getPriceChange().abs())
-                .changeDirection(data.getPriceChangeRate().compareTo(BigDecimal.ZERO) < 0 ? "down" : "up")
-                .changeRate(data.getPriceChangeRate())
+                .priceChangeAbsolute(data.getPriceChange().abs())
+                .priceChangeDirection(data.getPriceChangeRate().compareTo(BigDecimal.ZERO) < 0 ? "down" : "up")
+                .priceChangeRate(data.getPriceChangeRate())
+                .rankChangeDirection(rankDirection)
                 .build();
     }
 }
diff --git a/src/main/java/com/memesphere/domain/dashboard/dto/response/DashboardTrendResponse.java b/src/main/java/com/memesphere/domain/dashboard/dto/response/DashboardTrendResponse.java
@@ -30,12 +30,15 @@ public class DashboardTrendResponse {
     @Schema(description = "가격 변화량", example = "-0.03")
     private BigDecimal priceChange;
 
-    @Schema(description = "변화량 절대값", example = "0.03")
-    private BigDecimal changeAbsolute;
+    @Schema(description = "가격 변화량 절대값", example = "0.03")
+    private BigDecimal priceChangeAbsolute;
 
-    @Schema(description = "변화 방향", example = "down")
-    private String changeDirection;
+    @Schema(description = "가격 변화 방향", example = "down")
+    private String priceChangeDirection;
 
-    @Schema(description = "변화율", example = "-6.35")
-    private BigDecimal changeRate;
+    @Schema(description = "가격 변화율", example = "-6.35")
+    private BigDecimal priceChangeRate;
+
+    @Schema(description = "순위 변화 방향", example = "down")
+    private String rankChangeDirection;
 }
diff --git a/src/main/java/com/memesphere/domain/dashboard/service/DashboardQueryServiceImpl.java b/src/main/java/com/memesphere/domain/dashboard/service/DashboardQueryServiceImpl.java
@@ -1,12 +1,11 @@
 package com.memesphere.domain.dashboard.service;
 
+import com.memesphere.domain.chartdata.entity.ChartData;
 import com.memesphere.domain.collection.service.CollectionQueryService;
 import com.memesphere.domain.dashboard.converter.DashboardConverter;
 import com.memesphere.domain.dashboard.dto.response.DashboardOverviewResponse;
-import com.memesphere.domain.chartdata.entity.ChartData;
 import com.memesphere.domain.dashboard.dto.response.DashboardTrendListResponse;
 import com.memesphere.domain.chartdata.repository.ChartDataRepository;
-import com.memesphere.domain.user.entity.User;
 import com.memesphere.domain.user.repository.UserRepository;
 import com.memesphere.global.apipayload.code.status.ErrorStatus;
 import com.memesphere.global.apipayload.exception.GeneralException;
@@ -30,16 +29,15 @@
 import java.util.List;
 
 @Service
-@Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class DashboardQueryServiceImpl implements DashboardQueryService {
-    private final UserRepository userRepository;
     private final MemeCoinRepository memeCoinRepository;
     private final ChartDataRepository chartDataRepository;
     private final CollectionQueryService collectionQueryService;
 
     // ** 총 거래량 및 총 개수 ** //
     @Override
+    @Transactional(readOnly = true)
     public DashboardOverviewResponse getOverview() {
         // 등록된 모든 밈코인의 총 거래량
         BigDecimal totalVolume = chartDataRepository.findTotalVolume();
@@ -52,18 +50,25 @@ public DashboardOverviewResponse getOverview() {
 
     // ** 트렌드 ** //
     @Override
+    @Transactional
     public DashboardTrendListResponse getTrendList() {
-        // 거래량 top5 밈코인-차트데이터
+        // 이전에 기록된 top5 밈코인
+        List<MemeCoin> prevCoinList = memeCoinRepository.findTop5OrderByRank();
+
+        // 최신 거래량 top5 밈코인-차트데이터
         List<ChartData> dataList = chartDataRepository.findTop5OrderByVolumeDesc();
 
         // 코인 아이디 1 기준 기록 시간
         LocalDateTime recordedTime = chartDataRepository.findRecordedTimeByCoinId1();
 
-        return DashboardConverter.toTrendList(recordedTime, dataList);
+        DashboardTrendListResponse trendList = DashboardConverter.toTrendList(recordedTime, dataList, prevCoinList);
+        memeCoinRepository.saveAll(prevCoinList); // 순위 업데이트
+        return trendList;
     }
 
     // ** 차트 ** //
     @Override
+    @Transactional(readOnly = true)
     public SearchPageResponse getChartPage(Long userId, ViewType viewType, SortType sortType, Integer pageNumber) {
 
         // 로그인 x -> 콜렉션 빈 리스트
@@ -87,7 +92,7 @@ public SearchPageResponse getChartPage(Long userId, ViewType viewType, SortType
         Pageable pageable = PageRequest.of(pageNumber, pageSize, Sort.by(Sort.Direction.DESC, sortField));
         Page<MemeCoin> coinPage = memeCoinRepository.findAllLatestChartData(pageable);
 
-        // null 체크 후 예외 처리}
+        // null 체크 후 예외 처리
         return SearchConverter.toSearchPageDTO(coinPage, viewType, userCollectionIds);
     }
 }
diff --git a/src/main/java/com/memesphere/domain/memecoin/entity/MemeCoin.java b/src/main/java/com/memesphere/domain/memecoin/entity/MemeCoin.java
@@ -9,6 +9,7 @@
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +44,9 @@ public class MemeCoin extends BaseEntity {
     @Column
     private boolean collectionActive;
 
+    @Column
+    private Integer trendRank;
+
     @ElementCollection
     @CollectionTable(name = "CoinKeywords", joinColumns = @JoinColumn(name = "coin_id"))
     @Column(name = "keyword")
@@ -63,5 +67,11 @@ public class MemeCoin extends BaseEntity {
 
     @OneToMany(mappedBy = "memeCoin", cascade = CascadeType.ALL, orphanRemoval = true)
     @OrderBy("recordedTime DESC")
+    @Builder.Default
     private List<ChartData> chartDataList = new ArrayList<>();
+
+    @Transactional
+    public void updateRank(Integer trendRank) {
+        this.trendRank = trendRank;
+    }
 }
diff --git a/src/main/java/com/memesphere/domain/memecoin/repository/MemeCoinRepository.java b/src/main/java/com/memesphere/domain/memecoin/repository/MemeCoinRepository.java
@@ -3,12 +3,11 @@
 import com.memesphere.domain.memecoin.entity.MemeCoin;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.lang.NonNull;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface MemeCoinRepository extends JpaRepository<MemeCoin, Long> {
@@ -34,4 +33,8 @@ Page<MemeCoin> findWithLatestChartDataSorted(
     Page<MemeCoin> findAllLatestChartData( Pageable pageable);
 
     Optional<MemeCoin> findByName(String name);
+
+    @Query("SELECT m FROM MemeCoin m " +
+            "WHERE m.trendRank IS NOT NULL ORDER BY m.trendRank ASC")
+    List<MemeCoin> findTop5OrderByRank();
 }
diff --git a/src/main/java/com/memesphere/global/config/SwaggerConfig.java b/src/main/java/com/memesphere/global/config/SwaggerConfig.java
@@ -34,7 +34,8 @@ public OpenAPI MemeSphereAPI() {
                         .bearerFormat("JWT"));
 
         return new OpenAPI()
-                .addServersItem(new Server().url("https://15.164.103.195.nip.io"))  // 기본 URL을 nip.io 도메인으로 설정
+//                .addServersItem(new Server().url("https://15.164.103.195.nip.io"))  // 기본 URL을 nip.io 도메인으로 설정
+                .addServersItem(new Server().url("/"))
                 .info(info)
                 .addSecurityItem(securityRequirement)
                 .components(components);
