From 528abcdd1751bc5050b29ebe3874a92cba82604e Mon Sep 17 00:00:00 2001 From: Hm-source Date: Thu, 23 Jan 2025 11:10:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20Category=20book=20->=20BOOK=20?= =?UTF-8?q?=EB=8C=80=EB=AC=B8=EC=9E=90=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contents/service/ContentsSchedulerService.java | 4 ++-- .../contents/service/ContentsScheduleServiceTest.java | 2 +- .../customerservice/contents/util/AladinUtilsTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/customer-service/src/main/java/com/example/customerservice/contents/service/ContentsSchedulerService.java b/customer-service/src/main/java/com/example/customerservice/contents/service/ContentsSchedulerService.java index bdecff2..fbea378 100644 --- a/customer-service/src/main/java/com/example/customerservice/contents/service/ContentsSchedulerService.java +++ b/customer-service/src/main/java/com/example/customerservice/contents/service/ContentsSchedulerService.java @@ -49,7 +49,7 @@ public void fetchBooksForAllPages(int maxResults) throws JsonProcessingException String pageResponse = bookApiClient.fetchBooksByPage(page, maxResults); JsonNode items = objectMapper.readTree(pageResponse).path("item"); - List contentsList = AladinUtils.parseContentsData(items, "Book"); + List contentsList = AladinUtils.parseContentsData(items, "BOOK"); saveContentsToDatabase(contentsList); } @@ -67,7 +67,7 @@ public void saveNewBookWithLimit100() throws JsonProcessingException { String pageResponse = bookApiClient.fetchBooksByPage(page, maxResults); JsonNode items = objectMapper.readTree(pageResponse).path("item"); - List contentsList = AladinUtils.parseContentsData(items, "Book"); + List contentsList = AladinUtils.parseContentsData(items, "BOOK"); saveContentsToDatabase(contentsList); } } diff --git a/customer-service/src/test/java/com/example/customerservice/contents/service/ContentsScheduleServiceTest.java b/customer-service/src/test/java/com/example/customerservice/contents/service/ContentsScheduleServiceTest.java index b745b36..adde6cd 100644 --- a/customer-service/src/test/java/com/example/customerservice/contents/service/ContentsScheduleServiceTest.java +++ b/customer-service/src/test/java/com/example/customerservice/contents/service/ContentsScheduleServiceTest.java @@ -63,7 +63,7 @@ void saveContentsToDatabase_ShouldIgnoreDuplicateBooks() { when(contentsRepository.findAllTitlesAndWriters()).thenReturn(existingTitlesAndWriters); List contentsList = IntStream.range(1, 6) - .mapToObj(i -> Contents.of("Book", "Title" + i, "Author" + i, "Description" + i, "https://example.com/image" + i + ".jpg")) + .mapToObj(i -> Contents.of("BOOK", "Title" + i, "Author" + i, "Description" + i, "https://example.com/image" + i + ".jpg")) .collect(Collectors.toList()); // When diff --git a/customer-service/src/test/java/com/example/customerservice/contents/util/AladinUtilsTest.java b/customer-service/src/test/java/com/example/customerservice/contents/util/AladinUtilsTest.java index 67a7a4d..c81a79a 100644 --- a/customer-service/src/test/java/com/example/customerservice/contents/util/AladinUtilsTest.java +++ b/customer-service/src/test/java/com/example/customerservice/contents/util/AladinUtilsTest.java @@ -86,7 +86,7 @@ void parseContentsData_ShouldReturnContentsList() throws JsonProcessingException JsonNode items = objectMapper.readTree(mockJson).path("item"); // when - List contentsList = AladinUtils.parseContentsData(items, "Book"); + List contentsList = AladinUtils.parseContentsData(items, "BOOK"); // then SoftAssertions softly = new SoftAssertions(); @@ -268,7 +268,7 @@ void parseContentsData_shouldTruncateSummaryIfExceeds300Characters() throws Exce JsonNode items = objectMapper.readTree(jsonData).path("item"); // when - List contentsList = AladinUtils.parseContentsData(items, "Book"); + List contentsList = AladinUtils.parseContentsData(items, "BOOK"); // then assertThat(contentsList).hasSize(2); From 11d620c46f2a5f85351bb50d8fd05c549d50494b Mon Sep 17 00:00:00 2001 From: Hm-source Date: Thu, 23 Jan 2025 11:10:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20id=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actor/dto/response/AppearanceResponse.java | 2 +- .../com/example/customerservice/contents/entity/Contents.java | 4 +--- .../contents/repository/ContentsRepository.java | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/customer-service/src/main/java/com/example/customerservice/actor/dto/response/AppearanceResponse.java b/customer-service/src/main/java/com/example/customerservice/actor/dto/response/AppearanceResponse.java index 79f9be8..9f2e520 100644 --- a/customer-service/src/main/java/com/example/customerservice/actor/dto/response/AppearanceResponse.java +++ b/customer-service/src/main/java/com/example/customerservice/actor/dto/response/AppearanceResponse.java @@ -14,7 +14,7 @@ public class AppearanceResponse { public static AppearanceResponse fromContent(Contents contents) { return AppearanceResponse.builder() - .contentId(contents.getContentId()) + .contentId(contents.getId()) .category(contents.getCategory()) .title(contents.getTitle()) .writer(contents.getWriter()) diff --git a/customer-service/src/main/java/com/example/customerservice/contents/entity/Contents.java b/customer-service/src/main/java/com/example/customerservice/contents/entity/Contents.java index 4d7f50e..0eb0608 100644 --- a/customer-service/src/main/java/com/example/customerservice/contents/entity/Contents.java +++ b/customer-service/src/main/java/com/example/customerservice/contents/entity/Contents.java @@ -16,11 +16,9 @@ @Table(name="contents") @NoArgsConstructor public class Contents { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "content_id") - private Long contentId; + private Long id; @Column(nullable = false, length = 10) private String category; diff --git a/customer-service/src/main/java/com/example/customerservice/contents/repository/ContentsRepository.java b/customer-service/src/main/java/com/example/customerservice/contents/repository/ContentsRepository.java index 644bc28..6b092ef 100644 --- a/customer-service/src/main/java/com/example/customerservice/contents/repository/ContentsRepository.java +++ b/customer-service/src/main/java/com/example/customerservice/contents/repository/ContentsRepository.java @@ -21,11 +21,11 @@ public interface ContentsRepository extends JpaRepository { JOIN actor_appearances aa ON a.actor_id = aa.actor_id JOIN - contents c ON aa.contents_id = c.content_id + contents c ON aa.contents_id = c.id WHERE a.actor_name = :actorName ORDER BY - c.content_id ASC + c.id ASC LIMIT :limit OFFSET :offset """, nativeQuery = true) List findContentsByActorName( From 50a1a424e96c9cd2f435f83ddfdc10a8af9ee933 Mon Sep 17 00:00:00 2001 From: Hm-source Date: Thu, 23 Jan 2025 11:22:45 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20movies=20=EB=A1=9C=20path=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerservice/actor/controller/AppearanceController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customer-service/src/main/java/com/example/customerservice/actor/controller/AppearanceController.java b/customer-service/src/main/java/com/example/customerservice/actor/controller/AppearanceController.java index ae201f9..63aca8c 100644 --- a/customer-service/src/main/java/com/example/customerservice/actor/controller/AppearanceController.java +++ b/customer-service/src/main/java/com/example/customerservice/actor/controller/AppearanceController.java @@ -13,7 +13,7 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/movie/appearance") +@RequestMapping("/api/movies/appearance") public class AppearanceController { private final AppearanceService appearanceService;