Skip to content

Commit

Permalink
refactor: 리뷰 상세 조회 시, 리뷰이 이름 치환 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
skylar1220 committed Aug 12, 2024
1 parent f704efc commit 41374d3
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public TemplateAnswerResponse getReviewDetail(String groupAccessCode, long revie
List<SectionAnswerResponse> sectionResponses = sectionRepository.findAllByTemplateId(templateId)
.stream()
.filter(section -> section.isVisibleBySelectedOptionIds(selectedOptionItemIds))
.map(section -> getSectionAnswerResponse(review, section))
.map(section -> getSectionAnswerResponse(reviewGroup, review, section))
.toList();

return new TemplateAnswerResponse(
Expand All @@ -63,38 +63,38 @@ public TemplateAnswerResponse getReviewDetail(String groupAccessCode, long revie
);
}

private SectionAnswerResponse getSectionAnswerResponse(Review2 review, Section section) {
private SectionAnswerResponse getSectionAnswerResponse(ReviewGroup reviewGroup, Review2 review, Section section) {
TextAnswers textAnswers = new TextAnswers(review.getTextAnswers());
ArrayList<QuestionAnswerResponse> questionResponses = new ArrayList<>();

for (Question2 question : questionRepository.findAllBySectionId(section.getId())) {
if (question.isSelectable()) {
questionResponses.add(getCheckboxAnswerResponse(review, question));
questionResponses.add(getCheckboxAnswerResponse(reviewGroup, review, question));
continue;
}
questionResponses.add(getTextAnswerResponse(question, textAnswers));
questionResponses.add(getTextAnswerResponse(reviewGroup, question, textAnswers));
}

return new SectionAnswerResponse(
section.getId(),
section.getHeader(),
section.convertHeader("{revieweeName}", reviewGroup.getReviewee()),
questionResponses
);
}

private QuestionAnswerResponse getTextAnswerResponse(Question2 question, TextAnswers textAnswers) {
private QuestionAnswerResponse getTextAnswerResponse(ReviewGroup reviewGroup, Question2 question, TextAnswers textAnswers) {
TextAnswer textAnswer = textAnswers.getAnswerByQuestionId(question.getId());
return new QuestionAnswerResponse(
question.getId(),
question.isRequired(),
question.getQuestionType(),
question.getContent(),
question.convertContent("{revieweeName}", reviewGroup.getReviewee()),
null,
textAnswer.getContent()
);
}

private QuestionAnswerResponse getCheckboxAnswerResponse(Review2 review, Question2 question) {
private QuestionAnswerResponse getCheckboxAnswerResponse(ReviewGroup reviewGroup, Review2 review, Question2 question) {
OptionGroup optionGroup = optionGroupRepository.getByQuestionId(question.getId());
Set<Long> selectedOptionItemIds = optionItemRepository.findSelectedOptionItemIdsByReviewId(review.getId());
List<OptionItemAnswerResponse> optionItemResponse =
Expand All @@ -117,7 +117,7 @@ private QuestionAnswerResponse getCheckboxAnswerResponse(Review2 review, Questio
question.getId(),
question.isRequired(),
question.getQuestionType(),
question.getContent(),
question.convertContent("{revieweeName}", reviewGroup.getReviewee()),
optionGroupAnswerResponse,
null
);
Expand Down

0 comments on commit 41374d3

Please sign in to comment.