From 371ac4bc829f73a0c9caf560d0d108f20110c3ca 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: Sun, 10 Nov 2024 21:54:32 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20::=20(#846)=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EC=83=9D=EC=84=B1=EC=9E=90=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 --- .../TeacherQueryFieldTraineesAndContractWorkersResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/dto/response/TeacherQueryFieldTraineesAndContractWorkersResponse.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/dto/response/TeacherQueryFieldTraineesAndContractWorkersResponse.java index 076296463..476d41cba 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/dto/response/TeacherQueryFieldTraineesAndContractWorkersResponse.java +++ b/jobis-application/src/main/java/team/retum/jobis/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 fieldTraineesResponse; From 154befd093c0a20636917fc87b38b953839352fe Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Tue, 12 Nov 2024 14:46:01 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20::=20(848)=20=EC=A7=80?= =?UTF-8?q?=EC=9B=90=EC=84=9C=20=ED=8C=8C=EC=9D=BC=20notnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/dto/request/CreateApplicationWebRequest.java | 1 + 1 file changed, 1 insertion(+) 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 From f44290509354fbf1f07b74ff9004f23402240c1b Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Tue, 12 Nov 2024 15:59:10 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=A6=B7=20::=20(#848)=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EC=A7=80=EC=9B=90=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../retum/jobis/domain/application/model/ApplicationStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 44b37e6ac9a953091b7cdf8ac5ba8921319e15d4 Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Tue, 12 Nov 2024 22:41:33 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20::=20(848)=20pre-signe?= =?UTF-8?q?d=20=ED=8C=8C=EC=9D=BC=20validation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/presentation/dto/CreatePreSignedUrlWebRequest.java | 1 - .../main/java/team/retum/jobis/global/util/RegexProperty.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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-.]+$"; } From 1f6b582791c681fabae8a970de428c437da7e469 Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Thu, 14 Nov 2024 00:05:05 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=94=97=20::=20(#develop)=20=EC=9E=AC?= =?UTF-8?q?=EC=A7=80=EC=9B=90=20=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/application/presentation/ApplicationWebAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/ApplicationWebAdapter.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/ApplicationWebAdapter.java index cd3106416..c47c5c6cd 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/presentation/ApplicationWebAdapter.java +++ b/jobis-infrastructure/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,