[CT-52] 52-1,2,3 리뷰 후 develop 에 merge

data/src/main/java/com/yessorae/data/source/local/database/converter/MoneyConverter.kt

@@ -2,10 +2,11 @@ package com.yessorae.data.source.local.database.converter
 
 import androidx.room.TypeConverter
 import com.yessorae.domain.entity.value.Money
+import com.yessorae.domain.entity.value.asMoney
 
 class MoneyConverter {
     @TypeConverter
-    fun valueToMoney(value: Double?): Money? = value?.let { Money(it) }
+    fun valueToMoney(value: Double?): Money? = value?.let { it.asMoney() }
 
     @TypeConverter
     fun moneyToValue(money: Money?): Double? = money?.value

data/src/main/java/com/yessorae/data/source/local/database/model/ChartGameEntity.kt

@@ -76,7 +76,6 @@ fun ChartGameEntity.asDomainModel() =
         isQuit = isQuit,
         closeStockPrice = closeStockPrice,
         totalStockCount = totalStockCount,
-        totalStockPrice = totalStockPrice,
         averageStockPrice = averageStockPrice,
         accumulatedTotalProfit = accumulatedTotalProfit
     )

data/src/main/java/com/yessorae/data/source/local/database/model/TradeEntity.kt

@@ -13,6 +13,8 @@ data class TradeEntity(
     val id: Long = 0,
     @ColumnInfo(name = COL_GAME_ID)
     val gameId: Long,
+    @ColumnInfo(name = COL_OWNED_STOCK_COUNT)
+    val ownedStockCount: Int,
     @ColumnInfo(name = COL_OWNED_AVERAGE_STOCK_PRICE)
     val ownedAverageStockPrice: Money,
     @ColumnInfo(name = COL_STOCK_PRICE)
@@ -29,6 +31,7 @@ data class TradeEntity(
     companion object {
         const val NAME = "trade_table"
         const val COL_GAME_ID = "game_id"
+        const val COL_OWNED_STOCK_COUNT = "owned_stock_count"
         const val COL_OWNED_AVERAGE_STOCK_PRICE = "owned_average_price"
         const val COL_STOCK_PRICE = "stock_price"
         const val COL_COUNT = "count"
@@ -42,6 +45,7 @@ fun Trade.asEntity() =
     TradeEntity(
         id = id,
         gameId = gameId,
+        ownedStockCount = ownedStockCount,
         ownedAverageStockPrice = ownedAverageStockPrice,
         stockPrice = stockPrice,
         count = count,
@@ -54,6 +58,7 @@ fun TradeEntity.asDomainModel() =
     Trade(
         id = id,
         gameId = gameId,
+        ownedStockCount = ownedStockCount,
         ownedAverageStockPrice = ownedAverageStockPrice,
         stockPrice = stockPrice,
         count = count,

data/src/main/java/com/yessorae/data/source/network/polygon/model/chart/TickDto.kt

@@ -3,6 +3,7 @@ package com.yessorae.data.source.network.polygon.model.chart
 import com.yessorae.data.util.toLocalDateTime
 import com.yessorae.domain.entity.tick.Tick
 import com.yessorae.domain.entity.value.Money
+import com.yessorae.domain.entity.value.asMoney
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -28,10 +29,10 @@ data class TickDto(
 
 internal fun TickDto.asDomainModel() =
     Tick(
-        openPrice = Money(openPrice),
-        closePrice = Money(closePrice),
-        maxPrice = Money(maxPrice),
-        minPrice = Money(minPrice),
+        openPrice = openPrice.asMoney(),
+        closePrice = closePrice.asMoney(),
+        maxPrice = maxPrice.asMoney(),
+        minPrice = minPrice.asMoney(),
         transactionCount = transactionCount,
         startTimestamp = startTimestamp.toLocalDateTime(),
         tradingVolume = tradingVolume.toInt(),

domain/build.gradle.kts

@@ -17,4 +17,5 @@ dependencies {
     implementation(Dependency.PlatformIndependent.KOTLINX_COROUTINSE)
     implementation(Dependency.Common.KOTOIN_SERIALIZATION_JSON)
     implementation(Dependency.Common.PAGING_COMMON)
+    testImplementation(Dependency.Common.JUNIT)
 }

domain/src/main/java/com/yessorae/domain/entity/ChartGame.kt

@@ -2,6 +2,7 @@ package com.yessorae.domain.entity
 
 import com.yessorae.domain.entity.trade.Trade
 import com.yessorae.domain.entity.value.Money
+import com.yessorae.domain.entity.value.asMoney
 
 data class ChartGame(
     val id: Long = 0,
@@ -21,13 +22,13 @@ data class ChartGame(
     val isQuit: Boolean,
     // 현재 보유 주식 수량
     val totalStockCount: Int,
-    // 현재 보유 주식 가격의 총합
-    val totalStockPrice: Money,
     // 현재 보유 주식 평단가
     val averageStockPrice: Money,
-    // 누적 수익
+    // 누적 실현 손익
     val accumulatedTotalProfit: Money
 ) {
+    // 현재 보유 주식 가격의 총합
+    val totalStockPrice: Money = closeStockPrice * totalStockCount
 
     // 누적 수익률
     val accumulatedRateOfProfit: Double = (accumulatedTotalProfit / startBalance).value
@@ -41,10 +42,11 @@ data class ChartGame(
     // 정상종료이든 강제종료이든 종료된 경우 true
     val isGameEnd: Boolean = isQuit || isGameComplete
 
-    internal fun getNextTurnResult(): ChartGame {
+    internal fun getNextTurnResult(closeStockPrice: Money): ChartGame {
         val nextTurn = currentTurn + 1
         return this.copy(
-            currentTurn = nextTurn
+            currentTurn = nextTurn,
+            closeStockPrice = closeStockPrice
         )
     }
 
@@ -56,23 +58,16 @@ data class ChartGame(
         }
 
         return copy(
-            currentBalance = currentBalance + Money.of(
+            currentBalance = currentBalance +
                 if (newTrade.type.isBuy()) {
-                    -newTrade.totalTradeMoney.value
+                    -(newTrade.totalTradeMoney + newTrade.commission).value
                 } else {
-                    newTrade.totalTradeMoney.value
-                }
-            ),
+                    (newTrade.totalTradeMoney - newTrade.commission).value
+                }.asMoney(),
             totalStockCount = newTotalStockCount,
-            totalStockPrice = totalStockPrice + Money.of(
-                if (newTrade.type.isBuy()) {
-                    newTrade.totalTradeMoney.value
-                } else {
-                    -newTrade.totalTradeMoney.value
-                }
-            ),
             averageStockPrice = if (newTrade.type.isBuy()) {
-                (totalStockPrice + newTrade.totalTradeMoney) / newTotalStockCount
+                (averageStockPrice * totalStockCount + newTrade.totalTradeMoney) /
+                    newTotalStockCount
             } else {
                 averageStockPrice
             },
@@ -86,7 +81,6 @@ data class ChartGame(
             currentBalance = startBalance,
             closeStockPrice = closeStockPrice,
             totalStockCount = 0,
-            totalStockPrice = Money.ZERO,
             averageStockPrice = Money.ZERO,
             accumulatedTotalProfit = Money.ZERO
         )
@@ -116,7 +110,6 @@ data class ChartGame(
                 closeStockPrice = closeStockPrice,
                 isQuit = false,
                 totalStockCount = 0,
-                totalStockPrice = Money.ZERO,
                 averageStockPrice = Money.ZERO,
                 accumulatedTotalProfit = Money.ZERO
             )

domain/src/main/java/com/yessorae/domain/entity/User.kt

@@ -2,6 +2,7 @@ package com.yessorae.domain.entity
 
 import com.yessorae.domain.common.DefaultValues
 import com.yessorae.domain.entity.value.Money
+import com.yessorae.domain.entity.value.asMoney
 import kotlinx.serialization.Serializable
 
 @Serializable
@@ -39,7 +40,7 @@ data class User(
     ): User {
         val oldTotalGameCount = winCount + loseCount
         return User(
-            balance = balance + Money(profit),
+            balance = balance + profit.asMoney(),
             winCount = winCount + (if (profit > 0) 1 else 0),
             loseCount = loseCount + (if (profit < 0) 1 else 0),
             averageRateOfProfit =

domain/src/main/java/com/yessorae/domain/entity/trade/Trade.kt

@@ -1,11 +1,14 @@
 package com.yessorae.domain.entity.trade
 
 import com.yessorae.domain.entity.value.Money
+import com.yessorae.domain.entity.value.asMoney
 
 data class Trade(
     val id: Long = 0,
     // 차트게임 아이디
     val gameId: Long,
+    // 현재 가지고 있는 주식 개수
+    val ownedStockCount: Int,
     // 현재 가지고 있는 가격
     val ownedAverageStockPrice: Money,
     // 1 주당 가격
@@ -24,18 +27,22 @@ data class Trade(
     val totalTradeMoney: Money = stockPrice * count
 
     // 수수료
-    val commission: Money = totalTradeMoney * commissionRate
+    val commission: Money = totalTradeMoney * commissionRate / 100
 
     // 실현 손익, 매도할 때만 유효
     val profit: Money = if (type.isBuy()) {
-        Money(0.0) // TODO::CT-52 버그 수정 필요. 도메인 모델 Unit Testing 브랜치에서 수정 예정.
+        (-commission.value).asMoney()
     } else {
-        ((stockPrice - ownedAverageStockPrice) * count) - commission
+        val sellProfit = totalTradeMoney - commission
+        val totalOwnedStockPrice = ownedAverageStockPrice * count
+
+        sellProfit - totalOwnedStockPrice
     }
 
     companion object {
         internal fun new(
             gameId: Long,
+            ownedStockCount: Int,
             ownedAverageStockPrice: Money,
             stockPrice: Money,
             count: Int,
@@ -45,6 +52,7 @@ data class Trade(
         ): Trade {
             return Trade(
                 gameId = gameId,
+                ownedStockCount = ownedStockCount,
                 ownedAverageStockPrice = ownedAverageStockPrice,
                 stockPrice = stockPrice,
                 count = count,

domain/src/main/java/com/yessorae/domain/entity/trade/TradeType.kt

@@ -1,9 +1,9 @@
 package com.yessorae.domain.entity.trade
 
 enum class TradeType {
-    Buy,
-    Sell;
+    BUY,
+    SELL;
 
-    fun isBuy(): Boolean = this == Buy
-    fun isSell(): Boolean = this == Sell
+    fun isBuy(): Boolean = this == BUY
+    fun isSell(): Boolean = this == SELL
 }

domain/src/main/java/com/yessorae/domain/entity/value/Money.kt

@@ -9,41 +9,47 @@ data class Money(
     // TODO::LATER 화폐단위 바꿔주는 함수 추가
 
     operator fun plus(other: Money): Money {
-        return Money(value + other.value)
+        return (value + other.value).asMoney()
     }
 
     operator fun times(other: Money): Money {
-        return Money(value * other.value)
+        return (value * other.value).asMoney()
     }
 
     operator fun times(count: Int): Money {
-        return Money(value * count)
+        return (value * count).asMoney()
     }
 
     operator fun times(count: Double): Money {
-        return Money(value * count)
+        return (value * count).asMoney()
     }
 
     operator fun minus(other: Money): Money {
-        return Money(value - other.value)
+        return (value - other.value).asMoney()
     }
 
     operator fun div(other: Money): Money {
-        return Money(value / other.value)
+        return (value / other.value).asMoney()
     }
 
     operator fun div(other: Double): Money {
-        return Money(value / other)
+        return (value / other).asMoney()
     }
 
     operator fun div(other: Int): Money {
-        return Money(value / other)
+        return (value / other).asMoney()
     }
 
     companion object {
-        val ZERO = Money(0.0)
+        val ZERO = 0.asMoney()
         fun of(value: Double): Money {
             return Money(value)
         }
     }
 }
+
+fun Int.asMoney() = Money.of(value = this.toDouble())
+
+fun Float.asMoney() = Money.of(value = this.toDouble())
+
+fun Double.asMoney() = Money.of(value = this)

domain/src/main/java/com/yessorae/domain/usecase/TradeStockUseCase.kt

@@ -22,6 +22,7 @@ class TradeStockUseCase @Inject constructor(
             with(param) {
                 val trade = Trade.new(
                     gameId = gameId,
+                    ownedStockCount = ownedStockCount,
                     ownedAverageStockPrice = ownedAverageStockPrice,
                     stockPrice = stockPrice,
                     count = count,
@@ -39,6 +40,7 @@ class TradeStockUseCase @Inject constructor(
 
     data class Param(
         val gameId: Long,
+        val ownedStockCount: Int,
         val ownedAverageStockPrice: Money,
         val stockPrice: Money,
         val count: Int,

domain/src/main/java/com/yessorae/domain/usecase/UpdateNextTickUseCase.kt

@@ -5,13 +5,15 @@ import com.yessorae.domain.common.delegateEmptyResultFlow
 import com.yessorae.domain.entity.User
 import com.yessorae.domain.exception.ChartGameException
 import com.yessorae.domain.repository.ChartGameRepository
+import com.yessorae.domain.repository.ChartRepository
 import com.yessorae.domain.repository.UserRepository
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
 class UpdateNextTickUseCase @Inject constructor(
     private val chartGameRepository: ChartGameRepository,
+    private val chartRepository: ChartRepository,
     private val userRepository: UserRepository
 ) {
     operator fun invoke(gameId: Long): Flow<Result<Unit>> =
@@ -24,7 +26,20 @@ class UpdateNextTickUseCase @Inject constructor(
                 )
             }
 
-            val newChartGame = oldChartGame.getNextTurnResult()
+            val chart = chartRepository.fetchChart(gameId = gameId)
+            val lastVisibleTickIndex = (chart.ticks.size - 1) -
+                (oldChartGame.totalTurn - (oldChartGame.currentTurn + 1))
+
+            if (lastVisibleTickIndex < 0) {
+                throw ChartGameException.CanNotCreateChartGame(
+                    message = "can't change chart because new chart has not enough ticks"
+                )
+            }
+
+            // getNextTurnResult 에 Chart 를 전달하고 인덱스 검사하는 부분을 getNextTurnResult 에 포함할지 고민중
+            val newChartGame = oldChartGame.getNextTurnResult(
+                closeStockPrice = chart.ticks[lastVisibleTickIndex].closePrice
+            )
 
             if (newChartGame.isGameEnd) {
                 val oldUser: User = userRepository.fetchUser()