Merge pull request 'marketing 정보 업데이트 시 pid 값이 있으면 항상 로그인 기록 남기기' (#296) from test into main

Reviewed-on: #296

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

@@ -152,15 +152,13 @@ class MemberController(
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
         val memberId = member.id!!
-        val marketingPid = request.pid
+        val marketingPid = service.updateMarketingInfo(
-
-        val changedMarketingPid = service.updateMarketingInfo(
             memberId = memberId,
             adid = request.adid,
-            pid = marketingPid
+            pid = request.pid
         )
 
-        if (changedMarketingPid) {
+        if (!marketingPid.isNullOrBlank()) {
             trackingService.saveTrackingHistory(
                 pid = marketingPid,
                 type = AdTrackingHistoryType.LOGIN,

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

@@ -719,7 +719,7 @@ class MemberService(
     }
 
     @Transactional
-    fun updateMarketingInfo(memberId: Long, adid: String, pid: String): Boolean {
+    fun updateMarketingInfo(memberId: Long, adid: String, pid: String): String? {
         val member = repository.findByIdOrNull(id = memberId)
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
@@ -731,9 +731,9 @@ class MemberService(
             member.activePid = pid
             member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
 
-            return true
+            return pid
         }
 
-        return false
+        return member.activePid
     }
 }