Merge pull request #902 from SimonMarquis/resource-type-to-string

Replace `NewsResourceType` enum with simpler String type

Author: dturner

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/CompositeUserNewsResourceRepositoryTest.kt

@@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.core.data
 import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.repository.NewsResourceQuery
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.model.data.mapToUserNewsResources
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
@@ -164,7 +163,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/-fJ6poHQrjM",
         headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),
-        type = Video,
+        type = "Video 📺",
         topics = listOf(sampleTopic1),
     ),
     NewsResource(
@@ -176,7 +175,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/ZARz0pjm5YM",
         headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),
-        type = Video,
+        type = "Video 📺",
         topics = listOf(sampleTopic1, sampleTopic2),
     ),
     NewsResource(
@@ -186,7 +185,7 @@ private val sampleNewsResources = listOf(
         url = "https://youtu.be/r5JgIyS3t3s",
         headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",
         publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),
-        type = Video,
+        type = "Video 📺",
         topics = listOf(sampleTopic2),
     ),
 )

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/UserNewsResourceTest.kt

@@ -19,7 +19,6 @@ package com.google.samples.apps.nowinandroid.core.data
 import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig.FOLLOW_SYSTEM
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Article
 import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.DEFAULT
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.model.data.UserData
@@ -45,7 +44,7 @@ class UserNewsResourceTest {
             url = "Test URL",
             headerImageUrl = "Test image URL",
             publishDate = Clock.System.now(),
-            type = Article,
+            type = "Article 📚",
             topics = listOf(
                 Topic(
                     id = "T1",

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt

@@ -16,7 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.core.data.model
 
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Article
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResourceExpanded
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
@@ -56,7 +55,7 @@ class NetworkEntityKtTest {
                 url = "url",
                 headerImageUrl = "headerImageUrl",
                 publishDate = Instant.fromEpochMilliseconds(1),
-                type = Article,
+                type = "Article 📚",
             )
         val entity = networkModel.asEntity()
 
@@ -66,7 +65,7 @@ class NetworkEntityKtTest {
         assertEquals("url", entity.url)
         assertEquals("headerImageUrl", entity.headerImageUrl)
         assertEquals(Instant.fromEpochMilliseconds(1), entity.publishDate)
-        assertEquals(Article, entity.type)
+        assertEquals("Article 📚", entity.type)
 
         val expandedNetworkModel =
             NetworkNewsResourceExpanded(
@@ -76,7 +75,7 @@ class NetworkEntityKtTest {
                 url = "url",
                 headerImageUrl = "headerImageUrl",
                 publishDate = Instant.fromEpochMilliseconds(1),
-                type = Article,
+                type = "Article 📚",
             )
 
         val entityFromExpanded = expandedNetworkModel.asEntity()
@@ -87,6 +86,6 @@ class NetworkEntityKtTest {
         assertEquals("url", entityFromExpanded.url)
         assertEquals("headerImageUrl", entityFromExpanded.headerImageUrl)
         assertEquals(Instant.fromEpochMilliseconds(1), entityFromExpanded.publishDate)
-        assertEquals(Article, entityFromExpanded.type)
+        assertEquals("Article 📚", entityFromExpanded.type)
     }
 }

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt

@@ -17,7 +17,6 @@
 package com.google.samples.apps.nowinandroid.core.database.model
 
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import kotlinx.datetime.Instant
 import org.junit.Test
@@ -33,7 +32,7 @@ class PopulatedNewsResourceKtTest {
                 content = "Hilt",
                 url = "url",
                 headerImageUrl = "headerImageUrl",
-                type = Video,
+                type = "Video 📺",
                 publishDate = Instant.fromEpochMilliseconds(1),
             ),
             topics = listOf(
@@ -56,7 +55,7 @@ class PopulatedNewsResourceKtTest {
                 content = "Hilt",
                 url = "url",
                 headerImageUrl = "headerImageUrl",
-                type = Video,
+                type = "Video 📺",
                 publishDate = Instant.fromEpochMilliseconds(1),
                 topics = listOf(
                     Topic(

core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt

@@ -24,7 +24,6 @@ import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEnti
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceTopicCrossRef
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import kotlinx.datetime.Instant
@@ -305,5 +304,5 @@ private fun testNewsResource(
     url = "",
     headerImageUrl = "",
     publishDate = Instant.fromEpochMilliseconds(millisSinceEpoch),
-    type = NewsResourceType.DAC,
+    type = "Article 📚",
 )

core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt

@@ -32,7 +32,6 @@ import com.google.samples.apps.nowinandroid.core.database.model.RecentSearchQuer
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.TopicFtsEntity
 import com.google.samples.apps.nowinandroid.core.database.util.InstantConverter
-import com.google.samples.apps.nowinandroid.core.database.util.NewsResourceTypeConverter
 
 @Database(
     entities = [
@@ -63,7 +62,6 @@ import com.google.samples.apps.nowinandroid.core.database.util.NewsResourceTypeC
 )
 @TypeConverters(
     InstantConverter::class,
-    NewsResourceTypeConverter::class,
 )
 abstract class NiaDatabase : RoomDatabase() {
     abstract fun topicDao(): TopicDao

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.kt

@@ -20,7 +20,6 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
 import kotlinx.datetime.Instant
 
 /**
@@ -39,7 +38,7 @@ data class NewsResourceEntity(
     val headerImageUrl: String?,
     @ColumnInfo(name = "publish_date")
     val publishDate: Instant,
-    val type: NewsResourceType,
+    val type: String,
 )
 
 fun NewsResourceEntity.asExternalModel() = NewsResource(

core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.kt

@@ -17,8 +17,6 @@
 package com.google.samples.apps.nowinandroid.core.database.util
 
 import androidx.room.TypeConverter
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType
-import com.google.samples.apps.nowinandroid.core.model.data.asNewsResourceType
 import kotlinx.datetime.Instant
 
 class InstantConverter {
@@ -30,13 +28,3 @@ class InstantConverter {
     fun instantToLong(instant: Instant?): Long? =
         instant?.toEpochMilliseconds()
 }
-
-class NewsResourceTypeConverter {
-    @TypeConverter
-    fun newsResourceTypeToString(value: NewsResourceType?): String? =
-        value?.let(NewsResourceType::serializedName)
-
-    @TypeConverter
-    fun stringToNewsResourceType(serializedName: String?): NewsResourceType =
-        serializedName.asNewsResourceType()
-}

…android/core/database/util/Converters.kt …d/core/database/util/InstantConverter.ktcore/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.kt renamed to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/InstantConverter.kt core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.kt renamed to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/InstantConverter.kt

@@ -28,6 +28,6 @@ data class NewsResource(
     val url: String,
     val headerImageUrl: String?,
     val publishDate: Instant,
-    val type: NewsResourceType,
+    val type: String,
     val topics: List<Topic>,
 )