Merge pull request #1048 from tunjid/tj/list-member-record

Move listMembers method to ListRepository

Author: tunjid

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/ProfileRepository.kt

@@ -115,11 +115,6 @@ interface ProfileRepository {
         limit: Long,
     ): Flow<List<Profile>>
 
-    fun listMembers(
-        query: ListMemberQuery,
-        cursor: Cursor,
-    ): Flow<CursorList<ListMember>>
-
     fun followers(
         query: ProfilesQuery,
         cursor: Cursor,
@@ -218,50 +213,6 @@ internal class OfflineProfileRepository @Inject constructor(
                 }
         }
 
-    override fun listMembers(
-        query: ListMemberQuery,
-        cursor: Cursor,
-    ): Flow<CursorList<ListMember>> =
-        savedStateDataSource.singleAuthorizedSessionFlow { signedInProfileId ->
-            combine(
-                listDao.listMembers(
-                    listUri = query.listUri.uri,
-                    signedInUserId = signedInProfileId.id,
-                    offset = query.data.offset,
-                    limit = query.data.limit,
-                )
-                    .map {
-                        it.map(PopulatedListMemberEntity::asExternalModel)
-                    },
-                networkService.nextCursorFlow(
-                    currentCursor = cursor,
-                    currentRequestWithNextCursor = {
-                        getList(
-                            GetListQueryParams(
-                                list = query.listUri.uri.let(::AtUri),
-                                limit = query.data.limit,
-                                cursor = cursor.value,
-                            ),
-                        )
-                    },
-                    nextCursor = GetListResponse::cursor,
-                    onResponse = {
-                        multipleEntitySaverProvider.saveInTransaction {
-                            add(list)
-                            items.forEach { listItemView ->
-                                add(
-                                    listUri = list.uri.atUri.let(::ListUri),
-                                    listItemView = listItemView,
-                                )
-                            }
-                        }
-                    },
-                ),
-                ::CursorList,
-            )
-                .distinctUntilChanged()
-        }
-
     override fun followers(
         query: ProfilesQuery,
         cursor: Cursor,

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/RecordRepository.kt

@@ -23,6 +23,8 @@ import app.bsky.graph.GetActorStarterPacksQueryParams
 import app.bsky.graph.GetActorStarterPacksResponse
 import app.bsky.graph.GetBlocksQueryParams
 import app.bsky.graph.GetBlocksResponse
+import app.bsky.graph.GetListQueryParams
+import app.bsky.graph.GetListResponse
 import app.bsky.graph.GetListsQueryParams
 import app.bsky.graph.GetListsResponse
 import com.atproto.repo.CreateRecordRequest
@@ -35,6 +37,7 @@ import com.tunjid.heron.data.core.models.DataQuery
 import com.tunjid.heron.data.core.models.FeedGenerator
 import com.tunjid.heron.data.core.models.FeedList
 import com.tunjid.heron.data.core.models.Labeler
+import com.tunjid.heron.data.core.models.ListMember
 import com.tunjid.heron.data.core.models.ProfileWithViewerState
 import com.tunjid.heron.data.core.models.Record
 import com.tunjid.heron.data.core.models.StarterPack
@@ -56,6 +59,7 @@ import com.tunjid.heron.data.database.daos.PostDao
 import com.tunjid.heron.data.database.daos.StarterPackDao
 import com.tunjid.heron.data.database.entities.PopulatedFeedGeneratorEntity
 import com.tunjid.heron.data.database.entities.PopulatedListEntity
+import com.tunjid.heron.data.database.entities.PopulatedListMemberEntity
 import com.tunjid.heron.data.database.entities.PopulatedStarterPackEntity
 import com.tunjid.heron.data.database.entities.asExternalModel
 import com.tunjid.heron.data.di.AppMainScope
@@ -84,6 +88,7 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import sh.christian.ozone.api.AtUri
 import sh.christian.ozone.api.Did
 import sh.christian.ozone.api.Nsid
 import sh.christian.ozone.api.RKey
@@ -113,6 +118,11 @@ interface RecordRepository {
         cursor: Cursor,
     ): Flow<CursorList<FeedList>>
 
+    fun listMembers(
+        query: ListMemberQuery,
+        cursor: Cursor,
+    ): Flow<CursorList<ListMember>>
+
     fun feedGenerators(
         query: ProfilesQuery,
         cursor: Cursor,
@@ -303,6 +313,50 @@ internal class OfflineRecordRepository @Inject constructor(
                 .distinctUntilChanged()
         }
 
+    override fun listMembers(
+        query: ListMemberQuery,
+        cursor: Cursor,
+    ): Flow<CursorList<ListMember>> =
+        savedStateDataSource.singleAuthorizedSessionFlow { signedInProfileId ->
+            combine(
+                listDao.listMembers(
+                    listUri = query.listUri.uri,
+                    signedInUserId = signedInProfileId.id,
+                    offset = query.data.offset,
+                    limit = query.data.limit,
+                )
+                    .map {
+                        it.map(PopulatedListMemberEntity::asExternalModel)
+                    },
+                networkService.nextCursorFlow(
+                    currentCursor = cursor,
+                    currentRequestWithNextCursor = {
+                        getList(
+                            GetListQueryParams(
+                                list = query.listUri.uri.let(::AtUri),
+                                limit = query.data.limit,
+                                cursor = cursor.value,
+                            ),
+                        )
+                    },
+                    nextCursor = GetListResponse::cursor,
+                    onResponse = {
+                        multipleEntitySaverProvider.saveInTransaction {
+                            add(list)
+                            items.forEach { listItemView ->
+                                add(
+                                    listUri = list.uri.atUri.let(::ListUri),
+                                    listItemView = listItemView,
+                                )
+                            }
+                        }
+                    },
+                ),
+                ::CursorList,
+            )
+                .distinctUntilChanged()
+        }
+
     override fun feedGenerators(
         query: ProfilesQuery,
         cursor: Cursor,

feature/list/src/commonMain/kotlin/com/tunjid/heron/list/ListViewModel.kt

@@ -123,7 +123,7 @@ class ActualListViewModel(
                     request = route.timelineRequest,
                     scope = scope,
                     timelineRepository = timelineRepository,
-                    profileRepository = profileRepository,
+                    recordRepository = recordRepository,
                     authRepository = authRepository,
                 ),
                 actions.toMutationStream(
@@ -253,7 +253,7 @@ private fun SuspendingStateHolder<State>.listMemberStateHolderMutations(
     request: TimelineRequest.OfList,
     scope: CoroutineScope,
     timelineRepository: TimelineRepository,
-    profileRepository: ProfileRepository,
+    recordRepository: RecordRepository,
     authRepository: AuthRepository,
 ): Flow<Mutation<State>> = flow {
     val existingHolder = state().stateHolders
@@ -293,7 +293,7 @@ private fun SuspendingStateHolder<State>.listMemberStateHolderMutations(
                             currentState = { state() },
                             updateQueryData = { copy(data = it) },
                             refreshQuery = { copy(data = data.reset()) },
-                            cursorListLoader = profileRepository::listMembers,
+                            cursorListLoader = recordRepository::listMembers,
                             onNewItems = { items ->
                                 items.distinctBy(ListMember::uri)
                             },

feature/search/src/commonMain/kotlin/com/tunjid/heron/search/SearchViewModel.kt

@@ -26,7 +26,6 @@ import com.tunjid.heron.data.core.models.timelineRecordUri
 import com.tunjid.heron.data.repository.AuthRepository
 import com.tunjid.heron.data.repository.ListMemberQuery
 import com.tunjid.heron.data.repository.MessageRepository
-import com.tunjid.heron.data.repository.ProfileRepository
 import com.tunjid.heron.data.repository.RecordRepository
 import com.tunjid.heron.data.repository.SearchQuery
 import com.tunjid.heron.data.repository.SearchRepository
@@ -91,7 +90,6 @@ class SearchViewModel(
     messageRepository: MessageRepository,
     recordRepository: RecordRepository,
     searchRepository: SearchRepository,
-    profileRepository: ProfileRepository,
     timelineRepository: TimelineRepository,
     userDataRepository: UserDataRepository,
     writeQueue: WriteQueue,
@@ -119,7 +117,7 @@ class SearchViewModel(
             trendsMutations(searchRepository),
             suggestedStarterPackMutations(
                 searchRepository = searchRepository,
-                profileRepository = profileRepository,
+                recordRepository = recordRepository,
             ),
             suggestedFeedGeneratorMutations(
                 searchRepository = searchRepository,
@@ -226,13 +224,13 @@ private fun trendsMutations(
 
 private fun suggestedStarterPackMutations(
     searchRepository: SearchRepository,
-    profileRepository: ProfileRepository,
+    recordRepository: RecordRepository,
 ): Flow<Mutation<State>> =
     searchRepository.suggestedStarterPacks()
         .flatMapLatest { starterPacks ->
             val starterPackListUris = starterPacks.mapNotNull { it.list?.uri }
             val listMembersFlow = starterPackListUris.map { listUri ->
-                profileRepository.listMembers(
+                recordRepository.listMembers(
                     query = ListMemberQuery(
                         listUri = listUri,
                         data = CursorQuery.Data(