From abb60f574396e70327c346053e30dfc9cc7a07b5 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 25 Jul 2024 21:28:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=95=8C=EB=9E=8C=20-=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EC=8A=AC=EB=A1=AF=20=EA=B0=9C=EC=88=98=EC=99=80=20=EA=B0=80?= =?UTF-8?q?=EA=B2=A9=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/alarm/AlarmController.kt | 24 ++++++++++++++ .../sodalive/alarm/AlarmRepository.kt | 22 +++++++++++++ .../vividnext/sodalive/alarm/AlarmService.kt | 31 +++++++++++++++++++ .../alarm/GetSlotQuantityAndPriceResponse.kt | 3 ++ .../co/vividnext/sodalive/can/use/CanUsage.kt | 3 +- 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmRepository.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt create mode 100644 src/main/kotlin/kr/co/vividnext/sodalive/alarm/GetSlotQuantityAndPriceResponse.kt diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt new file mode 100644 index 0000000..3a630f7 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt @@ -0,0 +1,24 @@ +package kr.co.vividnext.sodalive.alarm + +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.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/alarm") +class AlarmController(private val service: AlarmService) { + @GetMapping + fun getSlotQuantityAndPrice( + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok( + service.getSlotQuantityAndPrice(memberId = member.id!!) + ) + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmRepository.kt new file mode 100644 index 0000000..4d8c86a --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmRepository.kt @@ -0,0 +1,22 @@ +package kr.co.vividnext.sodalive.alarm + +import com.querydsl.jpa.impl.JPAQueryFactory +import kr.co.vividnext.sodalive.can.use.CanUsage +import kr.co.vividnext.sodalive.can.use.QUseCan.useCan +import org.springframework.stereotype.Repository + +@Repository +class AlarmRepository(private val queryFactory: JPAQueryFactory) { + fun getSlotQuantity(memberId: Long): Int { + return queryFactory + .select(useCan.id) + .from(useCan) + .where( + useCan.member.id.eq(memberId) + .and(useCan.isRefund.isFalse) + .and(useCan.canUsage.eq(CanUsage.ALARM_SLOT)) + ) + .fetch() + .size + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt new file mode 100644 index 0000000..c8fe132 --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt @@ -0,0 +1,31 @@ +package kr.co.vividnext.sodalive.alarm + +import org.springframework.stereotype.Service + +@Service +class AlarmService(private val repository: AlarmRepository) { + fun getSlotQuantityAndPrice(memberId: Long): GetSlotQuantityAndPriceResponse { + val slotQuantity = repository.getSlotQuantity(memberId) + + return GetSlotQuantityAndPriceResponse( + slotQuantity = slotQuantity, + price = when (slotQuantity) { + 0 -> { + 30 + } + + 1 -> { + 60 + } + + 2 -> { + 100 + } + + else -> { + 0 + } + } + ) + } +} diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/GetSlotQuantityAndPriceResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/GetSlotQuantityAndPriceResponse.kt new file mode 100644 index 0000000..d4f0f9e --- /dev/null +++ b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/GetSlotQuantityAndPriceResponse.kt @@ -0,0 +1,3 @@ +package kr.co.vividnext.sodalive.alarm + +data class GetSlotQuantityAndPriceResponse(val slotQuantity: Int, val price: Int) 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 9d4f218..667f2b3 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 @@ -6,5 +6,6 @@ enum class CanUsage { CHANGE_NICKNAME, ORDER_CONTENT, SPIN_ROULETTE, - PAID_COMMUNITY_POST + PAID_COMMUNITY_POST, + ALARM_SLOT } -- 2.40.1 From 766d9668c25a83ff170413e9cb5a20c753391ed1 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 25 Jul 2024 21:53:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=95=8C=EB=9E=8C=20-=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EC=8A=AC=EB=A1=AF=20=EA=B5=AC=EB=A7=A4=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/alarm/AlarmController.kt | 17 +++++++++ .../vividnext/sodalive/alarm/AlarmService.kt | 38 ++++++++++++++++++- .../sodalive/can/payment/CanPaymentService.kt | 2 + 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt index 3a630f7..2428b4f 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmController.kt @@ -5,6 +5,8 @@ import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.member.Member 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.RequestMapping import org.springframework.web.bind.annotation.RestController @@ -21,4 +23,19 @@ class AlarmController(private val service: AlarmService) { service.getSlotQuantityAndPrice(memberId = member.id!!) ) } + + @PostMapping("/buy-slot/{container}") + fun buyExtraSlot( + @PathVariable("container") container: String, + @AuthenticationPrincipal(expression = "#this == 'anonymousUser' ? null : member") member: Member? + ) = run { + if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + + ApiResponse.ok( + service.buyExtraSlot( + memberId = member.id!!, + container = container + ) + ) + } } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt index c8fe132..9881eed 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/alarm/AlarmService.kt @@ -1,9 +1,16 @@ package kr.co.vividnext.sodalive.alarm +import kr.co.vividnext.sodalive.can.payment.CanPaymentService +import kr.co.vividnext.sodalive.can.use.CanUsage +import kr.co.vividnext.sodalive.common.SodaException import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional @Service -class AlarmService(private val repository: AlarmRepository) { +class AlarmService( + private val canPaymentService: CanPaymentService, + private val repository: AlarmRepository +) { fun getSlotQuantityAndPrice(memberId: Long): GetSlotQuantityAndPriceResponse { val slotQuantity = repository.getSlotQuantity(memberId) @@ -28,4 +35,33 @@ class AlarmService(private val repository: AlarmRepository) { } ) } + + @Transactional + fun buyExtraSlot(memberId: Long, container: String) { + val slotQuantity = repository.getSlotQuantity(memberId) + val needCan = when (slotQuantity) { + 0 -> { + 30 + } + + 1 -> { + 60 + } + + 2 -> { + 100 + } + + else -> { + throw SodaException("이미 구매하셨습니다") + } + } + + canPaymentService.spendCan( + memberId = memberId, + needCan = needCan, + canUsage = CanUsage.ALARM_SLOT, + container = container + ) + } } 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 e36e8c1..29da205 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 @@ -96,6 +96,8 @@ class CanPaymentService( recipientId = communityPost.member!!.id!! useCan.communityPost = communityPost useCan.member = member + } else if (canUsage == CanUsage.ALARM_SLOT) { + useCan.member = member } else { throw SodaException("잘못된 요청입니다.") } -- 2.40.1 From 4a264d90d4e7e85e4b3668b485e2852b987f1966 Mon Sep 17 00:00:00 2001 From: Klaus Date: Thu, 25 Jul 2024 22:07:43 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=EB=82=B4=EC=97=AD=20-=20?= =?UTF-8?q?=EC=95=8C=EB=9E=8C=20=EC=8A=AC=EB=A1=AF=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EB=82=B4=EC=97=AD=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt | 1 + 1 file changed, 1 insertion(+) 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 b6ed016..bfe03fa 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/CanService.kt @@ -68,6 +68,7 @@ class CanService(private val repository: CanRepository) { } CanUsage.CHANGE_NICKNAME -> "닉네임 변경" + CanUsage.ALARM_SLOT -> "알람 슬롯 구매" CanUsage.ORDER_CONTENT -> "[콘텐츠 구매] ${it.audioContent!!.title}" CanUsage.PAID_COMMUNITY_POST -> "[게시글 보기] ${it.communityPost?.member?.nickname ?: ""}" } -- 2.40.1