style: Apply team linter in stream chat persistence (#331)

* lint(persistence): Apply team linter

Signed-off-by: Sahil Kumar <[email protected]>

* style: flutter format

Signed-off-by: Sahil Kumar <[email protected]>

packages/stream_chat_persistence/lib/src/dao/channel_dao.dart

@@ -3,7 +3,7 @@ import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/channels.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'channel_dao.g.dart';
 
@@ -15,15 +15,14 @@ class ChannelDao extends DatabaseAccessor<MoorChatDatabase>
   ChannelDao(MoorChatDatabase db) : super(db);
 
   /// Get channel by cid
-  Future<ChannelModel> getChannelByCid(String cid) async {
-    return (select(channels)..where((c) => c.cid.equals(cid))).join([
-      leftOuterJoin(users, channels.createdById.equalsExp(users.id)),
-    ]).map((rows) {
-      final channel = rows.readTable(channels);
-      final createdBy = rows.readTable(users);
-      return channel.toChannelModel(createdBy: createdBy?.toUser());
-    }).getSingle();
-  }
+  Future<ChannelModel> getChannelByCid(String cid) async =>
+      (select(channels)..where((c) => c.cid.equals(cid))).join([
+        leftOuterJoin(users, channels.createdById.equalsExp(users.id)),
+      ]).map((rows) {
+        final channel = rows.readTable(channels);
+        final createdBy = rows.readTable(users);
+        return channel.toChannelModel(createdBy: createdBy?.toUser());
+      }).getSingle();
 
   /// Delete all channels by matching cid in [cids]
   ///
@@ -31,27 +30,22 @@ class ChannelDao extends DatabaseAccessor<MoorChatDatabase>
   /// 1. Channel Reads
   /// 2. Channel Members
   /// 3. Channel Messages -> Messages Reactions
-  Future<void> deleteChannelByCids(List<String> cids) async {
-    return (delete(channels)..where((tbl) => tbl.cid.isIn(cids))).go();
-  }
+  Future<void> deleteChannelByCids(List<String> cids) async =>
+      (delete(channels)..where((tbl) => tbl.cid.isIn(cids))).go();
 
   /// Get the channel cids saved in the storage
-  Future<List<String>> get cids {
-    return (select(channels)
-          ..orderBy([(c) => OrderingTerm.desc(c.lastMessageAt)])
-          ..limit(250))
-        .map((c) => c.cid)
-        .get();
-  }
+  Future<List<String>> get cids => (select(channels)
+        ..orderBy([(c) => OrderingTerm.desc(c.lastMessageAt)])
+        ..limit(250))
+      .map((c) => c.cid)
+      .get();
 
   /// Updates all the channels using the new [channelList] data
-  Future<void> updateChannels(List<ChannelModel> channelList) {
-    return batch(
-      (it) => it.insertAll(
-        channels,
-        channelList.map((c) => c.toEntity()).toList(),
-        mode: InsertMode.insertOrReplace,
-      ),
-    );
-  }
+  Future<void> updateChannels(List<ChannelModel> channelList) => batch(
+        (it) => it.insertAll(
+          channels,
+          channelList.map((c) => c.toEntity()).toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
 }

packages/stream_chat_persistence/lib/src/dao/channel_query_dao.dart

@@ -7,7 +7,7 @@ import 'package:stream_chat_persistence/src/entity/channel_queries.dart';
 import 'package:stream_chat_persistence/src/entity/channels.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
 
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'channel_query_dao.g.dart';
 
@@ -31,31 +31,31 @@ class ChannelQueryDao extends DatabaseAccessor<MoorChatDatabase>
   /// the list of matching rows will be deleted
   Future<void> updateChannelQueries(
     Map<String, dynamic> filter,
-    List<String> cids,
+    List<String> cids, {
     bool clearQueryCache,
-  ) async {
-    return transaction(() async {
-      final hash = _computeHash(filter);
-      if (clearQueryCache) {
+  }) async =>
+      transaction(() async {
+        final hash = _computeHash(filter);
+        if (clearQueryCache) {
+          await batch((it) {
+            it.deleteWhere<ChannelQueries, ChannelQueryEntity>(
+              channelQueries,
+              (c) => c.queryHash.equals(hash),
+            );
+          });
+        }
+
         await batch((it) {
-          it.deleteWhere<ChannelQueries, ChannelQueryEntity>(
+          it.insertAll(
             channelQueries,
-            (c) => c.queryHash.equals(hash),
+            cids
+                .map((cid) =>
+                    ChannelQueryEntity(queryHash: hash, channelCid: cid))
+                .toList(),
+            mode: InsertMode.insertOrReplace,
           );
         });
-      }
-
-      await batch((it) {
-        it.insertAll(
-          channelQueries,
-          cids.map((cid) {
-            return ChannelQueryEntity(queryHash: hash, channelCid: cid);
-          }).toList(),
-          mode: InsertMode.insertOrReplace,
-        );
       });
-    });
-  }
 
   /// Get list of channels by filter, sort and paginationParams
   Future<List<ChannelModel>> getChannels({
@@ -70,7 +70,7 @@ class ChannelQueryDao extends DatabaseAccessor<MoorChatDatabase>
         );
       }
       return true;
-    }());
+    }(), '');
 
     final hash = _computeHash(filter);
     final cachedChannelCids = await (select(channelQueries)
@@ -89,10 +89,11 @@ class ChannelQueryDao extends DatabaseAccessor<MoorChatDatabase>
     })).get();
 
     final possibleSortingFields = cachedChannels.fold<List<String>>(
-        ChannelModel.topLevelFields, (previousValue, element) {
-      return {...previousValue, ...element.extraData.keys}.toList();
-    });
+        ChannelModel.topLevelFields,
+        (previousValue, element) =>
+            {...previousValue, ...element.extraData.keys}.toList());
 
+    // ignore: parameter_assignments
     sort = sort
         ?.where((s) => possibleSortingFields.contains(s.field))
         ?.toList(growable: false);

packages/stream_chat_persistence/lib/src/dao/connection_event_dao.dart

@@ -4,7 +4,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/connection_events.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
 
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'connection_event_dao.g.dart';
 
@@ -16,43 +16,38 @@ class ConnectionEventDao extends DatabaseAccessor<MoorChatDatabase>
   ConnectionEventDao(MoorChatDatabase db) : super(db);
 
   /// Get the latest stored connection event
-  Future<Event> get connectionEvent {
-    return select(connectionEvents).map((eventEntity) {
-      return eventEntity.toEvent();
-    }).getSingle();
-  }
+  Future<Event> get connectionEvent => select(connectionEvents)
+      .map((eventEntity) => eventEntity.toEvent())
+      .getSingle();
 
   /// Get the latest stored lastSyncAt
-  Future<DateTime> get lastSyncAt {
-    return select(connectionEvents).getSingle().then((r) => r?.lastSyncAt);
-  }
+  Future<DateTime> get lastSyncAt =>
+      select(connectionEvents).getSingle().then((r) => r?.lastSyncAt);
 
   /// Update stored connection event with latest data
-  Future<void> updateConnectionEvent(Event event) async {
-    return transaction(() async {
-      final connectionInfo = await select(connectionEvents).getSingle();
-      await into(connectionEvents).insert(
-        ConnectionEventEntity(
-          id: 1,
-          lastSyncAt: connectionInfo?.lastSyncAt,
-          lastEventAt: event.createdAt ?? connectionInfo?.lastEventAt,
-          totalUnreadCount:
-              event.totalUnreadCount ?? connectionInfo?.totalUnreadCount,
-          ownUser: event.me?.toJson() ?? connectionInfo?.ownUser,
-          unreadChannels:
-              event.unreadChannels ?? connectionInfo?.unreadChannels,
-        ),
-        mode: InsertMode.insertOrReplace,
-      );
-    });
-  }
+  Future<void> updateConnectionEvent(Event event) async =>
+      transaction(() async {
+        final connectionInfo = await select(connectionEvents).getSingle();
+        await into(connectionEvents).insert(
+          ConnectionEventEntity(
+            id: 1,
+            lastSyncAt: connectionInfo?.lastSyncAt,
+            lastEventAt: event.createdAt ?? connectionInfo?.lastEventAt,
+            totalUnreadCount:
+                event.totalUnreadCount ?? connectionInfo?.totalUnreadCount,
+            ownUser: event.me?.toJson() ?? connectionInfo?.ownUser,
+            unreadChannels:
+                event.unreadChannels ?? connectionInfo?.unreadChannels,
+          ),
+          mode: InsertMode.insertOrReplace,
+        );
+      });
 
   /// Update stored lastSyncAt with latest data
-  Future<int> updateLastSyncAt(DateTime lastSyncAt) async {
-    return (update(connectionEvents)..where((tbl) => tbl.id.equals(1))).write(
-      ConnectionEventsCompanion(
-        lastSyncAt: Value(lastSyncAt),
-      ),
-    );
-  }
+  Future<int> updateLastSyncAt(DateTime lastSyncAt) async =>
+      (update(connectionEvents)..where((tbl) => tbl.id.equals(1))).write(
+        ConnectionEventsCompanion(
+          lastSyncAt: Value(lastSyncAt),
+        ),
+      );
 }

packages/stream_chat_persistence/lib/src/dao/dao.dart

@@ -1,9 +1,9 @@
-export 'user_dao.dart';
 export 'channel_dao.dart';
+export 'channel_query_dao.dart';
+export 'connection_event_dao.dart';
+export 'member_dao.dart';
 export 'message_dao.dart';
 export 'pinned_message_dao.dart';
-export 'member_dao.dart';
-export 'connection_event_dao.dart';
 export 'reaction_dao.dart';
 export 'read_dao.dart';
-export 'channel_query_dao.dart';
+export 'user_dao.dart';

packages/stream_chat_persistence/lib/src/dao/member_dao.dart

@@ -5,7 +5,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/members.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
 
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'member_dao.g.dart';
 
@@ -17,37 +17,33 @@ class MemberDao extends DatabaseAccessor<MoorChatDatabase>
   MemberDao(MoorChatDatabase db) : super(db);
 
   /// Get all members where [Members.channelCid] matches [cid]
-  Future<List<Member>> getMembersByCid(String cid) async {
-    return (select(members).join([
-      leftOuterJoin(users, members.userId.equalsExp(users.id)),
-    ])
-          ..where(members.channelCid.equals(cid))
-          ..orderBy([OrderingTerm.asc(members.createdAt)]))
-        .map((row) {
-      final userEntity = row.readTable(users);
-      final memberEntity = row.readTable(members);
-      return memberEntity.toMember(user: userEntity?.toUser());
-    }).get();
-  }
+  Future<List<Member>> getMembersByCid(String cid) async =>
+      (select(members).join([
+        leftOuterJoin(users, members.userId.equalsExp(users.id)),
+      ])
+            ..where(members.channelCid.equals(cid))
+            ..orderBy([OrderingTerm.asc(members.createdAt)]))
+          .map((row) {
+        final userEntity = row.readTable(users);
+        final memberEntity = row.readTable(members);
+        return memberEntity.toMember(user: userEntity?.toUser());
+      }).get();
 
   /// Updates all the members using the new [memberList] data
-  Future<void> updateMembers(String cid, List<Member> memberList) async {
-    return batch(
-      (it) => it.insertAll(
-        members,
-        memberList.map((m) => m.toEntity(cid: cid)).toList(),
-        mode: InsertMode.insertOrReplace,
-      ),
-    );
-  }
+  Future<void> updateMembers(String cid, List<Member> memberList) async =>
+      batch(
+        (it) => it.insertAll(
+          members,
+          memberList.map((m) => m.toEntity(cid: cid)).toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
 
   /// Deletes all the members whose [Members.channelCid] is present in [cids]
-  Future<void> deleteMemberByCids(List<String> cids) async {
-    return batch((it) {
-      it.deleteWhere<Members, MemberEntity>(
-        members,
-        (m) => m.channelCid.isIn(cids),
-      );
-    });
-  }
+  Future<void> deleteMemberByCids(List<String> cids) async => batch((it) {
+        it.deleteWhere<Members, MemberEntity>(
+          members,
+          (m) => m.channelCid.isIn(cids),
+        );
+      });
 }

packages/stream_chat_persistence/lib/src/dao/message_dao.dart

@@ -4,7 +4,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/messages.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
 
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'message_dao.g.dart';
 
@@ -25,17 +25,15 @@ class MessageDao extends DatabaseAccessor<MoorChatDatabase>
   ///
   /// This will automatically delete the following linked records
   /// 1. Message Reactions
-  Future<void> deleteMessageByIds(List<String> messageIds) {
-    return (delete(messages)..where((tbl) => tbl.id.isIn(messageIds))).go();
-  }
+  Future<void> deleteMessageByIds(List<String> messageIds) =>
+      (delete(messages)..where((tbl) => tbl.id.isIn(messageIds))).go();
 
   /// Removes all the messages by matching [Messages.channelCid] in [cids]
   ///
   /// This will automatically delete the following linked records
   /// 1. Message Reactions
-  Future<void> deleteMessageByCids(List<String> cids) async {
-    return (delete(messages)..where((tbl) => tbl.channelCid.isIn(cids))).go();
-  }
+  Future<void> deleteMessageByCids(List<String> cids) async =>
+      (delete(messages)..where((tbl) => tbl.channelCid.isIn(cids))).go();
 
   Future<Message> _messageFromJoinRow(TypedResult rows) async {
     final userEntity = rows.readTable(_users);
@@ -60,31 +58,29 @@ class MessageDao extends DatabaseAccessor<MoorChatDatabase>
   }
 
   /// Returns a single message by matching the [Messages.id] with [id]
-  Future<Message> getMessageById(String id) async {
-    return await (select(messages).join([
-      leftOuterJoin(_users, messages.userId.equalsExp(_users.id)),
-      leftOuterJoin(
-          _pinnedByUsers, messages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
-    ])
-          ..where(messages.id.equals(id)))
-        .map(_messageFromJoinRow)
-        .getSingle();
-  }
+  Future<Message> getMessageById(String id) async =>
+      await (select(messages).join([
+        leftOuterJoin(_users, messages.userId.equalsExp(_users.id)),
+        leftOuterJoin(_pinnedByUsers,
+            messages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
+      ])
+            ..where(messages.id.equals(id)))
+          .map(_messageFromJoinRow)
+          .getSingle();
 
   /// Returns all the messages of a particular thread by matching
   /// [Messages.channelCid] with [cid]
-  Future<List<Message>> getThreadMessages(String cid) async {
-    return Future.wait(await (select(messages).join([
-      leftOuterJoin(users, messages.userId.equalsExp(_users.id)),
-      leftOuterJoin(
-          _pinnedByUsers, messages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
-    ])
-          ..where(messages.channelCid.equals(cid))
-          ..where(isNotNull(messages.parentId))
-          ..orderBy([OrderingTerm.asc(messages.createdAt)]))
-        .map(_messageFromJoinRow)
-        .get());
-  }
+  Future<List<Message>> getThreadMessages(String cid) async =>
+      Future.wait(await (select(messages).join([
+        leftOuterJoin(users, messages.userId.equalsExp(_users.id)),
+        leftOuterJoin(_pinnedByUsers,
+            messages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
+      ])
+            ..where(messages.channelCid.equals(cid))
+            ..where(isNotNull(messages.parentId))
+            ..orderBy([OrderingTerm.asc(messages.createdAt)]))
+          .map(_messageFromJoinRow)
+          .get());
 
   /// Returns all the messages of a particular thread by matching
   /// [Messages.parentId] with [parentId]

packages/stream_chat_persistence/lib/src/dao/pinned_message_dao.dart

@@ -4,7 +4,7 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/pinned_messages.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
 
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'pinned_message_dao.g.dart';
 
@@ -25,19 +25,15 @@ class PinnedMessageDao extends DatabaseAccessor<MoorChatDatabase>
   ///
   /// This will automatically delete the following linked records
   /// 1. Message Reactions
-  Future<void> deleteMessageByIds(List<String> messageIds) {
-    return (delete(pinnedMessages)..where((tbl) => tbl.id.isIn(messageIds)))
-        .go();
-  }
+  Future<void> deleteMessageByIds(List<String> messageIds) =>
+      (delete(pinnedMessages)..where((tbl) => tbl.id.isIn(messageIds))).go();
 
   /// Removes all the messages by matching [PinnedMessages.channelCid] in [cids]
   ///
   /// This will automatically delete the following linked records
   /// 1. Message Reactions
-  Future<void> deleteMessageByCids(List<String> cids) async {
-    return (delete(pinnedMessages)..where((tbl) => tbl.channelCid.isIn(cids)))
-        .go();
-  }
+  Future<void> deleteMessageByCids(List<String> cids) async =>
+      (delete(pinnedMessages)..where((tbl) => tbl.channelCid.isIn(cids))).go();
 
   Future<Message> _messageFromJoinRow(TypedResult rows) async {
     final userEntity = rows.readTable(users);
@@ -62,31 +58,29 @@ class PinnedMessageDao extends DatabaseAccessor<MoorChatDatabase>
   }
 
   /// Returns a single message by matching the [PinnedMessages.id] with [id]
-  Future<Message> getMessageById(String id) async {
-    return await (select(pinnedMessages).join([
-      leftOuterJoin(_users, pinnedMessages.userId.equalsExp(_users.id)),
-      leftOuterJoin(_pinnedByUsers,
-          pinnedMessages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
-    ])
-          ..where(pinnedMessages.id.equals(id)))
-        .map(_messageFromJoinRow)
-        .getSingle();
-  }
+  Future<Message> getMessageById(String id) async =>
+      await (select(pinnedMessages).join([
+        leftOuterJoin(_users, pinnedMessages.userId.equalsExp(_users.id)),
+        leftOuterJoin(_pinnedByUsers,
+            pinnedMessages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
+      ])
+            ..where(pinnedMessages.id.equals(id)))
+          .map(_messageFromJoinRow)
+          .getSingle();
 
   /// Returns all the messages of a particular thread by matching
   /// [PinnedMessages.channelCid] with [cid]
-  Future<List<Message>> getThreadMessages(String cid) async {
-    return Future.wait(await (select(pinnedMessages).join([
-      leftOuterJoin(_users, pinnedMessages.userId.equalsExp(_users.id)),
-      leftOuterJoin(_pinnedByUsers,
-          pinnedMessages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
-    ])
-          ..where(pinnedMessages.channelCid.equals(cid))
-          ..where(isNotNull(pinnedMessages.parentId))
-          ..orderBy([OrderingTerm.asc(pinnedMessages.createdAt)]))
-        .map(_messageFromJoinRow)
-        .get());
-  }
+  Future<List<Message>> getThreadMessages(String cid) async =>
+      Future.wait(await (select(pinnedMessages).join([
+        leftOuterJoin(_users, pinnedMessages.userId.equalsExp(_users.id)),
+        leftOuterJoin(_pinnedByUsers,
+            pinnedMessages.pinnedByUserId.equalsExp(_pinnedByUsers.id)),
+      ])
+            ..where(pinnedMessages.channelCid.equals(cid))
+            ..where(isNotNull(pinnedMessages.parentId))
+            ..orderBy([OrderingTerm.asc(pinnedMessages.createdAt)]))
+          .map(_messageFromJoinRow)
+          .get());
 
   /// Returns all the messages of a particular thread by matching
   /// [PinnedMessages.parentId] with [parentId]

packages/stream_chat_persistence/lib/src/dao/reaction_dao.dart

@@ -3,7 +3,7 @@ import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/reactions.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'reaction_dao.g.dart';
 
@@ -16,18 +16,17 @@ class ReactionDao extends DatabaseAccessor<MoorChatDatabase>
 
   /// Returns all the reactions of a particular message by matching
   /// [Reactions.messageId] with [messageId]
-  Future<List<Reaction>> getReactions(String messageId) {
-    return (select(reactions).join([
-      leftOuterJoin(users, reactions.userId.equalsExp(users.id)),
-    ])
-          ..where(reactions.messageId.equals(messageId))
-          ..orderBy([OrderingTerm.asc(reactions.createdAt)]))
-        .map((rows) {
-      final userEntity = rows.readTable(users);
-      final reactionEntity = rows.readTable(reactions);
-      return reactionEntity.toReaction(user: userEntity?.toUser());
-    }).get();
-  }
+  Future<List<Reaction>> getReactions(String messageId) =>
+      (select(reactions).join([
+        leftOuterJoin(users, reactions.userId.equalsExp(users.id)),
+      ])
+            ..where(reactions.messageId.equals(messageId))
+            ..orderBy([OrderingTerm.asc(reactions.createdAt)]))
+          .map((rows) {
+        final userEntity = rows.readTable(users);
+        final reactionEntity = rows.readTable(reactions);
+        return reactionEntity.toReaction(user: userEntity?.toUser());
+      }).get();
 
   /// Returns all the reactions of a particular message
   /// added by a particular user by matching
@@ -42,23 +41,21 @@ class ReactionDao extends DatabaseAccessor<MoorChatDatabase>
   }
 
   /// Updates the reactions data with the new [reactionList] data
-  Future<void> updateReactions(List<Reaction> reactionList) {
-    return batch((it) {
-      it.insertAll(
-        reactions,
-        reactionList.map((r) => r.toEntity()).toList(),
-        mode: InsertMode.insertOrReplace,
-      );
-    });
-  }
+  Future<void> updateReactions(List<Reaction> reactionList) => batch((it) {
+        it.insertAll(
+          reactions,
+          reactionList.map((r) => r.toEntity()).toList(),
+          mode: InsertMode.insertOrReplace,
+        );
+      });
 
-  /// Deletes all the reactions whose [Reactions.messageId] is present in [messageIds]
-  Future<void> deleteReactionsByMessageIds(List<String> messageIds) {
-    return batch((it) {
-      it.deleteWhere<Reactions, ReactionEntity>(
-        reactions,
-        (r) => r.messageId.isIn(messageIds),
-      );
-    });
-  }
+  /// Deletes all the reactions whose [Reactions.messageId] is
+  /// present in [messageIds]
+  Future<void> deleteReactionsByMessageIds(List<String> messageIds) =>
+      batch((it) {
+        it.deleteWhere<Reactions, ReactionEntity>(
+          reactions,
+          (r) => r.messageId.isIn(messageIds),
+        );
+      });
 }

packages/stream_chat_persistence/lib/src/dao/read_dao.dart

@@ -3,7 +3,7 @@ import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/reads.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
-import '../mapper/mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
 part 'read_dao.g.dart';
 
@@ -14,30 +14,26 @@ class ReadDao extends DatabaseAccessor<MoorChatDatabase> with _$ReadDaoMixin {
   ReadDao(MoorChatDatabase db) : super(db);
 
   /// Get all reads where [Reads.channelCid] matches [cid]
-  Future<List<Read>> getReadsByCid(String cid) async {
-    return (select(reads).join([
-      leftOuterJoin(users, reads.userId.equalsExp(users.id)),
-    ])
-          ..where(reads.channelCid.equals(cid))
-          ..orderBy([
-            OrderingTerm.asc(reads.lastRead),
-          ]))
-        .map((row) {
-      final userEntity = row.readTable(users);
-      final readEntity = row.readTable(reads);
-      return readEntity.toRead(user: userEntity?.toUser());
-    }).get();
-  }
+  Future<List<Read>> getReadsByCid(String cid) async => (select(reads).join([
+        leftOuterJoin(users, reads.userId.equalsExp(users.id)),
+      ])
+            ..where(reads.channelCid.equals(cid))
+            ..orderBy([
+              OrderingTerm.asc(reads.lastRead),
+            ]))
+          .map((row) {
+        final userEntity = row.readTable(users);
+        final readEntity = row.readTable(reads);
+        return readEntity.toRead(user: userEntity?.toUser());
+      }).get();
 
   /// Updates the read data of a particular channel with
   /// the new [readList] data
-  Future<void> updateReads(String cid, List<Read> readList) {
-    return batch(
-      (it) => it.insertAll(
-        reads,
-        readList.map((r) => r.toEntity(cid: cid)).toList(),
-        mode: InsertMode.insertOrReplace,
-      ),
-    );
-  }
+  Future<void> updateReads(String cid, List<Read> readList) => batch(
+        (it) => it.insertAll(
+          reads,
+          readList.map((r) => r.toEntity(cid: cid)).toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
 }

packages/stream_chat_persistence/lib/src/dao/user_dao.dart

@@ -2,7 +2,7 @@ import 'package:moor/moor.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/entity/users.dart';
-import '../mapper/user_mapper.dart';
+import 'package:stream_chat_persistence/src/mapper/user_mapper.dart';
 
 part 'user_dao.g.dart';
 
@@ -13,13 +13,11 @@ class UserDao extends DatabaseAccessor<MoorChatDatabase> with _$UserDaoMixin {
   UserDao(MoorChatDatabase db) : super(db);
 
   /// Updates the users data with the new [userList] data
-  Future<void> updateUsers(List<User> userList) {
-    return batch(
-      (it) => it.insertAll(
-        users,
-        userList.map((u) => u.toEntity()).toList(),
-        mode: InsertMode.insertOrReplace,
-      ),
-    );
-  }
+  Future<void> updateUsers(List<User> userList) => batch(
+        (it) => it.insertAll(
+          users,
+          userList.map((u) => u.toEntity()).toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
 }