CLAP-81 Fix: server ip 속성 제거

parkjaehak · parkjaehak · commit 9816404bb8fd · 2025-01-31T18:44:39.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java
@@ -1,5 +1,6 @@
 package clap.server.adapter.inbound.web.dto.log;
 
+import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
@@ -8,16 +9,12 @@
 public record AnonymousLogResponse(
         @NotBlank
         Long logId,
-        @NotBlank
-        String loginNickname,
+        LogStatus logStatus,
         @NotBlank
         LocalDateTime requestAt,
         @NotBlank
-        LocalDateTime responseAt,
-        @NotBlank
-        String requestUrl,
-        @NotBlank
-        String requestMethod,
+        String nickName,
+        String clientIp,
         @NotBlank
         Integer statusCode,
         @NotNull
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
@@ -14,6 +14,6 @@ public record FilterLogRequest(
         @NotNull
         String nickName,
         @NotNull
-        String ipAddress
+        String clientIp
         ) {
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java
@@ -13,7 +13,7 @@ public record MemberLogResponse(
         @NotBlank
         LocalDateTime requestAt,
         String nickName,
-        String serverIp,
+        String clientIp,
         @NotBlank
         Integer statusCode
 ) {
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/ApiLogEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/ApiLogEntity.java
@@ -23,9 +23,6 @@ public abstract class ApiLogEntity extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long logId;
 
-    @Column(nullable = false)
-    private String serverIp;
-
     @Column(nullable = false)
     private String clientIp;
 
@@ -43,10 +40,10 @@ public abstract class ApiLogEntity extends BaseTimeEntity {
     private String customStatusCode;
 
     @Column(length = 4096, nullable = false)
-    private String request;
+    private String requestBody;
 
     @Column(length = 4096, nullable = false)
-    private String response;
+    private String responseBody;
 
     @Column(nullable = false)
     private LocalDateTime requestAt;
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/mapper/ApiLogPersistenceMapper.java b/src/main/java/clap/server/adapter/outbound/persistense/mapper/ApiLogPersistenceMapper.java
@@ -17,14 +17,13 @@ public class ApiLogPersistenceMapper {
     private final MemberPersistenceMapper memberPersistenceMapper;
     public AnonymousLogEntity mapAnonymousLogToEntity(ApiLog anonymousLog, String nickName) {
         return AnonymousLogEntity.builder()
-                .serverIp(anonymousLog.getServerIp())
                 .clientIp(anonymousLog.getClientIp())
                 .requestUrl(anonymousLog.getRequestUrl())
                 .requestMethod(ApiHttpMethod.valueOf(anonymousLog.getRequestMethod()))
                 .statusCode(anonymousLog.getStatusCode())
                 .customStatusCode(anonymousLog.getCustomStatusCode())
-                .request(anonymousLog.getRequest())
-                .response(anonymousLog.getResponse())
+                .requestBody(anonymousLog.getRequestBody())
+                .responseBody(anonymousLog.getResponseBody())
                 .requestAt(anonymousLog.getRequestAt())
                 .responseAt(anonymousLog.getResponseAt())
                 .loginNickname(nickName != null ? nickName : "UNKNOWN")
@@ -35,14 +34,13 @@ public AnonymousLogEntity mapAnonymousLogToEntity(ApiLog anonymousLog, String ni
     public MemberLogEntity mapMemberLogToEntity(MemberLog memberLog, MemberEntity memberEntity) {
         return MemberLogEntity.builder()
                 .member(memberEntity)
-                .serverIp(memberLog.getServerIp())
                 .clientIp(memberLog.getClientIp())
                 .requestUrl(memberLog.getRequestUrl())
                 .requestMethod(ApiHttpMethod.valueOf(memberLog.getRequestMethod()))
                 .statusCode(memberLog.getStatusCode())
                 .customStatusCode(memberLog.getCustomStatusCode())
-                .request(memberLog.getRequest())
-                .response(memberLog.getResponse())
+                .requestBody(memberLog.getRequestBody())
+                .responseBody(memberLog.getRequestBody())
                 .requestAt(memberLog.getRequestAt())
                 .responseAt(memberLog.getResponseAt())
                 .logStatus(memberLog.getLogStatus())
@@ -52,14 +50,13 @@ public MemberLogEntity mapMemberLogToEntity(MemberLog memberLog, MemberEntity me
     public AnonymousLog mapAnonymousLogEntityToDomain(AnonymousLogEntity anonymousLogEntity) {
         return AnonymousLog.builder()
                 .logId(anonymousLogEntity.getLogId())
-                .serverIp(anonymousLogEntity.getServerIp())
                 .clientIp(anonymousLogEntity.getClientIp())
                 .requestUrl(anonymousLogEntity.getRequestUrl())
                 .requestMethod(anonymousLogEntity.getRequestMethod().name())
                 .statusCode(anonymousLogEntity.getStatusCode())
                 .customStatusCode(anonymousLogEntity.getCustomStatusCode())
-                .request(anonymousLogEntity.getRequest())
-                .response(anonymousLogEntity.getResponse())
+                .requestBody(anonymousLogEntity.getRequestBody())
+                .responseBody(anonymousLogEntity.getResponseBody())
                 .requestAt(anonymousLogEntity.getRequestAt())
                 .responseAt(anonymousLogEntity.getResponseAt())
                 .logStatus(anonymousLogEntity.getLogStatus())
@@ -70,14 +67,13 @@ public AnonymousLog mapAnonymousLogEntityToDomain(AnonymousLogEntity anonymousLo
     public MemberLog mapMemberLogEntityToDomain(MemberLogEntity memberLogEntity) {
         return MemberLog.builder()
                 .logId(memberLogEntity.getLogId())
-                .serverIp(memberLogEntity.getServerIp())
                 .clientIp(memberLogEntity.getClientIp())
                 .requestUrl(memberLogEntity.getRequestUrl())
                 .requestMethod(memberLogEntity.getRequestMethod().name())
                 .statusCode(memberLogEntity.getStatusCode())
                 .customStatusCode(memberLogEntity.getCustomStatusCode())
-                .request(memberLogEntity.getRequest())
-                .response(memberLogEntity.getResponse())
+                .requestBody(memberLogEntity.getRequestBody())
+                .responseBody(memberLogEntity.getResponseBody())
                 .requestAt(memberLogEntity.getRequestAt())
                 .responseAt(memberLogEntity.getResponseAt())
                 .logStatus(memberLogEntity.getLogStatus())
@@ -90,14 +86,13 @@ public MemberLog mapMemberLogEntityToDomain(MemberLogEntity memberLogEntity) {
     public ApiLog mapLogEntityToDomain(ApiLogEntity logEntity) {
         return ApiLog.builder()
                 .logId(logEntity.getLogId())
-                .serverIp(logEntity.getServerIp())
                 .clientIp(logEntity.getClientIp())
                 .requestUrl(logEntity.getRequestUrl())
                 .requestMethod(logEntity.getRequestMethod().name())
                 .statusCode(logEntity.getStatusCode())
                 .customStatusCode(logEntity.getCustomStatusCode())
-                .request(logEntity.getRequest())
-                .response(logEntity.getResponse())
+                .requestBody(logEntity.getRequestBody())
+                .responseBody(logEntity.getResponseBody())
                 .requestAt(logEntity.getRequestAt())
                 .responseAt(logEntity.getResponseAt())
                 .logStatus(logEntity.getLogStatus())
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
@@ -34,8 +34,8 @@ public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pa
         if (!request.nickName().isEmpty()) {
             builder.and(anonymousLogEntity.loginNickname.contains(request.nickName()));
         }
-        if (!request.ipAddress().isEmpty()) {
-            builder.and(anonymousLogEntity.serverIp.eq(request.ipAddress()));
+        if (!request.clientIp().isEmpty()) {
+            builder.and(anonymousLogEntity.clientIp.eq(request.clientIp()));
         }
 
         List<AnonymousLogEntity> result = queryFactory
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
@@ -38,8 +38,8 @@ public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable
         if (!request.nickName().isEmpty()) {
             builder.and(memberEntity.nickname.contains(request.nickName()));
         }
-        if (!request.ipAddress().isEmpty()) {
-            builder.and(memberLogEntity.serverIp.eq(request.ipAddress()));
+        if (!request.clientIp().isEmpty()) {
+            builder.and(memberLogEntity.clientIp.eq(request.clientIp()));
         }
 
         List<MemberLogEntity> result = queryFactory
diff --git a/src/main/java/clap/server/application/mapper/response/LogMapper.java b/src/main/java/clap/server/application/mapper/response/LogMapper.java
@@ -6,14 +6,13 @@
 import clap.server.domain.model.log.MemberLog;
 
 public class LogMapper {
-    public static AnonymousLogResponse toAnonymounsLogResponse(AnonymousLog anonymousLog, int failedAttempts) {
+    public static AnonymousLogResponse toAnonymousLogResponse(AnonymousLog anonymousLog, int failedAttempts) {
         return new AnonymousLogResponse(
                 anonymousLog.getLogId(),
-                anonymousLog.getLoginNickname(),
+                anonymousLog.getLogStatus(),
                 anonymousLog.getRequestAt(),
-                anonymousLog.getResponseAt(),
-                anonymousLog.getRequestUrl(),
-                anonymousLog.getRequestMethod(),
+                anonymousLog.getLoginNickname(),
+                anonymousLog.getClientIp(),
                 anonymousLog.getStatusCode(),
                 anonymousLog.getCustomStatusCode(),
                 failedAttempts
@@ -25,7 +24,7 @@ public static MemberLogResponse toMemberLogResponse(MemberLog memberLog) {
                 memberLog.getLogStatus(),
                 memberLog.getRequestAt(),
                 memberLog.getMember().getNickname(),
-                memberLog.getServerIp(),
+                memberLog.getClientIp(),
                 memberLog.getStatusCode()
         );
     }
diff --git a/src/main/java/clap/server/application/service/log/FindApiLogsService.java b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
@@ -34,7 +34,7 @@ public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest a
         Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable);
         Page<AnonymousLogResponse> anonymousLogResponses = anonymousLogs.map(anonymousLog -> {
             int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());
-            return LogMapper.toAnonymounsLogResponse(anonymousLog, failedAttempts);
+            return LogMapper.toAnonymousLogResponse(anonymousLog, failedAttempts);
         });
         return PageResponse.from(anonymousLogResponses);
     }
diff --git a/src/main/java/clap/server/domain/model/log/AnonymousLog.java b/src/main/java/clap/server/domain/model/log/AnonymousLog.java
@@ -15,17 +15,16 @@
 public class AnonymousLog extends ApiLog {
     private String loginNickname;
 
-    public static AnonymousLog createAnonymousLog(HttpServletRequest request, HttpServletResponse response, Object result,
-                                                  LocalDateTime responseAt, LogStatus logStatus, String customCode, String body, String nickName) {
+    public static AnonymousLog createAnonymousLog(HttpServletRequest request, HttpServletResponse response, Object responseResult,
+                                                  LocalDateTime responseAt, LogStatus logStatus, String customCode, String requestBody, String nickName) {
         return AnonymousLog.builder()
-                .serverIp("127.0.0.1")
                 .clientIp(request.getRemoteAddr())
                 .requestUrl(request.getRequestURI())
                 .requestMethod(request.getMethod())
                 .statusCode(response.getStatus())
                 .customStatusCode(customCode)
-                .request(body)
-                .response(result != null ? result.toString() : "UNKNOWN")
+                .requestBody(requestBody)
+                .responseBody(responseResult != null ? responseResult.toString() : "UNKNOWN")
                 .requestAt(LocalDateTime.now())
                 .responseAt(responseAt)
                 .logStatus(logStatus)
diff --git a/src/main/java/clap/server/domain/model/log/ApiLog.java b/src/main/java/clap/server/domain/model/log/ApiLog.java
@@ -16,11 +16,10 @@ public class ApiLog extends BaseTime {
     private Integer statusCode;
     private LocalDateTime requestAt;
     private LocalDateTime responseAt;
-    private String request;
-    private String response;
+    private String requestBody;
+    private String responseBody;
     private String requestUrl;
     private String clientIp;
-    private String serverIp;
     private String customStatusCode;
     private String requestMethod;
     private LogStatus logStatus;
diff --git a/src/main/java/clap/server/domain/model/log/MemberLog.java b/src/main/java/clap/server/domain/model/log/MemberLog.java
@@ -16,17 +16,16 @@
 public class MemberLog extends ApiLog {
     private Member member;
 
-    public static MemberLog createMemberLog(HttpServletRequest request, HttpServletResponse response, Object result,
-                                            LocalDateTime responseAt, LogStatus logStatus, String customCode, String body, Member member) {
+    public static MemberLog createMemberLog(HttpServletRequest request, HttpServletResponse response, Object responseResult,
+                                            LocalDateTime responseAt, LogStatus logStatus, String customCode, String requestBody, Member member) {
         return MemberLog.builder()
-                .serverIp("127.0.0.1") //TODO: 실제 서버 ip 동적 주입
                 .clientIp(request.getRemoteAddr())
                 .requestUrl(request.getRequestURI())
                 .requestMethod(request.getMethod())
                 .statusCode(response.getStatus())
                 .customStatusCode(customCode)
-                .request(body)
-                .response(result != null ? result.toString() : "UNKNOWN")
+                .requestBody(requestBody)
+                .responseBody(responseResult != null ? responseResult.toString() : "UNKNOWN")
                 .requestAt(LocalDateTime.now())
                 .responseAt(responseAt)
                 .logStatus(logStatus)

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ public record FilterLogRequest(`
`14`	`14`	`@NotNull`
`15`	`15`	`String nickName,`
`16`	`16`	`@NotNull`
`17`		`- String ipAddress`
	`17`	`+ String clientIp`
`18`	`18`	`) {`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public Page<AnonymousLogEntity> filterAnonymousLogs(FilterLogRequest request, Pa`
`34`	`34`	`if (!request.nickName().isEmpty()) {`
`35`	`35`	`builder.and(anonymousLogEntity.loginNickname.contains(request.nickName()));`
`36`	`36`	`}`
`37`		`- if (!request.ipAddress().isEmpty()) {`
`38`		`- builder.and(anonymousLogEntity.serverIp.eq(request.ipAddress()));`
	`37`	`+ if (!request.clientIp().isEmpty()) {`
	`38`	`+ builder.and(anonymousLogEntity.clientIp.eq(request.clientIp()));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`List<AnonymousLogEntity> result = queryFactory`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public Page<MemberLogEntity> filterMemberLogs(FilterLogRequest request, Pageable`
`38`	`38`	`if (!request.nickName().isEmpty()) {`
`39`	`39`	`builder.and(memberEntity.nickname.contains(request.nickName()));`
`40`	`40`	`}`
`41`		`- if (!request.ipAddress().isEmpty()) {`
`42`		`- builder.and(memberLogEntity.serverIp.eq(request.ipAddress()));`
	`41`	`+ if (!request.clientIp().isEmpty()) {`
	`42`	`+ builder.and(memberLogEntity.clientIp.eq(request.clientIp()));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`List<MemberLogEntity> result = queryFactory`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest a`
`34`	`34`	`Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable);`
`35`	`35`	`Page<AnonymousLogResponse> anonymousLogResponses = anonymousLogs.map(anonymousLog -> {`
`36`	`36`	`int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());`
`37`		`- return LogMapper.toAnonymounsLogResponse(anonymousLog, failedAttempts);`
	`37`	`+ return LogMapper.toAnonymousLogResponse(anonymousLog, failedAttempts);`
`38`	`38`	`});`
`39`	`39`	`return PageResponse.from(anonymousLogResponses);`
`40`	`40`	`}`