CLAP-81 Add: 로그인 기록에 대한 필터링 조회

parkjaehak · parkjaehak · commit 643eb6749700 · 2025-01-31T15:49:40.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java
@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-public record MemberLogRequest(
+public record FilterLogRequest(
         @Schema(description = "검색 기간 (단위: 시간)", example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)")
         Integer term,
         @NotNull
diff --git a/src/main/java/clap/server/adapter/inbound/web/log/LogController.java b/src/main/java/clap/server/adapter/inbound/web/log/LogController.java
@@ -2,9 +2,8 @@
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
-import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest;
 import clap.server.application.port.inbound.log.FindApiLogsUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import lombok.RequiredArgsConstructor;
@@ -27,16 +26,21 @@ public class LogController {
 
     @Secured({"ROLE_ADMIN"})
     @GetMapping("/login")
-    public List<AnonymousLogResponse> getLoginAttempts() {
-        return findApiLogsUsecase.getAnonymousLogs();
+    public Page<AnonymousLogResponse> getLoginAttempts(
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "20") int pageSize,
+            @ModelAttribute FilterLogRequest anonymousLogRequest,
+            @AuthenticationPrincipal SecurityUserDetails userInfo) {
+        Pageable pageable = PageRequest.of(page, pageSize);
+        return findApiLogsUsecase.filterAnonymousLogs(anonymousLogRequest, pageable);
     }
 
     @Secured({"ROLE_ADMIN"})
     @GetMapping("/general")
     public Page<MemberLogResponse> getApiCalls(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int pageSize,
-            @ModelAttribute MemberLogRequest memberLogRequest,
+            @ModelAttribute FilterLogRequest memberLogRequest,
             @AuthenticationPrincipal SecurityUserDetails userInfo) {
         Pageable pageable = PageRequest.of(page, pageSize);
         return findApiLogsUsecase.filterMemberLogs(memberLogRequest, pageable);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java
@@ -1,9 +1,9 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
-import clap.server.adapter.outbound.persistense.entity.log.MemberLogEntity;
 import clap.server.adapter.outbound.persistense.mapper.ApiLogPersistenceMapper;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.log.AnonymousLogRepository;
@@ -40,7 +40,7 @@ public void saveMemberLog(MemberLog memberLog) {
     }
 
     @Override
-    public void saveAnonymousLog(AnonymousLog anonymousLog){
+    public void saveAnonymousLog(AnonymousLog anonymousLog) {
         apiLogRepository.save(apiLogPersistenceMapper.mapAnonymousLogToEntity(anonymousLog, anonymousLog.getLoginNickname()));
     }
 
@@ -52,16 +52,15 @@ public List<ApiLog> findAllLogs() {
     }
 
     @Override
-    public List<AnonymousLog> findAnonymousLogs() {
-        return anonymousLogRepository.findAll().stream()
-                .map(apiLogPersistenceMapper::mapAnonymousLogEntityToDomain)
-                .toList();
-    }
-
-    @Override
-    public Page<MemberLogResponse> filterMemberLogs(MemberLogRequest memberLogRequest, Pageable pageable) {
+    public Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
         Page<MemberLog> memberLogs = memberLogRepository.filterMemberLogs(memberLogRequest, pageable)
                 .map(apiLogPersistenceMapper::mapMemberLogEntityToDomain);
         return memberLogs.map(LogMapper::toMemberLogResponse);
     }
+
+    @Override
+    public Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {
+        return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable)
+                .map(apiLogPersistenceMapper::mapAnonymousLogEntityToDomain);
+    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java
@@ -0,0 +1,10 @@
+package clap.server.adapter.outbound.persistense.repository.log;
+
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
+import clap.server.adapter.outbound.persistense.entity.log.AnonymousLogEntity;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface AnonymousLogCustomRepository {
+    Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java
@@ -0,0 +1,54 @@
+package clap.server.adapter.outbound.persistense.repository.log;
+
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
+import clap.server.adapter.outbound.persistense.entity.log.AnonymousLogEntity;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static clap.server.adapter.outbound.persistense.entity.log.QAnonymousLogEntity.anonymousLogEntity;
+
+@Repository
+@RequiredArgsConstructor
+public class AnonymousLogCustomRepositoryImpl implements AnonymousLogCustomRepository{
+
+    private final JPAQueryFactory queryFactory;
+    @Override
+    public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pageable pageable) {
+        BooleanBuilder builder = new BooleanBuilder();
+
+        if (request.term() != null) {
+            LocalDateTime fromDate = LocalDateTime.now().minusHours(request.term());
+            builder.and(anonymousLogEntity.createdAt.after(fromDate));
+        }
+        if (!request.logStatus().isEmpty()) {
+            builder.and(anonymousLogEntity.logStatus.in(request.logStatus()));
+        }
+        if (!request.nickName().isEmpty()) {
+            builder.and(anonymousLogEntity.loginNickname.contains(request.nickName()));
+        }
+        if (!request.ipAddress().isEmpty()) {
+            builder.and(anonymousLogEntity.serverIp.eq(request.ipAddress()));
+        }
+
+        List<AnonymousLogEntity> result = queryFactory
+                .selectFrom(anonymousLogEntity)
+                .where(builder)
+                .orderBy(anonymousLogEntity.createdAt.desc())
+                .offset(pageable.getOffset())
+                .limit(pageable.getPageSize())
+                .fetch();
+        long total = queryFactory
+                .selectFrom(anonymousLogEntity)
+                .where(builder)
+                .fetch().size();
+        return new PageImpl<>(result, pageable, total);
+    }
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogRepository.java
@@ -1,11 +1,16 @@
 package clap.server.adapter.outbound.persistense.repository.log;
 
+import aj.org.objectweb.asm.commons.Remapper;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.outbound.persistense.entity.log.AnonymousLogEntity;
+import clap.server.domain.model.log.AnonymousLog;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface AnonymousLogRepository extends JpaRepository<AnonymousLogEntity, Long> {
+public interface AnonymousLogRepository extends JpaRepository<AnonymousLogEntity, Long>, AnonymousLogCustomRepository{
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java
@@ -1,10 +1,10 @@
 package clap.server.adapter.outbound.persistense.repository.log;
 
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.outbound.persistense.entity.log.MemberLogEntity;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 public interface MemberLogCustomRepository {
-    Page<MemberLogEntity> filterMemberLogs(MemberLogRequest memberLogRequest, Pageable pageable);
+    Page<MemberLogEntity> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java
@@ -1,7 +1,7 @@
 package clap.server.adapter.outbound.persistense.repository.log;
 
 
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.outbound.persistense.entity.log.MemberLogEntity;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -25,14 +25,14 @@ public class MemberLogCustomRepositoryImpl implements MemberLogCustomRepository{
     private final JPAQueryFactory queryFactory;
 
     @Override
-    public Page<MemberLogEntity> filterMemberLogs(MemberLogRequest request, Pageable pageable) {
+    public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable pageable) {
         BooleanBuilder builder = new BooleanBuilder();
 
         if (request.term() != null) {
             LocalDateTime fromDate = LocalDateTime.now().minusHours(request.term());
             builder.and(memberLogEntity.createdAt.after(fromDate));
         }
-        if (request.logStatus().isEmpty()) {
+        if (!request.logStatus().isEmpty()) {
             builder.and(memberLogEntity.logStatus.in(request.logStatus()));
         }
         if (!request.nickName().isEmpty()) {
diff --git a/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java
@@ -2,7 +2,7 @@
 
 
 import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
 import clap.server.domain.model.log.ApiLog;
 import org.springframework.data.domain.Page;
@@ -11,7 +11,7 @@
 import java.util.List;
 
 public interface FindApiLogsUsecase {
-    List<AnonymousLogResponse> getAnonymousLogs();
+    Page<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable);
+    Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
     List<ApiLog> getApiLogs();
-    Page<MemberLogResponse> filterMemberLogs(MemberLogRequest memberLogRequest, Pageable pageable);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java b/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java
@@ -1,18 +1,18 @@
 package clap.server.application.port.outbound.log;
 
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
 import clap.server.domain.model.log.AnonymousLog;
 import clap.server.domain.model.log.ApiLog;
-import clap.server.domain.model.log.MemberLog;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
 public interface LoadLogPort {
     List<ApiLog> findAllLogs();
-    List<AnonymousLog> findAnonymousLogs();
+    Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable);
 
-    Page<MemberLogResponse> filterMemberLogs(MemberLogRequest memberLogRequest, Pageable pageable);
+    Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable);
 }
diff --git a/src/main/java/clap/server/application/service/log/FindApiLogsService.java b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
@@ -1,16 +1,16 @@
 package clap.server.application.service.log;
 
 import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
-import clap.server.adapter.inbound.web.dto.log.MemberLogRequest;
+import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
 import clap.server.adapter.outbound.persistense.ApiLogPersistenceAdapter;
 import clap.server.application.mapper.response.LogMapper;
 import clap.server.application.port.inbound.domain.LoginDomainService;
 import clap.server.application.port.inbound.log.FindApiLogsUsecase;
 import clap.server.application.port.outbound.log.LoadLogPort;
 import clap.server.common.annotation.architecture.ApplicationService;
+import clap.server.domain.model.log.AnonymousLog;
 import clap.server.domain.model.log.ApiLog;
-import clap.server.domain.model.log.MemberLog;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -28,17 +28,16 @@ public class FindApiLogsService implements FindApiLogsUsecase {
     private final LoadLogPort loadLogPort;
 
     @Override
-    public List<AnonymousLogResponse> getAnonymousLogs() {
-        return apiLogPersistenceAdapter.findAnonymousLogs().stream()
-                .map(anonymousLog -> {
-                    int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());
-                    return LogMapper.toAnonymounsLogResponse(anonymousLog, failedAttempts);
-                })
-                .toList();
+    public Page<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable) {
+        Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable);
+        return anonymousLogs.map(anonymousLog -> {
+            int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());
+            return LogMapper.toAnonymounsLogResponse(anonymousLog, failedAttempts);
+        });
     }
 
     @Override
-    public Page<MemberLogResponse> filterMemberLogs(MemberLogRequest memberLogRequest, Pageable pageable) {
+    public Page<MemberLogResponse> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable) {
         return loadLogPort.filterMemberLogs(memberLogRequest, pageable);
     }
 
