diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistTest.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistTest.kt index c9d248d7..f7360eec 100644 --- a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistTest.kt +++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistTest.kt @@ -29,7 +29,7 @@ class SubsonicApiGetPlaylistTest : SubsonicAPIClientTest() { assertResponseSuccessful(response) with(response.body().playlist) { - id `should equal to` 0 + id `should equal to` "0" name `should equal to` "Aug 27, 2017 11:17 AM" owner `should equal to` "admin" public `should equal to` false diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt index dc9794ee..f787c37c 100644 --- a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt +++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPlaylistsTest.kt @@ -29,7 +29,7 @@ class SubsonicApiGetPlaylistsTest : SubsonicAPIClientTest() { assertResponseSuccessful(response) with(response.body().playlists) { size `should equal to` 1 - this[0] `should equal` Playlist(id = 0, name = "Aug 27, 2017 11:17 AM", + this[0] `should equal` Playlist(id = "0", name = "Aug 27, 2017 11:17 AM", owner = "admin", public = false, songCount = 16, duration = 3573, comment = "Some comment", created = parseDate("2017-08-27T11:17:26.216Z"), diff --git a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/Playlist.kt b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/Playlist.kt index 04186edf..ce3c41be 100644 --- a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/Playlist.kt +++ b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/Playlist.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import java.util.Calendar data class Playlist( - val id: Long = -1, + val id: String = "", val name: String = "", val owner: String = "", val comment: String = "", diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt index 28c6e678..a096fca1 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPlaylistConverter.kt @@ -16,7 +16,7 @@ fun APIPlaylist.toMusicDirectoryDomainEntity(): MusicDirectory = MusicDirectory( addAll(this@toMusicDirectoryDomainEntity.entriesList.map { it.toDomainEntity() }) } -fun APIPlaylist.toDomainEntity(): Playlist = Playlist(this.id.toString(), this.name, this.owner, +fun APIPlaylist.toDomainEntity(): Playlist = Playlist(this.id, this.name, this.owner, this.comment, this.songCount.toString(), this.created?.let { playlistDateFormat.format(it.time) }, public.toString()) diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt index 4f1be508..aefdd264 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPlaylistConverterTest.kt @@ -32,7 +32,7 @@ class APIPlaylistConverterTest { @Test fun `Should convert playlist to domain entity`() { - val entity = Playlist(id = 634, name = "some-name", owner = "some-owner", + val entity = Playlist(id = "634", name = "some-name", owner = "some-owner", comment = "some-comment", public = false, songCount = 256, duration = 1150, created = Calendar.getInstance(), changed = Calendar.getInstance(), coverArt = "some-art") @@ -40,7 +40,7 @@ class APIPlaylistConverterTest { val convertedEntity = entity.toDomainEntity() with(convertedEntity) { - id `should equal to` entity.id.toString() + id `should equal to` entity.id name `should equal to` entity.name comment `should equal to` entity.comment owner `should equal to` entity.owner @@ -52,7 +52,7 @@ class APIPlaylistConverterTest { @Test fun `Should convert list of playlists to list of domain entities`() { - val entitiesList = listOf(Playlist(id = 23, name = "some-name", songCount = 10)) + val entitiesList = listOf(Playlist(id = "23", name = "some-name", songCount = 10)) val convertedList = entitiesList.toDomainEntitiesList()