fix user null

fix markAsRead
fix notification not always shown issue

Author: Magellan

lib/src/db/db_service.dart

@@ -197,6 +197,14 @@ class DatabaseService {
     }
   }
 
+  Stream<ConversationModel?> watchedConversation(String id) {
+    return store!
+        .box<ConversationModel>()
+        .query(ConversationModel_.id.equals(id))
+        .watch(triggerImmediately: true)
+        .map((query) => query.findFirst());
+  }
+
   /// ////////////////////////
   /// User Store Functions ///
   /// ////////////////////////
@@ -288,8 +296,14 @@ class DatabaseService {
         assignMessage(message, messageInDb);
       }
     }
+    try {
+      await store!.box<MessageModel>().putManyAsync(items, mode: PutMode.put);
+    } on UniqueViolationException catch (e) {
+      final id = int.tryParse(e.message.split(' ').last) ?? 0;
+      print('saveMessagesLocal UniqueViolationException e id= $id');
+      return saveMessagesLocal(items);
+    }
 
-    await store!.box<MessageModel>().putManyAsync(items, mode: PutMode.put);
     return true;
   }
 

lib/src/db/local/message_local_datasource.dart

@@ -1,6 +1,6 @@
 import '../../shared/errors/exceptions.dart';
 import '../db_service.dart';
-import '../models/message_model.dart';
+import '../models/models.dart';
 
 class MessageLocalDatasource {
   final DatabaseService _databaseService = DatabaseService.instance;
@@ -86,4 +86,13 @@ class MessageLocalDatasource {
       throw DatabaseException(e.toString());
     }
   }
+
+  Stream<ConversationModel?> watchedConversation(String id) {
+    print('watchedConversation');
+    try {
+      return _databaseService.watchedConversation(id);
+    } catch (e) {
+      throw DatabaseException(e.toString());
+    }
+  }
 }

lib/src/features/conversation/bloc/conversation_bloc.dart

@@ -37,9 +37,9 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
   final MessagesRepository messagesRepository;
   final UserRepository userRepository;
 
-  StreamSubscription<ConversationModel>? updateConversationStreamSubscription;
   StreamSubscription<ChatMessage>? incomingMessagesSubscription;
   StreamSubscription<MessageSendStatus>? statusMessagesSubscription;
+  StreamSubscription<ConversationModel?>? conversationWatcher;
 
   ConversationBloc({
     required this.currentConversation,
@@ -48,7 +48,7 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
     required this.userRepository,
   }) : super(ConversationState(
             conversation: currentConversation,
-            participants: currentConversation.participants.toSet())) {
+            participants: Set.of(currentConversation.participants))) {
     on<MessagesRequested>(_onMessagesRequested);
     on<MessagesMoreRequested>(
       _onMessagesMoreRequested,
@@ -79,16 +79,6 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
 
     add(const ParticipantsReceived());
 
-    updateConversationStreamSubscription =
-        conversationRepository.updateConversationStream.listen((chat) async {
-      if (chat.id != currentConversation.id) return;
-
-      if (currentConversation != chat) {
-        currentConversation = currentConversation.copyWithItem(item: chat);
-        add(_ConversationUpdated(currentConversation));
-      }
-    });
-
     incomingMessagesSubscription =
         messagesRepository.incomingMessagesStream.listen((message) async {
       if (message.cid != currentConversation.id) return;
@@ -117,6 +107,15 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
           break;
       }
     });
+
+    conversationWatcher = messagesRepository.localDatasource
+        .watchedConversation(currentConversation.id)
+        .listen((chat) {
+      if (chat != null && chat != currentConversation) {
+        currentConversation = currentConversation.copyWithItem(item: chat);
+        add(_ConversationUpdated(currentConversation));
+      }
+    });
   }
 
   Future<void> _onMessagesRequested(
@@ -132,7 +131,7 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
               status: ConversationStatus.success,
               messages: messages,
               hasReachedMax: false,
-              participants: currentConversation.participants.toSet(),
+              participants: Set.of(currentConversation.participants),
               initial: true),
         );
         add(const MessagesRequested());
@@ -188,8 +187,8 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
 
   Future<void> _onParticipantsReceived(
       ParticipantsReceived event, Emitter<ConversationState> emit) async {
-    var participants =
-        await conversationRepository.updateParticipants(currentConversation);
+    var participants = await conversationRepository
+        .updateParticipants(currentConversation.copyWith());
     emit(state.copyWith(participants: Set.of(participants)));
   }
 
@@ -277,9 +276,9 @@ class ConversationBloc extends Bloc<ConversationEvent, ConversationState> {
 
   @override
   Future<void> close() {
-    updateConversationStreamSubscription?.cancel();
     incomingMessagesSubscription?.cancel();
     statusMessagesSubscription?.cancel();
+    conversationWatcher?.cancel();
     return super.close();
   }
 }

lib/src/features/group_info/bloc/group_info_bloc.dart

@@ -29,7 +29,7 @@ class GroupInfoBloc extends Bloc<GroupInfoEvent, GroupInfoState> {
     on<GroupInfoResetChanges>(_onResetChanges);
     on<GroupInfoSubmitted>(_onSubmitted);
 
-    add(GroupParticipantsReceived(conversation.participants.toList()));
+    add(GroupParticipantsReceived(conversation.participants));
 
     _conversationRepository
         .getParticipants([state.conversation.id]).then((users) {

lib/src/features/group_info/view/group_info_form.dart

@@ -312,12 +312,13 @@ class _ParticipantsListForm extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     var state = context.read<GroupInfoBloc>().state;
-
+    var participants = state.participants.value.toList()
+      ..sort((a, b) => a.login!.compareTo(b.login!));
     return ListView.builder(
       shrinkWrap: true,
-      itemCount: state.participants.value.length,
+      itemCount: participants.length,
       itemBuilder: (BuildContext context, int index) {
-        final user = state.participants.value.elementAt(index);
+        final user = participants.elementAt(index);
         return ListTile(
           leading: AvatarLetterIcon(name: user.login!, avatar: user.avatar),
           title:

lib/src/repository/messages/messages_repository.dart

@@ -65,7 +65,7 @@ class MessagesRepository {
               await userRepository.getUserById(message.from!);
           var isOwn = currentUser?.id == message.from;
           var chatMessage = message.toChatMessage(
-              sender,
+              sender?? UserModel(),
               isOwn,
               i == 0 ||
                   isServiceMessage(data[i - 1]) ||
@@ -123,7 +123,7 @@ class MessagesRepository {
       var isOwn = currentUser?.id == message.from;
 
       var chatMessage = message.toChatMessage(
-          sender,
+          sender?? UserModel(),
           isOwn,
           i == 0 ||
               isServiceMessage(messages[i - 1]) ||

lib/src/repository/user/user_repository.dart

@@ -91,8 +91,10 @@ class UserRepository {
   Future<UserModel?> getUserById(String id) async {
     var user = await localDataSource.getUserLocal(id);
     if (user == null) {
-      user = (await api.getUsersByIds({id})).first.toUserModel();
-      user = (await localDataSource.saveUsersLocal([user])).first;
+      user = (await api.getUsersByIds({id})).firstOrNull?.toUserModel();
+      if(user != null) {
+        user = (await localDataSource.saveUsersLocal([user])).first;
+      }
     }
     return user;
   }