Merge pull request #1638 from tunjid/tj/starter-pack-follow-data-2

Starter pack follow data layer 2

Author: tunjid

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

@@ -851,7 +851,6 @@ internal class OfflineProfileRepository(
             uri = connection.starterPackUri.uri.let(::AtUri),
         )
 
-        // Enumerate all of the pack list's members in memory; nothing is persisted.
         val members = buildList {
             var cursor: String? = null
             for (page in 0 until MaxStarterPackMemberPages) {
@@ -971,19 +970,13 @@ private fun ProfileTab.asNetworkTab(): PutTabsRequestItemUnion = when (this) {
     )
 }
 
-/**
- * A single pending starter-pack follow: the [ApplyWritesCreate] to send plus the data needed to
- * reflect the follow locally once its batch commits.
- */
 private class StarterPackFollowWrite(
     val memberId: ProfileId,
     val followedBy: FollowUri?,
     val followUri: FollowUri,
     val create: ApplyWritesCreate,
 )
 
-// Starter-pack lists are capped well below these bounds; they simply keep a single "follow all"
-// from fanning out unbounded work.
 private const val MaxStarterPackMemberPages = 6
 private const val StarterPackMemberPageLimit = 50L
 private const val MaxFollowWritesPerBatch = 50

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

@@ -405,6 +405,7 @@ internal class OfflineFirstBlueskyRecordOperations(
                             add(list)
                             items.forEach { listItemView ->
                                 add(
+                                    viewingProfileId = signedInProfileId,
                                     listUri = list.uri.atUri.let(::ListUri),
                                     listItemView = listItemView,
                                 )
@@ -527,52 +528,57 @@ internal class OfflineFirstBlueskyRecordOperations(
         cursor: Cursor,
     ): Flow<CursorList<StarterPack>> =
         if (query.query.isBlank()) emptyFlow()
-        else networkService.observedItems(
-            cursor = cursor,
-            responseFetcher = {
-                searchStarterPacksV2(
-                    params = SearchStarterPacksV2QueryParams(
-                        q = query.query,
-                        limit = query.data.limit,
-                        cursor = cursor.value,
-                    ),
-                )
-            },
-            responseSaver = { response ->
-                multipleEntitySaverProvider.saveInTransaction {
-                    response.starterPacks
-                        .forEach { starterPackView ->
-                            add(starterPack = starterPackView)
-                        }
-                }
-            },
-            responseCursor = { response ->
-                response.cursor?.let(Cursor::Next)
-            },
-            networkItems = { _, _ ->
-                null
-            },
-            observedItems = { response, nextCursor ->
-                val starterPackUris = response.starterPacks
-                    .map { it.uri.atUri.let(::StarterPackUri) }
-
-                starterPackDao.starterPacks(
-                    uris = starterPackUris,
-                )
-                    .distinctUntilChangedMap { populatedStarterPackEntities ->
-                        CursorList(
-                            items = populatedStarterPackEntities
-                                .map(PopulatedStarterPackEntity::asExternalModel)
-                                .sortedWithNetworkList(
-                                    networkList = starterPackUris,
-                                    databaseId = { it.uri.uri },
-                                    networkId = { it.uri },
-                                ),
-                            nextCursor = nextCursor,
-                        )
+        else savedStateDataSource.singleSessionFlow { signedInProfileId ->
+            networkService.observedItems(
+                cursor = cursor,
+                responseFetcher = {
+                    searchStarterPacksV2(
+                        params = SearchStarterPacksV2QueryParams(
+                            q = query.query,
+                            limit = query.data.limit,
+                            cursor = cursor.value,
+                        ),
+                    )
+                },
+                responseSaver = { response ->
+                    multipleEntitySaverProvider.saveInTransaction {
+                        response.starterPacks
+                            .forEach { starterPackView ->
+                                add(
+                                    viewingProfileId = signedInProfileId,
+                                    starterPack = starterPackView,
+                                )
+                            }
                     }
-            },
-        )
+                },
+                responseCursor = { response ->
+                    response.cursor?.let(Cursor::Next)
+                },
+                networkItems = { _, _ ->
+                    null
+                },
+                observedItems = { response, nextCursor ->
+                    val starterPackUris = response.starterPacks
+                        .map { it.uri.atUri.let(::StarterPackUri) }
+
+                    starterPackDao.starterPacks(
+                        uris = starterPackUris,
+                    )
+                        .distinctUntilChangedMap { populatedStarterPackEntities ->
+                            CursorList(
+                                items = populatedStarterPackEntities
+                                    .map(PopulatedStarterPackEntity::asExternalModel)
+                                    .sortedWithNetworkList(
+                                        networkList = starterPackUris,
+                                        databaseId = { it.uri.uri },
+                                        networkId = { it.uri },
+                                    ),
+                                nextCursor = nextCursor,
+                            )
+                        }
+                },
+            )
+        }
             .flowOn(ioDispatcher)
 
     override fun suggestedFeeds(): Flow<List<FeedGenerator>> =
@@ -611,7 +617,7 @@ internal class OfflineFirstBlueskyRecordOperations(
             .flowOn(ioDispatcher)
 
     override fun suggestedStarterPacks(): Flow<List<StarterPack>> =
-        savedStateDataSource.singleAuthorizedSessionFlow {
+        savedStateDataSource.singleAuthorizedSessionFlow { signedInProfileId ->
             val starterPackViews = networkService.runCatchingWithMonitoredNetworkRetry {
                 getSuggestedStarterPacksUnspecced(
                     GetSuggestedStarterPacksQueryParams(),
@@ -623,7 +629,10 @@ internal class OfflineFirstBlueskyRecordOperations(
 
             multipleEntitySaverProvider.saveInTransaction {
                 starterPackViews.forEach { starterPack ->
-                    add(starterPack = starterPack)
+                    add(
+                        viewingProfileId = signedInProfileId,
+                        starterPack = starterPack,
+                    )
                 }
             }
 

data/core/src/commonMain/kotlin/com/tunjid/heron/data/utilities/multipleEntitysaver/SaveListItemView.kt

@@ -21,15 +21,18 @@ import com.tunjid.heron.data.core.types.ListMemberUri
 import com.tunjid.heron.data.core.types.ListUri
 import com.tunjid.heron.data.core.types.ProfileId
 import com.tunjid.heron.data.database.entities.ListMemberEntity
-import com.tunjid.heron.data.network.models.profileEntity
 import com.tunjid.heron.data.utilities.tidInstant
 
 internal fun MultipleEntitySaver.add(
+    viewingProfileId: ProfileId?,
     listUri: ListUri,
     listItemView: ListItemView,
 ) {
     val createdAt = listItemView.uri.tidInstant ?: return
-    add(listItemView.subject.profileEntity())
+    add(
+        viewingProfileId = viewingProfileId,
+        profileView = listItemView.subject,
+    )
     add(
         ListMemberEntity(
             listUri = listUri,

data/core/src/commonMain/kotlin/com/tunjid/heron/data/utilities/multipleEntitysaver/SaveStarterPackView.kt

@@ -27,6 +27,7 @@ import com.tunjid.heron.data.database.entities.StarterPackEntity
 import com.tunjid.heron.data.network.models.profileEntity
 
 internal fun MultipleEntitySaver.add(
+    viewingProfileId: ProfileId?,
     starterPack: StarterPackView,
 ) {
     val bskyStarterPack = try {
@@ -44,6 +45,7 @@ internal fun MultipleEntitySaver.add(
         )
         starterPack.listItemsSample?.forEach { listItemView ->
             add(
+                viewingProfileId = viewingProfileId,
                 listUri = listView.uri.atUri.let(::ListUri),
                 listItemView = listItemView,
             )

data/core/src/commonMain/kotlin/com/tunjid/heron/data/utilities/recordResolver/RecordResolver.kt

@@ -466,7 +466,12 @@ internal class OfflineRecordResolver(
                 )
             }
                 .mapCatchingUnlessCancelled {
-                    multipleEntitySaverProvider.saveInTransaction { add(it.starterPack) }
+                    multipleEntitySaverProvider.saveInTransaction {
+                        add(
+                            viewingProfileId = viewingProfileId,
+                            starterPack = it.starterPack,
+                        )
+                    }
                     it.starterPack.asExternalModel()
                 }
             is LabelerUri -> networkService.runCatchingWithMonitoredNetworkRetry(times = 2) {

data/models/src/commonMain/kotlin/com/tunjid/heron/data/core/models/Profile.kt

@@ -73,12 +73,6 @@ data class Profile(
             val followUri: FollowUri,
         ) : Connection()
 
-        /**
-         * Bulk-follows every not-yet-followed member of a starter pack in a single batched
-         * write. Members are derived from [listUri] (the pack's list); [starterPackUri] and
-         * [starterPackCid] form the `via` strong-ref stamped on each follow record so the pack
-         * creator gets join attribution.
-         */
         @Serializable
         data class FollowStarterPack(
             override val signedInProfileId: ProfileId,
@@ -163,7 +157,6 @@ data class Profile(
         val verifiedStatus: Status,
         val trustedVerifierStatus: Status,
     ) {
-        val isVerified get() = verifiedStatus == Status.Valid
         val isTrustedVerifier get() = trustedVerifierStatus == Status.Valid
 
         @Serializable