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

fix [#220] 스포티파이 앨범 최신일자 조회 수정 #221

Merged
merged 1 commit into from
Jan 25, 2025
Merged

fix [#220] 스포티파이 앨범 최신일자 조회 수정 #221

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
2 changes: 0 additions & 2 deletions src/main/java/org/sopt/confeti/global/util/artistsearcher/ArtistResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import org.sopt.confeti.annotation.Resolver;
Expand Down
34 changes: 18 additions & 16 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 @@ -34,7 +34,7 @@ public class SpotifyAPIHandler {

private static final int ARTIST_LIMIT = 1;
private static final int ARTIST_OFFSET = 0;
private static final int ALBUM_LIMIT = 1;
private static final int ALBUM_LIMIT = 50;
private static final int ALBUM_OFFSET = 0;
private static final int REFRESH_TRIAL = 5;
private static final int REFRESH_INIT_VALUE = 0;
Expand Down Expand Up @@ -179,31 +179,33 @@ private Optional<Artist> searchArtistByKeyword(final String keyword) {
}

private LocalDate findLatestReleaseAt(final String artistId) {
Optional<Paging<AlbumSimplified>> searchedAlbums = searchAlbumByArtistId(artistId);
Optional<AlbumSimplified> searchedAlbum = searchAlbumByArtistId(artistId);

if (searchedAlbums.isEmpty()) {
if (searchedAlbum.isEmpty()) {
return null;
}

Paging<AlbumSimplified> albums = searchedAlbums.get();
AlbumSimplified album = searchedAlbum.get();

return Arrays.stream(albums.getItems())
.map(albumItem -> DateConvertor.convertToSpotifyLocalDate(albumItem.getReleaseDate()))
.findFirst()
.orElseGet(null);
return DateConvertor.convertToSpotifyLocalDate(album.getReleaseDate());
}

private Optional<Paging<AlbumSimplified>> searchAlbumByArtistId(final String artistId) {
private Optional<AlbumSimplified> searchAlbumByArtistId(final String artistId) {
try {
generateAccessTokenIfExpired();

return executeWithTokenRefresh(() ->
Optional.of(spotifyApi.getArtistsAlbums(artistId)
.market(CountryCode.KR)
.limit(ALBUM_LIMIT)
.offset(ALBUM_OFFSET)
.build()
.execute()));
return executeWithTokenRefresh(() -> {
Paging<AlbumSimplified> albums = spotifyApi.getArtistsAlbums(artistId)
.market(CountryCode.KR)
.limit(ALBUM_LIMIT)
.offset(ALBUM_OFFSET)
.build()
.execute();

return Arrays.stream(albums.getItems())
.max(Comparator.comparing(AlbumSimplified::getReleaseDate));
}
);
} catch (NotFoundException | BadRequestException e) {
return Optional.empty();
} catch (Exception e) {
Expand Down