#17 Merge: 충돌 해결

Author: kjiyun

src/main/java/com/memesphere/domain/chartdata/repository/ChartDataRepository.java

@@ -5,7 +5,9 @@
 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 java.awt.print.Pageable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/memesphere/domain/chartdata/scheduler/ChartDataScheduler.java

@@ -24,7 +24,7 @@ public class ChartDataScheduler {
     private final BinanceQueryService binanceQueryService;
     private final MemeCoinQueryService memeCoinQueryService;
 
-    @Scheduled(fixedRate = 600000) // 10분 간격 실행
+    @Scheduled(cron = "0 0/10 * * * ?") // 0, 10, 20, 30, 40, 50분에 실행
     @Transactional
     public void updateChartData() {
         List<MemeCoin> memeCoins = memeCoinRepository.findAll();

src/main/java/com/memesphere/domain/collection/controller/CollectionRestController.java

@@ -5,6 +5,8 @@
 import com.memesphere.domain.collection.entity.Collection;
 import com.memesphere.domain.collection.dto.response.CollectionPageResponse;
 import com.memesphere.domain.collection.service.CollectionQueryService;
+import com.memesphere.global.apipayload.code.status.ErrorStatus;
+import com.memesphere.global.apipayload.exception.GeneralException;
 import com.memesphere.global.jwt.CustomUserDetails;
 import com.memesphere.global.jwt.TokenProvider;
 import com.memesphere.global.validation.annotation.CheckPage;
@@ -22,7 +24,6 @@
 @Tag(name="콜렉션", description = "콜렉션 관련  API")
 @RestController
 @RequiredArgsConstructor
-//@RequestMapping("/collection")
 public class CollectionRestController {
     private final CollectionQueryService collectionQueryService;
     private final CollectionCommandService collectionCommandService;
@@ -31,12 +32,14 @@ public class CollectionRestController {
     @GetMapping("/collection")
     @Operation(summary = "사용자의 밈코인 콜렉션 모음 조회 API")
     public ApiResponse<CollectionPageResponse> getCollectionList (
-//            @AuthenticationPrincipal User user, // 현재 로그인한 사용자 (아직 구현 x)
+            @AuthenticationPrincipal CustomUserDetails userDetails, // 현재 로그인한 사용자
             @CheckPage @RequestParam(name = "page") Integer page // 페이지 번호
     ) {
         Integer pageNumber = page - 1;
-//        Long userId = user.getId();
-        Long userId = 1L;
+        Long userId = (userDetails == null) ? null : userDetails.getUser().getId();
+
+        // 유저를 찾지 못하면(로그인을 안 했으면) 콜렉션 접근 못하도록 에러 처리
+        if (userId == null) throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
 
         Page<Collection> collectionPage = collectionQueryService.getCollectionPage(userId, pageNumber);
         return ApiResponse.onSuccess(CollectionConverter.toCollectionPageDTO(collectionPage));

src/main/java/com/memesphere/domain/collection/service/CollectionQueryServiceImpl.java

@@ -9,13 +9,13 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class CollectionQueryServiceImpl implements CollectionQueryService {
-    private final UserRepository userRepository;
     private final CollectionRepository collectionRepository;
 
     @Transactional(readOnly = true)
@@ -28,6 +28,8 @@ public Page<Collection> getCollectionPage(Long userId, Integer pageNumber) {
     @Transactional(readOnly = true)
     @Override
     public List<Long> getUserCollectionIds(Long userId) {
+        if (userId == null) return Collections.emptyList();
+
         return collectionRepository.findAllByUserId(userId).stream()
                 .map(Collection::getMemeCoinId)
                 .collect(Collectors.toList());

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());

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();
     }
 }

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;
 }

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);
     }
 }

src/main/java/com/memesphere/domain/image/controller/ImageController.java

@@ -3,18 +3,20 @@
 import com.memesphere.domain.image.dto.response.PresignedUrlResponse;
 import com.memesphere.domain.image.dto.request.ImageExtensionRequest;
 import com.memesphere.domain.image.service.ImageService;
+import com.memesphere.domain.image.service.ProfileService;
 import com.memesphere.global.apipayload.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-@RequestMapping("/s3")
+@RequestMapping("/image")
 @RestController
 @RequiredArgsConstructor
 public class ImageController {
 
     private final ImageService imageService;
+    private final ProfileService profileService;
 
     @PostMapping(value = "/upload", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(
@@ -30,4 +32,16 @@ public ApiResponse<PresignedUrlResponse> uploadFile(@RequestBody ImageExtensionR
 
         return ApiResponse.onSuccess(url);
     }
+
+    //프로필 이미지 조회 Api
+    @GetMapping("/profile/{user_id}")
+    @Operation(summary = "프로필 이미지 조회 API",
+            description = "회원가입한 유저의 프로필 이미지를 반환합니다.")
+    public ApiResponse<String> getProfile(@PathVariable("user_id") Long user_id) {
+        String profileImage = profileService.getProfileImage(user_id);
+
+        // null이거나 ""이면 result를 null로 반환
+        return ApiResponse.onSuccess((profileImage == null || profileImage.isEmpty()) ? "null" : profileImage);
+    }
+
 }

src/main/java/com/memesphere/domain/image/service/ProfileService.java

@@ -0,0 +1,21 @@
+package com.memesphere.domain.image.service;
+
+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;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class ProfileService {
+    private final UserRepository userRepository;
+
+    // 프로필 이미지 반환
+    public String getProfileImage(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+        return user.getProfileImage();
+    }
+}