Skip to content

Return empty lists with status 200 instead of 400 - Fix for issue #70 #80

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

Merged
merged 1 commit into from
Apr 23, 2018
Merged

Return empty lists with status 200 instead of 400 - Fix for issue #70 #80

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: 0 additions & 2 deletions src/Action/ContentListAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ public function handle($contentType, Request $request, ParameterCollection $para

$results = $set->get($contentType);

$this->throwErrorOnNoResults($results, 'Bad request: There were no results based upon your criteria!');

$included = $this->fetchIncludes(
$parameters->getParametersByType('includes'),
$results,
Expand Down
14 changes: 0 additions & 14 deletions src/Action/FetchAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Bolt\Extension\Bolt\JsonApi\Config\Config;
use Bolt\Extension\Bolt\JsonApi\Converter\Parameter\Type\Fields;
use Bolt\Extension\Bolt\JsonApi\Exception\ApiInvalidRequestException;
use Bolt\Extension\Bolt\JsonApi\Helpers\DataLinks;
use Bolt\Extension\Bolt\JsonApi\Parser\Parser;
use Bolt\Storage\Entity\Content;
Expand Down Expand Up @@ -44,19 +43,6 @@ public function __construct(
$this->config = $config;
}

/**
* @param $results
* @param $message
*/
protected function throwErrorOnNoResults($results, $message)
{
if (! $results || (is_array($results) && count($results) === 0)) {
throw new ApiInvalidRequestException(
$message
);
}
}

/**
* @param $includes
* @param $results
Expand Down
2 changes: 0 additions & 2 deletions src/Action/SearchAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ public function handle($contentType = null, Request $request, ParameterCollectio

$page = $parameters->getParametersByType('page');

$this->throwErrorOnNoResults($results, "No search results found for query [$search]");

foreach ($results as $key => $item) {
// optimize this part...
$fields = $parameters->get('fields')->getFields();
Expand Down
6 changes: 4 additions & 2 deletions src/Action/SingleAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ public function handle($contentType, $slug, $relatedContentType, Request $reques
/** @var Content $results */
$results = $this->query->getContent($contentType, $queryParameters);

$this->throwErrorOnNoResults($results, "No [$contentType] found with id/slug: [$slug].");

if (! $results) {
throw new ApiNotFoundException("No [$contentType] found with id/slug: [$slug].");
}

if ($relatedContentType !== null) {
$relatedItemsTotal = $results->getRelation($relatedContentType)->count();
if ($relatedItemsTotal <= 0) {
Expand Down