From 0d277026948f78d682580cf2aac835abe20430dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B8=EC=A4=80?= <74056843+sejoon00@users.noreply.github.com> Date: Thu, 20 Feb 2025 21:33:37 +0900 Subject: [PATCH] =?UTF-8?q?[fix/#54]=20=EB=AC=B8=ED=95=AD=20=EC=B6=94?= =?UTF-8?q?=EC=B2=9C=EC=8B=9C=EA=B0=84=200=EC=9C=BC=EB=A1=9C=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../problem/domain/childProblem/ChildProblem.java | 2 +- .../domain/problem/domain/problem/Problem.java | 14 +++++++------- .../problem/domain/problem/RecommendedTime.java | 4 ++-- .../repository/converter/StringListConverter.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java index aff64c1..9fd9f47 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/domain/childProblem/ChildProblem.java @@ -61,7 +61,7 @@ public static ChildProblem createEmptyChildProblem() { } public void validateAnswerByType(String answer, AnswerType answerType) { - if (this.answerType == AnswerType.MULTIPLE_CHOICE) { + if (answerType == AnswerType.MULTIPLE_CHOICE) { if (!answer.matches("^[1-5]*$")) { throw new InvalidValueException(ErrorCode.INVALID_MULTIPLE_CHOICE_ANSWER); } diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/Problem.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/Problem.java index f4257c2..64e9d8e 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/Problem.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/Problem.java @@ -89,10 +89,10 @@ public Problem(List childProblems, boolean isConfirmed, AnswerType List prescriptionImageUrls, String seniorTipImageUrl, String readingTipImageUrl, String mainAnalysisImageUrl, String mainProblemImageUrl, String memo, String answer, String title, ProblemType problemType, int number, PracticeTestTag practiceTestTag, - ProblemCustomId problemCustomId, Integer recommendedMinute, Integer recommendedSecond) { + ProblemCustomId problemCustomId) { this.childProblems = childProblems; this.isConfirmed = isConfirmed; - this.answerType = answerType; + this.answerType = AnswerType.SHORT_ANSWER; this.conceptTagIds = conceptTagIds; this.mainHandwritingExplanationImageUrl = mainHandwritingExplanationImageUrl; this.prescriptionImageUrls = prescriptionImageUrls; @@ -102,17 +102,17 @@ public Problem(List childProblems, boolean isConfirmed, AnswerType this.mainProblemImageUrl = mainProblemImageUrl; this.difficulty = new Difficulty(difficulty); this.memo = memo; - this.answer = new Answer(answer, this.answerType); + this.answer = new Answer("0", this.answerType); this.title = new Title(title); this.problemType = problemType; this.number = number; this.practiceTestId = practiceTestTag != null ? practiceTestTag.getId() : null; this.problemCustomId = problemCustomId; - this.recommendedTime = new RecommendedTime(recommendedMinute, recommendedSecond); + this.recommendedTime = new RecommendedTime(0, 0); } public String getAnswer() { - return answer.getValue(); + return this.answer != null ? answer.getValue() : null; } public void update(Problem inputProblem) { @@ -133,8 +133,8 @@ public void update(Problem inputProblem) { this.prescriptionImageUrls = inputProblem.getPrescriptionImageUrls(); this.answerType = inputProblem.getAnswerType(); this.recommendedTime = new RecommendedTime( - inputProblem.getRecommendedTime() != null ? inputProblem.getRecommendedTime().getMinute() : null, - inputProblem.getRecommendedTime() != null ? inputProblem.getRecommendedTime().getSecond() : null + inputProblem.getRecommendedTime().getMinute(), + inputProblem.getRecommendedTime().getSecond() ); } diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/RecommendedTime.java b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/RecommendedTime.java index 8c0b8f7..abe8ab8 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/RecommendedTime.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/domain/problem/RecommendedTime.java @@ -19,8 +19,8 @@ public class RecommendedTime { public RecommendedTime(Integer minute, Integer second) { validateTime(minute, second); - this.minute = minute; - this.second = second; + this.minute = minute != null ? minute : 0; + this.second = second != null ? second : 0; } private void validateTime(Integer minute, Integer second) { diff --git a/src/main/java/com/moplus/moplus_server/domain/problem/repository/converter/StringListConverter.java b/src/main/java/com/moplus/moplus_server/domain/problem/repository/converter/StringListConverter.java index 9ca476b..bcb08fa 100644 --- a/src/main/java/com/moplus/moplus_server/domain/problem/repository/converter/StringListConverter.java +++ b/src/main/java/com/moplus/moplus_server/domain/problem/repository/converter/StringListConverter.java @@ -19,7 +19,7 @@ public class StringListConverter implements AttributeConverter, Str public String convertToDatabaseColumn(List attribute) { try { if (attribute == null || attribute.isEmpty()) { - return ""; + return "[]"; } return attribute.stream() .filter(str -> str != null && !str.isEmpty())