pr comments

Author: digitalbuddha

data/network/src/commonMain/kotlin/social/androiddev/common/network/model/Status.kt

@@ -26,7 +26,7 @@ data class Status(
     @SerialName("visibility") val visibility: Privacy,
     @SerialName("sensitive") val sensitive: Boolean,
     @SerialName("spoiler_text") val spoilerText: String,
-    @SerialName("media_attachments") val mediaAttachments: List<Attachment>? = emptyList(),
+    @SerialName("media_attachments") val mediaAttachments: List<Attachment>? = null,
     @SerialName("application") val application: Application? = null,
 
     // rendering attributes

data/repository/build.gradle.kts

@@ -18,7 +18,7 @@ kotlin {
                 implementation(projects.domain.timeline)
                 implementation(libs.io.insert.koin.core)
                 implementation(libs.kotlinx.coroutines.core)
-                //temp until we map to UI models
+                //TODO remove as api dependency once we can stop dependening on StoreResponse in UI
                 api(libs.store)
                 implementation(libs.com.squareup.sqldelight.coroutines.extensions)
             }

data/repository/src/commonMain/kotlin/social/androiddev/common/repository/timeline/ModelMappers.kt

@@ -13,6 +13,7 @@ import social.androiddev.common.network.model.Status
 import social.androiddev.common.timeline.StatusDB
 import social.androiddev.domain.timeline.FeedType
 import social.androiddev.domain.timeline.model.StatusLocal
+import social.androiddev.domain.timeline.model.Visibility
 
 fun StatusDB.toLocal(
     key: FeedType
@@ -26,7 +27,7 @@ fun StatusDB.toLocal(
     content = content,
     sensitive = sensitive ?: false,
     spoilerText = spoilerText,
-    visibility = visibility,
+    visibility = Visibility.valueOf(visibility),
     avatarUrl = avatarUrl,
     accountAddress = accountAddress,
     userName = userName

data/repository/src/commonMain/kotlin/social/androiddev/common/repository/timeline/TimelineFetcher.kt

@@ -14,12 +14,10 @@ import social.androiddev.common.network.MastodonApi
 import social.androiddev.common.persistence.localstorage.DodoAuthStorage
 import social.androiddev.common.timeline.StatusDB
 import social.androiddev.domain.timeline.FeedType
-
 /**
  * Wrapper for [MastodonApi.getHomeFeed] while also getting an auth token from storage
  * and mapping result to list of [StatusDB]
  */
-
 fun MastodonApi.timelineFetcher(authStorage: DodoAuthStorage): Fetcher<FeedType, List<StatusDB>> =
     Fetcher.of { key: FeedType ->
         when (key) {
@@ -32,4 +30,4 @@ fun MastodonApi.timelineFetcher(authStorage: DodoAuthStorage): Fetcher<FeedType,
                     .map { it.statusDB() }
             }
         }
-    }
+    }

data/repository/src/commonTest/kotlin/social/androiddev/common/repository/timeline/RealHomeTimelineRepositoryTest.kt

@@ -19,9 +19,10 @@ import kotlin.test.assertTrue
 import kotlin.test.fail
 
 
-class RealHomeTimelineRepositoryTest{
-    @Test fun sucessTest(): TestResult {
-        return runTest{
+class RealHomeTimelineRepositoryTest {
+    @Test
+    fun sucessTest(): TestResult {
+        return runTest {
             val testRepo = RealHomeTimelineRepository(fakeSuccessStore)
             val result = testRepo.read(FeedType.Home).first()
             assertTrue { result is StoreResponse.Data }
@@ -30,16 +31,18 @@ class RealHomeTimelineRepositoryTest{
         }
     }
 
-    @Test fun failureTest(): TestResult {
-        return runTest{
+    @Test
+    fun failureTest(): TestResult {
+        return runTest {
             val testRepo = RealHomeTimelineRepository(fakeFailureStore)
             val result = testRepo.read(FeedType.Home).first()
             assertTrue { result is StoreResponse.Error.Message }
-            assertTrue { result.errorMessageOrNull() == failureResponse.message}
+            assertTrue { result.errorMessageOrNull() == failureResponse.message }
 
         }
     }
 }
+
 val fakeSuccessStore = object : Store<FeedType, List<StatusLocal>> {
     override suspend fun clear(key: FeedType) {
         TODO("Not yet implemented")

data/repository/src/commonTest/kotlin/social/androiddev/common/repository/timeline/fixtures/TestFixtures.kt

@@ -22,6 +22,7 @@ import social.androiddev.common.network.model.Token
 import social.androiddev.common.persistence.localstorage.DodoAuthStorage
 import social.androiddev.domain.timeline.FeedType
 import social.androiddev.domain.timeline.model.StatusLocal
+import social.androiddev.domain.timeline.model.Visibility
 
 val fakeStorage = object : DodoAuthStorage {
     override var currentDomain: String? = "androiddev.social"
@@ -47,7 +48,7 @@ val fakeLocalStatus = StatusLocal(
     null,
     false,
     "",
-    "",
+    Visibility.UNLISTED,
     "",
     "",
     ""

domain/timeline/src/commonMain/kotlin/social/androiddev/domain/timeline/model/StatusLocal.kt

@@ -22,7 +22,7 @@ data class StatusLocal(
     val account: Account? = null,
     val sensitive: Boolean = false,
     val spoilerText: String? = null,
-    val visibility: String = "Public",
+    val visibility: Visibility = Visibility.UNLISTED,
     val avatarUrl: String = "",
     val accountAddress: String = "",
     val userName: String

ui/timeline/src/commonMain/kotlin/social/androiddev/timeline/navigation/TimelineViewModel.kt

@@ -40,8 +40,8 @@ class TimelineViewModel(
         .mapLatest(::render)
         .stateIn(scope, SharingStarted.Eagerly, StoreResponse.Loading(ResponseOrigin.Cache))
 
-    private fun render(it: StoreResponse<List<StatusLocal>>): StoreResponse.Data<List<FeedItemState>> {
-        return when (val response: StoreResponse<List<StatusLocal>> = it) {
+    private fun render(response: StoreResponse<List<StatusLocal>>): StoreResponse.Data<List<FeedItemState>> {
+        return when (response) {
             is StoreResponse.Data -> {
                 val result = StoreResponse.Data(
                     response.value.map {
@@ -62,7 +62,7 @@ class TimelineViewModel(
             }
 
             else -> {
-                StoreResponse.Data(emptyList(), it.origin)
+                StoreResponse.Data(emptyList(), response.origin)
             }
         }
     }