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

Add Market parameter to getTrack and GetPlaylistTrack #2

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add Market parameter to getTrack and GetPlaylistTrack #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bbab462
Add market to spotify api
imanzano Sep 11, 2017
a32e3db
Add market to API service
imanzano Sep 11, 2017
1c34e7b
Add market to getPlaylist
imanzano Sep 12, 2017
c6828ec
Handle available_market misses when call set market
imanzano Sep 12, 2017
72134bf
Test without available_markets
imanzano Sep 12, 2017
eae48d5
Fix available_market in track creation
imanzano Sep 12, 2017
7854373
Fix parameter market in TrackRequest
imanzano Sep 14, 2017
4888c17
Fix uses of market in Api
imanzano Sep 14, 2017
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
7 changes: 7 additions & 0 deletions src/main/java/com/wrapper/spotify/Api.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,13 @@ public TrackRequest.Builder getTrack(String id) {
return builder;
}

public TrackRequest.Builder getTrack(String id, String market) {
TrackRequest.Builder builder = TrackRequest.builder();
setDefaults(builder);
builder.id(id).market(market);
return builder;
}

public TracksRequest.Builder getTracks(String... ids) {
return getTracks(Arrays.asList(ids));
}
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/com/wrapper/spotify/JsonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,11 @@ public static SimpleAlbum createSimpleAlbum(JSONObject simpleAlbumJson) {
simpleAlbum.setName(simpleAlbumJson.getString("name"));
simpleAlbum.setType(createSpotifyEntityType(simpleAlbumJson.getString("type")));
simpleAlbum.setUri(simpleAlbumJson.getString("uri"));
simpleAlbum.setAvailableMarkets(
createAvailableMarkets(simpleAlbumJson.getJSONArray("available_markets")));

if (existsAndNotNull("available_markets", simpleAlbumJson)) {
simpleAlbum.setAvailableMarkets(
createAvailableMarkets(simpleAlbumJson.getJSONArray("available_markets")));
}
return simpleAlbum;
}

Expand Down Expand Up @@ -287,7 +289,10 @@ private static Track createTrack(JSONObject trackJson) {

track.setAlbum(createSimpleAlbum(trackJson.getJSONObject("album")));
track.setArtists(createSimpleArtists(trackJson.getJSONArray("artists")));
track.setAvailableMarkets(createAvailableMarkets(trackJson.getJSONArray("available_markets")));
if (existsAndNotNull("available_markets", trackJson)) {
track.setAvailableMarkets(createAvailableMarkets(trackJson.getJSONArray("available_markets")));
}

track.setDiscNumber(trackJson.getInt("disc_number"));
track.setDuration(trackJson.getInt("duration_ms"));
track.setExplicit(trackJson.getBoolean("explicit"));
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/wrapper/spotify/methods/PlaylistTracksRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ public Builder limit(int limit) {
return parameter("limit", String.valueOf(limit));
}

public Builder market(String market) {
assert (market != null);
return parameter("market", market);
}

public Builder offset(int offset) {
assert (offset >= 0);
return parameter("offset", String.valueOf(offset));
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/wrapper/spotify/methods/TrackRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ public Builder id(String id) {
return path(String.format("/v1/tracks/%s", id));
}

/** add Market */
public Builder market(String market) {
assert (market != null);
return parameter("market", market);
}

public TrackRequest build() {
return new TrackRequest(this);
}
Expand Down
4 changes: 1 addition & 3 deletions src/test/fixtures/playlist-tracks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
"track": {
"album": {
"album_type": "single",
"available_markets": [ "AR", "BO", "BR", "CA", "CL", "CO", "CR", "DO", "EC",
"GB", "GT", "HN", "NI", "PA", "PE", "PH", "PY", "SV",
"UY" ],

"external_urls": {
"spotify": "https://open.spotify.com/album/4nOrpg3k8viJ5AtL0vOsg4"
},
Expand Down