Merge pull request #138 from dnd-side-project/dev

release v0.2.7
dnd-side-project · Mar 19, 2024 · e0dbd97 · e0dbd97
2 parents 66ad20a + c79b488
commit e0dbd97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/com/dnd/namuiwiki/domain/survey/SurveyService.java b/src/main/java/com/dnd/namuiwiki/domain/survey/SurveyService.java
@@ -142,7 +142,7 @@ public GetAnswersByQuestionResponse getAnswersByQuestion(String wikiId, String q
                     .period(survey.getPeriod())
                     .relation(survey.getRelation())
                     .createdAt(survey.getWrittenAt())
-                    .answer(convertAnswerToText(question, answerOfQuestion))
+                    .answer(convertAnswer(question, answerOfQuestion))
                     .reason(answerOfQuestion.getReason())
                     .optionName(question, answerOfQuestion)
                     .build();
@@ -177,12 +177,16 @@ private Page<Survey> getReceivedSurveysByFilter(Period period, Relation relation
         return surveyRepository.findByOwner(owner, pageable);
     }
 
-    private String convertAnswerToText(Question question, Answer answer) {
+    private Object convertAnswer(Question question, Answer answer) {
         if (answer.getType().equals(AnswerType.MANUAL)) {
-            return answer.getAnswer().toString();
+            return answer.getAnswer();
         }
+
         Option option = question.getOption(answer.getAnswer().toString())
                 .orElseThrow(() -> new ApplicationErrorException(ApplicationErrorType.INVALID_OPTION_ID));
+        if (question.getType().isNumericType()) {
+            return option.getValue();
+        }
         return option.getText();
     }
 

diff --git a/src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/SingleAnswerWithSurveyDetailDto.java b/src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/SingleAnswerWithSurveyDetailDto.java
@@ -18,7 +18,7 @@ public class SingleAnswerWithSurveyDetailDto {
     private Period period;
     private Relation relation;
     private LocalDateTime createdAt;
-    private String answer;
+    private Object answer;
     private String reason;
     private String optionName;