* fix https://stackoverflow.com/questions/30871721/doctrine2-dynamic-…

…table-name-for-entity/79084344#79084344 after previous attempt 18f1b9c @ config/packages/doctrine.yaml * mark entire class and derived classes as `readonly` so all props including ones outside the construct promotion are now readonly + `setOrderBy(Field|Desc)()` to allow derived classes init its namesake readonly props instead of directly assigning them * narrow the type of key in `Collection<,>` for variable `$paginators` and param `$queries` @ `setResult()` @ `App\PostsQuery\BaseQuery` @ be
n0099 · Oct 13, 2024 · 22e8b8a · 22e8b8a
1 parent 59b547b
commit 22e8b8a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 28 deletions.
diff --git a/be/config/packages/doctrine.yaml b/be/config/packages/doctrine.yaml
@@ -31,6 +31,13 @@ doctrine:
                 alias: DTO
         controller_resolver:
             auto_mapping: false
+        query_cache_driver:
+            type: service
+            id: cache.adapter.null
+
+services:
+    cache.adapter.null:
+        class: Symfony\Component\Cache\Adapter\NullAdapter
 
 when@test:
     doctrine:
@@ -52,5 +59,3 @@ when@prod:
             pools:
                 doctrine.result_cache_pool:
                     adapter: cache.app
-                doctrine.system_cache_pool:
-                    adapter: cache.system
diff --git a/be/src/PostsQuery/BaseQuery.php b/be/src/PostsQuery/BaseQuery.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /** @psalm-import-type PostsKeyByTypePluralName from CursorCodec */
-abstract class BaseQuery
+abstract readonly class BaseQuery
 {
     /** @type array{
      *     fid: int,
@@ -37,24 +37,34 @@ abstract class BaseQuery
 
     protected bool $orderByDesc;
 
-    abstract public function query(QueryParams $params, ?string $cursor): void;
-
     public function __construct(
-        private readonly NormalizerInterface $normalizer,
-        private readonly Stopwatch $stopwatch,
-        private readonly CursorCodec $cursorCodec,
-        private readonly PostRepositoryFactory $postRepositoryFactory,
-        private readonly int $perPageItems = 50,
+        private NormalizerInterface $normalizer,
+        private Stopwatch $stopwatch,
+        private CursorCodec $cursorCodec,
+        private PostRepositoryFactory $postRepositoryFactory,
+        private int $perPageItems = 50,
     ) {}
 
+    abstract public function query(QueryParams $params, ?string $cursor): void;
+
     public function getResultPages(): array
     {
         return $this->queryResultPages;
     }
 
+    protected function setOrderByField(string $orderByField): void
+    {
+        $this->orderByField = $orderByField;
+    }
+
+    protected function setOrderByDesc(bool $orderByDesc): void
+    {
+        $this->orderByDesc = $orderByDesc;
+    }
+
     /**
      * @param int $fid
-     * @param Collection<string, QueryBuilder> $queries key by post type
+     * @param Collection<Helper::POST_TYPE, QueryBuilder> $queries key by post type
      * @param string|null $cursorParamValue
      * @param string|null $queryByPostIDParamName
      * @return void
@@ -67,7 +77,7 @@ protected function setResult(
     ): void {
         $this->stopwatch->start('setResult');
 
-        $orderedQueries = $queries->map(fn(QueryBuilder $qb, string $postType): QueryBuilder => $qb
+        $orderedQueries = $queries->each(fn(QueryBuilder $qb, string $postType): QueryBuilder => $qb
             ->addOrderBy("t.$this->orderByField", $this->orderByDesc === true ? 'DESC' : 'ASC')
             // cursor paginator requires values of orderBy column are unique
             // if not it should fall back to other unique field (here is the post ID primary key)
@@ -82,7 +92,7 @@ protected function setResult(
             // remove queries for post types with encoded cursor ',,'
             $orderedQueries = $orderedQueries->intersectByKeys($cursorsKeyByPostType);
         }
-        /** @var Collection<string, QueryBuilder> $paginators key by post type */
+        /** @var Collection<Helper::POST_TYPE, QueryBuilder> $paginators key by post type */
         $paginators = $orderedQueries->each(function (QueryBuilder $qb, string $type) use ($cursorsKeyByPostType) {
             $cursors = $cursorsKeyByPostType?->get($type);
             if ($cursors === null) {

diff --git a/be/src/PostsQuery/IndexQuery.php b/be/src/PostsQuery/IndexQuery.php
@@ -11,14 +11,14 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class IndexQuery extends BaseQuery
+readonly class IndexQuery extends BaseQuery
 {
     public function __construct(
         NormalizerInterface $normalizer,
         Stopwatch $stopwatch,
         CursorCodec $cursorCodec,
-        private readonly PostRepositoryFactory $postRepositoryFactory,
-        private readonly ForumRepository $forumRepository,
+        private PostRepositoryFactory $postRepositoryFactory,
+        private ForumRepository $forumRepository,
     ) {
         parent::__construct($normalizer, $stopwatch, $cursorCodec, $postRepositoryFactory);
     }
@@ -42,11 +42,11 @@ public function query(QueryParams $params, ?string $cursor): void
         $postTypes = $flatParams['postTypes'];
 
         if ($flatParams['orderBy'] === 'default') {
-            $this->orderByField = 'postedAt'; // order by postedAt to prevent posts out of order when order by post ID
+            $this->setOrderByField('postedAt'); // order by postedAt to prevent posts out of order when order by post ID
             if (\array_key_exists('fid', $flatParams) && $postIDParam->count() === 0) { // query by fid only
-                $this->orderByDesc = true;
+                $this->setOrderByDesc(true);
             } elseif ($hasPostIDParam) { // query by post ID (with or without fid)
-                $this->orderByDesc = false;
+                $this->setOrderByDesc(false);
             }
         }
 

diff --git a/be/src/PostsQuery/SearchQuery.php b/be/src/PostsQuery/SearchQuery.php
@@ -10,14 +10,14 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-class SearchQuery extends BaseQuery
+readonly class SearchQuery extends BaseQuery
 {
     public function __construct(
         NormalizerInterface $normalizer,
         Stopwatch $stopwatch,
         CursorCodec $cursorCodec,
-        private readonly PostRepositoryFactory $postRepositoryFactory,
-        private readonly UserRepository $userRepository,
+        private PostRepositoryFactory $postRepositoryFactory,
+        private UserRepository $userRepository,
     ) {
         parent::__construct($normalizer, $stopwatch, $cursorCodec, $postRepositoryFactory);
     }
@@ -28,12 +28,8 @@ public function query(QueryParams $params, ?string $cursor): void
         $fid = $params->getUniqueParamValue('fid');
 
         $orderByParam = $params->pick('orderBy')[0];
-        $this->orderByField = $orderByParam->value;
-        $this->orderByDesc = $orderByParam->getSub('direction');
-        if ($this->orderByField === 'default') {
-            $this->orderByField = 'postedAt';
-            $this->orderByDesc = true;
-        }
+        $this->setOrderByField($orderByParam->value === 'default' ? 'postedAt' : $orderByParam->value);
+        $this->setOrderByDesc($orderByParam->value === 'default' ? true : $orderByParam->getSub('direction'));
 
         /** @var array<string, array> $cachedUserQueryResult key by param name */
         $cachedUserQueryResult = [];