From a6f01bba308392a45808eb036aaf93e079b5f07a Mon Sep 17 00:00:00 2001 From: Rodrigo Verdiani Date: Tue, 17 Mar 2026 20:00:16 -0300 Subject: [PATCH] refactor: rename GenreController to CatalogController and update package structure --- .../controller/CatalogController.java} | 18 +++++++++--------- .../{ => catalog}/model/dto/GenreDTO.java | 4 ++-- .../{ => catalog}/model/entity/Genre.java | 3 ++- .../model/repository/GenreRepository.java | 4 ++-- .../{ => catalog}/service/GenreService.java | 6 +++--- .../com/magamochi/model/entity/MangaGenre.java | 1 + .../model/repository/MangaGenreRepository.java | 2 +- .../magamochi/service/MangaImportService.java | 2 ++ 8 files changed, 22 insertions(+), 18 deletions(-) rename src/main/java/com/magamochi/{controller/GenreController.java => catalog/controller/CatalogController.java} (56%) rename src/main/java/com/magamochi/{ => catalog}/model/dto/GenreDTO.java (75%) rename src/main/java/com/magamochi/{ => catalog}/model/entity/Genre.java (81%) rename src/main/java/com/magamochi/{ => catalog}/model/repository/GenreRepository.java (72%) rename src/main/java/com/magamochi/{ => catalog}/service/GenreService.java (70%) diff --git a/src/main/java/com/magamochi/controller/GenreController.java b/src/main/java/com/magamochi/catalog/controller/CatalogController.java similarity index 56% rename from src/main/java/com/magamochi/controller/GenreController.java rename to src/main/java/com/magamochi/catalog/controller/CatalogController.java index c922a4b..a2bd6b9 100644 --- a/src/main/java/com/magamochi/controller/GenreController.java +++ b/src/main/java/com/magamochi/catalog/controller/CatalogController.java @@ -1,25 +1,25 @@ -package com.magamochi.controller; +package com.magamochi.catalog.controller; +import com.magamochi.catalog.model.dto.GenreDTO; +import com.magamochi.catalog.service.GenreService; import com.magamochi.common.dto.DefaultResponseDTO; -import com.magamochi.model.dto.GenreDTO; -import com.magamochi.service.GenreService; import io.swagger.v3.oas.annotations.Operation; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/genres") +@RequestMapping("/catalog") @RequiredArgsConstructor -public class GenreController { +public class CatalogController { private final GenreService genreService; @Operation( - summary = "Get a list of genres", - description = "Retrieve a list of genres.", - tags = {"Genre"}, + summary = "Get a list of manga genres", + description = "Retrieve a list of manga genres.", + tags = {"Catalog"}, operationId = "getGenres") - @GetMapping + @GetMapping("/genres") public DefaultResponseDTO> getGenres() { return DefaultResponseDTO.ok(genreService.getGenres()); } diff --git a/src/main/java/com/magamochi/model/dto/GenreDTO.java b/src/main/java/com/magamochi/catalog/model/dto/GenreDTO.java similarity index 75% rename from src/main/java/com/magamochi/model/dto/GenreDTO.java rename to src/main/java/com/magamochi/catalog/model/dto/GenreDTO.java index 1283415..94151c6 100644 --- a/src/main/java/com/magamochi/model/dto/GenreDTO.java +++ b/src/main/java/com/magamochi/catalog/model/dto/GenreDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.model.dto; +package com.magamochi.catalog.model.dto; -import com.magamochi.model.entity.Genre; +import com.magamochi.catalog.model.entity.Genre; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/model/entity/Genre.java b/src/main/java/com/magamochi/catalog/model/entity/Genre.java similarity index 81% rename from src/main/java/com/magamochi/model/entity/Genre.java rename to src/main/java/com/magamochi/catalog/model/entity/Genre.java index a78e748..4c5f557 100644 --- a/src/main/java/com/magamochi/model/entity/Genre.java +++ b/src/main/java/com/magamochi/catalog/model/entity/Genre.java @@ -1,5 +1,6 @@ -package com.magamochi.model.entity; +package com.magamochi.catalog.model.entity; +import com.magamochi.model.entity.MangaGenre; import jakarta.persistence.*; import java.util.List; import lombok.*; diff --git a/src/main/java/com/magamochi/model/repository/GenreRepository.java b/src/main/java/com/magamochi/catalog/model/repository/GenreRepository.java similarity index 72% rename from src/main/java/com/magamochi/model/repository/GenreRepository.java rename to src/main/java/com/magamochi/catalog/model/repository/GenreRepository.java index 3acbe30..165c9fb 100644 --- a/src/main/java/com/magamochi/model/repository/GenreRepository.java +++ b/src/main/java/com/magamochi/catalog/model/repository/GenreRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.model.repository; +package com.magamochi.catalog.model.repository; -import com.magamochi.model.entity.Genre; +import com.magamochi.catalog.model.entity.Genre; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/service/GenreService.java b/src/main/java/com/magamochi/catalog/service/GenreService.java similarity index 70% rename from src/main/java/com/magamochi/service/GenreService.java rename to src/main/java/com/magamochi/catalog/service/GenreService.java index e18f4ef..d2ba420 100644 --- a/src/main/java/com/magamochi/service/GenreService.java +++ b/src/main/java/com/magamochi/catalog/service/GenreService.java @@ -1,7 +1,7 @@ -package com.magamochi.service; +package com.magamochi.catalog.service; -import com.magamochi.model.dto.GenreDTO; -import com.magamochi.model.repository.GenreRepository; +import com.magamochi.catalog.model.dto.GenreDTO; +import com.magamochi.catalog.model.repository.GenreRepository; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/model/entity/MangaGenre.java b/src/main/java/com/magamochi/model/entity/MangaGenre.java index 7c0df2e..15a2a5d 100644 --- a/src/main/java/com/magamochi/model/entity/MangaGenre.java +++ b/src/main/java/com/magamochi/model/entity/MangaGenre.java @@ -1,5 +1,6 @@ package com.magamochi.model.entity; +import com.magamochi.catalog.model.entity.Genre; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/magamochi/model/repository/MangaGenreRepository.java b/src/main/java/com/magamochi/model/repository/MangaGenreRepository.java index c0843b9..7b68a95 100644 --- a/src/main/java/com/magamochi/model/repository/MangaGenreRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaGenreRepository.java @@ -1,6 +1,6 @@ package com.magamochi.model.repository; -import com.magamochi.model.entity.Genre; +import com.magamochi.catalog.model.entity.Genre; import com.magamochi.model.entity.Manga; import com.magamochi.model.entity.MangaGenre; import java.util.Optional; diff --git a/src/main/java/com/magamochi/service/MangaImportService.java b/src/main/java/com/magamochi/service/MangaImportService.java index d154672..737f5fb 100644 --- a/src/main/java/com/magamochi/service/MangaImportService.java +++ b/src/main/java/com/magamochi/service/MangaImportService.java @@ -4,6 +4,8 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import com.google.common.util.concurrent.RateLimiter; +import com.magamochi.catalog.model.entity.Genre; +import com.magamochi.catalog.model.repository.GenreRepository; import com.magamochi.client.AniListClient; import com.magamochi.client.JikanClient; import com.magamochi.common.exception.NotFoundException;