Wip views

Author: riccardocucia

README.md

@@ -279,4 +279,4 @@ Below are some activities to complete to have a more complete and optimized proj
 4. Chat room channels
 5. Sending audio messages
 6. Improve documentation
-7. Use rooms view for improvement user parsing performance
+

doc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flutter-supabase-chat-core",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

example/pubspec.yaml

@@ -2,7 +2,7 @@ name: example
 description: A new Flutter project.
 publish_to: 'none'
 
-version: 1.3.2
+version: 1.4.0
 
 environment:
   sdk: '>=3.4.0 <4.0.0'

example/utils/sql/05_database_view.sql

@@ -1,57 +1,59 @@
+DROP VIEW IF EXISTS chats.messages_l;
 DROP VIEW IF EXISTS chats.rooms_l;
+
 create or replace view chats.rooms_l
-            with (security_invoker='on') as
-select
-    r.id,
-    r."imageUrl",
-    r.metadata,
-    case
-        when r.type = 'direct' and auth.uid() is not null then
-            (select coalesce(u."firstName", '') || ' ' || coalesce(u."lastName", '')
-             from chats.users u
-             where u.id = any(r."userIds") and u.id <> auth.uid()
-             limit 1)
-        else
-            r.name
-        end as name,
-    r.type,
-    r."userIds",
-    r."lastMessages",
-    r."userRoles",
-    r."createdAt",
-    r."updatedAt",
-    (select jsonb_agg(to_jsonb(u))
-     from chats.users u
-     where u.id = any(r."userIds")) as users
+    with (security_invoker='on') as
+select r.id,
+       r."imageUrl",
+       r.metadata,
+       case
+           when r.type = 'direct' and auth.uid() is not null then
+               (select coalesce(u."firstName", '') || ' ' || coalesce(u."lastName", '')
+                from chats.users u
+                where u.id = any (r."userIds")
+                  and u.id <> auth.uid()
+                limit 1)
+           else
+               r.name
+           end                          as name,
+       r.type,
+       r."userIds",
+       r."lastMessages",
+       r."userRoles",
+       r."createdAt",
+       r."updatedAt",
+       (select jsonb_agg(to_jsonb(u))
+        from chats.users u
+        where u.id = any (r."userIds")) as users
 from chats.rooms r;
 
-DROP VIEW IF EXISTS chats.messages_l;
-create or replace view chats.messages_l as
-select
-    m.id,
-    m."createdAt",
-    m.metadata,
-    m.duration,
-    m."mimeType",
-    m.name,
-    m."remoteId",
-    m."repliedMessage",
-    m."roomId",
-    m."showStatus",
-    m.size,
-    m.status,
-    m.type,
-    m."updatedAt",
-    m.uri,
-    m."waveForm",
-    m."isLoading",
-    m.height,
-    m.width,
-    m."previewData",
-    m."authorId",
-    m.text,
-    to_jsonb(u) as author,
-    to_jsonb(r) as room
+
+create or replace view chats.messages_l
+    with (security_invoker='on') as
+select m.id,
+       m."createdAt",
+       m.metadata,
+       m.duration,
+       m."mimeType",
+       m.name,
+       m."remoteId",
+       m."repliedMessage",
+       m."roomId",
+       m."showStatus",
+       m.size,
+       m.status,
+       m.type,
+       m."updatedAt",
+       m.uri,
+       m."waveForm",
+       m."isLoading",
+       m.height,
+       m.width,
+       m."previewData",
+       m."authorId",
+       m.text,
+       to_jsonb(u) as author,
+       to_jsonb(r) as room
 from chats.messages m
          left join chats.users u on u.id = m."authorId"
          left join chats.rooms_l r on r.id = m."roomId";

lib/src/class/supabase_chat_controller.dart

@@ -69,7 +69,7 @@ class SupabaseChatController {
 
   PostgrestTransformBuilder _messagesQuery() => _client
       .schema(_config.schema)
-      .from(_config.messagesTableName)
+      .from(_config.messagesViewName)
       .select()
       .eq('roomId', int.parse(_room.id))
       .order('createdAt', ascending: false)

lib/src/class/supabase_chat_core.dart

@@ -50,6 +50,7 @@ class SupabaseChatCore {
     'rooms',
     'rooms_l',
     'messages',
+    'messages_l',
     'users',
     'online-user-',
     //online-user-${uid}
@@ -173,15 +174,7 @@ class SupabaseChatCore {
   }) async {
     if (loggedSupabaseUser == null) return Future.error('User does not exist');
 
-    final currentUser = await fetchUser(
-      client,
-      loggedSupabaseUser!.id,
-      config.usersTableName,
-      config.schema,
-      role: creatorRole.toShortString(),
-    );
-
-    final roomUsers = [types.User.fromJson(currentUser)] + users;
+    final roomUsers = [loggedUser!] + users;
 
     final room =
         await client.schema(config.schema).from(config.roomsTableName).insert({

lib/src/class/supabase_chat_core_config.dart

@@ -12,6 +12,7 @@ class SupabaseChatCoreConfig {
     this.roomsTableName,
     this.roomsViewName,
     this.messagesTableName,
+    this.messagesViewName,
     this.usersTableName,
     this.realtimeOnlineUserPrefixChannel,
     this.realtimeChatTypingUserPrefixChannel,
@@ -30,6 +31,9 @@ class SupabaseChatCoreConfig {
   /// Property to set messages table name.
   final String messagesTableName;
 
+  /// Property to set messages view name.
+  final String messagesViewName;
+
   /// Property to set users table name.
   final String usersTableName;
 

lib/src/util.dart

@@ -20,14 +20,17 @@ Future<Map<String, dynamic>> fetchUser(
   String usersTableName,
   String schema, {
   String? role,
-}) async =>
-    (await instance
-            .schema(schema)
-            .from(usersTableName)
-            .select()
-            .eq('id', userId)
-            .limit(1))
-        .first;
+}) async {
+  final data = (await instance
+          .schema(schema)
+          .from(usersTableName)
+          .select()
+          .eq('id', userId)
+          .limit(1))
+      .first;
+  data['role'] = role;
+  return data;
+}
 
 /// Returns a list of [types.Room] created from Firebase query.
 /// If room has 2 participants, sets correct room name and image.
@@ -63,30 +66,28 @@ Future<types.Room> processRoomRow(
   final type = data['type'] as String;
   final userIds = data['userIds'] as List<dynamic>;
   final userRoles = data['userRoles'] as Map<String, dynamic>?;
-
-  final users = await Future.wait(
-    userIds.map(
-      (userId) => fetchUser(
-        instance,
-        userId as String,
-        usersTableName,
-        schema,
-        role: userRoles?[userId] as String?,
-      ),
-    ),
-  );
+  final users = data['users'] ??
+      await Future.wait(
+        userIds.map(
+          (userId) => fetchUser(
+            instance,
+            userId as String,
+            usersTableName,
+            schema,
+            role: userRoles?[userId] as String?,
+          ),
+        ),
+      );
 
   if (type == types.RoomType.direct.toShortString()) {
-    try {
-      final otherUser = users.firstWhere(
-        (u) => u['id'] != supabaseUser.id,
-      );
+    final index = users.indexWhere(
+      (u) => u['id'] != supabaseUser.id,
+    );
+    if (index >= 0) {
+      final otherUser = users[index];
       imageUrl = otherUser['imageUrl'] as String?;
       name = '${otherUser['firstName'] ?? ''} ${otherUser['lastName'] ?? ''}'
           .trim();
-    } catch (e) {
-      // Do nothing if other user is not found, because he should be found.
-      // Consider falling back to some default values.
     }
   }
   data['imageUrl'] = imageUrl;

pubspec.yaml

@@ -2,7 +2,7 @@ name: flutter_supabase_chat_core
 description: >
   Actively maintained, community-driven Supabase BaaS for chat applications
   with an optional chat UI.
-version: 1.3.2
+version: 1.4.0
 homepage: https://flutter-supabase-chat-core.insideapp.it
 repository: https://github.com/insideapp-srl/flutter_supabase_chat_core