diff --git a/src/main/java/com/example/egobook_be/domain/stat/controller/AdminStatControllerDocs.java b/src/main/java/com/example/egobook_be/domain/stat/controller/AdminStatControllerDocs.java index 02933382..e64e4c10 100644 --- a/src/main/java/com/example/egobook_be/domain/stat/controller/AdminStatControllerDocs.java +++ b/src/main/java/com/example/egobook_be/domain/stat/controller/AdminStatControllerDocs.java @@ -45,8 +45,8 @@ ResponseEntity> getJoinWithdraw( @Operation(summary = "잔존율 조회", description = """ 7/30일 잔존율을 조회합니다. - - 7일 잔존율 : 전체 가입 유저 중 가입 후 7일째 되는 날 접속한 유저 비율 - - 30일 잔존율 : 전체 가입 유저 중 가입 후 30일째 되는 날 접속한 유저 비율 + - 7일 잔존율 : 전체 가입 유저 중 가입 후 7일 이내 접속한 유저 비율 + - 30일 잔존율 : 전체 가입 유저 중 가입 후 30일 이내 접속한 유저 비율 """) @SecurityRequirement(name = "bearerAuth") @GetMapping("/users/retention") diff --git a/src/main/java/com/example/egobook_be/domain/stat/service/AdminStatService.java b/src/main/java/com/example/egobook_be/domain/stat/service/AdminStatService.java index 0e50182f..e3eedae0 100644 --- a/src/main/java/com/example/egobook_be/domain/stat/service/AdminStatService.java +++ b/src/main/java/com/example/egobook_be/domain/stat/service/AdminStatService.java @@ -17,6 +17,7 @@ import com.example.egobook_be.domain.user.repository.WithdrawReasonRepository; import com.example.egobook_be.global.exception.CustomException; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +29,7 @@ import java.util.Map; import java.util.stream.Collectors; - +@Slf4j @Service @RequiredArgsConstructor @Transactional(readOnly = true) @@ -106,8 +107,10 @@ public AdminRetentionResDto getRetention() { Long total7 = userRepository.countByCreatedAtBefore(today.minusDays(7).atStartOfDay()); Long total30 = userRepository.countByCreatedAtBefore(today.minusDays(30).atStartOfDay()); - Long active7 = userActivityLogRepository.countRetainedUserOnDay(7); - Long active30 = userActivityLogRepository.countRetainedUserOnDay(30); + Long active7 = userActivityLogRepository.countRetainedUserWithinDays(7); + Long active30 = userActivityLogRepository.countRetainedUserWithinDays(30); + + log.info("total7={}, total30={}, active7={}, active30={}", total7, total30, active7, active30); return AdminStatMapper.getRetentionResDto(total7, total30, active7, active30); } diff --git a/src/main/java/com/example/egobook_be/domain/user/repository/UserActivityLogRepository.java b/src/main/java/com/example/egobook_be/domain/user/repository/UserActivityLogRepository.java index ee55ac54..950d7728 100644 --- a/src/main/java/com/example/egobook_be/domain/user/repository/UserActivityLogRepository.java +++ b/src/main/java/com/example/egobook_be/domain/user/repository/UserActivityLogRepository.java @@ -17,9 +17,10 @@ public interface UserActivityLogRepository extends JpaRepository