🚀 :: 1.2.16

Team-return · Nov 13, 2024 · cf5e7dc · cf5e7dc
2 parents 01d544a + 1f6b582
commit cf5e7dc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/...s/domain/acceptance/dto/response/TeacherQueryFieldTraineesAndContractWorkersResponse.java b/...s/domain/acceptance/dto/response/TeacherQueryFieldTraineesAndContractWorkersResponse.java
@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import team.retum.jobis.domain.acceptance.spi.vo.AcceptanceVO;
 import team.retum.jobis.domain.application.spi.vo.FieldTraineesVO;
 import team.retum.jobis.domain.student.model.SchoolNumber;
@@ -12,6 +13,7 @@
 
 @Getter
 @AllArgsConstructor
+@NoArgsConstructor(force = true)
 public class TeacherQueryFieldTraineesAndContractWorkersResponse {
 
     private final List<TeacherQueryFieldTraineesResponse> fieldTraineesResponse;

diff --git a/...pplication/src/main/java/team/retum/jobis/domain/application/model/ApplicationStatus.java b/...pplication/src/main/java/team/retum/jobis/domain/application/model/ApplicationStatus.java
@@ -19,6 +19,6 @@ public enum ApplicationStatus {
     ACCEPTANCE("근로계약"),
     REJECTED("반려");
 
-    public static final List<ApplicationStatus> DUPLICATE_CHECK = List.of(APPROVED, PASS, FIELD_TRAIN);
+    public static final List<ApplicationStatus> DUPLICATE_CHECK = List.of(REQUESTED, SEND, PROCESSING, ACCEPTANCE, APPROVED, PASS, FIELD_TRAIN);
     private final String name;
 }
diff --git a/...src/main/java/team/retum/jobis/domain/application/presentation/ApplicationWebAdapter.java b/...src/main/java/team/retum/jobis/domain/application/presentation/ApplicationWebAdapter.java
@@ -209,7 +209,7 @@ public QueryPassedApplicationStudentsResponse queryFieldTrainApplication(
     @PutMapping("/{application-id}")
     public void reapply(
         @PathVariable("application-id") Long applicationId,
-        @RequestBody CreateApplicationWebRequest request
+        @RequestBody @Valid CreateApplicationWebRequest request
     ) {
         reapplyUseCase.execute(
             applicationId,

diff --git a/.../retum/jobis/domain/application/presentation/dto/request/CreateApplicationWebRequest.java b/.../retum/jobis/domain/application/presentation/dto/request/CreateApplicationWebRequest.java
@@ -14,6 +14,7 @@
 public class CreateApplicationWebRequest {
 
     @ValidListElements
+    @NotNull
     private List<AttachmentWebRequest> attachments;
 
     @Getter

diff --git a/...main/java/team/retum/jobis/domain/file/presentation/dto/CreatePreSignedUrlWebRequest.java b/...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
@@ -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-.]+$";
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     public class CreateApplicationWebRequest {
         @ValidListElements
+        @NotNull
         private List<AttachmentWebRequest> attachments;
         @Getter
@@ Expand Down @@