From e96b3d9bd4233e824817f37384764987a90f1404 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 28 Nov 2023 14:24:03 +0900 Subject: [PATCH 01/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=83=9D=EC=84=B1/=EC=88=98=EC=A0=95=20API=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roulette/CreateOrUpdateRouletteRequest.kt | 7 ++++ .../sodalive/live/roulette/Roulette.kt | 18 +++++++++ .../live/roulette/RouletteController.kt | 27 +++++++++++++ .../live/roulette/RouletteRepository.kt | 7 ++++ .../sodalive/live/roulette/RouletteService.kt | 39 +++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/CreateOrUpdateRouletteRequest.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/CreateOrUpdateRouletteRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/CreateOrUpdateRouletteRequest.kt new file mode 100644 index 0000000..6f726c9 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/CreateOrUpdateRouletteRequest.kt @@ -0,0 +1,7 @@ +package kr.co.vividnext.sodalive.live.roulette + +data class CreateOrUpdateRouletteRequest( + val can: Int, + val isActive: Boolean, + val items: List +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt new file mode 100644 index 0000000..9784c2c --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt @@ -0,0 +1,18 @@ +package kr.co.vividnext.sodalive.live.roulette + +import org.springframework.data.annotation.Id +import org.springframework.data.redis.core.RedisHash + +@RedisHash("roulette") +data class Roulette( + @Id + val creatorId: Long, + var can: Int, + var isActive: Boolean, + var items: List +) + +data class RouletteItem( + val title: String, + val percentage: Int +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt new file mode 100644 index 0000000..b4c84c4 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -0,0 +1,27 @@ +package kr.co.vividnext.sodalive.live.roulette + +import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.member.Member +import kr.co.vividnext.sodalive.member.MemberRole +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/roulette") +class RouletteController(private val service: RouletteService) { + @PostMapping + fun createOrUpdateRoulette( + @RequestBody request: CreateOrUpdateRouletteRequest, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null || member.role != MemberRole.CREATOR) { + throw SodaException("로그인 정보를 확인해주세요.") + } + + ApiResponse.ok(service.createOrUpdateRoulette(memberId = member.id!!, request = request)) + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt new file mode 100644 index 0000000..fbdf7c7 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt @@ -0,0 +1,7 @@ +package kr.co.vividnext.sodalive.live.roulette + +import org.springframework.data.repository.CrudRepository +import org.springframework.stereotype.Repository + +@Repository +interface RouletteRepository : CrudRepository diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt new file mode 100644 index 0000000..6939703 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -0,0 +1,39 @@ +package kr.co.vividnext.sodalive.live.roulette + +import kr.co.vividnext.sodalive.common.SodaException +import org.springframework.data.repository.findByIdOrNull +import org.springframework.stereotype.Service + +@Service +class RouletteService(private val repository: RouletteRepository) { + fun createOrUpdateRoulette(memberId: Long, request: CreateOrUpdateRouletteRequest) { + rouletteValidate(request) + + val roulette = repository.findByIdOrNull(id = memberId) ?: Roulette( + creatorId = memberId, + can = request.can, + isActive = request.isActive, + items = request.items + ) + + repository.save(roulette) + } + + private fun rouletteValidate(request: CreateOrUpdateRouletteRequest) { + if (request.can < 5) { + throw SodaException("룰렛 금액은 최소 5캔 입니다.") + } + + if (request.items.size < 2 || request.items.size > 6) { + throw SodaException("룰렛 옵션은 최소 2개, 최대 6개까지 설정할 수 있습니다.") + } + + val percentage = request.items.asSequence() + .map { it.percentage } + .reduce { acc, percentage -> acc + percentage } + + if (percentage != 100) { + throw SodaException("옵션 확률의 합이 100%가 아닙니다.") + } + } +} From 516853b05ff758633b5b8ffeeb26e9527ce3e86a Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 28 Nov 2023 15:21:50 +0900 Subject: [PATCH 02/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=9D=BD=EA=B8=B0=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/roulette/GetRouletteResponse.kt | 6 ++++++ .../sodalive/live/roulette/RouletteController.kt | 15 +++++++++++++++ .../sodalive/live/roulette/RouletteService.kt | 10 ++++++++++ 3 files changed, 31 insertions(+) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt new file mode 100644 index 0000000..a0e6e48 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt @@ -0,0 +1,6 @@ +package kr.co.vividnext.sodalive.live.roulette + +data class GetRouletteResponse( + val can: Int, + val items: List +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt index b4c84c4..f7ec72f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -5,9 +5,11 @@ import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.MemberRole import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @RestController @@ -24,4 +26,17 @@ class RouletteController(private val service: RouletteService) { ApiResponse.ok(service.createOrUpdateRoulette(memberId = member.id!!, request = request)) } + + @GetMapping + fun getRoulette( + @RequestParam creatorId: Long, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ): ApiResponse { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + val response = service.getRoulette(creatorId = creatorId) + ?: throw SodaException("룰렛을 사용할 수 없습니다.") + + return ApiResponse.ok(response) + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 6939703..866a090 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -36,4 +36,14 @@ class RouletteService(private val repository: RouletteRepository) { throw SodaException("옵션 확률의 합이 100%가 아닙니다.") } } + + fun getRoulette(creatorId: Long): GetRouletteResponse? { + val roulette = repository.findByIdOrNull(id = creatorId) + + if (roulette == null || !roulette.isActive || roulette.items.isEmpty()) { + return null + } + + return GetRouletteResponse(can = roulette.can, items = roulette.items) + } } From 0d2e0a1af8e63c5fdf170f8562e992d725403ce7 Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 28 Nov 2023 16:07:07 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EB=8F=8C=EB=A6=AC?= =?UTF-8?q?=EA=B8=B0=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/vividnext/sodalive/can/CanService.kt | 2 +- .../co/vividnext/sodalive/can/use/CanUsage.kt | 3 +- .../live/roulette/RouletteController.kt | 10 ++++ .../sodalive/live/roulette/RouletteService.kt | 55 ++++++++++++++++++- .../live/roulette/SpinRouletteRequest.kt | 6 ++ 5 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/SpinRouletteRequest.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt index ea1fe34..1c0ca4b 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt @@ -53,7 +53,7 @@ class CanService(private val repository: CanRepository) { } .map { val title: String = when (it.canUsage) { - CanUsage.DONATION -> { + CanUsage.DONATION, CanUsage.SPIN_ROULETTE -> { if (it.room != null) { "[라이브 후원] ${it.room!!.member!!.nickname}" } else if (it.audioContent != null) { diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/use/CanUsage.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/use/CanUsage.kt index 5e53fdc..58bbde9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/use/CanUsage.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/use/CanUsage.kt @@ -4,5 +4,6 @@ enum class CanUsage { LIVE, DONATION, CHANGE_NICKNAME, - ORDER_CONTENT + ORDER_CONTENT, + SPIN_ROULETTE } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt index f7ec72f..69dd64d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -39,4 +39,14 @@ class RouletteController(private val service: RouletteService) { return ApiResponse.ok(response) } + + @PostMapping("/spin") + fun spinRoulette( + @RequestBody request: SpinRouletteRequest, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.spinRoulette(request = request, memberId = member.id!!)) + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 866a090..4a90880 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -1,11 +1,24 @@ package kr.co.vividnext.sodalive.live.roulette +import kr.co.vividnext.sodalive.can.payment.CanPaymentService +import kr.co.vividnext.sodalive.can.use.CanUsage import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.live.room.LiveRoomRepository +import kr.co.vividnext.sodalive.member.MemberRole import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import java.util.concurrent.locks.ReentrantReadWriteLock +import kotlin.concurrent.write @Service -class RouletteService(private val repository: RouletteRepository) { +class RouletteService( + private val canPaymentService: CanPaymentService, + private val repository: RouletteRepository, + private val roomRepository: LiveRoomRepository +) { + private val tokenLocks: MutableMap = mutableMapOf() + fun createOrUpdateRoulette(memberId: Long, request: CreateOrUpdateRouletteRequest) { rouletteValidate(request) @@ -16,7 +29,10 @@ class RouletteService(private val repository: RouletteRepository) { items = request.items ) - repository.save(roulette) + val lock = getOrCreateLock(memberId = memberId) + lock.write { + repository.save(roulette) + } } private fun rouletteValidate(request: CreateOrUpdateRouletteRequest) { @@ -46,4 +62,39 @@ class RouletteService(private val repository: RouletteRepository) { return GetRouletteResponse(can = roulette.can, items = roulette.items) } + + @Transactional + fun spinRoulette(request: SpinRouletteRequest, memberId: Long): GetRouletteResponse { + // STEP 1 - 라이브 정보 가져오기 + val room = roomRepository.findByIdOrNull(request.roomId) + ?: throw SodaException("해당하는 라이브가 없습니다.") + + val host = room.member ?: throw SodaException("잘못된 요청입니다.") + + if (host.role != MemberRole.CREATOR) { + throw SodaException("비비드넥스트와 계약한\n크리에이터에게만 후원을 하실 수 있습니다.") + } + + // STEP 2 - 룰렛 데이터 가져오기 + val roulette = repository.findByIdOrNull(id = host.id!!) + + if (roulette == null || !roulette.isActive || roulette.items.isEmpty()) { + throw SodaException("룰렛을 사용할 수 없습니다.") + } + + // STEP 3 - 캔 사용 + canPaymentService.spendCan( + memberId = memberId, + needCan = roulette.can, + canUsage = CanUsage.SPIN_ROULETTE, + liveRoom = room, + container = request.container + ) + + return GetRouletteResponse(can = roulette.can, items = roulette.items) + } + + private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { + return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() } + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/SpinRouletteRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/SpinRouletteRequest.kt new file mode 100644 index 0000000..2cdbfa5 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/SpinRouletteRequest.kt @@ -0,0 +1,6 @@ +package kr.co.vividnext.sodalive.live.roulette + +data class SpinRouletteRequest( + val roomId: Long, + val container: String +) From 0e8d3656b2e9e9209de81ca889b3867f229ce2ec Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 29 Nov 2023 19:46:26 +0900 Subject: [PATCH 04/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EA=B0=80=EC=A0=B8?= =?UTF-8?q?=20=EC=98=A4=EA=B8=B0=20API=20-=20isActive=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/live/roulette/GetRouletteResponse.kt | 1 + .../co/vividnext/sodalive/live/roulette/RouletteController.kt | 4 +++- .../kr/co/vividnext/sodalive/live/roulette/RouletteService.kt | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt index a0e6e48..8b08ce5 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/GetRouletteResponse.kt @@ -2,5 +2,6 @@ package kr.co.vividnext.sodalive.live.roulette data class GetRouletteResponse( val can: Int, + val isActive: Boolean, val items: List ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt index 69dd64d..29df13a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -35,7 +35,9 @@ class RouletteController(private val service: RouletteService) { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") val response = service.getRoulette(creatorId = creatorId) - ?: throw SodaException("룰렛을 사용할 수 없습니다.") + if (response == null && creatorId != member.id!!) { + throw SodaException("룰렛을 사용할 수 없습니다.") + } return ApiResponse.ok(response) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 4a90880..9c1460e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -60,7 +60,7 @@ class RouletteService( return null } - return GetRouletteResponse(can = roulette.can, items = roulette.items) + return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) } @Transactional @@ -91,7 +91,7 @@ class RouletteService( container = request.container ) - return GetRouletteResponse(can = roulette.can, items = roulette.items) + return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) } private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { From 382364b5dfcdcb79fe999edda59ba9452b99b8e6 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 1 Dec 2023 00:12:58 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=98=B5=EC=85=98?= =?UTF-8?q?=20=EC=A0=80=EC=9E=A5=20-=20percentage(=ED=8D=BC=EC=84=BC?= =?UTF-8?q?=ED=8A=B8)=20->=20weight(=EA=B0=80=EC=A4=91=EC=B9=98)=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/roulette/Roulette.kt | 2 +- .../vividnext/sodalive/live/roulette/RouletteService.kt | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt index 9784c2c..0a13e61 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt @@ -14,5 +14,5 @@ data class Roulette( data class RouletteItem( val title: String, - val percentage: Int + val weight: Int ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 9c1460e..9eece76 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -43,14 +43,6 @@ class RouletteService( if (request.items.size < 2 || request.items.size > 6) { throw SodaException("룰렛 옵션은 최소 2개, 최대 6개까지 설정할 수 있습니다.") } - - val percentage = request.items.asSequence() - .map { it.percentage } - .reduce { acc, percentage -> acc + percentage } - - if (percentage != 100) { - throw SodaException("옵션 확률의 합이 100%가 아닙니다.") - } } fun getRoulette(creatorId: Long): GetRouletteResponse? { From aeed1dbd06707c1634c0157903a9df60d6af05fb Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 1 Dec 2023 02:36:29 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=20API,=20=EB=A3=B0=EB=A0=9B=20=EA=B0=80=EC=A0=B8=EC=98=A4?= =?UTF-8?q?=EA=B8=B0=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/roulette/Roulette.kt | 2 +- .../live/roulette/RouletteController.kt | 7 +-- .../sodalive/live/roulette/RouletteService.kt | 48 ++++++++++--------- 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt index 0a13e61..560e44c 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt @@ -9,7 +9,7 @@ data class Roulette( val creatorId: Long, var can: Int, var isActive: Boolean, - var items: List + var items: List = mutableListOf() ) data class RouletteItem( diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt index 29df13a..979bee4 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -34,12 +34,7 @@ class RouletteController(private val service: RouletteService) { ): ApiResponse { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - val response = service.getRoulette(creatorId = creatorId) - if (response == null && creatorId != member.id!!) { - throw SodaException("룰렛을 사용할 수 없습니다.") - } - - return ApiResponse.ok(response) + return ApiResponse.ok(service.getRoulette(creatorId = creatorId, memberId = member.id!!)) } @PostMapping("/spin") diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 9eece76..0dceae6 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -8,8 +8,6 @@ import kr.co.vividnext.sodalive.member.MemberRole import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional -import java.util.concurrent.locks.ReentrantReadWriteLock -import kotlin.concurrent.write @Service class RouletteService( @@ -17,22 +15,26 @@ class RouletteService( private val repository: RouletteRepository, private val roomRepository: LiveRoomRepository ) { - private val tokenLocks: MutableMap = mutableMapOf() - - fun createOrUpdateRoulette(memberId: Long, request: CreateOrUpdateRouletteRequest) { + fun createOrUpdateRoulette(memberId: Long, request: CreateOrUpdateRouletteRequest): Boolean { rouletteValidate(request) - val roulette = repository.findByIdOrNull(id = memberId) ?: Roulette( - creatorId = memberId, - can = request.can, - isActive = request.isActive, - items = request.items - ) - - val lock = getOrCreateLock(memberId = memberId) - lock.write { - repository.save(roulette) + var roulette = repository.findByIdOrNull(id = memberId) + if (roulette != null) { + roulette.can = request.can + roulette.isActive = request.isActive + roulette.items = request.items + } else { + roulette = Roulette( + creatorId = memberId, + can = request.can, + isActive = request.isActive, + items = request.items + ) } + + repository.save(roulette) + + return request.isActive } private fun rouletteValidate(request: CreateOrUpdateRouletteRequest) { @@ -45,14 +47,18 @@ class RouletteService( } } - fun getRoulette(creatorId: Long): GetRouletteResponse? { + fun getRoulette(creatorId: Long, memberId: Long): GetRouletteResponse? { val roulette = repository.findByIdOrNull(id = creatorId) - if (roulette == null || !roulette.isActive || roulette.items.isEmpty()) { - return null + if (creatorId != memberId && (roulette == null || !roulette.isActive || roulette.items.isEmpty())) { + throw SodaException("룰렛을 사용할 수 없습니다.") } - return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) + return GetRouletteResponse( + can = roulette?.can ?: 5, + isActive = roulette?.isActive ?: false, + items = roulette?.items ?: listOf() + ) } @Transactional @@ -85,8 +91,4 @@ class RouletteService( return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) } - - private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { - return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() } - } } From cae9f22e497528292b66558091d2c6d98342900f Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 1 Dec 2023 03:16:50 +0900 Subject: [PATCH 07/12] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20-=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20=EB=A3=B0=EB=A0=9B=20=EB=B9=84=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/room/LiveRoomService.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt index 98c1efd..e85f20e 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt @@ -39,6 +39,7 @@ import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository import kr.co.vividnext.sodalive.live.room.info.LiveRoomMember import kr.co.vividnext.sodalive.live.room.kickout.LiveRoomKickOutService import kr.co.vividnext.sodalive.live.room.visit.LiveRoomVisitService +import kr.co.vividnext.sodalive.live.roulette.RouletteRepository import kr.co.vividnext.sodalive.live.tag.LiveTagRepository import kr.co.vividnext.sodalive.member.Gender import kr.co.vividnext.sodalive.member.Member @@ -65,6 +66,7 @@ import kotlin.concurrent.write @Transactional(readOnly = true) class LiveRoomService( private val repository: LiveRoomRepository, + private val rouletteRepository: RouletteRepository, private val roomInfoRepository: LiveRoomInfoRedisRepository, private val roomCancelRepository: LiveRoomCancelRepository, private val kickOutService: LiveRoomKickOutService, @@ -981,6 +983,12 @@ class LiveRoomService( room.isActive = false kickOutService.deleteKickOutData(roomId = room.id!!) roomInfoRepository.deleteById(roomInfo.roomId) + + val roulette = rouletteRepository.findByIdOrNull(member.id!!) + if (roulette != null) { + roulette.isActive = false + rouletteRepository.save(roulette) + } } else { roomInfo.removeSpeaker(member) roomInfo.removeListener(member) From 6b90f42a0e3eecc8b750100a5d5dc8266da9ce62 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 1 Dec 2023 17:29:11 +0900 Subject: [PATCH 08/12] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=B0=A9?= =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20-=20=EB=A3=B0=EB=A0=9B=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/room/LiveRoomService.kt | 5 ++++- .../vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt index e85f20e..be21081 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomService.kt @@ -662,6 +662,8 @@ class LiveRoomService( .getNotificationUserIds(room.member!!.id!!) .contains(member.id) + val isActiveRoulette = rouletteRepository.findByIdOrNull(room.member!!.id!!)?.isActive ?: false + val donationRankingTop3UserIds = if (room.member!!.isVisibleDonationRank) { explorerQueryRepository .getMemberDonationRanking( @@ -712,7 +714,8 @@ class LiveRoomService( managerList = roomInfo.managerList, donationRankingTop3UserIds = donationRankingTop3UserIds, isPrivateRoom = room.type == LiveRoomType.PRIVATE, - password = room.password + password = room.password, + isActiveRoulette = isActiveRoulette ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt index 04c04f9..fd0de33 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/GetRoomInfoResponse.kt @@ -20,5 +20,6 @@ data class GetRoomInfoResponse( val managerList: List, val donationRankingTop3UserIds: List, val isPrivateRoom: Boolean = false, - val password: String? = null + val password: String? = null, + val isActiveRoulette: Boolean = false ) From b5e6176885070a0385abfa8e3054a9f0ce8b77f8 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 2 Dec 2023 04:31:03 +0900 Subject: [PATCH 09/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EB=8F=8C=EB=A6=AC?= =?UTF-8?q?=EA=B8=B0=20-=20=EC=BA=94=20=EC=82=AC=EC=9A=A9=EC=B2=98?= =?UTF-8?q?=EA=B0=80=20=EC=A0=95=ED=99=95=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=95=84=20=EC=83=9D=EA=B8=B0=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt index adfcccb..976e7c8 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt @@ -86,6 +86,10 @@ class CanPaymentService( recipientId = audioContent.member!!.id!! useCan.audioContent = audioContent useCan.member = member + } else if (canUsage == CanUsage.SPIN_ROULETTE && liveRoom != null) { + recipientId = liveRoom.member!!.id!! + useCan.room = liveRoom + useCan.member = member } else { throw SodaException("잘못된 요청입니다.") } From 612ca02461ced7f3497010529d291ae83243e5ca Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 2 Dec 2023 04:51:59 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=ED=9B=84=EC=9B=90=20=EB=9E=AD=ED=82=B9=20API=20-?= =?UTF-8?q?=20=EB=A3=B0=EB=A0=9B=20=ED=9B=84=EC=9B=90=EB=8F=84=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt index df04a37..2019140 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt @@ -183,7 +183,7 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L .groupBy(useCan.member) .where( useCan.room.id.eq(roomId) - .and(useCan.canUsage.eq(CanUsage.DONATION)) + .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE))) .and(useCan.isRefund.isFalse) ) .orderBy(useCan.can.sum().add(useCan.rewardCan.sum()).desc()) From 7badf857cb08ae6a97bdb1afe35fd027c098975e Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 2 Dec 2023 05:01:58 +0900 Subject: [PATCH 11/12] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EB=8F=8C=EB=A6=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=8B=A4=ED=8C=A8=EC=8B=9C=20=EC=BA=94=20=ED=99=98?= =?UTF-8?q?=EB=B6=88=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/roulette/RouletteController.kt | 11 ++++ .../sodalive/live/roulette/RouletteService.kt | 55 ++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt index 979bee4..06e48da 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt @@ -6,6 +6,7 @@ import kr.co.vividnext.sodalive.member.Member import kr.co.vividnext.sodalive.member.MemberRole import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping @@ -46,4 +47,14 @@ class RouletteController(private val service: RouletteService) { ApiResponse.ok(service.spinRoulette(request = request, memberId = member.id!!)) } + + @PostMapping("/refund/{id}") + fun refundDonation( + @PathVariable id: Long, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.refundDonation(id, member)) + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt index 0dceae6..f45059a 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt @@ -1,9 +1,20 @@ package kr.co.vividnext.sodalive.live.roulette +import kr.co.vividnext.sodalive.can.CanRepository +import kr.co.vividnext.sodalive.can.charge.Charge +import kr.co.vividnext.sodalive.can.charge.ChargeRepository +import kr.co.vividnext.sodalive.can.charge.ChargeStatus import kr.co.vividnext.sodalive.can.payment.CanPaymentService +import kr.co.vividnext.sodalive.can.payment.Payment +import kr.co.vividnext.sodalive.can.payment.PaymentGateway +import kr.co.vividnext.sodalive.can.payment.PaymentStatus import kr.co.vividnext.sodalive.can.use.CanUsage +import kr.co.vividnext.sodalive.can.use.UseCanCalculateRepository +import kr.co.vividnext.sodalive.can.use.UseCanCalculateStatus import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.live.room.LiveRoomRepository +import kr.co.vividnext.sodalive.member.Member +import kr.co.vividnext.sodalive.member.MemberRepository import kr.co.vividnext.sodalive.member.MemberRole import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service @@ -12,8 +23,13 @@ import org.springframework.transaction.annotation.Transactional @Service class RouletteService( private val canPaymentService: CanPaymentService, + + private val canRepository: CanRepository, private val repository: RouletteRepository, - private val roomRepository: LiveRoomRepository + private val chargeRepository: ChargeRepository, + private val roomRepository: LiveRoomRepository, + private val memberRepository: MemberRepository, + private val useCanCalculateRepository: UseCanCalculateRepository ) { fun createOrUpdateRoulette(memberId: Long, request: CreateOrUpdateRouletteRequest): Boolean { rouletteValidate(request) @@ -91,4 +107,41 @@ class RouletteService( return GetRouletteResponse(can = roulette.can, isActive = roulette.isActive, items = roulette.items) } + + @Transactional + fun refundDonation(roomId: Long, member: Member) { + val donator = memberRepository.findByIdOrNull(member.id) + ?: throw SodaException("룰렛 돌리기에 실패한 캔이 환불되지 않았습니다\n고객센터로 문의해주세요.") + + val useCan = canRepository.getCanUsedForLiveRoomNotRefund( + memberId = member.id!!, + roomId = roomId, + canUsage = CanUsage.SPIN_ROULETTE + ) ?: throw SodaException("룰렛 돌리기에 실패한 캔이 환불되지 않았습니다\n고객센터로 문의해주세요.") + useCan.isRefund = true + + val useCanCalculates = useCanCalculateRepository.findByUseCanIdAndStatus(useCan.id!!) + useCanCalculates.forEach { + it.status = UseCanCalculateStatus.REFUND + val charge = Charge(0, it.can, status = ChargeStatus.REFUND_CHARGE) + charge.title = "${it.can} 캔" + charge.useCan = useCan + + when (it.paymentGateway) { + PaymentGateway.GOOGLE_IAP -> donator.googleRewardCan += charge.rewardCan + PaymentGateway.APPLE_IAP -> donator.appleRewardCan += charge.rewardCan + else -> donator.pgRewardCan += charge.rewardCan + } + charge.member = donator + + val payment = Payment( + status = PaymentStatus.COMPLETE, + paymentGateway = it.paymentGateway + ) + payment.method = "환불" + charge.payment = payment + + chargeRepository.save(charge) + } + } } From 6ab9871fb956772290034e830701246e0b411517 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 2 Dec 2023 05:10:17 +0900 Subject: [PATCH 12/12] =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=ED=9B=84=EC=9B=90=20=EC=B4=9D=ED=95=A9=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0=20API=20-=20=EB=A3=B0=EB=A0=9B?= =?UTF-8?q?=ED=9B=84=EC=9B=90=EB=8F=84=20=ED=95=A9=EA=B3=84=EC=97=90=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt index 2019140..4b4715f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/LiveRoomRepository.kt @@ -159,7 +159,7 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L .innerJoin(useCan.room, liveRoom) .where( liveRoom.id.eq(roomId) - .and(useCan.canUsage.eq(CanUsage.DONATION)) + .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE))) .and(useCan.isRefund.isFalse) ) .fetchOne()