From 07d2ec66d54c0ed1640eca54ef056fb69635fccd Mon Sep 17 00:00:00 2001 From: yxhwxn Date: Sun, 18 Aug 2024 13:21:09 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20questionOptionId=20=EC=8B=9D=EB=B3=84?= =?UTF-8?q?=EA=B0=92=20=EC=9D=91=EB=8B=B5=20DTO=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../survey/controller/dto/SurveyResponseDTO.java | 11 ++++++++++- .../event/survey/converter/SurveyConverter.java | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java b/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java index 46be5e2..bd64639 100644 --- a/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java +++ b/src/main/java/com/cmc/suppin/event/survey/controller/dto/SurveyResponseDTO.java @@ -44,7 +44,16 @@ public static class QuestionDTO { private Long questionId; private QuestionType questionType; private String questionText; - private List options; + private List options; + + @Getter + @NoArgsConstructor + @AllArgsConstructor + @Builder + public static class OptionDTO { + private Long questionOptionId; + private String optionText; + } } @Getter diff --git a/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java b/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java index 3777914..f0cdd8a 100644 --- a/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java +++ b/src/main/java/com/cmc/suppin/event/survey/converter/SurveyConverter.java @@ -60,7 +60,10 @@ public static SurveyResponseDTO.SurveyViewDTO toSurveyViewResultDTO(Survey surve .questionType(question.getQuestionType()) .questionText(question.getQuestionText()) .options(question.getQuestionOptionList().stream() - .map(QuestionOption::getOptionText) + .map(option -> SurveyResponseDTO.SurveyViewDTO.QuestionDTO.OptionDTO.builder() + .questionOptionId(option.getId()) + .optionText(option.getOptionText()) + .build()) .collect(Collectors.toList())) .build()) .collect(Collectors.toList());