Refactor/#119/refactor responsibility driven design(swm 361)

src/main/java/com/m9d/sroom/gpt/GPTScheduler.java → src/main/java/com/m9d/sroom/ai/AiScheduler.java

@@ -1,6 +1,5 @@
-package com.m9d.sroom.gpt;
+package com.m9d.sroom.ai;
 
-import com.m9d.sroom.gpt.service.GPTService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -9,12 +8,12 @@
 @Component
 @Slf4j
 @RequiredArgsConstructor
-public class GPTScheduler {
+public class AiScheduler {
 
-    private final GPTService gptService;
+    private final AiService aiService;
 
     @Scheduled(cron = "0/5 * * * * *")
     public void requestToGptRepeat() {
-        gptService.saveResultFromFastApi();
+        aiService.saveResultFromFastApi();
     }
 }

src/main/java/com/m9d/sroom/gpt/service/GPTService.java → src/main/java/com/m9d/sroom/ai/AiService.java

@@ -1,10 +1,10 @@
-package com.m9d.sroom.gpt.service;
+package com.m9d.sroom.ai;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
-import com.m9d.sroom.gpt.vo.MaterialResultsVo;
-import com.m9d.sroom.gpt.vo.MaterialVo;
-import com.m9d.sroom.material.service.MaterialService;
+import com.m9d.sroom.ai.vo.MaterialResultsVo;
+import com.m9d.sroom.ai.vo.MaterialVo;
+import com.m9d.sroom.material.MaterialSaver;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,7 +19,7 @@
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class GPTService {
+public class AiService {
 
     @Value("${ai.request-url}")
     private String gptRequestUrl;
@@ -29,7 +29,7 @@ public class GPTService {
 
     private final WebClient webClient;
 
-    private final MaterialService materialService;
+    private final MaterialSaver materialSaver;
 
     private final Gson gson;
 
@@ -91,7 +91,7 @@ private MaterialVo getMaterialVo(String resultStr) throws NullPointerException {
 
     public void saveResultEach(MaterialResultsVo materialVo) {
         try {
-            materialService.saveMaterials(materialVo);
+            materialSaver.saveMaterials(materialVo);
         } catch (Exception e) {
             log.error("failed to save summary, quizzes from GPT. error message = {}", e.getMessage(), e);
         }

src/main/java/com/m9d/sroom/gpt/exception/QuizTypeNotMatchException.java → src/main/java/com/m9d/sroom/ai/exception/QuizTypeNotMatchException.java

@@ -1,6 +1,6 @@
-package com.m9d.sroom.gpt.exception;
+package com.m9d.sroom.ai.exception;
 
-import com.m9d.sroom.global.error.NotMatchException;
+import com.m9d.sroom.common.error.NotMatchException;
 
 public class QuizTypeNotMatchException extends NotMatchException {
 

src/main/java/com/m9d/sroom/gpt/exception/ResultFromGptNotMatchException.java → src/main/java/com/m9d/sroom/ai/exception/ResultFromGptNotMatchException.java

@@ -1,4 +1,4 @@
-package com.m9d.sroom.gpt.exception;
+package com.m9d.sroom.ai.exception;
 
 public class ResultFromGptNotMatchException extends RuntimeException{
 }

src/main/java/com/m9d/sroom/gpt/model/MaterialVaildStatus.java → src/main/java/com/m9d/sroom/ai/model/MaterialVaildStatus.java

@@ -1,4 +1,4 @@
-package com.m9d.sroom.gpt.model;
+package com.m9d.sroom.ai.model;
 
 public enum MaterialVaildStatus {
 

src/main/java/com/m9d/sroom/ai/vo/MaterialResultsVo.java

@@ -0,0 +1,44 @@
+package com.m9d.sroom.ai.vo;
+
+import com.m9d.sroom.quiz.vo.Quiz;
+import com.m9d.sroom.summary.Summary;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Setter
+@RequiredArgsConstructor
+@Getter
+public class MaterialResultsVo {
+
+    private String video_id;
+
+    private int is_valid;
+
+    private String summary;
+
+    private List<QuizVo> quizzes;
+
+    public String getVideoId() {
+        return video_id;
+    }
+
+    public int getIsValid() {
+        return is_valid;
+    }
+
+    public Summary getSummary(){
+        return new Summary(summary, new Timestamp(System.currentTimeMillis()), false);
+    }
+
+    public List<Quiz> getQuizList(){
+        return quizzes.stream()
+                .map(QuizVo::toQuiz)
+                .collect(Collectors.toList());
+    }
+
+}

src/main/java/com/m9d/sroom/gpt/vo/MaterialVo.java → src/main/java/com/m9d/sroom/ai/vo/MaterialVo.java

@@ -1,4 +1,4 @@
-package com.m9d.sroom.gpt.vo;
+package com.m9d.sroom.ai.vo;
 
 import lombok.Data;
 

src/main/java/com/m9d/sroom/gpt/vo/QuizVo.java → src/main/java/com/m9d/sroom/ai/vo/QuizVo.java

@@ -1,6 +1,7 @@
-package com.m9d.sroom.gpt.vo;
+package com.m9d.sroom.ai.vo;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.m9d.sroom.quiz.vo.Quiz;
+import com.m9d.sroom.quiz.QuizType;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -31,4 +32,8 @@ public String getQuizQuestion() {
     public List<String> getOptions() {
         return quiz_select_options;
     }
+
+    public Quiz toQuiz() {
+        return Quiz.toInheritor(QuizType.fromValue(quiz_type), quiz_question, quiz_select_options, answer);
+    }
 }

src/main/java/com/m9d/sroom/global/HealthCheckController.java → src/main/java/com/m9d/sroom/common/HealthCheckController.java

@@ -1,4 +1,4 @@
-package com.m9d.sroom.global;
+package com.m9d.sroom.common;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/m9d/sroom/common/LearningActivityUpdater.java

@@ -0,0 +1,144 @@
+package com.m9d.sroom.common;
+
+import com.m9d.sroom.common.entity.*;
+import com.m9d.sroom.common.repository.course.CourseRepository;
+import com.m9d.sroom.common.repository.coursedailylog.CourseDailyLogRepository;
+import com.m9d.sroom.common.repository.coursevideo.CourseVideoRepository;
+import com.m9d.sroom.common.repository.member.MemberRepository;
+import com.m9d.sroom.common.repository.video.VideoRepository;
+import com.m9d.sroom.course.CourseServiceHelper;
+import com.m9d.sroom.course.vo.CourseVideo;
+import com.m9d.sroom.search.dto.VideoCompletionStatus;
+import org.springframework.stereotype.Service;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+import static com.m9d.sroom.search.constant.SearchConstant.LAST_VIEW_TIME_ADJUSTMENT_IN_SECONDS;
+
+@Service
+public class LearningActivityUpdater {
+    private final CourseRepository courseRepository;
+    private final CourseDailyLogRepository courseDailyLogRepository;
+    private final MemberRepository memberRepository;
+    private final CourseVideoRepository courseVideoRepository;
+    private final CourseServiceHelper courseServiceHelper;
+    private final VideoRepository videoRepository;
+
+    public LearningActivityUpdater(CourseRepository courseRepository, CourseDailyLogRepository courseDailyLogRepository,
+                                   MemberRepository memberRepository, CourseVideoRepository courseVideoRepository,
+                                   CourseServiceHelper courseServiceHelper, VideoRepository videoRepository) {
+        this.courseRepository = courseRepository;
+        this.courseDailyLogRepository = courseDailyLogRepository;
+        this.memberRepository = memberRepository;
+        this.courseVideoRepository = courseVideoRepository;
+        this.courseServiceHelper = courseServiceHelper;
+        this.videoRepository = videoRepository;
+    }
+
+    public void updateCourseDailyLog(Long memberId, Long courseId, VideoCompletionStatus status) {
+        Optional<CourseDailyLogEntity> dailyLogOptional = courseDailyLogRepository.findByCourseIdAndDate(courseId,
+                Date.valueOf(LocalDate.now()));
+        int learningTimeToAdd = Math.max(status.getTimeGap(), 0);
+        int lectureCountToAdd = status.isCompletedNow() ? 1 : 0;
+
+        if (dailyLogOptional.isEmpty()) {
+            CourseDailyLogEntity initialDailyLog = CourseDailyLogEntity.builder()
+                    .memberId(memberId)
+                    .courseId(courseId)
+                    .dailyLogDate(Date.valueOf(LocalDate.now()))
+                    .learningTime(learningTimeToAdd)
+                    .quizCount(0)
+                    .lectureCount(lectureCountToAdd)
+                    .build();
+            courseDailyLogRepository.save(initialDailyLog);
+        } else {
+            CourseDailyLogEntity dailyLog = dailyLogOptional.get();
+            dailyLog.setLearningTime(dailyLog.getLearningTime() + learningTimeToAdd);
+            dailyLog.setLectureCount(dailyLog.getLectureCount() + lectureCountToAdd);
+            courseDailyLogRepository.updateById(dailyLog.getCourseDailyLogId(), dailyLog);
+        }
+    }
+
+    public void updateMemberLeaningTime(Long memberId, VideoCompletionStatus status) {
+        MemberEntity member = memberRepository.getById(memberId);
+        member.setTotalLearningTime(Math.max(status.getTimeGap(), 0) + member.getTotalLearningTime());
+        memberRepository.updateById(memberId, member);
+    }
+
+    public void updateCourseProgress(Long memberId, CourseEntity courseEntity) {
+        List<CourseVideo> courseVideoList = courseServiceHelper.getCourseVideoList(courseEntity.getCourseId());
+
+        if (courseVideoList.size() == 1) {
+            VideoEntity videoEntity = videoRepository.getById(courseVideoList.get(0).getVideoId());
+            courseEntity.setProgress(courseVideoList.get(0).getProgress(videoEntity.getDuration()));
+        } else if (courseVideoList.size() > 1) {
+            courseEntity.setProgress(courseEntity.toCourse(courseVideoList).getCompletionRatio());
+        } else {
+            courseEntity.setProgress(0);
+        }
+        courseRepository.updateById(courseEntity.getCourseId(), courseEntity);
+
+        if (courseEntity.getProgress() == 100) {
+            MemberEntity member = memberRepository.getById(memberId);
+            member.setCompletionRate(memberRepository.countCompletedCourseById(memberId) * 100
+                    / memberRepository.countCourseById(memberId));
+            memberRepository.updateById(memberId, member);
+        }
+    }
+
+    public void updateCourseVideoStatus(CourseVideoEntity courseVideoEntity, int viewDuration, boolean completed) {
+        courseVideoEntity.setMaxDuration(Math.max(viewDuration, courseVideoEntity.getMaxDuration()));
+        courseVideoEntity.setStartTime(viewDuration);
+        courseVideoEntity.setComplete(completed);
+        courseVideoEntity.setLastViewTime(new Timestamp(System.currentTimeMillis()));
+        courseVideoRepository.updateById(courseVideoEntity.getCourseVideoId(), courseVideoEntity);
+    }
+
+    public void updateCourseLastViewTime(CourseEntity courseEntity) {
+        courseEntity.setLastViewTime(new Timestamp(System.currentTimeMillis()));
+        courseRepository.updateById(courseEntity.getCourseId(), courseEntity);
+    }
+
+    public void updateLastViewVideoToNext(Long courseId, int videoIndex) {
+        Optional<CourseVideoEntity> courseVideoOptional = courseVideoRepository
+                .findByCourseIdAndPrevIndex(courseId, videoIndex);
+
+        if (courseVideoOptional.isPresent()) {
+            CourseVideoEntity courseVideo = courseVideoOptional.get();
+            courseVideo.setLastViewTime(
+                    Timestamp.valueOf(LocalDateTime.now().plusSeconds(LAST_VIEW_TIME_ADJUSTMENT_IN_SECONDS)));
+            courseVideoRepository.updateById(courseVideo.getCourseVideoId(), courseVideo);
+        }
+    }
+
+    public void updateDailyLogQuizCount(Long memberId, Long courseId, int submittedQuizCount) {
+        Optional<CourseDailyLogEntity> courseDailyLogOptional = courseDailyLogRepository
+                .findByCourseIdAndDate(courseId, Date.valueOf(LocalDate.now()));
+        if (courseDailyLogOptional.isEmpty()) {
+            courseDailyLogRepository.save(CourseDailyLogEntity.builder()
+                    .memberId(memberId)
+                    .courseId(courseId)
+                    .dailyLogDate(Date.valueOf(LocalDate.now()))
+                    .learningTime(0)
+                    .quizCount(submittedQuizCount)
+                    .lectureCount(0)
+                    .build());
+        } else {
+            CourseDailyLogEntity dailyLog = courseDailyLogOptional.get();
+            dailyLog.setQuizCount(dailyLog.getQuizCount() + submittedQuizCount);
+            courseDailyLogRepository.updateById(dailyLog.getCourseDailyLogId(), dailyLog);
+        }
+    }
+
+    public void updateMemberQuizCount(Long memberId, int submittedQuizCount, int submittedCorrectQuizCount) {
+        MemberEntity memberEntity = memberRepository.getById(memberId);
+        memberEntity.setTotalSolvedCount(submittedQuizCount + memberEntity.getTotalSolvedCount());
+        memberEntity.setTotalCorrectCount(submittedCorrectQuizCount + memberEntity.getTotalCorrectCount());
+        memberRepository.updateById(memberEntity.getMemberId(), memberEntity);
+    }
+}

src/main/java/com/m9d/sroom/global/mapper/CourseDailyLog.java → src/main/java/com/m9d/sroom/common/entity/CourseDailyLogEntity.java

@@ -1,4 +1,4 @@
-package com.m9d.sroom.global.mapper;
+package com.m9d.sroom.common.entity;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -10,7 +10,7 @@
 @Getter
 @Setter
 @Builder
-public class CourseDailyLog {
+public class CourseDailyLogEntity {
 
     private Long courseDailyLogId;
 
@@ -26,8 +26,8 @@ public class CourseDailyLog {
 
     private int lectureCount;
 
-    public static RowMapper<CourseDailyLog> getRowMapper() {
-        return ((rs, rowNum) -> CourseDailyLog.builder()
+    public static RowMapper<CourseDailyLogEntity> getRowMapper() {
+        return ((rs, rowNum) -> CourseDailyLogEntity.builder()
                 .courseDailyLogId(rs.getLong("course_daily_log_id"))
                 .memberId(rs.getLong("member_id"))
                 .courseId(rs.getLong("course_id"))