From e6dec42a00390f4552b05539508f534ebcece96a Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 8 May 2024 20:22:47 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/roulette/NewRouletteService.kt | 22 +-- .../live/roulette/RouletteController.kt | 60 ------- .../live/roulette/RouletteRepository.kt | 7 - .../sodalive/live/roulette/RouletteService.kt | 147 ------------------ .../live/roulette/v2/RouletteController.kt | 8 + .../live/roulette/v2/RouletteRepository.kt | 8 + .../live/roulette/v2/RouletteService.kt | 6 + 7 files changed, 23 insertions(+), 235 deletions(-) delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt index fc669e1..8d9b176 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRouletteService.kt @@ -27,7 +27,6 @@ class NewRouletteService( private val canRepository: CanRepository, private val repository: NewRouletteRepository, - private val oldRepository: RouletteRepository, private val roomRepository: LiveRoomRepository, private val memberRepository: MemberRepository, private val chargeRepository: ChargeRepository, @@ -36,27 +35,9 @@ class NewRouletteService( fun getAllRoulette(creatorId: Long, memberId: Long): List { if (creatorId != memberId) throw SodaException("잘못된 요청입니다.") - var rouletteList = repository.findByCreatorId(creatorId) - if (rouletteList.isEmpty()) { - val roulette = oldRepository.findByIdOrNull(creatorId) - if (roulette != null) { - repository.save( - NewRoulette( - id = idGenerator.generateId(SEQUENCE_NAME), - creatorId = creatorId, - can = roulette.can, - isActive = false, - items = roulette.items - ) - ) - - rouletteList = repository.findByCreatorId(creatorId) - oldRepository.deleteById(roulette.creatorId) - } - } + val rouletteList = repository.findByCreatorId(creatorId) return rouletteList.sortedBy { it.id } - .asSequence() .map { GetNewRouletteResponse( it.id, @@ -65,7 +46,6 @@ class NewRouletteService( it.items ) } - .toList() } fun createRoulette(memberId: Long, request: CreateNewRouletteRequest): Boolean { 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 deleted file mode 100644 index 06e48da..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteController.kt +++ /dev/null @@ -1,60 +0,0 @@ -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.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 -import org.springframework.web.bind.annotation.RequestParam -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)) - } - - @GetMapping - fun getRoulette( - @RequestParam creatorId: Long, - @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? - ): ApiResponse { - if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - - return ApiResponse.ok(service.getRoulette(creatorId = creatorId, memberId = member.id!!)) - } - - @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!!)) - } - - @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/RouletteRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt deleted file mode 100644 index fbdf7c7..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteRepository.kt +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index d3826e4..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/RouletteService.kt +++ /dev/null @@ -1,147 +0,0 @@ -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 -import org.springframework.transaction.annotation.Transactional - -@Service -class RouletteService( - private val canPaymentService: CanPaymentService, - - private val canRepository: CanRepository, - private val repository: RouletteRepository, - 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) - - 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) { - if (request.can < 5) { - throw SodaException("룰렛 금액은 최소 5캔 입니다.") - } - - if (request.items.size < 2 || request.items.size > 10) { - throw SodaException("룰렛 옵션은 최소 2개, 최대 10개까지 설정할 수 있습니다.") - } - } - - fun getRoulette(creatorId: Long, memberId: Long): GetRouletteResponse? { - val roulette = repository.findByIdOrNull(id = creatorId) - - if (creatorId != memberId && (roulette == null || !roulette.isActive || roulette.items.isEmpty())) { - throw SodaException("룰렛을 사용할 수 없습니다.") - } - - return GetRouletteResponse( - can = roulette?.can ?: 0, - isActive = roulette?.isActive ?: false, - items = roulette?.items ?: listOf() - ) - } - - @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, 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) - } - } -} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt new file mode 100644 index 0000000..d26521f --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt @@ -0,0 +1,8 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/roulette") +class RouletteController(private val service: RouletteService) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt new file mode 100644 index 0000000..202b47c --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt @@ -0,0 +1,8 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import kr.co.vividnext.sodalive.live.roulette.NewRoulette +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/v2/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt new file mode 100644 index 0000000..3f28978 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt @@ -0,0 +1,6 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import org.springframework.stereotype.Service + +@Service +class RouletteService From 4f778184065586645c0a2283214a97cdc53660ef Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 8 May 2024 22:25:16 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20RouletteItem=20=EC=97=90=20percentage(?= =?UTF-8?q?=ED=99=95=EB=A5=A0)=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/NewRoulette.kt | 6 +++++ .../sodalive/live/roulette/Roulette.kt | 18 --------------- .../live/roulette/v2/RouletteController.kt | 22 +++++++++++++++++-- .../live/roulette/v2/RouletteRepository.kt | 4 +++- .../live/roulette/v2/RouletteService.kt | 22 ++++++++++++++++++- 5 files changed, 50 insertions(+), 22 deletions(-) delete mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt index 262bf40..d99afa2 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt @@ -14,3 +14,9 @@ data class NewRoulette( var isActive: Boolean, var items: List = mutableListOf() ) + +data class RouletteItem( + val title: String, + val weight: Int, + val percentage: Float = 0.0F +) 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 deleted file mode 100644 index 560e44c..0000000 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/Roulette.kt +++ /dev/null @@ -1,18 +0,0 @@ -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 = mutableListOf() -) - -data class RouletteItem( - val title: String, - val weight: Int -) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt index d26521f..9daecf1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt @@ -1,8 +1,26 @@ package kr.co.vividnext.sodalive.live.roulette.v2 +import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.member.Member +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RestController @RestController -@RequestMapping("/roulette") -class RouletteController(private val service: RouletteService) +@RequestMapping("/v2/roulette") +class RouletteController(private val service: RouletteService) { + @GetMapping("/creator") + @PreAuthorize("hasRole('CREATOR')") + fun getAllRoulette( + @RequestParam creatorId: Long, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.getAllRoulette(creatorId = creatorId, memberId = member.id!!)) + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt index 202b47c..8755bdf 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteRepository.kt @@ -5,4 +5,6 @@ import org.springframework.data.repository.CrudRepository import org.springframework.stereotype.Repository @Repository -interface RouletteRepository : CrudRepository +interface RouletteRepository : CrudRepository { + fun findByCreatorId(creatorId: Long): List +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt index 3f28978..8f60bac 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt @@ -1,6 +1,26 @@ package kr.co.vividnext.sodalive.live.roulette.v2 +import kr.co.vividnext.sodalive.common.SodaException +import kr.co.vividnext.sodalive.live.roulette.GetNewRouletteResponse import org.springframework.stereotype.Service @Service -class RouletteService +class RouletteService( + private val repository: RouletteRepository +) { + fun getAllRoulette(creatorId: Long, memberId: Long): List { + if (creatorId != memberId) throw SodaException("잘못된 요청입니다.") + + val rouletteList = repository.findByCreatorId(creatorId) + + return rouletteList.sortedBy { it.id } + .map { + GetNewRouletteResponse( + it.id, + it.can, + it.isActive, + it.items + ) + } + } +} From 985e5e2bea4bcdbcac924027a69132af7d8a9b1c Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 9 May 2024 00:49:28 +0900 Subject: [PATCH 3/6] =?UTF-8?q?RouletteItem=20=EC=97=90=20percentage(?= =?UTF-8?q?=ED=99=95=EB=A5=A0)=20=EA=B8=B0=EB=B3=B8=EA=B0=92=200.0=20->=20?= =?UTF-8?q?0.00=EC=9C=BC=EB=A1=9C=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/NewRoulette.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt index d99afa2..35979aa 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/NewRoulette.kt @@ -18,5 +18,5 @@ data class NewRoulette( data class RouletteItem( val title: String, val weight: Int, - val percentage: Float = 0.0F + val percentage: Float = 0.00F ) From 4a6330d016e029111acf994b750bbf37f9eb6bc4 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 10 May 2024 00:19:23 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20-=20=ED=99=95=EB=A5=A0?= =?UTF-8?q?=20=EC=88=98=EB=8F=99=EC=84=A4=EC=A0=95=20=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20-=20=EA=B2=B0=EA=B3=BC=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=8B=A4=ED=96=89=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20=ED=99=9C=EC=84=B1=ED=99=94=20=EB=90=9C=20?= =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EC=A4=91=20=EC=84=A0=ED=83=9D=ED=95=98?= =?UTF-8?q?=EC=97=AC=20=EB=8F=8C=EB=A6=AC=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20=EB=A3=B0=EB=A0=9B=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EB=A5=BC=20=ED=9B=84=EC=9B=90=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=EC=84=9C=20=EB=B3=BC=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/info/LiveRoomInfo.kt | 12 + .../roulette/v2/CreateRouletteRequestV2.kt | 9 + .../live/roulette/v2/GetRouletteResponseV2.kt | 10 + .../live/roulette/v2/RouletteController.kt | 61 +++++ .../live/roulette/v2/RouletteService.kt | 241 +++++++++++++++++- .../live/roulette/v2/SpinRouletteRequestV2.kt | 7 + .../live/roulette/v2/SpinRouletteResponse.kt | 9 + .../roulette/v2/UpdateRouletteRequestV2.kt | 10 + 8 files changed, 348 insertions(+), 11 deletions(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/CreateRouletteRequestV2.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/GetRouletteResponseV2.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteRequestV2.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteResponse.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/UpdateRouletteRequestV2.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfo.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfo.kt index 7bb3ca9..8d19de1 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfo.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/info/LiveRoomInfo.kt @@ -95,6 +95,18 @@ data class LiveRoomInfo( donationMessageList = donationMessageSet.toList() } + fun addRouletteMessage(nickname: String, donationMessage: String) { + val donationMessageSet = donationMessageList.toMutableSet() + donationMessageSet.add( + LiveRoomDonationMessage( + nickname = nickname, + canMessage = "", + donationMessage = donationMessage + ) + ) + donationMessageList = donationMessageSet.toList() + } + fun removeDonationMessage(uuid: String) { (donationMessageList as MutableList).removeIf { it.uuid == uuid } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/CreateRouletteRequestV2.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/CreateRouletteRequestV2.kt new file mode 100644 index 0000000..44b1076 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/CreateRouletteRequestV2.kt @@ -0,0 +1,9 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import kr.co.vividnext.sodalive.live.roulette.RouletteItem + +data class CreateRouletteRequestV2( + val can: Int, + val isActive: Boolean, + val items: List +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/GetRouletteResponseV2.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/GetRouletteResponseV2.kt new file mode 100644 index 0000000..e1e0478 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/GetRouletteResponseV2.kt @@ -0,0 +1,10 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import kr.co.vividnext.sodalive.live.roulette.RouletteItem + +data class GetRouletteResponseV2( + val id: Long, + val can: Int, + val isActive: Boolean, + val items: List +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt index 9daecf1..e201430 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteController.kt @@ -3,9 +3,14 @@ package kr.co.vividnext.sodalive.live.roulette.v2 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.access.prepost.PreAuthorize 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.PutMapping +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 @@ -23,4 +28,60 @@ class RouletteController(private val service: RouletteService) { ApiResponse.ok(service.getAllRoulette(creatorId = creatorId, memberId = member.id!!)) } + + @PostMapping + @PreAuthorize("hasRole('CREATOR')") + fun createNewRoulette( + @RequestBody request: CreateRouletteRequestV2, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null || member.role != MemberRole.CREATOR) { + throw SodaException("로그인 정보를 확인해주세요.") + } + + ApiResponse.ok(service.createRoulette(memberId = member.id!!, request = request)) + } + + @PutMapping + @PreAuthorize("hasRole('CREATOR')") + fun updateNewRoulette( + @RequestBody request: UpdateRouletteRequestV2, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null || member.role != MemberRole.CREATOR) { + throw SodaException("로그인 정보를 확인해주세요.") + } + + ApiResponse.ok(service.updateRoulette(memberId = member.id!!, request = request)) + } + + @GetMapping + fun getRoulette( + @RequestParam creatorId: Long, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.getRoulette(creatorId = creatorId, memberId = member.id!!)) + } + + @PostMapping("/spin") + fun spinRoulette( + @RequestBody request: SpinRouletteRequestV2, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok(service.spinRoulette(request = request, member = member)) + } + + @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/v2/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt index 8f60bac..125451d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt @@ -1,26 +1,245 @@ package kr.co.vividnext.sodalive.live.roulette.v2 +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.roulette.GetNewRouletteResponse +import kr.co.vividnext.sodalive.live.room.LiveRoomRepository +import kr.co.vividnext.sodalive.live.room.info.LiveRoomInfoRedisRepository +import kr.co.vividnext.sodalive.live.roulette.NewRoulette +import kr.co.vividnext.sodalive.live.roulette.RedisIdGenerator +import kr.co.vividnext.sodalive.live.roulette.RouletteItem +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 +import org.springframework.transaction.annotation.Transactional +import java.util.concurrent.locks.ReentrantReadWriteLock +import kotlin.concurrent.write +import kotlin.random.Random @Service class RouletteService( - private val repository: RouletteRepository + private val idGenerator: RedisIdGenerator, + private val canPaymentService: CanPaymentService, + + private val canRepository: CanRepository, + private val repository: RouletteRepository, + private val roomRepository: LiveRoomRepository, + private val memberRepository: MemberRepository, + private val chargeRepository: ChargeRepository, + private val roomInfoRepository: LiveRoomInfoRedisRepository, + private val useCanCalculateRepository: UseCanCalculateRepository ) { - fun getAllRoulette(creatorId: Long, memberId: Long): List { + private val tokenLocks: MutableMap = mutableMapOf() + + fun getAllRoulette(creatorId: Long, memberId: Long): List { if (creatorId != memberId) throw SodaException("잘못된 요청입니다.") - val rouletteList = repository.findByCreatorId(creatorId) - - return rouletteList.sortedBy { it.id } + return repository.findByCreatorId(creatorId) + .sortedBy { it.id } .map { - GetNewRouletteResponse( - it.id, - it.can, - it.isActive, - it.items + GetRouletteResponseV2( + id = it.id, + can = it.can, + isActive = it.isActive, + items = it.items ) } } + + fun createRoulette(memberId: Long, request: CreateRouletteRequestV2): Boolean { + rouletteValidate(can = request.can, items = request.items) + + val roulette = NewRoulette( + id = idGenerator.generateId(SEQUENCE_NAME), + creatorId = memberId, + can = request.can, + isActive = request.isActive, + items = request.items + ) + + repository.save(roulette) + return request.isActive + } + + fun updateRoulette(memberId: Long, request: UpdateRouletteRequestV2): Boolean { + rouletteValidate(can = request.can, items = request.items) + + val rouletteList = repository.findByCreatorId(creatorId = memberId) + + if (rouletteList.isEmpty()) { + throw SodaException("잘못된 요청입니다.") + } + + var isActive = false + rouletteList.forEach { + if (request.isActive || it.isActive) { + isActive = true + } + + if (it.id == request.id) { + it.can = request.can + it.items = request.items + it.isActive = request.isActive + repository.save(it) + } else if (request.isActive) { + it.isActive = false + repository.save(it) + } + } + + return isActive + } + + fun getRoulette(creatorId: Long, memberId: Long): List { + val rouletteList = repository.findByCreatorId(creatorId = creatorId) + .filter { it.isActive } + .filter { it.items.isNotEmpty() } + .map { GetRouletteResponseV2(it.id, it.can, it.isActive, it.items) } + + if (rouletteList.isEmpty()) { + throw SodaException("룰렛을 사용할 수 없습니다.") + } + + return rouletteList + } + + @Transactional + fun spinRoulette(request: SpinRouletteRequestV2, member: Member): SpinRouletteResponse { + // 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 = request.rouletteId) + + if (roulette == null || roulette.items.isEmpty()) { + throw SodaException("룰렛을 사용할 수 없습니다.") + } + + // STEP 3 - 캔 사용 + canPaymentService.spendCan( + memberId = member.id!!, + needCan = roulette.can, + canUsage = CanUsage.SPIN_ROULETTE, + liveRoom = room, + container = request.container + ) + + val itemList = roulette.items + val result = randomSelectRouletteItem(itemList = itemList) + + val lock = getOrCreateLock(memberId = member.id!!) + lock.write { + val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!) + ?: throw SodaException("해당하는 라이브의 정보가 없습니다.") + + roomInfo.addRouletteMessage( + nickname = member.nickname, + donationMessage = "[$result] 당첨!" + ) + + roomInfoRepository.save(roomInfo) + } + + return SpinRouletteResponse(can = roulette.can, result = result, items = itemList) + } + + @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) + } + } + + private fun randomSelectRouletteItem(itemList: List): String { + val cumulativeProbabilities = calculateCumulativeProbabilities(itemList) + + val randomValue = Random.nextFloat() + for (i in itemList.indices) { + if (randomValue <= cumulativeProbabilities[i]) { + return itemList[i].title + } + } + + return itemList.random().title + } + + private fun calculateCumulativeProbabilities(items: List): List { + val totalPercent = items.map { it.percentage }.sum() + var cumulativeProbability = 0f + return items.map { + cumulativeProbability += it.percentage / totalPercent + cumulativeProbability + } + } + + private fun rouletteValidate(can: Int, items: List) { + if (can < 5) { + throw SodaException("룰렛 금액은 최소 5캔 입니다.") + } + + if (items.size < 2 || items.size > 10) { + throw SodaException("룰렛 옵션은 최소 2개, 최대 10개까지 설정할 수 있습니다.") + } + + val totalPercentage = items.map { it.percentage }.sum() + if (totalPercentage != 100f) { + throw SodaException("확률이 100%가 아닙니다") + } + } + + private fun getOrCreateLock(memberId: Long): ReentrantReadWriteLock { + return tokenLocks.computeIfAbsent(memberId) { ReentrantReadWriteLock() } + } + + companion object { + const val SEQUENCE_NAME = "newRoulette:sequence" + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteRequestV2.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteRequestV2.kt new file mode 100644 index 0000000..ce89548 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteRequestV2.kt @@ -0,0 +1,7 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +data class SpinRouletteRequestV2( + val roomId: Long, + val rouletteId: Long, + val container: String +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteResponse.kt new file mode 100644 index 0000000..0d4d047 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/SpinRouletteResponse.kt @@ -0,0 +1,9 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import kr.co.vividnext.sodalive.live.roulette.RouletteItem + +data class SpinRouletteResponse( + val can: Int, + val result: String, + val items: List +) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/UpdateRouletteRequestV2.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/UpdateRouletteRequestV2.kt new file mode 100644 index 0000000..0e6b627 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/UpdateRouletteRequestV2.kt @@ -0,0 +1,10 @@ +package kr.co.vividnext.sodalive.live.roulette.v2 + +import kr.co.vividnext.sodalive.live.roulette.RouletteItem + +data class UpdateRouletteRequestV2( + val id: Long, + val can: Int, + val isActive: Boolean, + val items: List +) From 9012dd14e27283d60b8a8506b53a7f20230aa350 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 10 May 2024 00:26:13 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20-=20=EC=97=AC=EB=9F=AC?= =?UTF-8?q?=EA=B0=9C=EA=B0=80=20=EB=8F=99=EC=8B=9C=EC=97=90=20=ED=99=9C?= =?UTF-8?q?=EC=84=B1=ED=99=94=20=EB=90=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?= =?UTF-8?q?=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 --- .../sodalive/live/roulette/v2/RouletteService.kt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt index 125451d..58d6147 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt @@ -81,24 +81,16 @@ class RouletteService( throw SodaException("잘못된 요청입니다.") } - var isActive = false rouletteList.forEach { - if (request.isActive || it.isActive) { - isActive = true - } - if (it.id == request.id) { it.can = request.can it.items = request.items it.isActive = request.isActive repository.save(it) - } else if (request.isActive) { - it.isActive = false - repository.save(it) } } - return isActive + return request.isActive } fun getRoulette(creatorId: Long, memberId: Long): List { From f9a8b431e0122bcb160b9fe538d8bb5c19a960d2 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 10 May 2024 03:41:26 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EB=A3=B0=EB=A0=9B=20=EB=93=B1=EB=A1=9D/?= =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=EB=A3=B0=EB=A0=9B=EC=9D=B4=20?= =?UTF-8?q?=ED=95=9C=20=EA=B0=9C=20=EC=9D=B4=EC=83=81=20=ED=99=9C=EC=84=B1?= =?UTF-8?q?=ED=99=94=20=EB=90=98=EC=96=B4=20=EC=9E=88=EC=9C=BC=EB=A9=B4=20?= =?UTF-8?q?true=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/roulette/v2/RouletteService.kt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt index 58d6147..b8c39e9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/roulette/v2/RouletteService.kt @@ -69,7 +69,17 @@ class RouletteService( ) repository.save(roulette) - return request.isActive + + var activeRoulette = false + val rouletteList = repository.findByCreatorId(creatorId = memberId) + + rouletteList.forEach { + if (request.isActive || it.isActive) { + activeRoulette = true + } + } + + return activeRoulette } fun updateRoulette(memberId: Long, request: UpdateRouletteRequestV2): Boolean { @@ -81,7 +91,12 @@ class RouletteService( throw SodaException("잘못된 요청입니다.") } + var activeRoulette = false rouletteList.forEach { + if (request.isActive || it.isActive) { + activeRoulette = true + } + if (it.id == request.id) { it.can = request.can it.items = request.items @@ -90,7 +105,7 @@ class RouletteService( } } - return request.isActive + return activeRoulette } fun getRoulette(creatorId: Long, memberId: Long): List {