Skip to content

Fixed direct export error #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rzablodskyi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed direct export error #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aae155
Fixed direct export error
rzablodskyi Jul 31, 2026
5ed5ff9
.
rzablodskyi Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Jobs/Export.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function runNow(array $data, ?Job $job = null): void

// put attributes to metadata as fields
if (!empty($entityName) && $this->getMetadata()->get("scopes.$entityName.hasAttribute")) {
$exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId'), $data['feed']);
$exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId') ?? $data['feed']['id'], $data['feed']);
}

$typeService = $exportFeedService->getExportTypeService($data['feed']['type']);
Expand Down
2 changes: 1 addition & 1 deletion app/Jobs/ExportChunk.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function run(Job $job): void

// put attributes to metadata as fields
if (!empty($entityName) && $this->getMetadata()->get("scopes.$entityName.hasAttribute")) {
$exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId'), $data['feed']);
$exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId') ?? $data['feed']['id'], $data['feed']);
}

$res = $typeService->createCacheChunk();
Expand Down
6 changes: 4 additions & 2 deletions app/Repositories/ExportJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,10 @@ protected function afterSave(Entity $entity, array $options = [])
}

// update last status
$this->getEntityManager()->getRepository('ExportFeed')
->updateLastStatus($entity->get('exportFeedId'), $entity->get('state'));
if (!empty($entity->get('exportFeedId'))) {
$this->getEntityManager()->getRepository('ExportFeed')
->updateLastStatus($entity->get('exportFeedId'), $entity->get('state'));
}
}

if (!empty($feed = $entity->get('exportFeed'))) {
Expand Down
1 change: 1 addition & 0 deletions app/Services/ExportFeed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,6 +1104,7 @@ public function putAttributesToMetadata(string $exportFeedId, ?array $feedData =
}

$exportFeed = $this->getEntityManager()->getEntity('ExportFeed', $exportFeedId);

if (empty($exportFeed)) {
if ($feedData === null) {
return;
Expand Down