fix fetching the channels for a group

Author: battermann

integration/test/Test/UserGroup.hs

@@ -383,16 +383,18 @@ testUserGroupUpdateChannelsSucceeds = do
       >>= getJSON 200
   gid <- ug %. "id" & asString
 
-  convId <-
-    postConversation alice (defProteus {team = Just tid})
+  convIds <-
+    replicateM 2
+      $ postConversation alice (defProteus {team = Just tid})
       >>= getJSON 201
       >>= objConvId
-  updateUserGroupChannels alice gid [convId.id_] >>= assertSuccess
+  updateUserGroupChannels alice gid ((.id_) <$> convIds) >>= assertSuccess
 
   -- bobId <- asString $ bob %. "id"
   bindResponse (getUserGroupWithChannels alice gid) $ \resp -> do
     resp.status `shouldMatchInt` 200
-    resp.json %. "channels" `shouldMatch` [object ["id" .= convId.id_, "domain" .= convId.domain]]
+    actual <- resp.json %. "channels" >>= asList >>= traverse objQid
+    actual `shouldMatchSet` for convIds objQid
 
 -- FUTUREWORK: check the actual associated channels
 --  resp.json %. "members" `shouldMatch` [bobId]

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

@@ -1,16 +1,13 @@
 module Wire.BackgroundJobsRunner.Interpreter where
 
 import Data.Id
-import Data.Qualified
-import Debug.Trace
 import Imports
 import Polysemy
 import Polysemy.Error
 import Wire.API.BackgroundJobs
-import Wire.API.UserGroup
 import Wire.BackgroundJobsPublisher
 import Wire.BackgroundJobsRunner (BackgroundJobsRunner (..))
-import Wire.UserGroupStore (UserGroupStore, getUserGroup)
+import Wire.UserGroupStore (UserGroupStore, listUserGroupChannels)
 import Wire.UserStore
 
 data BackgroundJobError = BackgroundJobUserTeamNotFound
@@ -44,7 +41,6 @@ runJob job = case job.payload of
 
 runSyncUserGroupAndChannel :: JobId -> RequestId -> SyncUserGroupAndChannel -> Sem r ()
 runSyncUserGroupAndChannel _jid _rid _job = do
-  traceM "Running SyncUserGroupAndChannel job"
   pure ()
 
 runSyncUserGroup ::
@@ -59,10 +55,14 @@ runSyncUserGroup ::
   SyncUserGroup ->
   Sem r ()
 runSyncUserGroup _jid _rid job = do
-  traceM "======================== Running SyncUserGroup job ======================="
-  teamId <- getUserTeam job.actor >>= note BackgroundJobUserTeamNotFound
-  channels <- fromMaybe mempty . (foldMap (runIdentity . (.channels))) <$> getUserGroup teamId job.userGroupId
+  void $ getUserTeam job.actor >>= note BackgroundJobUserTeamNotFound
+  channels <- listUserGroupChannels job.userGroupId
   for_ channels $ \chan -> do
-    let job' = SyncUserGroupAndChannel job.userGroupId (qUnqualified chan) job.actor
+    let syncUserGroupAndChannel =
+          SyncUserGroupAndChannel
+            { userGroupId = job.userGroupId,
+              convId = chan,
+              actor = job.actor
+            }
     jobId <- liftIO randomId
-    publishJob jobId (JobSyncUserGroupAndChannel job')
+    publishJob jobId (JobSyncUserGroupAndChannel syncUserGroupAndChannel)

services/background-worker/src/Wire/BackgroundWorker/Jobs/Registry.hs

@@ -4,7 +4,6 @@ module Wire.BackgroundWorker.Jobs.Registry
 where
 
 import Data.Text qualified as T
-import Debug.Trace (traceM)
 import Hasql.Pool (Pool, UsageError)
 import Imports
 import Polysemy
@@ -21,7 +20,6 @@ import Wire.UserStore.Cassandra (interpretUserStoreCassandra)
 dispatchJob :: Job -> AppT IO (Either Text ())
 dispatchJob job = do
   env <- ask @Env
-  traceM $ "======================== Dispatching job " <> show job.jobId <> " ========================"
   liftIO $ runInterpreters env $ runJob job
   where
     runInterpreters env =