Add include parameter to album and artist endpoints

stevesoltys · Dec 25, 2020 · 4394944 · 4394944
1 parent 06e1080
commit 4394944
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/main/kotlin/com/stevesoltys/applemusic/AppleMusic.kt b/src/main/kotlin/com/stevesoltys/applemusic/AppleMusic.kt
@@ -69,15 +69,21 @@ class AppleMusic(
     /**
      * Get an artist.
      */
-    fun getArtistById(id: String): ArtistResponse {
-        return call(appleMusicService.getArtistById(id))
+    fun getArtistById(
+        id: String,
+        include: Set<String>? = null
+    ): ArtistResponse {
+        return call(appleMusicService.getArtistById(id, include?.toTypedArray()))
     }
 
     /**
      * Get an album.
      */
-    fun getAlbumById(id: String): AlbumResponse {
-        return call(appleMusicService.getAlbumById(id))
+    fun getAlbumById(
+        id: String,
+        include: Set<String>? = null
+    ): AlbumResponse {
+        return call(appleMusicService.getAlbumById(id, include?.toTypedArray()))
     }
 
     /**

diff --git a/src/main/kotlin/com/stevesoltys/applemusic/net/AppleMusicService.kt b/src/main/kotlin/com/stevesoltys/applemusic/net/AppleMusicService.kt
@@ -3,7 +3,6 @@ package com.stevesoltys.applemusic.net
 import com.stevesoltys.applemusic.model.album.AlbumResponse
 import com.stevesoltys.applemusic.model.artist.ArtistResponse
 import com.stevesoltys.applemusic.model.search.SearchResponse
-import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Path
@@ -23,13 +22,19 @@ interface AppleMusicService {
     ): Call<SearchResponse>
 
     @GET("artists/{id}")
-    fun getArtistById(@Path("id") id: String): Call<ArtistResponse>
+    fun getArtistById(
+        @Path("id") id: String,
+        @Query("include") types: Array<String>? = null
+    ): Call<ArtistResponse>
 
     @GET("artists")
     fun getArtistsById(@Query("ids") ids: Array<String>): Call<ArtistResponse>
 
     @GET("albums/{id}")
-    fun getAlbumById(@Path("id") id: String): Call<AlbumResponse>
+    fun getAlbumById(
+        @Path("id") id: String,
+        @Query("include") types: Array<String>? = null
+    ): Call<AlbumResponse>
 
     @GET("albums")
     fun getAlbumsById(@Query("ids") ids: Array<String>): Call<AlbumResponse>