diff --git a/src/main/java/org/sopt/confeti/api/artist/facade/ArtistFacade.java b/src/main/java/org/sopt/confeti/api/artist/facade/ArtistFacade.java index 3cc2c60..fb2dfc5 100644 --- a/src/main/java/org/sopt/confeti/api/artist/facade/ArtistFacade.java +++ b/src/main/java/org/sopt/confeti/api/artist/facade/ArtistFacade.java @@ -18,17 +18,14 @@ public class ArtistFacade { @Transactional(readOnly = true) public SearchArtistDTO searchByKeyword(final Long userId, final String keyword) { - Optional confetiArtist = spotifyAPIHandler.findArtistsByKeyword(keyword); + ConfetiArtist confetiArtist = spotifyAPIHandler.findArtistsByKeyword(keyword); boolean isFavorite = false; - if (confetiArtist.isPresent() && userId != null) { - isFavorite = artistFavoriteService.isFavorite(userId, confetiArtist.get().getArtistId()); + if (userId != null) { + isFavorite = artistFavoriteService.isFavorite(userId, confetiArtist.getArtistId()); } - return SearchArtistDTO.from( - confetiArtist.orElse(ConfetiArtist.empty()), - isFavorite - ); + return SearchArtistDTO.from(confetiArtist, isFavorite); } } diff --git a/src/main/java/org/sopt/confeti/global/util/artistsearcher/SpotifyAPIHandler.java b/src/main/java/org/sopt/confeti/global/util/artistsearcher/SpotifyAPIHandler.java index 243ab87..30ae651 100644 --- a/src/main/java/org/sopt/confeti/global/util/artistsearcher/SpotifyAPIHandler.java +++ b/src/main/java/org/sopt/confeti/global/util/artistsearcher/SpotifyAPIHandler.java @@ -54,18 +54,13 @@ public void init() { refreshCount = REFRESH_INIT_VALUE; } - public Optional findArtistsByKeyword(final String keyword) { - Optional searchedArtist = searchArtistByKeyword(keyword); - - if (searchedArtist.isEmpty()) { - return Optional.empty(); - } - - Artist artist = searchedArtist.get(); + public ConfetiArtist findArtistsByKeyword(final String keyword) { + Artist artist = searchArtistByKeyword(keyword) + .orElseThrow( + () -> new ConfetiException(ErrorMessage.NOT_FOUND) + ); - return Optional.of( - ConfetiArtist.toConfetiArtist(artist, findLatestReleaseAt(artist.getId())) - ); + return ConfetiArtist.toConfetiArtist(artist, findLatestReleaseAt(artist.getId())); } public Optional findArtistByArtistId(final String artistId) {