From 77d341882f1a801112ed744fe89206333f9af171 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 11:12:36 +0900
Subject: [PATCH 1/9] =?UTF-8?q?CLAP-241=20Refactor:=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=8B=9D=EB=B3=84=20?=
 =?UTF-8?q?sessionId=20->=20clientip=20=EB=B0=A9=EC=8B=9D=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../security/filter/LoginAttemptFilter.java      | 14 +++++++++-----
 .../adapter/inbound/web/auth/AuthController.java |  4 ++--
 .../redis/log/LoginLogAdapter.java               |  8 ++++----
 .../infrastructure/redis/log/LoginLogEntity.java |  8 +++-----
 .../port/inbound/auth/LoginUsecase.java          |  2 +-
 .../port/outbound/auth/CommandLoginLogPort.java  |  2 +-
 .../port/outbound/auth/LoadLoginLogPort.java     |  2 +-
 .../application/service/auth/AuthService.java    | 16 ++++++++--------
 .../service/auth/LoginAttemptService.java        | 16 ++++++++--------
 .../clap/server/domain/model/auth/LoginLog.java  |  7 ++-----
 10 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
index f73c54c9..9dab45ba 100644
--- a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
+++ b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
@@ -19,6 +19,7 @@
 
 import static clap.server.adapter.inbound.security.WebSecurityUrl.LOGIN_ENDPOINT;
 import static clap.server.common.constants.AuthConstants.SESSION_ID;
+import static clap.server.common.utils.ClientIpParseUtil.getClientIp;
 
 
 @RequiredArgsConstructor
@@ -30,13 +31,16 @@ public class LoginAttemptFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
-        String sessionId = request.getHeader(SESSION_ID.getValue().toLowerCase());
+        //TODO: 25.02.04 요구사항 변경에 따른 임시 주석 처리
+//        String sessionId = request.getHeader(SESSION_ID.getValue().toLowerCase());
 
         if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
-            if (sessionId == null) {
-                throw new AuthException(GlobalErrorCode.BAD_REQUEST);
-            }
-            loginAttemptService.checkAccountIsLocked(sessionId);
+
+//            if (sessionId == null) {
+//                throw new AuthException(GlobalErrorCode.BAD_REQUEST);
+//            }
+            String clientIp = getClientIp(request);
+            loginAttemptService.checkAccountIsLocked(clientIp);
         }
 
         UsernamePasswordAuthenticationToken authenticationToken =
diff --git a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java
index 5f4b5366..5325a16d 100644
--- a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java
@@ -32,11 +32,11 @@ public class AuthController {
     @LogType(LogStatus.LOGIN)
     @Operation(summary = "로그인 API")
     @PostMapping("/login")
-    public ResponseEntity<LoginResponse> login(@RequestHeader(name = "sessionId") String sessionId,
+    public ResponseEntity<LoginResponse> login(
                                                @RequestBody LoginRequest request,
                                                HttpServletRequest httpRequest) {
         String clientIp = getClientIp(httpRequest);
-        LoginResponse response = loginUsecase.login(request.nickname(), request.password(), sessionId, clientIp);
+        LoginResponse response = loginUsecase.login(request.nickname(), request.password(), clientIp);
         return ResponseEntity.ok(response);
     }
 
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogAdapter.java
index b2643307..3fd24e89 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogAdapter.java
@@ -21,11 +21,11 @@ public void save(LoginLog loginLog) {
 		loginLogRepository.save(loginLogEntity);
 	}
 
-	public void deleteById(String sessionId) {
-		loginLogRepository.deleteById(sessionId);
+	public void deleteById(String clientIp) {
+		loginLogRepository.deleteById(clientIp);
 	}
 
-	public Optional<LoginLog> findBySessionId(String sessionId) {
-		return loginLogRepository.findById(sessionId).map(loginLogMapper::toDomain);
+	public Optional<LoginLog> findByClientIp(String clientIp) {
+		return loginLogRepository.findById(clientIp).map(loginLogMapper::toDomain);
 	}
 }
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java b/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java
index 6993517c..db083d45 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java
@@ -17,17 +17,15 @@
 @Getter
 @RedisHash("loginLog")
 @Builder
-@ToString(of = {"sessionId", "clientIp", "attemptNickname", "lastAttemptAt", "attemptCount", "isLocked"})
-@EqualsAndHashCode(of = {"sessionId"})
+@ToString(of = {"clientIp", "attemptNickname", "lastAttemptAt", "attemptCount", "isLocked"})
+@EqualsAndHashCode(of = {"clientIp"})
 public class LoginLogEntity {
 	@Id
-	private String sessionId;
-
 	private String clientIp;
 
 	private String attemptNickname;
 
-	@JsonSerialize(using = ToStringSerializer.class)  // 직렬화 방식을 설정
+	@JsonSerialize(using = ToStringSerializer.class)
 	@JsonDeserialize(using = LocalDateTimeDeserializer.class)
 	@Builder.Default
 	private LocalDateTime lastAttemptAt = LocalDateTime.now();
diff --git a/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java b/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java
index 4a88128c..5861cfe7 100644
--- a/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java
@@ -3,5 +3,5 @@
 import clap.server.adapter.inbound.web.dto.auth.response.LoginResponse;
 
 public interface LoginUsecase {
-    LoginResponse login(String nickname, String password, String sessionId, String clientIp);
+    LoginResponse login(String nickname, String password, String clientIp);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/auth/CommandLoginLogPort.java b/src/main/java/clap/server/application/port/outbound/auth/CommandLoginLogPort.java
index fe6547c9..5101078d 100644
--- a/src/main/java/clap/server/application/port/outbound/auth/CommandLoginLogPort.java
+++ b/src/main/java/clap/server/application/port/outbound/auth/CommandLoginLogPort.java
@@ -5,5 +5,5 @@
 public interface CommandLoginLogPort {
     void save(LoginLog loginLog);
 
-    void deleteById(String sessionId);
+    void deleteById(String clientIp);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/auth/LoadLoginLogPort.java b/src/main/java/clap/server/application/port/outbound/auth/LoadLoginLogPort.java
index 0a02f995..93bb4b59 100644
--- a/src/main/java/clap/server/application/port/outbound/auth/LoadLoginLogPort.java
+++ b/src/main/java/clap/server/application/port/outbound/auth/LoadLoginLogPort.java
@@ -5,5 +5,5 @@
 import java.util.Optional;
 
 public interface LoadLoginLogPort {
-    Optional<LoginLog> findBySessionId(String sessionId);
+    Optional<LoginLog> findByClientIp(String clientIp);
 }
diff --git a/src/main/java/clap/server/application/service/auth/AuthService.java b/src/main/java/clap/server/application/service/auth/AuthService.java
index 7b26155e..58b6f83b 100644
--- a/src/main/java/clap/server/application/service/auth/AuthService.java
+++ b/src/main/java/clap/server/application/service/auth/AuthService.java
@@ -34,10 +34,10 @@ class AuthService implements LoginUsecase, LogoutUsecase {
 
 
     @Override
-    public LoginResponse login(String nickname, String password, String sessionId, String clientIp) {
-        Member member = getMember(nickname, sessionId, clientIp);
+    public LoginResponse login(String nickname, String password, String clientIp) {
+        Member member = getMember(nickname,clientIp);
 
-        validatePassword(password, member.getPassword(), sessionId, nickname, clientIp);
+        validatePassword(password, member.getPassword(), nickname, clientIp);
 
         if (member.getStatus().equals(MemberStatus.APPROVAL_REQUEST)) {
             String temporaryToken = manageTokenService.issueTemporaryToken(member.getMemberId());
@@ -46,7 +46,7 @@ public LoginResponse login(String nickname, String password, String sessionId, S
 
         CustomJwts jwtTokens = manageTokenService.issueTokens(member);
         refreshTokenService.saveRefreshToken(manageTokenService.issueRefreshToken(member.getMemberId()));
-        loginAttemptService.resetFailedAttempts(sessionId);
+        loginAttemptService.resetFailedAttempts(clientIp);
         return AuthResponseMapper.toLoginResponse(jwtTokens.accessToken(), jwtTokens.refreshToken(), member);
     }
 
@@ -68,17 +68,17 @@ private void deleteAccessToken(Long memberId, String accessToken) {
         forbiddenTokenPort.save(forbiddenToken);
     }
 
-    private Member getMember(String inputNickname, String sessionId, String clientIp) {
+    private Member getMember(String inputNickname, String clientIp) {
         return loadMemberPort.findByNickname(inputNickname).orElseThrow(() ->
         {
-            loginAttemptService.recordFailedAttempt(sessionId, clientIp, inputNickname);
+            loginAttemptService.recordFailedAttempt(clientIp, inputNickname);
             return new AuthException(AuthErrorCode.LOGIN_REQUEST_FAILED);
         });
     }
 
-    private void validatePassword(String inputPassword, String encodedPassword, String sessionId, String inputNickname, String clientIp) {
+    private void validatePassword(String inputPassword, String encodedPassword, String inputNickname, String clientIp) {
         if (!passwordEncoder.matches(inputPassword, encodedPassword)) {
-            loginAttemptService.recordFailedAttempt(sessionId, clientIp, inputNickname);
+            loginAttemptService.recordFailedAttempt(clientIp, inputNickname);
             throw new AuthException(AuthErrorCode.LOGIN_REQUEST_FAILED);
         }
     }
diff --git a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
index fc8be813..d3eb47df 100644
--- a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
+++ b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
@@ -21,10 +21,10 @@ public class LoginAttemptService {
     private static final int MAX_FAILED_ATTEMPTS = 5;
     private static final long LOCK_TIME_DURATION = 30 * 60 * 1000; // 30분 (밀리초)
 
-    public void recordFailedAttempt(String sessionId, String clientIp, String attemptNickname) {
-        LoginLog loginLog = loadLoginLogPort.findBySessionId(sessionId).orElse(null);
+    public void recordFailedAttempt(String clientIp, String attemptNickname) {
+        LoginLog loginLog = loadLoginLogPort.findByClientIp(clientIp).orElse(null);
         if (loginLog == null) {
-            loginLog = LoginLog.createLoginLog(sessionId, clientIp, attemptNickname);
+            loginLog = LoginLog.createLoginLog(clientIp, attemptNickname);
         } else {
             int attemptCount = loginLog.recordFailedAttempt();
             if (attemptCount >= MAX_FAILED_ATTEMPTS) {
@@ -36,8 +36,8 @@ public void recordFailedAttempt(String sessionId, String clientIp, String attemp
         commandLoginLogPort.save(loginLog);
     }
 
-    public void checkAccountIsLocked(String sessionId) {
-        LoginLog loginLog = loadLoginLogPort.findBySessionId(sessionId).orElse(null);
+    public void checkAccountIsLocked(String clientIp) {
+        LoginLog loginLog = loadLoginLogPort.findByClientIp(clientIp).orElse(null);
         if (loginLog == null) {
             return;
         }
@@ -51,12 +51,12 @@ public void checkAccountIsLocked(String sessionId) {
             if (minutesSinceLastAttemptInMillis <= LOCK_TIME_DURATION) {
                 throw new AuthException(AuthErrorCode.ACCOUNT_IS_LOCKED);
             }
-            commandLoginLogPort.deleteById(sessionId);
+            commandLoginLogPort.deleteById(clientIp);
         }
     }
 
 
-    public void resetFailedAttempts(String sessionId) {
-        commandLoginLogPort.deleteById(sessionId);
+    public void resetFailedAttempts(String clientIp) {
+        commandLoginLogPort.deleteById(clientIp);
     }
 }
diff --git a/src/main/java/clap/server/domain/model/auth/LoginLog.java b/src/main/java/clap/server/domain/model/auth/LoginLog.java
index cc454f20..54d9d3d9 100644
--- a/src/main/java/clap/server/domain/model/auth/LoginLog.java
+++ b/src/main/java/clap/server/domain/model/auth/LoginLog.java
@@ -11,7 +11,6 @@
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class LoginLog {
-	private String sessionId;
 	private String clientIp;
 	private String attemptNickname;
 	private LocalDateTime lastAttemptAt;
@@ -19,9 +18,8 @@ public class LoginLog {
 	private boolean isLocked;
 
 	@Builder
-	private LoginLog(String sessionId, String clientIp, String attemptNickname, LocalDateTime lastAttemptAt,
+	private LoginLog(String clientIp, String attemptNickname, LocalDateTime lastAttemptAt,
 					 int attemptCount, boolean isLocked) {
-		this.sessionId = sessionId;
 		this.clientIp = clientIp;
 		this.attemptNickname = attemptNickname;
 		this.lastAttemptAt = lastAttemptAt;
@@ -29,9 +27,8 @@ private LoginLog(String sessionId, String clientIp, String attemptNickname, Loca
 		this.isLocked = isLocked;
 	}
 
-	public static LoginLog createLoginLog(String sessionId, String clientIp, String attemptNickname) {
+	public static LoginLog createLoginLog(String clientIp, String attemptNickname) {
 		return LoginLog.builder()
-				.sessionId(sessionId)
 				.clientIp(clientIp)
 				.attemptNickname(attemptNickname)
 				.lastAttemptAt(LocalDateTime.now())

From e241d5208c3c63f1a8ec87ec2fe07231eb99573c Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 11:15:09 +0900
Subject: [PATCH 2/9] =?UTF-8?q?CLAP-241=20Refactor:=20=EA=B0=99=EC=9D=80?=
 =?UTF-8?q?=20=EC=83=81=ED=83=9C=EC=97=90=20=EB=8C=80=ED=95=B4=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=EC=9D=B4=20=EC=9D=BC=EC=96=B4=EB=82=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../service/task/UpdateTaskBoardService.java   |  4 ++--
 .../service/task/UpdateTaskService.java        | 18 ++++++++++++++----
 .../server/exception/code/TaskErrorCode.java   |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
index 8cd7a74d..cd08f9e9 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskBoardService.java
@@ -7,11 +7,11 @@
 import clap.server.application.port.inbound.task.UpdateTaskBoardUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskOrderAndStatusUsecase;
 import clap.server.application.port.outbound.task.LoadTaskPort;
-import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
-import clap.server.domain.policy.task.ProcessorValidationPolicy;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Task;
+import clap.server.domain.policy.task.ProcessorValidationPolicy;
+import clap.server.domain.policy.task.TaskOrderCalculationPolicy;
 import clap.server.domain.policy.task.TaskPolicyConstants;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.TaskErrorCode;
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index 82029f1d..ebdeca5e 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -36,6 +36,8 @@
 
 import java.util.List;
 
+import static clap.server.domain.policy.task.TaskPolicyConstants.TASK_UPDATABLE_STATUS;
+
 
 @ApplicationService
 @RequiredArgsConstructor
@@ -74,11 +76,19 @@ public UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatu
         memberService.findActiveMember(memberId);
         memberService.findReviewer(memberId);
         Task task = taskService.findById(taskId);
-        task.updateTaskStatus(taskStatus);
-        Task updateTask = taskService.upsert(task);
 
-        publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
-        return TaskResponseMapper.toUpdateTaskResponse(updateTask);
+        if(!TASK_UPDATABLE_STATUS.contains(taskStatus)){
+            throw new ApplicationException(TaskErrorCode.TASK_STATUS_NOT_ALLOWED);
+        }
+
+        if(!task.getTaskStatus().equals(taskStatus)){
+            task.updateTaskStatus(taskStatus);
+            Task updateTask = taskService.upsert(task);
+
+            publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
+            return TaskResponseMapper.toUpdateTaskResponse(updateTask);
+        }
+        return TaskResponseMapper.toUpdateTaskResponse(task);
     }
 
     @Transactional
diff --git a/src/main/java/clap/server/exception/code/TaskErrorCode.java b/src/main/java/clap/server/exception/code/TaskErrorCode.java
index c7976c2b..f5c551af 100644
--- a/src/main/java/clap/server/exception/code/TaskErrorCode.java
+++ b/src/main/java/clap/server/exception/code/TaskErrorCode.java
@@ -17,7 +17,7 @@ public enum TaskErrorCode implements BaseErrorCode {
     INVALID_TASK_STATUS_TRANSITION(HttpStatus.BAD_REQUEST, "TASK_008", "유효하지 않은 작업 상태 전환입니다."),
     NOT_A_REVIEWER(HttpStatus.FORBIDDEN, "TASK_009", "작업 승인 및 수정 권한이 없습니다."),
     NOT_A_REQUESTER(HttpStatus.FORBIDDEN, "TASK_009", "작업 수정 권한이 없습니다."),
-    TASK_STATUS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "TASK_010", "변경할 수 없는 작업 상태입니다.")
+    TASK_STATUS_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "TASK_010", "변경할 수 없는 작업 상태입니다. 다른 API를 사용해주세요")
     ;
 
     private final HttpStatus httpStatus;

From f0dd1fa534ec9c74e225bd2676e1d92b56f6c8d7 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 11:31:41 +0900
Subject: [PATCH 3/9] =?UTF-8?q?CLAP-241=20Refactor:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=B0=98=ED=99=98=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20response=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../inbound/web/task/ChangeTaskController.java     | 14 ++++++--------
 .../inbound/web/task/ManagementTaskController.java |  4 ++--
 .../port/inbound/task/UpdateTaskLabelUsecase.java  |  2 +-
 .../inbound/task/UpdateTaskProcessorUsecase.java   |  3 +--
 .../port/inbound/task/UpdateTaskStatusUsecase.java |  2 +-
 .../port/inbound/task/UpdateTaskUsecase.java       |  2 +-
 .../service/task/UpdateTaskService.java            | 13 ++++---------
 7 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java
index a3e9ffb6..ac78792b 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java
@@ -5,7 +5,6 @@
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskLabelRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest;
 import clap.server.adapter.inbound.web.dto.task.response.ApprovalTaskResponse;
-import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskLabelUsecase;
@@ -40,34 +39,33 @@ public class ChangeTaskController {
     @Operation(summary = "작업 상태 변경")
     @Secured("ROLE_MANAGER")
     @PatchMapping("/{taskId}/status")
-    public ResponseEntity<UpdateTaskResponse> updateTaskState(
+    public void updateTaskState(
             @PathVariable @NotNull Long taskId,
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @Parameter(description = "변경하고 싶은 작업 상태",
                     schema = @Schema(allowableValues = {"IN_PROGRESS", "PENDING_COMPLETED", "COMPLETED"}))
             @RequestBody TaskStatus taskStatus) {
-
-        return ResponseEntity.ok(updateTaskStatusUsecase.updateTaskStatus(userInfo.getUserId(), taskId, taskStatus));
+        updateTaskStatusUsecase.updateTaskStatus(userInfo.getUserId(), taskId, taskStatus);
     }
 
     @Operation(summary = "작업 처리자 변경")
     @Secured({"ROLE_MANAGER"})
     @PatchMapping("/{taskId}/processor")
-    public ResponseEntity<UpdateTaskResponse> updateTaskProcessor(
+    public void updateTaskProcessor(
             @PathVariable Long taskId,
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @Valid @RequestBody UpdateTaskProcessorRequest updateTaskProcessorRequest) {
-        return ResponseEntity.ok(updateTaskProcessorUsecase.updateTaskProcessor(taskId, userInfo.getUserId(), updateTaskProcessorRequest));
+        updateTaskProcessorUsecase.updateTaskProcessor(taskId, userInfo.getUserId(), updateTaskProcessorRequest);
     }
 
     @Operation(summary = "작업 구분 변경")
     @Secured({"ROLE_MANAGER"})
     @PatchMapping("/{taskId}/label")
-    public ResponseEntity<UpdateTaskResponse> updateTaskLabel(
+    public void updateTaskLabel(
             @PathVariable Long taskId,
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @Valid @RequestBody UpdateTaskLabelRequest updateTaskLabelRequest) {
-        return ResponseEntity.ok(updateTaskLabelUsecase.updateTaskLabel(taskId, userInfo.getUserId(), updateTaskLabelRequest));
+        updateTaskLabelUsecase.updateTaskLabel(taskId, userInfo.getUserId(), updateTaskLabelRequest);
     }
 
     @Operation(summary = "작업 승인")
diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
index 84cda3b0..be475dd8 100644
--- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
+++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java
@@ -46,11 +46,11 @@ public ResponseEntity<CreateTaskResponse> createTask(
     @Operation(summary = "작업 수정")
     @PatchMapping(value = "/{taskId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE, MediaType.APPLICATION_JSON_VALUE})
     @Secured({"ROLE_MANAGER", "ROLE_USER"})
-    public ResponseEntity<UpdateTaskResponse> updateTask(
+    public void updateTask(
             @PathVariable @NotNull Long taskId,
             @RequestPart(name = "taskInfo") @Valid UpdateTaskRequest updateTaskRequest,
             @RequestPart(name = "attachment", required = false) List<MultipartFile> attachments,
             @AuthenticationPrincipal SecurityUserDetails userInfo){
-        return ResponseEntity.ok(updateTaskUsecase.updateTask(userInfo.getUserId(), taskId, updateTaskRequest, attachments));
+        updateTaskUsecase.updateTask(userInfo.getUserId(), taskId, updateTaskRequest, attachments);
     }
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java
index 78a5bfcf..e1a266c7 100644
--- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java
@@ -4,5 +4,5 @@
 import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
 
 public interface UpdateTaskLabelUsecase {
-    UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request);
+    void updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java
index a5cd48b2..9fb8d28c 100644
--- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java
@@ -1,8 +1,7 @@
 package clap.server.application.port.inbound.task;
 
-import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest;
 
 public interface UpdateTaskProcessorUsecase {
-    UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request);
+    void updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java
index 80c7ff03..b08aa879 100644
--- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java
@@ -4,5 +4,5 @@
 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 
 public interface UpdateTaskStatusUsecase {
-    UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus);
+    void updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java
index fb78cba6..106c6e58 100644
--- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java
+++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java
@@ -8,5 +8,5 @@
 import java.util.List;
 
 public interface UpdateTaskUsecase {
-    UpdateTaskResponse updateTask(Long memberId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files);
+    void updateTask(Long memberId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files);
 }
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
index ebdeca5e..70bee596 100644
--- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java
+++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
@@ -56,7 +56,7 @@ public class UpdateTaskService implements UpdateTaskUsecase, UpdateTaskStatusUse
 
     @Override
     @Transactional
-    public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files) {
+    public void updateTask(Long requesterId, Long taskId, UpdateTaskRequest updateTaskRequest, List<MultipartFile> files) {
         Member requester = memberService.findActiveMember(requesterId);
         Category category = categoryService.findById(updateTaskRequest.categoryId());
         Task task = taskService.findById(taskId);
@@ -67,12 +67,11 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe
         if (!updateTaskRequest.attachmentsToDelete().isEmpty()) {
             updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task);
         }
-        return TaskResponseMapper.toUpdateTaskResponse(updatedTask);
     }
 
     @Override
     @Transactional
-    public UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus) {
+    public void updateTaskStatus(Long memberId, Long taskId, TaskStatus taskStatus) {
         memberService.findActiveMember(memberId);
         memberService.findReviewer(memberId);
         Task task = taskService.findById(taskId);
@@ -86,14 +85,12 @@ public UpdateTaskResponse updateTaskStatus(Long memberId, Long taskId, TaskStatu
             Task updateTask = taskService.upsert(task);
 
             publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus()));
-            return TaskResponseMapper.toUpdateTaskResponse(updateTask);
         }
-        return TaskResponseMapper.toUpdateTaskResponse(task);
     }
 
     @Transactional
     @Override
-    public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request) {
+    public void updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request) {
         memberService.findActiveMember(userId);
         memberService.findReviewer(userId);
         Member processor = memberService.findById(request.processorId());
@@ -103,12 +100,11 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa
         Task updateTask = taskService.upsert(task);
 
         publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname());
-        return TaskResponseMapper.toUpdateTaskResponse(updateTask);
     }
 
     @Transactional
     @Override
-    public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request) {
+    public void updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request) {
         memberService.findActiveMember(userId);
         memberService.findReviewer(userId);
         Task task = taskService.findById(taskId);
@@ -116,7 +112,6 @@ public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLa
 
         task.updateLabel(label);
         Task updatetask = taskService.upsert(task);
-        return TaskResponseMapper.toUpdateTaskResponse(updatetask);
     }
 
     private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartFile> files, Task task) {

From fdfe5612f2874081bb78d04b9212eeb2750efc52 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 11:34:32 +0900
Subject: [PATCH 4/9] =?UTF-8?q?CLAP-241=20Fix:=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=9E=A0=EA=B8=88=20=EC=8B=9C=EA=B0=84=EC=9D=B4=20?=
 =?UTF-8?q?=EC=B4=88=EA=B3=BC=EB=90=90=EC=9D=84=20=EC=8B=9C=EC=97=90=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EA=B7=B8=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../adapter/inbound/security/filter/LoginAttemptFilter.java    | 3 ---
 .../server/application/service/auth/LoginAttemptService.java   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
index 9dab45ba..876023b9 100644
--- a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
+++ b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
@@ -1,8 +1,6 @@
 package clap.server.adapter.inbound.security.filter;
 
 import clap.server.application.service.auth.LoginAttemptService;
-import clap.server.exception.AuthException;
-import clap.server.exception.code.GlobalErrorCode;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -18,7 +16,6 @@
 import java.util.ArrayList;
 
 import static clap.server.adapter.inbound.security.WebSecurityUrl.LOGIN_ENDPOINT;
-import static clap.server.common.constants.AuthConstants.SESSION_ID;
 import static clap.server.common.utils.ClientIpParseUtil.getClientIp;
 
 
diff --git a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
index d3eb47df..8676419f 100644
--- a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
+++ b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
@@ -51,7 +51,7 @@ public void checkAccountIsLocked(String clientIp) {
             if (minutesSinceLastAttemptInMillis <= LOCK_TIME_DURATION) {
                 throw new AuthException(AuthErrorCode.ACCOUNT_IS_LOCKED);
             }
-            commandLoginLogPort.deleteById(clientIp);
+            else commandLoginLogPort.deleteById(clientIp);
         }
     }
 

From 0886e7f0fbfa40d75cfbea7a2c626314af8faade Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 13:54:22 +0900
Subject: [PATCH 5/9] =?UTF-8?q?CLAP-241=20Fix:=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=ED=95=84=ED=84=B0=20try=20catch=EB=A1=9C=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../security/filter/LoginAttemptFilter.java   | 28 ++++++++++++-------
 .../handler/JwtAuthenticationEntryPoint.java  |  1 -
 .../server/exception/code/AuthErrorCode.java  |  6 ++--
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
index 876023b9..a4625754 100644
--- a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
+++ b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
@@ -1,12 +1,17 @@
 package clap.server.adapter.inbound.security.filter;
 
+import clap.server.application.port.inbound.domain.LogService;
 import clap.server.application.service.auth.LoginAttemptService;
+import clap.server.application.service.log.FindApiLogsService;
+import clap.server.exception.AuthException;
+import clap.server.exception.code.AuthErrorCode;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
@@ -28,16 +33,19 @@ public class LoginAttemptFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
-        //TODO: 25.02.04 요구사항 변경에 따른 임시 주석 처리
-//        String sessionId = request.getHeader(SESSION_ID.getValue().toLowerCase());
-
-        if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
-
-//            if (sessionId == null) {
-//                throw new AuthException(GlobalErrorCode.BAD_REQUEST);
-//            }
-            String clientIp = getClientIp(request);
-            loginAttemptService.checkAccountIsLocked(clientIp);
+        try {
+            if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
+                String clientIp = getClientIp(request);
+
+                loginAttemptService.checkAccountIsLocked(clientIp);
+
+            }
+        } catch (AuthException e) {
+            log.warn("Authentication failed for IP: {}. Error: {}", getClientIp(request), e.getMessage());
+            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+            response.getWriter().write(e.getErrorCode().getCustomCode());
+            log.info("Sent error response: {}", e.getErrorCode().getCustomCode());
+            return;
         }
 
         UsernamePasswordAuthenticationToken authenticationToken =
diff --git a/src/main/java/clap/server/adapter/inbound/security/handler/JwtAuthenticationEntryPoint.java b/src/main/java/clap/server/adapter/inbound/security/handler/JwtAuthenticationEntryPoint.java
index 74ba4fc2..2dfdbe5d 100644
--- a/src/main/java/clap/server/adapter/inbound/security/handler/JwtAuthenticationEntryPoint.java
+++ b/src/main/java/clap/server/adapter/inbound/security/handler/JwtAuthenticationEntryPoint.java
@@ -23,7 +23,6 @@ public void commence(
     ) throws IOException, ServletException {
         AuthErrorCode errorCode = AuthErrorCode.UNAUTHORIZED;
 
-        response.setContentType("application/json;charset=UTF-8");
         response.setStatus(errorCode.getHttpStatus().value());
         response.getWriter().write(errorCode.getCustomCode());
     }
diff --git a/src/main/java/clap/server/exception/code/AuthErrorCode.java b/src/main/java/clap/server/exception/code/AuthErrorCode.java
index c223d41d..3898f998 100644
--- a/src/main/java/clap/server/exception/code/AuthErrorCode.java
+++ b/src/main/java/clap/server/exception/code/AuthErrorCode.java
@@ -21,9 +21,9 @@ public enum AuthErrorCode implements BaseErrorCode {
     FORBIDDEN_ACCESS_TOKEN(HttpStatus.FORBIDDEN, "AUTH_012","해당 토큰에는 엑세스 권한이 없습니다."),
     INVALID_TOKEN(HttpStatus.UNAUTHORIZED,"AUTH_013", "유효하지 않은 토큰입니다."),
     REFRESH_TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "AUTH_014", "리프레시 토큰을 찾을 수 없습니다."),
-    REFRESH_TOKEN_MISMATCHED(HttpStatus.UNAUTHORIZED, "AUTH_014", "리프레시 토큰이 일치하지 않습니다"),
-    ACCOUNT_IS_LOCKED(HttpStatus.UNAUTHORIZED, "AUTH_015", "접근할 수 없는 계정입니다."),
-    LOGIN_REQUEST_FAILED(HttpStatus.UNAUTHORIZED, "AUTH_016", "로그인에 실패하였습니다.")
+    ACCOUNT_IS_LOCKED(HttpStatus.UNAUTHORIZED, "AUTH_016", "접근할 수 없는 계정입니다."),
+    LOGIN_REQUEST_FAILED(HttpStatus.UNAUTHORIZED, "AUTH_016", "로그인에 실패하였습니다."),
+    REFRESH_TOKEN_MISMATCHED(HttpStatus.UNAUTHORIZED, "AUTH_017", "리프레시 토큰이 일치하지 않습니다"),
     ;
 
     private final HttpStatus httpStatus;

From 5ed59da9be38b7ca38775a2f4ad377222ed808dc Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 16:19:42 +0900
Subject: [PATCH 6/9] =?UTF-8?q?CLAP-241=20Feat:=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=8B=A4=ED=8C=A8=20=EC=8B=9C=EC=9D=98=20api=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EB=A5=BC=20=EA=B8=B0=EB=A1=9D=ED=95=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../security/filter/LoginAttemptFilter.java        |  3 ---
 .../port/inbound/domain/LogService.java            | 14 ++++++++++++++
 .../service/auth/LoginAttemptService.java          |  4 ++--
 .../java/clap/server/config/aop/LoggingAspect.java | 14 ++++++++++++--
 .../clap/server/domain/model/auth/LoginLog.java    | 11 +++++++++++
 5 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
index a4625754..c011a3d3 100644
--- a/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
+++ b/src/main/java/clap/server/adapter/inbound/security/filter/LoginAttemptFilter.java
@@ -1,10 +1,7 @@
 package clap.server.adapter.inbound.security.filter;
 
-import clap.server.application.port.inbound.domain.LogService;
 import clap.server.application.service.auth.LoginAttemptService;
-import clap.server.application.service.log.FindApiLogsService;
 import clap.server.exception.AuthException;
-import clap.server.exception.code.AuthErrorCode;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/src/main/java/clap/server/application/port/inbound/domain/LogService.java b/src/main/java/clap/server/application/port/inbound/domain/LogService.java
index 206ed552..d5a9b2d0 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/LogService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/LogService.java
@@ -1,10 +1,15 @@
 package clap.server.application.port.inbound.domain;
 
 import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
+import clap.server.application.port.outbound.auth.LoadLoginLogPort;
 import clap.server.application.port.outbound.log.CommandLogPort;
+import clap.server.common.utils.ClientIpParseUtil;
+import clap.server.domain.model.auth.LoginLog;
 import clap.server.domain.model.log.AnonymousLog;
 import clap.server.domain.model.log.MemberLog;
 import clap.server.domain.model.member.Member;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -16,6 +21,8 @@
 public class LogService {
     private final CommandLogPort commandLogPort;
     private final MemberService memberService;
+    private final LoadLoginLogPort loadLoginLogPort;
+    private final ObjectMapper objectMapper;
 
     public void createAnonymousLog(HttpServletRequest request,  int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) {
         AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName);
@@ -27,4 +34,11 @@ public void createMemberLog(HttpServletRequest request, int statusCode, String c
         MemberLog memberLog = MemberLog.createMemberLog(request, statusCode, customCode, logStatus,  responseBody, requestBody, member);
         commandLogPort.saveMemberLog(memberLog);
     }
+
+    public void createLoginFailedLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, String requestBody, String nickName) throws JsonProcessingException {
+        LoginLog loginLog = loadLoginLogPort.findByClientIp(ClientIpParseUtil.getClientIp(request)).orElse(null);
+        String responseBody = loginLog != null ? loginLog.toString() : null;
+        AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName);
+        commandLogPort.saveAnonymousLog(anonymousLog);
+    }
 }
diff --git a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
index 8676419f..a205ae9d 100644
--- a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
+++ b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
@@ -6,15 +6,15 @@
 import clap.server.exception.AuthException;
 import clap.server.exception.code.AuthErrorCode;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
 @RequiredArgsConstructor
 @Component
-@Slf4j
+@Transactional
 public class LoginAttemptService {
     private final LoadLoginLogPort loadLoginLogPort;
     private final CommandLoginLogPort commandLoginLogPort;
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java
index 75eea464..760e08fa 100644
--- a/src/main/java/clap/server/config/aop/LoggingAspect.java
+++ b/src/main/java/clap/server/config/aop/LoggingAspect.java
@@ -6,6 +6,7 @@
 import clap.server.application.port.inbound.domain.LogService;
 import clap.server.common.annotation.log.LogType;
 import clap.server.exception.BaseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -35,7 +36,6 @@
 @RequiredArgsConstructor
 public class LoggingAspect {
     private final ObjectMapper objectMapper;
-    private final HandlerExceptionResolver handlerExceptionResolver;
     private final LogService logService;
 
     @Pointcut("execution(* clap.server.adapter.inbound.web..*Controller.*(..))")
@@ -59,6 +59,7 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
             LogStatus logStatus = getLogType((MethodSignature) joinPoint.getSignature());
             int statusCode = HttpStatus.SC_INTERNAL_SERVER_ERROR;
             String customCode = null;
+
             if (capturedException != null) {
                 if (capturedException instanceof BaseException e) {
                     statusCode = e.getCode().getHttpStatus().value();
@@ -70,7 +71,8 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
 
             if (logStatus != null) {
                 if (LogStatus.LOGIN.equals(logStatus)) {
-                    logService.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
+                    handleLoginLog(statusCode, request, customCode, logStatus, result);
+
                 } else {
                     if (!isUserAuthenticated()) {
                         log.error("로그인 시도 로그를 기록할 수 없음");
@@ -86,6 +88,14 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable {
         return result;
     }
 
+    private void handleLoginLog(int statusCode, HttpServletRequest request, String customCode, LogStatus logStatus, Object result) throws JsonProcessingException {
+        if (statusCode == HttpStatus.SC_OK) {
+            logService.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request));
+        } else {
+            logService.createLoginFailedLog(request, statusCode, customCode, logStatus, getRequestBody(request), getNicknameFromRequestBody(request));
+        }
+    }
+
     private LogStatus getLogType(MethodSignature methodSignature) {
         if (methodSignature.getMethod().isAnnotationPresent(LogType.class)) {
             return methodSignature.getMethod().getAnnotation(LogType.class).value();
diff --git a/src/main/java/clap/server/domain/model/auth/LoginLog.java b/src/main/java/clap/server/domain/model/auth/LoginLog.java
index 54d9d3d9..f78fc54d 100644
--- a/src/main/java/clap/server/domain/model/auth/LoginLog.java
+++ b/src/main/java/clap/server/domain/model/auth/LoginLog.java
@@ -45,4 +45,15 @@ public int recordFailedAttempt() {
 	public void setLocked(boolean locked) {
 		isLocked = locked;
 	}
+
+	@Override
+	public String toString() {
+			return "{" +
+					"clientIp='" + clientIp + '\'' +
+					", attemptNickname='" + attemptNickname + '\'' +
+					", lastAttemptAt=" + lastAttemptAt +
+					", attemptCount=" + attemptCount +
+					", isLocked=" + isLocked +
+					'}';
+	}
 }

From d7837ccc28e6afd76954e24c6b772057b9167a19 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 16:21:25 +0900
Subject: [PATCH 7/9] =?UTF-8?q?CLAP-241=20Fix:=20=EC=97=90=EB=9F=AC?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A4=91=EB=B3=B5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 src/main/java/clap/server/exception/code/AuthErrorCode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/exception/code/AuthErrorCode.java b/src/main/java/clap/server/exception/code/AuthErrorCode.java
index 3898f998..acb9b5a3 100644
--- a/src/main/java/clap/server/exception/code/AuthErrorCode.java
+++ b/src/main/java/clap/server/exception/code/AuthErrorCode.java
@@ -21,7 +21,7 @@ public enum AuthErrorCode implements BaseErrorCode {
     FORBIDDEN_ACCESS_TOKEN(HttpStatus.FORBIDDEN, "AUTH_012","해당 토큰에는 엑세스 권한이 없습니다."),
     INVALID_TOKEN(HttpStatus.UNAUTHORIZED,"AUTH_013", "유효하지 않은 토큰입니다."),
     REFRESH_TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "AUTH_014", "리프레시 토큰을 찾을 수 없습니다."),
-    ACCOUNT_IS_LOCKED(HttpStatus.UNAUTHORIZED, "AUTH_016", "접근할 수 없는 계정입니다."),
+    ACCOUNT_IS_LOCKED(HttpStatus.UNAUTHORIZED, "AUTH_015", "접근할 수 없는 계정입니다."),
     LOGIN_REQUEST_FAILED(HttpStatus.UNAUTHORIZED, "AUTH_016", "로그인에 실패하였습니다."),
     REFRESH_TOKEN_MISMATCHED(HttpStatus.UNAUTHORIZED, "AUTH_017", "리프레시 토큰이 일치하지 않습니다"),
     ;

From 88382b7c22f929721be9dbf5c1a23ce64c9260ba Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 16:44:13 +0900
Subject: [PATCH 8/9] =?UTF-8?q?CLAP-241=20Style:=20attemptCount=20->=20fai?=
 =?UTF-8?q?ledCount=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../dto/log/response/AnonymousLogResponse.java    |  2 +-
 .../infrastructure/redis/log/LoginLogEntity.java  |  5 ++---
 .../clap/server/application/mapper/LogMapper.java |  4 ++--
 .../application/mapper/NotificationMapper.java    |  1 +
 .../port/inbound/domain/LoginDomainService.java   | 12 ------------
 .../service/log/FindApiLogsService.java           |  8 +-------
 .../clap/server/domain/model/auth/LoginLog.java   | 15 +++++++--------
 7 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/java/clap/server/application/port/inbound/domain/LoginDomainService.java

diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java
index f239d289..c0a17695 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java
@@ -16,6 +16,6 @@ public record AnonymousLogResponse(
         String clientIp,
         @NotBlank
         Integer statusCode,
-        int failedAttempts
+        String failedAttempts
 ) {
 }
diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java b/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java
index db083d45..fda27839 100644
--- a/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java
+++ b/src/main/java/clap/server/adapter/outbound/infrastructure/redis/log/LoginLogEntity.java
@@ -10,14 +10,13 @@
 import lombok.ToString;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
-import org.springframework.data.redis.core.index.Indexed;
 
 import java.time.LocalDateTime;
 
 @Getter
 @RedisHash("loginLog")
 @Builder
-@ToString(of = {"clientIp", "attemptNickname", "lastAttemptAt", "attemptCount", "isLocked"})
+@ToString(of = {"clientIp", "attemptNickname", "lastAttemptAt", "failedCount", "isLocked"})
 @EqualsAndHashCode(of = {"clientIp"})
 public class LoginLogEntity {
 	@Id
@@ -30,7 +29,7 @@ public class LoginLogEntity {
 	@Builder.Default
 	private LocalDateTime lastAttemptAt = LocalDateTime.now();
 
-	private int attemptCount;
+	private int failedCount;
 
 	private boolean isLocked;
 }
diff --git a/src/main/java/clap/server/application/mapper/LogMapper.java b/src/main/java/clap/server/application/mapper/LogMapper.java
index 0899c673..04e494ae 100644
--- a/src/main/java/clap/server/application/mapper/LogMapper.java
+++ b/src/main/java/clap/server/application/mapper/LogMapper.java
@@ -6,7 +6,7 @@
 import clap.server.domain.model.log.MemberLog;
 
 public class LogMapper {
-    public static AnonymousLogResponse toAnonymousLogResponse(AnonymousLog anonymousLog, int failedAttempts) {
+    public static AnonymousLogResponse toAnonymousLogResponse(AnonymousLog anonymousLog) {
         return new AnonymousLogResponse(
                 anonymousLog.getLogId(),
                 anonymousLog.getLogStatus(),
@@ -14,7 +14,7 @@ public static AnonymousLogResponse toAnonymousLogResponse(AnonymousLog anonymous
                 anonymousLog.getLoginNickname(),
                 anonymousLog.getClientIp(),
                 anonymousLog.getStatusCode(),
-                failedAttempts
+                anonymousLog.getResponseBody()
         );
     }
     public static MemberLogResponse toMemberLogResponse(MemberLog memberLog) {
diff --git a/src/main/java/clap/server/application/mapper/NotificationMapper.java b/src/main/java/clap/server/application/mapper/NotificationMapper.java
index fdacb40f..4cc1b150 100644
--- a/src/main/java/clap/server/application/mapper/NotificationMapper.java
+++ b/src/main/java/clap/server/application/mapper/NotificationMapper.java
@@ -17,6 +17,7 @@ public static FindNotificationListResponse toFindNoticeListResponse(Notification
                 notification.getReceiver().getMemberId(),
                 notification.getTask().getTitle(),
                 notification.getMessage() != null ? notification.getMessage() : null,
+                notification.isRead(),
                 notification.getCreatedAt()
         );
     }
diff --git a/src/main/java/clap/server/application/port/inbound/domain/LoginDomainService.java b/src/main/java/clap/server/application/port/inbound/domain/LoginDomainService.java
deleted file mode 100644
index d2362601..00000000
--- a/src/main/java/clap/server/application/port/inbound/domain/LoginDomainService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package clap.server.application.port.inbound.domain;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class LoginDomainService {
-
-    public int getFailedAttemptCount(String loginNickname) {
-        //TODO: 로그인 실패 횟수 계산 로직 추가
-        return 3;
-    }
-}
diff --git a/src/main/java/clap/server/application/service/log/FindApiLogsService.java b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
index 1fdc0f0a..6c2c65db 100644
--- a/src/main/java/clap/server/application/service/log/FindApiLogsService.java
+++ b/src/main/java/clap/server/application/service/log/FindApiLogsService.java
@@ -5,7 +5,6 @@
 import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest;
 import clap.server.adapter.inbound.web.dto.log.response.MemberLogResponse;
 import clap.server.application.mapper.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;
@@ -20,17 +19,12 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class FindApiLogsService implements FindApiLogsUsecase {
-
-    private final LoginDomainService loginDomainService;
     private final LoadLogPort loadLogPort;
 
     @Override
     public PageResponse<AnonymousLogResponse> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection) {
         Page<AnonymousLog> anonymousLogs = loadLogPort.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection);
-        Page<AnonymousLogResponse> anonymousLogResponses = anonymousLogs.map(anonymousLog -> {
-            int failedAttempts = loginDomainService.getFailedAttemptCount(anonymousLog.getLoginNickname());
-            return LogMapper.toAnonymousLogResponse(anonymousLog, failedAttempts);
-        });
+        Page<AnonymousLogResponse> anonymousLogResponses = anonymousLogs.map(anonymousLog -> LogMapper.toAnonymousLogResponse(anonymousLog));
         return PageResponse.from(anonymousLogResponses);
     }
 
diff --git a/src/main/java/clap/server/domain/model/auth/LoginLog.java b/src/main/java/clap/server/domain/model/auth/LoginLog.java
index f78fc54d..18ef9ec6 100644
--- a/src/main/java/clap/server/domain/model/auth/LoginLog.java
+++ b/src/main/java/clap/server/domain/model/auth/LoginLog.java
@@ -14,16 +14,16 @@ public class LoginLog {
 	private String clientIp;
 	private String attemptNickname;
 	private LocalDateTime lastAttemptAt;
-	private int attemptCount;
+	private int failedCount;
 	private boolean isLocked;
 
 	@Builder
 	private LoginLog(String clientIp, String attemptNickname, LocalDateTime lastAttemptAt,
-					 int attemptCount, boolean isLocked) {
+					 int failedCount, boolean isLocked) {
 		this.clientIp = clientIp;
 		this.attemptNickname = attemptNickname;
 		this.lastAttemptAt = lastAttemptAt;
-		this.attemptCount = attemptCount;
+		this.failedCount = failedCount;
 		this.isLocked = isLocked;
 	}
 
@@ -32,27 +32,26 @@ public static LoginLog createLoginLog(String clientIp, String attemptNickname) {
 				.clientIp(clientIp)
 				.attemptNickname(attemptNickname)
 				.lastAttemptAt(LocalDateTime.now())
-				.attemptCount(1)
+				.failedCount(1)
 				.isLocked(false)
 				.build();
 	}
 
 	public int recordFailedAttempt() {
-		this.attemptCount++;
-		return this.attemptCount;
+		this.failedCount++;
+		return this.failedCount;
 	}
 
 	public void setLocked(boolean locked) {
 		isLocked = locked;
 	}
 
-	@Override
 	public String toString() {
 			return "{" +
 					"clientIp='" + clientIp + '\'' +
 					", attemptNickname='" + attemptNickname + '\'' +
 					", lastAttemptAt=" + lastAttemptAt +
-					", attemptCount=" + attemptCount +
+					", failedCount=" + failedCount +
 					", isLocked=" + isLocked +
 					'}';
 	}

From f6ad78e4a8c26b1331414a4fce80bc3f60b9517c Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 4 Feb 2025 16:52:23 +0900
Subject: [PATCH 9/9] =?UTF-8?q?CLAP-241=20Refactor:=20=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=EA=B0=92=EB=A7=8C=20=EC=B6=94=EC=B6=9C=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- 관련: #256
---
 .../server/application/port/inbound/domain/LogService.java   | 2 +-
 src/main/java/clap/server/domain/model/auth/LoginLog.java    | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/clap/server/application/port/inbound/domain/LogService.java b/src/main/java/clap/server/application/port/inbound/domain/LogService.java
index d5a9b2d0..05077cd9 100644
--- a/src/main/java/clap/server/application/port/inbound/domain/LogService.java
+++ b/src/main/java/clap/server/application/port/inbound/domain/LogService.java
@@ -37,7 +37,7 @@ public void createMemberLog(HttpServletRequest request, int statusCode, String c
 
     public void createLoginFailedLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, String requestBody, String nickName) throws JsonProcessingException {
         LoginLog loginLog = loadLoginLogPort.findByClientIp(ClientIpParseUtil.getClientIp(request)).orElse(null);
-        String responseBody = loginLog != null ? loginLog.toString() : null;
+        String responseBody = loginLog != null ? loginLog.toSummaryString() : null;
         AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName);
         commandLogPort.saveAnonymousLog(anonymousLog);
     }
diff --git a/src/main/java/clap/server/domain/model/auth/LoginLog.java b/src/main/java/clap/server/domain/model/auth/LoginLog.java
index 18ef9ec6..11f89c19 100644
--- a/src/main/java/clap/server/domain/model/auth/LoginLog.java
+++ b/src/main/java/clap/server/domain/model/auth/LoginLog.java
@@ -46,11 +46,8 @@ public void setLocked(boolean locked) {
 		isLocked = locked;
 	}
 
-	public String toString() {
+	public String toSummaryString() {
 			return "{" +
-					"clientIp='" + clientIp + '\'' +
-					", attemptNickname='" + attemptNickname + '\'' +
-					", lastAttemptAt=" + lastAttemptAt +
 					", failedCount=" + failedCount +
 					", isLocked=" + isLocked +
 					'}';