From e326ee503bd5031971a5ebb10872ecb7ab57f0df Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 11 Feb 2025 15:29:03 +0900
Subject: [PATCH 1/3] =?UTF-8?q?CLAP-379=20Fix:=20=EB=B9=84=EB=B0=80?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=EB=88=84?=
 =?UTF-8?q?=EB=9D=BD=EB=90=9C=20=EB=AC=B8=EC=9E=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annotation/validation/password/PasswordValidator.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java b/src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java
index 03b82fd7..e37207ab 100644
--- a/src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java
+++ b/src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java
@@ -7,7 +7,7 @@
 
 public class PasswordValidator implements ConstraintValidator<ValidPassword, String> {
 
-    private static final String PASSWORD_REGEX = "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)(?=.*[!@#$%^&*()_+={}\\[\\]:;\"'<>,.?/\\\\|]).{8,}$";
+    private static final String PASSWORD_REGEX = "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)(?=.*[!@#$%^&*()_+{}\\[\\]:;<>,.?/~`-]).{8,20}$";
 
     @Override
     public boolean isValid(String password, ConstraintValidatorContext context) {

From 0668fa00f6c5a8fae92a83055a0e5f411c38829f Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 11 Feb 2025 15:36:27 +0900
Subject: [PATCH 2/3] =?UTF-8?q?CLAP-379=20Refactor:=20=EB=B9=84=EB=B0=80?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=EC=A0=95?=
 =?UTF-8?q?=EC=B1=85=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #484
---
 .../annotation/validation/password/ValidPassword.java      | 3 ++-
 .../policy/member/PasswordPolicy.java}                     | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename src/main/java/clap/server/{common/annotation/validation/password/PasswordValidator.java => domain/policy/member/PasswordPolicy.java} (63%)

diff --git a/src/main/java/clap/server/common/annotation/validation/password/ValidPassword.java b/src/main/java/clap/server/common/annotation/validation/password/ValidPassword.java
index 8b8b436b..bd7e0b78 100644
--- a/src/main/java/clap/server/common/annotation/validation/password/ValidPassword.java
+++ b/src/main/java/clap/server/common/annotation/validation/password/ValidPassword.java
@@ -1,5 +1,6 @@
 package clap.server.common.annotation.validation.password;
 
+import clap.server.domain.policy.member.PasswordPolicy;
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
 
@@ -10,7 +11,7 @@
 
 @Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy = PasswordValidator.class)
+@Constraint(validatedBy = PasswordPolicy.class)
 public @interface ValidPassword {
 
     String message() default "대문자, 소문자, 숫자, 특수문자를 포함하며 8자 이상이어야 합니다.";
diff --git a/src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java b/src/main/java/clap/server/domain/policy/member/PasswordPolicy.java
similarity index 63%
rename from src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java
rename to src/main/java/clap/server/domain/policy/member/PasswordPolicy.java
index e37207ab..2237ee9e 100644
--- a/src/main/java/clap/server/common/annotation/validation/password/PasswordValidator.java
+++ b/src/main/java/clap/server/domain/policy/member/PasswordPolicy.java
@@ -1,11 +1,14 @@
-package clap.server.common.annotation.validation.password;
+package clap.server.domain.policy.member;
 
+import clap.server.common.annotation.architecture.Policy;
+import clap.server.common.annotation.validation.password.ValidPassword;
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
 
 import java.util.regex.Pattern;
 
-public class PasswordValidator implements ConstraintValidator<ValidPassword, String> {
+@Policy
+public class PasswordPolicy implements ConstraintValidator<ValidPassword, String> {
 
     private static final String PASSWORD_REGEX = "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)(?=.*[!@#$%^&*()_+{}\\[\\]:;<>,.?/~`-]).{8,20}$";
 

From 79dba17a59a6442e1fb6137170af0909b3de8252 Mon Sep 17 00:00:00 2001
From: joowojr <joowojr@gmail.com>
Date: Tue, 11 Feb 2025 15:36:42 +0900
Subject: [PATCH 3/3] =?UTF-8?q?CLAP-379=20Test:=20=EB=B9=84=EB=B0=80?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=A0=95=EA=B7=9C=EC=8B=9D=20=EC=A0=95?=
 =?UTF-8?q?=EC=B1=85=20=EB=8B=A8=EC=9C=84=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<footer>
- #484
---
 .../policy/member/PasswordPolicyTest.java     | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 src/test/java/clap/server/domain/policy/member/PasswordPolicyTest.java

diff --git a/src/test/java/clap/server/domain/policy/member/PasswordPolicyTest.java b/src/test/java/clap/server/domain/policy/member/PasswordPolicyTest.java
new file mode 100644
index 00000000..6a39df2f
--- /dev/null
+++ b/src/test/java/clap/server/domain/policy/member/PasswordPolicyTest.java
@@ -0,0 +1,85 @@
+package clap.server.domain.policy.member;
+
+import jakarta.validation.ConstraintValidatorContext;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+class PasswordPolicyTest {
+
+    private PasswordPolicy passwordPolicy;
+    private ConstraintValidatorContext context;
+
+    @BeforeEach
+    void setUp() {
+        passwordPolicy = new PasswordPolicy();
+        context = mock(ConstraintValidatorContext.class); // Mock ConstraintValidatorContext
+    }
+
+    @Test
+    @DisplayName("유효한 비밀번호 - 대문자, 소문자, 숫자, 특수문자 포함")
+    void validPassword() {
+        String validPassword = "Abcdef1!";
+        boolean result = passwordPolicy.isValid(validPassword, context);
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - 대문자 없음")
+    void invalidPassword_noUpperCase() {
+        String invalidPassword = "abcdef1!";
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - 소문자 없음")
+    void invalidPassword_noLowerCase() {
+        String invalidPassword = "ABCDEF1!";
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - 숫자 없음")
+    void invalidPassword_noDigit() {
+        String invalidPassword = "Abcdefgh!";
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - 특수문자 없음")
+    void invalidPassword_noSpecialCharacter() {
+        String invalidPassword = "Abcdefg1";
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - 길이가 8자 미만")
+    void invalidPassword_tooShort() {
+        String invalidPassword = "Ab1!";
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - 길이가 20자 초과")
+    void invalidPassword_tooLong() {
+        String invalidPassword = "Abcdefg1!Abcdefg1!Abcdefg1!";
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+
+    @Test
+    @DisplayName("유효하지 않은 비밀번호 - null 값")
+    void invalidPassword_null() {
+        String invalidPassword = null;
+        boolean result = passwordPolicy.isValid(invalidPassword, context);
+        assertThat(result).isFalse();
+    }
+}