wip

Author: eyeinsky

libs/wire-api/src/Wire/API/Routes/Internal/Brig.hs

@@ -283,7 +283,7 @@ type GetGroupsInternal =
         :> "user-groups"
         :> Capture "tid" TeamId
         :> QueryParam' [Optional, Strict] "nameContains" Text.Text
-        :> Get '[Servant.JSON] UserGroupPage
+        :> Get '[Servant.JSON] UserGroupPageWithMembers
     )
 
 type UpdateGroupInternal =

libs/wire-subsystems/src/Wire/BrigAPIAccess/Rpc.hs

@@ -63,6 +63,7 @@ import Wire.API.UserGroup.Pagination
 import Wire.BrigAPIAccess (BrigAPIAccess (..), DeleteGroupManagedError (..), OpaqueAuthToken (..))
 import Wire.ParseException
 import Wire.Rpc
+import Debug.Trace
 
 interpretBrigAccess ::
   ( Member TinyLog r,
@@ -614,7 +615,8 @@ getGroupsInternal tid mbFilter = do
         . paths ["i", "user-groups", toByteString' tid]
         . maybe id (queryItem "nameContains" . Text.encodeUtf8) maybeDisplayName
         . expect2xx
-  decodeBodyOrThrow "brig" r
+
+  traceShow r $ decodeBodyOrThrow "brig" r
 
 updateGroup ::
   (Member Rpc r, Member (Input Endpoint) r) =>

libs/wire-subsystems/src/Wire/UserGroupStore.hs

@@ -53,6 +53,7 @@ data UserGroupStore m a where
   CreateUserGroup :: TeamId -> NewUserGroup -> ManagedBy -> UserGroupStore m UserGroup
   GetUserGroup :: TeamId -> UserGroupId -> Bool -> UserGroupStore m (Maybe UserGroup)
   GetUserGroups :: UserGroupPageRequest -> UserGroupStore m UserGroupPage
+  GetUserGroupsWithMembers :: UserGroupPageRequest -> UserGroupStore m UserGroupPageWithMembers
   GetUserGroupsForConv :: ConvId -> UserGroupStore m (Vector UserGroup)
   UpdateUserGroup :: TeamId -> UserGroupId -> UserGroupUpdate -> UserGroupStore m (Maybe ())
   DeleteUserGroup :: TeamId -> UserGroupId -> UserGroupStore m (Maybe ())

libs/wire-subsystems/src/Wire/UserGroupStore/Postgres.hs

@@ -65,6 +65,7 @@ interpretUserGroupStoreToPostgres =
     CreateUserGroup team newUserGroup managedBy -> createUserGroup team newUserGroup managedBy
     GetUserGroup team userGroupId includeChannels -> getUserGroup team userGroupId includeChannels
     GetUserGroups req -> getUserGroups req
+    GetUserGroupsWithMembers req -> getUserGroupsWithMembers req
     GetUserGroupsForConv convId -> getUserGroupsForConv convId
     UpdateUserGroup tid gid gup -> updateGroup tid gid gup
     DeleteUserGroup tid gid -> deleteGroup tid gid
@@ -220,6 +221,20 @@ getUserGroup team id_ includeChannels = do
             where ug.id = ($1 :: uuid) and ug.team_id = ($2 :: uuid)
           |]
 
+getUserGroupsWithMembers ::
+  forall r.
+  ( UserGroupStorePostgresEffectConstraints r,
+    Member (Input (Local ())) r
+  ) =>
+  UserGroupPageRequest ->
+  Sem r UserGroupPageWithMembers
+getUserGroupsWithMembers req = do
+  undefined -- userGroupFromMeta <$> getUserGroups req
+  where
+    userGroupFromMeta :: UserGroupMeta -> UserGroup
+    userGroupFromMeta UserGroup_ {..} = UserGroup_ {members = pure mempty, ..}
+
+
 getUserGroups ::
   forall r.
   ( UserGroupStorePostgresEffectConstraints r,

libs/wire-subsystems/src/Wire/UserGroupSubsystem.hs

@@ -75,7 +75,7 @@ data UserGroupSubsystem m a where
   -- Internal API handlers
   CreateGroupInternal :: ManagedBy -> TeamId -> Maybe UserId -> NewUserGroup -> UserGroupSubsystem r UserGroup
   GetGroupInternal :: TeamId -> UserGroupId -> Bool -> UserGroupSubsystem m (Maybe UserGroup)
-  GetGroupsInternal :: TeamId -> Maybe Text -> UserGroupSubsystem m UserGroupPage
+  GetGroupsInternal :: TeamId -> Maybe Text -> UserGroupSubsystem m UserGroupPageWithMembers
   ResetUserGroupInternal :: UpdateGroupInternalRequest -> UserGroupSubsystem m ()
 
 makeSem ''UserGroupSubsystem

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

@@ -282,7 +282,7 @@ getUserGroupsInternal ::
   ) =>
   TeamId ->
   Maybe Text ->
-  Sem r UserGroupPage
+  Sem r UserGroupPageWithMembers
 getUserGroupsInternal team displayNameSubstring = do
   let -- hscim doesn't support pagination at the time of writing this,
       -- so we better fit all groups into one page!
@@ -297,7 +297,7 @@ getUserGroupsInternal team displayNameSubstring = do
             includeMemberCount = True,
             includeChannels = False
           }
-  Store.getUserGroups pageReq
+  Store.getUserGroupsWithMembers pageReq
 
 updateGroup ::
   ( Member UserSubsystem r,

services/brig/src/Brig/API/Internal.hs

@@ -1030,7 +1030,7 @@ getGroupsInternalH ::
   ) =>
   TeamId ->
   Maybe T.Text ->
-  Handler r UserGroupPage
+  Handler r UserGroupPageWithMembers
 getGroupsInternalH tid nameContains =
   lift . liftSem $ getGroupsInternal tid nameContains