Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor [#159] 스포티파이에 존재하지 않는 아티스트인 경우 404 응답 처리 #160

Merged
merged 1 commit into from
Jan 23, 2025
+10 −18
Merged

refactor [#159] 스포티파이에 존재하지 않는 아티스트인 경우 404 응답 처리 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/main/java/org/sopt/confeti/api/artist/facade/ArtistFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ public class ArtistFacade {

@Transactional(readOnly = true)
public SearchArtistDTO searchByKeyword(final Long userId, final String keyword) {
Optional<ConfetiArtist> 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);
}
}
17 changes: 6 additions & 11 deletions src/main/java/org/sopt/confeti/global/util/artistsearcher/SpotifyAPIHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,13 @@ public void init() {
refreshCount = REFRESH_INIT_VALUE;
}

public Optional<ConfetiArtist> findArtistsByKeyword(final String keyword) {
Optional<Artist> 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<ConfetiArtist> findArtistByArtistId(final String artistId) {
Expand Down