From 9cb6a5c4e9258ecfb6fdc20f14e56e240db22630 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sat, 16 Dec 2017 20:51:07 +0100 Subject: [PATCH] Change PodcastChannel id type to String. Signed-off-by: Yahor Berdnikau --- .../api/subsonic/SubsonicApiGetPodcastsTest.kt | 2 +- .../ultrasonic/api/subsonic/models/PodcastChannel.kt | 2 +- .../org/moire/ultrasonic/data/APIPodcastConverter.kt | 2 +- .../moire/ultrasonic/data/APIPodcastConverterTest.kt | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPodcastsTest.kt b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPodcastsTest.kt index b4a8bbe7..1827085d 100644 --- a/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPodcastsTest.kt +++ b/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicApiGetPodcastsTest.kt @@ -30,7 +30,7 @@ class SubsonicApiGetPodcastsTest : SubsonicAPIClientTest() { val podcastChannelsList = response.body().podcastChannels podcastChannelsList.size `should equal to` 1 with(podcastChannelsList[0]) { - id `should equal to` 2 + id `should equal to` "2" url `should equal to` "http://feeds.codenewbie.org/cnpodcast.xml" title `should equal to` "CodeNewbie" description `should equal to` "Stories and interviews from people on their coding journey." diff --git a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/PodcastChannel.kt b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/PodcastChannel.kt index 780898bb..d2a44b83 100644 --- a/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/PodcastChannel.kt +++ b/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/PodcastChannel.kt @@ -3,7 +3,7 @@ package org.moire.ultrasonic.api.subsonic.models import com.fasterxml.jackson.annotation.JsonProperty data class PodcastChannel( - val id: Long = -1, + val id: String = "", val url: String = "", val title: String = "", val description: String = "", diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt index 3b79dccd..3a5d3e4b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/APIPodcastConverter.kt @@ -7,7 +7,7 @@ import org.moire.ultrasonic.api.subsonic.models.PodcastChannel import org.moire.ultrasonic.domain.PodcastsChannel fun PodcastChannel.toDomainEntity(): PodcastsChannel = PodcastsChannel( - this.id.toString(), this.title, this.url, this.description, this.status) + this.id, this.title, this.url, this.description, this.status) fun List.toDomainEntitiesList(): List = this .map { it.toDomainEntity() } diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt index 7a0a71f6..11958239 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/data/APIPodcastConverterTest.kt @@ -8,19 +8,19 @@ import org.junit.Test import org.moire.ultrasonic.api.subsonic.models.PodcastChannel /** - * Unit test for extension functions in [APIPodcastConverter.kt] file. + * Unit test for extension functions in APIPodcastConverter.kt file. */ class APIPodcastConverterTest { @Test fun `Should convert podcast channel entity to domain entity`() { - val entity = PodcastChannel(id = 452L, url = "some-url", title = "some-title", + val entity = PodcastChannel(id = "452", url = "some-url", title = "some-title", description = "some-description", coverArt = "cA", originalImageUrl = "image-url", status = "podcast-status", errorMessage = "some-error-message") val converterEntity = entity.toDomainEntity() with(converterEntity) { - id = entity.id.toString() + id = entity.id description = entity.description status = entity.status title = entity.title @@ -31,8 +31,8 @@ class APIPodcastConverterTest { @Test fun `Should convert list of podcasts channels to domain entites list`() { val entitiesList = listOf( - PodcastChannel(id = 932L, title = "title1"), - PodcastChannel(id = 12L, title = "title2")) + PodcastChannel(id = "932", title = "title1"), + PodcastChannel(id = "12", title = "title2")) val converted = entitiesList.toDomainEntitiesList()