Merge pull request #99 from SynergyX-AI-Pattern/refactor/#98_watchlist_add_changerate_price

eldeoddt · web-flow · commit 82f53260ea72 · 2025-10-11T22:10:59.000+09:00
[REFACTOR] 관심종목 엔티티에 orm, fetch join 적용 및 필드 추가 #98
diff --git a/src/main/java/com/synergyx/trading/dto/InterestStock/InterestStockResponseDTO.java b/src/main/java/com/synergyx/trading/dto/InterestStock/InterestStockResponseDTO.java
@@ -10,12 +10,16 @@ public class InterestStockResponseDTO {
     private Long stockId;
     private String stockName;
     private String stockSymbol;
+    private String price;
+    private String changeRate;
     private String imageUrl;
 
-    public InterestStockResponseDTO(Long stockId, String stockName, String stockSymbol, String imageUrl) {
+    public InterestStockResponseDTO(Long stockId, String stockName, String stockSymbol, String price, String changeRate, String imageUrl) {
         this.stockId = stockId;
         this.stockName = stockName;
         this.stockSymbol = stockSymbol;
+        this.price = price;
+        this.changeRate = changeRate;
         this.imageUrl = imageUrl;
     }
 }
diff --git a/src/main/java/com/synergyx/trading/model/RecentViewStock.java b/src/main/java/com/synergyx/trading/model/RecentViewStock.java
@@ -19,11 +19,13 @@ public class RecentViewStock {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "user_id", nullable = false)
-    private Long userId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
 
-    @Column(name = "stock_id", nullable = false)
-    private Long stockId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "stock_id", nullable = false)
+    private Stock stock;
 
     @Column(name = "viewed_at", nullable = false)
     private LocalDateTime viewedAt;
diff --git a/src/main/java/com/synergyx/trading/model/Stock.java b/src/main/java/com/synergyx/trading/model/Stock.java
@@ -24,4 +24,7 @@ public class Stock extends BaseEntity {
 
     @Column(name = "image_url", nullable = true, length = 255)
     private String imageUrl;
+
+    @OneToOne(mappedBy = "stock")
+    private StockDetail stockDetail;
 }
diff --git a/src/main/java/com/synergyx/trading/repository/InterestStockRepository.java b/src/main/java/com/synergyx/trading/repository/InterestStockRepository.java
@@ -1,6 +1,7 @@
 package com.synergyx.trading.repository;
 
 import com.synergyx.trading.model.InterestStock;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -11,10 +12,9 @@
 public interface InterestStockRepository extends JpaRepository<InterestStock, Long> {
     Optional<InterestStock> findByUserIdAndStockId(Long userId, Long stockId);
 
+    @EntityGraph(attributePaths = {"stock", "stock.stockDetail"})
     List<InterestStock> findAllByUserId(Long userId);
 
-    void deleteByUserIdAndStockId(Long userId, Long stockId);
-
     boolean existsByUserIdAndStockId(Long userId, Long stockId);
 }
 
diff --git a/src/main/java/com/synergyx/trading/repository/RecentViewStockRepository.java b/src/main/java/com/synergyx/trading/repository/RecentViewStockRepository.java
@@ -2,6 +2,7 @@
 
 import com.synergyx.trading.dto.InterestStock.InterestStockResponseDTO;
 import com.synergyx.trading.model.RecentViewStock;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -11,34 +12,27 @@
 
 public interface RecentViewStockRepository extends JpaRepository<RecentViewStock, Long> {
 
-    @Query("""
-                SELECT new com.synergyx.trading.dto.InterestStock.InterestStockResponseDTO(
-                    s.id, s.name, s.symbol, s.imageUrl
-                )
-                FROM RecentViewStock r
-                JOIN Stock s ON r.stockId = s.id
-                WHERE r.userId = :userId
-                ORDER BY r.viewedAt DESC
-            """)
-    List<InterestStockResponseDTO> findRecentStocksWithInfo(@Param("userId") Long userId);
-
+    @EntityGraph(attributePaths = {"stock", "stock.stockDetail"})
+    List<RecentViewStock> findByUserIdOrderByViewedAtDesc(Long userId);
 
     // 중복 제거 (stockId 1개 삭제)
     void deleteByUserIdAndStockId(Long userId, Long stockId);
 
     // 20개 초과된 데이터 삭제
     @Modifying
     @Query(value = """
-                DELETE FROM recent_view_stock
-                WHERE user_id = :userId
-                  AND id NOT IN (
-                      SELECT id FROM (
-                          SELECT id FROM recent_view_stock
-                          WHERE user_id = :userId
-                          ORDER BY viewed_at DESC
-                          LIMIT 20
-                      ) AS tmp
-                  )
+                DELETE r FROM recent_view_stock r
+                WHERE r.user_id = :userId
+                AND r.id NOT IN (
+                    SELECT id
+                    FROM (
+                        SELECT id
+                        FROM recent_view_stock
+                        WHERE user_id = :userId
+                        ORDER BY viewed_at DESC
+                        LIMIT 20
+                    ) tmp
+                )
             """, nativeQuery = true)
     void deleteOverLimit(Long userId);
 }
diff --git a/src/main/java/com/synergyx/trading/service/InterestStockService/InterestStockCommandServiceImpl.java b/src/main/java/com/synergyx/trading/service/InterestStockService/InterestStockCommandServiceImpl.java
@@ -79,13 +79,22 @@ public void removeInterest(Long userId, Long stockId) {
     @Override
     @Transactional(propagation = REQUIRES_NEW)
     public void addRecentView(Long userId, Long stockId) {
+        // 사용자 조회
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+
+        // 종목 조회
+        Stock stock = stockRepository.findById(stockId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.STOCK_NOT_FOUND));
+
         // 중복 제거
         recentViewStockRepository.deleteByUserIdAndStockId(userId, stockId);
 
+        // 기록 저장
         recentViewStockRepository.save(
                 RecentViewStock.builder()
-                        .userId(userId)
-                        .stockId(stockId)
+                        .user(user)
+                        .stock(stock)
                         .viewedAt(LocalDateTime.now())
                         .build()
         );
diff --git a/src/main/java/com/synergyx/trading/service/InterestStockService/InterestStockQueryServiceImpl.java b/src/main/java/com/synergyx/trading/service/InterestStockService/InterestStockQueryServiceImpl.java
@@ -3,6 +3,8 @@
 import com.synergyx.trading.apiPayload.code.status.ErrorStatus;
 import com.synergyx.trading.apiPayload.exception.GeneralException;
 import com.synergyx.trading.dto.InterestStock.InterestStockResponseDTO;
+import com.synergyx.trading.model.Stock;
+import com.synergyx.trading.model.StockDetail;
 import com.synergyx.trading.model.User;
 import com.synergyx.trading.repository.InterestStockRepository;
 import com.synergyx.trading.repository.RecentViewStockRepository;
@@ -13,6 +15,8 @@
 
 import java.util.List;
 
+import static com.synergyx.trading.util.ParsingUtil.toFormattedNumber;
+
 @Service
 @RequiredArgsConstructor
 public class InterestStockQueryServiceImpl implements InterestStockQueryService {
@@ -34,13 +38,20 @@ public List<InterestStockResponseDTO> getInterestList(Long userId) {
         User user = getValidUser(userId);
 
         return interestStockRepository.findAllByUserId(userId).stream()
-                .map(i -> InterestStockResponseDTO.builder()
-                        .stockId(i.getStock().getId())
-                        .stockName(i.getStock().getName())
-                        .stockSymbol(i.getStock().getSymbol())
-                        .imageUrl(i.getStock().getImageUrl())
-                        .build()
-                ).toList();
+                .map(i -> {
+                    Stock stock = i.getStock();
+                    StockDetail detail = stock.getStockDetail(); // entity graph로 fetch
+
+                    return InterestStockResponseDTO.builder()
+                            .stockId(i.getStock().getId())
+                            .stockName(i.getStock().getName())
+                            .stockSymbol(i.getStock().getSymbol())
+                            .price(detail != null ? toFormattedNumber(detail.getPrice()) : null)
+                            .changeRate(detail != null ? (detail.getChangeRate() + "%") : null)
+                            .imageUrl(i.getStock().getImageUrl())
+                            .build();
+                })
+                .toList();
     }
 
     /**
@@ -54,7 +65,21 @@ public List<InterestStockResponseDTO> getInterestList(Long userId) {
     public List<InterestStockResponseDTO> getRecentViewStocks(Long userId) {
         User user = getValidUser(userId);
 
-        return recentViewStockRepository.findRecentStocksWithInfo(userId);
+        return recentViewStockRepository.findByUserIdOrderByViewedAtDesc(userId).stream()
+                .map(r -> {
+                    var stock = r.getStock();
+                    var detail = stock.getStockDetail();
+
+                    return InterestStockResponseDTO.builder()
+                            .stockId(stock.getId())
+                            .stockName(stock.getName())
+                            .stockSymbol(stock.getSymbol())
+                            .price(detail != null ? toFormattedNumber(detail.getPrice()) : null)
+                            .changeRate(detail != null ? (detail.getChangeRate() + "%") : null)
+                            .imageUrl(stock.getImageUrl())
+                            .build();
+                })
+                .toList();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,7 @@ public class Stock extends BaseEntity {`
`24`	`24`
`25`	`25`	`@Column(name = "image_url", nullable = true, length = 255)`
`26`	`26`	`private String imageUrl;`
	`27`	`+`
	`28`	`+ @OneToOne(mappedBy = "stock")`
	`29`	`+ private StockDetail stockDetail;`
`27`	`30`	`}`