From 4ac2ccbe4889f9730071772a2b11ddec16ccad70 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Thu, 26 Oct 2023 23:16:27 +0900
Subject: [PATCH 01/24] =?UTF-8?q?feat=20:=20initialize=20and=20usercategor?=
 =?UTF-8?q?y=20video=20response=20dto=20restcontroller=20=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=A0=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=EB=B0=8F=20restcontroller=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/video/VideoJPARepostiory.java        |  7 +++++
 .../com/example/demo/video/VideoResponse.java |  4 +++
 .../demo/video/VideoRestController.java       | 27 +++++++++++++++++++
 .../com/example/demo/video/VideoService.java  | 12 +++++++++
 4 files changed, 50 insertions(+)
 create mode 100644 src/main/java/com/example/demo/video/VideoJPARepostiory.java
 create mode 100644 src/main/java/com/example/demo/video/VideoResponse.java
 create mode 100644 src/main/java/com/example/demo/video/VideoRestController.java
 create mode 100644 src/main/java/com/example/demo/video/VideoService.java

diff --git a/src/main/java/com/example/demo/video/VideoJPARepostiory.java b/src/main/java/com/example/demo/video/VideoJPARepostiory.java
new file mode 100644
index 00000000..2da192ef
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoJPARepostiory.java
@@ -0,0 +1,7 @@
+package com.example.demo.video;
+
+import com.example.demo.user.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface VideoJPARepostiory extends JpaRepository<User, Integer> {
+}
diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
new file mode 100644
index 00000000..f79b730e
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -0,0 +1,4 @@
+package com.example.demo.video;
+
+public class VideoResponse {
+}
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
new file mode 100644
index 00000000..cb4e880f
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -0,0 +1,27 @@
+package com.example.demo.video;
+
+import com.example.demo.config.auth.CustomUserDetails;
+import com.example.demo.config.utils.ApiUtils;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "Video API")
+@RequiredArgsConstructor
+@RestController
+public class VideoRestController {
+
+    private final VideoService videoService;
+
+    @GetMapping("/videos/main")
+    public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page, @AuthenticationPrincipal CustomUserDetails userDetails) {
+        List<VideoResponse.UserCategoryVideoResponseDTO> responseDTOs = videoService.findUserCategoryVideo(page);
+        return ResponseEntity.ok(ApiUtils.success(responseDTOs));
+    }
+}
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
new file mode 100644
index 00000000..e7af806c
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -0,0 +1,12 @@
+package com.example.demo.video;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@RequiredArgsConstructor
+@Service
+public class VideoService {
+
+}

From 0b02c4253b3708bde4114ab28b4f240482b5487d Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Thu, 26 Oct 2023 23:36:14 +0900
Subject: [PATCH 02/24] feat : usercategoryVideoResponseDTO videoresponse

---
 .../java/com/example/demo/video/Video.java    | 10 +++++--
 .../com/example/demo/video/VideoResponse.java | 28 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/video/Video.java b/src/main/java/com/example/demo/video/Video.java
index bdf88b93..e96598d2 100644
--- a/src/main/java/com/example/demo/video/Video.java
+++ b/src/main/java/com/example/demo/video/Video.java
@@ -22,7 +22,10 @@ public class Video extends BaseTime {
     private String videoUrl;
 
     @Column
-    private String videoInfo;
+    private String videoInfoKorean;
+
+    @Column
+    private String videoInfoEng;
 
     @Column
     private String videoStartTime;
@@ -31,9 +34,10 @@ public class Video extends BaseTime {
     private String videoEndTime;
 
     @Builder
-    public Video(String videoUrl, String videoInfo, String videoStartTime, String videoEndTime) {
+    public Video(String videoUrl, String videoInfoKorean, String videoInfoEng, String videoStartTime, String videoEndTime) {
         this.videoUrl = videoUrl;
-        this.videoInfo = videoInfo;
+        this.videoInfoKorean = videoInfoKorean;
+        this.videoInfoEng = videoInfoEng;
         this.videoStartTime = videoStartTime;
         this.videoEndTime = videoEndTime;
     }
diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index f79b730e..8a99dcd2 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -1,4 +1,32 @@
 package com.example.demo.video;
 
+import com.example.demo.mentoring.MentorPostResponse;
+import com.example.demo.user.userInterest.UserInterest;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
 public class VideoResponse {
+    @Getter
+    @Setter
+    public class UserCategoryVideoResponseDTO {
+        private int videoID;
+        private String videoUrl;
+        private String videoInfoKorean;
+        private String videoInfoEng;
+        private List<String> interests;
+
+        public UserCategoryVideoResponseDTO(Video video, List<VideoInterest> videoInterests)
+        {
+            this.videoID = video.getId();
+            this.videoUrl = video.getVideoUrl();
+            this.videoInfoKorean = video.getVideoInfoKorean();
+            this.videoInfoEng = video.getVideoInfoEng();
+            this.interests = videoInterests.stream()
+                .map(videoInterest -> videoInterest.getInterest().getCategory())
+                .collect(Collectors.toList());
+        }
+    }
 }

From 1c9af4acec2b3f55f0726adfc5be623ccecf7fd8 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Fri, 3 Nov 2023 17:28:16 +0900
Subject: [PATCH 03/24] =?UTF-8?q?feat=20:=20video=20find=20all=20service?=
 =?UTF-8?q?=20video=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=B3=84=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/video/Subtitle.java |  2 +-
 .../demo/video/SubtitleJPARepository.java     | 12 +++++++
 .../java/com/example/demo/video/Video.java    |  2 +-
 .../com/example/demo/video/VideoInterest.java |  2 +-
 .../video/VideoInterestJPARepository.java     | 12 +++++++
 .../demo/video/VideoJPARepostiory.java        |  3 +-
 .../com/example/demo/video/VideoResponse.java |  6 ++--
 .../demo/video/VideoRestController.java       |  2 +-
 .../com/example/demo/video/VideoService.java  | 36 +++++++++++++++++++
 9 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/example/demo/video/SubtitleJPARepository.java
 create mode 100644 src/main/java/com/example/demo/video/VideoInterestJPARepository.java

diff --git a/src/main/java/com/example/demo/video/Subtitle.java b/src/main/java/com/example/demo/video/Subtitle.java
index b2107b85..9fc06413 100644
--- a/src/main/java/com/example/demo/video/Subtitle.java
+++ b/src/main/java/com/example/demo/video/Subtitle.java
@@ -12,7 +12,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "subtitle_tb")
+@Table(name = "subtitles")
 public class Subtitle extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
diff --git a/src/main/java/com/example/demo/video/SubtitleJPARepository.java b/src/main/java/com/example/demo/video/SubtitleJPARepository.java
new file mode 100644
index 00000000..4a12d9d2
--- /dev/null
+++ b/src/main/java/com/example/demo/video/SubtitleJPARepository.java
@@ -0,0 +1,12 @@
+package com.example.demo.video;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Optional;
+
+public interface SubtitleJPARepository extends JpaRepository<Subtitle, Integer> {
+    @Query("select m from Subtitle m where m.video.id = :video")
+    Optional<Subtitle> findSubtitleByVideoId(@Param("video") int video);
+}
diff --git a/src/main/java/com/example/demo/video/Video.java b/src/main/java/com/example/demo/video/Video.java
index e96598d2..20af093b 100644
--- a/src/main/java/com/example/demo/video/Video.java
+++ b/src/main/java/com/example/demo/video/Video.java
@@ -12,7 +12,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "video_tb")
+@Table(name = "videos")
 public class Video extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
diff --git a/src/main/java/com/example/demo/video/VideoInterest.java b/src/main/java/com/example/demo/video/VideoInterest.java
index 11a58b0f..1bbf4842 100644
--- a/src/main/java/com/example/demo/video/VideoInterest.java
+++ b/src/main/java/com/example/demo/video/VideoInterest.java
@@ -13,7 +13,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "videoInterest_tb")
+@Table(name = "video_interests")
 public class VideoInterest extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
diff --git a/src/main/java/com/example/demo/video/VideoInterestJPARepository.java b/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
new file mode 100644
index 00000000..34d41250
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
@@ -0,0 +1,12 @@
+package com.example.demo.video;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface VideoInterestJPARepository  extends JpaRepository<VideoInterest, Integer> {
+    @Query("select m from VideoInterest m where m.video.id = :video")
+    List<VideoInterest> findVideoInterestByVideoId(@Param("video") int video);
+}
diff --git a/src/main/java/com/example/demo/video/VideoJPARepostiory.java b/src/main/java/com/example/demo/video/VideoJPARepostiory.java
index 2da192ef..8d72b874 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepostiory.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepostiory.java
@@ -1,7 +1,6 @@
 package com.example.demo.video;
 
-import com.example.demo.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface VideoJPARepostiory extends JpaRepository<User, Integer> {
+public interface VideoJPARepostiory extends JpaRepository<Video, Integer> {
 }
diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index 8a99dcd2..885826fa 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -11,14 +11,15 @@
 public class VideoResponse {
     @Getter
     @Setter
-    public class UserCategoryVideoResponseDTO {
+    public static class VideoResponseDTO {
         private int videoID;
         private String videoUrl;
         private String videoInfoKorean;
         private String videoInfoEng;
         private List<String> interests;
+        private Subtitle subtitle;
 
-        public UserCategoryVideoResponseDTO(Video video, List<VideoInterest> videoInterests)
+        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, Subtitle subtitle)
         {
             this.videoID = video.getId();
             this.videoUrl = video.getVideoUrl();
@@ -27,6 +28,7 @@ public UserCategoryVideoResponseDTO(Video video, List<VideoInterest> videoIntere
             this.interests = videoInterests.stream()
                 .map(videoInterest -> videoInterest.getInterest().getCategory())
                 .collect(Collectors.toList());
+            this.subtitle = subtitle;
         }
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index cb4e880f..89c90780 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -21,7 +21,7 @@ public class VideoRestController {
 
     @GetMapping("/videos/main")
     public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page, @AuthenticationPrincipal CustomUserDetails userDetails) {
-        List<VideoResponse.UserCategoryVideoResponseDTO> responseDTOs = videoService.findUserCategoryVideo(page);
+        List<VideoResponse.VideoResponseDTO> responseDTOs = videoService.findUserCategoryVideo(page);
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index e7af806c..4a5bd975 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -1,12 +1,48 @@
 package com.example.demo.video;
 
+import com.example.demo.config.errors.exception.Exception404;
+import com.example.demo.mentoring.MentorPostResponse;
+import com.example.demo.user.userInterest.UserInterest;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Transactional
 @RequiredArgsConstructor
 @Service
 public class VideoService {
+    private final VideoJPARepostiory videoJPARepostiory;
+    private final VideoInterestJPARepository videoInterestJPARepository;
+    private final SubtitleJPARepository subtitleJPARepository;
+
+    public List<VideoResponse.VideoResponseDTO> findAllVideo(Integer page) {
+        Pageable pageable = PageRequest.of(page,4);
+
+        Page<Video> pageContent = videoJPARepostiory.findAll(pageable);
+
+        if(pageContent.getTotalPages() == 0){
+            throw new Exception404("해당 영상들이 존재하지 않습니다");
+        }
+
+        // 각 Video에대해서 Interest, Subtitle 끌어오기
+        List<VideoResponse.VideoResponseDTO> videoDTOList = pageContent.getContent().stream().map(
+                video -> {
+                    List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
+                    Subtitle subtitle = subtitleJPARepository.findSubtitleByVideoId(video.getId()).get();
+
+                    if(videoInterests.isEmpty()){
+                        throw new Exception404("해당 카테고리는 존재하지 않습니다");
+                    }
 
+                    return new VideoResponse.VideoResponseDTO(video, videoInterests, subtitle);
+                }
+        ).collect(Collectors.toList());
+        return videoDTOList;
+    }
 }

From aa1066ec0f733fd5e5d2b511f1d7ecd97cfb210f Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Fri, 3 Nov 2023 17:31:45 +0900
Subject: [PATCH 04/24] feat : video soft delete

---
 src/main/java/com/example/demo/video/Subtitle.java    |  4 ++++
 src/main/java/com/example/demo/video/Video.java       |  4 ++++
 .../java/com/example/demo/video/VideoInterest.java    |  4 ++++
 src/test/java/com/example/demo/VideoTest.java         | 11 +++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 src/test/java/com/example/demo/VideoTest.java

diff --git a/src/main/java/com/example/demo/video/Subtitle.java b/src/main/java/com/example/demo/video/Subtitle.java
index 9fc06413..18baa547 100644
--- a/src/main/java/com/example/demo/video/Subtitle.java
+++ b/src/main/java/com/example/demo/video/Subtitle.java
@@ -6,12 +6,16 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@Where(clause = "deleted_at IS NULL")
+@SQLDelete(sql = "UPDATE mentor_posts SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
 @Table(name = "subtitles")
 public class Subtitle extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/example/demo/video/Video.java b/src/main/java/com/example/demo/video/Video.java
index 20af093b..6702dc04 100644
--- a/src/main/java/com/example/demo/video/Video.java
+++ b/src/main/java/com/example/demo/video/Video.java
@@ -6,12 +6,16 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@Where(clause = "deleted_at IS NULL")
+@SQLDelete(sql = "UPDATE mentor_posts SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
 @Table(name = "videos")
 public class Video extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/example/demo/video/VideoInterest.java b/src/main/java/com/example/demo/video/VideoInterest.java
index 1bbf4842..acd367f9 100644
--- a/src/main/java/com/example/demo/video/VideoInterest.java
+++ b/src/main/java/com/example/demo/video/VideoInterest.java
@@ -7,12 +7,16 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@Where(clause = "deleted_at IS NULL")
+@SQLDelete(sql = "UPDATE mentor_posts SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
 @Table(name = "video_interests")
 public class VideoInterest extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
new file mode 100644
index 00000000..c3f2e2c3
--- /dev/null
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -0,0 +1,11 @@
+package com.example.demo;
+
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@ActiveProfiles("test")
+public class VideoTest {
+}

From 93d3f2d7796e7d0215fee86a60dd45fdcd55e2b2 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Fri, 3 Nov 2023 19:21:30 +0900
Subject: [PATCH 05/24] =?UTF-8?q?feat=20:=20videofindall=20testcode=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A5=BC=20=EA=B1=B4=EB=82=B4?=
 =?UTF-8?q?=EC=A3=BC=EB=A9=B4=20=ED=95=B4=EB=8B=B9=20=EC=98=81=EC=83=81?=
 =?UTF-8?q?=EB=93=A4=EC=9D=84=20=EC=B0=BE=EC=95=84=EC=98=A4=EB=8A=94=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=BD=94=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/video/Subtitle.java |   2 +-
 .../demo/video/SubtitleJPARepository.java     |   3 +-
 .../java/com/example/demo/video/Video.java    |  21 +-
 .../com/example/demo/video/VideoInterest.java |   2 +-
 ...epostiory.java => VideoJPARepository.java} |   2 +-
 .../com/example/demo/video/VideoResponse.java |  14 +-
 .../demo/video/VideoRestController.java       |   2 +-
 .../com/example/demo/video/VideoService.java  |  12 +-
 src/test/java/com/example/demo/VideoTest.java | 183 +++++++++++++++++-
 9 files changed, 213 insertions(+), 28 deletions(-)
 rename src/main/java/com/example/demo/video/{VideoJPARepostiory.java => VideoJPARepository.java} (63%)

diff --git a/src/main/java/com/example/demo/video/Subtitle.java b/src/main/java/com/example/demo/video/Subtitle.java
index 18baa547..0ab972b9 100644
--- a/src/main/java/com/example/demo/video/Subtitle.java
+++ b/src/main/java/com/example/demo/video/Subtitle.java
@@ -15,7 +15,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Where(clause = "deleted_at IS NULL")
-@SQLDelete(sql = "UPDATE mentor_posts SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
+@SQLDelete(sql = "UPDATE subtitles SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
 @Table(name = "subtitles")
 public class Subtitle extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/example/demo/video/SubtitleJPARepository.java b/src/main/java/com/example/demo/video/SubtitleJPARepository.java
index 4a12d9d2..79129499 100644
--- a/src/main/java/com/example/demo/video/SubtitleJPARepository.java
+++ b/src/main/java/com/example/demo/video/SubtitleJPARepository.java
@@ -4,9 +4,10 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface SubtitleJPARepository extends JpaRepository<Subtitle, Integer> {
     @Query("select m from Subtitle m where m.video.id = :video")
-    Optional<Subtitle> findSubtitleByVideoId(@Param("video") int video);
+    List<Subtitle> findSubtitleByVideoId(@Param("video") int video);
 }
diff --git a/src/main/java/com/example/demo/video/Video.java b/src/main/java/com/example/demo/video/Video.java
index 6702dc04..61b1bf18 100644
--- a/src/main/java/com/example/demo/video/Video.java
+++ b/src/main/java/com/example/demo/video/Video.java
@@ -1,7 +1,6 @@
 package com.example.demo.video;
 
 import com.example.demo.config.utils.BaseTime;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -15,7 +14,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Where(clause = "deleted_at IS NULL")
-@SQLDelete(sql = "UPDATE mentor_posts SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
+@SQLDelete(sql = "UPDATE videos SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
 @Table(name = "videos")
 public class Video extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -26,10 +25,10 @@ public class Video extends BaseTime {
     private String videoUrl;
 
     @Column
-    private String videoInfoKorean;
+    private String videoTitleKorean;
 
     @Column
-    private String videoInfoEng;
+    private String videoTitleEng;
 
     @Column
     private String videoStartTime;
@@ -37,12 +36,20 @@ public class Video extends BaseTime {
     @Column
     private String videoEndTime;
 
+    @Column
+    private long views;
+
+    @Column
+    private String videoThumbnailUrl;
+
     @Builder
-    public Video(String videoUrl, String videoInfoKorean, String videoInfoEng, String videoStartTime, String videoEndTime) {
+    public Video(String videoUrl, String videoTitleKorean, String videoTitleEng, String videoStartTime, String videoEndTime, long views, String videoThumbnailUrl) {
         this.videoUrl = videoUrl;
-        this.videoInfoKorean = videoInfoKorean;
-        this.videoInfoEng = videoInfoEng;
+        this.videoTitleKorean = videoTitleKorean;
+        this.videoTitleEng = videoTitleEng;
         this.videoStartTime = videoStartTime;
         this.videoEndTime = videoEndTime;
+        this.views = views;
+        this.videoThumbnailUrl = videoThumbnailUrl;
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoInterest.java b/src/main/java/com/example/demo/video/VideoInterest.java
index acd367f9..21c2624b 100644
--- a/src/main/java/com/example/demo/video/VideoInterest.java
+++ b/src/main/java/com/example/demo/video/VideoInterest.java
@@ -16,7 +16,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Where(clause = "deleted_at IS NULL")
-@SQLDelete(sql = "UPDATE mentor_posts SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
+@SQLDelete(sql = "UPDATE video_interests SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
 @Table(name = "video_interests")
 public class VideoInterest extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/example/demo/video/VideoJPARepostiory.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
similarity index 63%
rename from src/main/java/com/example/demo/video/VideoJPARepostiory.java
rename to src/main/java/com/example/demo/video/VideoJPARepository.java
index 8d72b874..95dda1f9 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepostiory.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -2,5 +2,5 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface VideoJPARepostiory extends JpaRepository<Video, Integer> {
+public interface VideoJPARepository extends JpaRepository<Video, Integer> {
 }
diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index 885826fa..2be2d8c3 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -1,7 +1,5 @@
 package com.example.demo.video;
 
-import com.example.demo.mentoring.MentorPostResponse;
-import com.example.demo.user.userInterest.UserInterest;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,18 +15,22 @@ public static class VideoResponseDTO {
         private String videoInfoKorean;
         private String videoInfoEng;
         private List<String> interests;
-        private Subtitle subtitle;
+        private List<Subtitle> subtitle;
+        private long views;
+        private String videoThumbnailUrl;
 
-        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, Subtitle subtitle)
+        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, List<Subtitle> subtitle)
         {
             this.videoID = video.getId();
             this.videoUrl = video.getVideoUrl();
-            this.videoInfoKorean = video.getVideoInfoKorean();
-            this.videoInfoEng = video.getVideoInfoEng();
+            this.videoInfoKorean = video.getVideoTitleKorean();
+            this.videoInfoEng = video.getVideoTitleEng();
             this.interests = videoInterests.stream()
                 .map(videoInterest -> videoInterest.getInterest().getCategory())
                 .collect(Collectors.toList());
             this.subtitle = subtitle;
+            this.views = video.getViews();
+            this.videoThumbnailUrl = video.getVideoThumbnailUrl();
         }
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 89c90780..059d2380 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -21,7 +21,7 @@ public class VideoRestController {
 
     @GetMapping("/videos/main")
     public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page, @AuthenticationPrincipal CustomUserDetails userDetails) {
-        List<VideoResponse.VideoResponseDTO> responseDTOs = videoService.findUserCategoryVideo(page);
+        List<VideoResponse.VideoResponseDTO> responseDTOs = videoService.findAllVideo(page);
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 4a5bd975..a97a51ff 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -1,8 +1,6 @@
 package com.example.demo.video;
 
 import com.example.demo.config.errors.exception.Exception404;
-import com.example.demo.mentoring.MentorPostResponse;
-import com.example.demo.user.userInterest.UserInterest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -17,14 +15,14 @@
 @RequiredArgsConstructor
 @Service
 public class VideoService {
-    private final VideoJPARepostiory videoJPARepostiory;
+    private final VideoJPARepository videoJPARepository;
     private final VideoInterestJPARepository videoInterestJPARepository;
     private final SubtitleJPARepository subtitleJPARepository;
 
     public List<VideoResponse.VideoResponseDTO> findAllVideo(Integer page) {
         Pageable pageable = PageRequest.of(page,4);
 
-        Page<Video> pageContent = videoJPARepostiory.findAll(pageable);
+        Page<Video> pageContent = videoJPARepository.findAll(pageable);
 
         if(pageContent.getTotalPages() == 0){
             throw new Exception404("해당 영상들이 존재하지 않습니다");
@@ -34,11 +32,7 @@ public List<VideoResponse.VideoResponseDTO> findAllVideo(Integer page) {
         List<VideoResponse.VideoResponseDTO> videoDTOList = pageContent.getContent().stream().map(
                 video -> {
                     List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
-                    Subtitle subtitle = subtitleJPARepository.findSubtitleByVideoId(video.getId()).get();
-
-                    if(videoInterests.isEmpty()){
-                        throw new Exception404("해당 카테고리는 존재하지 않습니다");
-                    }
+                    List<Subtitle> subtitle = subtitleJPARepository.findSubtitleByVideoId(video.getId());
 
                     return new VideoResponse.VideoResponseDTO(video, videoInterests, subtitle);
                 }
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index c3f2e2c3..826916b7 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -1,11 +1,192 @@
 package com.example.demo;
 
+import com.example.demo.interest.Interest;
+import com.example.demo.interest.InterestJPARepository;
+import com.example.demo.video.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 
+import java.util.List;
+
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class VideoTest {
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class VideoTest extends RestDoc{
+    @Autowired
+    private InterestJPARepository interestJPARepository;
+    @Autowired
+    private VideoInterestJPARepository videoInterestJPARepository;
+    @Autowired
+    private VideoJPARepository videoJPARepository;
+    @Autowired
+    private SubtitleJPARepository subtitleJPARepository;
+
+    @Autowired
+    private VideoService videoService;
+
+    @Autowired
+    private ObjectMapper om;
+
+    @Test
+    @Order(1)
+    void findAllTest() {
+
+        Interest interest1 = Interest.builder()
+                .category("test_Interest_1")
+                .build();
+
+        Interest interest2 = Interest.builder()
+                .category("test_Interest_2")
+                .build();
+
+        Video video1 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("First page First Video")
+                .videoTitleKorean("첫번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        Video video2 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Second page Second Video")
+                .videoTitleKorean("두번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        Video video3 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Third page Third Video")
+                .videoTitleKorean("세번쨰 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        Video video4 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Fourth page Fourth Video")
+                .videoTitleKorean("네번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        Video video5 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Fifth page Fifth Video")
+                .videoTitleKorean("다섯번쨰 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        Video video6 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Sixth page Sixth Video")
+                .videoTitleKorean("여섯번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        VideoInterest video1Interest1 = VideoInterest.builder()
+                .video(video1)
+                .interest(interest1)
+                .build();
+
+        VideoInterest video1Interest2 = VideoInterest.builder()
+                .video(video1)
+                .interest(interest2)
+                .build();
+
+        VideoInterest video2Interest1 = VideoInterest.builder()
+                .video(video2)
+                .interest(interest1)
+                .build();
+
+        VideoInterest video3Interest1 = VideoInterest.builder()
+                .video(video3)
+                .interest(interest1)
+                .build();
+
+        VideoInterest video4Interest2 = VideoInterest.builder()
+                .video(video4)
+                .interest(interest2)
+                .build();
+
+        VideoInterest video5Interest1 = VideoInterest.builder()
+                .video(video5)
+                .interest(interest1)
+                .build();
+
+        VideoInterest video6Interest2 = VideoInterest.builder()
+                .video(video6)
+                .interest(interest2)
+                .build();
+
+        Subtitle subtitle1 = Subtitle.builder()
+                .video(video1)
+                .korStartTime("1")
+                .korEndTime("2")
+                .korSubtitleContent("asdfasdf")
+                .engStartTime("12")
+                .engEndTime("12")
+                .engSubtitleContent("ffff")
+                .build();
+
+        Subtitle subtitle2 = Subtitle.builder()
+                .video(video1)
+                .korStartTime("4")
+                .korEndTime("7")
+                .korSubtitleContent("aaaaasdfasdf")
+                .engStartTime("12")
+                .engEndTime("12")
+                .engSubtitleContent("ffff")
+                .build();
+
+
+        interestJPARepository.save(interest1);
+        interestJPARepository.save(interest2);
+        videoJPARepository.save(video1);
+        videoJPARepository.save(video2);
+        videoJPARepository.save(video3);
+        videoJPARepository.save(video4);
+        videoJPARepository.save(video5);
+        videoJPARepository.save(video6);
+        videoInterestJPARepository.save(video1Interest1);
+        videoInterestJPARepository.save(video1Interest2);
+        videoInterestJPARepository.save(video2Interest1);
+        videoInterestJPARepository.save(video3Interest1);
+        videoInterestJPARepository.save(video4Interest2);
+        videoInterestJPARepository.save(video5Interest1);
+        videoInterestJPARepository.save(video6Interest2);
+        subtitleJPARepository.save(subtitle1);
+        subtitleJPARepository.save(subtitle2);
+    }
+
+    @Test
+    @Order(2)
+    void findAllServiceTest() throws Exception {
+        List<VideoResponse.VideoResponseDTO> videoFind = videoService.findAllVideo(0);
+
+        String responseBody = om.writeValueAsString(videoFind);
+
+        System.out.println("전체조회테스트 : " + responseBody);
+    }
 }

From 97ae071417e138b0c1270133b6d96f38f7e26c1a Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Fri, 3 Nov 2023 19:50:21 +0900
Subject: [PATCH 06/24] =?UTF-8?q?feat=20:=20videos/{video-id}=20restcontro?=
 =?UTF-8?q?ller=20=EC=98=81=EC=83=81=20=EB=B3=84=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/video/VideoRestController.java    | 10 +++++++++-
 src/main/java/com/example/demo/video/VideoService.java |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 059d2380..0b5edeac 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -2,11 +2,13 @@
 
 import com.example.demo.config.auth.CustomUserDetails;
 import com.example.demo.config.utils.ApiUtils;
+import com.example.demo.mentoring.MentorPostResponse;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,8 +22,14 @@ public class VideoRestController {
     private final VideoService videoService;
 
     @GetMapping("/videos/main")
-    public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page, @AuthenticationPrincipal CustomUserDetails userDetails) {
+    public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
         List<VideoResponse.VideoResponseDTO> responseDTOs = videoService.findAllVideo(page);
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
+
+    @GetMapping("/videos/{id}")
+    public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
+        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
+        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index a97a51ff..22791eab 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -39,4 +39,7 @@ public List<VideoResponse.VideoResponseDTO> findAllVideo(Integer page) {
         ).collect(Collectors.toList());
         return videoDTOList;
     }
+
+    public VideoResponse.VideoResponseDTO findVideo(int id) {
+    }
 }

From 7337f40b76186a581790113969f324eafbcb7bb4 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Fri, 3 Nov 2023 20:07:03 +0900
Subject: [PATCH 07/24] =?UTF-8?q?fix=20:=20videofindAll=20subtitle?=
 =?UTF-8?q?=EC=97=90=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=EC=9D=80=20=ED=95=84=EC=9A=94=EC=97=86=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/video/VideoResponse.java | 48 +++++++++++++++----
 .../demo/video/VideoRestController.java       | 15 +++---
 .../com/example/demo/video/VideoService.java  | 13 ++---
 src/test/java/com/example/demo/VideoTest.java |  3 +-
 4 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index 2be2d8c3..14f8866f 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -9,28 +9,60 @@
 public class VideoResponse {
     @Getter
     @Setter
-    public static class VideoResponseDTO {
+    public static class VideoAllResponseDTO {
         private int videoID;
         private String videoUrl;
-        private String videoInfoKorean;
-        private String videoInfoEng;
+        private String videoTitleKorean;
+        private String videoTitleEng;
         private List<String> interests;
-        private List<Subtitle> subtitle;
         private long views;
         private String videoThumbnailUrl;
+        private String videoStartTime;
+        private String videoEndTime;
 
-        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, List<Subtitle> subtitle)
+        public VideoAllResponseDTO(Video video, List<VideoInterest> videoInterests)
         {
             this.videoID = video.getId();
             this.videoUrl = video.getVideoUrl();
-            this.videoInfoKorean = video.getVideoTitleKorean();
-            this.videoInfoEng = video.getVideoTitleEng();
+            this.videoTitleKorean = video.getVideoTitleKorean();
+            this.videoTitleEng = video.getVideoTitleEng();
             this.interests = videoInterests.stream()
                 .map(videoInterest -> videoInterest.getInterest().getCategory())
                 .collect(Collectors.toList());
-            this.subtitle = subtitle;
             this.views = video.getViews();
             this.videoThumbnailUrl = video.getVideoThumbnailUrl();
+            this.videoStartTime = video.getVideoStartTime();
+            this.videoEndTime = video.getVideoEndTime();
+        }
+    }
+
+    @Getter
+    @Setter
+    public static class VideoResponseDTO {
+        private int videoID;
+        private String videoUrl;
+        private String videoTitleKorean;
+        private String videoTitleEng;
+        private List<String> interests;
+        private long views;
+        private String videoThumbnailUrl;
+        private String videoStartTime;
+        private String videoEndTime;
+        private Subtitle subtitle;
+
+        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, Subtitle subtitle)
+        {
+            this.videoID = video.getId();
+            this.videoUrl = video.getVideoUrl();
+            this.videoTitleKorean = video.getVideoTitleKorean();
+            this.videoTitleEng = video.getVideoTitleEng();
+            this.interests = videoInterests.stream()
+                    .map(videoInterest -> videoInterest.getInterest().getCategory())
+                    .collect(Collectors.toList());
+            this.views = video.getViews();
+            this.videoThumbnailUrl = video.getVideoThumbnailUrl();
+            this.videoStartTime = video.getVideoStartTime();
+            this.videoEndTime = video.getVideoEndTime();
         }
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 0b5edeac..ae406114 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -1,12 +1,9 @@
 package com.example.demo.video;
 
-import com.example.demo.config.auth.CustomUserDetails;
 import com.example.demo.config.utils.ApiUtils;
-import com.example.demo.mentoring.MentorPostResponse;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,13 +20,13 @@ public class VideoRestController {
 
     @GetMapping("/videos/main")
     public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
-        List<VideoResponse.VideoResponseDTO> responseDTOs = videoService.findAllVideo(page);
+        List<VideoResponse.VideoAllResponseDTO> responseDTOs = videoService.findAllVideo(page);
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 
-    @GetMapping("/videos/{id}")
-    public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
-        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
-        return ResponseEntity.ok(ApiUtils.success(responseDTO));
-    }
+//    @GetMapping("/videos/{id}")
+//    public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
+//        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
+//        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+//    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 22791eab..8e25b87a 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -19,7 +19,7 @@ public class VideoService {
     private final VideoInterestJPARepository videoInterestJPARepository;
     private final SubtitleJPARepository subtitleJPARepository;
 
-    public List<VideoResponse.VideoResponseDTO> findAllVideo(Integer page) {
+    public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
         Pageable pageable = PageRequest.of(page,4);
 
         Page<Video> pageContent = videoJPARepository.findAll(pageable);
@@ -29,17 +29,18 @@ public List<VideoResponse.VideoResponseDTO> findAllVideo(Integer page) {
         }
 
         // 각 Video에대해서 Interest, Subtitle 끌어오기
-        List<VideoResponse.VideoResponseDTO> videoDTOList = pageContent.getContent().stream().map(
+        List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
                 video -> {
                     List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
-                    List<Subtitle> subtitle = subtitleJPARepository.findSubtitleByVideoId(video.getId());
 
-                    return new VideoResponse.VideoResponseDTO(video, videoInterests, subtitle);
+                    return new VideoResponse.VideoAllResponseDTO(video, videoInterests);
                 }
         ).collect(Collectors.toList());
         return videoDTOList;
     }
 
-    public VideoResponse.VideoResponseDTO findVideo(int id) {
-    }
+//    public VideoResponse.VideoResponseDTO findVideo(int id) {
+//
+//    }
+
 }
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 826916b7..821c7ce8 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -4,7 +4,6 @@
 import com.example.demo.interest.InterestJPARepository;
 import com.example.demo.video.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -183,7 +182,7 @@ void findAllTest() {
     @Test
     @Order(2)
     void findAllServiceTest() throws Exception {
-        List<VideoResponse.VideoResponseDTO> videoFind = videoService.findAllVideo(0);
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findAllVideo(0);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From d4cf0b10d1b04929ea380fc2ef14954c26f66230 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Fri, 3 Nov 2023 21:05:45 +0900
Subject: [PATCH 08/24] =?UTF-8?q?feat=20:=20find=20video=20=EB=B9=84?=
 =?UTF-8?q?=EB=94=94=EC=98=A4=20=ED=95=98=EB=82=98=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EA=B9=8C=EC=A7=80=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/video/VideoJPARepository.java        |  4 +++
 .../com/example/demo/video/VideoResponse.java | 34 +++++++++++++++++--
 .../demo/video/VideoRestController.java       | 10 +++---
 .../com/example/demo/video/VideoService.java  | 16 ++++++---
 src/test/java/com/example/demo/VideoTest.java |  2 +-
 5 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoJPARepository.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
index 95dda1f9..27960557 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -1,6 +1,10 @@
 package com.example.demo.video;
 
+import com.example.demo.mentoring.MentorPost;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface VideoJPARepository extends JpaRepository<Video, Integer> {
+    Optional<Video> findById(int id);
 }
diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index 14f8866f..a83d613c 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -48,9 +48,9 @@ public static class VideoResponseDTO {
         private String videoThumbnailUrl;
         private String videoStartTime;
         private String videoEndTime;
-        private Subtitle subtitle;
+        private List<SubtitleDTO> subtitles;
 
-        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, Subtitle subtitle)
+        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, List<Subtitle> subtitles)
         {
             this.videoID = video.getId();
             this.videoUrl = video.getVideoUrl();
@@ -63,6 +63,36 @@ public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, Subtitl
             this.videoThumbnailUrl = video.getVideoThumbnailUrl();
             this.videoStartTime = video.getVideoStartTime();
             this.videoEndTime = video.getVideoEndTime();
+            this.subtitles = subtitles.stream()
+            .map(SubtitleDTO::new)
+            .collect(Collectors.toList());
+        }
+
+        @Getter
+        @Setter
+        public static class SubtitleDTO
+        {
+            private int subtitleId;
+            private String korSubtitleContent;
+            private String korSubtitleStartTime;
+            private String korSubtitleEndTime;
+            private String engSubtitleContent;
+            private String engSubtitleStartTime;
+            private String engSubtitleEndTime;
+
+            public SubtitleDTO(Subtitle subtitle)
+            {
+                this.subtitleId = subtitle.getId();
+                this.korSubtitleContent = subtitle.getKorSubtitleContent();
+                this.korSubtitleStartTime = subtitle.getKorStartTime();
+                this.korSubtitleEndTime = subtitle.getKorEndTime();
+                this.engSubtitleContent = subtitle.getEngSubtitleContent();
+                this.engSubtitleStartTime = subtitle.getEngStartTime();
+                this.korSubtitleEndTime = subtitle.getEngEndTime();
+            }
         }
     }
+
+
+
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index ae406114..4159e05e 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -24,9 +24,9 @@ public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defa
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 
-//    @GetMapping("/videos/{id}")
-//    public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
-//        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
-//        return ResponseEntity.ok(ApiUtils.success(responseDTO));
-//    }
+    @GetMapping("/videos/{id}")
+    public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
+        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
+        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 8e25b87a..ccf1ac7b 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -28,7 +28,7 @@ public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
             throw new Exception404("해당 영상들이 존재하지 않습니다");
         }
 
-        // 각 Video에대해서 Interest, Subtitle 끌어오기
+        // 각 Video에대해서 Interest 끌어오기
         List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
                 video -> {
                     List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
@@ -39,8 +39,16 @@ public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
         return videoDTOList;
     }
 
-//    public VideoResponse.VideoResponseDTO findVideo(int id) {
-//
-//    }
+    public VideoResponse.VideoResponseDTO findVideo(int id) {
+        Video video = videoJPARepository.findById(id)
+                .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));;
+
+        List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
+        List<Subtitle> videoSubtitles = subtitleJPARepository.findSubtitleByVideoId(video.getId());
+
+        VideoResponse.VideoResponseDTO videoResponseDTO = new VideoResponse.VideoResponseDTO(video, videoInterests, videoSubtitles);
+
+        return videoResponseDTO;
+    }
 
 }
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 821c7ce8..42c79a17 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -182,7 +182,7 @@ void findAllTest() {
     @Test
     @Order(2)
     void findAllServiceTest() throws Exception {
-        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findAllVideo(0);
+        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From 20c7b64a4517f741dc4010cd9d3b8e253ffafba3 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sat, 4 Nov 2023 10:36:30 +0900
Subject: [PATCH 09/24] =?UTF-8?q?feat=20:=20video=20history=20=EB=B4=A4?=
 =?UTF-8?q?=EB=8D=98=20=EB=82=B4=EC=9A=A9=EB=93=A4=20=EA=B8=B0=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/video/VideoHistory.java  | 37 +++++++++++++++++++
 .../com/example/demo/video/VideoInterest.java |  2 +-
 .../demo/video/VideoRestController.java       | 18 ++++++++-
 .../com/example/demo/video/VideoService.java  | 12 ++++++
 4 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/example/demo/video/VideoHistory.java

diff --git a/src/main/java/com/example/demo/video/VideoHistory.java b/src/main/java/com/example/demo/video/VideoHistory.java
new file mode 100644
index 00000000..cb52917d
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoHistory.java
@@ -0,0 +1,37 @@
+package com.example.demo.video;
+
+import com.example.demo.config.utils.BaseTime;
+import com.example.demo.user.User;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.*;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+@Where(clause = "deleted_at IS NULL")
+@SQLDelete(sql = "UPDATE videohistories SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
+@Table(name = "videohistories")
+public class VideoHistory extends BaseTime {
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    private int id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "video_id")
+    private Video video;
+
+    public void VideoHistory( User user, Video video) {
+        this.user = user;
+        this.video = video;
+    }
+
+}
diff --git a/src/main/java/com/example/demo/video/VideoInterest.java b/src/main/java/com/example/demo/video/VideoInterest.java
index 21c2624b..b84a0d6c 100644
--- a/src/main/java/com/example/demo/video/VideoInterest.java
+++ b/src/main/java/com/example/demo/video/VideoInterest.java
@@ -24,7 +24,7 @@ public class VideoInterest extends BaseTime {
     private int id;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
+    @JoinColumn(name = "video_id")
     private Video video;
 
     @ManyToOne(fetch = FetchType.LAZY)
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 4159e05e..08c26a74 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -1,9 +1,11 @@
 package com.example.demo.video;
 
+import com.example.demo.config.auth.CustomUserDetails;
 import com.example.demo.config.utils.ApiUtils;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -18,15 +20,27 @@ public class VideoRestController {
 
     private final VideoService videoService;
 
+   /* @GetMapping("/videos/interest")
+    public ResponseEntity<?> getUserCategoryVideo(@AuthenticationPrincipal CustomUserDetails userDetails){
+        List<VideoResponse.VideoAllResponseDTO> responseDTOs = videoService.findUserCategory(userDetails.getUser().getId());
+        return ResponseEntity.ok(ApiUtils.success(responseDTOs));
+    }*/
+
     @GetMapping("/videos/main")
-    public ResponseEntity<?> getUserCategoryVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
+    public ResponseEntity<?> getCategoryFilterVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
         List<VideoResponse.VideoAllResponseDTO> responseDTOs = videoService.findAllVideo(page);
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 
     @GetMapping("/videos/{id}")
-    public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
+    public ResponseEntity<?> getVideoId(@PathVariable int id) {
         VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
         return ResponseEntity.ok(ApiUtils.success(responseDTO));
     }
+
+    @GetMapping("/videos/history")
+    public ResponseEntity<?> getVideoHistory(@PathVariable int id) {
+        List<VideoResponse.VideoResponseDTO> responseDTO = videoService.findHistoryVideo(id);
+        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index ccf1ac7b..62c66274 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -1,6 +1,8 @@
 package com.example.demo.video;
 
 import com.example.demo.config.errors.exception.Exception404;
+import com.example.demo.user.userInterest.UserInterest;
+import com.example.demo.user.userInterest.UserInterestJPARepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -18,6 +20,7 @@ public class VideoService {
     private final VideoJPARepository videoJPARepository;
     private final VideoInterestJPARepository videoInterestJPARepository;
     private final SubtitleJPARepository subtitleJPARepository;
+    private final UserInterestJPARepository userInterestJPARepository;
 
     public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
         Pageable pageable = PageRequest.of(page,4);
@@ -51,4 +54,13 @@ public VideoResponse.VideoResponseDTO findVideo(int id) {
         return videoResponseDTO;
     }
 
+//    public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
+//        List<UserInterest> userInterests = userInterestJPARepository.findAllById(id);
+//        Pageable pageable = PageRequest.of(0,4);
+//        Page<Video> pageContent;
+//        if(userInterests.size() == 0)
+//        {
+//            pageContent = videoJPARepository.findAll(pageable);
+//        }
+//    }
 }

From ea5ea9f083161ad0e7fba24ab2b76ca224474449 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sat, 4 Nov 2023 10:37:48 +0900
Subject: [PATCH 10/24] =?UTF-8?q?fix=20:=20video=20history=20restcontrolle?=
 =?UTF-8?q?r=20=EC=9D=B8=EC=9E=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/video/VideoRestController.java | 4 ++--
 src/main/java/com/example/demo/video/VideoService.java        | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 08c26a74..9b534be4 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -39,8 +39,8 @@ public ResponseEntity<?> getVideoId(@PathVariable int id) {
     }
 
     @GetMapping("/videos/history")
-    public ResponseEntity<?> getVideoHistory(@PathVariable int id) {
-        List<VideoResponse.VideoResponseDTO> responseDTO = videoService.findHistoryVideo(id);
+    public ResponseEntity<?> getVideoHistory(@AuthenticationPrincipal CustomUserDetails userDetails) {
+        List<VideoResponse.VideoResponseDTO> responseDTO = videoService.findHistoryVideo(userDetails.getUser().getId());
         return ResponseEntity.ok(ApiUtils.success(responseDTO));
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 62c66274..b9a77af9 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -54,6 +54,10 @@ public VideoResponse.VideoResponseDTO findVideo(int id) {
         return videoResponseDTO;
     }
 
+    public List<VideoResponse.VideoResponseDTO> findHistoryVideo(int id) {
+        
+    }
+
 //    public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
 //        List<UserInterest> userInterests = userInterestJPARepository.findAllById(id);
 //        Pageable pageable = PageRequest.of(0,4);

From 2bfcfb72566d8e2264dccb5a98c15d226cb4182f Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sat, 4 Nov 2023 11:09:08 +0900
Subject: [PATCH 11/24] =?UTF-8?q?feat=20:=20videoHistory=20fin=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EA=B9=8C=EC=A7=80=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/video/VideoHistory.java  |  4 +-
 .../demo/video/VideoHistoryJPARepository.java | 11 ++++++
 .../video/VideoInterestJPARepository.java     |  4 +-
 .../demo/video/VideoJPARepository.java        |  3 ++
 .../demo/video/VideoRestController.java       |  4 +-
 .../com/example/demo/video/VideoService.java  | 26 +++++++++++--
 src/test/java/com/example/demo/VideoTest.java | 39 ++++++++++++++++++-
 7 files changed, 83 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/example/demo/video/VideoHistoryJPARepository.java

diff --git a/src/main/java/com/example/demo/video/VideoHistory.java b/src/main/java/com/example/demo/video/VideoHistory.java
index cb52917d..3f8a9023 100644
--- a/src/main/java/com/example/demo/video/VideoHistory.java
+++ b/src/main/java/com/example/demo/video/VideoHistory.java
@@ -3,6 +3,7 @@
 import com.example.demo.config.utils.BaseTime;
 import com.example.demo.user.User;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
@@ -29,7 +30,8 @@ public class VideoHistory extends BaseTime {
     @JoinColumn(name = "video_id")
     private Video video;
 
-    public void VideoHistory( User user, Video video) {
+    @Builder
+    public VideoHistory( User user, Video video) {
         this.user = user;
         this.video = video;
     }
diff --git a/src/main/java/com/example/demo/video/VideoHistoryJPARepository.java b/src/main/java/com/example/demo/video/VideoHistoryJPARepository.java
new file mode 100644
index 00000000..4f4cfe0f
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoHistoryJPARepository.java
@@ -0,0 +1,11 @@
+package com.example.demo.video;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+public interface VideoHistoryJPARepository extends JpaRepository<VideoHistory, Integer> {
+    @Query("select vh from VideoHistory vh where vh.user.id = :id order by vh.createdAt desc")
+    Page<VideoHistory> findHistoryVideo(int id, Pageable pageable);
+}
diff --git a/src/main/java/com/example/demo/video/VideoInterestJPARepository.java b/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
index 34d41250..80c0be50 100644
--- a/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
@@ -1,5 +1,7 @@
 package com.example.demo.video;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -7,6 +9,6 @@
 import java.util.List;
 
 public interface VideoInterestJPARepository  extends JpaRepository<VideoInterest, Integer> {
-    @Query("select m from VideoInterest m where m.video.id = :video")
+    @Query("select vi from VideoInterest vi where vi.video.id = :video")
     List<VideoInterest> findVideoInterestByVideoId(@Param("video") int video);
 }
diff --git a/src/main/java/com/example/demo/video/VideoJPARepository.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
index 27960557..ca2275b0 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -1,7 +1,10 @@
 package com.example.demo.video;
 
 import com.example.demo.mentoring.MentorPost;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.Optional;
 
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 9b534be4..fc524742 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -39,8 +39,8 @@ public ResponseEntity<?> getVideoId(@PathVariable int id) {
     }
 
     @GetMapping("/videos/history")
-    public ResponseEntity<?> getVideoHistory(@AuthenticationPrincipal CustomUserDetails userDetails) {
-        List<VideoResponse.VideoResponseDTO> responseDTO = videoService.findHistoryVideo(userDetails.getUser().getId());
+    public ResponseEntity<?> getVideoHistory(@RequestParam(value = "page", defaultValue = "0") Integer page, @AuthenticationPrincipal CustomUserDetails userDetails) {
+        List<VideoResponse.VideoAllResponseDTO> responseDTO = videoService.findHistoryVideo(page, userDetails.getUser().getId());
         return ResponseEntity.ok(ApiUtils.success(responseDTO));
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index b9a77af9..31a681bb 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -21,9 +21,13 @@ public class VideoService {
     private final VideoInterestJPARepository videoInterestJPARepository;
     private final SubtitleJPARepository subtitleJPARepository;
     private final UserInterestJPARepository userInterestJPARepository;
+    private final VideoHistoryJPARepository videoHistoryJPARepository;
+
+    private final int MAINVIDEONUM = 4;
+    private final int HISTORYVIDEONUM = 5;
 
     public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
-        Pageable pageable = PageRequest.of(page,4);
+        Pageable pageable = PageRequest.of(page,MAINVIDEONUM);
 
         Page<Video> pageContent = videoJPARepository.findAll(pageable);
 
@@ -54,8 +58,24 @@ public VideoResponse.VideoResponseDTO findVideo(int id) {
         return videoResponseDTO;
     }
 
-    public List<VideoResponse.VideoResponseDTO> findHistoryVideo(int id) {
-        
+    public List<VideoResponse.VideoAllResponseDTO> findHistoryVideo(Integer page, int id) {
+        Pageable pageable = PageRequest.of(page,HISTORYVIDEONUM);
+
+        Page<VideoHistory> pageContent = videoHistoryJPARepository.findHistoryVideo(id, pageable);
+
+        if(pageContent.getTotalPages() == 0){
+            throw new Exception404("해당 영상들이 존재하지 않습니다");
+        }
+
+        // 각 Video에대해서 Interest 끌어오기
+        List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
+                video -> {
+                    List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getVideo().getId());
+
+                    return new VideoResponse.VideoAllResponseDTO(video.getVideo(), videoInterests);
+                }
+        ).collect(Collectors.toList());
+        return videoDTOList;
     }
 
 //    public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 42c79a17..b26ba8fa 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -2,6 +2,9 @@
 
 import com.example.demo.interest.Interest;
 import com.example.demo.interest.InterestJPARepository;
+import com.example.demo.user.Role;
+import com.example.demo.user.User;
+import com.example.demo.user.UserJPARepository;
 import com.example.demo.video.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.*;
@@ -25,6 +28,10 @@ public class VideoTest extends RestDoc{
     private VideoJPARepository videoJPARepository;
     @Autowired
     private SubtitleJPARepository subtitleJPARepository;
+    @Autowired
+    private UserJPARepository userJPARepository;
+    @Autowired
+    private VideoHistoryJPARepository videoHistoryJPARepository;
 
     @Autowired
     private VideoService videoService;
@@ -36,6 +43,17 @@ public class VideoTest extends RestDoc{
     @Order(1)
     void findAllTest() {
 
+        User user = User.builder()
+                .email("anjdal64@gmail.com")
+                .password("asdf1234!")
+                .firstName("Jin")
+                .lastName("Seung")
+                .country("Korea")
+                .age(21)
+                .role(Role.MENTOR)
+                .phone("010-0000-0000")
+                .build();
+
         Interest interest1 = Interest.builder()
                 .category("test_Interest_1")
                 .build();
@@ -159,6 +177,21 @@ void findAllTest() {
                 .engSubtitleContent("ffff")
                 .build();
 
+        VideoHistory videoHistory1 = VideoHistory.builder()
+                .video(video1)
+                .user(user)
+                .build();
+
+        VideoHistory videoHistory2 = VideoHistory.builder()
+                .video(video5)
+                .user(user)
+                .build();
+
+        VideoHistory videoHistory3 = VideoHistory.builder()
+                .video(video3)
+                .user(user)
+                .build();
+
 
         interestJPARepository.save(interest1);
         interestJPARepository.save(interest2);
@@ -177,12 +210,16 @@ void findAllTest() {
         videoInterestJPARepository.save(video6Interest2);
         subtitleJPARepository.save(subtitle1);
         subtitleJPARepository.save(subtitle2);
+        userJPARepository.save(user);
+        videoHistoryJPARepository.save(videoHistory1);
+        videoHistoryJPARepository.save(videoHistory2);
+        videoHistoryJPARepository.save(videoHistory3);
     }
 
     @Test
     @Order(2)
     void findAllServiceTest() throws Exception {
-        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findHistoryVideo(0,1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From ee726e06b6652c918a12f39cbad209fecf81b56b Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sat, 4 Nov 2023 11:17:52 +0900
Subject: [PATCH 12/24] feat : testcode update

---
 src/test/java/com/example/demo/VideoTest.java | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index b26ba8fa..7757aa6c 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -1,12 +1,15 @@
 package com.example.demo;
 
+import com.example.demo.config.errors.exception.Exception404;
 import com.example.demo.interest.Interest;
 import com.example.demo.interest.InterestJPARepository;
+import com.example.demo.mentoring.MentorPost;
 import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.UserJPARepository;
 import com.example.demo.video.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -41,7 +44,7 @@ public class VideoTest extends RestDoc{
 
     @Test
     @Order(1)
-    void findAllTest() {
+    void save() {
 
         User user = User.builder()
                 .email("anjdal64@gmail.com")
@@ -218,7 +221,37 @@ void findAllTest() {
 
     @Test
     @Order(2)
-    void findAllServiceTest() throws Exception {
+    void findAllTest() throws Exception{
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findAllVideo(0);
+        org.assertj.core.api.Assertions.assertThat(1)
+                .isEqualTo(videoFind.get(0).getVideoID());
+        Assertions.assertThat("첫번째 비디오")
+                .isEqualTo(videoFind.get(0).getVideoTitleKorean());
+    }
+
+    @Test
+    @Order(2)
+    void findTest() throws Exception{
+        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
+        org.assertj.core.api.Assertions.assertThat(1)
+                .isEqualTo(videoFind.getVideoID());
+        Assertions.assertThat("첫번째 비디오")
+                .isEqualTo(videoFind.getVideoTitleKorean());
+        Assertions.assertThat("asdfasdf")
+                .isEqualTo(videoFind.getSubtitles().get(0).getKorSubtitleContent());
+    }
+
+    @Test
+    @Order(2)
+    void findHistoryTest() throws Exception{
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findHistoryVideo(0,1);
+        org.assertj.core.api.Assertions.assertThat(3)
+                .isEqualTo(videoFind.get(0).getVideoID());
+    }
+
+    @Test
+    @Order(2)
+    void findOmTest() throws Exception {
         List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findHistoryVideo(0,1);
 
         String responseBody = om.writeValueAsString(videoFind);

From 159b3ccdf899581d2a0da1fa8d1b495d690b8489 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sat, 4 Nov 2023 16:10:06 +0900
Subject: [PATCH 13/24] fix : interest list to interest

---
 .../demo/video/VideoInterestJPARepository.java   |  2 +-
 .../com/example/demo/video/VideoResponse.java    | 16 ++++++----------
 .../com/example/demo/video/VideoService.java     | 10 +++++-----
 src/test/java/com/example/demo/VideoTest.java    |  3 +--
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoInterestJPARepository.java b/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
index 80c0be50..411ee8aa 100644
--- a/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoInterestJPARepository.java
@@ -10,5 +10,5 @@
 
 public interface VideoInterestJPARepository  extends JpaRepository<VideoInterest, Integer> {
     @Query("select vi from VideoInterest vi where vi.video.id = :video")
-    List<VideoInterest> findVideoInterestByVideoId(@Param("video") int video);
+    VideoInterest findVideoInterestByVideoId(@Param("video") int video);
 }
diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index a83d613c..33dc38ef 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -14,21 +14,19 @@ public static class VideoAllResponseDTO {
         private String videoUrl;
         private String videoTitleKorean;
         private String videoTitleEng;
-        private List<String> interests;
+        private String interests;
         private long views;
         private String videoThumbnailUrl;
         private String videoStartTime;
         private String videoEndTime;
 
-        public VideoAllResponseDTO(Video video, List<VideoInterest> videoInterests)
+        public VideoAllResponseDTO(Video video, VideoInterest videoInterest)
         {
             this.videoID = video.getId();
             this.videoUrl = video.getVideoUrl();
             this.videoTitleKorean = video.getVideoTitleKorean();
             this.videoTitleEng = video.getVideoTitleEng();
-            this.interests = videoInterests.stream()
-                .map(videoInterest -> videoInterest.getInterest().getCategory())
-                .collect(Collectors.toList());
+            this.interests = videoInterest.getInterest().getCategory();
             this.views = video.getViews();
             this.videoThumbnailUrl = video.getVideoThumbnailUrl();
             this.videoStartTime = video.getVideoStartTime();
@@ -43,22 +41,20 @@ public static class VideoResponseDTO {
         private String videoUrl;
         private String videoTitleKorean;
         private String videoTitleEng;
-        private List<String> interests;
+        private String interests;
         private long views;
         private String videoThumbnailUrl;
         private String videoStartTime;
         private String videoEndTime;
         private List<SubtitleDTO> subtitles;
 
-        public VideoResponseDTO(Video video, List<VideoInterest> videoInterests, List<Subtitle> subtitles)
+        public VideoResponseDTO(Video video, VideoInterest videoInterest, List<Subtitle> subtitles)
         {
             this.videoID = video.getId();
             this.videoUrl = video.getVideoUrl();
             this.videoTitleKorean = video.getVideoTitleKorean();
             this.videoTitleEng = video.getVideoTitleEng();
-            this.interests = videoInterests.stream()
-                    .map(videoInterest -> videoInterest.getInterest().getCategory())
-                    .collect(Collectors.toList());
+            this.interests = videoInterest.getInterest().getCategory();
             this.views = video.getViews();
             this.videoThumbnailUrl = video.getVideoThumbnailUrl();
             this.videoStartTime = video.getVideoStartTime();
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 31a681bb..9342db07 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -38,7 +38,7 @@ public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
         // 각 Video에대해서 Interest 끌어오기
         List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
                 video -> {
-                    List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
+                    VideoInterest videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
 
                     return new VideoResponse.VideoAllResponseDTO(video, videoInterests);
                 }
@@ -50,10 +50,10 @@ public VideoResponse.VideoResponseDTO findVideo(int id) {
         Video video = videoJPARepository.findById(id)
                 .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));;
 
-        List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
+        VideoInterest videoInterest = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
         List<Subtitle> videoSubtitles = subtitleJPARepository.findSubtitleByVideoId(video.getId());
 
-        VideoResponse.VideoResponseDTO videoResponseDTO = new VideoResponse.VideoResponseDTO(video, videoInterests, videoSubtitles);
+        VideoResponse.VideoResponseDTO videoResponseDTO = new VideoResponse.VideoResponseDTO(video, videoInterest, videoSubtitles);
 
         return videoResponseDTO;
     }
@@ -70,9 +70,9 @@ public List<VideoResponse.VideoAllResponseDTO> findHistoryVideo(Integer page, in
         // 각 Video에대해서 Interest 끌어오기
         List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
                 video -> {
-                    List<VideoInterest> videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getVideo().getId());
+                    VideoInterest videoInterest = videoInterestJPARepository.findVideoInterestByVideoId(video.getVideo().getId());
 
-                    return new VideoResponse.VideoAllResponseDTO(video.getVideo(), videoInterests);
+                    return new VideoResponse.VideoAllResponseDTO(video.getVideo(), videoInterest);
                 }
         ).collect(Collectors.toList());
         return videoDTOList;
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 7757aa6c..99aa3b63 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -205,7 +205,6 @@ void save() {
         videoJPARepository.save(video5);
         videoJPARepository.save(video6);
         videoInterestJPARepository.save(video1Interest1);
-        videoInterestJPARepository.save(video1Interest2);
         videoInterestJPARepository.save(video2Interest1);
         videoInterestJPARepository.save(video3Interest1);
         videoInterestJPARepository.save(video4Interest2);
@@ -252,7 +251,7 @@ void findHistoryTest() throws Exception{
     @Test
     @Order(2)
     void findOmTest() throws Exception {
-        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findHistoryVideo(0,1);
+        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From 7c23c2632d513882843a320441d1ee67d83d8a12 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sat, 4 Nov 2023 17:02:26 +0900
Subject: [PATCH 14/24] =?UTF-8?q?feat=20:=20findUserCategory=20sevice=20?=
 =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=EB=B6=80=EB=B6=84=20=ED=85=8C?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=ED=95=B4=EC=95=BC=EB=90=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/video/VideoJPARepository.java        |  5 +++
 .../demo/video/VideoRestController.java       |  4 +-
 .../com/example/demo/video/VideoService.java  | 38 ++++++++++++++-----
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoJPARepository.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
index ca2275b0..e3512edb 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -1,13 +1,18 @@
 package com.example.demo.video;
 
 import com.example.demo.mentoring.MentorPost;
+import com.example.demo.user.userInterest.UserInterest;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface VideoJPARepository extends JpaRepository<Video, Integer> {
     Optional<Video> findById(int id);
+
+    @Query("select v from Video v join fetch VideoInterest vi on v.id = vi.video.id where vi.interest.category in :userInterest")
+    Page<Video> findByVideoCategory(List<String> userInterests, Pageable pageable);
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index fc524742..8ad20a75 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -20,11 +20,11 @@ public class VideoRestController {
 
     private final VideoService videoService;
 
-   /* @GetMapping("/videos/interest")
+   @GetMapping("/videos/interest")
     public ResponseEntity<?> getUserCategoryVideo(@AuthenticationPrincipal CustomUserDetails userDetails){
         List<VideoResponse.VideoAllResponseDTO> responseDTOs = videoService.findUserCategory(userDetails.getUser().getId());
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
-    }*/
+    }
 
     @GetMapping("/videos/main")
     public ResponseEntity<?> getCategoryFilterVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 9342db07..a27c5d5e 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -1,6 +1,7 @@
 package com.example.demo.video;
 
 import com.example.demo.config.errors.exception.Exception404;
+import com.example.demo.interest.Interest;
 import com.example.demo.user.userInterest.UserInterest;
 import com.example.demo.user.userInterest.UserInterestJPARepository;
 import lombok.RequiredArgsConstructor;
@@ -78,13 +79,32 @@ public List<VideoResponse.VideoAllResponseDTO> findHistoryVideo(Integer page, in
         return videoDTOList;
     }
 
-//    public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
-//        List<UserInterest> userInterests = userInterestJPARepository.findAllById(id);
-//        Pageable pageable = PageRequest.of(0,4);
-//        Page<Video> pageContent;
-//        if(userInterests.size() == 0)
-//        {
-//            pageContent = videoJPARepository.findAll(pageable);
-//        }
-//    }
+    public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
+        List<UserInterest> userInterests = userInterestJPARepository.findAllById(id);
+        List<String> Interests = userInterests.stream()
+                .map(userInterest -> userInterest.getInterest().getCategory()).collect(Collectors.toList());
+        Pageable pageable = PageRequest.of(0,4);
+        Page<Video> pageContent;
+        if(userInterests.size() == 0)
+        {
+            pageContent = videoJPARepository.findAll(pageable);
+        }
+        else
+        {
+            pageContent = videoJPARepository.findByVideoCategory(Interests ,pageable);
+        }
+
+        if(pageContent.getTotalPages() == 0){
+            throw new Exception404("해당 영상들이 존재하지 않습니다");
+        }
+
+        // 각 Video에대해서 Interest 끌어오기
+        List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
+                video -> {
+                    VideoInterest videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
+                    return new VideoResponse.VideoAllResponseDTO(video, videoInterests);
+                }
+        ).collect(Collectors.toList());
+        return videoDTOList;
+    }
 }

From 84639e8b6037766c886726b41690aa58cc7f0b29 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 00:57:24 +0900
Subject: [PATCH 15/24] feat : random 4 usercategory native query

---
 .../demo/video/VideoJPARepository.java        | 16 +++-
 src/test/java/com/example/demo/VideoTest.java | 85 +++++++++++++++++--
 2 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoJPARepository.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
index e3512edb..c3f18ac0 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -6,6 +6,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 import java.util.Optional;
@@ -13,6 +14,17 @@
 public interface VideoJPARepository extends JpaRepository<Video, Integer> {
     Optional<Video> findById(int id);
 
-    @Query("select v from Video v join fetch VideoInterest vi on v.id = vi.video.id where vi.interest.category in :userInterest")
-    Page<Video> findByVideoCategory(List<String> userInterests, Pageable pageable);
+    @Query(value = "SELECT * FROM videos v " +
+            "INNER JOIN video_interests vi ON v.id = vi.video_id " +
+            "INNER JOIN interest_tb i ON vi.interest_id = i.id " +
+            "WHERE i.category IN :userInterests " +
+            "ORDER BY RAND()", // MySQL에서 랜덤 정렬
+            countQuery = "SELECT COUNT(*) FROM videos v " +
+                    "INNER JOIN video_interests vi ON v.id = vi.video_id " +
+                    "INNER JOIN interest_tb i ON vi.interest_id = i.id " +
+                    "WHERE i.category IN :userInterests", // 페이징을 위한 count 쿼리
+            nativeQuery = true)
+    Page<Video> findByVideoCategory(@Param("userInterests") List<String> userInterests, Pageable pageable);
+
+
 }
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 99aa3b63..2f303371 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -7,6 +7,8 @@
 import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.UserJPARepository;
+import com.example.demo.user.userInterest.UserInterest;
+import com.example.demo.user.userInterest.UserInterestJPARepository;
 import com.example.demo.video.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.assertj.core.api.Assertions;
@@ -35,6 +37,8 @@ public class VideoTest extends RestDoc{
     private UserJPARepository userJPARepository;
     @Autowired
     private VideoHistoryJPARepository videoHistoryJPARepository;
+    @Autowired
+    private UserInterestJPARepository userInterestJPARepository;
 
     @Autowired
     private VideoService videoService;
@@ -65,6 +69,10 @@ void save() {
                 .category("test_Interest_2")
                 .build();
 
+        Interest interest3 = Interest.builder()
+                .category("test_Interest_3")
+                .build();
+
         Video video1 = Video.builder()
                 .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
                 .views(25)
@@ -125,14 +133,39 @@ void save() {
                 .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
                 .build();
 
-        VideoInterest video1Interest1 = VideoInterest.builder()
-                .video(video1)
-                .interest(interest1)
+        Video video7 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Sixth page Sixth Video")
+                .videoTitleKorean("여섯번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
                 .build();
 
-        VideoInterest video1Interest2 = VideoInterest.builder()
+        Video video8 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Sixth page Sixth Video")
+                .videoTitleKorean("여섯번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        Video video9 = Video.builder()
+                .videoUrl("https://www.youtube.com/watch?v=6lw4Cbk1IzA")
+                .views(25)
+                .videoTitleEng("Sixth page Sixth Video")
+                .videoTitleKorean("여섯번째 비디오")
+                .videoStartTime("23")
+                .videoEndTime("100")
+                .videoThumbnailUrl( "https://search.pstatic.net/common/?src=http%3A%2F%2Fimgnews.naver.net%2Fimage%2F016%2F2023%2F08%2F10%2F20230810000405_0_20230810112103061.jpg&type=sc960_832")
+                .build();
+
+        VideoInterest video1Interest1 = VideoInterest.builder()
                 .video(video1)
-                .interest(interest2)
+                .interest(interest1)
                 .build();
 
         VideoInterest video2Interest1 = VideoInterest.builder()
@@ -160,6 +193,21 @@ void save() {
                 .interest(interest2)
                 .build();
 
+        VideoInterest video7Interest3 = VideoInterest.builder()
+                .video(video7)
+                .interest(interest3)
+                .build();
+
+        VideoInterest video8Interest3 = VideoInterest.builder()
+                .video(video8)
+                .interest(interest3)
+                .build();
+
+        VideoInterest video9Interest1 = VideoInterest.builder()
+                .video(video9)
+                .interest(interest1)
+                .build();
+
         Subtitle subtitle1 = Subtitle.builder()
                 .video(video1)
                 .korStartTime("1")
@@ -195,27 +243,45 @@ void save() {
                 .user(user)
                 .build();
 
+        UserInterest userInterest1 = UserInterest.builder()
+                .user(user)
+                .interest(interest1)
+                .build();
+
+        UserInterest userInterest2 = UserInterest.builder()
+                .user(user)
+                .interest(interest3)
+                .build();
 
         interestJPARepository.save(interest1);
         interestJPARepository.save(interest2);
+        interestJPARepository.save(interest3);
         videoJPARepository.save(video1);
         videoJPARepository.save(video2);
         videoJPARepository.save(video3);
         videoJPARepository.save(video4);
         videoJPARepository.save(video5);
         videoJPARepository.save(video6);
+        videoJPARepository.save(video7);
+        videoJPARepository.save(video8);
+        videoJPARepository.save(video9);
         videoInterestJPARepository.save(video1Interest1);
         videoInterestJPARepository.save(video2Interest1);
         videoInterestJPARepository.save(video3Interest1);
         videoInterestJPARepository.save(video4Interest2);
         videoInterestJPARepository.save(video5Interest1);
         videoInterestJPARepository.save(video6Interest2);
+        videoInterestJPARepository.save(video7Interest3);
+        videoInterestJPARepository.save(video8Interest3);
+        videoInterestJPARepository.save(video9Interest1);
         subtitleJPARepository.save(subtitle1);
         subtitleJPARepository.save(subtitle2);
         userJPARepository.save(user);
         videoHistoryJPARepository.save(videoHistory1);
         videoHistoryJPARepository.save(videoHistory2);
         videoHistoryJPARepository.save(videoHistory3);
+        userInterestJPARepository.save(userInterest1);
+        userInterestJPARepository.save(userInterest2);
     }
 
     @Test
@@ -248,10 +314,17 @@ void findHistoryTest() throws Exception{
                 .isEqualTo(videoFind.get(0).getVideoID());
     }
 
+    @Test
+    @Order(2)
+    void findUserCategoryTest() throws Exception{
+        List<VideoResponse.VideoAllResponseDTO> findUserCategory = videoService.findUserCategory(1);
+
+    }
+
     @Test
     @Order(2)
     void findOmTest() throws Exception {
-        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findUserCategory(1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From 953f6fe77b1c56077272639b5bbba0419ba42afb Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 03:13:25 +0900
Subject: [PATCH 16/24] feat : video show all

---
 .../com/example/demo/video/VideoResponse.java | 15 ++++++++++
 .../demo/video/VideoRestController.java       |  4 +--
 .../com/example/demo/video/VideoService.java  | 30 +++++++++++++++----
 src/test/java/com/example/demo/VideoTest.java |  8 ++---
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index 33dc38ef..871faf5d 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -7,6 +7,21 @@
 import java.util.stream.Collectors;
 
 public class VideoResponse {
+    @Getter
+    @Setter
+    public static class VideoPageResponseDTO{
+        private int page;
+        private List<VideoAllResponseDTO> videoAllResponseDTO;
+        private boolean last;
+
+        public VideoPageResponseDTO(int page, List<VideoAllResponseDTO> videoAllResponseDTO, boolean last){
+            this.page = page;
+            this.videoAllResponseDTO = videoAllResponseDTO;
+            this.last = last;
+        }
+    }
+
+
     @Getter
     @Setter
     public static class VideoAllResponseDTO {
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 8ad20a75..a0a65fbc 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -27,8 +27,8 @@ public ResponseEntity<?> getUserCategoryVideo(@AuthenticationPrincipal CustomUse
     }
 
     @GetMapping("/videos/main")
-    public ResponseEntity<?> getCategoryFilterVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
-        List<VideoResponse.VideoAllResponseDTO> responseDTOs = videoService.findAllVideo(page);
+    public ResponseEntity<?> getCategoryFilterVideo() {
+        List<VideoResponse.VideoPageResponseDTO> responseDTOs = videoService.findAllVideo();
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index a27c5d5e..7d28860a 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -11,6 +11,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,12 +25,12 @@ public class VideoService {
     private final UserInterestJPARepository userInterestJPARepository;
     private final VideoHistoryJPARepository videoHistoryJPARepository;
 
+    private final int MAINVIDEOTOTAL = 100;
     private final int MAINVIDEONUM = 4;
     private final int HISTORYVIDEONUM = 5;
 
-    public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
-        Pageable pageable = PageRequest.of(page,MAINVIDEONUM);
-
+    public List<VideoResponse.VideoPageResponseDTO> findAllVideo() {
+        Pageable pageable = PageRequest.of(0 ,MAINVIDEOTOTAL);
         Page<Video> pageContent = videoJPARepository.findAll(pageable);
 
         if(pageContent.getTotalPages() == 0){
@@ -40,11 +41,30 @@ public List<VideoResponse.VideoAllResponseDTO> findAllVideo(Integer page) {
         List<VideoResponse.VideoAllResponseDTO> videoDTOList = pageContent.getContent().stream().map(
                 video -> {
                     VideoInterest videoInterests = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
-
                     return new VideoResponse.VideoAllResponseDTO(video, videoInterests);
                 }
         ).collect(Collectors.toList());
-        return videoDTOList;
+
+        List<VideoResponse.VideoPageResponseDTO> videoPageResponseDTOS = new ArrayList<>();
+        List<VideoResponse.VideoAllResponseDTO> tempGroup = new ArrayList<>();
+        int page = 0;
+        boolean finish = false;
+        for(int i = 0;i < videoDTOList.size();i++)
+        {
+            tempGroup.add(videoDTOList.get(i));
+            if ((i + 1) % 4 == 0 || i == videoDTOList.size() - 1) {
+                if(i == videoDTOList.size() - 1)
+                    finish = true;
+                VideoResponse.VideoPageResponseDTO videoPageResponseDTO = new VideoResponse.VideoPageResponseDTO(
+                        page, tempGroup, finish
+                );
+                tempGroup = new ArrayList<>();
+                videoPageResponseDTOS.add(videoPageResponseDTO);
+                page++;
+            }
+        }
+
+        return videoPageResponseDTOS;
     }
 
     public VideoResponse.VideoResponseDTO findVideo(int id) {
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 2f303371..5f2e64a3 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -287,11 +287,7 @@ void save() {
     @Test
     @Order(2)
     void findAllTest() throws Exception{
-        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findAllVideo(0);
-        org.assertj.core.api.Assertions.assertThat(1)
-                .isEqualTo(videoFind.get(0).getVideoID());
-        Assertions.assertThat("첫번째 비디오")
-                .isEqualTo(videoFind.get(0).getVideoTitleKorean());
+        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo();
     }
 
     @Test
@@ -324,7 +320,7 @@ void findUserCategoryTest() throws Exception{
     @Test
     @Order(2)
     void findOmTest() throws Exception {
-        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findUserCategory(1);
+        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo();
 
         String responseBody = om.writeValueAsString(videoFind);
 

From d750b8bf3cd2d98439d2b4ecdfef7f9f800031b8 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 08:56:02 +0900
Subject: [PATCH 17/24] fix : videoResponse single

---
 .../com/example/demo/video/VideoResponse.java  | 18 ++++++------------
 src/test/java/com/example/demo/VideoTest.java  |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoResponse.java b/src/main/java/com/example/demo/video/VideoResponse.java
index 871faf5d..949a3b5f 100644
--- a/src/main/java/com/example/demo/video/VideoResponse.java
+++ b/src/main/java/com/example/demo/video/VideoResponse.java
@@ -53,27 +53,21 @@ public VideoAllResponseDTO(Video video, VideoInterest videoInterest)
     @Setter
     public static class VideoResponseDTO {
         private int videoID;
-        private String videoUrl;
-        private String videoTitleKorean;
-        private String videoTitleEng;
+        private String url;
         private String interests;
         private long views;
-        private String videoThumbnailUrl;
-        private String videoStartTime;
-        private String videoEndTime;
+        private String startTime;
+        private String endTime;
         private List<SubtitleDTO> subtitles;
 
         public VideoResponseDTO(Video video, VideoInterest videoInterest, List<Subtitle> subtitles)
         {
             this.videoID = video.getId();
-            this.videoUrl = video.getVideoUrl();
-            this.videoTitleKorean = video.getVideoTitleKorean();
-            this.videoTitleEng = video.getVideoTitleEng();
+            this.url = video.getVideoUrl();
             this.interests = videoInterest.getInterest().getCategory();
             this.views = video.getViews();
-            this.videoThumbnailUrl = video.getVideoThumbnailUrl();
-            this.videoStartTime = video.getVideoStartTime();
-            this.videoEndTime = video.getVideoEndTime();
+            this.startTime = video.getVideoStartTime();
+            this.endTime = video.getVideoEndTime();
             this.subtitles = subtitles.stream()
             .map(SubtitleDTO::new)
             .collect(Collectors.toList());
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 5f2e64a3..dd4df63e 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -320,7 +320,7 @@ void findUserCategoryTest() throws Exception{
     @Test
     @Order(2)
     void findOmTest() throws Exception {
-        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo();
+        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From 39333c3ac2283769b50a49ea7bd58aca062876f3 Mon Sep 17 00:00:00 2001
From: Jin_00 <anjdal64@gmail.com>
Date: Sun, 5 Nov 2023 10:58:35 +0900
Subject: [PATCH 18/24] =?UTF-8?q?fix=20:=20=ED=8C=8C=EC=9D=BC=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jin_00 <anjdal64@gmail.com>
---
 .../com/example/demo/interest/Interest.java   |   2 +-
 .../mentoring/MentorPostRestController.java   |   8 +-
 .../contact/ContactRestController.java        |  18 +-
 .../mentoring/done/DoneRestController.java    |   6 +-
 .../demo/video/VideoRestController.java       |   8 +-
 src/main/resources/db/teardown.sql            |  12 +-
 .../demo/mentoringtest/MentoringTest.java     | 399 ------------------
 7 files changed, 27 insertions(+), 426 deletions(-)
 delete mode 100644 src/test/java/com/example/demo/mentoringtest/MentoringTest.java

diff --git a/src/main/java/com/example/demo/interest/Interest.java b/src/main/java/com/example/demo/interest/Interest.java
index 8e64541e..504be61f 100644
--- a/src/main/java/com/example/demo/interest/Interest.java
+++ b/src/main/java/com/example/demo/interest/Interest.java
@@ -12,7 +12,7 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Table(name = "interests")
-public class Interest {
+public class Interest extends BaseTime {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int id;
diff --git a/src/main/java/com/example/demo/mentoring/MentorPostRestController.java b/src/main/java/com/example/demo/mentoring/MentorPostRestController.java
index fd19f3bb..17fd6dc2 100644
--- a/src/main/java/com/example/demo/mentoring/MentorPostRestController.java
+++ b/src/main/java/com/example/demo/mentoring/MentorPostRestController.java
@@ -33,7 +33,7 @@ public ResponseEntity<?> getMentorPost(
             category = MentorPostCategoryEnum.NULL;
 
         List<MentorPostResponse.MentorPostAllDTO> responseDTOs = mentorPostService.findAllMentorPost(category, keyword, page);
-        return ResponseEntity.ok(ApiUtils.success(responseDTOs));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTOs));
     }
 
     @GetMapping("/mentorings/post/{id}")
@@ -45,19 +45,19 @@ public ResponseEntity<?> getMentorPostId(@PathVariable int id) {
     @PutMapping(value = "/mentorings/post/{id}")
     public ResponseEntity<?> updateMentorPost(@PathVariable int id, @RequestBody @Valid MentorPostRequest.CreateDTO requestDTO, Errors errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
         mentorPostService.updateMentorPost(requestDTO, id, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
     @DeleteMapping(value = "/mentorings/post/{id}")
     public ResponseEntity<?> deleteMentorPost(@PathVariable int id, @AuthenticationPrincipal CustomUserDetails userDetails) {
         mentorPostService.deleteMentorPost(id, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
     @PatchMapping(value = "/mentorings/post/{id}/done")
     public ResponseEntity<?> changeMentorPostStatus(@PathVariable int id,@RequestBody @Valid MentorPostRequest.StateDTO requestDTO, Errors errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
         mentorPostService.changeMentorPostStatus(requestDTO, id, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
 }
diff --git a/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java b/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java
index 2cfbc08c..e9544d03 100644
--- a/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java
+++ b/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java
@@ -1,7 +1,7 @@
 package com.example.demo.mentoring.contact;
 
 import com.example.demo.config.auth.CustomUserDetails;
-import com.example.demo.config.utils.ApiUtils;
+import com.example.demo.config.utils.ApiResponseBuilder;
 import com.example.demo.mentoring.done.DoneService;
 import com.example.demo.user.Role;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,10 +25,10 @@ public class ContactRestController {
     public ResponseEntity<?> findAllContacts(@AuthenticationPrincipal CustomUserDetails userDetails) {
         if ( userDetails.getUser().getRole() == Role.MENTEE ) {
             List<ContactResponse.ContactDashBoardMenteeDTO> responseDTO = contactService.findAllByMentee(userDetails.getUser());
-            return ResponseEntity.ok(ApiUtils.success(responseDTO));
+            return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
         }
         List<ContactResponse.ContactDashboardMentorDTO> responseDTO = contactService.findAllByMentor(userDetails.getUser());
-        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
 
     
@@ -42,11 +42,11 @@ public ResponseEntity<?> postCounts(@AuthenticationPrincipal CustomUserDetails u
 
         if ( role == Role.MENTEE ) {
             ContactResponse.PostCountDTO responseDTO = contactService.postCountsMyMentee(userDetails.getUser().getId());
-            return ResponseEntity.ok(ApiUtils.success(responseDTO));
+            return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
         }
 
         ContactResponse.PostCountDTO responseDTO = contactService.postCountsByMentor(userDetails.getUser().getId());
-        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
 
     @PostMapping(value = "/contacts/accept")
@@ -54,7 +54,7 @@ public ResponseEntity<?> postCounts(@AuthenticationPrincipal CustomUserDetails u
     public ResponseEntity<?> acceptContact(@RequestBody @Valid ContactRequest.ContactAcceptDTO contactAcceptDTO, Error errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
         // TO-DO : 멘토링 신청 수락 API 로직 만들기
         contactService.acceptContact(contactAcceptDTO, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
     @PatchMapping(value = "/contacts/refuse")
@@ -62,7 +62,7 @@ public ResponseEntity<?> acceptContact(@RequestBody @Valid ContactRequest.Contac
     public ResponseEntity<?> refuseContact(@RequestBody @Valid ContactRequest.ContactRefuseDTO contactRefuseDTO, Error errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
         // TO-DO : 멘토링 신청 거절 API 로직 만들기
         contactService.refuseContact(contactRefuseDTO, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
     @PostMapping(value = "/contacts")
@@ -70,7 +70,7 @@ public ResponseEntity<?> refuseContact(@RequestBody @Valid ContactRequest.Contac
     public ResponseEntity<?> createContact(@RequestBody @Valid ContactRequest.ContactCreateDTO contactCreateDTO, Error errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
         // TO-DO : 멘토링 신청 API 로직 만들기
         contactService.createContact(contactCreateDTO, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
     @DeleteMapping(value = "/contacts")
@@ -78,7 +78,7 @@ public ResponseEntity<?> createContact(@RequestBody @Valid ContactRequest.Contac
     public ResponseEntity<?> deleteContact(@RequestHeader("contactId") List<Integer> contactId, Error errors, @AuthenticationPrincipal CustomUserDetails userDetails) {
         // TO-DO : 멘토링 신청 취소 API 로직 만들기
         contactService.deleteContact(contactId, userDetails.getUser());
-        return ResponseEntity.status(HttpStatus.OK).body(ApiUtils.successWithNoContent());
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
     }
 
 }
diff --git a/src/main/java/com/example/demo/mentoring/done/DoneRestController.java b/src/main/java/com/example/demo/mentoring/done/DoneRestController.java
index 365ac1b9..02d4d7f0 100644
--- a/src/main/java/com/example/demo/mentoring/done/DoneRestController.java
+++ b/src/main/java/com/example/demo/mentoring/done/DoneRestController.java
@@ -1,7 +1,7 @@
 package com.example.demo.mentoring.done;
 
 import com.example.demo.config.auth.CustomUserDetails;
-import com.example.demo.config.utils.ApiUtils;
+import com.example.demo.config.utils.ApiResponseBuilder;
 import com.example.demo.user.Role;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
@@ -23,9 +23,9 @@ public class DoneRestController {
     public ResponseEntity<?> findAllContacts(@AuthenticationPrincipal CustomUserDetails userDetails) {
         if (userDetails.getUser().getRole().equals(Role.MENTEE)) {
             List<DoneResponse.DoneDashBoardDTO> responseDTO = doneService.findByMentee(userDetails.getUser());
-            return ResponseEntity.ok(ApiUtils.success(responseDTO));
+            return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
         }
         List<DoneResponse.DoneDashBoardDTO> responseDTO = doneService.findByMentor(userDetails.getUser());
-        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index fc524742..03629e84 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -1,7 +1,7 @@
 package com.example.demo.video;
 
 import com.example.demo.config.auth.CustomUserDetails;
-import com.example.demo.config.utils.ApiUtils;
+import com.example.demo.config.utils.ApiResponseBuilder;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -29,18 +29,18 @@ public ResponseEntity<?> getUserCategoryVideo(@AuthenticationPrincipal CustomUse
     @GetMapping("/videos/main")
     public ResponseEntity<?> getCategoryFilterVideo(@RequestParam(value = "page", defaultValue = "0") Integer page) {
         List<VideoResponse.VideoAllResponseDTO> responseDTOs = videoService.findAllVideo(page);
-        return ResponseEntity.ok(ApiUtils.success(responseDTOs));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTOs));
     }
 
     @GetMapping("/videos/{id}")
     public ResponseEntity<?> getVideoId(@PathVariable int id) {
         VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
-        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
 
     @GetMapping("/videos/history")
     public ResponseEntity<?> getVideoHistory(@RequestParam(value = "page", defaultValue = "0") Integer page, @AuthenticationPrincipal CustomUserDetails userDetails) {
         List<VideoResponse.VideoAllResponseDTO> responseDTO = videoService.findHistoryVideo(page, userDetails.getUser().getId());
-        return ResponseEntity.ok(ApiUtils.success(responseDTO));
+        return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
 }
diff --git a/src/main/resources/db/teardown.sql b/src/main/resources/db/teardown.sql
index c2a2f103..99c9d37c 100644
--- a/src/main/resources/db/teardown.sql
+++ b/src/main/resources/db/teardown.sql
@@ -1,14 +1,14 @@
 SET REFERENTIAL_INTEGRITY FALSE;
-TRUNCATE TABLE user_tb;
-TRUNCATE TABLE interest_tb;
+TRUNCATE TABLE users;
+TRUNCATE TABLE interests;
 TRUNCATE TABLE mentor_posts;
-TRUNCATE TABLE user_interest_tb;
+TRUNCATE TABLE user_interests;
 TRUNCATE TABLE not_connected_register_users;
 TRUNCATE TABLE connected_users;
 SET REFERENTIAL_INTEGRITY TRUE;
 
 -- user Table
-INSERT INTO user_tb (created_at, first_name, last_name, email, password, country, introduction, age, profile_image, role, phone) VALUES
+INSERT INTO users (created_at, first_name, last_name, email, password, country, introduction, age, profile_image, role, phone) VALUES
    (NOW(), 'John', 'Doe', 'john@example.com', '{bcrypt}$2a$10$8H0OT8wgtALJkig6fmypi.Y7jzI5Y7W9PGgRKqnVeS2cLWGifwHF2', 'USA', 'Hello, I am John.', 25, 'profile.jpg', 'MENTOR', '010-0000-0000'),
    (NOW(), 'Alice', 'Smith', 'alice.smith@example.com', '{bcrypt}$2a$10$8H0OT8wgtALJkig6fmypi.Y7jzI5Y7W9PGgRKqnVeS2cLWGifwHF2', 'Canada', 'I love painting.', 25, 'image2.jpg', 'MENTOR', '010-0000-0000'),
    (NOW(), 'Admin', 'Admin', 'admin@example.com', '{bcrypt}$2a$10$8H0OT8wgtALJkig6fmypi.Y7jzI5Y7W9PGgRKqnVeS2cLWGifwHF2', 'USA', 'I am an admin user.', 35, 'admin.jpg', 'MENTEE', '010-0000-0000'),
@@ -17,7 +17,7 @@ INSERT INTO user_tb (created_at, first_name, last_name, email, password, country
    (NOW(), 'Adminnnn', 'Adminsonnnnn', 'admin33333@example.com', '{bcrypt}$2a$10$8H0OT8wgtALJkig6fmypi.Y7jzI5Y7W9PGgRKqnVeS2cLWGifwHF2', 'USA', 'I am the admin.', 35, 'admin.jpg', 'MENTEE', '010-0000-0000');
 
 -- interst Table
-INSERT INTO interest_tb (created_at, category) VALUES
+INSERT INTO interests (created_at, category) VALUES
   (NOW(), 'IDOL'),
   (NOW(), 'Game'),
   (NOW(), 'K-POP'),
@@ -56,7 +56,7 @@ INSERT INTO connected_users (created_at, mentor_post_id, mentee_user_id) VALUES
     (NOW(), 2, 6);
 
 -- userInterest Table
-INSERT INTO user_interest_tb (created_at, user_id, interest_id) VALUES
+INSERT INTO user_interests (created_at, user_id, interest_id) VALUES
    (NOW(), 1, 1),
    (NOW(), 1, 2),
    (NOW(), 2, 1),
diff --git a/src/test/java/com/example/demo/mentoringtest/MentoringTest.java b/src/test/java/com/example/demo/mentoringtest/MentoringTest.java
deleted file mode 100644
index 15f15be2..00000000
--- a/src/test/java/com/example/demo/mentoringtest/MentoringTest.java
+++ /dev/null
@@ -1,399 +0,0 @@
-package com.example.demo.mentoringtest;
-
-
-import com.example.demo.RestDoc;
-import com.example.demo.config.errors.exception.Exception404;
-import com.example.demo.mentoring.MentorPostStateEnum;
-import com.example.demo.interest.Interest;
-import com.example.demo.interest.InterestJPARepository;
-import com.example.demo.mentoring.*;
-import com.example.demo.mentoring.contact.ContactJPARepository;
-import com.example.demo.mentoring.contact.ContactStateEnum;
-import com.example.demo.mentoring.contact.NotConnectedRegisterUser;
-import com.example.demo.user.Role;
-import com.example.demo.user.User;
-import com.example.demo.user.UserJPARepository;
-import com.example.demo.user.userInterest.UserInterest;
-import com.example.demo.user.userInterest.UserInterestJPARepository;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithUserDetails;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.web.servlet.ResultActions;
-
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-
-@SpringBootTest
-@AutoConfigureMockMvc
-@ActiveProfiles("test")
-public class MentoringTest extends RestDoc {
-    @Autowired
-    private UserJPARepository userJPARepository;
-    @Autowired
-    private MentorPostJPARepostiory mentorPostJPARepostiory;
-    @Autowired
-    private InterestJPARepository interestJPARepository;
-    @Autowired
-    private MentorPostService mentorPostService;
-    @Autowired
-    private UserInterestJPARepository userInterestJPARepository;
-    @Autowired
-    private ContactJPARepository contactJPARepository;
-
-    @Autowired
-    private ObjectMapper om;
-
-
-    @Test
-    @DisplayName("CreateMentorPostTest")
-    void CreateMentorPostTest() {
-
-        //given
-        User writer = User.builder()
-                .email("john@example.com")
-                .password("asdf1234!")
-                .firstName("Jin")
-                .lastName("Seung")
-                .country("Korea")
-                .age(21)
-                .role(Role.MENTOR)
-                .phone("010-0000-0000")
-                .build();
-
-        //when
-        MentorPost mentorPost = MentorPost.builder()
-                .writer(writer)
-                .title("title")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost2 = MentorPost.builder()
-                .writer(writer)
-                .title("title2")
-                .content("content2")
-                .build();
-
-        // then
-//        userJPARepository.save(writer);
-//        mentorPostJPARepostiory.save(mentorPost);
-//        mentorPostJPARepostiory.save(mentorPost2);
-
-        userJPARepository.save(writer);
-        MentorPostRequest.CreateDTO mentorPostRequest = new MentorPostRequest.CreateDTO();
-        mentorPostRequest.setTitle("title");
-        mentorPostRequest.setContent("content");
-        mentorPostService.createMentorPost(mentorPostRequest, writer);
-
-        MentorPost mentorPostFind = mentorPostJPARepostiory.findById(1)
-                .orElseThrow(() -> new Exception404("해당 게시글이 존재하지 않습니다."));
-        Assertions.assertThat(1)
-                .isEqualTo(mentorPostFind.getId());
-        Assertions.assertThat(mentorPostRequest.getTitle())
-                .isEqualTo(mentorPostFind.getTitle());
-        Assertions.assertThat(mentorPostRequest.getContent())
-                .isEqualTo(mentorPostFind.getContent());
-    }
-
-
-
-    @Test
-    @DisplayName("findMentorPostTest")
-    void findMentorPostSaveTest() {
-        //given
-        User mentor = User.builder()
-                .email("anjdal6612312364@gmail.com")
-                .password("as123df1234!")
-                .firstName("Jin123")
-                .lastName("Seun123g")
-                .country("Korea")
-                .age(21)
-                .role(Role.MENTOR)
-                .phone("010-0000-0000")
-                .build();
-
-        User mentor2 = User.builder()
-                .email("anj2312364@gmail.com")
-                .password("adf1234!")
-                .firstName("Jin123")
-                .lastName("Seun123g")
-                .country("Korea")
-                .age(23)
-                .role(Role.MENTOR)
-                .phone("010-0000-0000")
-                .build();
-
-        User mentee_One = User.builder()
-                .email("anjda22l6664@gmail.com")
-                .password("asdf221234!")
-                .firstName("mentee1")
-                .lastName("Seung11")
-                .country("Korea")
-                .age(21)
-                .role(Role.MENTEE)
-                .phone("010-0000-0000")
-                .build();
-
-        User mentee_Two = User.builder()
-                .email("anjdal66111164@gmail.com")
-                .password("asdf122222234!")
-                .firstName("mentee2")
-                .lastName("Seung22")
-                .country("Korea")
-                .age(21)
-                .role(Role.MENTEE)
-                .phone("010-0000-0000")
-                .build();
-
-        Interest interest1 = Interest.builder()
-                .category("test1")
-                .build();
-
-        Interest interest2 = Interest.builder()
-                .category("test2")
-                .build();
-
-        Interest interest3 = Interest.builder()
-                .category("test3")
-                .build();
-
-        UserInterest userInterest1 = UserInterest.builder()
-                .user(mentor)
-                .interest(interest2)
-                .build();
-
-        UserInterest userInterest2 = UserInterest.builder()
-                .user(mentee_One)
-                .interest(interest2)
-                .build();
-
-        UserInterest userInterest3 = UserInterest.builder()
-                .user(mentee_One)
-                .interest(interest3)
-                .build();
-
-        UserInterest userInterest4 = UserInterest.builder()
-                .user(mentee_Two)
-                .interest(interest1)
-                .build();
-
-        UserInterest userInterest5 = UserInterest.builder()
-                .user(mentee_Two)
-                .interest(interest2)
-                .build();
-
-        UserInterest userInterest6 = UserInterest.builder()
-                .user(mentor)
-                .interest(interest3)
-                .build();
-
-        UserInterest userInterest7 = UserInterest.builder()
-                .user(mentor2)
-                .interest(interest1)
-                .build();
-
-        MentorPost mentorPost3 = MentorPost.builder()
-                .writer(mentor)
-                .title("title")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost4 = MentorPost.builder()
-                .writer(mentor)
-                .title("abtitle4")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost5 = MentorPost.builder()
-                .writer(mentor)
-                .title("title5")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost6 = MentorPost.builder()
-                .writer(mentor)
-                .title("tabitle6")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost7 = MentorPost.builder()
-                .writer(mentor)
-                .title("title7")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost8 = MentorPost.builder()
-                .writer(mentor)
-                .title("abtitle8")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost9 = MentorPost.builder()
-                .writer(mentor2)
-                .title("abtitle8")
-                .content("content")
-                .build();
-
-        MentorPost mentorPost10 = MentorPost.builder()
-                .writer(mentor2)
-                .title("abtitle83")
-                .content("content")
-                .build();
-
-        NotConnectedRegisterUser menteeNotConnected1 = NotConnectedRegisterUser.builder()
-                .mentorPost(mentorPost3)
-                .menteeUser(mentee_One)
-                .state(ContactStateEnum.AWAIT)
-                .build();
-
-        NotConnectedRegisterUser menteeNotConnected2 = NotConnectedRegisterUser.builder()
-                .mentorPost(mentorPost3)
-                .menteeUser(mentee_Two)
-                .state(ContactStateEnum.AWAIT)
-                .build();
-
-        //when
-        interestJPARepository.save(interest1);
-        interestJPARepository.save(interest2);
-        interestJPARepository.save(interest3);
-        userJPARepository.save(mentor);
-        userJPARepository.save(mentor2);
-        userJPARepository.save(mentee_One);
-        userJPARepository.save(mentee_Two);
-        mentorPostJPARepostiory.save(mentorPost3);
-        mentorPostJPARepostiory.save(mentorPost4);
-        mentorPostJPARepostiory.save(mentorPost5);
-        mentorPostJPARepostiory.save(mentorPost6);
-        mentorPostJPARepostiory.save(mentorPost7);
-        mentorPostJPARepostiory.save(mentorPost8);
-        mentorPostJPARepostiory.save(mentorPost9);
-        mentorPostJPARepostiory.save(mentorPost10);
-        userInterestJPARepository.save(userInterest1);
-        userInterestJPARepository.save(userInterest2);
-        userInterestJPARepository.save(userInterest3);
-        userInterestJPARepository.save(userInterest4);
-        userInterestJPARepository.save(userInterest5);
-        userInterestJPARepository.save(userInterest6);
-        userInterestJPARepository.save(userInterest7);
-        contactJPARepository.save(menteeNotConnected1);
-        contactJPARepository.save(menteeNotConnected2);
-
-    }
-
-    @Test
-    @DisplayName("updateMentorPostTest")
-    void updateMentorPostTest()
-    {
-        User writer = User.builder()
-            .email("anjdal6664@gmail.com")
-            .password("asdf1234!")
-            .firstName("Jin")
-            .lastName("Seung")
-            .country("Korea")
-            .age(21)
-            .role(Role.MENTOR)
-            .phone("010-0000-0000")
-            .build();
-
-        MentorPostRequest.CreateDTO mentorPostRequest = new MentorPostRequest.CreateDTO();
-        mentorPostRequest.setTitle("tittttttle");
-        mentorPostRequest.setContent("content");
-
-        MentorPostRequest.CreateDTO mentorPostUpdated = new MentorPostRequest.CreateDTO();
-        mentorPostUpdated.setTitle("updated!!!!");
-        mentorPostUpdated.setContent("contenttt");
-
-        userJPARepository.save(writer);
-        mentorPostService.createMentorPost(mentorPostRequest, writer);
-        mentorPostService.updateMentorPost(mentorPostUpdated,2, writer);
-
-        MentorPost mentorPostFind = mentorPostJPARepostiory.findById(2)
-                .orElseThrow(() -> new Exception404("해당 게시글이 존재하지 않습니다."));
-        Assertions.assertThat(2)
-                .isEqualTo(mentorPostFind.getId());
-        Assertions.assertThat(mentorPostUpdated.getTitle())
-                .isEqualTo(mentorPostFind.getTitle());
-        Assertions.assertThat(mentorPostUpdated.getContent())
-                .isEqualTo(mentorPostFind.getContent());
-    }
-
-    @WithUserDetails(value = "john@example.com")
-    @Test
-    public void CreateMentorPostTestMVC() throws Exception {
-
-        MentorPostRequest.CreateDTO createDTO = new MentorPostRequest.CreateDTO();
-        createDTO.setTitle("asfd");
-        createDTO.setContent("afaffafa");
-
-        String requestBody = om.writeValueAsString(createDTO);
-
-        // when
-        ResultActions resultActions = mvc.perform(
-                post("/mentorings/post")
-                        .content(requestBody)
-                        .contentType(MediaType.APPLICATION_JSON_VALUE)
-        );
-
-        String responseBody = resultActions.andReturn().getResponse().getContentAsString();
-        System.out.println("테스트 : " + responseBody);
-
-        // verify
-        //resultActions.andExpect(jsonPath("$.success").value("true"));
-        //resultActions.andDo(MockMvcResultHandlers.print()).andDo(document);
-    }
-
-    @Test
-    public void GetMentorPostTestMVC() throws Exception {
-
-        int id = 2;
-
-        // when
-        ResultActions resultActions = mvc.perform(
-                get("/mentorings/post")
-        );
-
-        // console
-        String responseBody = resultActions.andReturn().getResponse().getContentAsString();
-        System.out.println("테스트 : "+responseBody);
-    }
-
-    @Test
-    @DisplayName("DeleteTest")
-    public void DeleteMentorPost() throws Exception{
-        int id = 2;
-        mentorPostService.deleteMentorPost(id, User.builder().id(1).build());
-
-        MentorPost mentorPostFind = mentorPostJPARepostiory.findById(2)
-                .orElse(null);
-        assertNull(mentorPostFind);
-    }
-
-    @Test
-    @DisplayName("DoneTest")
-    public void PatchDoneMentorPost() throws Exception{
-        int id = 1;
-        MentorPostRequest.StateDTO stateDTO = new MentorPostRequest.StateDTO();
-        stateDTO.setMentorPostStateEnum(MentorPostStateEnum.DONE);
-        mentorPostService.changeMentorPostStatus(stateDTO, id, User.builder().id(1).build());
-    }
-
-    @Test
-    void mentorPostServiceTest() throws Exception {
-        List<MentorPostResponse.MentorPostAllDTO> mentorPostFind = mentorPostService.findAllMentorPost(MentorPostCategoryEnum.NULL,"",2);
-
-        String responseBody = om.writeValueAsString(mentorPostFind);
-
-        System.out.println("전체조회테스트 : " + responseBody);
-    }
-}

From a8c3ffef57b6f6d869350d7d417ed715e424e856 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 11:19:14 +0900
Subject: [PATCH 19/24] feat : category filtering

---
 src/main/java/com/example/demo/video/VideoHistory.java |  4 ++--
 .../com/example/demo/video/VideoJPARepository.java     |  2 ++
 .../com/example/demo/video/VideoRestController.java    |  4 ++--
 src/main/java/com/example/demo/video/VideoService.java | 10 ++++++++--
 src/test/java/com/example/demo/VideoTest.java          |  6 ++----
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoHistory.java b/src/main/java/com/example/demo/video/VideoHistory.java
index 3f8a9023..ebfbeced 100644
--- a/src/main/java/com/example/demo/video/VideoHistory.java
+++ b/src/main/java/com/example/demo/video/VideoHistory.java
@@ -15,8 +15,8 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @Where(clause = "deleted_at IS NULL")
-@SQLDelete(sql = "UPDATE videohistories SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
-@Table(name = "videohistories")
+@SQLDelete(sql = "UPDATE video_histories SET deleted_at = CURRENT_TIMESTAMP, is_deleted = TRUE where id = ?")
+@Table(name = "video_histories")
 public class VideoHistory extends BaseTime {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Id
diff --git a/src/main/java/com/example/demo/video/VideoJPARepository.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
index c3f18ac0..536592bd 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -27,4 +27,6 @@ public interface VideoJPARepository extends JpaRepository<Video, Integer> {
     Page<Video> findByVideoCategory(@Param("userInterests") List<String> userInterests, Pageable pageable);
 
 
+    @Query(value = "select v from Video v inner join VideoInterest vi on v.id = vi.video.id where vi.interest.id = :categoryId")
+    Page<Video> findByCategoryId(@Param("categoryId") int id, Pageable pageable);
 }
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index a0a65fbc..95b8788f 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -27,8 +27,8 @@ public ResponseEntity<?> getUserCategoryVideo(@AuthenticationPrincipal CustomUse
     }
 
     @GetMapping("/videos/main")
-    public ResponseEntity<?> getCategoryFilterVideo() {
-        List<VideoResponse.VideoPageResponseDTO> responseDTOs = videoService.findAllVideo();
+    public ResponseEntity<?> getCategoryFilterVideo(@RequestParam(value = "category", defaultValue = "0") int id) {
+        List<VideoResponse.VideoPageResponseDTO> responseDTOs = videoService.findAllVideo(id);
         return ResponseEntity.ok(ApiUtils.success(responseDTOs));
     }
 
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 7d28860a..4a6c4220 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -29,9 +29,15 @@ public class VideoService {
     private final int MAINVIDEONUM = 4;
     private final int HISTORYVIDEONUM = 5;
 
-    public List<VideoResponse.VideoPageResponseDTO> findAllVideo() {
+    public List<VideoResponse.VideoPageResponseDTO> findAllVideo(int categoryId) {
         Pageable pageable = PageRequest.of(0 ,MAINVIDEOTOTAL);
-        Page<Video> pageContent = videoJPARepository.findAll(pageable);
+
+        Page<Video> pageContent;
+        if(categoryId == 0)
+            pageContent = videoJPARepository.findAll(pageable);
+        else
+            pageContent = videoJPARepository.findByCategoryId(categoryId, pageable);
+
 
         if(pageContent.getTotalPages() == 0){
             throw new Exception404("해당 영상들이 존재하지 않습니다");
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index dd4df63e..8754e736 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -287,7 +287,7 @@ void save() {
     @Test
     @Order(2)
     void findAllTest() throws Exception{
-        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo();
+        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo(0);
     }
 
     @Test
@@ -296,8 +296,6 @@ void findTest() throws Exception{
         VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
         org.assertj.core.api.Assertions.assertThat(1)
                 .isEqualTo(videoFind.getVideoID());
-        Assertions.assertThat("첫번째 비디오")
-                .isEqualTo(videoFind.getVideoTitleKorean());
         Assertions.assertThat("asdfasdf")
                 .isEqualTo(videoFind.getSubtitles().get(0).getKorSubtitleContent());
     }
@@ -320,7 +318,7 @@ void findUserCategoryTest() throws Exception{
     @Test
     @Order(2)
     void findOmTest() throws Exception {
-        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
+        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo(1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From 158803d801ca614597b4a475570642115e3d7f26 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 17:26:41 +0900
Subject: [PATCH 20/24] =?UTF-8?q?feat=20:=20video=20view=20add=20restcontr?=
 =?UTF-8?q?oller=20view=EC=B6=94=EA=B0=80=20restcontroller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/video/VideoRequest.java   |  4 ++++
 .../com/example/demo/video/VideoRestController.java | 13 +++++++++----
 .../java/com/example/demo/video/VideoService.java   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/example/demo/video/VideoRequest.java

diff --git a/src/main/java/com/example/demo/video/VideoRequest.java b/src/main/java/com/example/demo/video/VideoRequest.java
new file mode 100644
index 00000000..2b062693
--- /dev/null
+++ b/src/main/java/com/example/demo/video/VideoRequest.java
@@ -0,0 +1,4 @@
+package com.example.demo.video;
+
+public class VideoRequest {
+}
diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index 8c1e8ee8..cefc6500 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -4,13 +4,12 @@
 import com.example.demo.config.utils.ApiResponseBuilder;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Api(tags = "Video API")
@@ -43,4 +42,10 @@ public ResponseEntity<?> getVideoHistory(@RequestParam(value = "page", defaultVa
         List<VideoResponse.VideoAllResponseDTO> responseDTO = videoService.findHistoryVideo(page, userDetails.getUser().getId());
         return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
+
+    @PostMapping("videos/view/{id}")
+    public ResponseEntity<?> postVideoView(@PathVariable int id){
+        videoService.addVideoView(id);
+        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
+    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 4a6c4220..187f712f 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -58,7 +58,7 @@ public List<VideoResponse.VideoPageResponseDTO> findAllVideo(int categoryId) {
         for(int i = 0;i < videoDTOList.size();i++)
         {
             tempGroup.add(videoDTOList.get(i));
-            if ((i + 1) % 4 == 0 || i == videoDTOList.size() - 1) {
+            if ((i + 1) % MAINVIDEONUM == 0 || i == videoDTOList.size() - 1) {
                 if(i == videoDTOList.size() - 1)
                     finish = true;
                 VideoResponse.VideoPageResponseDTO videoPageResponseDTO = new VideoResponse.VideoPageResponseDTO(

From 1ad39f476747177ca5ede0aa37394efe35a04eb6 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 17:30:22 +0900
Subject: [PATCH 21/24] feat : service add view

---
 src/main/java/com/example/demo/video/Video.java        | 4 ++++
 src/main/java/com/example/demo/video/VideoService.java | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/video/Video.java b/src/main/java/com/example/demo/video/Video.java
index 61b1bf18..f8e702a9 100644
--- a/src/main/java/com/example/demo/video/Video.java
+++ b/src/main/java/com/example/demo/video/Video.java
@@ -52,4 +52,8 @@ public Video(String videoUrl, String videoTitleKorean, String videoTitleEng, Str
         this.views = views;
         this.videoThumbnailUrl = videoThumbnailUrl;
     }
+
+    public void addView(){
+        this.views += 1;
+    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 187f712f..37fbfc02 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -75,7 +75,7 @@ public List<VideoResponse.VideoPageResponseDTO> findAllVideo(int categoryId) {
 
     public VideoResponse.VideoResponseDTO findVideo(int id) {
         Video video = videoJPARepository.findById(id)
-                .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));;
+                .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));
 
         VideoInterest videoInterest = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
         List<Subtitle> videoSubtitles = subtitleJPARepository.findSubtitleByVideoId(video.getId());
@@ -133,4 +133,10 @@ public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
         ).collect(Collectors.toList());
         return videoDTOList;
     }
+
+    public void addVideoView(int id) {
+        Video video = videoJPARepository.findById(id)
+                .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));
+        video.addView();
+    }
 }

From f4e6f5b91d43e5616d8c0b4808076fed25c51b63 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 17:41:24 +0900
Subject: [PATCH 22/24] feat : add request post

---
 src/main/java/com/example/demo/video/Video.java   |  5 ++++-
 .../example/demo/video/VideoJPARepository.java    |  4 ++--
 src/test/java/com/example/demo/VideoTest.java     | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/demo/video/Video.java b/src/main/java/com/example/demo/video/Video.java
index f8e702a9..945325fa 100644
--- a/src/main/java/com/example/demo/video/Video.java
+++ b/src/main/java/com/example/demo/video/Video.java
@@ -5,10 +5,12 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -36,7 +38,8 @@ public class Video extends BaseTime {
     @Column
     private String videoEndTime;
 
-    @Column
+    @Column(nullable = false)
+    @ColumnDefault("0")
     private long views;
 
     @Column
diff --git a/src/main/java/com/example/demo/video/VideoJPARepository.java b/src/main/java/com/example/demo/video/VideoJPARepository.java
index 536592bd..f7a56be4 100644
--- a/src/main/java/com/example/demo/video/VideoJPARepository.java
+++ b/src/main/java/com/example/demo/video/VideoJPARepository.java
@@ -16,12 +16,12 @@ public interface VideoJPARepository extends JpaRepository<Video, Integer> {
 
     @Query(value = "SELECT * FROM videos v " +
             "INNER JOIN video_interests vi ON v.id = vi.video_id " +
-            "INNER JOIN interest_tb i ON vi.interest_id = i.id " +
+            "INNER JOIN interests i ON vi.interest_id = i.id " +
             "WHERE i.category IN :userInterests " +
             "ORDER BY RAND()", // MySQL에서 랜덤 정렬
             countQuery = "SELECT COUNT(*) FROM videos v " +
                     "INNER JOIN video_interests vi ON v.id = vi.video_id " +
-                    "INNER JOIN interest_tb i ON vi.interest_id = i.id " +
+                    "INNER JOIN interests i ON vi.interest_id = i.id " +
                     "WHERE i.category IN :userInterests", // 페이징을 위한 count 쿼리
             nativeQuery = true)
     Page<Video> findByVideoCategory(@Param("userInterests") List<String> userInterests, Pageable pageable);
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 8754e736..82b63642 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -311,14 +311,23 @@ void findHistoryTest() throws Exception{
     @Test
     @Order(2)
     void findUserCategoryTest() throws Exception{
-        List<VideoResponse.VideoAllResponseDTO> findUserCategory = videoService.findUserCategory(1);
+        //List<VideoResponse.VideoAllResponseDTO> findUserCategory = videoService.findUserCategory(1);
 
     }
 
     @Test
-    @Order(2)
+    @Order(3)
+    void addView() throws Exception{
+        videoService.addVideoView(1);
+        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
+        org.assertj.core.api.Assertions.assertThat(26)
+                .isEqualTo(videoFind.getViews());
+    }
+
+    @Test
+    @Order(3)
     void findOmTest() throws Exception {
-        List<VideoResponse.VideoPageResponseDTO> videoFind = videoService.findAllVideo(1);
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findUserCategory(1);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From 72e3755a70e3a642cc055aabf55f04b14dedf4c2 Mon Sep 17 00:00:00 2001
From: sjmjys954646 <sjmjys954646@gmail.com>
Date: Sun, 5 Nov 2023 17:58:32 +0900
Subject: [PATCH 23/24] feat : history add, view add

---
 .../demo/video/VideoRestController.java       | 10 ++----
 .../com/example/demo/video/VideoService.java  | 16 +++++----
 src/test/java/com/example/demo/VideoTest.java | 34 +++++++++----------
 3 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/example/demo/video/VideoRestController.java b/src/main/java/com/example/demo/video/VideoRestController.java
index cefc6500..fdc6d673 100644
--- a/src/main/java/com/example/demo/video/VideoRestController.java
+++ b/src/main/java/com/example/demo/video/VideoRestController.java
@@ -32,8 +32,8 @@ public ResponseEntity<?> getCategoryFilterVideo(@RequestParam(value = "category"
     }
 
     @GetMapping("/videos/{id}")
-    public ResponseEntity<?> getVideoId(@PathVariable int id) {
-        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id);
+    public ResponseEntity<?> getVideoId(@PathVariable int id, @AuthenticationPrincipal CustomUserDetails userDetails) {
+        VideoResponse.VideoResponseDTO responseDTO = videoService.findVideo(id, userDetails.getUser());
         return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
 
@@ -42,10 +42,4 @@ public ResponseEntity<?> getVideoHistory(@RequestParam(value = "page", defaultVa
         List<VideoResponse.VideoAllResponseDTO> responseDTO = videoService.findHistoryVideo(page, userDetails.getUser().getId());
         return ResponseEntity.ok(ApiResponseBuilder.success(responseDTO));
     }
-
-    @PostMapping("videos/view/{id}")
-    public ResponseEntity<?> postVideoView(@PathVariable int id){
-        videoService.addVideoView(id);
-        return ResponseEntity.status(HttpStatus.OK).body(ApiResponseBuilder.successWithNoContent());
-    }
 }
diff --git a/src/main/java/com/example/demo/video/VideoService.java b/src/main/java/com/example/demo/video/VideoService.java
index 37fbfc02..ce774742 100644
--- a/src/main/java/com/example/demo/video/VideoService.java
+++ b/src/main/java/com/example/demo/video/VideoService.java
@@ -2,6 +2,7 @@
 
 import com.example.demo.config.errors.exception.Exception404;
 import com.example.demo.interest.Interest;
+import com.example.demo.user.User;
 import com.example.demo.user.userInterest.UserInterest;
 import com.example.demo.user.userInterest.UserInterestJPARepository;
 import lombok.RequiredArgsConstructor;
@@ -73,10 +74,17 @@ public List<VideoResponse.VideoPageResponseDTO> findAllVideo(int categoryId) {
         return videoPageResponseDTOS;
     }
 
-    public VideoResponse.VideoResponseDTO findVideo(int id) {
+    public VideoResponse.VideoResponseDTO findVideo(int id, User user) {
         Video video = videoJPARepository.findById(id)
                 .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));
 
+        video.addView();
+        if(user != null)
+        {
+            VideoHistory videoHistory = new VideoHistory(user, video);
+            videoHistoryJPARepository.save(videoHistory);
+        }
+
         VideoInterest videoInterest = videoInterestJPARepository.findVideoInterestByVideoId(video.getId());
         List<Subtitle> videoSubtitles = subtitleJPARepository.findSubtitleByVideoId(video.getId());
 
@@ -133,10 +141,4 @@ public List<VideoResponse.VideoAllResponseDTO> findUserCategory(int id) {
         ).collect(Collectors.toList());
         return videoDTOList;
     }
-
-    public void addVideoView(int id) {
-        Video video = videoJPARepository.findById(id)
-                .orElseThrow(() -> new Exception404("해당 영상이 존재하지 않습니다.\n" + "id : " + id));
-        video.addView();
-    }
 }
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 82b63642..4e0fe3a8 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -292,12 +292,20 @@ void findAllTest() throws Exception{
 
     @Test
     @Order(2)
-    void findTest() throws Exception{
-        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
-        org.assertj.core.api.Assertions.assertThat(1)
-                .isEqualTo(videoFind.getVideoID());
-        Assertions.assertThat("asdfasdf")
-                .isEqualTo(videoFind.getSubtitles().get(0).getKorSubtitleContent());
+    void HistoryTest() throws Exception{
+        User user2 = User.builder()
+                .email("anjfffffdal64@gmail.com")
+                .password("asdf1234!")
+                .firstName("Jin")
+                .lastName("Seung")
+                .country("Korea")
+                .age(21)
+                .role(Role.MENTOR)
+                .phone("010-0000-0000")
+                .build();
+
+        userJPARepository.save(user2);
+        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(3,user2);
     }
 
     @Test
@@ -311,23 +319,13 @@ void findHistoryTest() throws Exception{
     @Test
     @Order(2)
     void findUserCategoryTest() throws Exception{
-        //List<VideoResponse.VideoAllResponseDTO> findUserCategory = videoService.findUserCategory(1);
-
-    }
-
-    @Test
-    @Order(3)
-    void addView() throws Exception{
-        videoService.addVideoView(1);
-        VideoResponse.VideoResponseDTO videoFind = videoService.findVideo(1);
-        org.assertj.core.api.Assertions.assertThat(26)
-                .isEqualTo(videoFind.getViews());
+        List<VideoResponse.VideoAllResponseDTO> findUserCategory = videoService.findUserCategory(1);
     }
 
     @Test
     @Order(3)
     void findOmTest() throws Exception {
-        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findUserCategory(1);
+        List<VideoResponse.VideoAllResponseDTO> videoFind = videoService.findHistoryVideo(0,2);
 
         String responseBody = om.writeValueAsString(videoFind);
 

From c996cd2ff572a2fc89dc2c03c6c64a706d8a6295 Mon Sep 17 00:00:00 2001
From: cosmos_1885 <dmsrkql104321@gmail.com>
Date: Mon, 6 Nov 2023 15:37:24 +0900
Subject: [PATCH 24/24] =?UTF-8?q?refactor:=20=C3=AD=C3=ABfeedback=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../errors/GlobalValidationHandler.java       |  2 --
 .../config/errors/exception/Exception400.java |  8 ++----
 .../demo/mentoring/MentorPostResponse.java    |  1 -
 .../demo/mentoring/MentorPostService.java     |  1 -
 .../mentoring/contact/ContactResponse.java    |  1 -
 .../contact/ContactRestController.java        |  2 --
 .../mentoring/contact/ContactService.java     |  1 -
 .../demo/mentoring/done/DoneResponse.java     |  2 --
 .../mentoring/done/DoneRestController.java    |  1 -
 .../demo/refreshToken/TokenService.java       |  7 -----
 src/main/java/com/example/demo/user/Role.java | 27 ++++++++++---------
 .../com/example/demo/user/RoleConverter.java  | 20 ++++++++++++++
 .../com/example/demo/user/UserService.java    | 10 +++----
 .../java/com/example/demo/AccountTest.java    |  1 -
 src/test/java/com/example/demo/VideoTest.java |  4 ---
 .../demo/mentoringtest/MentoringTest2.java    |  1 -
 16 files changed, 42 insertions(+), 47 deletions(-)
 create mode 100644 src/main/java/com/example/demo/user/RoleConverter.java

diff --git a/src/main/java/com/example/demo/config/errors/GlobalValidationHandler.java b/src/main/java/com/example/demo/config/errors/GlobalValidationHandler.java
index 545123b0..12f0c9a5 100644
--- a/src/main/java/com/example/demo/config/errors/GlobalValidationHandler.java
+++ b/src/main/java/com/example/demo/config/errors/GlobalValidationHandler.java
@@ -6,10 +6,8 @@
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.stereotype.Component;
-import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/example/demo/config/errors/exception/Exception400.java b/src/main/java/com/example/demo/config/errors/exception/Exception400.java
index fa170cc1..315eb295 100644
--- a/src/main/java/com/example/demo/config/errors/exception/Exception400.java
+++ b/src/main/java/com/example/demo/config/errors/exception/Exception400.java
@@ -3,6 +3,7 @@
 import com.example.demo.config.utils.ApiResponseBuilder;
 import lombok.Getter;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Getter
@@ -11,12 +12,7 @@ public class Exception400 extends RuntimeException {
 
     public Exception400(Map<String, String> errors, String message) {
         super(message);
-        this.errors = errors;
-    }
-
-    public Exception400(String message) {
-        super(message);
-        errors = null;
+        this.errors = (errors != null) ? errors : null;
     }
 
     public ApiResponseBuilder.ApiResponse<?> body(){
diff --git a/src/main/java/com/example/demo/mentoring/MentorPostResponse.java b/src/main/java/com/example/demo/mentoring/MentorPostResponse.java
index 405a019b..0dfd3c5d 100644
--- a/src/main/java/com/example/demo/mentoring/MentorPostResponse.java
+++ b/src/main/java/com/example/demo/mentoring/MentorPostResponse.java
@@ -3,7 +3,6 @@
 
 import com.example.demo.mentoring.contact.ContactStateEnum;
 import com.example.demo.mentoring.contact.NotConnectedRegisterUser;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.userInterest.UserInterest;
 import lombok.Getter;
diff --git a/src/main/java/com/example/demo/mentoring/MentorPostService.java b/src/main/java/com/example/demo/mentoring/MentorPostService.java
index be3f9c45..ac075398 100644
--- a/src/main/java/com/example/demo/mentoring/MentorPostService.java
+++ b/src/main/java/com/example/demo/mentoring/MentorPostService.java
@@ -5,7 +5,6 @@
 import com.example.demo.config.errors.exception.Exception404;
 import com.example.demo.mentoring.contact.ContactJPARepository;
 import com.example.demo.mentoring.contact.NotConnectedRegisterUser;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.userInterest.UserInterest;
 import com.example.demo.user.userInterest.UserInterestJPARepository;
diff --git a/src/main/java/com/example/demo/mentoring/contact/ContactResponse.java b/src/main/java/com/example/demo/mentoring/contact/ContactResponse.java
index ff83058c..62b8f150 100644
--- a/src/main/java/com/example/demo/mentoring/contact/ContactResponse.java
+++ b/src/main/java/com/example/demo/mentoring/contact/ContactResponse.java
@@ -1,7 +1,6 @@
 package com.example.demo.mentoring.contact;
 
 import com.example.demo.mentoring.MentorPost;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.userInterest.UserInterest;
 import lombok.Getter;
diff --git a/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java b/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java
index e9544d03..abe0b21d 100644
--- a/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java
+++ b/src/main/java/com/example/demo/mentoring/contact/ContactRestController.java
@@ -2,8 +2,6 @@
 
 import com.example.demo.config.auth.CustomUserDetails;
 import com.example.demo.config.utils.ApiResponseBuilder;
-import com.example.demo.mentoring.done.DoneService;
-import com.example.demo.user.Role;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/com/example/demo/mentoring/contact/ContactService.java b/src/main/java/com/example/demo/mentoring/contact/ContactService.java
index f377e130..280ac6e8 100644
--- a/src/main/java/com/example/demo/mentoring/contact/ContactService.java
+++ b/src/main/java/com/example/demo/mentoring/contact/ContactService.java
@@ -6,7 +6,6 @@
 import com.example.demo.mentoring.MentorPostJPARepostiory;
 import com.example.demo.mentoring.done.ConnectedUser;
 import com.example.demo.mentoring.done.DoneJPARepository;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.userInterest.UserInterest;
 import com.example.demo.user.userInterest.UserInterestJPARepository;
diff --git a/src/main/java/com/example/demo/mentoring/done/DoneResponse.java b/src/main/java/com/example/demo/mentoring/done/DoneResponse.java
index 85dabc77..60f75141 100644
--- a/src/main/java/com/example/demo/mentoring/done/DoneResponse.java
+++ b/src/main/java/com/example/demo/mentoring/done/DoneResponse.java
@@ -1,8 +1,6 @@
 package com.example.demo.mentoring.done;
 
 import com.example.demo.mentoring.MentorPost;
-import com.example.demo.mentoring.contact.ContactResponse;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.userInterest.UserInterest;
 import lombok.Getter;
diff --git a/src/main/java/com/example/demo/mentoring/done/DoneRestController.java b/src/main/java/com/example/demo/mentoring/done/DoneRestController.java
index 02d4d7f0..10b7c910 100644
--- a/src/main/java/com/example/demo/mentoring/done/DoneRestController.java
+++ b/src/main/java/com/example/demo/mentoring/done/DoneRestController.java
@@ -2,7 +2,6 @@
 
 import com.example.demo.config.auth.CustomUserDetails;
 import com.example.demo.config.utils.ApiResponseBuilder;
-import com.example.demo.user.Role;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/com/example/demo/refreshToken/TokenService.java b/src/main/java/com/example/demo/refreshToken/TokenService.java
index bb1b2118..d2ece77b 100644
--- a/src/main/java/com/example/demo/refreshToken/TokenService.java
+++ b/src/main/java/com/example/demo/refreshToken/TokenService.java
@@ -1,18 +1,11 @@
 package com.example.demo.refreshToken;
 
-import com.example.demo.config.errors.exception.Exception400;
 import com.example.demo.config.errors.exception.Exception401;
 import com.example.demo.config.jwt.JWTTokenProvider;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
 import lombok.RequiredArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Optional;
-
 @Transactional
 @RequiredArgsConstructor
 @Service
diff --git a/src/main/java/com/example/demo/user/Role.java b/src/main/java/com/example/demo/user/Role.java
index 8092be42..58738307 100644
--- a/src/main/java/com/example/demo/user/Role.java
+++ b/src/main/java/com/example/demo/user/Role.java
@@ -6,22 +6,25 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 @Getter
 @AllArgsConstructor
 public enum Role {
-    ADMIN("Admin"),
-    MENTOR("Mentor"),
-    MENTEE("Mentee");
+    ADMIN("ADMIN", "ADMIN"),
+    MENTOR("MENTOR", "MENTOR"),
+    MENTEE("MENTEE", "MENTEE");
+
+    private final String desc;
+    private final String value;
 
-    private final String role;
+    private static final Map<String, Role> description = Collections.unmodifiableMap(Stream.of(values()).collect(Collectors.toMap(Role::getValue, Function.identity())));
 
-    @JsonCreator
-    public static Role parsing(String value) {
-        for (Role role: Role.values()) {
-            if (role.getRole().equals(value)) {
-                return role;
-            }
-        }
-        return null;
+    public static Role findOf(String findValue) {
+        return description.get(findValue);
     }
 }
diff --git a/src/main/java/com/example/demo/user/RoleConverter.java b/src/main/java/com/example/demo/user/RoleConverter.java
new file mode 100644
index 00000000..2efe9c08
--- /dev/null
+++ b/src/main/java/com/example/demo/user/RoleConverter.java
@@ -0,0 +1,20 @@
+package com.example.demo.user;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.AttributeConverter;
+
+@RequiredArgsConstructor
+@Component
+public class RoleConverter implements AttributeConverter<Role, String> {
+    @Override
+    public String convertToDatabaseColumn(Role attribute) {
+        return attribute.getValue();
+    }
+
+    @Override
+    public Role convertToEntityAttribute(String dbData) {
+        return Role.findOf(dbData);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/user/UserService.java b/src/main/java/com/example/demo/user/UserService.java
index 7ca3140e..684925d8 100644
--- a/src/main/java/com/example/demo/user/UserService.java
+++ b/src/main/java/com/example/demo/user/UserService.java
@@ -1,9 +1,9 @@
 package com.example.demo.user;
 
+import com.example.demo.config.errors.exception.Exception400;
 import com.example.demo.config.errors.exception.Exception404;
 import com.example.demo.interest.Interest;
 import com.example.demo.interest.InterestJPARepository;
-import com.example.demo.config.errors.exception.Exception400;
 import com.example.demo.config.jwt.JWTTokenProvider;
 import com.example.demo.refreshToken.RefreshToken;
 import com.example.demo.refreshToken.RefreshTokenJPARepository;
@@ -33,7 +33,7 @@ public class UserService {
     public void emailCheck(UserRequest.EmailCheckDTO requestDTO) {
         Optional<User> optionalUser = userJPARepository.findByEmail(requestDTO.getEmail());
         if (optionalUser.isPresent()) {
-            throw new Exception400("동일한 이메일이 존재합니다.");
+            throw new Exception400(null, "동일한 이메일이 존재합니다.");
         }
     }
 
@@ -56,7 +56,7 @@ public void signup(UserRequest.SignUpDTO requestDTO) {
         List<String> categoryList = requestDTO.getCategoryList();
         for (String category : categoryList) {
             Interest interest = interestJPARepository.findByCategory(category)
-                    .orElseThrow(() -> new Exception400("해당 관심사가 존재하지 않습니다."));
+                    .orElseThrow(() -> new Exception400(null, "해당 관심사가 존재하지 않습니다."));
             UserInterest userInterest = UserInterest.builder().user(user).interest(interest).build();
             userInterestList.add(userInterest);
         }
@@ -66,10 +66,10 @@ public void signup(UserRequest.SignUpDTO requestDTO) {
     @Transactional
     public UserResponse.LoginDTO login(UserRequest.LoginDTO requestDTO) {
         User user = userJPARepository.findByEmail(requestDTO.getEmail())
-                .orElseThrow(() -> new Exception400("잘못된 이메일입니다."));
+                .orElseThrow(() -> new Exception400(null, "잘못된 이메일입니다."));
 
         if (!passwordEncoder.matches(requestDTO.getPassword(), user.getPassword())) {
-            throw new Exception400("잘못된 비밀번호입니다.");
+            throw new Exception400(null, "잘못된 비밀번호입니다.");
         }
 
         TokenResponse.TokenDTO token = JWTTokenProvider.createToken(user);
diff --git a/src/test/java/com/example/demo/AccountTest.java b/src/test/java/com/example/demo/AccountTest.java
index 51054ccb..22070337 100644
--- a/src/test/java/com/example/demo/AccountTest.java
+++ b/src/test/java/com/example/demo/AccountTest.java
@@ -1,7 +1,6 @@
 package com.example.demo;
 
 import com.example.demo.config.errors.exception.Exception404;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.UserJPARepository;
 import org.assertj.core.api.Assertions;
diff --git a/src/test/java/com/example/demo/VideoTest.java b/src/test/java/com/example/demo/VideoTest.java
index 4e0fe3a8..67d7e1c6 100644
--- a/src/test/java/com/example/demo/VideoTest.java
+++ b/src/test/java/com/example/demo/VideoTest.java
@@ -1,17 +1,13 @@
 package com.example.demo;
 
-import com.example.demo.config.errors.exception.Exception404;
 import com.example.demo.interest.Interest;
 import com.example.demo.interest.InterestJPARepository;
-import com.example.demo.mentoring.MentorPost;
-import com.example.demo.user.Role;
 import com.example.demo.user.User;
 import com.example.demo.user.UserJPARepository;
 import com.example.demo.user.userInterest.UserInterest;
 import com.example.demo.user.userInterest.UserInterestJPARepository;
 import com.example.demo.video.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
diff --git a/src/test/java/com/example/demo/mentoringtest/MentoringTest2.java b/src/test/java/com/example/demo/mentoringtest/MentoringTest2.java
index 9a19e32c..9bec0233 100644
--- a/src/test/java/com/example/demo/mentoringtest/MentoringTest2.java
+++ b/src/test/java/com/example/demo/mentoringtest/MentoringTest2.java
@@ -1,7 +1,6 @@
 package com.example.demo.mentoringtest;
 
 import com.example.demo.RestDoc;
-import com.example.demo.config.errors.exception.Exception400;
 import com.example.demo.mentoring.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayName;