openinfra/openstackid-resources
Code Issues Proposed changes

Updated expand for Invitations

Browse Source 
now the groups are expanded by default

Change-Id: I44a1bb2054910c860854561ccc245fc43d83a3d5
This commit is contained in:
Sebastian Marcet 2017-02-02 11:12:28 -03:00
parent e6638bde6e
commit 079b7a59ca
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/ModelSerializers/ChatTeams/ChatTeamInvitationSerializer.php
View File

@ -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;

2
app/ModelSerializers/ChatTeams/ChatTeamSerializer.php
View File

@ -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;
}

2
tests/OAuth2ChatTeamApiTest.php
View File

@ -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,