delete: test set

Author: vumrra

src/main/kotlin/gogo/gogobetting/domain/batch/root/application/BatchServiceImpl.kt

@@ -23,14 +23,14 @@ class BatchServiceImpl(
 ) : BatchService {
 
     override fun batch(matchId: Long, dto: BatchDto) {
-//        val studentId = userUtil.getCurrentStudent().studentId
-//
-//        val isEmptyBetting = batchValidator.valid(matchId, studentId, dto)
-//
-//        if (isEmptyBetting) {
-//            batchProcessor.emptyBettingBatch(matchId, dto, studentId, isEmptyBetting)
-//            return
-//        }
+        val studentId = userUtil.getCurrentStudent().studentId
+
+        val isEmptyBetting = batchValidator.valid(matchId, studentId, dto)
+
+        if (isEmptyBetting) {
+            batchProcessor.emptyBettingBatch(matchId, dto, studentId, isEmptyBetting)
+            return
+        }
 
         val bettingOdds = batchReader.readBettingOdds(matchId, dto.winTeamId)
 

src/main/kotlin/gogo/gogobetting/global/config/SecurityConfig.kt

@@ -58,8 +58,7 @@ class SecurityConfig(
             httpRequests.requestMatchers(HttpMethod.POST, "/betting/{match_id}").hasAnyRole(Authority.USER.name, Authority.STAFF.name)
 
             // batch
-//            httpRequests.requestMatchers(HttpMethod.POST, "/betting/batch/{match_id}").hasAnyRole(Authority.USER.name, Authority.STAFF.name)
-            httpRequests.requestMatchers(HttpMethod.POST, "/betting/batch/{match_id}").permitAll()
+            httpRequests.requestMatchers(HttpMethod.POST, "/betting/batch/{match_id}").hasAnyRole(Authority.USER.name, Authority.STAFF.name)
             httpRequests.requestMatchers(HttpMethod.POST, "/betting/batch/cancel/{match_id}").hasAnyRole(Authority.USER.name, Authority.STAFF.name)
 
             // server to server

src/main/kotlin/gogo/gogobetting/infra/batch/service/BettingResultWriter.kt

@@ -2,6 +2,8 @@ package gogo.gogobetting.infra.batch.service
 
 import gogo.gogobetting.domain.batch.detail.persistence.BatchDetail
 import gogo.gogobetting.domain.batch.detail.persistence.BatchDetailRepository
+import gogo.gogobetting.domain.batch.root.event.MatchBatchEvent
+import gogo.gogobetting.domain.batch.root.event.StudentBettingDto
 import gogo.gogobetting.domain.batch.root.persistence.BatchRepository
 import gogo.gogobetting.domain.betting.result.persistence.BettingResultTable
 import gogo.gogobetting.domain.betting.root.persistence.BettingRepository
@@ -21,6 +23,7 @@ import org.springframework.batch.item.ItemWriter
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
+import java.util.*
 import javax.sql.DataSource
 import kotlin.math.ceil
 
@@ -86,23 +89,23 @@ class BettingResultWriter(
             )
         )
 
-//        val successList = accumulated.filter { it.isPredicted }
-//            .map {
-//                val studentId = bettingRepository.findByIdOrNull(it.bettingId)!!.studentId
-//                StudentBettingDto(studentId, it.earnedPoint)
-//            }
-//
-//        val event = MatchBatchEvent(
-//            id = UUID.randomUUID().toString(),
-//            batchId = batchId,
-//            matchId = matchId,
-//            victoryTeamId = winTeamId,
-//            aTeamScore = aTeamScore,
-//            bTeamScore = bTeamScore,
-//            students = successList
-//        )
-//
-//        log.info("published betting batch application event: {}", event.id)
-//        batchPublisher.publishBettingBatchEvent(event)
+        val successList = accumulated.filter { it.isPredicted }
+            .map {
+                val studentId = bettingRepository.findByIdOrNull(it.bettingId)!!.studentId
+                StudentBettingDto(studentId, it.earnedPoint)
+            }
+
+        val event = MatchBatchEvent(
+            id = UUID.randomUUID().toString(),
+            batchId = batchId,
+            matchId = matchId,
+            victoryTeamId = winTeamId,
+            aTeamScore = aTeamScore,
+            bTeamScore = bTeamScore,
+            students = successList
+        )
+
+        log.info("published betting batch application event: {}", event.id)
+        batchPublisher.publishBettingBatchEvent(event)
     }
 }