From 9f45bce55ff3edd00b3cb2d89efaaadc05ec489e Mon Sep 17 00:00:00 2001 From: "Fawzi E. Abdulfattah" Date: Sat, 23 Jul 2022 01:51:58 +0200 Subject: [PATCH 1/2] Fixing #3583 - create team membership to return added person name and email Signed-off-by: Fawzi E. Abdulfattah --- app/controllers/api/teams.php | 4 ++-- tests/e2e/Services/Teams/TeamsBaseClient.php | 2 ++ tests/e2e/Services/Teams/TeamsBaseServer.php | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 383bcac149..509de112cf 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -427,8 +427,8 @@ App::post('/v1/teams/:teamId/memberships') $response->dynamic( $membership ->setAttribute('teamName', $team->getAttribute('name')) - ->setAttribute('userName', $user->getAttribute('name')) - ->setAttribute('userEmail', $user->getAttribute('email')), + ->setAttribute('userName', $name) + ->setAttribute('userEmail', $email), Response::MODEL_MEMBERSHIP ); }); diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php index bd9b9c1ae0..08e2ddc8c8 100644 --- a/tests/e2e/Services/Teams/TeamsBaseClient.php +++ b/tests/e2e/Services/Teams/TeamsBaseClient.php @@ -107,6 +107,8 @@ trait TeamsBaseClient $this->assertEquals(201, $response['headers']['status-code']); $this->assertNotEmpty($response['body']['$id']); $this->assertNotEmpty($response['body']['userId']); + $this->assertEquals($name, $response['body']['userName']); + $this->assertEquals($email, $response['body']['userEmail']); $this->assertNotEmpty($response['body']['teamId']); $this->assertNotEmpty($response['body']['teamName']); $this->assertCount(2, $response['body']['roles']); diff --git a/tests/e2e/Services/Teams/TeamsBaseServer.php b/tests/e2e/Services/Teams/TeamsBaseServer.php index 9961cec247..f08664f4df 100644 --- a/tests/e2e/Services/Teams/TeamsBaseServer.php +++ b/tests/e2e/Services/Teams/TeamsBaseServer.php @@ -57,6 +57,8 @@ trait TeamsBaseServer $this->assertEquals(201, $response['headers']['status-code']); $this->assertNotEmpty($response['body']['$id']); $this->assertNotEmpty($response['body']['userId']); + $this->assertEquals('Friend User', $response['body']['userName']); + $this->assertEquals($email, $response['body']['userEmail']); $this->assertNotEmpty($response['body']['teamId']); $this->assertCount(2, $response['body']['roles']); $this->assertIsInt($response['body']['joined']); From 3f095757405955d3394a9f1a9299889c1c1a0222 Mon Sep 17 00:00:00 2001 From: "Fawzi E. Abdulfattah" Date: Mon, 25 Jul 2022 06:09:35 +0200 Subject: [PATCH 2/2] get the invitee info from the db Co-authored-by: Christy Jacob --- app/controllers/api/teams.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 509de112cf..79e1ac3d18 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -427,8 +427,8 @@ App::post('/v1/teams/:teamId/memberships') $response->dynamic( $membership ->setAttribute('teamName', $team->getAttribute('name')) - ->setAttribute('userName', $name) - ->setAttribute('userEmail', $email), + ->setAttribute('userName', $invitee->getAttribute('name')) + ->setAttribute('userEmail', $invitee->getAttribute('email')), Response::MODEL_MEMBERSHIP ); });