Merge pull request #247 from adamint/dev

Make CursorBasedPagingObject cursor nullable

Author: adamint

src/commonMain/kotlin/com.adamratzman.spotify/models/PagingObjects.kt

@@ -244,15 +244,15 @@ public abstract class AbstractPagingObject<T : Any, Z : AbstractPagingObject<T,
  * @param limit The maximum number of items in the response (as set in the query or by default).
  * @param next URL to the next page of items. ( null if none)
  * @param total The maximum number of items available to return.
- * @param cursor The cursors used to find the next set of items..
+ * @param cursor The cursors used to find the next set of items. If [items] is empty, cursor may be null.
  */
 @Serializable
 public data class CursorBasedPagingObject<T : Any>(
     override val href: String,
     override val items: List<T>,
     override val limit: Int,
     override val next: String? = null,
-    @SerialName("cursors") public val cursor: Cursor,
+    @SerialName("cursors") public val cursor: Cursor? = null,
     override val total: Int = 0,
     override val offset: Int = 0,
     override val previous: String? = null

src/commonTest/kotlin/com.adamratzman/spotify/pub/BrowseApiTest.kt

@@ -114,15 +114,7 @@ class BrowseApiTest {
             assertFailsWithSuspend<SpotifyException.BadRequestException> {
                 api.browse.getTrackRecommendations(seedArtists = listOf("abc"))
             }
-            assertTrue(api.browse.getTrackRecommendations(seedArtists = listOf("2C2sVVXanbOpymYBMpsi89")).tracks.isNotEmpty())
-            assertTrue(
-                api.browse.getTrackRecommendations(
-                    seedArtists = listOf(
-                        "2C2sVVXanbOpymYBMpsi89",
-                        "7lMgpN1tEBQKpRoUMKB8iw"
-                    )
-                ).tracks.isNotEmpty()
-            )
+            assertTrue(api.browse.getTrackRecommendations(seedArtists = listOf("1kNQXvepPjaPgUfeDAF2h6")).tracks.isNotEmpty())
 
             assertFailsWithSuspend<SpotifyException.BadRequestException> {
                 api.browse.getTrackRecommendations(seedTracks = listOf("abc"))

src/commonTest/kotlin/com.adamratzman/spotify/utilities/JsonTests.kt

@@ -112,7 +112,7 @@ class JsonTests {
             assertEquals(emptyList(), pagingObject.items)
             assertEquals(50, pagingObject.limit)
             assertEquals("nextHref", pagingObject.next)
-            assertEquals("afterHref", pagingObject.cursor.after)
+            assertEquals("afterHref", pagingObject.cursor?.after)
             assertEquals(5, pagingObject.total)
         }
     }