Skip to content

404 instead of 422 if entity not found #1046

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
bbujisic wants to merge 1 commit into
base: 7.x-1.x
Choose a base branch
from
Open

404 instead of 422 if entity not found #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 plugins/restful/RestfulEntityBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ protected function isValidEntity($op, $entity_id) {
);

if (!$entity = entity_load_single($entity_type, $entity_id)) {
throw new RestfulUnprocessableEntityException(format_string('The entity ID @id for @resource does not exist.', $params));
throw new RestfulNotFoundException(format_string('The entity ID @id for @resource does not exist.', $params));
}

list(,, $bundle) = entity_extract_ids($entity_type, $entity);
Expand Down
2 changes: 1 addition & 1 deletion tests/RestfulExceptionHandleTestCase.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class RestfulExceptionHandleTestCase extends RestfulCurlBaseTestCase {
$url = 'api/v1.0/articles/1';
$result = $this->httpRequest($url);
$body = drupal_json_decode($result['body']);
$this->assertEqual($result['code'], '422', format_string('422 status code sent for @url url.', array('@url' => $url)));
$this->assertEqual($result['code'], '404', format_string('404 status code sent for @url url.', array('@url' => $url)));
$this->assertTrue(strpos($result['headers'], 'application/problem+json;'), '"application/problem+json" found in invalid request.');
$this->assertEqual($body['title'], 'The entity ID 1 for Articles does not exist.', 'Correct error message.');
}
Expand Down