Revert "Add TeamId to conversation.delete event"

This reverts commit dc6bc9c.

Author: supersven

integration/test/Test/Cells.hs

@@ -77,24 +77,6 @@ testCellsCreationEvent = do
 
   assertNoMessage q
 
-testCellsDeletionEvent :: (HasCallStack) => App ()
-testCellsDeletionEvent = do
-  -- start watcher before creating conversation
-  q0 <- watchCellsEvents def
-  (alice, tid, _) <- createTeam OwnDomain 1
-  conv <- postConversation alice defProteus {team = Just tid, cells = True} >>= getJSON 201
-  void $ deleteTeamConversation tid conv alice >>= assertSuccess
-
-  let q = q0 {filter = isConvDeleteNotif} :: QueueConsumer
-
-  event <- getMessage q %. "payload.0"
-  printJSON event
-  event %. "type" `shouldMatch` "conversation.delete"
-  event %. "qualified_conversation.id" `shouldMatch` (conv %. "qualified_id.id")
-  event %. "qualified_from" `shouldMatch` (alice %. "qualified_id")
-
-  assertNoMessage q
-
 testCellsCreationEventIsSentOnlyOnce :: (HasCallStack) => App ()
 testCellsCreationEventIsSentOnlyOnce = do
   -- start watcher before creating conversation

libs/wire-api/src/Wire/API/Conversation.hs

@@ -87,9 +87,6 @@ module Wire.API.Conversation
     ConversationRemoveMembers (..),
     AddPermissionUpdate (..),
 
-    -- * delete
-    ConversationDelete (..),
-
     -- * re-exports
     module Wire.API.Conversation.Member,
   )
@@ -1153,24 +1150,6 @@ instance ToSchema AddPermissionUpdate where
       $ AddPermissionUpdate
         <$> addPermission .= field "add_permission" schema
 
-newtype ConversationDelete = ConversationDelete
-  { teamId :: TeamId
-  }
-  deriving stock (Eq, Show)
-  deriving newtype (Arbitrary)
-  deriving (S.ToSchema, ToJSON, FromJSON) via Schema ConversationDelete
-
-instance ToSchema ConversationDelete where
-  schema =
-    objectWithDocModifier
-      "ConversationDelete"
-      (description ?~ "The action of deleting a conversation")
-      $ ConversationDelete
-        <$> teamId
-          .= field
-            "teamId"
-            (unnamed (schema @TeamId))
-
 --------------------------------------------------------------------------------
 -- MultiVerb instances
 

libs/wire-api/src/Wire/API/Conversation/Action.hs

@@ -60,7 +60,7 @@ type family ConversationAction (tag :: ConversationActionTag) :: Type where
   ConversationAction ConversationJoinTag = ConversationJoin
   ConversationAction ConversationLeaveTag = ()
   ConversationAction ConversationMemberUpdateTag = ConversationMemberUpdate
-  ConversationAction ConversationDeleteTag = ConversationDelete
+  ConversationAction ConversationDeleteTag = ()
   ConversationAction ConversationRenameTag = ConversationRename
   ConversationAction ConversationMessageTimerUpdateTag = ConversationMessageTimerUpdate
   ConversationAction ConversationReceiptModeUpdateTag = ConversationReceiptModeUpdate
@@ -136,7 +136,11 @@ conversationActionSchema SConversationLeaveTag =
     $ pure ()
 conversationActionSchema SConversationRemoveMembersTag = schema
 conversationActionSchema SConversationMemberUpdateTag = schema @ConversationMemberUpdate
-conversationActionSchema SConversationDeleteTag = schema
+conversationActionSchema SConversationDeleteTag =
+  objectWithDocModifier
+    "ConversationDelete"
+    (S.description ?~ "The action of deleting a conversation")
+    (pure ())
 conversationActionSchema SConversationRenameTag = schema
 conversationActionSchema SConversationMessageTimerUpdateTag = schema
 conversationActionSchema SConversationReceiptModeUpdateTag = schema
@@ -203,7 +207,7 @@ conversationActionToEvent tag now quid qcnv subconv action =
           let ConversationMemberUpdate target (OtherMemberUpdate role) = action
               update = MemberUpdateData target Nothing Nothing Nothing Nothing Nothing Nothing role
            in EdMemberUpdate update
-        SConversationDeleteTag -> EdConvDelete action
+        SConversationDeleteTag -> EdConvDelete
         SConversationRenameTag -> EdConvRename action
         SConversationMessageTimerUpdateTag -> EdConvMessageTimerUpdate action
         SConversationReceiptModeUpdateTag -> EdConvReceiptModeUpdate action

libs/wire-api/src/Wire/API/Event/Conversation.hs

@@ -185,7 +185,7 @@ data EventData
   | EdConnect Connect
   | EdConvReceiptModeUpdate ConversationReceiptModeUpdate
   | EdConvRename ConversationRename
-  | EdConvDelete ConversationDelete
+  | EdConvDelete
   | EdConvReset GroupId
   | EdConvAccessUpdate ConversationAccessData
   | EdConvMessageTimerUpdate ConversationMessageTimerUpdate
@@ -218,7 +218,7 @@ genEventData = \case
   OtrMessageAdd -> EdOtrMessage <$> arbitrary
   MLSMessageAdd -> EdMLSMessage <$> arbitrary
   MLSWelcome -> EdMLSWelcome <$> arbitrary
-  ConvDelete -> EdConvDelete <$> arbitrary
+  ConvDelete -> pure EdConvDelete
   ConvReset -> EdConvReset <$> arbitrary
   ProtocolUpdate -> EdProtocolUpdate <$> arbitrary
   AddPermissionUpdate -> EdAddPermissionUpdate <$> arbitrary
@@ -239,7 +239,7 @@ eventDataType (EdTyping _) = Typing
 eventDataType (EdOtrMessage _) = OtrMessageAdd
 eventDataType (EdMLSMessage _) = MLSMessageAdd
 eventDataType (EdMLSWelcome _) = MLSWelcome
-eventDataType (EdConvDelete _) = ConvDelete
+eventDataType EdConvDelete = ConvDelete
 eventDataType (EdConvReset _) = ConvReset
 eventDataType (EdProtocolUpdate _) = ProtocolUpdate
 eventDataType (EdAddPermissionUpdate _) = AddPermissionUpdate
@@ -449,7 +449,7 @@ taggedEventDataSchema =
       MLSWelcome -> tag _EdMLSWelcome base64Schema
       Typing -> tag _EdTyping (unnamed schema)
       ConvCodeDelete -> tag _EdConvCodeDelete null_
-      ConvDelete -> tag _EdConvDelete (unnamed schema)
+      ConvDelete -> tag _EdConvDelete null_
       ConvReset -> tag _EdConvReset (unnamed (object "ConvResetData" (field "group_id" schema)))
       ProtocolUpdate -> tag _EdProtocolUpdate (unnamed (unProtocolUpdate <$> P.ProtocolUpdate .= schema))
       AddPermissionUpdate -> tag _EdAddPermissionUpdate (unnamed schema)

libs/wire-api/test/golden/Test/Wire/API/Golden/Generated/Event_user.hs

@@ -48,9 +48,7 @@ testObject_Event_user_1 =
     Nothing
     (Qualified (Id (fromJust (UUID.fromString "00003b8b-0000-3395-0000-076a00007830"))) (Domain "faraway.example.com"))
     (read "1864-05-22 09:51:07.104 UTC")
-    ( EdConvDelete
-        (ConversationDelete (Id (fromJust (UUID.fromString "90eda181-bb05-4525-a5cc-d0038deda9b7"))))
-    )
+    EdConvDelete
 
 testObject_Event_user_2 :: Event
 testObject_Event_user_2 =

libs/wire-api/test/golden/testObject_Event_user_1.json

@@ -1,8 +1,6 @@
 {
     "conversation": "00005d81-0000-0d71-0000-1d8f00007d32",
-    "data": {
-        "teamId": "90eda181-bb05-4525-a5cc-d0038deda9b7"
-    },
+    "data": null,
     "from": "00003b8b-0000-3395-0000-076a00007830",
     "qualified_conversation": {
         "domain": "faraway.example.com",

services/brig/test/integration/API/Provider.hs

@@ -763,9 +763,9 @@ testDeleteConvBotTeam config db brig galley cannon = withTestService config db b
     -- 200 response on success
     Team.deleteTeamConv galley tid cid uid2
     -- Events for the users
-    forM_ wss $ \ws -> wsAssertConvDelete ws qcid quid2 tid
+    forM_ wss $ \ws -> wsAssertConvDelete ws qcid quid2
     -- Event for the bot
-    svcAssertConvDelete buf quid2 qcid tid
+    svcAssertConvDelete buf quid2 qcid
   -- Check that the conversation no longer exists
   forM_ [uid1, uid2] $ \uid ->
     getConversationQualified galley uid qcid !!! const 404 === statusCode
@@ -787,7 +787,7 @@ testDeleteTeamBotTeam config db brig galley cannon = withTestService config db b
   -- events may or may not be sent (for instance, team members)
   -- leaving a conversation. Thus, we check _only_ for the relevant
   -- ones for the bot, which are the ConvDelete event
-  svcAssertEventuallyConvDelete buf quid1 qcid tid
+  svcAssertEventuallyConvDelete buf quid1 qcid
   -- Wait until all users have been deleted (can take a while)
   forM_ [uid1, uid2] $ \uid -> do
     void $ retryWhileN 20 (/= User.Deleted) (getStatus brig uid)
@@ -1847,8 +1847,8 @@ wsAssertMemberLeave ws conv usr old = void $
         evtFrom e @?= usr
         evtData e @?= EdMembersLeave EdReasonRemoved (QualifiedUserIdList old)
 
-wsAssertConvDelete :: (HasCallStack, MonadIO m) => WS.WebSocket -> Qualified ConvId -> Qualified UserId -> TeamId -> m ()
-wsAssertConvDelete ws conv from tid = void $
+wsAssertConvDelete :: (HasCallStack, MonadIO m) => WS.WebSocket -> Qualified ConvId -> Qualified UserId -> m ()
+wsAssertConvDelete ws conv from = void $
   liftIO $
     WS.assertMatch (5 # Second) ws $
       \n -> do
@@ -1857,7 +1857,7 @@ wsAssertConvDelete ws conv from tid = void $
         evtConv e @?= conv
         evtType e @?= ConvDelete
         evtFrom e @?= from
-        evtData e @?= EdConvDelete (ConversationDelete tid)
+        evtData e @?= EdConvDelete
 
 wsAssertMessage :: (HasCallStack, MonadIO m) => WS.WebSocket -> Qualified ConvId -> Qualified UserId -> ClientId -> ClientId -> Text -> m ()
 wsAssertMessage ws conv fromu fromc to txt = void $
@@ -1895,15 +1895,15 @@ svcAssertMemberLeave buf usr gone cnv = liftIO $ do
       assertEqual "event data" (EdMembersLeave EdReasonRemoved msg) (evtData e)
     _ -> assertFailure "Event timeout (TestBotMessage: member-leave)"
 
-svcAssertConvDelete :: (HasCallStack, MonadIO m) => Chan TestBotEvent -> Qualified UserId -> Qualified ConvId -> TeamId -> m ()
-svcAssertConvDelete buf usr cnv tid = liftIO $ do
+svcAssertConvDelete :: (HasCallStack, MonadIO m) => Chan TestBotEvent -> Qualified UserId -> Qualified ConvId -> m ()
+svcAssertConvDelete buf usr cnv = liftIO $ do
   evt <- timeout (5 # Second) $ readChan buf
   case evt of
     Just (TestBotMessage e) -> do
       assertEqual "event type" ConvDelete (evtType e)
       assertEqual "conv" cnv (evtConv e)
       assertEqual "user" usr (evtFrom e)
-      assertEqual "event data" (EdConvDelete (ConversationDelete tid)) (evtData e)
+      assertEqual "event data" EdConvDelete (evtData e)
     _ -> assertFailure "Event timeout (TestBotMessage: conv-delete)"
 
 svcAssertBotCreated :: (HasCallStack, MonadIO m) => Chan TestBotEvent -> BotId -> ConvId -> m TestBot
@@ -1929,18 +1929,18 @@ svcAssertMessage buf from msg cnv = liftIO $ do
       assertEqual "event data" (EdOtrMessage msg) (evtData e)
     _ -> assertFailure "Event timeout (TestBotMessage: otr-message-add)"
 
-svcAssertEventuallyConvDelete :: (HasCallStack, MonadIO m) => Chan TestBotEvent -> Qualified UserId -> Qualified ConvId -> TeamId -> m ()
-svcAssertEventuallyConvDelete buf usr cnv tid = liftIO $ do
+svcAssertEventuallyConvDelete :: (HasCallStack, MonadIO m) => Chan TestBotEvent -> Qualified UserId -> Qualified ConvId -> m ()
+svcAssertEventuallyConvDelete buf usr cnv = liftIO $ do
   evt <- timeout (5 # Second) $ readChan buf
   case evt of
     Just (TestBotMessage e) | evtType e == ConvDelete -> do
       assertEqual "event type" ConvDelete (evtType e)
       assertEqual "conv" cnv (evtConv e)
       assertEqual "user" usr (evtFrom e)
-      assertEqual "event data" (EdConvDelete (ConversationDelete tid)) (evtData e)
+      assertEqual "event data" EdConvDelete (evtData e)
     -- We ignore every other message type
     Just (TestBotMessage _) ->
-      svcAssertEventuallyConvDelete buf usr cnv tid
+      svcAssertEventuallyConvDelete buf usr cnv
     _ -> assertFailure "Event timeout (TestBotMessage: conv-delete)"
 
 unpackEvents :: Notification -> List1 Event

services/galley/src/Galley/API/Teams.hs

@@ -110,7 +110,7 @@ import Polysemy.Error
 import Polysemy.Input
 import Polysemy.TinyLog qualified as P
 import System.Logger qualified as Log
-import Wire.API.Conversation (ConversationDelete (..), ConversationRemoveMembers (..))
+import Wire.API.Conversation (ConversationRemoveMembers (..))
 import Wire.API.Conversation.Role (wireConvRoles)
 import Wire.API.Conversation.Role qualified as Public
 import Wire.API.Error
@@ -439,7 +439,7 @@ uncheckedDeleteTeam lusr zcon tid = do
       -- all team users are deleted immediately after these events are sent
       -- and will thus never be able to see these events in practice.
       let mm = nonTeamMembers convMembs teamMembs
-      let e = Conv.Event qconvId Nothing (tUntagged lusr) now (Conv.EdConvDelete (ConversationDelete tid))
+      let e = Conv.Event qconvId Nothing (tUntagged lusr) now Conv.EdConvDelete
       -- This event always contains all the required recipients
       let p =
             def
@@ -1036,9 +1036,9 @@ deleteTeamConversation ::
   TeamId ->
   ConvId ->
   Sem r ()
-deleteTeamConversation lusr zcon tid cid = do
+deleteTeamConversation lusr zcon _tid cid = do
   let lconv = qualifyAs lusr cid
-  void $ API.deleteLocalConversation lusr zcon tid lconv
+  void $ API.deleteLocalConversation lusr zcon lconv
 
 getSearchVisibility ::
   ( Member (ErrorS 'NotATeamMember) r,

services/galley/src/Galley/API/Update.hs

@@ -495,12 +495,11 @@ deleteLocalConversation ::
   ) =>
   Local UserId ->
   ConnId ->
-  TeamId ->
   Local ConvId ->
   Sem r (UpdateResult Event)
-deleteLocalConversation lusr con tid lcnv =
+deleteLocalConversation lusr con lcnv =
   getUpdateResult . fmap lcuEvent $
-    updateLocalConversation @'ConversationDeleteTag lcnv (tUntagged lusr) (Just con) (ConversationDelete tid)
+    updateLocalConversation @'ConversationDeleteTag lcnv (tUntagged lusr) (Just con) ()
 
 addCodeUnqualifiedWithReqBody ::
   forall r.

services/galley/test/integration/API/Federation.hs

@@ -607,7 +607,7 @@ notifyDeletedConversation :: TestM ()
 notifyDeletedConversation = do
   c <- view tsCannon
 
-  (tid, qalice, _) <- createBindingTeamWithQualifiedMembers 0
+  qalice <- randomQualifiedUser
   let alice = qUnqualified qalice
 
   bob <- randomId
@@ -638,7 +638,7 @@ notifyDeletedConversation = do
               FedGalley.origUserId = qbob,
               FedGalley.convId = qUnqualified qconv,
               FedGalley.alreadyPresentUsers = [alice],
-              FedGalley.action = SomeConversationAction (sing @'ConversationDeleteTag) (ConversationDelete tid)
+              FedGalley.action = SomeConversationAction (sing @'ConversationDeleteTag) ()
             }
     void $ runFedClient @"on-conversation-updated" fedGalleyClient bobDomain cu