refactor: drop TeamId from ListUserGroupChannels

Author: blackheaven

libs/wire-subsystems/src/Wire/UserGroupStore.hs

@@ -38,6 +38,6 @@ data UserGroupStore m a where
   UpdateUsers :: UserGroupId -> Vector UserId -> UserGroupStore m ()
   RemoveUser :: UserGroupId -> UserId -> UserGroupStore m ()
   UpdateUserGroupChannels :: UserGroupId -> Vector ConvId -> UserGroupStore m ()
-  ListUserGroupChannels :: TeamId -> UserGroupId -> UserGroupStore m (Vector ConvId)
+  ListUserGroupChannels :: UserGroupId -> UserGroupStore m (Vector ConvId)
 
 makeSem ''UserGroupStore

libs/wire-subsystems/src/Wire/UserGroupStore/Postgres.hs

@@ -54,7 +54,7 @@ interpretUserGroupStoreToPostgres =
     UpdateUsers gid uids -> updateUsers gid uids
     RemoveUser gid uid -> removeUser gid uid
     UpdateUserGroupChannels gid convIds -> updateUserGroupChannels gid convIds
-    ListUserGroupChannels _ gid -> listUserGroupChannels gid
+    ListUserGroupChannels gid -> listUserGroupChannels gid
 
 updateUsers :: (UserGroupStorePostgresEffectConstraints r) => UserGroupId -> Vector UserId -> Sem r ()
 updateUsers gid uids = do

libs/wire-subsystems/src/Wire/UserGroupSubsystem/Interpreter.hs

@@ -363,5 +363,5 @@ listChannels ::
   Sem r (Vector ConvId)
 listChannels performer groupId = do
   void $ getUserGroup performer groupId >>= note UserGroupNotFound
-  teamId <- getUserTeam performer >>= note UserGroupNotATeamAdmin
-  Store.listUserGroupChannels teamId groupId
+  void $ getUserTeam performer >>= note UserGroupNotATeamAdmin
+  Store.listUserGroupChannels groupId

libs/wire-subsystems/test/unit/Wire/MockInterpreters/UserGroupStore.hs

@@ -65,7 +65,7 @@ userGroupStoreTestInterpreter =
     UpdateUsers gid uids -> updateUsersImpl gid uids
     RemoveUser gid uid -> removeUserImpl gid uid
     UpdateUserGroupChannels gid convIds -> updateUserGroupChannelsImpl gid convIds
-    ListUserGroupChannels tid gid -> listUserGroupChannelsImpl tid gid
+    ListUserGroupChannels gid -> listUserGroupChannelsImpl gid
 
 updateUsersImpl :: (UserGroupStoreInMemEffectConstraints r) => UserGroupId -> Vector UserId -> Sem r ()
 updateUsersImpl gid uids = do
@@ -204,11 +204,10 @@ updateUserGroupChannelsImpl gid convIds = do
 
 listUserGroupChannelsImpl ::
   (UserGroupStoreInMemEffectConstraints r) =>
-  TeamId ->
   UserGroupId ->
   Sem r (Vector ConvId)
-listUserGroupChannelsImpl tid gid =
-  foldMap (fmap qUnqualified) . (runIdentity . (.channels) <=< Map.lookup (tid, gid))
+listUserGroupChannelsImpl gid =
+  foldMap (fmap qUnqualified) . (runIdentity . (.channels) . snd <=< find ((== gid) . snd . fst) . Map.toList)
     <$> get @(Map (TeamId, UserGroupId) UserGroup)
 
 ----------------------------------------------------------------------