integration: Allow MLS State to track multiple conversations (#4329)

Makefile

@@ -134,7 +134,7 @@ crm: c db-migrate
 # Usage: TEST_INCLUDE=test1,test2 make devtest
 .PHONY: devtest
 devtest:
-	ghcid --command 'cabal repl integration' --test='Testlib.Run.mainI []'
+	ghcid --command 'cabal repl lib:integration' --test='Testlib.Run.mainI []'
 
 .PHONY: sanitize-pr
 sanitize-pr:

integration/default.nix

@@ -22,6 +22,8 @@
 , cookie
 , cql
 , cql-io
+, criterion
+, cryptobox-haskell
 , crypton
 , crypton-x509
 , cryptostore
@@ -119,6 +121,8 @@ mkDerivation {
     cookie
     cql
     cql-io
+    criterion
+    cryptobox-haskell
     crypton
     crypton-x509
     cryptostore

integration/integration.cabal

@@ -217,6 +217,8 @@ library
     , cookie
     , cql
     , cql-io
+    , criterion
+    , cryptobox-haskell
     , crypton
     , crypton-x509
     , cryptostore

integration/test/API/Galley.hs

@@ -120,17 +120,15 @@ deleteTeamMember tid owner mem = do
 putConversationProtocol ::
   ( HasCallStack,
     MakesValue user,
-    MakesValue qcnv,
     MakesValue protocol
   ) =>
   user ->
-  qcnv ->
+  ConvId ->
   protocol ->
   App Response
-putConversationProtocol user qcnv protocol = do
-  (domain, cnv) <- objQid qcnv
+putConversationProtocol user convId protocol = do
   p <- asString protocol
-  req <- baseRequest user Galley Versioned (joinHttpPath ["conversations", domain, cnv, "protocol"])
+  req <- baseRequest user Galley Versioned (joinHttpPath ["conversations", convId.domain, convId.id_, "protocol"])
   submit "PUT" (req & addJSONObject ["protocol" .= p])
 
 getConversation ::
@@ -148,21 +146,19 @@ getConversation user qcnv = do
 
 getSubConversation ::
   ( HasCallStack,
-    MakesValue user,
-    MakesValue conv
+    MakesValue user
   ) =>
   user ->
-  conv ->
+  ConvId ->
   String ->
   App Response
 getSubConversation user conv sub = do
-  (cnvDomain, cnvId) <- objQid conv
   req <-
     baseRequest user Galley Versioned
       $ joinHttpPath
         [ "conversations",
-          cnvDomain,
-          cnvId,
+          conv.domain,
+          conv.id_,
           "subconversations",
           sub
         ]
@@ -184,16 +180,15 @@ deleteSubConversation user sub = do
   submit "DELETE" $ req & addJSONObject ["group_id" .= groupId, "epoch" .= epoch]
 
 leaveSubConversation ::
-  (HasCallStack, MakesValue user, MakesValue sub) =>
+  (HasCallStack, MakesValue user) =>
   user ->
-  sub ->
+  ConvId ->
   App Response
-leaveSubConversation user sub = do
-  (conv, Just subId) <- objSubConv sub
-  (domain, convId) <- objQid conv
+leaveSubConversation user convId = do
+  let Just subId = convId.subconvId
   req <-
     baseRequest user Galley Versioned
-      $ joinHttpPath ["conversations", domain, convId, "subconversations", subId, "self"]
+      $ joinHttpPath ["conversations", convId.domain, convId.id_, "subconversations", subId, "self"]
   submit "DELETE" req
 
 getSelfConversation :: (HasCallStack, MakesValue user) => user -> App Response
@@ -278,16 +273,14 @@ mkProteusRecipients dom userClients msg = do
         & #text .~ fromString msg
 
 getGroupInfo ::
-  (HasCallStack, MakesValue user, MakesValue conv) =>
+  (HasCallStack, MakesValue user) =>
   user ->
-  conv ->
+  ConvId ->
   App Response
 getGroupInfo user conv = do
-  (qcnv, mSub) <- objSubConv conv
-  (convDomain, convId) <- objQid qcnv
-  let path = joinHttpPath $ case mSub of
-        Nothing -> ["conversations", convDomain, convId, "groupinfo"]
-        Just sub -> ["conversations", convDomain, convId, "subconversations", sub, "groupinfo"]
+  let path = joinHttpPath $ case conv.subconvId of
+        Nothing -> ["conversations", conv.domain, conv.id_, "groupinfo"]
+        Just sub -> ["conversations", conv.domain, conv.id_, "subconversations", sub, "groupinfo"]
   req <- baseRequest user Galley Versioned path
   submit "GET" req
 
@@ -323,7 +316,7 @@ deleteTeamConv ::
   App Response
 deleteTeamConv team conv user = do
   teamId <- objId team
-  convId <- objId conv
+  convId <- objId $ objQidObject conv
   req <- baseRequest user Galley Versioned (joinHttpPath ["teams", teamId, "conversations", convId])
   submit "DELETE" req