From 79ca09cbbd994f67fd568983ab7618c4ff5bab31 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Thu, 26 Sep 2024 22:54:29 +0900
Subject: [PATCH 01/20] =?UTF-8?q?[feat]=20=EC=A0=80=EC=9E=A5=EB=90=9C=20?=
 =?UTF-8?q?=EC=98=81=EC=83=81=EC=9D=84=20=EC=B5=9C=EC=8B=A0=20=EC=88=9C?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B0=9B=EC=95=84=EC=98=A4=EB=8A=94=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

이외 토큰 없이 공통으로 조회 가능한 기능은 추후 구현 예정
---
 .../video/application/VideoService.java       |  9 ++++++
 .../video/persistence/VideoRepository.java    |  2 ++
 .../video/presentation/VideoController.java   | 31 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index edfe24f7..f89bfa30 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -1,6 +1,7 @@
 package team7.inplace.video.application;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import team7.inplace.influencer.entity.Influencer;
 import team7.inplace.influencer.repository.InfluencerRepository;
@@ -32,6 +33,14 @@ public List<VideoInfo> findByInfluencer(List<String> influencers) {
         return videoToInfo(savedVideos);
     }
 
+    public List<VideoInfo> findAllDESC() {
+        // id를 기준으로 내림차순 정렬하여 비디오 정보 불러오기
+        List<Video> savedVideos = videoRepository.findAll(Sort.by(Sort.Direction.DESC, "id"));
+
+        // DTO 형식에 맞게 대입
+        return videoToInfo(savedVideos);
+    }
+
     private List<VideoInfo> videoToInfo(List<Video> savedVideos) {
         List<VideoInfo> videoInfos = new ArrayList<>();
         for (Video savedVideo : savedVideos) {
diff --git a/src/main/java/team7/inplace/video/persistence/VideoRepository.java b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
index 2eb6f957..79562940 100644
--- a/src/main/java/team7/inplace/video/persistence/VideoRepository.java
+++ b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
@@ -1,5 +1,6 @@
 package team7.inplace.video.persistence;
 
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import team7.inplace.video.domain.Video;
 
@@ -7,4 +8,5 @@
 
 public interface VideoRepository extends JpaRepository<Video, Long> {
     List<Video> findVideosByInfluencerIdIn(List<Long> influencerIds);
+    List<Video> findAll(Sort sort);
 }
diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 0a93add8..7e54348a 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -10,6 +10,7 @@
 import team7.inplace.video.presentation.dto.VideoResponse;
 import team7.inplace.video.application.VideoService;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -23,7 +24,35 @@ public ResponseEntity<List<VideoResponse>> readByInfluencer(
             @RequestParam(name = "influencer", required = false) List<String> influencers
     ) {
         List<VideoInfo> videoInfos = videoService.findByInfluencer(influencers);
-        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::new).toList();
+        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::of).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
+
+    // 내 주변 그 곳 ( 토큰 x )
+    // Place 쪽에 기능을 넣어야 할 것 같다 ( 내 위치 기준으로 가까운 장소 가져오기 )
+    @GetMapping("/video")
+    public ResponseEntity<List<VideoResponse>> readBySurround(
+            @RequestParam(name = "longitude") String longtitude,
+            @RequestParam(name = "latitude") String latitude
+    ) {
+        List<VideoResponse> videoResponses = new ArrayList<>();
+        return new ResponseEntity<>(videoResponses, HttpStatus.OK);
+    }
+
+    // 새로 등록된 그 곳
+    @GetMapping("/videos/new")
+    public ResponseEntity<List<VideoResponse>> readByNew() {
+        List<VideoInfo> videoInfos = videoService.findAllDESC();
+        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::of).toList();
+        return new ResponseEntity<>(videoResponses, HttpStatus.OK);
+    }
+
+    // 쿨한 그 곳
+    // 조회수 가져오는 로직 개발 전에 완성 못함
+    @GetMapping("/videos/cool")
+    public ResponseEntity<List<VideoResponse>> readByCool() {
+        List<VideoResponse> videoResponses = new ArrayList<>();
+        return new ResponseEntity<>(videoResponses, HttpStatus.OK);
+    }
+
 }

From acab28b723ddf406b3d8fcae68b2988bdd45d4e3 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Fri, 27 Sep 2024 13:36:35 +0900
Subject: [PATCH 02/20] =?UTF-8?q?[build]=20Swagger=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=A2=85=EC=86=8D=EC=84=B1=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Springdoc 2.0.3 버전 종속성 추가
---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index 7ee55b06..175fe646 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,10 +26,12 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.3'
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 
 
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	runtimeOnly 'com.h2database:h2'

From 975d6118e5af10a9576e8307d0e3eb2269f36714 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Fri, 27 Sep 2024 13:46:22 +0900
Subject: [PATCH 03/20] =?UTF-8?q?[feat]=20Swagger=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20Controller=20=EB=A9=94=EC=84=9C=EB=93=9C?=
 =?UTF-8?q?=20=EC=84=A4=EB=AA=85=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

성공 및 실패 사례는 아직 미처리, 추후 추가 예정
---
 .../video/presentation/VideoController.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 7e54348a..0d796ad8 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -1,5 +1,6 @@
 package team7.inplace.video.presentation;
 
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,8 +19,9 @@
 public class VideoController {
     private final VideoService videoService;
 
-    // 내 인플루언서가 방문한 그 곳 ( 토큰 0 )
+    // 토큰 필요 메서드
     @GetMapping("/video")
+    @Operation(summary = "내 인플루언서가 방문한 그곳", description = "인플루언서를 기준으로 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByInfluencer(
             @RequestParam(name = "influencer", required = false) List<String> influencers
     ) {
@@ -28,9 +30,10 @@ public ResponseEntity<List<VideoResponse>> readByInfluencer(
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
-    // 내 주변 그 곳 ( 토큰 x )
-    // Place 쪽에 기능을 넣어야 할 것 같다 ( 내 위치 기준으로 가까운 장소 가져오기 )
+    // 토큰 불필요 메서드
+    // 내 주변 장소 반환 기능 ( PR 존재 ) weekly에 merge 시 개발
     @GetMapping("/video")
+    @Operation(summary = "내 주변 그 곳", description = "내 위치를 기준으로 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readBySurround(
             @RequestParam(name = "longitude") String longtitude,
             @RequestParam(name = "latitude") String latitude
@@ -39,17 +42,17 @@ public ResponseEntity<List<VideoResponse>> readBySurround(
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
-    // 새로 등록된 그 곳
     @GetMapping("/videos/new")
+    @Operation(summary = "새로 등록된 그 곳", description = "id를 기준으로 내림차순 정렬한 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByNew() {
         List<VideoInfo> videoInfos = videoService.findAllDESC();
         List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::of).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
-    // 쿨한 그 곳
-    // 조회수 가져오는 로직 개발 전에 완성 못함
+    // 조회수 반환 기능 개발 시 개발
     @GetMapping("/videos/cool")
+    @Operation(summary = "쿨한 그 곳", description = "조회수를 기준으로 내림차순 정렬한 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByCool() {
         List<VideoResponse> videoResponses = new ArrayList<>();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);

From 93a0c69ece793108a00c9351573d598bc50b3baf Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sat, 28 Sep 2024 23:39:55 +0900
Subject: [PATCH 04/20] =?UTF-8?q?[refactor]=20=EB=82=B4=EB=A6=BC=EC=B0=A8?=
 =?UTF-8?q?=EC=88=9C=20=EC=A0=81=EC=9A=A9=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sort 객체를 이용하는 방법에서 메서드 이름으로 지정하는 방식으로 변경
---
 src/main/java/team7/inplace/video/application/VideoService.java | 2 +-
 .../java/team7/inplace/video/persistence/VideoRepository.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index f89bfa30..3c78a7bb 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -35,7 +35,7 @@ public List<VideoInfo> findByInfluencer(List<String> influencers) {
 
     public List<VideoInfo> findAllDESC() {
         // id를 기준으로 내림차순 정렬하여 비디오 정보 불러오기
-        List<Video> savedVideos = videoRepository.findAll(Sort.by(Sort.Direction.DESC, "id"));
+        List<Video> savedVideos = videoRepository.findAllByOrderById();
 
         // DTO 형식에 맞게 대입
         return videoToInfo(savedVideos);
diff --git a/src/main/java/team7/inplace/video/persistence/VideoRepository.java b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
index 79562940..5e988086 100644
--- a/src/main/java/team7/inplace/video/persistence/VideoRepository.java
+++ b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
@@ -8,5 +8,5 @@
 
 public interface VideoRepository extends JpaRepository<Video, Long> {
     List<Video> findVideosByInfluencerIdIn(List<Long> influencerIds);
-    List<Video> findAll(Sort sort);
+    List<Video> findAllByOrderById();
 }

From 8a7ae5dec9c00e1ce45475e104d796c56ab40a68 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sat, 28 Sep 2024 23:43:35 +0900
Subject: [PATCH 05/20] =?UTF-8?q?[refactor]=20requestMapping=20=EC=96=B4?=
 =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=82=AC=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

동일 리소스에 대한 Mapping 가독성 상승시키기
---
 .../inplace/video/presentation/VideoController.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 0d796ad8..751d85a1 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -5,6 +5,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import team7.inplace.video.application.dto.VideoInfo;
@@ -16,11 +17,12 @@
 
 @RestController
 @RequiredArgsConstructor
+@RequestMapping("/video")
 public class VideoController {
     private final VideoService videoService;
 
     // 토큰 필요 메서드
-    @GetMapping("/video")
+    @GetMapping()
     @Operation(summary = "내 인플루언서가 방문한 그곳", description = "인플루언서를 기준으로 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByInfluencer(
             @RequestParam(name = "influencer", required = false) List<String> influencers
@@ -32,7 +34,7 @@ public ResponseEntity<List<VideoResponse>> readByInfluencer(
 
     // 토큰 불필요 메서드
     // 내 주변 장소 반환 기능 ( PR 존재 ) weekly에 merge 시 개발
-    @GetMapping("/video")
+    @GetMapping()
     @Operation(summary = "내 주변 그 곳", description = "내 위치를 기준으로 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readBySurround(
             @RequestParam(name = "longitude") String longtitude,
@@ -42,7 +44,7 @@ public ResponseEntity<List<VideoResponse>> readBySurround(
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
-    @GetMapping("/videos/new")
+    @GetMapping("/new")
     @Operation(summary = "새로 등록된 그 곳", description = "id를 기준으로 내림차순 정렬한 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByNew() {
         List<VideoInfo> videoInfos = videoService.findAllDESC();
@@ -51,7 +53,7 @@ public ResponseEntity<List<VideoResponse>> readByNew() {
     }
 
     // 조회수 반환 기능 개발 시 개발
-    @GetMapping("/videos/cool")
+    @GetMapping("/cool")
     @Operation(summary = "쿨한 그 곳", description = "조회수를 기준으로 내림차순 정렬한 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByCool() {
         List<VideoResponse> videoResponses = new ArrayList<>();

From e0c65f3e06823ba0cd6d35a805a230e5ee8c2342 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sat, 28 Sep 2024 23:56:48 +0900
Subject: [PATCH 06/20] =?UTF-8?q?[build]=20=EC=BD=94=EB=93=9C=20=EC=B5=9C?=
 =?UTF-8?q?=EC=8B=A0=ED=99=94=20=EC=9D=B4=ED=9B=84=20swagger=20=EC=A2=85?=
 =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=9E=AC=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 47964dc6..19f40b08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,7 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.3'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     runtimeOnly 'com.mysql:mysql-connector-j'

From 0eeabc3174cc72b2737ef57c1c5496bebf5040ae Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sat, 28 Sep 2024 23:59:48 +0900
Subject: [PATCH 07/20] =?UTF-8?q?[refactor]=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=B5=9C=EC=8B=A0=ED=99=94=20=EC=9D=B4=ED=9B=84=20=EB=8B=AC?=
 =?UTF-8?q?=EB=9D=BC=EC=A7=84=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=AA=85=20?=
 =?UTF-8?q?import=20=EB=AC=B8=EC=97=90=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/team7/inplace/video/persistence/VideoRepository.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/team7/inplace/video/persistence/VideoRepository.java b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
index 5e988086..b4fd0245 100644
--- a/src/main/java/team7/inplace/video/persistence/VideoRepository.java
+++ b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
@@ -8,5 +8,5 @@
 
 public interface VideoRepository extends JpaRepository<Video, Long> {
     List<Video> findVideosByInfluencerIdIn(List<Long> influencerIds);
-    List<Video> findAllByOrderById();
+    List<Video> findAllByOrderByIdDesc();
 }

From b26c1fd844862db5dde438ebe5026015ff0b7cda Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sun, 29 Sep 2024 00:00:26 +0900
Subject: [PATCH 08/20] =?UTF-8?q?[fix]=20=EB=82=B4=EB=A6=BC=EC=B0=A8?=
 =?UTF-8?q?=EC=88=9C=20=EC=A0=81=EC=9A=A9=20=EC=95=88=20=ED=95=9C=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EB=B0=9C=EA=B2=AC=20=EC=9D=B4=ED=9B=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../team7/inplace/video/application/VideoService.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index 3c78a7bb..c460cd81 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -1,12 +1,11 @@
 package team7.inplace.video.application;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
-import team7.inplace.influencer.entity.Influencer;
-import team7.inplace.influencer.repository.InfluencerRepository;
+import team7.inplace.influencer.domain.Influencer;
+import team7.inplace.influencer.persistence.InfluencerRepository;
 import team7.inplace.place.domain.Place;
-import team7.inplace.place.dto.PlaceForVideo;
+import team7.inplace.place.application.dto.PlaceForVideo;
 import team7.inplace.video.application.dto.VideoInfo;
 import team7.inplace.video.domain.Video;
 import team7.inplace.video.persistence.VideoRepository;
@@ -35,7 +34,7 @@ public List<VideoInfo> findByInfluencer(List<String> influencers) {
 
     public List<VideoInfo> findAllDESC() {
         // id를 기준으로 내림차순 정렬하여 비디오 정보 불러오기
-        List<Video> savedVideos = videoRepository.findAllByOrderById();
+        List<Video> savedVideos = videoRepository.findAllByOrderByIdDesc();
 
         // DTO 형식에 맞게 대입
         return videoToInfo(savedVideos);
@@ -54,7 +53,7 @@ private List<VideoInfo> videoToInfo(List<Video> savedVideos) {
                             savedVideo.getId(),
                             alias,
                             savedVideo.getVideoUrl(),
-                            PlaceForVideo.of(place.getPlaceId(), place.getName())
+                            PlaceForVideo.of(place.getId(), place.getName())
                     )
             );
         }

From 4731088a18f9ca7320e7a19c16a5d750b64ad47a Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sun, 29 Sep 2024 00:29:20 +0900
Subject: [PATCH 09/20] =?UTF-8?q?[feat]=20=EB=82=B4=20=EC=A3=BC=EB=B3=80?=
 =?UTF-8?q?=20=EA=B7=B8=20=EA=B3=B3=20API=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Place 변경사항 Merge 이후 구현
---
 .../video/application/VideoService.java       | 17 ++++++++++++++
 .../video/persistence/VideoRepository.java    |  3 +++
 .../video/presentation/VideoController.java   | 23 +++++++++++--------
 .../presentation/dto/VideoSearchParams.java   | 10 ++++++++
 4 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index c460cd81..d909ef23 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -1,14 +1,18 @@
 package team7.inplace.video.application;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import team7.inplace.influencer.domain.Influencer;
 import team7.inplace.influencer.persistence.InfluencerRepository;
 import team7.inplace.place.domain.Place;
 import team7.inplace.place.application.dto.PlaceForVideo;
+import team7.inplace.place.persistence.PlaceRepository;
 import team7.inplace.video.application.dto.VideoInfo;
 import team7.inplace.video.domain.Video;
 import team7.inplace.video.persistence.VideoRepository;
+import team7.inplace.video.presentation.dto.VideoSearchParams;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +22,7 @@
 public class VideoService {
     private final VideoRepository videoRepository;
     private final InfluencerRepository influencerRepository;
+    private final PlaceRepository placeRepository;
 
     public List<VideoInfo> findByInfluencer(List<String> influencers) {
         // 인플루언서 정보 처리
@@ -40,6 +45,18 @@ public List<VideoInfo> findAllDESC() {
         return videoToInfo(savedVideos);
     }
 
+    public List<VideoInfo> findBySurround(VideoSearchParams videoSearchParams, Pageable pageable){
+        Page<Place> placesByDistance = placeRepository.getPlacesByDistance(
+                videoSearchParams.longitude(),
+                videoSearchParams.latitude(),
+                pageable
+        );
+
+        List<Place> places = placesByDistance.getContent();
+        List<Video> videos = videoRepository.findDistinctByPlaceIn(places);
+        return videoToInfo(videos);
+    }
+
     private List<VideoInfo> videoToInfo(List<Video> savedVideos) {
         List<VideoInfo> videoInfos = new ArrayList<>();
         for (Video savedVideo : savedVideos) {
diff --git a/src/main/java/team7/inplace/video/persistence/VideoRepository.java b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
index b4fd0245..a981d2ac 100644
--- a/src/main/java/team7/inplace/video/persistence/VideoRepository.java
+++ b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
@@ -2,6 +2,7 @@
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
+import team7.inplace.place.domain.Place;
 import team7.inplace.video.domain.Video;
 
 import java.util.List;
@@ -9,4 +10,6 @@
 public interface VideoRepository extends JpaRepository<Video, Long> {
     List<Video> findVideosByInfluencerIdIn(List<Long> influencerIds);
     List<Video> findAllByOrderByIdDesc();
+
+    List<Video> findDistinctByPlaceIn(List<Place> placeIds);
 }
diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 751d85a1..19db4786 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -2,15 +2,16 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import team7.inplace.video.application.dto.VideoInfo;
 import team7.inplace.video.presentation.dto.VideoResponse;
 import team7.inplace.video.application.VideoService;
+import team7.inplace.video.presentation.dto.VideoSearchParams;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,19 +29,21 @@ public ResponseEntity<List<VideoResponse>> readByInfluencer(
             @RequestParam(name = "influencer", required = false) List<String> influencers
     ) {
         List<VideoInfo> videoInfos = videoService.findByInfluencer(influencers);
-        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::of).toList();
+        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::from).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
     // 토큰 불필요 메서드
-    // 내 주변 장소 반환 기능 ( PR 존재 ) weekly에 merge 시 개발
     @GetMapping()
     @Operation(summary = "내 주변 그 곳", description = "내 위치를 기준으로 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readBySurround(
-            @RequestParam(name = "longitude") String longtitude,
-            @RequestParam(name = "latitude") String latitude
+            @ModelAttribute VideoSearchParams searchParams,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size
     ) {
-        List<VideoResponse> videoResponses = new ArrayList<>();
+        Pageable pageable = PageRequest.of(page, size);
+        List<VideoInfo> videoInfos = videoService.findBySurround(searchParams, pageable);
+        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::from).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
@@ -48,7 +51,7 @@ public ResponseEntity<List<VideoResponse>> readBySurround(
     @Operation(summary = "새로 등록된 그 곳", description = "id를 기준으로 내림차순 정렬한 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByNew() {
         List<VideoInfo> videoInfos = videoService.findAllDESC();
-        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::of).toList();
+        List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::from).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
diff --git a/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java b/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java
new file mode 100644
index 00000000..6d11fc7f
--- /dev/null
+++ b/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java
@@ -0,0 +1,10 @@
+package team7.inplace.video.presentation.dto;
+
+import lombok.Getter;
+
+@Getter
+public record VideoSearchParams(
+        String longitude,
+        String latitude
+) {
+}

From 46f3834b7865b9426dc7f31a27ea30a575d15081 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sun, 29 Sep 2024 00:30:21 +0900
Subject: [PATCH 10/20] =?UTF-8?q?[chore]=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=20=EB=AC=B8=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/team7/inplace/video/persistence/VideoRepository.java    | 1 -
 .../java/team7/inplace/video/presentation/VideoController.java   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/main/java/team7/inplace/video/persistence/VideoRepository.java b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
index a981d2ac..d9fe5085 100644
--- a/src/main/java/team7/inplace/video/persistence/VideoRepository.java
+++ b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
@@ -1,6 +1,5 @@
 package team7.inplace.video.persistence;
 
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import team7.inplace.place.domain.Place;
 import team7.inplace.video.domain.Video;
diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 19db4786..f1048d1c 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -2,7 +2,6 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

From 8f63213f5f958d76d4f0c4bb556d46609fccd557 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Sun, 29 Sep 2024 22:20:45 +0900
Subject: [PATCH 11/20] =?UTF-8?q?[chore]=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?=
 =?UTF-8?q?=ED=86=B5=EC=9D=BC=20=EB=B0=8F=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

테스트는 도메인 별로 패키지를 만들고 패키지 명은 도메인 명과 동일하게 하기
---
 .../team7/inplace/{VideoTest => video}/domain/VideoTest.java   | 3 +--
 .../{VideoTest => video}/repository/VideoRepositoryTest.java   | 2 +-
 .../inplace/{VideoTest => video}/service/VideoServiceTest.java | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename src/test/java/team7/inplace/{VideoTest => video}/domain/VideoTest.java (90%)
 rename src/test/java/team7/inplace/{VideoTest => video}/repository/VideoRepositoryTest.java (98%)
 rename src/test/java/team7/inplace/{VideoTest => video}/service/VideoServiceTest.java (98%)

diff --git a/src/test/java/team7/inplace/VideoTest/domain/VideoTest.java b/src/test/java/team7/inplace/video/domain/VideoTest.java
similarity index 90%
rename from src/test/java/team7/inplace/VideoTest/domain/VideoTest.java
rename to src/test/java/team7/inplace/video/domain/VideoTest.java
index 0a0d8a55..5f352d2c 100644
--- a/src/test/java/team7/inplace/VideoTest/domain/VideoTest.java
+++ b/src/test/java/team7/inplace/video/domain/VideoTest.java
@@ -1,11 +1,10 @@
-package team7.inplace.VideoTest.domain;
+package team7.inplace.video.domain;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import team7.inplace.influencer.domain.Influencer;
 import team7.inplace.place.domain.Place;
-import team7.inplace.video.domain.Video;
 
 public class VideoTest {
     @Test
diff --git a/src/test/java/team7/inplace/VideoTest/repository/VideoRepositoryTest.java b/src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java
similarity index 98%
rename from src/test/java/team7/inplace/VideoTest/repository/VideoRepositoryTest.java
rename to src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java
index 1333fa81..cffeef1d 100644
--- a/src/test/java/team7/inplace/VideoTest/repository/VideoRepositoryTest.java
+++ b/src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java
@@ -1,4 +1,4 @@
-package team7.inplace.VideoTest.repository;
+package team7.inplace.video.repository;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
diff --git a/src/test/java/team7/inplace/VideoTest/service/VideoServiceTest.java b/src/test/java/team7/inplace/video/service/VideoServiceTest.java
similarity index 98%
rename from src/test/java/team7/inplace/VideoTest/service/VideoServiceTest.java
rename to src/test/java/team7/inplace/video/service/VideoServiceTest.java
index 0dd48544..3d61c109 100644
--- a/src/test/java/team7/inplace/VideoTest/service/VideoServiceTest.java
+++ b/src/test/java/team7/inplace/video/service/VideoServiceTest.java
@@ -1,4 +1,4 @@
-package team7.inplace.VideoTest.service;
+package team7.inplace.video.service;
 
 import static org.mockito.BDDMockito.given;
 

From b745ec8ee08725bf36fc952a2b927335209b2eb7 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 15:44:38 +0900
Subject: [PATCH 12/20] =?UTF-8?q?[chore]=20=EB=9D=84=EC=96=B4=EC=93=B0?=
 =?UTF-8?q?=EA=B8=B0=20=ED=98=95=EC=8B=9D=20=EB=A7=9E=EC=B6=94=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/team7/inplace/video/application/VideoService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index d909ef23..abce5162 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -45,7 +45,7 @@ public List<VideoInfo> findAllDESC() {
         return videoToInfo(savedVideos);
     }
 
-    public List<VideoInfo> findBySurround(VideoSearchParams videoSearchParams, Pageable pageable){
+    public List<VideoInfo> findBySurround(VideoSearchParams videoSearchParams, Pageable pageable) {
         Page<Place> placesByDistance = placeRepository.getPlacesByDistance(
                 videoSearchParams.longitude(),
                 videoSearchParams.latitude(),

From f4938799a671445a58192eeca8431ce6b121201b Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 15:45:04 +0900
Subject: [PATCH 13/20] =?UTF-8?q?[chore]=20=EC=98=A4=ED=83=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

리소스 명 video에서 videos로 수정
---
 .../java/team7/inplace/video/presentation/VideoController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index f1048d1c..0acbeb08 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -17,7 +17,7 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/video")
+@RequestMapping("/videos")
 public class VideoController {
     private final VideoService videoService;
 

From 5f2a329dce44b2f1ccd6ab1f1647e9ad9c313cdf Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 18:03:10 +0900
Subject: [PATCH 14/20] =?UTF-8?q?[fix]=20=EC=9D=98=EB=8F=84=ED=95=9C=20?=
 =?UTF-8?q?=EB=B0=94=EC=99=80=20=EB=8B=A4=EB=A5=B8=20=EB=8F=99=EC=9E=91?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

테스트 과정에서 의도한 바와 다르게 동작하는 것을 발견하고 수정
---
 .../java/team7/inplace/video/application/VideoService.java | 7 ++++++-
 .../team7/inplace/video/persistence/VideoRepository.java   | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index abce5162..1728a72b 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -53,7 +53,12 @@ public List<VideoInfo> findBySurround(VideoSearchParams videoSearchParams, Pagea
         );
 
         List<Place> places = placesByDistance.getContent();
-        List<Video> videos = videoRepository.findDistinctByPlaceIn(places);
+        List<Video> videos = new ArrayList<>();
+        for (Place place : places) {
+            if(videos.size() == places.size())
+                break;
+            videos.add(videoRepository.findTopByPlaceOrderByIdDesc(place));
+        }
         return videoToInfo(videos);
     }
 
diff --git a/src/main/java/team7/inplace/video/persistence/VideoRepository.java b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
index d9fe5085..3521a8d9 100644
--- a/src/main/java/team7/inplace/video/persistence/VideoRepository.java
+++ b/src/main/java/team7/inplace/video/persistence/VideoRepository.java
@@ -8,7 +8,8 @@
 
 public interface VideoRepository extends JpaRepository<Video, Long> {
     List<Video> findVideosByInfluencerIdIn(List<Long> influencerIds);
+
     List<Video> findAllByOrderByIdDesc();
 
-    List<Video> findDistinctByPlaceIn(List<Place> placeIds);
+    Video findTopByPlaceOrderByIdDesc(Place place);
 }

From 809804ea034bbae766d9e7caf91e79ca79868865 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 18:03:32 +0900
Subject: [PATCH 15/20] =?UTF-8?q?[fix]=20Record=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EC=97=90=20Getter=20=EC=82=AC=EC=9A=A9=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inplace/video/presentation/dto/VideoSearchParams.java      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java b/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java
index 6d11fc7f..e56c21cc 100644
--- a/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java
+++ b/src/main/java/team7/inplace/video/presentation/dto/VideoSearchParams.java
@@ -1,8 +1,5 @@
 package team7.inplace.video.presentation.dto;
 
-import lombok.Getter;
-
-@Getter
 public record VideoSearchParams(
         String longitude,
         String latitude

From 1044b9a072fe687331f5927cd6a92ac094a1737e Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 18:03:58 +0900
Subject: [PATCH 16/20] =?UTF-8?q?[test]=20=EC=83=88=EB=A1=9C=EC=9A=B4=20?=
 =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EC=97=90=20=EB=8C=80=ED=95=9C=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B5=AC=ED=98=84=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B5=9C=EC=8B=A0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/repository/VideoRepositoryTest.java | 54 +++++++++++++++----
 .../video/service/VideoServiceTest.java       | 19 ++++---
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java b/src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java
index cffeef1d..b9fefb0d 100644
--- a/src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java
+++ b/src/test/java/team7/inplace/video/repository/VideoRepositoryTest.java
@@ -2,8 +2,8 @@
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
-import jakarta.transaction.Transactional;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -13,8 +13,7 @@
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.test.annotation.DirtiesContext;
 import team7.inplace.influencer.domain.Influencer;
-import team7.inplace.place.domain.Category;
-import team7.inplace.place.domain.Place;
+import team7.inplace.place.domain.*;
 import team7.inplace.video.domain.Video;
 import team7.inplace.video.persistence.VideoRepository;
 
@@ -25,11 +24,11 @@ public class VideoRepositoryTest {
     EntityManager entityManager;
     @Autowired
     private VideoRepository videoRepository;
+    private Place place;
 
     @BeforeEach
-    @Transactional
     void init() {
-        Place place = Place.builder()
+        place = Place.builder()
                 .name("Test Place")
                 .pet(false)
                 .wifi(true)
@@ -37,13 +36,18 @@ void init() {
                 .fordisabled(true)
                 .nursery(false)
                 .smokingroom(false)
-                .address1("Address 1")
-                .address2("Address 2")
-                .address3("Address 3")
+                .address(new Address("Address 1", "Address 2", "Address 3"))
                 .menuImgUrl("menu.jpg")
                 .category(Category.CAFE)
-                .longitude("127.0")
-                .latitude("37.0")
+                .coordinate(new Coordinate("127.0", "37.0"))
+                .timeList(Arrays.asList(
+                        new PlaceTime("Opening Hours", "9:00 AM", "Monday"),
+                        new PlaceTime("Closing Hours", "10:00 PM", "Monday")
+                ))
+                .menuList(Arrays.asList(
+                        new Menu(5000L, true, "Coffee"),
+                        new Menu(7000L, false, "Cake")
+                ))
                 .build();
         entityManager.persist(place);
 
@@ -69,6 +73,7 @@ void init() {
     void test1() {
         // given
         /* Before Each */
+
         // when
         List<Long> influencerIds = new ArrayList<>();
         influencerIds.add(1L);
@@ -77,4 +82,33 @@ void test1() {
         // then
         Assertions.assertThat(savedVideos.size()).isEqualTo(3);
     }
+
+    @Test
+    @DisplayName("findAllByOrderByIdDesc Test")
+    void test2() {
+        // given
+        /* Before Each */
+
+        // when
+        List<Video> videos = videoRepository.findAllByOrderByIdDesc();
+
+        // then
+        Long number = 5L;
+        for (Video video : videos) {
+            Assertions.assertThat(video.getId()).isEqualTo(number);
+            number -= 1L;
+        }
+    }
+
+    @Test
+    @DisplayName("findTopByPlaceOrderByIdDesc Test")
+    void test3() {
+        // given
+
+        // when
+        Video video = videoRepository.findTopByPlaceOrderByIdDesc(place);
+
+        // then
+        Assertions.assertThat(video.getId()).isEqualTo(5L);
+    }
 }
diff --git a/src/test/java/team7/inplace/video/service/VideoServiceTest.java b/src/test/java/team7/inplace/video/service/VideoServiceTest.java
index 3d61c109..bd13a36f 100644
--- a/src/test/java/team7/inplace/video/service/VideoServiceTest.java
+++ b/src/test/java/team7/inplace/video/service/VideoServiceTest.java
@@ -3,6 +3,7 @@
 import static org.mockito.BDDMockito.given;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
@@ -14,8 +15,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import team7.inplace.influencer.domain.Influencer;
 import team7.inplace.influencer.persistence.InfluencerRepository;
-import team7.inplace.place.domain.Category;
-import team7.inplace.place.domain.Place;
+import team7.inplace.place.domain.*;
 import team7.inplace.video.application.VideoService;
 import team7.inplace.video.application.dto.VideoInfo;
 import team7.inplace.video.domain.Video;
@@ -45,13 +45,18 @@ void test1() {
                 .fordisabled(true)
                 .nursery(false)
                 .smokingroom(false)
-                .address1("Address 1")
-                .address2("Address 2")
-                .address3("Address 3")
+                .address(new Address("Address 1", "Address 2", "Address 3"))
                 .menuImgUrl("menu.jpg")
                 .category(Category.CAFE)
-                .longitude("127.0")
-                .latitude("37.0")
+                .coordinate(new Coordinate("127.0", "37.0"))
+                .timeList(Arrays.asList(
+                        new PlaceTime("Opening Hours", "9:00 AM", "Monday"),
+                        new PlaceTime("Closing Hours", "10:00 PM", "Monday")
+                ))
+                .menuList(Arrays.asList(
+                        new Menu(5000L, true, "Coffee"),
+                        new Menu(7000L, false, "Cake")
+                ))
                 .build();
         Influencer influencer = new Influencer("성시경", "가수", "imgUrl");
         Video video = new Video("url", influencer, place);

From 66891cc99c54ca634a65fffd898e91d4a1eff646 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 21:41:13 +0900
Subject: [PATCH 17/20] =?UTF-8?q?[chore]=20=ED=99=98=EA=B2=BD=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application-security.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/application-security.yaml b/src/main/resources/application-security.yaml
index 68fa588f..ace7172d 100644
--- a/src/main/resources/application-security.yaml
+++ b/src/main/resources/application-security.yaml
@@ -1,4 +1,6 @@
 spring:
+  config:
+    import: optional:file:.env[.properties]
   security:
     oauth2:
       client:

From bf1f83f1fefa14a54bbbe0ffc7f1aa7c9ea1d0fd Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 21:42:25 +0900
Subject: [PATCH 18/20] =?UTF-8?q?[feat]=20=ED=86=A0=ED=81=B0=20=ED=99=95?=
 =?UTF-8?q?=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

헤더를 분석하여 토큰의 유무를 확인하는 로직 구현
---
 .../video/presentation/VideoController.java   | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 0acbeb08..3fed076d 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -1,12 +1,15 @@
 package team7.inplace.video.presentation;
 
 import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import team7.inplace.influencer.domain.Influencer;
+import team7.inplace.security.util.JwtUtil;
 import team7.inplace.video.application.dto.VideoInfo;
 import team7.inplace.video.presentation.dto.VideoResponse;
 import team7.inplace.video.application.VideoService;
@@ -23,23 +26,38 @@ public class VideoController {
 
     // 토큰 필요 메서드
     @GetMapping()
-    @Operation(summary = "내 인플루언서가 방문한 그곳", description = "인플루언서를 기준으로 Video 정보를 조회합니다.")
-    public ResponseEntity<List<VideoResponse>> readByInfluencer(
-            @RequestParam(name = "influencer", required = false) List<String> influencers
+    @Operation(
+            summary = "내 인플루언서가 방문한 or 내 주변 그곳 ",
+            description = "토큰의 유무에 따라 다른 동작을 수행합니다."
+    )
+    public ResponseEntity<List<VideoResponse>> readVideos(
+            HttpServletRequest request,
+            @RequestParam(name = "influencer", required = false) List<String> influencers,
+            @ModelAttribute VideoSearchParams searchParams,
+            @RequestParam(defaultValue = "0", required = false) int page,
+            @RequestParam(defaultValue = "10", required = false) int size
     ) {
+        // Authorization 헤더 추출
+        String authHeader = request.getHeader("Authorization");
+        // 토큰 존재 여부 검사
+        if(authHeader != null && authHeader.startsWith("Bearer ")) {
+            // 토큰 유효성 검사
+
+            // 토큰이 있는 경우
+            return readByInfluencer(influencers);
+        }
+
+        // 토큰이 없는 경우
+        return readBySurround(searchParams, page, size);
+    }
+
+    private ResponseEntity<List<VideoResponse>> readByInfluencer(List<String> influencers){
         List<VideoInfo> videoInfos = videoService.findByInfluencer(influencers);
         List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::from).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }
 
-    // 토큰 불필요 메서드
-    @GetMapping()
-    @Operation(summary = "내 주변 그 곳", description = "내 위치를 기준으로 Video 정보를 조회합니다.")
-    public ResponseEntity<List<VideoResponse>> readBySurround(
-            @ModelAttribute VideoSearchParams searchParams,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size
-    ) {
+    private ResponseEntity<List<VideoResponse>> readBySurround(VideoSearchParams searchParams, int page, int size) {
         Pageable pageable = PageRequest.of(page, size);
         List<VideoInfo> videoInfos = videoService.findBySurround(searchParams, pageable);
         List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::from).toList();

From 725d3db27e0abb68a40a019e9c2a6dbece7d9be3 Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 22:27:54 +0900
Subject: [PATCH 19/20] =?UTF-8?q?[refactor]=20=EB=A9=94=EC=84=9C=EB=93=9C?=
 =?UTF-8?q?=20=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/team7/inplace/video/application/VideoService.java    | 2 +-
 .../team7/inplace/video/presentation/VideoController.java     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/team7/inplace/video/application/VideoService.java b/src/main/java/team7/inplace/video/application/VideoService.java
index 1728a72b..24a566ce 100644
--- a/src/main/java/team7/inplace/video/application/VideoService.java
+++ b/src/main/java/team7/inplace/video/application/VideoService.java
@@ -37,7 +37,7 @@ public List<VideoInfo> findByInfluencer(List<String> influencers) {
         return videoToInfo(savedVideos);
     }
 
-    public List<VideoInfo> findAllDESC() {
+    public List<VideoInfo> findAllDesc() {
         // id를 기준으로 내림차순 정렬하여 비디오 정보 불러오기
         List<Video> savedVideos = videoRepository.findAllByOrderByIdDesc();
 
diff --git a/src/main/java/team7/inplace/video/presentation/VideoController.java b/src/main/java/team7/inplace/video/presentation/VideoController.java
index 3fed076d..03ee1439 100644
--- a/src/main/java/team7/inplace/video/presentation/VideoController.java
+++ b/src/main/java/team7/inplace/video/presentation/VideoController.java
@@ -8,8 +8,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import team7.inplace.influencer.domain.Influencer;
-import team7.inplace.security.util.JwtUtil;
 import team7.inplace.video.application.dto.VideoInfo;
 import team7.inplace.video.presentation.dto.VideoResponse;
 import team7.inplace.video.application.VideoService;
@@ -67,7 +65,7 @@ private ResponseEntity<List<VideoResponse>> readBySurround(VideoSearchParams sea
     @GetMapping("/new")
     @Operation(summary = "새로 등록된 그 곳", description = "id를 기준으로 내림차순 정렬한 Video 정보를 조회합니다.")
     public ResponseEntity<List<VideoResponse>> readByNew() {
-        List<VideoInfo> videoInfos = videoService.findAllDESC();
+        List<VideoInfo> videoInfos = videoService.findAllDesc();
         List<VideoResponse> videoResponses = videoInfos.stream().map(VideoResponse::from).toList();
         return new ResponseEntity<>(videoResponses, HttpStatus.OK);
     }

From 579dbab92b40e065a10f1322ef49826862a56eff Mon Sep 17 00:00:00 2001
From: BaeJunho <bjh4498@knu.ac.kr>
Date: Tue, 1 Oct 2024 22:29:58 +0900
Subject: [PATCH 20/20] =?UTF-8?q?[refactor]=20=ED=99=98=EA=B2=BD=20?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

application yaml 파일에서 import 하도록 변경
---
 src/main/resources/application-security.yaml | 2 --
 src/main/resources/application.yaml          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/resources/application-security.yaml b/src/main/resources/application-security.yaml
index ace7172d..68fa588f 100644
--- a/src/main/resources/application-security.yaml
+++ b/src/main/resources/application-security.yaml
@@ -1,6 +1,4 @@
 spring:
-  config:
-    import: optional:file:.env[.properties]
   security:
     oauth2:
       client:
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index c6f65167..361f1db6 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -1,3 +1,3 @@
 spring:
   config:
-    import: classpath:application-security.yaml, classpath:application-youtube.yaml
\ No newline at end of file
+    import: classpath:application-security.yaml, classpath:application-youtube.yaml, optional:file:.env[.properties]
\ No newline at end of file