[CVW-039] 코인 거래내역 정보 객체 책임 리팩토링

Projects/App/Sources/DI/Assembly/DataAssembly.swift

@@ -40,6 +40,10 @@ public class DataAssembly: Assembly {
             DefaultExchangeRateService()
         }
 
+        // MARK: DataSource
+        container.register(CoinTradeDataSource.self) { _ in
+            BinanceCoinTradeDataSource()
+        }
 
         // MARK: Repository
         container.register(UserConfigurationRepository.self) { _ in
@@ -63,8 +67,8 @@ public class DataAssembly: Assembly {
             BinanceSingleMarketTickerRepository()
         }
 
-        container.register(TradeRepository.self) { _ in
-            BinanceTradeRepository()
+        container.register(CoinTradeRepository.self) { _ in
+            BinanceCoinTradeRepository()
         }
     }
 }

Projects/Data/DataSource/Sources/DataSource/CoinTradeDataSource.swift

@@ -0,0 +1,39 @@
+//
+//  CoinTradeDataSource.swift
+//  Data
+//
+//  Created by choijunios on 4/21/25.
+//
+
+import Combine
+
+import Foundation
+import CoreUtil
+
+public protocol CoinTradeDataSource {
+    func getTradeList(symbolPair: String, tableUpdateInterval: Double?) -> AnyPublisher<HashMap<Int64, BinanceCoinTradeDTO>, Never>
+}
+
+public final class BinanceCoinTradeDataSource: CoinTradeDataSource {
+    // Dependency
+    @Injected private var webSocketService: WebSocketService
+
+    // State
+    private let tradeList: ThreadSafeHashMap<Int64, BinanceCoinTradeDTO> = .init()
+
+    public init() { }
+
+    public func getTradeList(symbolPair: String, tableUpdateInterval: Double?) -> AnyPublisher<HashMap<Int64, BinanceCoinTradeDTO>, Never>  {
+        webSocketService
+            .getMessageStream()
+            .filter { (dto: BinanceCoinTradeDTO) in
+                dto.symbol.lowercased() == symbolPair.lowercased()
+            }
+            .throttle(for: .init(floatLiteral: tableUpdateInterval ?? 0.0), scheduler: DispatchQueue.global(qos: .default), latest: true)
+            .unretained(self)
+            .asyncTransform { source, dto in
+                await source.tradeList.insert(key: dto.tradeTime, value: dto)
+                return await source.tradeList.hashMap.copy()
+            }
+    }
+}

Projects/Data/Repository/Sources/BinanceCoinTradeRepository.swift

@@ -0,0 +1,35 @@
+//
+//  BinanceTradeRepository.swift
+//  Data
+//
+//  Created by choijunios on 4/15/25.
+//
+
+import Foundation
+import Combine
+
+import DomainInterface
+import DataSource
+import CoreUtil
+
+public final class BinanceCoinTradeRepository: CoinTradeRepository {
+    // Dependency
+    @Injected private var webSocketService: WebSocketService
+    @Injected private var coinTradeDataSource: CoinTradeDataSource
+
+    public init() { }
+
+    public func getCoinTradeList(symbolPair: String, tableUpdateInterval: Double?) -> AnyPublisher<HashMap<Date, CoinTradeVO>, Never> {
+        coinTradeDataSource
+            .getTradeList(symbolPair: symbolPair, tableUpdateInterval: tableUpdateInterval)
+            .map { dtoList in
+                var entityList = HashMap<Date, CoinTradeVO>()
+                dtoList.values.forEach { dto in
+                    let entity = dto.toEntity()
+                    entityList[entity.tradeTime] = entity
+                }
+                return entityList
+            }
+            .eraseToAnyPublisher()
+    }
+}

Projects/Data/Repository/Sources/BinanceOrderbookRepository.swift

@@ -18,8 +18,8 @@ public final class BinanceOrderbookRepository: OrderbookRepository {
     @Injected private var httpService: HTTPService
 
     // Store
-    private let bidOrderbookStore = ThreadSafeOrderbookHashMap()
-    private let askOrderbookStore = ThreadSafeOrderbookHashMap()
+    private let bidOrderbookStore = ThreadSafeHashMap<CVNumber, CVNumber>()
+    private let askOrderbookStore = ThreadSafeHashMap<CVNumber, CVNumber>()
 
     public init() { }
 }
@@ -79,7 +79,7 @@ private extension BinanceOrderbookRepository {
 
     enum StoreType { case bid, ask }
     func adaptToStore(orderbooks: [[String]], storeType: StoreType) async {
-        var store: ThreadSafeOrderbookHashMap
+        var store: ThreadSafeHashMap<CVNumber, CVNumber>
         switch storeType {
         case .bid:
             store = bidOrderbookStore

Projects/Domain/Concrete/UseCase/DefaultCoinDetailPageUseCase.swift

@@ -15,7 +15,7 @@ final public class DefaultCoinDetailPageUseCase: CoinDetailPageUseCase {
     // Dependency
     @Injected private var orderbookRepository: OrderbookRepository
     @Injected private var singleTickerRepository: SingleMarketTickerRepository
-    @Injected private var coinTradeRepository: TradeRepository
+    @Injected private var coinTradeRepository: CoinTradeRepository
     @Injected private var webSocketHelper: WebSocketManagementHelper
 
     public init() { }
@@ -49,8 +49,18 @@ public extension DefaultCoinDetailPageUseCase {
         singleTickerRepository.request24hTickerChange(pairSymbol: symbolPair)
     }
 
-    func getRecentTrade(symbolPair: String) -> AsyncStream<CoinTradeVO> {
-        coinTradeRepository.getSingleTrade(symbolPair: symbolPair)
+    func getRecentTrade(symbolPair: String, maxRowCount: UInt) -> AnyPublisher<[CoinTradeVO], Never> {
+        coinTradeRepository
+            .getCoinTradeList(symbolPair: symbolPair, tableUpdateInterval: 0.5)
+            .map { entity in
+                // 최신으로 maxRowCount개수 만큼
+                let slicedList = entity
+                    .keys(order: .DESC, maxCount: maxRowCount)
+                    .compactMap { key in entity[key] }
+                    .prefix(Int(maxRowCount))
+                return Array(slicedList)
+            }
+            .eraseToAnyPublisher()
     }
 
     func getOrderbookTable(symbolPair: String, rowCount: UInt) -> AnyPublisher<OrderbookTableVO, Error> {

Projects/Domain/Interface/Repository/CoinTradeRepository.swift

@@ -0,0 +1,15 @@
+//
+//  CoinTradeRepository.swift
+//  Domain
+//
+//  Created by choijunios on 4/15/25.
+//
+
+import Combine
+import Foundation
+
+import CoreUtil
+
+public protocol CoinTradeRepository {
+    func getCoinTradeList(symbolPair: String, tableUpdateInterval: Double?) -> AnyPublisher<HashMap<Date, CoinTradeVO>, Never>
+}

Projects/Domain/Interface/UseCase/CoinDetailPageUseCase.swift

@@ -14,6 +14,6 @@ public protocol CoinDetailPageUseCase {
     func disconnectToStreams(symbolPair: String)
 
     func getOrderbookTable(symbolPair: String, rowCount: UInt) -> AnyPublisher<OrderbookTableVO, Error>
+    func getRecentTrade(symbolPair: String, maxRowCount: UInt) -> AnyPublisher<[CoinTradeVO], Never>
     func get24hTickerChange(symbolPair: String) -> AsyncStream<Twenty4HourTickerForSymbolVO>
-    func getRecentTrade(symbolPair: String) -> AsyncStream<CoinTradeVO>
 }

Projects/Features/CoinDetail/Example/Sources/DI/Assemblies.swift

@@ -30,6 +30,11 @@ public class Assemblies: Assembly {
         }
         .inObjectScope(.container)
 
+        // MARK: DataSource
+        container.register(CoinTradeDataSource.self) { _ in
+            BinanceCoinTradeDataSource()
+        }
+
         // MARK: Shared
         container.register(AlertShooter.self) { _ in AlertShooter() }
         .inObjectScope(.container)
@@ -48,8 +53,8 @@ public class Assemblies: Assembly {
         container.register(SingleMarketTickerRepository.self) { _ in
             BinanceSingleMarketTickerRepository()
         }
-        container.register(TradeRepository.self) { _ in
-            BinanceTradeRepository()
+        container.register(CoinTradeRepository.self) { _ in
+            BinanceCoinTradeRepository()
         }
 
         // MARK: UseCase

Projects/Features/CoinDetail/Feature/Sources/CoinDetailPageViewModel.swift

@@ -49,9 +49,8 @@ final class CoinDetailPageViewModel: UDFObservableObject, CoinDetailPageViewMode
     private var symbolPair: String { symbolInfo.pairSymbol }
     private var hasAppeared = false
     private let orderbookRowCount: Int = 15
-    private let tradeContainer: TradeContainer = .init(maxCount: 15)
-
-
+    private let recentTradeRowCount: Int = 20
+
     // Action
     typealias Action = CoinDetailPageAction
     let action: PassthroughSubject<CoinDetailPageAction, Never> = .init()
@@ -213,26 +212,14 @@ private extension CoinDetailPageViewModel {
 // MARK: Recent trade
 private extension CoinDetailPageViewModel {
     func listenToRecentTradeStream() {
-        let updateTracker = PassthroughSubject<CoinTradeVO, Never>()
         streamUpdateObserverStore[.recentTrade]?.cancel()
-        streamUpdateObserverStore[.recentTrade] = updateTracker
+        streamUpdateObserverStore[.recentTrade] = useCase
+            .getRecentTrade(symbolPair: symbolPair, maxRowCount: UInt(recentTradeRowCount))
             .throttle(for: 1.0, scheduler: DispatchQueue.global(), latest: true)
-            .unretained(self)
-            .asyncTransform { vm, update in
-                // - 주문정보 업데이트
-                await vm.tradeContainer.insert(element: update)
-
-                // - 새로운 리스트 추출
-                let newList = await vm.tradeContainer.getList()
-                return Action.updateTrades(trades: newList)
+            .map { list in
+                return Action.updateTrades(trades: list)
             }
             .subscribe(self.action)
-
-        streamTask[.recentTrade]?.cancel()
-        streamTask[.recentTrade] = Task { [updateTracker, weak self] in
-            guard let self else { return }
-            for await entity in useCase.getRecentTrade(symbolPair: symbolPair) { updateTracker.send(entity) }
-        }
     }
 
     func convertToRO(_ entity: CoinTradeVO) -> CoinTradeRO {

Projects/Features/CoinDetail/Tests/TradeContainerTests.swift

@@ -10,37 +10,5 @@ import Testing
 @testable import CoinDetailFeature
 
 struct TradeContainerRuntimeErrorTest {
-    @Test("단기간 동시 접근시 런타임 에러 확인")
-    func shortTermConcurrency() async {
-        // Given
-        let container = TradeContainer(maxCount: 1000)
-
-        // When
-        var tasks: [Task<Void, Never>] = []
-        for index in 0..<1000 {
-            let insertTask = Task<Void, Never>.detached {
-                try? await Task.sleep(for: .seconds(1))
-                await container.insert(element: .init(
-                    tradeId: String(index),
-                    tradeType: .buy,
-                    price: .init(0.0),
-                    quantity: .init(0.0),
-                    tradeTime: .now
-                ))
-            }
-            tasks.append(insertTask)
-
-            let getTask = Task<Void, Never>.detached {
-                try? await Task.sleep(for: .seconds(0.5))
-                _ = await container.getList()
-            }
-            tasks.append(getTask)
-        }
-
-        // Then
-        for task in tasks {
-            _ = await task.value
-        }
-        #expect(await container.getList().count == 1000)
-    }
+
 }