diff --git a/src/main/java/ceos/backend/domain/recruitment/domain/Recruitment.java b/src/main/java/ceos/backend/domain/recruitment/domain/Recruitment.java index 5149eb2..830812f 100644 --- a/src/main/java/ceos/backend/domain/recruitment/domain/Recruitment.java +++ b/src/main/java/ceos/backend/domain/recruitment/domain/Recruitment.java @@ -49,6 +49,10 @@ public class Recruitment extends BaseEntity { @NotNull private LocalDate otDate; + @NotNull private LocalDate ideathonDate; + + @NotNull private LocalDate hackathonDate; + @NotNull private LocalDate demodayDate; private LocalDateTime applicationExcelCreatedAt; @@ -68,6 +72,8 @@ private Recruitment( LocalDate resultDateFinal, String openChatUrl, LocalDate otDate, + LocalDate ideathonDate, + LocalDate hackathonDate, LocalDate demodayDate, LocalDateTime applicationExcelCreatedAt) { this.generation = generation; @@ -82,6 +88,8 @@ private Recruitment( this.resultDateFinal = resultDateFinal; this.openChatUrl = openChatUrl; this.otDate = otDate; + this.ideathonDate = ideathonDate; + this.hackathonDate = hackathonDate; this.demodayDate = demodayDate; this.applicationExcelCreatedAt = applicationExcelCreatedAt; } @@ -99,6 +107,8 @@ public void updateRecruitment(RecruitmentDTO recruitmentDTO) { this.resultDateFinal = recruitmentDTO.getResultDateFinal(); this.openChatUrl = recruitmentDTO.getOpenChatUrl(); this.otDate = recruitmentDTO.getOtDate(); + this.ideathonDate = recruitmentDTO.getIdeathonDate(); + this.hackathonDate = recruitmentDTO.getHackathonDate(); this.demodayDate = recruitmentDTO.getDemodayDate(); } diff --git a/src/main/java/ceos/backend/domain/recruitment/dto/RecruitmentDTO.java b/src/main/java/ceos/backend/domain/recruitment/dto/RecruitmentDTO.java index fd73857..c64f8da 100644 --- a/src/main/java/ceos/backend/domain/recruitment/dto/RecruitmentDTO.java +++ b/src/main/java/ceos/backend/domain/recruitment/dto/RecruitmentDTO.java @@ -20,6 +20,8 @@ public class RecruitmentDTO { private LocalDate resultDateFinal; private String openChatUrl; private LocalDate otDate; + private LocalDate ideathonDate; + private LocalDate hackathonDate; private LocalDate demodayDate; @Builder @@ -36,6 +38,8 @@ public RecruitmentDTO( LocalDate resultDateFinal, String openChatUrl, LocalDate otDate, + LocalDate ideathonDate, + LocalDate hackathonDate, LocalDate demodayDate) { this.generation = generation; this.prodStudyUrl = prodStudyUrl; @@ -49,6 +53,8 @@ public RecruitmentDTO( this.resultDateFinal = resultDateFinal; this.openChatUrl = openChatUrl; this.otDate = otDate; + this.ideathonDate = ideathonDate; + this.hackathonDate = hackathonDate; this.demodayDate = demodayDate; } @@ -66,6 +72,8 @@ public static RecruitmentDTO from(Recruitment recruitment) { .resultDateFinal(recruitment.getResultDateFinal()) .openChatUrl(recruitment.getOpenChatUrl()) .otDate(recruitment.getOtDate()) + .ideathonDate(recruitment.getIdeathonDate()) + .hackathonDate(recruitment.getHackathonDate()) .demodayDate(recruitment.getDemodayDate()) .build(); } diff --git a/src/main/java/ceos/backend/domain/recruitment/dto/UserRecruitmentDTO.java b/src/main/java/ceos/backend/domain/recruitment/dto/UserRecruitmentDTO.java index 4b64ed4..753db16 100644 --- a/src/main/java/ceos/backend/domain/recruitment/dto/UserRecruitmentDTO.java +++ b/src/main/java/ceos/backend/domain/recruitment/dto/UserRecruitmentDTO.java @@ -19,6 +19,8 @@ public class UserRecruitmentDTO { private LocalDate endDateInterview; private LocalDate resultDateFinal; private LocalDate otDate; + private LocalDate ideathonDate; + private LocalDate hackathonDate; private LocalDate demodayDate; @Builder @@ -34,6 +36,8 @@ public UserRecruitmentDTO( LocalDate endDateInterview, LocalDate resultDateFinal, LocalDate otDate, + LocalDate ideathonDate, + LocalDate hackathonDate, LocalDate demodayDate) { this.generation = generation; this.prodStudyUrl = prodStudyUrl; @@ -46,6 +50,8 @@ public UserRecruitmentDTO( this.endDateInterview = endDateInterview; this.resultDateFinal = resultDateFinal; this.otDate = otDate; + this.ideathonDate = ideathonDate; + this.hackathonDate = hackathonDate; this.demodayDate = demodayDate; } @@ -62,6 +68,8 @@ public static UserRecruitmentDTO from(Recruitment recruitment) { .endDateInterview(recruitment.getEndDateInterview()) .resultDateFinal(recruitment.getResultDateFinal()) .otDate(recruitment.getOtDate()) + .ideathonDate(recruitment.getIdeathonDate()) + .hackathonDate(recruitment.getHackathonDate()) .demodayDate(recruitment.getDemodayDate()) .build(); } diff --git a/src/main/java/ceos/backend/global/config/WebSecurityConfig.java b/src/main/java/ceos/backend/global/config/WebSecurityConfig.java index b3aa748..725e7df 100644 --- a/src/main/java/ceos/backend/global/config/WebSecurityConfig.java +++ b/src/main/java/ceos/backend/global/config/WebSecurityConfig.java @@ -85,7 +85,7 @@ public class WebSecurityConfig { private final String[] GetPermittedPatterns = { "/awards/**", - "/recruitments/**", + "/recruitments", "/projects/**", "/activities/**", "/managements/**",