From e373e6ab0f377103fe229f8de072ab794d779a29 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 23 Aug 2024 15:10:34 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90=20-=20=EB=B9=84=EB=B0=80=20=ED=9B=84=EC=9B=90=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 --- .../co/vividnext/sodalive/can/payment/CanPaymentService.kt | 4 +++- src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt | 4 +++- .../kr/co/vividnext/sodalive/live/room/LiveRoomService.kt | 6 ++++-- .../sodalive/live/room/donation/LiveRoomDonationRequest.kt | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) 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 29da205..14479c8 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 @@ -36,6 +36,7 @@ class CanPaymentService( memberId: Long, needCan: Int, canUsage: CanUsage, + isSecret: Boolean = false, liveRoom: LiveRoom? = null, order: Order? = null, audioContent: AudioContent? = null, @@ -65,7 +66,8 @@ class CanPaymentService( val useCan = UseCan( canUsage = canUsage, can = useChargeCan?.total ?: 0, - rewardCan = useRewardCan.total + rewardCan = useRewardCan.total, + isSecret = isSecret ) var recipientId: Long? = null diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt index 916d4b0..31ac687 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/use/UseCan.kt @@ -25,7 +25,9 @@ data class UseCan( val rewardCan: Int, - var isRefund: Boolean = false + var isRefund: Boolean = false, + + val isSecret: Boolean = false ) : BaseEntity() { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "member_id", nullable = false) 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 1d026e0..32b0c0e 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 @@ -1052,11 +1052,12 @@ class LiveRoomService( memberId = member.id!!, needCan = request.can, canUsage = CanUsage.DONATION, + isSecret = request.isSecret, liveRoom = room, container = request.container ) - if (request.message.isNotBlank()) { + if (!request.isSecret && request.message.isNotBlank()) { val lock = getOrCreateLock(memberId = member.id!!) lock.write { val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!) @@ -1095,11 +1096,12 @@ class LiveRoomService( memberId = member.id!!, needCan = request.can, canUsage = CanUsage.DONATION, + isSecret = request.isSecret, liveRoom = room, container = request.container ) - if (request.message.isNotBlank()) { + if (!request.isSecret && request.message.isNotBlank()) { val lock = getOrCreateLock(memberId = member.id!!) lock.write { val roomInfo = roomInfoRepository.findByIdOrNull(room.id!!) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt index 732bd84..9adfdf2 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt @@ -3,6 +3,7 @@ package kr.co.vividnext.sodalive.live.room.donation data class LiveRoomDonationRequest( val roomId: Long, val can: Int, + val isSecret: Boolean, val container: String, val message: String = "" ) From aa682aa10aee31a7160160d7a40121052d8ec853 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 23 Aug 2024 15:14:53 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90=EB=A6=AC=EC=8A=A4=ED=8A=B8,=20=ED=9B=84=EC=9B=90?= =?UTF-8?q?=ED=95=A9=EA=B3=84=20-=20=EB=B9=84=EB=B0=80=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90=EC=9D=80=20=EC=A1=B0=ED=9A=8C=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=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, 2 insertions(+) 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 9b19673..c4aeac8 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 @@ -229,6 +229,7 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L liveRoom.id.eq(roomId) .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE))) .and(useCan.isRefund.isFalse) + .and(useCan.isSecret.isFalse) ) .fetchOne() } @@ -253,6 +254,7 @@ class LiveRoomQueryRepositoryImpl(private val queryFactory: JPAQueryFactory) : L useCan.room.id.eq(roomId) .and(useCan.canUsage.eq(CanUsage.DONATION).or(useCan.canUsage.eq(CanUsage.SPIN_ROULETTE))) .and(useCan.isRefund.isFalse) + .and(useCan.isSecret.isFalse) ) .orderBy(useCan.can.sum().add(useCan.rewardCan.sum()).desc()) .fetch() From ac7b91b7e8e7a84a0815102ee286374ec1d76f57 Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 23 Aug 2024 22:36:24 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=ED=83=90=EC=83=89=20-=20=ED=8A=B9=EC=A0=95?= =?UTF-8?q?=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0=EA=B0=80=20?= =?UTF-8?q?=EB=82=A8=EB=85=80=20=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EC=97=90=20=ED=91=9C=EC=8B=9C=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=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 --- .../co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt index 981139f..766c7fa 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/explorer/ExplorerQueryRepository.kt @@ -198,7 +198,7 @@ class ExplorerQueryRepository( member.role.eq(MemberRole.CREATOR) .and(member.isActive.isTrue) .and(auth.gender.eq(gender)) - .and(member.id.notIn(3, 351, 19209, 8103)) + .and(member.id.notIn(3, 351, 19209, 8103, 19775)) ) .orderBy(caseExpression.asc(), randomExpression) .offset(0) From 3a1db0f595b7738f043644c429cdf8f11f0be83e Mon Sep 17 00:00:00 2001 From: Klaus Date: Fri, 23 Aug 2024 22:43:43 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90=20-=20=EB=B9=84=EB=B0=80=20=ED=9B=84=EC=9B=90=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EC=9E=90=20=EA=B8=B0=EB=B3=B8=EA=B0=92=20fal?= =?UTF-8?q?se=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/donation/LiveRoomDonationRequest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt index 9adfdf2..0d7efac 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationRequest.kt @@ -3,7 +3,7 @@ package kr.co.vividnext.sodalive.live.room.donation data class LiveRoomDonationRequest( val roomId: Long, val can: Int, - val isSecret: Boolean, + val isSecret: Boolean = false, val container: String, val message: String = "" )