#120 Fix: Merge conflict

Author: kjiyun

build.gradle

@@ -61,6 +61,9 @@ dependencies {
 
 	// redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+	// 이메일 전송
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -12,4 +12,17 @@ services:
     ports:
       - "8080:8080"
     depends_on:
-      - redis
+      - redis
+
+  nginx:
+    image: nginx
+    container_name: nginx
+    restart: always
+    volumes:
+      - ./conf/:/etc/nginx/conf.d
+      - /etc/letsencrypt:/etc/letsencrypt
+    ports:
+      - 80:80
+      - 443:443
+    depends_on:
+      - spring

src/main/java/com/memesphere/MemesphereApplication.java

@@ -1,15 +1,23 @@
 package com.memesphere;
 
+import jakarta.annotation.PostConstruct;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.TimeZone;
+
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableScheduling
 public class MemesphereApplication {
 
+	@PostConstruct
+	public void started() {
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
+	}
+
 	public static void main(String[] args) {
 		SpringApplication.run(MemesphereApplication.class, args);
 	}

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

@@ -11,6 +11,7 @@
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 public interface ChartDataRepository extends JpaRepository<ChartData, Long> {
     @Query("SELECT SUM(c.volume) FROM ChartData c " +
@@ -28,6 +29,12 @@ public interface ChartDataRepository extends JpaRepository<ChartData, Long> {
     LocalDateTime findRecordedTimeByCoinId1();
 
     List<ChartData> findByMemeCoinOrderByRecordedTimeDesc(MemeCoin memeCoin);
-    //TODO: 위아래 코드 합치는 방법 찾기
-    List<ChartData> findByMemeCoinOrderByRecordedTimeDesc(MemeCoin memeCoin, Pageable pageable);
+
+    List<ChartData> findByMemeCoinAndRecordedTimeAfterOrderByRecordedTimeDesc(MemeCoin memeCoin, LocalDateTime recordedTime, Pageable pageable);
+
+    @Query("SELECT c FROM ChartData c " +
+            "WHERE c.memeCoin.id = :coinId " +
+            "AND c.recordedTime = " +
+            "(SELECT MAX(c2.recordedTime) FROM ChartData c2 WHERE c2.memeCoin = c.memeCoin)")
+    Optional<ChartData> findLatestByCoinId(Long coinId);
 }

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

@@ -3,17 +3,20 @@
 import com.memesphere.domain.binance.dto.response.BinanceTickerResponse;
 import com.memesphere.domain.binance.service.BinanceQueryService;
 import com.memesphere.domain.chartdata.entity.ChartData;
+import com.memesphere.domain.notification.service.PushNotificationService;
 import com.memesphere.global.apipayload.code.status.ErrorStatus;
 import com.memesphere.global.apipayload.exception.GeneralException;
 import com.memesphere.domain.memecoin.entity.MemeCoin;
 import com.memesphere.domain.memecoin.repository.MemeCoinRepository;
 import com.memesphere.domain.memecoin.service.MemeCoinQueryService;
+import com.memesphere.global.jwt.LoggedInUserStore;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Set;
 
 import static com.memesphere.domain.chartdata.converter.ChartDataConverter.toChartData;
 
@@ -23,25 +26,34 @@ public class ChartDataScheduler {
     private final MemeCoinRepository memeCoinRepository;
     private final BinanceQueryService binanceQueryService;
     private final MemeCoinQueryService memeCoinQueryService;
+    private final LoggedInUserStore loggedInUserStore;
+    private final PushNotificationService pushNotificationService;
 
     @Scheduled(cron = "0 0/10 * * * ?") // 0, 10, 20, 30, 40, 50분에 실행
     @Transactional
     public void updateChartData() {
+
+        Set<Long> loggedInUsers = loggedInUserStore.getLoggedInUsers();
+
         List<MemeCoin> memeCoins = memeCoinRepository.findAll();
 
         for (MemeCoin memeCoin : memeCoins) {
             try {
                 String symbol = memeCoin.getSymbol() + "USDT";
                 BinanceTickerResponse response = binanceQueryService.getTickerData(symbol);
 
-                ChartData chartData = toChartData(memeCoin,response);
+                ChartData chartData = toChartData(memeCoin, response);
 
                 memeCoinQueryService.updateChartData(memeCoin.getId(), chartData);
 
             } catch (Exception e) {
                 throw new GeneralException(ErrorStatus.CANNOT_LOAD_CHARTDATA);
             }
         }
+
+        for (Long userId : loggedInUsers) {
+            pushNotificationService.send(userId);
+        }
     }
 }
 

src/main/java/com/memesphere/domain/chartdata/service/ChartDataQueryServiceImpl.java

@@ -3,6 +3,7 @@
 import com.memesphere.domain.chartdata.entity.ChartData;
 import com.memesphere.domain.chartdata.repository.ChartDataRepository;
 import com.memesphere.domain.memecoin.entity.MemeCoin;
+import com.memesphere.domain.notification.service.PushNotificationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -1,6 +1,8 @@
 package com.memesphere.domain.collection.controller;
 
 import com.memesphere.domain.collection.service.CollectionCommandService;
+import com.memesphere.domain.search.entity.SortType;
+import com.memesphere.domain.search.entity.ViewType;
 import com.memesphere.global.apipayload.ApiResponse;
 import com.memesphere.domain.collection.entity.Collection;
 import com.memesphere.domain.collection.dto.response.CollectionPageResponse;
@@ -32,6 +34,8 @@ public class CollectionRestController {
     @GetMapping("/collection")
     @Operation(summary = "사용자의 밈코인 콜렉션 모음 조회 API")
     public ApiResponse<CollectionPageResponse> getCollectionList (
+            @RequestParam(name = "viewType", defaultValue = "GRID") ViewType viewType, // 뷰 타입 (grid 또는 list)
+            @RequestParam(name = "sortType", defaultValue = "PRICE_CHANGE") SortType sortType, // 정렬 기준 (MKTCap, 24h Volume, Price)
             @AuthenticationPrincipal CustomUserDetails userDetails, // 현재 로그인한 사용자
             @CheckPage @RequestParam(name = "page") Integer page // 페이지 번호
     ) {
@@ -41,8 +45,8 @@ public ApiResponse<CollectionPageResponse> getCollectionList (
         // 유저를 찾지 못하면(로그인을 안 했으면) 콜렉션 접근 못하도록 에러 처리
         if (userId == null) throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
 
-        Page<Collection> collectionPage = collectionQueryService.getCollectionPage(userId, pageNumber);
-        return ApiResponse.onSuccess(CollectionConverter.toCollectionPageDTO(collectionPage));
+        Page<Collection> collectionPage = collectionQueryService.getCollectionPage(userId, pageNumber, viewType, sortType);
+        return ApiResponse.onSuccess(CollectionConverter.toCollectionPageDTO(collectionPage, viewType));
     }
 
     @PostMapping("/collection/{coinId}")

src/main/java/com/memesphere/domain/collection/converter/CollectionConverter.java

@@ -1,13 +1,17 @@
 package com.memesphere.domain.collection.converter;
 
 import com.memesphere.domain.chartdata.entity.ChartData;
+import com.memesphere.domain.collection.dto.response.CollectionListPreviewResponse;
 import com.memesphere.domain.collection.entity.Collection;
 import com.memesphere.domain.memecoin.entity.MemeCoin;
 import com.memesphere.domain.collection.dto.response.CollectionPageResponse;
-import com.memesphere.domain.collection.dto.response.CollectionPreviewResponse;
+import com.memesphere.domain.collection.dto.response.CollectionGridPreviewResponse;
+import com.memesphere.domain.search.entity.ViewType;
 import com.memesphere.domain.user.entity.User;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.data.domain.Page;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -18,26 +22,37 @@ public static Collection toCollection(User user, MemeCoin coin) {
                 .user(user).memeCoin(coin).build();
     }
 
-    public static CollectionPageResponse toCollectionPageDTO(Page<Collection> collectionPage) {
-        List<CollectionPreviewResponse> collectionItems = collectionPage.getContent().stream()
-                .map(collection -> toCollectionPreviewDTO(collection))
-                .collect(Collectors.toList());
+    public static CollectionPageResponse toCollectionPageDTO(Page<Collection> collectionPage, ViewType viewType) {
+        List<CollectionGridPreviewResponse> gridItems = null;
+        List<CollectionListPreviewResponse> listItems = null;
+
+        if (viewType == ViewType.GRID) {
+            gridItems = collectionPage.stream()
+                    .map(collection -> toCollectionGridPreviewDTO(collection))
+                    .collect(Collectors.toList());
+        } else if (viewType == ViewType.LIST) {
+            listItems = collectionPage.stream()
+                    .map(collection -> toCollectionListPreviewDTO(collection))
+                    .collect(Collectors.toList());
+        }
 
         return CollectionPageResponse.builder()
-                .collectionItems(collectionItems)
-                .listSize(collectionItems.size())
+                .gridItems(gridItems)
+                .listItems(listItems)
+                .listSize(collectionPage.getContent().size())
                 .totalPage(collectionPage.getTotalPages())
                 .totalElements(collectionPage.getTotalElements())
                 .isFirst(collectionPage.isFirst())
                 .isLast(collectionPage.isLast())
                 .build();
     }
 
-    private static CollectionPreviewResponse toCollectionPreviewDTO(Collection collection) {
+    private static CollectionGridPreviewResponse toCollectionGridPreviewDTO(Collection collection) {
         MemeCoin memeCoin = collection.getMemeCoin();
         ChartData chartData = memeCoin.getChartDataList().get(0);
 
-        return CollectionPreviewResponse.builder()
+        return CollectionGridPreviewResponse.builder()
+                .coinId(memeCoin.getId())
                 .name(memeCoin.getName())
                 .symbol(memeCoin.getSymbol())
                 .image(memeCoin.getImage())
@@ -48,4 +63,19 @@ private static CollectionPreviewResponse toCollectionPreviewDTO(Collection colle
                 .priceChangeRate(chartData.getPriceChangeRate())
                 .build();
     }
+
+    public static CollectionListPreviewResponse toCollectionListPreviewDTO(Collection collection) {
+        MemeCoin memeCoin = collection.getMemeCoin();
+        ChartData chartData = memeCoin.getChartDataList().get(0);
+
+        return CollectionListPreviewResponse.builder()
+                .coinId(memeCoin.getId())
+                .name(memeCoin.getName())
+                .symbol(memeCoin.getSymbol())
+                .currentPrice(chartData.getPrice())
+                .priceChangeRate(chartData.getPriceChangeRate())
+                .weightedAveragePrice(chartData.getWeighted_average_price())
+                .volume(chartData.getVolume())
+                .build();
+    }
 }

…/response/CollectionPreviewResponse.java …ponse/CollectionGridPreviewResponse.javasrc/main/java/com/memesphere/domain/collection/dto/response/CollectionPreviewResponse.java renamed to src/main/java/com/memesphere/domain/collection/dto/response/CollectionGridPreviewResponse.java src/main/java/com/memesphere/domain/collection/dto/response/CollectionPreviewResponse.java renamed to src/main/java/com/memesphere/domain/collection/dto/response/CollectionGridPreviewResponse.java

@@ -12,7 +12,9 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class CollectionPreviewResponse {
+public class CollectionGridPreviewResponse {
+    @Schema(description = "밈코인 id", example = "1")
+    Long coinId;
     @Schema(description = "밈코인 name", example = "도지코인")
     String name;
     @Schema(description = "밈코인 symbol", example = "DOGE")

src/main/java/com/memesphere/domain/collection/dto/response/CollectionListPreviewResponse.java

@@ -0,0 +1,31 @@
+package com.memesphere.domain.collection.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CollectionListPreviewResponse {
+    @Schema(description = "밈코인 id", example = "1")
+    Long coinId;
+    @Schema(description = "밈코인 name", example = "도지코인")
+    String name;
+    @Schema(description = "밈코인 symbol", example = "DOGE")
+    String symbol;
+    @Schema(description = "차트 데이터의 price", example = "2000")
+    BigDecimal currentPrice;
+    @Schema(description = "차트 데이터의 price_change_rate", example = "+2.4%")
+    BigDecimal priceChangeRate;
+    @Schema(description = "차트 데이터의 weighted average price", example = "10000")
+    BigDecimal weightedAveragePrice; // market cap 대신 사용
+    @Schema(description = "차트 데이터의 volume", example = "5")
+    BigDecimal volume;
+}
+