From bd696d46ca75e625dbaf45d51b472e0160b6d83a Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 12:32:35 +0900
Subject: [PATCH 1/6] =?UTF-8?q?CLAP-355=20Fix:=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=8B=9D=EB=B3=84=EC=9E=90=20=EB=8B=89=EB=84=A4?=
 =?UTF-8?q?=EC=9E=84=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #448
---
 .../security/filter/LoginAttemptFilter.java   | 20 +++++--
 .../inbound/web/auth/AuthController.java      |  5 +-
 .../web/dto/auth/request/LoginRequest.java    |  6 +--
 .../redis/log/LoginLogAdapter.java            |  5 +-
 .../redis/log/LoginLogEntity.java             | 10 ++--
 .../auth/CheckAccountLockStatusUseCase.java   |  2 +-
 .../auth/loginLog/LoadLoginLogPort.java       |  2 +-
 .../application/service/auth/AuthService.java |  4 +-
 .../service/auth/LoginAttemptService.java     | 16 +++---
 .../application/service/log/LogService.java   |  2 +-
 .../config/security/SecurityFilterConfig.java |  1 +
 .../server/domain/model/auth/LoginLog.java    | 54 +++++++++----------
 .../service/auth/LoginAttemptServiceTest.java | 45 ++++++++--------
 13 files changed, 92 insertions(+), 80 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 2fd65036..89576132 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,8 @@
 package clap.server.adapter.inbound.security.filter;
 
 import clap.server.application.port.inbound.auth.CheckAccountLockStatusUseCase;
-import clap.server.application.service.auth.LoginAttemptService;
 import clap.server.exception.AuthException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -14,12 +14,15 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.util.ContentCachingRequestWrapper;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 
 import static clap.server.adapter.inbound.security.WebSecurityUrl.LOGIN_ENDPOINT;
 import static clap.server.common.utils.ClientIpParseUtil.getClientIp;
+import static clap.server.common.utils.ParseNicknameUtil.getNicknameFromRequestBody;
 
 
 @RequiredArgsConstructor
@@ -33,9 +36,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             throws ServletException, IOException {
         try {
             if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
-                String clientIp = getClientIp(request);
-
-                checkAccountLockStatusUseCase.checkAccountIsLocked(clientIp);
+                String nickname = request.getParameter("nickname");
+                checkAccountLockStatusUseCase.checkAccountIsLocked(nickname);
 
             }
         } catch (AuthException e) {
@@ -54,4 +56,14 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         filterChain.doFilter(request, response);
     }
 
+    private String getRequestBody(HttpServletRequest request) {
+        try {
+            ContentCachingRequestWrapper cachingRequest = (ContentCachingRequestWrapper) request;
+            byte[] content = cachingRequest.getContentAsByteArray();
+            return new String(content, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            return "요청 바디의 내용을 읽을 수 없음";
+        }
+    }
+
 }
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 5325a16d..5e77632f 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
@@ -12,6 +12,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -32,11 +33,11 @@ public class AuthController {
     @LogType(LogStatus.LOGIN)
     @Operation(summary = "로그인 API")
     @PostMapping("/login")
-    public ResponseEntity<LoginResponse> login(
+    public ResponseEntity<LoginResponse> login(@RequestParam @NotBlank String nickname,
                                                @RequestBody LoginRequest request,
                                                HttpServletRequest httpRequest) {
         String clientIp = getClientIp(httpRequest);
-        LoginResponse response = loginUsecase.login(request.nickname(), request.password(), clientIp);
+        LoginResponse response = loginUsecase.login(nickname, request.password(), clientIp);
         return ResponseEntity.ok(response);
     }
 
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java
index 51e2c1e8..dccaea11 100644
--- a/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java
+++ b/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java
@@ -1,11 +1,9 @@
 package clap.server.adapter.inbound.web.dto.auth.request;
 
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
 
 public record LoginRequest(
-        @NotNull
-        String nickname,
-        @NotNull
+        @NotBlank
         String password
 ) {
 }
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 e747ec65..4a2bf8ad 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
@@ -25,7 +25,8 @@ public void deleteById(String clientIp) {
 		loginLogRepository.deleteById(clientIp);
 	}
 
-	public Optional<LoginLog> findByClientIp(String clientIp) {
-		return loginLogRepository.findById(clientIp).map(loginLogMapper::toDomain);
+	@Override
+	public Optional<LoginLog> findByNickname(String nickname) {
+		return loginLogRepository.findById(nickname).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 fda27839..bab88141 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
@@ -14,15 +14,15 @@
 import java.time.LocalDateTime;
 
 @Getter
-@RedisHash("loginLog")
+@RedisHash(value = "loginLog", timeToLive = 3600)
 @Builder
-@ToString(of = {"clientIp", "attemptNickname", "lastAttemptAt", "failedCount", "isLocked"})
-@EqualsAndHashCode(of = {"clientIp"})
+@ToString(of = {"nickname", "clientIp", "lastAttemptAt", "failedCount", "isLocked"})
+@EqualsAndHashCode(of = {"nickname"})
 public class LoginLogEntity {
 	@Id
-	private String clientIp;
+	private String nickname;
 
-	private String attemptNickname;
+	private String clientIp;
 
 	@JsonSerialize(using = ToStringSerializer.class)
 	@JsonDeserialize(using = LocalDateTimeDeserializer.class)
diff --git a/src/main/java/clap/server/application/port/inbound/auth/CheckAccountLockStatusUseCase.java b/src/main/java/clap/server/application/port/inbound/auth/CheckAccountLockStatusUseCase.java
index d102e1ab..05f5d3f7 100644
--- a/src/main/java/clap/server/application/port/inbound/auth/CheckAccountLockStatusUseCase.java
+++ b/src/main/java/clap/server/application/port/inbound/auth/CheckAccountLockStatusUseCase.java
@@ -1,5 +1,5 @@
 package clap.server.application.port.inbound.auth;
 
 public interface CheckAccountLockStatusUseCase {
-    void checkAccountIsLocked(String clientIp);
+    void checkAccountIsLocked(String nickname);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/auth/loginLog/LoadLoginLogPort.java b/src/main/java/clap/server/application/port/outbound/auth/loginLog/LoadLoginLogPort.java
index 66c73d42..5e3d1384 100644
--- a/src/main/java/clap/server/application/port/outbound/auth/loginLog/LoadLoginLogPort.java
+++ b/src/main/java/clap/server/application/port/outbound/auth/loginLog/LoadLoginLogPort.java
@@ -5,5 +5,5 @@
 import java.util.Optional;
 
 public interface LoadLoginLogPort {
-    Optional<LoginLog> findByClientIp(String clientIp);
+    Optional<LoginLog> findByNickname(String nickname);
 }
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 6aa030ac..e65f82f2 100644
--- a/src/main/java/clap/server/application/service/auth/AuthService.java
+++ b/src/main/java/clap/server/application/service/auth/AuthService.java
@@ -46,7 +46,7 @@ public LoginResponse login(String nickname, String password, String clientIp) {
 
         CustomJwts jwtTokens = manageTokenService.issueTokens(member);
         refreshTokenService.saveRefreshToken(manageTokenService.issueRefreshToken(member.getMemberId()));
-        loginAttemptService.resetFailedAttempts(clientIp);
+        loginAttemptService.resetFailedAttempts(nickname);
         return AuthResponseMapper.toLoginResponse(jwtTokens.accessToken(), jwtTokens.refreshToken());
     }
 
@@ -71,7 +71,7 @@ private void deleteAccessToken(Long memberId, String accessToken) {
     private Member getMember(String inputNickname, String clientIp) {
         return loadMemberPort.findByNickname(inputNickname).orElseThrow(() ->
         {
-            loginAttemptService.recordFailedAttempt(clientIp, inputNickname);
+            loginAttemptService.recordFailedAttempt(inputNickname, clientIp);
             return 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 282cbb6d..ecfe124e 100644
--- a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
+++ b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
@@ -22,10 +22,10 @@ public class LoginAttemptService implements CheckAccountLockStatusUseCase {
     private static final int MAX_FAILED_ATTEMPTS = 5;
     private static final long LOCK_TIME_DURATION = 30 * 60 * 1000; // 30분 (밀리초)
 
-    public void recordFailedAttempt(String clientIp, String attemptNickname) {
-        LoginLog loginLog = loadLoginLogPort.findByClientIp(clientIp).orElse(null);
+    public void recordFailedAttempt(String nickname, String clientIp) {
+        LoginLog loginLog = loadLoginLogPort.findByNickname(clientIp).orElse(null);
         if (loginLog == null) {
-            loginLog = LoginLog.createLoginLog(clientIp, attemptNickname);
+            loginLog = LoginLog.createLoginLog(nickname, clientIp);
         } else {
             int attemptCount = loginLog.recordFailedAttempt();
             if (attemptCount >= MAX_FAILED_ATTEMPTS) {
@@ -38,8 +38,8 @@ public void recordFailedAttempt(String clientIp, String attemptNickname) {
     }
 
     @Override
-    public void checkAccountIsLocked(String clientIp) {
-        LoginLog loginLog = loadLoginLogPort.findByClientIp(clientIp).orElse(null);
+    public void checkAccountIsLocked(String nickname) {
+        LoginLog loginLog = loadLoginLogPort.findByNickname(nickname).orElse(null);
         if (loginLog == null) {
             return;
         }
@@ -53,12 +53,12 @@ public void checkAccountIsLocked(String clientIp) {
             if (minutesSinceLastAttemptInMillis <= LOCK_TIME_DURATION) {
                 throw new AuthException(AuthErrorCode.ACCOUNT_IS_LOCKED);
             }
-            else commandLoginLogPort.deleteById(clientIp);
+            else commandLoginLogPort.deleteById(nickname);
         }
     }
 
 
-    public void resetFailedAttempts(String clientIp) {
-        commandLoginLogPort.deleteById(clientIp);
+    public void resetFailedAttempts(String nickname) {
+        commandLoginLogPort.deleteById(nickname);
     }
 }
diff --git a/src/main/java/clap/server/application/service/log/LogService.java b/src/main/java/clap/server/application/service/log/LogService.java
index 5d527820..019ef2ba 100644
--- a/src/main/java/clap/server/application/service/log/LogService.java
+++ b/src/main/java/clap/server/application/service/log/LogService.java
@@ -35,7 +35,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) {
-        LoginLog loginLog = loadLoginLogPort.findByClientIp(ClientIpParseUtil.getClientIp(request)).orElse(null);
+        LoginLog loginLog = loadLoginLogPort.findByNickname(nickName).orElse(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/config/security/SecurityFilterConfig.java b/src/main/java/clap/server/config/security/SecurityFilterConfig.java
index e3994c5a..6be22d7d 100644
--- a/src/main/java/clap/server/config/security/SecurityFilterConfig.java
+++ b/src/main/java/clap/server/config/security/SecurityFilterConfig.java
@@ -6,6 +6,7 @@
 import clap.server.application.port.outbound.auth.forbidden.ForbiddenTokenPort;
 import clap.server.application.port.outbound.auth.JwtProvider;
 import clap.server.application.service.auth.LoginAttemptService;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
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 29792ede..887dbb0d 100644
--- a/src/main/java/clap/server/domain/model/auth/LoginLog.java
+++ b/src/main/java/clap/server/domain/model/auth/LoginLog.java
@@ -11,35 +11,35 @@
 @SuperBuilder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class LoginLog {
-	private String clientIp;
-	private String attemptNickname;
-	private LocalDateTime lastAttemptAt;
-	private int failedCount;
-	private boolean isLocked;
+    private String nickname;
+    private String clientIp;
+    private LocalDateTime lastAttemptAt;
+    private int failedCount;
+    private boolean isLocked;
 
-	public static LoginLog createLoginLog(String clientIp, String attemptNickname) {
-		return LoginLog.builder()
-				.clientIp(clientIp)
-				.attemptNickname(attemptNickname)
-				.lastAttemptAt(LocalDateTime.now())
-				.failedCount(1)
-				.isLocked(false)
-				.build();
-	}
+    public static LoginLog createLoginLog(String nickname, String clientIp) {
+        return LoginLog.builder()
+                .nickname(nickname)
+                .clientIp(clientIp)
+                .lastAttemptAt(LocalDateTime.now())
+                .failedCount(1)
+                .isLocked(false)
+                .build();
+    }
 
-	public int recordFailedAttempt() {
-		this.failedCount++;
-		return this.failedCount;
-	}
+    public int recordFailedAttempt() {
+        this.failedCount++;
+        return this.failedCount;
+    }
 
-	public void setLocked(boolean locked) {
-		isLocked = locked;
-	}
+    public void setLocked(boolean locked) {
+        isLocked = locked;
+    }
 
-	public String toSummaryString() {
-			return "{" +
-					", failedCount=" + failedCount +
-					", isLocked=" + isLocked +
-					'}';
-	}
+    public String toSummaryString() {
+        return "{" +
+                "failedCount=" + failedCount +
+                ", isLocked=" + isLocked +
+                '}';
+    }
 }
diff --git a/src/test/java/clap/server/application/service/auth/LoginAttemptServiceTest.java b/src/test/java/clap/server/application/service/auth/LoginAttemptServiceTest.java
index 5bfdc524..c22581cd 100644
--- a/src/test/java/clap/server/application/service/auth/LoginAttemptServiceTest.java
+++ b/src/test/java/clap/server/application/service/auth/LoginAttemptServiceTest.java
@@ -31,14 +31,15 @@ class LoginAttemptServiceTest {
     @Mock
     private CommandLoginLogPort commandLoginLogPort;
 
-    private final String clientIp = "192.168.1.1";
+    private static final String nickname = "testUser";
+    private static final String clientIp = "192.168.1.1";
     private LoginLog existingLoginLog;
     private LoginLog lockedAccountLoginLog;
     private LoginLog lockTimeExpiredLoginLog;
 
-    public static LoginLog createLoginLog(String clientIp, int count, boolean isLocked, LocalDateTime lastAttemptAt){
+    public static LoginLog createLoginLog(int count, boolean isLocked, LocalDateTime lastAttemptAt){
         return LoginLog.builder()
-                .attemptNickname("testUser")
+                .nickname(nickname)
                 .lastAttemptAt(lastAttemptAt)
                 .failedCount(count)
                 .isLocked(isLocked)
@@ -48,18 +49,18 @@ public static LoginLog createLoginLog(String clientIp, int count, boolean isLock
 
     @BeforeEach
     void setUp() {
-        existingLoginLog = createLoginLog(clientIp, 3, false, LocalDateTime.now());
-        lockedAccountLoginLog = createLoginLog(clientIp, 5, true, LocalDateTime.now());
-        lockTimeExpiredLoginLog = createLoginLog(clientIp, 5, true, LocalDateTime.now().minusMinutes(31));
+        existingLoginLog = createLoginLog(3, false, LocalDateTime.now());
+        lockedAccountLoginLog = createLoginLog(5, true, LocalDateTime.now());
+        lockTimeExpiredLoginLog = createLoginLog(5, true, LocalDateTime.now().minusMinutes(31));
     }
 
     @Test
-    @DisplayName("로그인에 실패하면 IP를 통해 로그인 실패 기록이 저장된다.")
+    @DisplayName("로그인에 실패하면 nickname을 통해 로그인 실패 기록이 저장된다.")
     void recordFailedAttempt_NewIP() {
         String nickname = "testUser";
-        when(loadLoginLogPort.findByClientIp(clientIp)).thenReturn(Optional.empty());
+        when(loadLoginLogPort.findByNickname(nickname)).thenReturn(Optional.empty());
 
-        loginAttemptService.recordFailedAttempt(clientIp, nickname);
+        loginAttemptService.recordFailedAttempt(nickname, nickname);
 
         verify(commandLoginLogPort).save(any(LoginLog.class));
     }
@@ -67,12 +68,11 @@ void recordFailedAttempt_NewIP() {
     @Test
     @DisplayName("기존 IP로 로그인에 실패하면 로그인 실패 기록이 갱신된다.")
     void recordFailedAttempt_ExistingIP_BeforeLock() {
-        String nickname = "testUser";
         LoginLog existingLog = existingLoginLog;;
 
-        when(loadLoginLogPort.findByClientIp(clientIp)).thenReturn(Optional.of(existingLog));
+        when(loadLoginLogPort.findByNickname(nickname)).thenReturn(Optional.of(existingLog));
 
-        loginAttemptService.recordFailedAttempt(clientIp, nickname);
+        loginAttemptService.recordFailedAttempt(nickname, clientIp);
 
         verify(commandLoginLogPort).save(existingLog);
         assertEquals(4, existingLog.getFailedCount());
@@ -80,15 +80,14 @@ void recordFailedAttempt_ExistingIP_BeforeLock() {
     }
 
     @Test
-    @DisplayName("기존 IP로 로그인에 5회 실패하면 계정이 잠긴다.")
+    @DisplayName("로그인에 5회 실패하면 계정이 잠긴다.")
     void recordFailedAttempt_AccountLock() {
-        String nickname = "testUser";
         LoginLog existingLog = existingLoginLog;
         existingLog.recordFailedAttempt();
 
-        when(loadLoginLogPort.findByClientIp(clientIp)).thenReturn(Optional.of(existingLog));
+        when(loadLoginLogPort.findByNickname(nickname)).thenReturn(Optional.of(existingLog));
 
-        assertThrows(AuthException.class, () -> loginAttemptService.recordFailedAttempt(clientIp, nickname));
+        assertThrows(AuthException.class, () -> loginAttemptService.recordFailedAttempt(nickname,clientIp ));
 
         verify(commandLoginLogPort).save(existingLog);
         assertTrue(existingLog.isLocked());
@@ -100,9 +99,9 @@ void checkAccountIsLocked_NotLocked() {
         LoginLog loginLog = existingLoginLog;
         loginLog.setLocked(false);
 
-        when(loadLoginLogPort.findByClientIp(clientIp)).thenReturn(Optional.of(loginLog));
+        when(loadLoginLogPort.findByNickname(loginLog.getNickname())).thenReturn(Optional.of(loginLog));
 
-        assertDoesNotThrow(() -> loginAttemptService.checkAccountIsLocked(clientIp));
+        assertDoesNotThrow(() -> loginAttemptService.checkAccountIsLocked(loginLog.getNickname()));
     }
 
     @Test
@@ -110,10 +109,10 @@ void checkAccountIsLocked_NotLocked() {
     void checkAccountIsLocked_Locked() {
         LoginLog loginLog = lockedAccountLoginLog;
 
-        when(loadLoginLogPort.findByClientIp(clientIp)).thenReturn(Optional.of(loginLog));
+        when(loadLoginLogPort.findByNickname(loginLog.getNickname())).thenReturn(Optional.of(loginLog));
 
         AuthException exception = assertThrows(AuthException.class, () ->
-                loginAttemptService.checkAccountIsLocked(clientIp)
+                loginAttemptService.checkAccountIsLocked(loginLog.getNickname())
         );
 
         assertEquals(AuthErrorCode.ACCOUNT_IS_LOCKED.getMessage(), exception.getMessage(),
@@ -125,11 +124,11 @@ void checkAccountIsLocked_Locked() {
     void checkAccountIsLocked_LockTimeExpired() {
         LoginLog loginLog = lockTimeExpiredLoginLog;
 
-        when(loadLoginLogPort.findByClientIp(clientIp)).thenReturn(Optional.of(loginLog));
+        when(loadLoginLogPort.findByNickname(loginLog.getNickname())).thenReturn(Optional.of(loginLog));
 
-        loginAttemptService.checkAccountIsLocked(clientIp);
+        loginAttemptService.checkAccountIsLocked(loginLog.getNickname());
 
-        verify(commandLoginLogPort).deleteById(clientIp);
+        verify(commandLoginLogPort).deleteById(loginLog.getNickname());
     }
 
 }

From 39295c79f34e85ef68b60135208b50c25b90a570 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 12:47:17 +0900
Subject: [PATCH 2/6] =?UTF-8?q?CLAP-355=20Fix:=20validation=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #448
---
 .../domain/policy/member/ManagerDepartmentPolicy.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/clap/server/domain/policy/member/ManagerDepartmentPolicy.java b/src/main/java/clap/server/domain/policy/member/ManagerDepartmentPolicy.java
index 08f8f6c1..4b92d3f1 100644
--- a/src/main/java/clap/server/domain/policy/member/ManagerDepartmentPolicy.java
+++ b/src/main/java/clap/server/domain/policy/member/ManagerDepartmentPolicy.java
@@ -9,9 +9,10 @@
 @Policy
 public class ManagerDepartmentPolicy {
     public void validateDepartment(final Department department, final MemberRole memberRole) {
-        if (!(department.isManager()
-                && memberRole == MemberRole.ROLE_MANAGER)) {
-            throw new DomainException(MemberErrorCode.MANAGER_PERMISSION_DENIED);
+        if (!department.isManager() ){
+            if(memberRole == MemberRole.ROLE_MANAGER){
+                throw new DomainException(MemberErrorCode.MANAGER_PERMISSION_DENIED);
+            }
         }
     }
 }

From cf75dc4221485c11ead0cd7dc20f3933c82ced70 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 13:29:44 +0900
Subject: [PATCH 3/6] =?UTF-8?q?CLAP-355=20Fix:=20=EB=A7=A4=EA=B0=9C?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=20=EB=A7=A4=ED=95=91=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #448
---
 .../java/clap/server/application/service/auth/AuthService.java  | 2 +-
 .../server/application/service/auth/LoginAttemptService.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 e65f82f2..75b4667c 100644
--- a/src/main/java/clap/server/application/service/auth/AuthService.java
+++ b/src/main/java/clap/server/application/service/auth/AuthService.java
@@ -78,7 +78,7 @@ private Member getMember(String inputNickname, String clientIp) {
 
     private void validatePassword(String inputPassword, String encodedPassword, String inputNickname, String clientIp) {
         if (!passwordEncoder.matches(inputPassword, encodedPassword)) {
-            loginAttemptService.recordFailedAttempt(clientIp, inputNickname);
+            loginAttemptService.recordFailedAttempt(inputNickname, clientIp);
             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 ecfe124e..415724b2 100644
--- a/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
+++ b/src/main/java/clap/server/application/service/auth/LoginAttemptService.java
@@ -23,7 +23,7 @@ public class LoginAttemptService implements CheckAccountLockStatusUseCase {
     private static final long LOCK_TIME_DURATION = 30 * 60 * 1000; // 30분 (밀리초)
 
     public void recordFailedAttempt(String nickname, String clientIp) {
-        LoginLog loginLog = loadLoginLogPort.findByNickname(clientIp).orElse(null);
+        LoginLog loginLog = loadLoginLogPort.findByNickname(nickname).orElse(null);
         if (loginLog == null) {
             loginLog = LoginLog.createLoginLog(nickname, clientIp);
         } else {

From 7bcc4fcbe81e417eac7c9c75e20d9ac420a05448 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:32:33 +0900
Subject: [PATCH 4/6] =?UTF-8?q?CLAP-356=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95=EC=8B=9C=20=EA=B3=A0=EC=9C=A0?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B0=8F=20=EC=A0=9C=EB=AA=A9=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* CLAP-343 fix: 카테고리 고유코드 및 제목 중복 가능한 문제 수정

<footer>
- #443

* CLAP-343 fix: 카테고리 고유코드 및 제목 중복 가능한 문제 수정

<footer>
- #443

* CLAP-356 fix: 카테고리 수정시 고유코드 및 제목 중복 가능한 문제 수정

<footer>
- #449
---
 .../outbound/persistense/CategoryPersistenceAdapter.java        | 2 +-
 .../persistense/repository/task/CategoryRepository.java         | 2 +-
 .../server/application/service/admin/UpdateCategoryService.java | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
index ed9f1a7f..e99883db 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java
@@ -51,7 +51,7 @@ public List<Category> findSubCategory() {
 
     @Override
     public boolean existsByNameOrCode(String name, String code) {
-        return categoryRepository.existsByNameOrCode(name, code);
+        return categoryRepository.existsByNameOrCodeAndIsDeletedFalse(name, code);
     }
 
     @Override
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
index a5bec1e3..5cdcc2b1 100644
--- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
+++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/CategoryRepository.java
@@ -12,5 +12,5 @@ public interface CategoryRepository extends JpaRepository<CategoryEntity, Long>
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNull();
     List<CategoryEntity> findByIsDeletedFalseAndMainCategoryIsNotNull();
 
-    boolean existsByNameOrCode(String name, String code);
+    boolean existsByNameOrCodeAndIsDeletedFalse(String name, String code);
 }
\ No newline at end of file
diff --git a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
index 29ac6249..cae97710 100644
--- a/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
+++ b/src/main/java/clap/server/application/service/admin/UpdateCategoryService.java
@@ -12,6 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import static clap.server.exception.code.MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND;
+import static clap.server.exception.code.TaskErrorCode.CATEGORY_DUPLICATE;
 import static clap.server.exception.code.TaskErrorCode.CATEGORY_NOT_FOUND;
 
 @ApplicationService
@@ -25,6 +26,7 @@ public class UpdateCategoryService implements UpdateCategoryUsecase {
     @Transactional
     public void updateCategory(Long adminId, Long categoryId, String name, String code, String descriptionExample) {
         Member admin = loadMemberPort.findActiveMemberById(adminId).orElseThrow(() -> new ApplicationException(ACTIVE_MEMBER_NOT_FOUND));
+        if (loadCategoryPort.existsByNameOrCode(name, code)) throw new ApplicationException(CATEGORY_DUPLICATE);
         Category category = loadCategoryPort.findById(categoryId)
                 .orElseThrow(() -> new ApplicationException(CATEGORY_NOT_FOUND));
         category.updateCategory(admin, name, code, descriptionExample);

From 92fc430aa9c0a90763816e14f9fa3b0ae6734b2e Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 13:33:23 +0900
Subject: [PATCH 5/6] =?UTF-8?q?CLAP-355=20Fix:=20=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #448
---
 .../adapter/inbound/security/filter/LoginAttemptFilter.java     | 2 --
 1 file changed, 2 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 89576132..7d5110f8 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
@@ -2,7 +2,6 @@
 
 import clap.server.application.port.inbound.auth.CheckAccountLockStatusUseCase;
 import clap.server.exception.AuthException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -22,7 +21,6 @@
 
 import static clap.server.adapter.inbound.security.WebSecurityUrl.LOGIN_ENDPOINT;
 import static clap.server.common.utils.ClientIpParseUtil.getClientIp;
-import static clap.server.common.utils.ParseNicknameUtil.getNicknameFromRequestBody;
 
 
 @RequiredArgsConstructor

From 9f72ce1c825cfa18c0517a2143f59626e437c282 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Mon, 10 Feb 2025 13:40:52 +0900
Subject: [PATCH 6/6] =?UTF-8?q?CLAP-355=20Fix:=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #448
---
 .../clap/server/application/service/auth/AuthServiceTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/clap/server/application/service/auth/AuthServiceTest.java b/src/test/java/clap/server/application/service/auth/AuthServiceTest.java
index b090fbd6..ca836ba8 100644
--- a/src/test/java/clap/server/application/service/auth/AuthServiceTest.java
+++ b/src/test/java/clap/server/application/service/auth/AuthServiceTest.java
@@ -67,7 +67,7 @@ void loginSuccess() {
         assertNotNull(response);
         assertEquals(jwtTokens.accessToken(), response.accessToken());
         assertEquals(jwtTokens.refreshToken(), response.refreshToken());
-        verify(loginAttemptService).resetFailedAttempts(clientIp);
+        verify(loginAttemptService).resetFailedAttempts(nickname);
         verify(refreshTokenService).saveRefreshToken(any());
     }
 
@@ -85,7 +85,7 @@ void loginFailureWrongPassword() {
 
         // When & Then
         assertThrows(AuthException.class, () -> authService.login(nickname, inputPassword, clientIp));
-        verify(loginAttemptService).recordFailedAttempt(clientIp, nickname);
+        verify(loginAttemptService).recordFailedAttempt(nickname, clientIp);
     }