Merge pull request #107 from 4m9d/refactor/#101/refactor-material-ser…

…vice(swm-323)

Refactor/#101/refactor material service(swm 323)

src/main/java/com/m9d/sroom/global/mapper/CourseQuiz.java

@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.Timestamp;
 
@@ -26,4 +27,18 @@ public class CourseQuiz {
     private Boolean scrapped;
 
     private Timestamp submittedTime;
+
+    public static RowMapper<CourseQuiz> getRowMapper() {
+        return (rs, rowNum) -> CourseQuiz.builder()
+                .id(rs.getLong("course_quiz_id"))
+                .courseId(rs.getLong("course_id"))
+                .quizId(rs.getLong("quiz_id"))
+                .videoId(rs.getLong("video_id"))
+                .submittedAnswer(rs.getString("submitted_answer"))
+                .correct(rs.getBoolean("is_correct"))
+                .scrapped(rs.getBoolean("is_scrapped"))
+                .submittedTime(rs.getTimestamp("submitted_time"))
+                .courseVideoId(rs.getLong("course_video_id"))
+                .build();
+    }
 }

src/main/java/com/m9d/sroom/global/mapper/Quiz.java

@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.jdbc.core.RowMapper;
 
 @Data
 @Builder
@@ -18,4 +19,15 @@ public class Quiz {
     private String subjectiveAnswer;
 
     private Integer choiceAnswer;
+
+    public static RowMapper<Quiz> getRowMapper() {
+        return (rs, rowNum) -> Quiz.builder()
+                .id(rs.getLong("quiz_id"))
+                .videoId(rs.getLong("video_id"))
+                .type(rs.getInt("type"))
+                .question(rs.getString("question"))
+                .subjectiveAnswer(rs.getString("subjective_answer"))
+                .choiceAnswer(rs.getInt("choice_answer"))
+                .build();
+    }
 }

src/main/java/com/m9d/sroom/global/mapper/QuizOption.java

@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.jdbc.core.RowMapper;
 
 @Data
 @Builder
@@ -13,5 +14,15 @@ public class QuizOption {
 
     private String optionText;
 
-    private int index;
+    private int optionIndex;
+
+    public static RowMapper<QuizOption> getRowMapper() {
+        return (rs, rowNum) -> QuizOption.builder()
+                .quizOptionId(rs.getLong("quiz_option_id"))
+                .quizId(rs.getLong("quiz_id"))
+                .optionText(rs.getString("option_text"))
+                .optionIndex(rs.getInt("option_index"))
+                .build();
+
+    }
 }

src/main/java/com/m9d/sroom/global/mapper/Summary.java

@@ -3,6 +3,7 @@
 
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.Timestamp;
 
@@ -25,4 +26,14 @@ public class Summary {
     private Timestamp updatedAt;
 
     private boolean modified;
+
+    public static RowMapper<Summary> getRowMapper() {
+        return (rs, rowNum) -> Summary.builder()
+                .id(rs.getLong("summary_id"))
+                .videoId(rs.getLong("video_id"))
+                .content(rs.getString("content"))
+                .updatedAt(rs.getTimestamp("updated_time"))
+                .modified(rs.getBoolean("is_modified"))
+                .build();
+    }
 }

src/main/java/com/m9d/sroom/gpt/service/GPTService.java

@@ -14,6 +14,8 @@
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.time.Duration;
+
 @Service
 @Slf4j
 @RequiredArgsConstructor
@@ -42,9 +44,9 @@ public void saveResultFromFastApi() {
             return;
         }
 
-        if(resultStr == null){
+        if (resultStr == null) {
             return;
-        }else{
+        } else {
             log.debug("response body from gpt server = {}", resultStr);
         }
 
@@ -65,6 +67,7 @@ private String getResultStr(String requestUrl) {
                             .toUri())
                     .retrieve()
                     .bodyToMono(String.class)
+                    .timeout(Duration.ofSeconds(4))
                     .block();
         } catch (Exception e) {
             log.error("Error occurred while making a request to fastAPI server. message = {}", e.getMessage());
@@ -77,7 +80,7 @@ private MaterialVo getMaterialVo(String resultStr) throws NullPointerException {
         MaterialVo resultVo = null;
         try {
             resultVo = gson.fromJson(resultStr, MaterialVo.class);
-            if(resultVo.getResults().size() > 0) {
+            if (!resultVo.getResults().isEmpty()) {
                 log.info("received video material count is = {}", resultVo.getResults().size());
             }
         } catch (JsonSyntaxException e) {

src/main/java/com/m9d/sroom/material/dto/response/QuizRes.java

@@ -19,7 +19,7 @@ public class QuizRes {
     private List<String> options;
 
     @JsonProperty("is_submitted")
-    private boolean submitted;
+    private Boolean submitted;
 
     private String answer;
 

src/main/java/com/m9d/sroom/material/dto/response/SummaryBrief.java

@@ -1,13 +1,18 @@
 package com.m9d.sroom.material.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.m9d.sroom.global.mapper.Summary;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
-import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SummaryBrief {
 
     private String content;
@@ -17,11 +22,9 @@ public class SummaryBrief {
 
     private String modifiedAt;
 
-    @Builder
-    public SummaryBrief(String content, boolean modified, Timestamp timestamp) {
-        SimpleDateFormat simpleDateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        this.content = content;
-        this.modified = modified;
-        this.modifiedAt = simpleDateFormatter.format(timestamp);
+    public SummaryBrief(Summary summary) {
+        this.content = summary.getContent();
+        this.modified = summary.isModified();
+        this.modifiedAt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(summary.getUpdatedAt());
     }
 }

src/main/java/com/m9d/sroom/material/exception/CourseQuizNotFoundException.java

@@ -6,7 +6,6 @@ public class CourseQuizNotFoundException extends NotFoundException {
 
     private static final String MESSAGE = "해당 courseQuiz를 찾을 수 없습니다.";
 
-
     public CourseQuizNotFoundException() {
         super(MESSAGE);
     }

src/main/java/com/m9d/sroom/material/exception/QuizNotMatchException.java

@@ -0,0 +1,11 @@
+package com.m9d.sroom.material.exception;
+
+import com.m9d.sroom.global.error.NotMatchException;
+
+public class QuizNotMatchException extends NotMatchException {
+
+    private static final String MESSAGE = "입력받은 여러 퀴즈 id가 일치하지 않습니다.";
+    public QuizNotMatchException() {
+        super(MESSAGE);
+    }
+}

src/main/java/com/m9d/sroom/material/model/QuizType.java

@@ -18,4 +18,13 @@ public int getValue() {
         return value;
     }
 
+    public static QuizType fromValue(int value) {
+        for (QuizType type : values()) {
+            if (type.getValue() == value) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("Invalid QuizType value: " + value);
+    }
+
 }