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

@@ -5,7 +5,6 @@ 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
@@ -13,14 +12,8 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/admin/marketing/statistics")
 class AdminAdStatisticsController(private val service: AdminAdStatisticsService) {
     @GetMapping
-    fun getStatistics(
+    fun getStatistics(pageable: Pageable) = ApiResponse.ok(
-        @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,24 +28,13 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
             ).toInt()
     }
 
-    fun getAdStatisticsDataList(
+    fun getAdStatisticsDataList(offset: Long, limit: Long): List<GetAdminAdStatisticsItem> {
-        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)
@@ -95,7 +84,6 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
                     adTrackingHistory.mediaGroup,
                     adTrackingHistory.id.pid,
                     adTrackingHistory.pidName,
-                    loginCount,
                     signUpCount,
                     firstPaymentCount,
                     roundedValueDecimalPlaces2(firstPaymentTotalAmount),
@@ -106,10 +94,6 @@ 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,23 +1,14 @@
 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(
+    fun getStatistics(offset: Long, limit: Long): GetAdminAdStatisticsResponse {
-        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(startDate, endDate, offset, limit)
+        val items = repository.getAdStatisticsDataList(offset, limit)
 
         return GetAdminAdStatisticsResponse(
             totalCount = totalCount,

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

@@ -12,7 +12,6 @@ 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,8 +42,5 @@ enum class AdTrackingHistoryType {
     FIRST_PAYMENT,
 
     // 재결제
-    REPEAT_PAYMENT,
+    REPEAT_PAYMENT
-
-    // 자동로그인
-    LOGIN
 }

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

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

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): Boolean {
+    fun updateMarketingInfo(memberId: Long, adid: String, pid: String) {
         val member = repository.findByIdOrNull(id = memberId)
             ?: throw SodaException("로그인 정보를 확인해주세요.")
 
@@ -659,10 +659,6 @@ class MemberService(
         if (pid != member.activePid && pid.isNotBlank()) {
             member.activePid = pid
             member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
-
+        }
-            return true
-        }
-
-        return false
     }
 }