core: decrease membersRequireAttention counter when member is deleted or leaves (#5919)

src/Simplex/Chat/Store/Groups.hs

@@ -81,6 +81,7 @@ module Simplex.Chat.Store.Groups
     updateGroupMemberStatusById,
     updateGroupMemberAccepted,
     updateGroupMembersRequireAttention,
+    decreaseGroupMembersRequireAttention,
     increaseGroupMembersRequireAttention,
     createNewGroupMember,
     checkGroupMemberHasItems,
@@ -1231,24 +1232,28 @@ updateGroupMemberAccepted db User {userId} m@GroupMember {groupMemberId} status
   pure m {memberStatus = status, memberRole = role, updatedAt = currentTs}
 
 updateGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> GroupMember -> GroupMember -> IO GroupInfo
-updateGroupMembersRequireAttention db user@User {userId} g@GroupInfo {groupId, membersRequireAttention} member member'
+updateGroupMembersRequireAttention db user g member member'
   | nowRequires && not didRequire =
       increaseGroupMembersRequireAttention db user g
-  | not nowRequires && didRequire = do
-      DB.execute
-        db
-        [sql|
-          UPDATE groups
-          SET members_require_attention = members_require_attention - 1
-          WHERE user_id = ? AND group_id = ?
-        |]
-        (userId, groupId)
-      pure g {membersRequireAttention = membersRequireAttention - 1}
+  | not nowRequires && didRequire =
+      decreaseGroupMembersRequireAttention db user g
   | otherwise = pure g
   where
     didRequire = gmRequiresAttention member
     nowRequires = gmRequiresAttention member'
 
+decreaseGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> IO GroupInfo
+decreaseGroupMembersRequireAttention db User {userId} g@GroupInfo {groupId, membersRequireAttention} = do
+  DB.execute
+    db
+    [sql|
+      UPDATE groups
+      SET members_require_attention = members_require_attention - 1
+      WHERE user_id = ? AND group_id = ?
+    |]
+    (userId, groupId)
+  pure g {membersRequireAttention = membersRequireAttention - 1}
+
 increaseGroupMembersRequireAttention :: DB.Connection -> User -> GroupInfo -> IO GroupInfo
 increaseGroupMembersRequireAttention db User {userId} g@GroupInfo {groupId, membersRequireAttention} = do
   DB.execute

src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt

@@ -1335,14 +1335,6 @@ SEARCH group_profiles USING INTEGER PRIMARY KEY (rowid=?)
 LIST SUBQUERY 1
 SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
 
-Query: 
-          UPDATE groups
-          SET members_require_attention = members_require_attention - 1
-          WHERE user_id = ? AND group_id = ?
-        
-Plan:
-SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
-
 Query: 
           UPDATE user_contact_links
           SET auto_accept = ?, business_address = ?, auto_accept_incognito = ?, auto_reply_msg_content = ?
@@ -4451,6 +4443,14 @@ Query:
 Plan:
 SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
 
+Query: 
+      UPDATE groups
+      SET members_require_attention = members_require_attention - 1
+      WHERE user_id = ? AND group_id = ?
+    
+Plan:
+SEARCH groups USING INTEGER PRIMARY KEY (rowid=?)
+
 Query: 
       UPDATE groups
       SET via_group_link_uri_hash = (SELECT via_contact_uri_hash FROM connections WHERE connection_id = ?)