diff --git a/src/main/java/com/startlion/startlionserver/controller/InterviewController.java b/src/main/java/com/startlion/startlionserver/controller/InterviewController.java index e46f29b..413a046 100644 --- a/src/main/java/com/startlion/startlionserver/controller/InterviewController.java +++ b/src/main/java/com/startlion/startlionserver/controller/InterviewController.java @@ -1,6 +1,7 @@ package com.startlion.startlionserver.controller; +import com.startlion.startlionserver.dto.response.interview.InterviewDetailResponse; import com.startlion.startlionserver.dto.response.interview.InterviewResponse; import com.startlion.startlionserver.service.InterviewService; import io.swagger.v3.oas.annotations.Operation; @@ -33,7 +34,7 @@ public ResponseEntity> getInterviews() { @Operation(summary = "interviewId로 interview 정보 조회") @GetMapping("/{interviewId}") - public ResponseEntity getInterviewById(@PathVariable Long interviewId) { + public ResponseEntity getInterviewById(@PathVariable Long interviewId) { val response = interviewService.getInterviewById(interviewId); return ResponseEntity.ok(response); } diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/Application.java b/src/main/java/com/startlion/startlionserver/domain/entity/Application.java index 646912f..8a8780d 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/Application.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/Application.java @@ -80,7 +80,6 @@ public class Application extends BaseTimeEntity { private Part part; // application page 1 end - @ColumnDefault("''") private String portfolio; diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java b/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java index 33a14bd..2468f04 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java @@ -26,4 +26,6 @@ public class InterviewContent { @Column(length = 400) private String answer; + @Column + private String boldAnswer; } \ No newline at end of file diff --git a/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewDetailResponse.java b/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewDetailResponse.java new file mode 100644 index 0000000..8e96622 --- /dev/null +++ b/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewDetailResponse.java @@ -0,0 +1,32 @@ +package com.startlion.startlionserver.dto.response.interview; + + +import com.startlion.startlionserver.domain.entity.Interview; +import com.startlion.startlionserver.dto.response.interviewanswer.InterviewAnswerResponse; + +import java.util.List; + +public record InterviewDetailResponse( + Long interviewId, + Long generation, + String part, + String name, + String major, + String oneLineAnswer, + String imageUrl, + List interviewAnswers +) { + + public static InterviewDetailResponse of(Interview interview, List interviewAnswers) { + return new InterviewDetailResponse( + interview.getInterviewId(), + interview.getGeneration(), + interview.getPart(), + interview.getName(), + interview.getMajor(), + interview.getOneLineAnswer(), + interview.getImageUrl(), + interviewAnswers + ); + } +} diff --git a/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewListResponse.java b/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewListResponse.java index 4be8622..b6aa011 100644 --- a/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewListResponse.java +++ b/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewListResponse.java @@ -3,6 +3,6 @@ import java.util.List; public record InterviewListResponse( - List interviews + List interviews ) { } diff --git a/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewResponse.java b/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewResponse.java index 23f4fb5..3dbf77b 100644 --- a/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewResponse.java +++ b/src/main/java/com/startlion/startlionserver/dto/response/interview/InterviewResponse.java @@ -8,29 +8,19 @@ public record InterviewResponse( Long interviewId, - String title, Long generation, - String part, - String major, String name, - String oneLineContent, - String oneLineAnswer, - String imageUrl, - List interviewAnswers + String part, + String OneLineContent ) { - public static InterviewResponse of(Interview interview, List interviewAnswers) { + public static InterviewResponse of(Interview interview) { return new InterviewResponse( interview.getInterviewId(), - interview.getTitle(), interview.getGeneration(), - interview.getPart(), - interview.getMajor(), interview.getName(), - interview.getOneLineContent(), - interview.getOneLineAnswer(), - interview.getImageUrl(), - interviewAnswers + interview.getPart(), + interview.getOneLineContent() ); } } diff --git a/src/main/java/com/startlion/startlionserver/dto/response/interviewanswer/InterviewAnswerResponse.java b/src/main/java/com/startlion/startlionserver/dto/response/interviewanswer/InterviewAnswerResponse.java index ec34444..0800b3f 100644 --- a/src/main/java/com/startlion/startlionserver/dto/response/interviewanswer/InterviewAnswerResponse.java +++ b/src/main/java/com/startlion/startlionserver/dto/response/interviewanswer/InterviewAnswerResponse.java @@ -5,13 +5,16 @@ public record InterviewAnswerResponse( Long interviewAnswerId, String question, + String boldAnswer, String answer + ) { public static InterviewAnswerResponse of(InterviewContent interviewContent) { return new InterviewAnswerResponse( interviewContent.getInterviewAnswerId(), interviewContent.getQuestion(), + interviewContent.getBoldAnswer(), interviewContent.getAnswer()); } } diff --git a/src/main/java/com/startlion/startlionserver/service/InterviewService.java b/src/main/java/com/startlion/startlionserver/service/InterviewService.java index e34b327..84ad861 100644 --- a/src/main/java/com/startlion/startlionserver/service/InterviewService.java +++ b/src/main/java/com/startlion/startlionserver/service/InterviewService.java @@ -1,6 +1,7 @@ package com.startlion.startlionserver.service; import com.startlion.startlionserver.domain.entity.Interview; +import com.startlion.startlionserver.dto.response.interview.InterviewDetailResponse; import com.startlion.startlionserver.dto.response.interview.InterviewResponse; import com.startlion.startlionserver.dto.response.interviewanswer.InterviewAnswerResponse; import com.startlion.startlionserver.repository.InterviewAnswerJpaRepository; @@ -20,7 +21,7 @@ public class InterviewService { private final InterviewJpaRepository interviewJpaRepository; private final InterviewAnswerJpaRepository interviewAnswerJpaRepository; - public InterviewResponse getInterviewById(Long interviewId) { + public InterviewDetailResponse getInterviewById(Long interviewId) { Interview interview = interviewJpaRepository.findById(interviewId) .orElseThrow( () -> new IllegalArgumentException("해당하는 인터뷰가 없습니다.")); @@ -28,17 +29,14 @@ public InterviewResponse getInterviewById(Long interviewId) { .stream() .map(InterviewAnswerResponse::of) .toList(); - return InterviewResponse.of(interview, interviewAnswerResponses); + return InterviewDetailResponse.of(interview, interviewAnswerResponses); } public List getInterviews() { return interviewJpaRepository.findAll() .stream() .map(interview -> - InterviewResponse.of(interview, interviewAnswerJpaRepository.findByInterview(interview) - .stream() - .map(InterviewAnswerResponse::of) - .toList())) + InterviewResponse.of(interview)) .toList(); }