Use filterer for ListPostsController (#2479)

src/Api/Controller/ListPostsController.php

@@ -10,11 +10,10 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Api\Serializer\PostSerializer;
-use Flarum\Event\ConfigurePostsQuery;
-use Flarum\Post\PostRepository;
-use Illuminate\Database\Eloquent\Builder;
+use Flarum\Http\UrlGenerator;
+use Flarum\Post\Filter\PostFilterer;
+use Flarum\Search\SearchCriteria;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
@@ -43,16 +42,23 @@ class ListPostsController extends AbstractListController
     public $sortFields = ['createdAt'];
 
     /**
-     * @var \Flarum\Post\PostRepository
+     * @var PostFilterer
      */
-    protected $posts;
+    protected $filterer;
 
     /**
-     * @param \Flarum\Post\PostRepository $posts
+     * @var UrlGenerator
      */
-    public function __construct(PostRepository $posts)
+    protected $url;
+
+    /**
+     * @param PostFilterer $filterer
+     * @param UrlGenerator $url
+     */
+    public function __construct(PostFilterer $filterer, UrlGenerator $url)
     {
-        $this->posts = $posts;
+        $this->filterer = $filterer;
+        $this->url = $url;
     }
 
     /**
@@ -61,18 +67,25 @@ class ListPostsController extends AbstractListController
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
-        $filter = $this->extractFilter($request);
+
+        $filters = $this->extractFilter($request);
+        $sort = $this->extractSort($request);
+
+        $limit = $this->extractLimit($request);
+        $offset = $this->extractOffset($request);
         $include = $this->extractInclude($request);
 
-        if ($postIds = Arr::get($filter, 'id')) {
-            $postIds = explode(',', $postIds);
-        } else {
-            $postIds = $this->getPostIds($request);
-        }
+        $results = $this->filterer->filter(new SearchCriteria($actor, $filters, $sort), $limit, $offset);
 
-        $posts = $this->posts->findByIds($postIds, $actor);
+        $document->addPaginationLinks(
+            $this->url->to('api')->route('posts.index'),
+            $request->getQueryParams(),
+            $offset,
+            $limit,
+            $results->areMoreResults() ? null : 0
+        );
 
-        return $posts->load($include);
+        return $results->getResults()->load($include);
     }
 
     /**
@@ -100,55 +113,4 @@ class ListPostsController extends AbstractListController
 
         return parent::extractOffset($request);
     }
-
-    /**
-     * @param ServerRequestInterface $request
-     * @return array
-     * @throws InvalidParameterException
-     */
-    private function getPostIds(ServerRequestInterface $request)
-    {
-        $actor = $request->getAttribute('actor');
-        $filter = $this->extractFilter($request);
-        $sort = $this->extractSort($request);
-        $limit = $this->extractLimit($request);
-        $offset = $this->extractOffset($request);
-
-        $query = $this->posts->query()->whereVisibleTo($actor);
-
-        $this->applyFilters($query, $filter);
-
-        $query->skip($offset)->take($limit);
-
-        foreach ((array) $sort as $field => $order) {
-            $query->orderBy(Str::snake($field), $order);
-        }
-
-        return $query->pluck('id')->all();
-    }
-
-    /**
-     * @param Builder $query
-     * @param array $filter
-     */
-    private function applyFilters(Builder $query, array $filter)
-    {
-        if ($discussionId = Arr::get($filter, 'discussion')) {
-            $query->where('discussion_id', $discussionId);
-        }
-
-        if ($number = Arr::get($filter, 'number')) {
-            $query->where('number', $number);
-        }
-
-        if ($userId = Arr::get($filter, 'user')) {
-            $query->where('user_id', $userId);
-        }
-
-        if ($type = Arr::get($filter, 'type')) {
-            $query->where('type', $type);
-        }
-
-        event(new ConfigurePostsQuery($query, $filter));
-    }
 }