🔗 :: (#728) 기업 이메일 정규식 확인 코드 추가

Team-return · Oct 1, 2024 · b9c22f8 · b9c22f8
2 parents c041cdc + fdcd545
commit b9c22f8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/...in/java/team/retum/jobis/domain/auth/presentation/dto/request/SendAuthCodeWebRequest.java b/...in/java/team/retum/jobis/domain/auth/presentation/dto/request/SendAuthCodeWebRequest.java
@@ -13,7 +13,7 @@
 public class SendAuthCodeWebRequest {
 
     @NotBlank
-    @Pattern(regexp = RegexProperty.EMAIL)
+    @Pattern(regexp = RegexProperty.STUDENT_EMAIL)
     private String email;
 
     @NotNull

diff --git a/...a/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java b/...a/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java
@@ -6,9 +6,11 @@
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import team.retum.jobis.domain.company.dto.request.RegisterCompanyRequest;
+import team.retum.jobis.global.util.RegexProperty;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -67,6 +69,7 @@ public class RegisterCompanyWebRequest {
 
     @Email
     @Size(max = 30)
+    @Pattern(regexp = RegexProperty.EMAIL)
     private String email;
 
     @NotBlank

diff --git a/...m/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java b/...m/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java
@@ -4,9 +4,11 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import team.retum.jobis.domain.company.dto.request.UpdateCompanyDetailsRequest;
+import team.retum.jobis.global.util.RegexProperty;
 
 import java.util.List;
 
@@ -57,6 +59,7 @@ public class UpdateCompanyDetailsWebRequest {
 
     @Email
     @Size(max = 30)
+    @Pattern(regexp = RegexProperty.EMAIL)
     private String email;
 
     @NotNull

diff --git a/...ava/team/retum/jobis/domain/student/presentation/dto/request/StudentSignUpWebRequest.java b/...ava/team/retum/jobis/domain/student/presentation/dto/request/StudentSignUpWebRequest.java
@@ -16,7 +16,7 @@
 public class StudentSignUpWebRequest {
 
     @Size(max = 30)
-    @Pattern(regexp = RegexProperty.EMAIL)
+    @Pattern(regexp = RegexProperty.STUDENT_EMAIL)
     private String email;
 
     @Pattern(regexp = RegexProperty.PASSWORD)

diff --git a/...etum/jobis/domain/student/presentation/dto/request/UpdateForgottenPasswordWebRequest.java b/...etum/jobis/domain/student/presentation/dto/request/UpdateForgottenPasswordWebRequest.java
@@ -13,7 +13,7 @@ public class UpdateForgottenPasswordWebRequest {
 
     @Size(max = 30)
     @NotBlank
-    @Pattern(regexp = RegexProperty.EMAIL)
+    @Pattern(regexp = RegexProperty.STUDENT_EMAIL)
     private String email;
 
     @Pattern(regexp = RegexProperty.PASSWORD)

diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/global/util/RegexProperty.java b/jobis-infrastructure/src/main/java/team/retum/jobis/global/util/RegexProperty.java
@@ -5,11 +5,13 @@
 @UtilityClass
 public class RegexProperty {
 
-    public static final String EMAIL = "^[email protected]$";
+    public static final String STUDENT_EMAIL = "^[email protected]$";
 
     public static final String PASSWORD = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Za-z\\d$@$!%*#?&]{8,16}$";
 
     public static final String WORKING_HOURS = "^([01][0-9]|2[0-3]):([0-5][0-9]) ~ ([01][0-9]|2[0-3]):([0-5][0-9])$";
 
     public static final String FILE_NAME = "^.+\\..+$";
+
+    public static final String EMAIL = "^[a-zA-Z0-9+-\\_.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$";
 }