From e049e0fa3c4bf27a8c0a54bd07efbac316ec84bf Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 26 May 2025 19:22:42 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9C=A0=EC=A0=80=20=ED=96=89=EB=8F=99?= =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D,=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EC=A7=80=EA=B8=89=20-=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EC=A7=80=EA=B8=89=20=EC=99=84=EB=A3=8C=EC=8B=9C=20=ED=91=B8?= =?UTF-8?q?=EC=8B=9C=20=EB=B3=B4=EB=82=B4=EC=A7=80=20=EC=95=8A=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 --- .../comment/AudioContentCommentController.kt | 11 ++-------- .../sodalive/member/MemberController.kt | 21 +++---------------- .../sodalive/member/auth/AuthController.kt | 7 +------ .../useraction/UserActionController.kt | 13 +++--------- .../sodalive/useraction/UserActionService.kt | 12 +---------- 5 files changed, 10 insertions(+), 54 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt index 593758f..879027d 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/comment/AudioContentCommentController.kt @@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.content.comment 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.MemberService import kr.co.vividnext.sodalive.useraction.ActionType import kr.co.vividnext.sodalive.useraction.UserActionService import org.springframework.data.domain.Pageable @@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController @RestController class AudioContentCommentController( private val service: AudioContentCommentService, - private val memberService: MemberService, private val userActionService: UserActionService ) { @PostMapping("/audio-content/comment") @@ -38,15 +36,11 @@ class AudioContentCommentController( ) try { - val memberId = member.id!! - val pushTokenList = memberService.getPushTokenList(recipient = memberId) - userActionService.recordAction( memberId = member.id!!, isAuth = member.auth != null, actionType = ActionType.CONTENT_COMMENT, - contentCommentId = commentId, - pushTokenList = pushTokenList + contentCommentId = commentId ) userActionService.recordAction( @@ -54,8 +48,7 @@ class AudioContentCommentController( isAuth = member.auth != null, actionType = ActionType.ORDER_CONTENT_COMMENT, contentId = request.contentId, - contentCommentId = commentId, - pushTokenList = pushTokenList + contentCommentId = commentId ) } catch (_: Exception) { } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt index e7cd05b..a2716e0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt @@ -66,12 +66,7 @@ class MemberController( userActionService.recordAction( memberId = response.memberId, isAuth = false, - actionType = ActionType.SIGN_UP, - pushTokenList = if (request.pushToken != null) { - listOf(request.pushToken) - } else { - emptyList() - } + actionType = ActionType.SIGN_UP ) return ApiResponse.ok(message = "회원가입을 축하드립니다.", data = response.loginResponse) @@ -360,12 +355,7 @@ class MemberController( userActionService.recordAction( memberId = response.memberId, isAuth = false, - actionType = ActionType.SIGN_UP, - pushTokenList = if (request.pushToken != null) { - listOf(request.pushToken) - } else { - emptyList() - } + actionType = ActionType.SIGN_UP ) } @@ -396,12 +386,7 @@ class MemberController( userActionService.recordAction( memberId = response.memberId, isAuth = false, - actionType = ActionType.SIGN_UP, - pushTokenList = if (request.pushToken != null) { - listOf(request.pushToken) - } else { - emptyList() - } + actionType = ActionType.SIGN_UP ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthController.kt index 50f8cbb..b5b9298 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/auth/AuthController.kt @@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.member.auth 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.MemberService import kr.co.vividnext.sodalive.useraction.ActionType import kr.co.vividnext.sodalive.useraction.UserActionService import org.springframework.security.core.annotation.AuthenticationPrincipal @@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController @RequestMapping("/auth") class AuthController( private val service: AuthService, - private val memberService: MemberService, private val userActionService: UserActionService ) { @PostMapping @@ -36,13 +34,10 @@ class AuthController( val authResponse = service.authenticate(authenticateData, member.id!!) try { - val memberId = member.id!! - val pushTokenList = memberService.getPushTokenList(recipient = memberId) userActionService.recordAction( memberId = member.id!!, isAuth = true, - actionType = ActionType.USER_AUTHENTICATION, - pushTokenList = pushTokenList + actionType = ActionType.USER_AUTHENTICATION ) } catch (_: Exception) { } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionController.kt index 1a87e08..c01e394 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionController.kt @@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.useraction 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.MemberService import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody @@ -12,10 +11,7 @@ import org.springframework.web.bind.annotation.RestController @RestController @RequestMapping("/user-action") -class UserActionController( - private val service: UserActionService, - private val memberService: MemberService -) { +class UserActionController(private val service: UserActionService) { @PostMapping fun recordAction( @RequestBody request: UserActionRequest, @@ -23,13 +19,10 @@ class UserActionController( ) = run { if (member == null) throw SodaException("") - val memberId = member.id!! - val pushTokenList = memberService.getPushTokenList(recipient = memberId) service.recordAction( - memberId = memberId, + memberId = member.id!!, isAuth = member.auth != null, - actionType = request.actionType, - pushTokenList = pushTokenList + actionType = request.actionType ) ApiResponse.ok(Unit, "") diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt index 8dd1ab5..23dbee0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/useraction/UserActionService.kt @@ -7,7 +7,6 @@ import kotlinx.coroutines.cancel import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kr.co.vividnext.sodalive.content.order.OrderRepository -import kr.co.vividnext.sodalive.fcm.FcmService import kr.co.vividnext.sodalive.point.MemberPoint import kr.co.vividnext.sodalive.point.MemberPointRepository import kr.co.vividnext.sodalive.point.PointGrantLog @@ -29,7 +28,6 @@ class UserActionService( private val memberPointRepository: MemberPointRepository, private val transactionTemplate: TransactionTemplate, - private val fcmService: FcmService, private val entityManager: EntityManager ) { @@ -44,8 +42,7 @@ class UserActionService( isAuth: Boolean, actionType: ActionType, contentId: Long? = null, - contentCommentId: Long? = null, - pushTokenList: List = emptyList() + contentCommentId: Long? = null ) { coroutineScope.launch { val now = LocalDateTime.now() @@ -171,13 +168,6 @@ class UserActionService( expiresAt = now.plusDays(3) ) ) - - if (pushTokenList.isNotEmpty()) { - fcmService.sendPointGranted( - pushTokenList, - point - ) - } } } }