Revert "[wip] Filter searchable with /team/:tid/members?searchable=false"

This reverts commit 4790b05.

Author: eyeinsky

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

@@ -17,7 +17,6 @@
 
 module Wire.API.Routes.Public.Galley.TeamMember where
 
-import Data.Bool
 import Data.Id
 import Data.Int
 import Data.Range
@@ -61,13 +60,6 @@ type TeamMemberAPI =
              ]
              "pagingState"
              TeamMembersPagingState
-        :> QueryParam'
-             [ Optional,
-               Strict,
-               Description "Optional, return only non-seacrhable members when false."
-             ]
-             "searchable"
-             Bool
         :> Get '[JSON] TeamMembersPage
     )
     :<|> Named

services/brig/test/integration/API/User/Account.hs

@@ -720,14 +720,14 @@ testUserSearchable brig galley = do
   liftIO $ assertBool "/teams/:tid/members returns searchable and non-searchable users from team" $ all (`elem` uids) $ u1id : map userId [u3, u4]
 
   -- /teams/:tid/members?searchable=false gets only non-searchable members
-  -- r :: Team.Member.TeamMembersPage <- parseOrFail "TeamMembersPage" $
-  --   get ( galley
-  --         . paths ["teams", toByteString' tid, "members"]
-  --         . queryItem "searchable" "false"
-  --         . zUser u1id) <!! const 200 === statusCode
-  -- let teamMembers = mtpResults $ Team.Member.unTeamMembersPage r :: [Team.Member.TeamMemberOptPerms]
-  --     uids = map (^.Team.Member.userId) teamMembers
-  -- liftIO $ assertBool "/teams/:tid/members?searchable=false returns only non-searchable members" $ uids == [userId u4]
+  r :: Team.Member.TeamMembersPage <- parseOrFail "TeamMembersPage" $
+    get ( galley
+          . paths ["teams", toByteString' tid, "members"]
+          . queryItem "searchable" "false"
+          . zUser u1id) <!! const 200 === statusCode
+  let teamMembers = mtpResults $ Team.Member.unTeamMembersPage r :: [Team.Member.TeamMemberOptPerms]
+      uids = map (^.Team.Member.userId) teamMembers
+  liftIO $ assertBool "/teams/:tid/members?searchable=false returns only non-searchable members" $ uids == [userId u4]
 
   where
     contactUid :: Contact -> UserId

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

@@ -275,7 +275,7 @@ removeSettings' ::
   Sem r ()
 removeSettings' tid =
   withChunks
-    (\mps -> listTeamMembers @p tid mps maxBound Nothing) -- TODO_searchable: Pass Nothing here?
+    (\mps -> listTeamMembers @p tid mps maxBound)
     action
   where
     action :: [TeamMember] -> Sem r ()

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

@@ -477,23 +477,20 @@ getTeamMembers ::
   TeamId ->
   Maybe (Range 1 Public.HardTruncationLimit Int32) ->
   Maybe TeamMembersPagingState ->
-  Maybe Bool ->
   Sem r TeamMembersPage
-getTeamMembers lzusr tid mbMaxResults mbPagingState mbSearchable = do
+getTeamMembers lzusr tid mbMaxResults mbPagingState = do
   let uid = tUnqualified lzusr
   member <- E.getTeamMember tid uid >>= noteS @'NotATeamMember
   let mState = C.PagingState . LBS.fromStrict <$> (mbPagingState >>= mtpsState)
   let mLimit = fromMaybe (unsafeRange Public.hardTruncationLimit) mbMaxResults
   if member `hasPermission` SearchContacts
-    then case mbSearchable of
-      Just False -> E.listTeamMembers @CassandraPaging tid mState mLimit mbSearchable <&> toTeamMembersPage member
-      _ -> E.listTeamMembers @CassandraPaging tid mState mLimit mbSearchable <&> toTeamMembersPage member
+    then E.listTeamMembers @CassandraPaging tid mState mLimit <&> toTeamMembersPage member
     else do
       -- If the user does not have the SearchContacts permission (e.g. the external partner),
       -- we only return the person who invited them and the self user.
       let invitee = member ^. invitation <&> fst
       let uids = uid : maybeToList invitee
-      E.selectTeamMembersPaginated tid uids mState mLimit <&> toTeamMembersPage member -- TODO_searchable: Use `mbSearchable` in this branch of the if as well?
+      E.selectTeamMembersPaginated tid uids mState mLimit <&> toTeamMembersPage member
   where
     toTeamMembersPage :: TeamMember -> C.PageWithState TeamMember -> TeamMembersPage
     toTeamMembersPage member p =

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

@@ -122,7 +122,7 @@ getTeamMembersCSV lusr tid = do
   let encodeRow r = encodeDefaultOrderedByNameWith customEncodeOptions [r]
   let produceTeamExportUsers = do
         embedFinal $ writeChan chan (Just headerLine)
-        E.withChunks (\mps -> listTeamMembers @InternalPaging tid mps maxBound Nothing) $ -- TODO_searchable: Pass Nothing here?
+        E.withChunks (\mps -> listTeamMembers @InternalPaging tid mps maxBound) $
           \members -> unsafePooledForConcurrentlyN_ 8 members $ \member -> do
             mRecord <-
               runErrorS @TeamMemberNotFound $

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

@@ -74,7 +74,6 @@ module Galley.Cassandra.Queries
     selectTeam,
     selectUserTeamsIn,
     selectTeamMembers,
-    selectTeamMembersSearchable,
     selectOneUserTeam,
     selectTeamBindingWritetime,
     selectTeamBinding,
@@ -155,23 +154,6 @@ selectTeamMembers ::
     )
 selectTeamMembers = selectTeamMembersBase []
 
-selectTeamMembersNonSearchable ::
-  PrepQuery
-    R
-    (TeamId, Bool)
-    ( UserId,
-      Permissions,
-      Maybe UserId,
-      Maybe UTCTimeMillis,
-      Maybe UserLegalHoldStatus
-    )
-selectTeamMembersNonSearchable =
-  [r|
-    select user, perms, invited_by, invited_at, legalhold_status
-      from team_member
-    where team = ? and searchable = false order by user
-    |]
-
 selectTeamMembersFrom ::
   PrepQuery
     R
@@ -202,18 +184,6 @@ selectTeamMembers' =
     where team = ? and user in ? order by user
     |]
 
-selectTeamMembersSearchable ::
-  PrepQuery
-    R
-    (TeamId, Bool)
-    ( UserId,
-      Permissions,
-      Maybe UserId,
-      Maybe UTCTimeMillis,
-      Maybe UserLegalHoldStatus
-    )
-selectTeamMembersSearchable = selectTeamMembersBase ["searchable = ?"]
-
 selectUserTeams :: PrepQuery R (Identity UserId) (Identity TeamId)
 selectUserTeams = "select team from user_team where user = ? order by team"
 

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

@@ -199,13 +199,13 @@ interpretTeamMemberStoreToCassandra ::
   Sem (TeamMemberStore InternalPaging ': r) a ->
   Sem r a
 interpretTeamMemberStoreToCassandra lh = interpret $ \case
-  ListTeamMembers tid mps lim ms -> do
+  ListTeamMembers tid mps lim -> do
     logEffect "TeamMemberStore.ListTeamMembers"
     embedClient $ case mps of
       Nothing -> do
-        page <- teamMembersForPagination tid Nothing lim ms
+        page <- teamMembersForPagination tid Nothing lim
         mkInternalPage page (newTeamMember' lh tid)
-      Just ps -> ipNext ps -- TODO_searchable: do I need to pass ms (Maybe Bool) to here as well?
+      Just ps -> ipNext ps
 
 interpretTeamMemberStoreToCassandraWithPaging ::
   ( Member (Embed IO) r,
@@ -216,9 +216,9 @@ interpretTeamMemberStoreToCassandraWithPaging ::
   Sem (TeamMemberStore CassandraPaging ': r) a ->
   Sem r a
 interpretTeamMemberStoreToCassandraWithPaging lh = interpret $ \case
-  ListTeamMembers tid mps lim ms -> do
+  ListTeamMembers tid mps lim -> do
     logEffect "TeamMemberStore.ListTeamMembers"
-    embedClient $ teamMembersPageFrom lh tid mps lim ms
+    embedClient $ teamMembersPageFrom lh tid mps lim
 
 createTeam ::
   ( Member (Input ClientState) r,
@@ -377,7 +377,7 @@ teamMembersWithLimit lh t (fromRange -> limit) = do
 --       Maybe should be left explicitly for the caller?
 teamMembersCollectedWithPagination :: FeatureDefaults LegalholdConfig -> TeamId -> Client [TeamMember]
 teamMembersCollectedWithPagination lh tid = do
-  mems <- teamMembersForPagination tid Nothing (unsafeRange 2000) Nothing -- TODO_searchable: pass Nothing (the last argument to the call)?
+  mems <- teamMembersForPagination tid Nothing (unsafeRange 2000)
   collectTeamMembersPaginated [] mems
   where
     collectTeamMembersPaginated acc mems = do
@@ -458,7 +458,7 @@ markTeamDeletedAndRemoveTeamMembers :: TeamId -> Client ()
 markTeamDeletedAndRemoveTeamMembers tid = do
   -- TODO: delete service_whitelist records that mention this team
   retry x5 $ write Cql.markTeamDeleted (params LocalQuorum (PendingDelete, tid))
-  mems <- teamMembersForPagination tid Nothing (unsafeRange 2000) Nothing -- TODO_searchable: pass Nothing?
+  mems <- teamMembersForPagination tid Nothing (unsafeRange 2000)
   removeTeamMembers mems
   where
     removeTeamMembers ::
@@ -532,30 +532,20 @@ type RawTeamMember = (UserId, Permissions, Maybe UserId, Maybe UTCTimeMillis, Ma
 -- have a pure function of type RawTeamMember -> TeamMember so we cannot fmap
 -- over the ResultSet. We don't want to mess around with the Result size
 -- nextPage either otherwise
-teamMembersForPagination :: TeamId -> Maybe UserId -> Range 1 HardTruncationLimit Int32 -> Maybe Bool -> Client (Page RawTeamMember)
-teamMembersForPagination tid start (fromRange -> max) ms =
+teamMembersForPagination :: TeamId -> Maybe UserId -> Range 1 HardTruncationLimit Int32 -> Client (Page RawTeamMember)
+teamMembersForPagination tid start (fromRange -> max) =
   case start of
     Just u -> paginate Cql.selectTeamMembersFrom (paramsP LocalQuorum (tid, u) max)
-    Nothing -> case ms of
-      Just searchable -> paginate Cql.selectTeamMembersSearchable (paramsP LocalQuorum (tid, searchable) max)
-      Nothing -> paginate Cql.selectTeamMembers (paramsP LocalQuorum (Identity tid) max)
+    Nothing -> paginate Cql.selectTeamMembers (paramsP LocalQuorum (Identity tid) max)
 
 teamMembersPageFrom ::
   FeatureDefaults LegalholdConfig ->
   TeamId ->
   Maybe PagingState ->
   Range 1 HardTruncationLimit Int32 ->
-  Maybe Bool ->
   Client (PageWithState TeamMember)
-teamMembersPageFrom lh tid pagingState (fromRange -> max) ms = do
-  page <- case ms of
-    Just searchable -> paginateWithState Cql.selectTeamMembersSearchable (paramsPagingState LocalQuorum (tid, searchable) max pagingState)
-    -- WIP_searchable: This is what is called from
-    -- /team/:tid/members?searchable=true. The issue is that this
-    -- queries the team_members table from cassandra and not the
-    -- users' table where the searchable field is. Cassandra doesn't
-    -- seem to support joins, so am currently stomped on how to proceed.
-    Nothing -> paginateWithState Cql.selectTeamMembers (paramsPagingState LocalQuorum (Identity tid) max pagingState)
+teamMembersPageFrom lh tid pagingState (fromRange -> max) = do
+  page <- paginateWithState Cql.selectTeamMembers (paramsPagingState LocalQuorum (Identity tid) max pagingState)
   members <- mapM (newTeamMember' lh tid) (pwsResults page)
   pure $ PageWithState members (pwsState page)
 

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

@@ -37,7 +37,6 @@ data TeamMemberStore p m a where
     TeamId ->
     Maybe (PagingState p TeamMember) ->
     PagingBounds p TeamMember ->
-    Maybe Bool ->
     TeamMemberStore p m (Page p TeamMember)
 
 makeSem ''TeamMemberStore