Merge pull request #14 from team-gogo/fix/betting-bundle-query

[betting] 배팅 일괄 조회 repostiroy 수정

Author: vumrra

src/main/kotlin/gogo/gogobetting/domain/betting/root/application/BettingMapper.kt

@@ -0,0 +1,39 @@
+package gogo.gogobetting.domain.betting.root.application
+
+import gogo.gogobetting.domain.betting.result.persistence.BettingResultRepository
+import gogo.gogobetting.domain.betting.root.application.dto.BettingBundleDto
+import gogo.gogobetting.domain.betting.root.application.dto.BettingBundleInfoDto
+import gogo.gogobetting.domain.betting.root.application.dto.BettingInfoDto
+import gogo.gogobetting.domain.betting.root.application.dto.BettingResultInfoDto
+import gogo.gogobetting.domain.betting.root.persistence.Betting
+import org.springframework.stereotype.Component
+
+@Component
+class BettingMapper(
+    private val bettingResultRepository: BettingResultRepository)
+{
+
+    fun mapBundle(bettingList: List<Betting>): BettingBundleDto {
+        val bundleInfo = bettingList.map { betting ->
+            val bettingInfoDto = BettingInfoDto(betting.id, betting.point, betting.predictedWinTeamId)
+
+            val bettingResult = bettingResultRepository.findByBettingIdAndIsCancelled(betting.id)
+            val bettingResultInfoDto = bettingResult?.let {
+                    BettingResultInfoDto(
+                        isPredicted =bettingResult.isPredicted,
+                        earnedPoint =   bettingResult.earnedPoint
+                    )
+            }
+
+            BettingBundleInfoDto(
+                betting.matchId,
+                bettingInfoDto,
+                bettingResultInfoDto
+            )
+        }
+
+        return BettingBundleDto(bundleInfo)
+    }
+
+
+}

src/main/kotlin/gogo/gogobetting/domain/betting/root/application/BettingReader.kt

@@ -1,6 +1,6 @@
 package gogo.gogobetting.domain.betting.root.application
 
-import gogo.gogobetting.domain.betting.root.application.dto.BettingBundleInfoDto
+import gogo.gogobetting.domain.betting.root.persistence.Betting
 import gogo.gogobetting.domain.betting.root.persistence.BettingRepository
 import org.springframework.stereotype.Component
 
@@ -9,7 +9,7 @@ class BettingReader(
     private val bettingRepository: BettingRepository,
 ) {
 
-    fun readBundleInfo(matchIds: List<Long>, studentId: Long): List<BettingBundleInfoDto> =
+    fun readBundleInfo(matchIds: List<Long>, studentId: Long): List<Betting> =
         bettingRepository.findBettingBundleInfo(matchIds, studentId)
 
 }

src/main/kotlin/gogo/gogobetting/domain/betting/root/application/BettingServiceImpl.kt

@@ -16,6 +16,7 @@ class BettingServiceImpl(
     private val bettingProcessor: BettingProcessor,
     private val applicationEventPublisher: ApplicationEventPublisher,
     private val bettingReader: BettingReader,
+    private val bettingMapper: BettingMapper,
 ) : BettingService {
 
     @Transactional
@@ -39,8 +40,8 @@ class BettingServiceImpl(
 
     @Transactional(readOnly = true)
     override fun bundle(matchIds: List<Long>, studentId: Long): BettingBundleDto {
-        val bettingBundleInfo = bettingReader.readBundleInfo(matchIds, studentId)
-        return BettingBundleDto(bettingBundleInfo)
+        val bettings = bettingReader.readBundleInfo(matchIds, studentId)
+        return bettingMapper.mapBundle(bettings)
     }
 
 }

src/main/kotlin/gogo/gogobetting/domain/betting/root/persistence/BettingCustomRepository.kt

@@ -1,9 +1,8 @@
 package gogo.gogobetting.domain.betting.root.persistence
 
-import gogo.gogobetting.domain.betting.root.application.dto.BettingBundleInfoDto
 import gogo.gogobetting.domain.betting.root.application.dto.MatchOddsDto
 
 interface BettingCustomRepository {
     fun calcOdds(matchId: Long, winTeamId: Long): MatchOddsDto
-    fun findBettingBundleInfo(matchIds: List<Long>, studentId: Long): List<BettingBundleInfoDto>
+    fun findBettingBundleInfo(matchIds: List<Long>, studentId: Long): List<Betting>
 }

src/main/kotlin/gogo/gogobetting/domain/betting/root/persistence/BettingCustomRepositoryImpl.kt

@@ -44,26 +44,9 @@ class BettingCustomRepositoryImpl(
         return MatchOddsDto(odds)
     }
 
-    override fun findBettingBundleInfo(matchIds: List<Long>, studentId: Long): List<BettingBundleInfoDto> =
+    override fun findBettingBundleInfo(matchIds: List<Long>, studentId: Long): List<Betting> =
         queryFactory
-            .select(
-                Projections.constructor(
-                    BettingBundleInfoDto::class.java,
-                    betting.matchId,
-                    Projections.constructor(
-                        BettingInfoDto::class.java,
-                        betting.id,
-                        betting.point,
-                        betting.predictedWinTeamId,
-                    ),
-                    Projections.constructor(
-                        BettingResultInfoDto::class.java,
-                        bettingResult.isPredicted,
-                        bettingResult.earnedPoint
-                    ).`as`("result")
-                )
-            )
-            .from(betting)
+            .selectFrom(betting)
             .leftJoin(bettingResult)
             .on(
                 bettingResult.bettingId.eq(betting.id)