chore(fc): explicitly define paged conversations query; filter IN only text and announcements

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/list/ChatNode.kt

@@ -13,7 +13,6 @@ import androidx.compose.material.DismissValue
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.FixedThreshold
 import androidx.compose.material.SwipeToDismiss
-import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.VolumeOff
 import androidx.compose.material.icons.automirrored.filled.VolumeUp
@@ -43,6 +42,7 @@ import kotlinx.coroutines.flow.filter
 import xyz.flipchat.app.R
 import xyz.flipchat.app.ui.LocalUserManager
 import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastMessage
+import xyz.flipchat.services.internal.data.mapper.nullIfEmpty
 
 @OptIn(ExperimentalMaterialApi::class)
 @Composable

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/data/mapper/MetadataRoomMapper.kt

@@ -30,4 +30,4 @@ class MetadataRoomMapper @Inject constructor(
 }
 
 internal fun Long.ifZeroOrElse(other: Long, block: (Long) -> Long) = takeIf { it > 0 }?.let(block) ?: other
-private fun String?.nullIfEmpty() = if (this?.isEmpty() == true) null else this
+fun String?.nullIfEmpty() = if (this?.isEmpty() == true) null else this

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt

@@ -28,15 +28,94 @@ interface ConversationDao {
     suspend fun upsertConversations(vararg conversation: Conversation)
 
     @RewriteQueriesToDropUnusedColumns
+    @Transaction
     @Query(
         """
-            SELECT * FROM conversations
-            WHERE roomNumber > 0
-            ORDER BY lastActivity DESC
-            LIMIT :limit OFFSET :offset
-        """
+    SELECT
+        -- Conversation fields
+        c.idBase58             AS idBase58,
+        c.ownerIdBase58        AS ownerIdBase58,
+        c.title                AS title,
+        c.imageUri             AS imageUri,
+        c.canMute              AS canMute,
+        c.unreadCount          AS unreadCount,
+        c.hasMoreUnread        AS hasMoreUnread,
+        c.isOpen               AS isOpen,
+        c.roomNumber           AS roomNumber,
+        c.lastActivity         AS lastActivity,
+
+        -- Last message fields
+        lm.idBase58            AS lastMessageIdBase58,
+        lm.dateMillis          AS lastMessageDateMillis,
+        lm.senderIdBase58      AS lastMessageSenderIdBase58,
+        lm.type                AS lastMessageType,
+        lm.content             AS lastMessageContent,
+
+        -- Member fields
+        cm.memberIdBase58      AS memberIdBase58,
+        cm.memberName          AS memberName,
+        cm.imageUri            AS imageUri,
+        cm.isHost              AS isHost,
+        cm.isMuted             AS isMuted,
+        cm.isFullMember        AS isFullMember,
+        cm.isBlocked           AS isBlocked
+
+    FROM conversations AS c
+
+    -- Join to fetch all members for each conversation
+    LEFT JOIN members AS cm
+        ON cm.conversationIdBase58 = c.idBase58
+
+    -- Subquery to find the most recent message for each conversation
+    LEFT JOIN (
+        SELECT
+            conversationIdBase58,
+            MAX(dateMillis) AS maxDateMillis
+        FROM
+            messages
+
+        GROUP BY
+            conversationIdBase58
+    ) AS latestMessage
+    ON
+        c.idBase58 = latestMessage.conversationIdBase58
+
+    -- Subquery to find the most recent message for ordering, filtering by specific types
+    LEFT JOIN (
+        SELECT
+            conversationIdBase58,
+            MAX(dateMillis) AS maxDateMillis
+        FROM
+            messages
+        WHERE
+            type IN (1, 8)
+        GROUP BY
+            conversationIdBase58
+    ) AS messageForOrder
+    ON
+        c.idBase58 = messageForOrder.conversationIdBase58
+
+    -- Join to get details for the latest message
+    LEFT JOIN messages AS lm
+    ON
+        latestMessage.conversationIdBase58 = lm.conversationIdBase58
+        AND latestMessage.maxDateMillis = lm.dateMillis
+    WHERE type IN (1,8)
+
+    GROUP BY c.idBase58
+
+    ORDER BY
+        messageForOrder.maxDateMillis DESC
+
+    LIMIT :limit OFFSET :offset
+    """
     )
-    suspend fun getPagedConversations(limit: Int, offset: Int): List<ConversationWithMembersAndLastMessage>
+    suspend fun getPagedConversations(
+        limit: Int,
+        offset: Int
+    ): List<ConversationWithMembersAndLastMessage>
+
+
 
     @RewriteQueriesToDropUnusedColumns
     @Transaction

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationMessageDao.kt

@@ -70,6 +70,8 @@ interface ConversationMessageDao {
         return getNewestMessage(conversationId.base58)
     }
 
+    @RewriteQueriesToDropUnusedColumns
+    @Transaction
     @Query(
         """
             SELECT