diff --git a/app/ModelSerializers/ChatTeams/ChatTeamInvitationSerializer.php b/app/ModelSerializers/ChatTeams/ChatTeamInvitationSerializer.php index 39fc4099..d25dc536 100644 --- a/app/ModelSerializers/ChatTeams/ChatTeamInvitationSerializer.php +++ b/app/ModelSerializers/ChatTeams/ChatTeamInvitationSerializer.php @@ -52,7 +52,7 @@ final class ChatTeamInvitationSerializer extends SilverStripeSerializer if(isset($values['inviter_id'])) { unset($values['inviter_id']); - $values['inviter'] = SerializerRegistry::getInstance()->getSerializer($invitation->getInviter())->serialize(); + $values['inviter'] = SerializerRegistry::getInstance()->getSerializer($invitation->getInviter())->serialize('groups'); } } break; @@ -60,7 +60,7 @@ final class ChatTeamInvitationSerializer extends SilverStripeSerializer if(isset($values['invitee_id'])) { unset($values['invitee_id']); - $values['invitee'] = SerializerRegistry::getInstance()->getSerializer($invitation->getInvitee())->serialize(); + $values['invitee'] = SerializerRegistry::getInstance()->getSerializer($invitation->getInvitee())->serialize('groups'); } } break; @@ -68,7 +68,7 @@ final class ChatTeamInvitationSerializer extends SilverStripeSerializer if(isset($values['team_id'])) { unset($values['team_id']); - $values['team'] = SerializerRegistry::getInstance()->getSerializer($invitation->getTeam())->serialize($expand = 'owner,members,member'); + $values['team'] = SerializerRegistry::getInstance()->getSerializer($invitation->getTeam())->serialize($expand = 'owner,members,member, groups'); } } break; diff --git a/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php b/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php index cf9dbc98..7d9d55c2 100644 --- a/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php +++ b/app/ModelSerializers/ChatTeams/ChatTeamSerializer.php @@ -77,7 +77,7 @@ final class ChatTeamSerializer extends SilverStripeSerializer // add pending invitations $invitations = []; foreach($team->getInvitations() as $invitation){ - $invitations[] = SerializerRegistry::getInstance()->getSerializer($invitation)->serialize('inviter,invitee'); + $invitations[] = SerializerRegistry::getInstance()->getSerializer($invitation)->serialize('inviter,invitee,'); } $values['invitations'] = $invitations; } diff --git a/tests/OAuth2ChatTeamApiTest.php b/tests/OAuth2ChatTeamApiTest.php index 314d5098..d0063938 100644 --- a/tests/OAuth2ChatTeamApiTest.php +++ b/tests/OAuth2ChatTeamApiTest.php @@ -94,7 +94,7 @@ final class OAuth2ChatTeamApiTest extends ProtectedApiTest } public function testGetMyTeams(){ - $params = ['expand' => 'owner, member']; + $params = ['expand' => 'owner, member, groups']; $headers = [ "HTTP_Authorization" => " Bearer " . $this->access_token,