From 84de4e0c5ab2f6a65b5c9023e069317ffc62cadf Mon Sep 17 00:00:00 2001 From: Klaus Date: Tue, 11 Mar 2025 15:27:26 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A7=88=EC=BC=80=ED=8C=85=20-=20=EB=A7=A4?= =?UTF-8?q?=EC=B2=B4=20=ED=8C=8C=ED=8A=B8=EB=84=88=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20-=20=EB=A7=88=EC=BC=80=ED=8C=85=20PID=20?= =?UTF-8?q?=EA=B0=80=20=EB=B3=80=EA=B2=BD=EB=90=A0=20=EB=95=8C=20LOGIN=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/marketing/AdTrackingHistory.kt | 5 +++- .../sodalive/member/MemberController.kt | 23 ++++++++++++++----- .../sodalive/member/MemberService.kt | 6 ++++- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingHistory.kt b/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingHistory.kt index 5a1eb2b..8578245 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingHistory.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingHistory.kt @@ -42,5 +42,8 @@ enum class AdTrackingHistoryType { FIRST_PAYMENT, // 재결제 - REPEAT_PAYMENT + REPEAT_PAYMENT, + + // 자동로그인 + LOGIN } 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 54f1f8b..61000c0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberController.kt @@ -135,13 +135,24 @@ class MemberController( ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - ApiResponse.ok( - service.updateMarketingInfo( - memberId = member.id!!, - adid = request.adid, - pid = request.pid - ) + val memberId = member.id!! + val marketingPid = request.pid + + val changedMarketingPid = service.updateMarketingInfo( + memberId = memberId, + adid = request.adid, + pid = marketingPid ) + + if (changedMarketingPid) { + trackingService.saveTrackingHistory( + pid = marketingPid, + type = AdTrackingHistoryType.LOGIN, + memberId = memberId + ) + } + + ApiResponse.ok(Unit) } @PutMapping("/adid/update") diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt index e646fac..81af3f0 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt @@ -648,7 +648,7 @@ class MemberService( } @Transactional - fun updateMarketingInfo(memberId: Long, adid: String, pid: String) { + fun updateMarketingInfo(memberId: Long, adid: String, pid: String): Boolean { val member = repository.findByIdOrNull(id = memberId) ?: throw SodaException("로그인 정보를 확인해주세요.") @@ -659,6 +659,10 @@ class MemberService( if (pid != member.activePid && pid.isNotBlank()) { member.activePid = pid member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1) + + return true } + + return false } }