removing innerObjectNames for SpotifyCategory, SimpleAlbum, and SimplePlaylist

Fixes #229

Signed-off-by: Adam Ratzman <[email protected]>

Author: adamint

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

@@ -116,9 +116,9 @@ public abstract class AbstractPagingObject<T : Any, Z : AbstractPagingObject<T,
         return (if (type == FORWARDS) next else previous)?.let { endpoint!!.get(it) }?.let { json ->
             when (itemClazz) {
                 SimpleTrack::class -> json.toPagingObject(SimpleTrack.serializer(), null, endpointFinal, endpointFinal.api.json, true)
-                SpotifyCategory::class -> json.toPagingObject(SpotifyCategory.serializer(), "categories", endpointFinal, endpointFinal.api.json, true)
-                SimpleAlbum::class -> json.toPagingObject(SimpleAlbum.serializer(), "albums", endpointFinal, endpointFinal.api.json, true)
-                SimplePlaylist::class -> json.toPagingObject(SimplePlaylist.serializer(), "playlists", endpointFinal, endpointFinal.api.json, true)
+                SpotifyCategory::class -> json.toPagingObject(SpotifyCategory.serializer(), null, endpointFinal, endpointFinal.api.json, true)
+                SimpleAlbum::class -> json.toPagingObject(SimpleAlbum.serializer(), null, endpointFinal, endpointFinal.api.json, true)
+                SimplePlaylist::class -> json.toPagingObject(SimplePlaylist.serializer(), null, endpointFinal, endpointFinal.api.json, true)
                 SavedTrack::class -> json.toPagingObject(SavedTrack.serializer(), null, endpointFinal, endpointFinal.api.json, true)
                 SavedAlbum::class -> json.toPagingObject(SavedAlbum.serializer(), null, endpointFinal, endpointFinal.api.json, true)
                 Artist::class -> json.toPagingObject(Artist.serializer(), null, endpointFinal, endpointFinal.api.json, true)
@@ -154,7 +154,6 @@ public abstract class AbstractPagingObject<T : Any, Z : AbstractPagingObject<T,
 
         @Suppress("UNCHECKED_CAST")
         pagingObjects.add(this as Z)
-
         var nxt = next?.let { getNext() }
         while (nxt != null) {
             pagingObjects.add(nxt)

src/commonTest/kotlin/com.adamratzman/spotify/priv/ClientPlaylistApiTest.kt

@@ -9,12 +9,13 @@ import com.adamratzman.spotify.models.Playlist
 import com.adamratzman.spotify.models.SimplePlaylist
 import com.adamratzman.spotify.runBlockingTest
 import com.adamratzman.spotify.spotifyApi
-import kotlin.test.AfterTest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 
 class ClientPlaylistApiTest {
     lateinit var api: SpotifyClientApi
@@ -30,10 +31,20 @@ class ClientPlaylistApiTest {
         return ::api.isInitialized
     }
 
-    private suspend fun tearDown() {
+    private suspend fun CoroutineScope.tearDown() {
         if (::createdPlaylist.isInitialized) {
-            api.playlists.deleteClientPlaylist(createdPlaylist.id)
-            assertTrue(api.playlists.getClientPlaylist(createdPlaylist.id) == null)
+            coroutineScope {
+                api.playlists.getClientPlaylists().getAllItemsNotNull()
+                        .filter { it.name == "this is a test playlist" }
+                        .map {
+                            async {
+                                if (api.following.isFollowingPlaylist(it.id)) {
+                                    api.playlists.deleteClientPlaylist(it.id)
+                                }
+                            }
+                        }
+                        .awaitAll()
+            }
         }
     }