Fix merge

This commit is contained in:
Jake Barnby 2025-11-14 18:49:26 +13:00
parent 6274d5a3e4
commit 2349401a86
2 changed files with 8 additions and 4 deletions

View file

@ -166,7 +166,7 @@ class Update extends Action
}
if (!isset($collections[$collectionId])) {
$collections[$collectionId] = Authorization::skip(
$collections[$collectionId] = $authorization->skip(
fn () => $dbForProject->getCollection($collectionId)
);
}

View file

@ -84,6 +84,7 @@ class Migrations extends Action
->inject('deviceForFiles')
->inject('queueForMails')
->inject('plan')
->inject('authorization')
->callback($this->action(...));
}
@ -101,6 +102,7 @@ class Migrations extends Action
Device $deviceForFiles,
Mail $queueForMails,
array $plan,
Authorization $authorization,
): void {
$payload = $message->getPayload() ?? [];
$this->deviceForMigrations = $deviceForMigrations;
@ -127,7 +129,7 @@ class Migrations extends Action
return;
}
$this->processMigration($migration, $queueForRealtime, $queueForMails);
$this->processMigration($migration, $queueForRealtime, $queueForMails, $authorization);
}
/**
@ -296,6 +298,7 @@ class Migrations extends Action
Document $migration,
Realtime $queueForRealtime,
Mail $queueForMails,
Authorization $authorization,
): void {
$project = $this->dbForPlatform->getDocument('projects', $this->project->getId());
$tempAPIKey = $this->generateAPIKey($project);
@ -432,7 +435,8 @@ class Migrations extends Action
protected function handleCSVExportComplete(
Document $project,
Document $migration,
Mail $queueForMails
Mail $queueForMails,
Authorization $authorization,
): void {
$options = $migration->getAttribute('options', []);
$bucketId = 'default'; // Always use platform default bucket
@ -446,7 +450,7 @@ class Migrations extends Action
throw new \Exception('User ' . $userInternalId . ' not found');
}
$bucket = Authorization::skip(fn () => $this->dbForPlatform->getDocument('buckets', $bucketId));
$bucket = $authorization->skip(fn () => $this->dbForPlatform->getDocument('buckets', $bucketId));
if ($bucket->isEmpty()) {
throw new \Exception('Bucket not found');
}