src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt

@@ -351,13 +351,11 @@ class MemberController(
             )
         }
 
-        if (response.isNew) {
+        userActionService.recordAction(
-            userActionService.recordAction(
+            memberId = response.memberId,
-                memberId = response.memberId,
+            actionType = ActionType.SIGN_UP,
-                actionType = ActionType.SIGN_UP,
+            pushToken = request.pushToken
-                pushToken = request.pushToken
+        )
-            )
-        }
 
         return ApiResponse.ok(message = "회원가입을 축하드립니다.", data = response.loginResponse)
     }
@@ -382,13 +380,11 @@ class MemberController(
             )
         }
 
-        if (response.isNew) {
+        userActionService.recordAction(
-            userActionService.recordAction(
+            memberId = response.memberId,
-                memberId = response.memberId,
+            actionType = ActionType.SIGN_UP,
-                actionType = ActionType.SIGN_UP,
+            pushToken = request.pushToken
-                pushToken = request.pushToken
+        )
-            )
-        }
 
         return ApiResponse.ok(message = "회원가입을 축하드립니다.", data = response.loginResponse)
     }

src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt

@@ -33,7 +33,6 @@ import kr.co.vividnext.sodalive.member.signUp.SignUpRequest
 import kr.co.vividnext.sodalive.member.signUp.SignUpRequestV2
 import kr.co.vividnext.sodalive.member.signUp.SignUpResponse
 import kr.co.vividnext.sodalive.member.signUp.SignUpValidator
-import kr.co.vividnext.sodalive.member.social.MemberResolveResult
 import kr.co.vividnext.sodalive.member.social.google.GoogleUserInfo
 import kr.co.vividnext.sodalive.member.social.kakao.KakaoUserInfo
 import kr.co.vividnext.sodalive.member.stipulation.Stipulation
@@ -801,11 +800,11 @@ class MemberService(
         container: String,
         marketingPid: String?,
         pushToken: String?
-    ): MemberResolveResult {
+    ): Member {
         val findMember = repository.findByGoogleId(googleUserInfo.sub)
         if (findMember != null) {
             if (findMember.isActive) {
-                return MemberResolveResult(member = findMember, isNew = false)
+                return findMember
             } else {
                 throw SodaException("탈퇴한 계정입니다.\n고객센터로 문의해 주시기 바랍니다.")
             }
@@ -848,7 +847,7 @@ class MemberService(
             )
         }
 
-        return MemberResolveResult(member = member, isNew = true)
+        return member
     }
 
     @Transactional
@@ -857,11 +856,11 @@ class MemberService(
         container: String,
         marketingPid: String?,
         pushToken: String?
-    ): MemberResolveResult {
+    ): Member {
         val findMember = repository.findByKakaoId(kakaoUserInfo.id)
         if (findMember != null) {
             if (findMember.isActive) {
-                return MemberResolveResult(member = findMember, isNew = false)
+                return findMember
             } else {
                 throw SodaException("탈퇴한 계정입니다.\n고객센터로 문의해 주시기 바랍니다.")
             }
@@ -904,7 +903,7 @@ class MemberService(
             )
         }
 
-        return MemberResolveResult(member = member, isNew = true)
+        return member
     }
 
     private fun checkEmail(email: String) {

src/main/kotlin/kr/co/vividnext/sodalive/member/social/MemberResolveResult.kt

@@ -1,8 +0,0 @@
-package kr.co.vividnext.sodalive.member.social
-
-import kr.co.vividnext.sodalive.member.Member
-
-data class MemberResolveResult(
-    val member: Member,
-    val isNew: Boolean
-)

src/main/kotlin/kr/co/vividnext/sodalive/member/social/SocialLoginResponse.kt

@@ -5,6 +5,5 @@ import kr.co.vividnext.sodalive.member.login.LoginResponse
 data class SocialLoginResponse(
     val memberId: Long,
     val marketingPid: String?,
-    val loginResponse: LoginResponse,
+    val loginResponse: LoginResponse
-    val isNew: Boolean
 )

src/main/kotlin/kr/co/vividnext/sodalive/member/social/google/GoogleAuthService.kt

@@ -27,8 +27,7 @@ class GoogleAuthService(
     ): SocialLoginResponse {
         val googleUserInfo = googleService.getUserInfo(idToken)
             ?: throw SodaException("구글 로그인을 하지 못했습니다. 다시 시도해 주세요")
-        val memberResolveResult = memberService.findOrRegister(googleUserInfo, container, marketingPid, pushToken)
+        val member = memberService.findOrRegister(googleUserInfo, container, marketingPid, pushToken)
-        val member = memberResolveResult.member
         val principal = MemberAdapter(member)
         val authToken = GoogleAuthenticationToken(idToken, principal.authorities)
         authToken.setPrincipal(principal)
@@ -54,8 +53,7 @@ class GoogleAuthService(
         return SocialLoginResponse(
             memberId = member.id!!,
             marketingPid = marketingPid,
-            loginResponse = loginResponse,
+            loginResponse = loginResponse
-            isNew = memberResolveResult.isNew
         )
     }
 }

src/main/kotlin/kr/co/vividnext/sodalive/member/social/kakao/KakaoAuthService.kt

@@ -27,8 +27,7 @@ class KakaoAuthService(
     ): SocialLoginResponse {
         val kakaoUserInfo = kakaoService.getUserInfo(accessToken)
             ?: throw SodaException("카카오 로그인을 하지 못했습니다. 다시 시도해 주세요")
-        val memberResolveResult = memberService.findOrRegister(kakaoUserInfo, container, marketingPid, pushToken)
+        val member = memberService.findOrRegister(kakaoUserInfo, container, marketingPid, pushToken)
-        val member = memberResolveResult.member
         val principal = MemberAdapter(member)
         val authToken = KakaoAuthenticationToken(accessToken, principal.authorities)
         authToken.setPrincipal(principal)
@@ -54,8 +53,7 @@ class KakaoAuthService(
         return SocialLoginResponse(
             memberId = member.id!!,
             marketingPid = marketingPid,
-            loginResponse = loginResponse,
+            loginResponse = loginResponse
-            isNew = memberResolveResult.isNew
         )
     }
 }