Merge pull request #9660 from appwrite/fix-deployment-deletion

Fix deployment and executions deletion
This commit is contained in:
Matej Bačo 2025-04-17 12:20:41 +02:00 committed by GitHub
commit f1ff8dd783
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -885,7 +885,9 @@ class Deletes extends Action
$deploymentInternalIds = []; $deploymentInternalIds = [];
$deploymentIds = []; $deploymentIds = [];
$this->deleteByGroup('deployments', [ $this->deleteByGroup('deployments', [
Query::equal('resourceInternalId', [$siteInternalId]) Query::equal('resourceInternalId', [$siteInternalId]),
Query::equal('resourceType', ['site']),
Query::orderAsc()
], $dbForProject, function (Document $document) use ($project, $certificates, $deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds) { ], $dbForProject, function (Document $document) use ($project, $certificates, $deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds) {
$deploymentInternalIds[] = $document->getInternalId(); $deploymentInternalIds[] = $document->getInternalId();
$deploymentIds[] = $document->getId(); $deploymentIds[] = $document->getId();
@ -894,6 +896,17 @@ class Deletes extends Action
$this->deleteDeploymentScreenshots($deviceForFiles, $dbForPlatform, $document); $this->deleteDeploymentScreenshots($deviceForFiles, $dbForPlatform, $document);
}); });
/**
* Delete Logs
*/
Console::info("Deleting logs for site " . $siteId);
$this->deleteByGroup('executions', [
Query::select($this->selects),
Query::equal('resourceInternalId', [$siteInternalId]),
Query::equal('resourceType', ['sites']),
Query::orderAsc()
], $dbForProject);
/** /**
* Delete VCS Repositories and VCS Comments * Delete VCS Repositories and VCS Comments
*/ */
@ -961,6 +974,7 @@ class Deletes extends Action
$deploymentInternalIds = []; $deploymentInternalIds = [];
$this->deleteByGroup('deployments', [ $this->deleteByGroup('deployments', [
Query::equal('resourceInternalId', [$functionInternalId]), Query::equal('resourceInternalId', [$functionInternalId]),
Query::equal('resourceType', ['function']),
Query::orderAsc() Query::orderAsc()
], $dbForProject, function (Document $document) use ($dbForPlatform, $project, $certificates, $deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) { ], $dbForProject, function (Document $document) use ($dbForPlatform, $project, $certificates, $deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
$deploymentInternalIds[] = $document->getInternalId(); $deploymentInternalIds[] = $document->getInternalId();
@ -974,7 +988,8 @@ class Deletes extends Action
Console::info("Deleting executions for function " . $functionId); Console::info("Deleting executions for function " . $functionId);
$this->deleteByGroup('executions', [ $this->deleteByGroup('executions', [
Query::select($this->selects), Query::select($this->selects),
Query::equal('functionInternalId', [$functionInternalId]), Query::equal('resourceInternalId', [$functionInternalId]),
Query::equal('resourceType', ['functions']),
Query::orderAsc() Query::orderAsc()
], $dbForProject); ], $dbForProject);