diff --git a/src/main/java/org/ject/support/domain/admin/dto/SubmittedApplyResponse.java b/src/main/java/org/ject/support/domain/admin/dto/SubmittedApplyResponse.java index 8916e098..15c2225b 100644 --- a/src/main/java/org/ject/support/domain/admin/dto/SubmittedApplyResponse.java +++ b/src/main/java/org/ject/support/domain/admin/dto/SubmittedApplyResponse.java @@ -1,12 +1,17 @@ package org.ject.support.domain.admin.dto; -import java.util.List; -import java.util.Map; -import java.util.Optional; import org.ject.support.domain.apply.domain.ApplicationForm; import org.ject.support.domain.apply.domain.Apply; import org.ject.support.domain.apply.dto.ApplyPortfolioDto; +import org.ject.support.domain.member.CareerDetails; +import org.ject.support.domain.member.ExperiencePeriod; import org.ject.support.domain.member.JobFamily; +import org.ject.support.domain.member.Region; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; public record SubmittedApplyResponse( Long applyId, @@ -14,6 +19,10 @@ public record SubmittedApplyResponse( String phoneNumber, String email, JobFamily jobFamily, + String region, + String careerDetails, + String experiencePeriod, + List interestedDomains, boolean hasPortfolio, ApplicationFormResponse applicationFormResponse ) { @@ -26,6 +35,18 @@ public static SubmittedApplyResponse from(Apply apply, apply.getMember().getPhoneNumber(), apply.getMember().getEmail(), apply.getMember().getJobFamily(), + Optional.ofNullable(apply.getMember().getRegion()) + .map(Region::getDescription) + .orElse(""), + Optional.ofNullable(apply.getMember().getCareerDetails()) + .map(CareerDetails::getDescription) + .orElse(""), + Optional.ofNullable(apply.getMember().getExperiencePeriod()) + .map(ExperiencePeriod::getDescription) + .orElse(""), + new ArrayList<>(Optional.ofNullable(apply.getMember().getInterestedDomains()) + .orElse(List.of()) + ), Optional.ofNullable(apply.getApplicationForm()) .map(ApplicationForm::getPortfolios) .map(portfolioList -> !portfolioList.isEmpty()) diff --git a/src/main/java/org/ject/support/domain/recruit/domain/Question.java b/src/main/java/org/ject/support/domain/recruit/domain/Question.java index f9d7ddf0..3b9fcabf 100644 --- a/src/main/java/org/ject/support/domain/recruit/domain/Question.java +++ b/src/main/java/org/ject/support/domain/recruit/domain/Question.java @@ -47,6 +47,9 @@ public class Question extends BaseTimeEntity { @Column(length = 100, nullable = false) private String title; + @Column(length = 200) + private String subtitle; + @Column(length = 30, nullable = false) private String label; diff --git a/src/main/java/org/ject/support/domain/recruit/dto/QuestionResponse.java b/src/main/java/org/ject/support/domain/recruit/dto/QuestionResponse.java index 6b1d4c01..396860a4 100644 --- a/src/main/java/org/ject/support/domain/recruit/dto/QuestionResponse.java +++ b/src/main/java/org/ject/support/domain/recruit/dto/QuestionResponse.java @@ -13,6 +13,7 @@ public record QuestionResponse(Long id, InputType inputType, boolean isRequired, String title, + String subtitle, String label, List selectOptions, String inputHint, diff --git a/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryImpl.java b/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryImpl.java index 5786f3f7..fe40d78a 100644 --- a/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryImpl.java +++ b/src/main/java/org/ject/support/domain/recruit/repository/QuestionQueryRepositoryImpl.java @@ -29,6 +29,7 @@ public List findByJobFamilyOfActiveRecruit(final LocalDateTime question.inputType, question.isRequired, question.title, + question.subtitle, question.label, question.selectOptions, question.inputHint, diff --git a/src/main/resources/db/migration/V16__add_subtitle_to_question.sql b/src/main/resources/db/migration/V16__add_subtitle_to_question.sql new file mode 100644 index 00000000..217c3856 --- /dev/null +++ b/src/main/resources/db/migration/V16__add_subtitle_to_question.sql @@ -0,0 +1,12 @@ +-- Question 테이블에 subtitle 컬럼 추가 +ALTER TABLE question ADD COLUMN subtitle VARCHAR(200) NULL; + +-- semester_id가 4이고 job_family가 PD인 recruit의 question 중에서 +-- title이 "포트폴리오가 있으시다면 첨부해주세요"인 질문의 subtitle 초기화 +UPDATE question q +INNER JOIN recruit r ON q.recruit_id = r.id +SET q.subtitle = '전공, 교육 경험, 부트캠프 수료 등 관련 활동 경험 증빙 문서로 대체 가능합니다.' +WHERE r.semester_id = 4 + AND r.job_family = 'PD' + AND q.title = '포트폴리오가 있으시다면 첨부해주세요'; +