Merge pull request #32 from syyling/feat/27

[feat/refactor/fix] 영화 제목 리스트 검색 기능 추가, 영화 제목 검색 결과 조회 기능 추가, kofic api 파라미터 추가, infra 패키지 구조 변경
syyling · May 25, 2024 · e58f0cf · e58f0cf
2 parents cf85a6c + 05f67fa
commit e58f0cf
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 10 deletions.
diff --git a/src/main/java/com/mookive/mookive_backend/movie/application/dto/response/MovieResponse.java b/src/main/java/com/mookive/mookive_backend/movie/application/dto/response/MovieResponse.java
@@ -32,4 +32,34 @@ public MovieDetailResponse(String title, String director, String genre, String y
             this.tagline = tagline;
         }
     }
+
+    @Getter
+    @NoArgsConstructor
+    public static class MovieTitleResponse {
+        private String title;
+
+        @Builder
+        public MovieTitleResponse(String title) {
+            this.title = title;
+        }
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class MovieTitleSearchResponse {
+        private String title;
+        private String director;
+        private String year;
+        private String poster;
+        private String nation;
+
+        @Builder
+        public MovieTitleSearchResponse(String title, String director, String year, String poster, String nation) {
+            this.title = title;
+            this.director = director;
+            this.year = year;
+            this.poster = poster;
+            this.nation = nation;
+        }
+    }
 }
diff --git a/src/main/java/com/mookive/mookive_backend/movie/application/service/MovieGetService.java b/src/main/java/com/mookive/mookive_backend/movie/application/service/MovieGetService.java
@@ -5,7 +5,7 @@
 import com.mookive.mookive_backend.movie.domain.entity.Movie;
 import com.mookive.mookive_backend.movie.domain.service.MovieQueryService;
 import com.mookive.mookive_backend.movie.domain.service.MovieSaveService;
-import com.mookive.mookive_backend.movie.infra.MovieSearchService;
+import com.mookive.mookive_backend.movie.infra.service.MovieEntityGetService;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import org.json.JSONException;
@@ -17,13 +17,13 @@
 public class MovieGetService {
 
     private final MovieQueryService movieQueryService;
-    private final MovieSearchService movieSearchService;
+    private final MovieEntityGetService movieEntityGetService;
     private final MovieSaveService movieSaveService;
 
     public MovieResponse.MovieDetailResponse getMovieDetail(String tmdbId) throws JSONException {
         Movie movie = movieQueryService.findByTmdbId(tmdbId);
         if(movie == null) {
-            movie = movieSearchService.searchMovie(tmdbId);
+            movie = movieEntityGetService.searchMovie(tmdbId);
             movieSaveService.save(movie);
         }
         return MovieMapper.mapToMovieDetailResponse(movie);

diff --git a/src/main/java/com/mookive/mookive_backend/movie/application/service/MovieSearchService.java b/src/main/java/com/mookive/mookive_backend/movie/application/service/MovieSearchService.java
@@ -0,0 +1,73 @@
+package com.mookive.mookive_backend.movie.application.service;
+
+import com.mookive.mookive_backend.movie.application.dto.response.MovieResponse;
+import com.mookive.mookive_backend.movie.infra.component.KoficComponent;
+import com.mookive.mookive_backend.movie.infra.component.TmdbSearchComponent;
+import lombok.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class MovieSearchService {
+
+    private final TmdbSearchComponent tmdbSearchComponent;
+    private final KoficComponent koficComponent;
+
+    @Value("${kofic.service-key}")
+    private String koficKey;
+
+    public List<MovieResponse.MovieTitleResponse> getMovieTitleList(String title) {
+        List<MovieResponse.MovieTitleResponse> tmdbMovieTtitleResponseList = new ArrayList<>();
+        JSONObject jsonObject = new JSONObject(tmdbSearchComponent.findMovieTitleList(title, "ko-KR"));
+        JSONArray results = (JSONArray) jsonObject.get("results");
+        for(int i=0; i<results.length(); i++) {
+            JSONObject result = (JSONObject) results.get(i);
+            MovieResponse.MovieTitleResponse tmdbMovieTitleResponse = MovieResponse.MovieTitleResponse.builder()
+                    .title(result.get("title").toString())
+                    .build();
+            tmdbMovieTtitleResponseList.add(tmdbMovieTitleResponse);
+        }
+        return tmdbMovieTtitleResponseList;
+    }
+
+    public List<MovieResponse.MovieTitleSearchResponse> getMovieTitleSearchResult(String title) {
+        List<MovieResponse.MovieTitleSearchResponse> tmdbMovieTitleSearchResponseList = new ArrayList<>();
+        JSONObject jsonObject = new JSONObject(tmdbSearchComponent.findMovieTitleList(title, "ko-KR"));
+        JSONArray results = (JSONArray) jsonObject.get("results");
+        for(int i=0; i<results.length(); i++) {
+            JSONObject result = (JSONObject) results.get(i);
+            String titleResult = result.get("title").toString();
+            String year = result.get("release_date").toString().substring(0, 4);
+            JSONObject koficResponse = new JSONObject(koficComponent.findMovieByTitleAndYear(koficKey, titleResult, year, year));
+
+            JSONObject movieListResult = (JSONObject) koficResponse.get("movieListResult");
+            JSONArray dataResult = (JSONArray) movieListResult.get("movieList");
+            if(!dataResult.isEmpty()) {
+                JSONObject movie = (JSONObject) dataResult.get(0);
+                String nation = movie.get("nationAlt").toString();
+                JSONArray directors = (JSONArray) movie.get("directors");
+                StringBuilder director = new StringBuilder();
+                for(int j=0; j<directors.length(); j++) {
+                    JSONObject directorObject = (JSONObject) directors.get(j);
+                    director.append(directorObject.get("peopleNm"));
+                    if(j<directors.length()-1) director.append(",");
+                }
+                MovieResponse.MovieTitleSearchResponse tmdbMovieTitleSearchResponse = MovieResponse.MovieTitleSearchResponse.builder()
+                        .title(titleResult)
+                        .year(year)
+                        .poster("https://image.tmdb.org/t/p/original" + result.get("poster_path"))
+                        .director(director.toString())
+                        .nation(nation)
+                        .build();
+                tmdbMovieTitleSearchResponseList.add(tmdbMovieTitleSearchResponse);
+            }
+        }
+        return tmdbMovieTitleSearchResponseList;
+    }
+}
diff --git a/...e_backend/movie/infra/KoficComponent.java → ...movie/infra/component/KoficComponent.java b/...e_backend/movie/infra/KoficComponent.java → ...movie/infra/component/KoficComponent.java
@@ -1,4 +1,4 @@
-package com.mookive.mookive_backend.movie.infra;
+package com.mookive.mookive_backend.movie.infra.component;
 
 
 import org.springframework.stereotype.Component;
@@ -11,5 +11,6 @@
 public interface KoficComponent {
 
     @GetExchange()
-    String findMovieByTitleAndYear(@RequestParam String key, @RequestParam String movieNm, @RequestParam String openStartDt);
+    String findMovieByTitleAndYear(@RequestParam String key, @RequestParam String movieNm,
+                                   @RequestParam String openStartDt, @RequestParam String openEndDt);
 }
diff --git a/...ve_backend/movie/infra/TmdbComponent.java → .../movie/infra/component/TmdbComponent.java b/...ve_backend/movie/infra/TmdbComponent.java → .../movie/infra/component/TmdbComponent.java
@@ -1,4 +1,4 @@
-package com.mookive.mookive_backend.movie.infra;
+package com.mookive.mookive_backend.movie.infra.component;
 
 
 import org.springframework.stereotype.Component;

diff --git a/src/main/java/com/mookive/mookive_backend/movie/infra/component/TmdbSearchComponent.java b/src/main/java/com/mookive/mookive_backend/movie/infra/component/TmdbSearchComponent.java
@@ -0,0 +1,14 @@
+package com.mookive.mookive_backend.movie.infra.component;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.service.annotation.GetExchange;
+import org.springframework.web.service.annotation.HttpExchange;
+
+@Component
+@HttpExchange
+public interface TmdbSearchComponent {
+
+    @GetExchange()
+    String findMovieTitleList (@RequestParam("query") String title, @RequestParam String language);
+}
diff --git a/...backend/movie/infra/RestClientConfig.java → .../movie/infra/config/RestClientConfig.java b/...backend/movie/infra/RestClientConfig.java → .../movie/infra/config/RestClientConfig.java
@@ -1,5 +1,8 @@
-package com.mookive.mookive_backend.movie.infra;
+package com.mookive.mookive_backend.movie.infra.config;
 
+import com.mookive.mookive_backend.movie.infra.component.KoficComponent;
+import com.mookive.mookive_backend.movie.infra.component.TmdbComponent;
+import com.mookive.mookive_backend.movie.infra.component.TmdbSearchComponent;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,4 +39,17 @@ public TmdbComponent tmdbService() {
         return factory.createClient(TmdbComponent.class);
 
     }
+
+    @Bean
+    public TmdbSearchComponent tmdbSearchService() {
+        RestClient restClient = RestClient.builder()
+                .baseUrl("https://api.themoviedb.org/3/search/movie")
+                .defaultHeader("Authorization", token)
+                .defaultHeader("accept", "application/json")
+                .build();
+        RestClientAdapter adapter = RestClientAdapter.create(restClient);
+        HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter).build();
+        return factory.createClient(TmdbSearchComponent.class);
+
+    }
 }
diff --git a/...ckend/movie/infra/MovieSearchService.java → .../infra/service/MovieEntityGetService.java b/...ckend/movie/infra/MovieSearchService.java → .../infra/service/MovieEntityGetService.java
@@ -1,6 +1,8 @@
-package com.mookive.mookive_backend.movie.infra;
+package com.mookive.mookive_backend.movie.infra.service;
 
 import com.mookive.mookive_backend.movie.domain.entity.Movie;
+import com.mookive.mookive_backend.movie.infra.component.KoficComponent;
+import com.mookive.mookive_backend.movie.infra.component.TmdbComponent;
 import lombok.*;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -9,7 +11,7 @@
 
 @Service
 @RequiredArgsConstructor
-public class MovieSearchService {
+public class MovieEntityGetService {
 
     private final KoficComponent koficComponent;
     private final TmdbComponent tmdbComponent;
@@ -60,7 +62,7 @@ private TmdbResponse getTmdbResponse(String tmdbMovieId) {
     }
 
     private KoficResponse getKoficResponse(String title, String year) {
-        JSONObject apiResponse = new JSONObject(koficComponent.findMovieByTitleAndYear(koficKey, title, year));
+        JSONObject apiResponse = new JSONObject(koficComponent.findMovieByTitleAndYear(koficKey, title, year, year));
         JSONObject jsonObject = (JSONObject) apiResponse.get("movieListResult");
         JSONArray dataResult = (JSONArray) jsonObject.get("movieList");
         JSONObject movie = (JSONObject) dataResult.get(0);

diff --git a/src/main/java/com/mookive/mookive_backend/movie/presentation/MovieController.java b/src/main/java/com/mookive/mookive_backend/movie/presentation/MovieController.java
@@ -3,20 +3,34 @@
 
 import com.mookive.mookive_backend.movie.application.dto.response.MovieResponse;
 import com.mookive.mookive_backend.movie.application.service.MovieGetService;
+import com.mookive.mookive_backend.movie.application.service.MovieSearchService;
 import lombok.RequiredArgsConstructor;
 import org.json.JSONException;
 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;
+
 @RestController
 @RequiredArgsConstructor
 public class MovieController {
 
     private final MovieGetService movieGetService;
+    private final MovieSearchService movieSearchService;
 
     @GetMapping("/movie/detail")
     public MovieResponse.MovieDetailResponse getMovieDetail(@RequestParam String tmdbId) throws JSONException {
         return movieGetService.getMovieDetail(tmdbId);
     }
+
+    @GetMapping("/movie/title/list")
+    public List<MovieResponse.MovieTitleResponse> getMovieTitleList(@RequestParam String title) {
+        return movieSearchService.getMovieTitleList(title);
+    }
+
+    @GetMapping("/movie/title/result")
+    public List<MovieResponse.MovieTitleSearchResponse> getMovieTitleSearchResult(@RequestParam String title) {
+        return movieSearchService.getMovieTitleSearchResult(title);
+    }
 }