From 07e787e4e4a19bf520662e17f6746f96f117ca29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=A7=84?= <4mj.eo@dsm.hs.kr> Date: Mon, 30 Sep 2024 22:51:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=A9=20::=20(#728)=20=ED=9A=8C?= =?UTF-8?q?=EC=82=AC=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=A0=95=EA=B7=9C?= =?UTF-8?q?=EC=8B=9D=20=ED=99=95=EC=9D=B8=20=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/dto/request/RegisterCompanyWebRequest.java | 3 +++ .../dto/request/UpdateCompanyDetailsWebRequest.java | 3 +++ .../main/java/team/retum/jobis/global/util/RegexProperty.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java index 7ad7018df..8b80097f8 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java +++ b/jobis-infrastructure/src/main/java/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.COMPANY) private String email; @NotBlank diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java index 53cc13abb..759cd0de5 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java +++ b/jobis-infrastructure/src/main/java/team/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.COMPANY) private String email; @NotNull 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 index 925a90047..aaf611102 100644 --- 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 @@ -12,4 +12,6 @@ public class RegexProperty { 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 COMPANY = "^[a-zA-Z0-9+-\\_.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"; } From fdcd5453ef735b34f8ffe94fce8292e5deedae92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AA=85=EC=A7=84?= <4mj.eo@dsm.hs.kr> Date: Mon, 30 Sep 2024 23:56:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20(#728)=20?= =?UTF-8?q?=EC=A0=95=EA=B7=9C=EC=8B=9D=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/presentation/dto/request/SendAuthCodeWebRequest.java | 2 +- .../presentation/dto/request/RegisterCompanyWebRequest.java | 2 +- .../dto/request/UpdateCompanyDetailsWebRequest.java | 2 +- .../presentation/dto/request/StudentSignUpWebRequest.java | 2 +- .../dto/request/UpdateForgottenPasswordWebRequest.java | 2 +- .../main/java/team/retum/jobis/global/util/RegexProperty.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/auth/presentation/dto/request/SendAuthCodeWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/auth/presentation/dto/request/SendAuthCodeWebRequest.java index 6b6f3dcd2..061054b55 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/auth/presentation/dto/request/SendAuthCodeWebRequest.java +++ b/jobis-infrastructure/src/main/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/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java index 8b80097f8..3c24fb1b0 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/RegisterCompanyWebRequest.java @@ -69,7 +69,7 @@ public class RegisterCompanyWebRequest { @Email @Size(max = 30) - @Pattern(regexp = RegexProperty.COMPANY) + @Pattern(regexp = RegexProperty.EMAIL) private String email; @NotBlank diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java index 759cd0de5..5b0a493d0 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/company/presentation/dto/request/UpdateCompanyDetailsWebRequest.java @@ -59,7 +59,7 @@ public class UpdateCompanyDetailsWebRequest { @Email @Size(max = 30) - @Pattern(regexp = RegexProperty.COMPANY) + @Pattern(regexp = RegexProperty.EMAIL) private String email; @NotNull diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/student/presentation/dto/request/StudentSignUpWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/student/presentation/dto/request/StudentSignUpWebRequest.java index aff1dba1c..76351b175 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/student/presentation/dto/request/StudentSignUpWebRequest.java +++ b/jobis-infrastructure/src/main/java/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/jobis-infrastructure/src/main/java/team/retum/jobis/domain/student/presentation/dto/request/UpdateForgottenPasswordWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/student/presentation/dto/request/UpdateForgottenPasswordWebRequest.java index 081a184f7..954be05e3 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/student/presentation/dto/request/UpdateForgottenPasswordWebRequest.java +++ b/jobis-infrastructure/src/main/java/team/retum/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 index aaf611102..ad73c03ed 100644 --- 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,7 +5,7 @@ @UtilityClass public class RegexProperty { - public static final String EMAIL = "^.+@dsm.hs.kr$"; + public static final String STUDENT_EMAIL = "^.+@dsm.hs.kr$"; public static final String PASSWORD = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Za-z\\d$@$!%*#?&]{8,16}$"; @@ -13,5 +13,5 @@ public class RegexProperty { public static final String FILE_NAME = "^.+\\..+$"; - public static final String COMPANY = "^[a-zA-Z0-9+-\\_.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"; + public static final String EMAIL = "^[a-zA-Z0-9+-\\_.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"; }