Skip to content

Fixes #126

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
bbrands02 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8535954
Return response from action after throwing event
bbrands02 Jan 23, 2023
e48fb1e
error prevention
bbrands02 Jan 23, 2023
451c4f7
Apply fixes from StyleCI
StyleCIBot Jan 23, 2023
6b93716
Merge pull request #127 from CommonGateway/analysis-YOB7Ky
bbrands02 Jan 23, 2023
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 Service/CacheService.php → ActionHandler/Service/CacheService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private function removeDataFromCache(\MongoDB\Collection $collection, string $ty
$endpoints = $collection->find()->toArray();
foreach ($endpoints as $endpoint) {
if (!$this->entityManager->find($type, $endpoint['id'])) {
$this->io->writeln("removing {$endpoint['id']} from cache");
isset($this->io) && $this->io->writeln("removing {$endpoint['id']} from cache");
$collection->findOneAndDelete(['id' => $endpoint['id']]);
}
}
Expand Down
6 changes: 4 additions & 2 deletions Service/RequestService.php → ActionHandler/Service/RequestService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ public function getId(array $object)
} elseif (isset($this->data['query']['id'])) {
return $this->data['query']['id'];
} elseif (isset($this->data['path']['id'])) {
return$this->data['path']['id'];
return $this->data['path']['id'];
} elseif (isset($this->data['path']['{uuid}'])) {
return $this->data['path']['{uuid}'];
} elseif (isset($this->data['query']['uuid'])) {
return$this->data['query']['uuid'];
return $this->data['query']['uuid'];
} elseif (isset($this->content['id'])) { // the id might also be passed trough the object itself
return $this->content['id'];
} elseif (isset($this->content['uuid'])) {
Expand Down Expand Up @@ -544,6 +544,8 @@ public function requestHandler(array $data, array $configuration): Response
if (isset($eventType) && isset($this->object)) {
$event = new ActionEvent($eventType, ['response' => $this->object->toArray(), 'entity' => $this->object->getEntity()->getId()->toString()]);
$this->eventDispatcher->dispatch($event, $event->getType());
$eventData = $event->getData();
isset($eventData['response']) && $result = $eventData['response'];
}

$this->handleMetadataSelf($result, $metadataSelf);
Expand Down