Fix failing test.

Author: fisx

libs/wire-api/src/Wire/API/Routes/Public/Galley.hs

@@ -947,6 +947,22 @@ type TeamAPI =
                     '[RespondEmpty 200 "Team updated"]
                     ()
            )
+    :<|> Named
+           "update-team-delete-splash-screen"
+           ( Summary "Update team properties: delete splash screen"
+               :> ZUser
+               :> ZConn
+               :> CanThrow 'NotATeamMember
+               :> CanThrow ('MissingPermission ('Just 'SetTeamData))
+               :> "teams"
+               :> Capture "tid" TeamId
+               :> "splash_screen"
+               :> MultiVerb
+                    'DELETE
+                    '[JSON]
+                    '[RespondEmpty 200 "Team updated"]
+                    ()
+           )
     :<|> Named
            "get-teams"
            ( Summary "Get teams (deprecated); use `GET /teams/:tid`"

services/galley/src/Galley/API/Public/Servant.hs

@@ -106,6 +106,7 @@ servantSitemap =
     team =
       mkNamedAPI @"create-non-binding-team" createNonBindingTeamH
         <@> mkNamedAPI @"update-team" updateTeamH
+        <@> mkNamedAPI @"update-team-delete-splash-screen" updateTeamDeleteSplashScreenH
         <@> mkNamedAPI @"get-teams" getManyTeams
         <@> mkNamedAPI @"get-team" getTeamH
         <@> mkNamedAPI @"delete-team" deleteTeam

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

@@ -21,6 +21,7 @@ module Galley.API.Teams
     createNonBindingTeamH,
     updateTeamH,
     updateTeamStatus,
+    updateTeamDeleteSplashScreenH,
     getTeamH,
     getTeamInternalH,
     getTeamNameInternalH,
@@ -336,6 +337,29 @@ updateTeamH zusr zcon tid updateData = do
   let r = list1 (userRecipient zusr) (membersToRecipients (Just zusr) (memList ^. teamMembers))
   E.push1 $ newPushLocal1 (memList ^. teamMemberListType) zusr (TeamEvent e) r & pushConn ?~ zcon
 
+updateTeamDeleteSplashScreenH ::
+  Members
+    '[ ErrorS 'NotATeamMember,
+       ErrorS ('MissingPermission ('Just 'SetTeamData)),
+       GundeckAccess,
+       Input UTCTime,
+       TeamStore
+     ]
+    r =>
+  UserId ->
+  ConnId ->
+  TeamId ->
+  Sem r ()
+updateTeamDeleteSplashScreenH zusr zcon tid = do
+  zusrMembership <- E.getTeamMember tid zusr
+  void $ permissionCheckS SSetTeamData zusrMembership
+  E.deleteTeamSplashScreen tid
+  now <- input
+  memList <- getTeamMembersForFanout tid
+  let e = newEvent tid now (EdTeamUpdate newTeamUpdateData)
+  let r = list1 (userRecipient zusr) (membersToRecipients (Just zusr) (memList ^. teamMembers))
+  E.push1 $ newPushLocal1 (memList ^. teamMemberListType) zusr (TeamEvent e) r & pushConn ?~ zcon
+
 deleteTeam ::
   forall r.
   ( Member BrigAccess r,

services/galley/src/Galley/Cassandra/Queries.hs

@@ -194,6 +194,9 @@ updateTeamStatus = "update team set status = ? where team = ?"
 updateTeamSplashScreen :: PrepQuery W (AssetKey, TeamId) ()
 updateTeamSplashScreen = "update team set splash_screen = ? where team = ?"
 
+deleteTeamSplashScreen :: PrepQuery W (Identity TeamId) ()
+deleteTeamSplashScreen = "update team set splash_screen = NULL where team = ?"
+
 -- Conversations ------------------------------------------------------------
 
 selectConv :: PrepQuery R (Identity ConvId) (ConvType, UserId, Maybe (C.Set Access), Maybe AccessRoleLegacy, Maybe (C.Set AccessRoleV2), Maybe Text, Maybe TeamId, Maybe Bool, Maybe Milliseconds, Maybe ReceiptMode, Maybe ProtocolTag, Maybe GroupId, Maybe Epoch, Maybe CipherSuiteTag)

services/galley/src/Galley/Cassandra/Team.hs

@@ -92,6 +92,7 @@ interpretTeamStoreToCassandra lh = interpret $ \case
   DeleteTeam tid -> embedClient $ deleteTeam tid
   DeleteTeamConversation tid cid -> embedClient $ removeTeamConv tid cid
   SetTeamData tid upd -> embedClient $ updateTeam tid upd
+  DeleteTeamSplashScreen tid -> embedClient $ deleteTeamSplashScreen tid
   SetTeamStatus tid st -> embedClient $ updateTeamStatus tid st
   FanoutLimit -> embedApp $ currentFanoutLimit <$> view options
   GetLegalHoldFlag ->
@@ -381,6 +382,10 @@ updateTeam tid u = retry x5 . batch $ do
   for_ (u ^. splashScreenUpdate) $ \ss ->
     addPrepQuery Cql.updateTeamSplashScreen (ss, tid)
 
+deleteTeamSplashScreen :: TeamId -> Client ()
+deleteTeamSplashScreen tid = retry x5 . batch $ do
+  addPrepQuery Cql.deleteTeamSplashScreen (Identity tid)
+
 -- | Construct 'TeamMember' from database tuple.
 -- If FeatureLegalHoldWhitelistTeamsAndImplicitConsent is enabled set UserLegalHoldDisabled
 -- if team is whitelisted.

services/galley/src/Galley/Effects/TeamStore.hs

@@ -44,6 +44,7 @@ module Galley.Effects.TeamStore
     -- ** Update teams
     deleteTeamConversation,
     setTeamData,
+    deleteTeamSplashScreen,
     setTeamStatus,
 
     -- ** Delete teams
@@ -123,6 +124,7 @@ data TeamStore m a where
   DeleteTeam :: TeamId -> TeamStore m ()
   DeleteTeamConversation :: TeamId -> ConvId -> TeamStore m ()
   SetTeamData :: TeamId -> TeamUpdateData -> TeamStore m ()
+  DeleteTeamSplashScreen :: TeamId -> TeamStore m ()
   SetTeamStatus :: TeamId -> TeamStatus -> TeamStore m ()
   FanoutLimit :: TeamStore m (Range 1 HardTruncationLimit Int32)
   GetLegalHoldFlag :: TeamStore m FeatureLegalHold