feat: add year at datafield

PKNU-Assemble · Aug 13, 2024 · d843d88 · d843d88
1 parent 5d1b45b
commit d843d88
Show file tree

Hide file tree

Showing 27 changed files with 66 additions and 8 deletions.
diff --git a/server/.gradle/8.8/executionHistory/executionHistory.bin b/server/.gradle/8.8/executionHistory/executionHistory.bin
diff --git a/server/.gradle/8.8/executionHistory/executionHistory.lock b/server/.gradle/8.8/executionHistory/executionHistory.lock
diff --git a/server/.gradle/8.8/fileHashes/fileHashes.bin b/server/.gradle/8.8/fileHashes/fileHashes.bin
diff --git a/server/.gradle/8.8/fileHashes/fileHashes.lock b/server/.gradle/8.8/fileHashes/fileHashes.lock
diff --git a/server/.gradle/8.8/fileHashes/resourceHashesCache.bin b/server/.gradle/8.8/fileHashes/resourceHashesCache.bin
diff --git a/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/server/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/...er/build/classes/java/main/com/example/hackathon/content/application/ContentService.class b/...er/build/classes/java/main/com/example/hackathon/content/application/ContentService.class
diff --git a/.../classes/java/main/com/example/hackathon/content/controller/ContentDetailController.class b/.../classes/java/main/com/example/hackathon/content/controller/ContentDetailController.class
diff --git a/...om/example/hackathon/content/dto/ContentDetailResponse$ContentDetailResponseBuilder.class b/...om/example/hackathon/content/dto/ContentDetailResponse$ContentDetailResponseBuilder.class
diff --git a/server/build/classes/java/main/com/example/hackathon/content/dto/ContentDetailResponse.class b/server/build/classes/java/main/com/example/hackathon/content/dto/ContentDetailResponse.class
diff --git a/server/build/classes/java/main/com/example/hackathon/dataset/domain/DataField.class b/server/build/classes/java/main/com/example/hackathon/dataset/domain/DataField.class
diff --git a/server/build/classes/java/main/com/example/hackathon/tmdb/application/TmdbService.class b/server/build/classes/java/main/com/example/hackathon/tmdb/application/TmdbService.class
diff --git a/server/build/resources/main/application.properties b/server/build/resources/main/application.properties
@@ -57,9 +57,6 @@
 #
 #tmdb.api.key=${TMDB_API_KEY}
 
-spring.servlet.multipart.max-file-size=50MB
-spring.servlet.multipart.max-request-size=50MB
-
 spring.security.oauth2.client.registration.google.client-id=240772131497-d17ho20q4gb42n5s42ncohdh5k9379rc.apps.googleusercontent.com
 spring.security.oauth2.client.registration.google.client-secret=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
 spring.security.oauth2.client.registration.google.redirect-uri=http://glogglogglog-env.eba-fuksumx7.ap-northeast-2.elasticbeanstalk.com/oauth2/callback/google

diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/ContentController.class.uniqueId2 b/server/build/tmp/compileJava/compileTransaction/stash-dir/ContentController.class.uniqueId2
diff --git a/...uild/tmp/compileJava/compileTransaction/stash-dir/ContentDetailController.class.uniqueId3 b/...uild/tmp/compileJava/compileTransaction/stash-dir/ContentDetailController.class.uniqueId3
diff --git a/...eTransaction/stash-dir/ContentDetailResponse$ContentDetailResponseBuilder.class.uniqueId4 b/...eTransaction/stash-dir/ContentDetailResponse$ContentDetailResponseBuilder.class.uniqueId4
diff --git a/.../build/tmp/compileJava/compileTransaction/stash-dir/ContentDetailResponse.class.uniqueId1 b/.../build/tmp/compileJava/compileTransaction/stash-dir/ContentDetailResponse.class.uniqueId1
diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/ContentService.class.uniqueId5 b/server/build/tmp/compileJava/compileTransaction/stash-dir/ContentService.class.uniqueId5
diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/MypageController.class.uniqueId0 b/server/build/tmp/compileJava/compileTransaction/stash-dir/MypageController.class.uniqueId0
diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/TmdbController.class.uniqueId0 b/server/build/tmp/compileJava/compileTransaction/stash-dir/TmdbController.class.uniqueId0
diff --git a/server/build/tmp/compileJava/compileTransaction/stash-dir/UserController.class.uniqueId1 b/server/build/tmp/compileJava/compileTransaction/stash-dir/UserController.class.uniqueId1
diff --git a/server/build/tmp/compileJava/previous-compilation-data.bin b/server/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/server/src/main/java/com/example/hackathon/content/application/ContentService.java b/server/src/main/java/com/example/hackathon/content/application/ContentService.java
@@ -206,6 +206,7 @@ public ContentDetailResponse getContentDetailResponse(Long userId, Long contentI
                 .contentId(contentId)
                 .contentImage(dataField.getImage())
                 .contentType(dataField.getMediaType())
+                .year(dataField.getYear())
                 .addressTag(addressTags)
                 .contentTitle(dataField.getTitleName())
                 .isScraped(isScraped(user,dataField))

diff --git a/server/src/main/java/com/example/hackathon/content/dto/ContentDetailResponse.java b/server/src/main/java/com/example/hackathon/content/dto/ContentDetailResponse.java
@@ -10,6 +10,7 @@ public record ContentDetailResponse(
         String contentTitle,
         String contentImage,
         String contentType,
+        String year,
         Boolean isScraped,
         List<String> addressTag,
         List<PlaceDto> placeDtos

diff --git a/server/src/main/java/com/example/hackathon/dataset/domain/DataField.java b/server/src/main/java/com/example/hackathon/dataset/domain/DataField.java
@@ -19,4 +19,6 @@ public class DataField {
     private String image;
     @Column(name = "genre")
     private String genre;
+    @Column(name = "year")
+    private String year;
 }
diff --git a/server/src/main/java/com/example/hackathon/tmdb/application/TmdbService.java b/server/src/main/java/com/example/hackathon/tmdb/application/TmdbService.java
@@ -27,11 +27,11 @@ public void saveImage(){
         List<DataField> dataFields = dataFieldRepository.findAll();
         for(DataField dataField : dataFields){
             if(dataField.getMediaType().equals("movie")){
-                dataField.setGenre(getMovieGenres(dataField.getTitleName()));
+                dataField.setYear(getMovieReleaseYear(dataField.getTitleName()));
                 dataFieldRepository.save(dataField);
             }
             else{
-                dataField.setGenre(getTvShowGenres(dataField.getTitleName()));
+                dataField.setYear(getTvShowStartYear(dataField.getTitleName()));
                 dataFieldRepository.save(dataField);
             }
         }
@@ -156,4 +156,62 @@ public String getMovieGenres(String query) {
         return "No genres found";
     }
 
+    // TV 드라마 방영 시작 년도 가져오기
+    public String getTvShowStartYear(String query) {
+        String searchUrl = UriComponentsBuilder.fromHttpUrl("https://api.themoviedb.org/3/search/tv")
+                .queryParam("api_key", apiKey)
+                .queryParam("query", query)
+                .queryParam("language", "ko-KR")
+                .toUriString();
+
+        Map<String, Object> searchResponse = restTemplate.getForObject(searchUrl, Map.class);
+
+        if (searchResponse != null && !((List<?>) searchResponse.get("results")).isEmpty()) {
+            Map<String, Object> firstResult = ((List<Map<String, Object>>) searchResponse.get("results")).get(0);
+            String id = String.valueOf(firstResult.get("id"));
+
+            String detailsUrl = UriComponentsBuilder.fromHttpUrl("https://api.themoviedb.org/3/tv/" + id)
+                    .queryParam("api_key", apiKey)
+                    .queryParam("language", "ko-KR")
+                    .toUriString();
+
+            Map<String, Object> detailsResponse = restTemplate.getForObject(detailsUrl, Map.class);
+
+            if (detailsResponse != null && detailsResponse.get("first_air_date") != null) {
+                String firstAirDate = String.valueOf(detailsResponse.get("first_air_date"));
+                return firstAirDate.split("-")[0]; // 첫 번째 요소로부터 년도만 추출
+            }
+        }
+        return "";
+    }
+
+    // 영화 상영 년도 가져오기
+    public String getMovieReleaseYear(String query) {
+        String searchUrl = UriComponentsBuilder.fromHttpUrl("https://api.themoviedb.org/3/search/movie")
+                .queryParam("api_key", apiKey)
+                .queryParam("query", query)
+                .queryParam("language", "ko-KR")
+                .toUriString();
+
+        Map<String, Object> searchResponse = restTemplate.getForObject(searchUrl, Map.class);
+
+        if (searchResponse != null && !((List<?>) searchResponse.get("results")).isEmpty()) {
+            Map<String, Object> firstResult = ((List<Map<String, Object>>) searchResponse.get("results")).get(0);
+            String id = String.valueOf(firstResult.get("id"));
+
+            String detailsUrl = UriComponentsBuilder.fromHttpUrl("https://api.themoviedb.org/3/movie/" + id)
+                    .queryParam("api_key", apiKey)
+                    .queryParam("language", "ko-KR")
+                    .toUriString();
+
+            Map<String, Object> detailsResponse = restTemplate.getForObject(detailsUrl, Map.class);
+
+            if (detailsResponse != null && detailsResponse.get("release_date") != null) {
+                String releaseDate = String.valueOf(detailsResponse.get("release_date"));
+                return releaseDate.split("-")[0]; // 첫 번째 요소로부터 년도만 추출
+            }
+        }
+        return "";
+    }
+
 }
diff --git a/server/src/main/java/com/example/hackathon/tmdb/controller/TmdbController.java b/server/src/main/java/com/example/hackathon/tmdb/controller/TmdbController.java
@@ -16,8 +16,7 @@ public class TmdbController {
     private final TmdbService tmdbService;
 
 //    @GetMapping("/movie-image")
-//    public String getMovieImage() {
-//        tmdbService.saveImage();
-//        return "success save image";
+//    public String getMovieImage(@RequestParam String title) {
+//        return tmdbService.getTvShowStartYear(title);
 //    }
 }