diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/model/ApplicationStatus.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/model/ApplicationStatus.java index 5c381bd56..39ba55824 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/model/ApplicationStatus.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/model/ApplicationStatus.java @@ -19,6 +19,6 @@ public enum ApplicationStatus { ACCEPTANCE("근로계약"), REJECTED("반려"); - public static final List DUPLICATE_CHECK = List.of(APPROVED, PASS, FIELD_TRAIN); + public static final List DUPLICATE_CHECK = List.of(REQUESTED, SEND, PROCESSING, ACCEPTANCE, APPROVED, PASS, FIELD_TRAIN); private final String name; } diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/dto/request/CreateApplicationWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/dto/request/CreateApplicationWebRequest.java index f907039ab..4beff0a1a 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/dto/request/CreateApplicationWebRequest.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/dto/request/CreateApplicationWebRequest.java @@ -14,6 +14,7 @@ public class CreateApplicationWebRequest { @ValidListElements + @NotNull private List attachments; @Getter diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/file/presentation/dto/CreatePreSignedUrlWebRequest.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/file/presentation/dto/CreatePreSignedUrlWebRequest.java index f0e57b4d3..99c1cfb2d 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/file/presentation/dto/CreatePreSignedUrlWebRequest.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/file/presentation/dto/CreatePreSignedUrlWebRequest.java @@ -6,7 +6,6 @@ import jakarta.validation.constraints.Pattern; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.validation.annotation.Validated; import team.retum.jobis.domain.file.model.FileType; import team.retum.jobis.global.util.RegexProperty; 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 9980f4267..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 @@ -11,7 +11,7 @@ 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 = "^[a-zA-Z0-9가-힣\\s_-]+\\.[a-zA-Z0-9]+$"; + public static final String FILE_NAME = "^.+\\..+$"; public static final String EMAIL = "^[a-zA-Z0-9+-\\_.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$"; }