Merge remote-tracking branch 'origin/1.3.x' into feat-db-update-migrations
# Conflicts: # CHANGES.md
This commit is contained in:
commit
9a76507185
|
@ -12,6 +12,7 @@
|
||||||
## Bugs
|
## Bugs
|
||||||
- Fix not storing function's response on response codes 5xx [#4610](https://github.com/appwrite/appwrite/pull/4610)
|
- Fix not storing function's response on response codes 5xx [#4610](https://github.com/appwrite/appwrite/pull/4610)
|
||||||
- Fix expire to formatTz in create account session [#4985](https://github.com/appwrite/appwrite/pull/4985)
|
- Fix expire to formatTz in create account session [#4985](https://github.com/appwrite/appwrite/pull/4985)
|
||||||
|
- Fix deleting projects when organization is deleted [#5335](https://github.com/appwrite/appwrite/pull/5335)
|
||||||
- Fix deleting collections from a project [#4983](https://github.com/appwrite/appwrite/pull/4983)
|
- Fix deleting collections from a project [#4983](https://github.com/appwrite/appwrite/pull/4983)
|
||||||
- Fix cleaning up project databases [#4984](https://github.com/appwrite/appwrite/pull/4984)
|
- Fix cleaning up project databases [#4984](https://github.com/appwrite/appwrite/pull/4984)
|
||||||
- Fix creating documents with attributes with special characters [#246](https://github.com/utopia-php/database/pull/246)
|
- Fix creating documents with attributes with special characters [#246](https://github.com/utopia-php/database/pull/246)
|
||||||
|
|
|
@ -58,6 +58,9 @@ class DeletesV1 extends Worker
|
||||||
break;
|
break;
|
||||||
case DELETE_TYPE_TEAMS:
|
case DELETE_TYPE_TEAMS:
|
||||||
$this->deleteMemberships($document, $project->getId());
|
$this->deleteMemberships($document, $project->getId());
|
||||||
|
if ($project->getId() === 'console') {
|
||||||
|
$this->deleteProjectsByTeam($document);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case DELETE_TYPE_BUCKETS:
|
case DELETE_TYPE_BUCKETS:
|
||||||
$this->deleteBucket($document, $project->getId());
|
$this->deleteBucket($document, $project->getId());
|
||||||
|
@ -263,6 +266,24 @@ class DeletesV1 extends Worker
|
||||||
], $this->getProjectDB($projectId));
|
], $this->getProjectDB($projectId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param \Utopia\Database\Document $document
|
||||||
|
* @return void
|
||||||
|
* @throws \Exception
|
||||||
|
*/
|
||||||
|
protected function deleteProjectsByTeam(Document $document): void
|
||||||
|
{
|
||||||
|
$dbForConsole = $this->getConsoleDB();
|
||||||
|
|
||||||
|
$projects = $dbForConsole->find('projects', [
|
||||||
|
Query::equal('teamInternalId', [$document->getInternalId()])
|
||||||
|
]);
|
||||||
|
|
||||||
|
foreach ($projects as $project) {
|
||||||
|
$this->deleteProject($project);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Document $document project document
|
* @param Document $document project document
|
||||||
* @throws Exception
|
* @throws Exception
|
||||||
|
|
Loading…
Reference in a new issue