1
0
Fork 0
mirror of synced 2024-06-02 19:04:49 +12:00

feat: fix deletes workker bug

This commit is contained in:
Christy Jacob 2021-06-14 10:41:48 +05:30
parent cfd6aed48e
commit 09a90a5631
2 changed files with 266 additions and 277 deletions

View file

@ -32,7 +32,7 @@ class DeletesV1
public function perform()
{
$projectId = $this->args['projectId'];
$projectId = isset($this->args['projectId']) ? $this->args['projectId'] : '';
$type = $this->args['type'];
switch (strval($type)) {
@ -101,8 +101,6 @@ class DeletesV1
}
protected function deleteMemberships(Document $document, $projectId) {
var_dump("In deleteMembership");
var_dump($document);
// Delete Memberships
$this->deleteByGroup([
'$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
@ -232,7 +230,6 @@ class DeletesV1
Authorization::disable();
Console::success($document->getAttribute('name', 'noname'));
var_dump($document);
if($database->deleteDocument($document->getId())) {
Console::success('Deleted document "'.$document->getId().'" successfully');
@ -266,7 +263,6 @@ class DeletesV1
Authorization::disable();
$projects = $this->getConsoleDB()->getCollection([
'limit' => $limit,
'offset' => $count,
'orderType' => 'ASC',
'orderCast' => 'string',
'filters' => [
@ -309,7 +305,6 @@ class DeletesV1
$results = $database->getCollection([
'limit' => $limit,
'offset' => $count,
'orderField' => '$id',
'orderType' => 'ASC',
'orderCast' => 'string',
@ -318,12 +313,6 @@ class DeletesV1
Authorization::reset();
var_dump("chunk=".$chunk);
var_dump("sum=".$sum);
var_dump("limit=".$limit);
var_dump("offset=".$count);
var_dump("count(results)=".count($results));
$sum = count($results);
Console::info('Deleting chunk #'.$chunk.'. Found '.$sum.' documents');

View file

@ -6,275 +6,15 @@ use Tests\E2E\Client;
trait TeamsBaseClient
{
// /**
// * @depends testCreateTeam
// */
// public function testGetTeamMemberships($data):array
// {
// $teamUid = $data['teamUid'] ?? '';
// /**
// * Test for SUCCESS
// */
// $response = $this->client->call(Client::METHOD_GET, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()));
// $this->assertEquals(200, $response['headers']['status-code']);
// $this->assertIsInt($response['body']['sum']);
// $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
// $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['name']);
// $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['email']);
// $this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]);
// /**
// * Test for FAILURE
// */
// return $data;
// }
// /**
// * @depends testCreateTeam
// */
// public function testCreateTeamMembership($data):array
// {
// $teamUid = $data['teamUid'] ?? '';
// $teamName = $data['teamName'] ?? '';
// $email = uniqid().'friend@localhost.test';
// /**
// * Test for SUCCESS
// */
// $response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()), [
// 'email' => $email,
// 'name' => 'Friend User',
// 'roles' => ['admin', 'editor'],
// 'url' => 'http://localhost:5000/join-us#title'
// ]);
// $this->assertEquals(201, $response['headers']['status-code']);
// $this->assertNotEmpty($response['body']['$id']);
// $this->assertNotEmpty($response['body']['userId']);
// $this->assertNotEmpty($response['body']['teamId']);
// $this->assertCount(2, $response['body']['roles']);
// $this->assertIsInt($response['body']['joined']);
// $this->assertEquals(false, $response['body']['confirm']);
// $lastEmail = $this->getLastEmail();
// $this->assertEquals($email, $lastEmail['to'][0]['address']);
// $this->assertEquals('Friend User', $lastEmail['to'][0]['name']);
// $this->assertEquals('Invitation to '.$teamName.' Team at '.$this->getProject()['name'], $lastEmail['subject']);
// $secret = substr($lastEmail['text'], strpos($lastEmail['text'], '&secret=', 0) + 8, 256);
// $membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 13);
// $userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 13);
// /**
// * Test for FAILURE
// */
// $response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()), [
// 'email' => 'dasdkaskdjaskdjasjkd',
// 'name' => 'Friend User',
// 'roles' => ['admin', 'editor'],
// 'url' => 'http://localhost:5000/join-us#title'
// ]);
// $this->assertEquals(400, $response['headers']['status-code']);
// $response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()), [
// 'email' => $email,
// 'name' => 'Friend User',
// 'roles' => 'bad string',
// 'url' => 'http://localhost:5000/join-us#title'
// ]);
// $this->assertEquals(400, $response['headers']['status-code']);
// $response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()), [
// 'email' => $email,
// 'name' => 'Friend User',
// 'roles' => ['admin', 'editor'],
// 'url' => 'http://example.com/join-us#title' // bad url
// ]);
// $this->assertEquals(400, $response['headers']['status-code']);
// return [
// 'teamUid' => $teamUid,
// 'secret' => $secret,
// 'membershipUid' => $membershipUid,
// 'userUid' => $userUid,
// ];
// }
// /**
// * @depends testCreateTeamMembership
// */
// public function testUpdateTeamMembership($data):array
// {
// $teamUid = $data['teamUid'] ?? '';
// $secret = $data['secret'] ?? '';
// $membershipUid = $data['membershipUid'] ?? '';
// $userUid = $data['userUid'] ?? '';
// /**
// * Test for SUCCESS
// */
// $response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ]), [
// 'secret' => $secret,
// 'userId' => $userUid,
// ]);
// $this->assertEquals(200, $response['headers']['status-code']);
// $this->assertNotEmpty($response['body']['$id']);
// $this->assertNotEmpty($response['body']['userId']);
// $this->assertNotEmpty($response['body']['teamId']);
// $this->assertCount(2, $response['body']['roles']);
// $this->assertIsInt($response['body']['joined']);
// $this->assertEquals(true, $response['body']['confirm']);
// /**
// * Test for FAILURE
// */
// $response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ]), [
// 'secret' => 'sdasdasd',
// 'userId' => $userUid,
// ]);
// $this->assertEquals(401, $response['headers']['status-code']);
// $response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ]), [
// 'secret' => '',
// 'userId' => $userUid,
// ]);
// $this->assertEquals(400, $response['headers']['status-code']);
// $response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ]), [
// 'secret' => $secret,
// 'userId' => 'sdasd',
// ]);
// $this->assertEquals(401, $response['headers']['status-code']);
// $response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ]), [
// 'secret' => $secret,
// 'userId' => '',
// ]);
// $this->assertEquals(400, $response['headers']['status-code']);
// return $data;
// }
// /**
// * @depends testUpdateTeamMembership
// */
// public function testDeleteTeamMembership($data):array
// {
// $teamUid = $data['teamUid'] ?? '';
// $membershipUid = $data['membershipUid'] ?? '';
// /**
// * Test for SUCCESS
// */
// $response = $this->client->call(Client::METHOD_DELETE, '/teams/'.$teamUid.'/memberships/'.$membershipUid, array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()));
// $this->assertEquals(204, $response['headers']['status-code']);
// $this->assertEmpty($response['body']);
// /**
// * Test for FAILURE
// */
// $response = $this->client->call(Client::METHOD_GET, '/teams/'.$teamUid.'/memberships/'.$membershipUid, array_merge([
// 'origin' => 'http://localhost',
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()));
// $this->assertEquals(200, $response['headers']['status-code']);
// $this->assertCount(1, $response['body']['memberships']);
// return [];
// }
/**
* @depends testCreateTeam
*/
public function testDeleteTeamMembershipsWorker($data):array
public function testGetTeamMemberships($data):array
{
$teamUid = $data['teamUid'] ?? '';
$count = 3;
/*
* Create $count Team Memberships
*/
for ($i = 0; $i < $count; ++$i) {
$email = uniqid().'friend@localhost.test';
/**
* Test for SUCCESS
*/
$response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'email' => $email,
'name' => 'Friend User ' . $i,
'roles' => ['admin', 'editor'],
'url' => 'http://localhost:5000/join-us#title'
]);
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertNotEmpty($response['body']['userId']);
$this->assertNotEmpty($response['body']['teamId']);
$this->assertCount(2, $response['body']['roles']);
$this->assertIsInt($response['body']['joined']);
$this->assertEquals(false, $response['body']['confirm']);
}
/**
* Get team memberships
* Test for SUCCESS
*/
$response = $this->client->call(Client::METHOD_GET, '/teams/'.$teamUid.'/memberships', array_merge([
'content-type' => 'application/json',
@ -282,12 +22,199 @@ trait TeamsBaseClient
], $this->getHeaders()));
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($count + 1 /* +1 for Team owner */, $response['body']['sum']);
$this->assertIsInt($response['body']['sum']);
$this->assertNotEmpty($response['body']['memberships'][0]['$id']);
$this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['name']);
$this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['email']);
$this->assertEquals('owner', $response['body']['memberships'][0]['roles'][0]);
/**
* Delete the team
* Test for FAILURE
*/
$response = $this->client->call(Client::METHOD_DELETE, '/teams/'.$teamUid, array_merge([
return $data;
}
/**
* @depends testCreateTeam
*/
public function testCreateTeamMembership($data):array
{
$teamUid = $data['teamUid'] ?? '';
$teamName = $data['teamName'] ?? '';
$email = uniqid().'friend@localhost.test';
/**
* Test for SUCCESS
*/
$response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'email' => $email,
'name' => 'Friend User',
'roles' => ['admin', 'editor'],
'url' => 'http://localhost:5000/join-us#title'
]);
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertNotEmpty($response['body']['userId']);
$this->assertNotEmpty($response['body']['teamId']);
$this->assertCount(2, $response['body']['roles']);
$this->assertIsInt($response['body']['joined']);
$this->assertEquals(false, $response['body']['confirm']);
$lastEmail = $this->getLastEmail();
$this->assertEquals($email, $lastEmail['to'][0]['address']);
$this->assertEquals('Friend User', $lastEmail['to'][0]['name']);
$this->assertEquals('Invitation to '.$teamName.' Team at '.$this->getProject()['name'], $lastEmail['subject']);
$secret = substr($lastEmail['text'], strpos($lastEmail['text'], '&secret=', 0) + 8, 256);
$membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 13);
$userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 13);
/**
* Test for FAILURE
*/
$response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'email' => 'dasdkaskdjaskdjasjkd',
'name' => 'Friend User',
'roles' => ['admin', 'editor'],
'url' => 'http://localhost:5000/join-us#title'
]);
$this->assertEquals(400, $response['headers']['status-code']);
$response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'email' => $email,
'name' => 'Friend User',
'roles' => 'bad string',
'url' => 'http://localhost:5000/join-us#title'
]);
$this->assertEquals(400, $response['headers']['status-code']);
$response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'email' => $email,
'name' => 'Friend User',
'roles' => ['admin', 'editor'],
'url' => 'http://example.com/join-us#title' // bad url
]);
$this->assertEquals(400, $response['headers']['status-code']);
return [
'teamUid' => $teamUid,
'secret' => $secret,
'membershipUid' => $membershipUid,
'userUid' => $userUid,
];
}
/**
* @depends testCreateTeamMembership
*/
public function testUpdateTeamMembership($data):array
{
$teamUid = $data['teamUid'] ?? '';
$secret = $data['secret'] ?? '';
$membershipUid = $data['membershipUid'] ?? '';
$userUid = $data['userUid'] ?? '';
/**
* Test for SUCCESS
*/
$response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
]), [
'secret' => $secret,
'userId' => $userUid,
]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
$this->assertNotEmpty($response['body']['userId']);
$this->assertNotEmpty($response['body']['teamId']);
$this->assertCount(2, $response['body']['roles']);
$this->assertIsInt($response['body']['joined']);
$this->assertEquals(true, $response['body']['confirm']);
/**
* Test for FAILURE
*/
$response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
]), [
'secret' => 'sdasdasd',
'userId' => $userUid,
]);
$this->assertEquals(401, $response['headers']['status-code']);
$response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
]), [
'secret' => '',
'userId' => $userUid,
]);
$this->assertEquals(400, $response['headers']['status-code']);
$response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
]), [
'secret' => $secret,
'userId' => 'sdasd',
]);
$this->assertEquals(401, $response['headers']['status-code']);
$response = $this->client->call(Client::METHOD_PATCH, '/teams/'.$teamUid.'/memberships/'.$membershipUid.'/status', array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
]), [
'secret' => $secret,
'userId' => '',
]);
$this->assertEquals(400, $response['headers']['status-code']);
return $data;
}
/**
* @depends testUpdateTeamMembership
*/
public function testDeleteTeamMembership($data):array
{
$teamUid = $data['teamUid'] ?? '';
$membershipUid = $data['membershipUid'] ?? '';
/**
* Test for SUCCESS
*/
$response = $this->client->call(Client::METHOD_DELETE, '/teams/'.$teamUid.'/memberships/'.$membershipUid, array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()));
@ -295,8 +222,81 @@ trait TeamsBaseClient
$this->assertEquals(204, $response['headers']['status-code']);
$this->assertEmpty($response['body']);
/**
* Test for FAILURE
*/
$response = $this->client->call(Client::METHOD_GET, '/teams/'.$teamUid.'/memberships/'.$membershipUid, array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()));
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertCount(1, $response['body']['memberships']);
return [];
}
// /**
// * @depends testCreateTeam
// */
// public function testDeleteTeamMembershipsWorker($data):array
// {
// $teamUid = $data['teamUid'] ?? '';
// $count = 100;
// /*
// * Create $count Team Memberships
// */
// for ($i = 0; $i < $count; ++$i) {
// $email = uniqid().'friend@localhost.test';
// /**
// * Test for SUCCESS
// */
// $response = $this->client->call(Client::METHOD_POST, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()), [
// 'email' => $email,
// 'name' => 'Friend User ' . $i,
// 'roles' => ['admin', 'editor'],
// 'url' => 'http://localhost:5000/join-us#title'
// ]);
// $this->assertEquals(201, $response['headers']['status-code']);
// $this->assertNotEmpty($response['body']['$id']);
// $this->assertNotEmpty($response['body']['userId']);
// $this->assertNotEmpty($response['body']['teamId']);
// $this->assertCount(2, $response['body']['roles']);
// $this->assertIsInt($response['body']['joined']);
// $this->assertEquals(false, $response['body']['confirm']);
// }
// /**
// * Get team memberships
// */
// $response = $this->client->call(Client::METHOD_GET, '/teams/'.$teamUid.'/memberships', array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()));
// $this->assertEquals(200, $response['headers']['status-code']);
// $this->assertEquals($count + 1 /* +1 for Team owner */, $response['body']['sum']);
// /**
// * Delete the team
// */
// $response = $this->client->call(Client::METHOD_DELETE, '/teams/'.$teamUid, array_merge([
// 'content-type' => 'application/json',
// 'x-appwrite-project' => $this->getProject()['$id'],
// ], $this->getHeaders()));
// $this->assertEquals(204, $response['headers']['status-code']);
// $this->assertEmpty($response['body']);
// return [];
// }
}