Merge pull request 'test' (#282) from test into main

Reviewed-on: #282

src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsController.kt

@@ -5,6 +5,7 @@ import org.springframework.data.domain.Pageable
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
@@ -12,8 +13,14 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/admin/marketing/statistics")
 class AdminAdStatisticsController(private val service: AdminAdStatisticsService) {
     @GetMapping
-    fun getStatistics(pageable: Pageable) = ApiResponse.ok(
+    fun getStatistics(
+        @RequestParam startDateStr: String,
+        @RequestParam endDateStr: String,
+        pageable: Pageable
+    ) = ApiResponse.ok(
         service.getStatistics(
+            startDateStr = startDateStr,
+            endDateStr = endDateStr,
             offset = pageable.offset,
             limit = pageable.pageSize.toLong()
         )

src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsRepository.kt

@@ -28,13 +28,24 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
             ).toInt()
     }
 
-    fun getAdStatisticsDataList(offset: Long, limit: Long): List<GetAdminAdStatisticsItem> {
+    fun getAdStatisticsDataList(
+        startDate: LocalDateTime,
+        endDate: LocalDateTime,
+        offset: Long,
+        limit: Long
+    ): List<GetAdminAdStatisticsItem> {
         val signUpCount = CaseBuilder()
             .`when`(adTrackingHistory.id.type.eq(AdTrackingHistoryType.SIGNUP))
             .then(1)
             .otherwise(0)
             .sum()
 
+        val loginCount = CaseBuilder()
+            .`when`(adTrackingHistory.id.type.eq(AdTrackingHistoryType.LOGIN))
+            .then(1)
+            .otherwise(0)
+            .sum()
+
         val firstPaymentCount = CaseBuilder()
             .`when`(adTrackingHistory.id.type.eq(AdTrackingHistoryType.FIRST_PAYMENT))
             .then(1)
@@ -84,6 +95,7 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                     adTrackingHistory.mediaGroup,
                     adTrackingHistory.id.pid,
                     adTrackingHistory.pidName,
+                    loginCount,
                     signUpCount,
                     firstPaymentCount,
                     roundedValueDecimalPlaces2(firstPaymentTotalAmount),
@@ -94,6 +106,10 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                 )
             )
             .from(adTrackingHistory)
+            .where(
+                adTrackingHistory.id.createdAt.goe(startDate),
+                adTrackingHistory.id.createdAt.loe(endDate)
+            )
             .groupBy(
                 getFormattedDate(adTrackingHistory.id.createdAt),
                 adTrackingHistory.mediaGroup,

src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/AdminAdStatisticsService.kt

@@ -1,14 +1,23 @@
 package kr.co.vividnext.sodalive.admin.marketing.statistics
 
+import kr.co.vividnext.sodalive.extensions.convertLocalDateTime
 import org.springframework.stereotype.Service
 
 @Service
 class AdminAdStatisticsService(
     private val repository: AdminAdStatisticsRepository
 ) {
-    fun getStatistics(offset: Long, limit: Long): GetAdminAdStatisticsResponse {
+    fun getStatistics(
+        startDateStr: String,
+        endDateStr: String,
+        offset: Long,
+        limit: Long
+    ): GetAdminAdStatisticsResponse {
+        val startDate = startDateStr.convertLocalDateTime()
+        val endDate = endDateStr.convertLocalDateTime(hour = 23, minute = 59, second = 59)
+
         val totalCount = repository.getAdStatisticsDataTotalCount()
-        val items = repository.getAdStatisticsDataList(offset, limit)
+        val items = repository.getAdStatisticsDataList(startDate, endDate, offset, limit)
 
         return GetAdminAdStatisticsResponse(
             totalCount = totalCount,

src/main/kotlin/kr/co/vividnext/sodalive/admin/marketing/statistics/GetAdminAdStatisticsResponse.kt

@@ -12,6 +12,7 @@ data class GetAdminAdStatisticsItem @QueryProjection constructor(
     val mediaGroup: String,
     val pid: String,
     val pidName: String,
+    val loginCount: Int,
     val signUpCount: Int,
     val firstPaymentCount: Int,
     val firstPaymentTotalAmount: Double,

src/main/kotlin/kr/co/vividnext/sodalive/marketing/AdTrackingHistory.kt

@@ -42,5 +42,8 @@ enum class AdTrackingHistoryType {
     FIRST_PAYMENT,
 
     // 재결제
-    REPEAT_PAYMENT
+    REPEAT_PAYMENT,
+
+    // 자동로그인
+    LOGIN
 }

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

@@ -135,13 +135,24 @@ class MemberController(
     ) = run {
         if (member == null) throw SodaException("로그인 정보를 확인해주세요.")
 
-        ApiResponse.ok(
+        val memberId = member.id!!
-            service.updateMarketingInfo(
+        val marketingPid = request.pid
-                memberId = member.id!!,
+
-                adid = request.adid,
+        val changedMarketingPid = service.updateMarketingInfo(
-                pid = request.pid
+            memberId = memberId,
-            )
+            adid = request.adid,
+            pid = marketingPid
         )
+
+        if (changedMarketingPid) {
+            trackingService.saveTrackingHistory(
+                pid = marketingPid,
+                type = AdTrackingHistoryType.LOGIN,
+                memberId = memberId
+            )
+        }
+
+        ApiResponse.ok(Unit)
     }
 
     @PutMapping("/adid/update")

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
     }
 }