* fix not accepting int typed value for numeric params: https://www.p…

…hp.net/manual/en/function.ctype-digit.php#108712 * rename `params` in method name and param to `param` @ `validateParamValue()` * replace public prop `$params` with getter and fluent setter contain the param `$params` in ctor @ `ParamsValidator` * now not being fluent method @ `BaseQuery->query()` @ `App\PostsQuery` * replace `new ParamsValidator()` & `new $queryClass()` with services locator * fix misusing `AbstractController->getParameter()` for getting the value of query string `?cursor=` @ `App\Controller\PostsController` * fix unquoted table name will become lowercase ing Postgres @ `PostRepository->__construct()` * fix typo in table name @ `SubReplyRepository->getTableNameSuffix()` @ `App\Repository\Post` @ symfony
n0099 · Oct 8, 2024 · 8483414 · 8483414
1 parent c79a749
commit 8483414
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 27 deletions.
diff --git a/symfony/src/Controller/PostsController.php b/symfony/src/Controller/PostsController.php
@@ -3,6 +3,7 @@
 namespace App\Controller;
 
 use App\Helper;
+use App\PostsQuery\BaseQuery;
 use App\PostsQuery\IndexQuery;
 use App\PostsQuery\ParamsValidator;
 use App\PostsQuery\SearchQuery;
@@ -12,7 +13,9 @@
 use App\Validator\Validator;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Psr\Container\ContainerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Attribute\AutowireLocator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Stopwatch\Stopwatch;
@@ -26,6 +29,12 @@ public function __construct(
         private readonly ForumRepository $forumRepository,
         private readonly UserRepository $userRepository,
         private readonly LatestReplierRepository $latestReplierRepository,
+        #[AutowireLocator([
+            ParamsValidator::class,
+            IndexQuery::class,
+            SearchQuery::class,
+        ])]
+        private readonly ContainerInterface $locator,
     ) {}
 
     #[Route('/posts')]
@@ -38,8 +47,8 @@ public function query(Request $request): array
             )),
             'query' => new Assert\Required(new Assert\Json()),
         ]));
-        $validator = new ParamsValidator($this->validator, \Safe\json_decode($request->query->get('query'), true));
-        $params = $validator->params;
+        $validator = $this->locator->get(ParamsValidator::class);
+        $params = $validator->setParams(\Safe\json_decode($request->query->get('query'), true))->getParams();
 
         $postIDParams = $params->pick(...Helper::POST_ID);
         $isQueryByPostID =
@@ -58,9 +67,10 @@ public function query(Request $request): array
 
         $validator->addDefaultParamsThenValidate(shouldSkip40003: $isIndexQuery);
 
-        $queryClass = $isIndexQuery ? IndexQuery::class : SearchQuery::class;
         $this->stopwatch->start('$queryClass->query()');
-        $query = (new $queryClass())->query($params, $this->getParameter('cursor'));
+        /** @var BaseQuery $query */
+        $query = $this->locator->get($isIndexQuery ? IndexQuery::class : SearchQuery::class);
+        $query->query($params, $request->query->get('cursor'));
         $this->stopwatch->stop('$queryClass->query()');
         $this->stopwatch->start('fillWithParentPost');
         $result = $query->fillWithParentPost();

diff --git a/symfony/src/PostsQuery/BaseQuery.php b/symfony/src/PostsQuery/BaseQuery.php
@@ -30,7 +30,7 @@ abstract class BaseQuery
 
     protected bool $orderByDesc;
 
-    abstract public function query(QueryParams $params, ?string $cursor): self;
+    abstract public function query(QueryParams $params, ?string $cursor): void;
 
     public function __construct(
         private readonly SerializerInterface $serializer,

diff --git a/symfony/src/PostsQuery/IndexQuery.php b/symfony/src/PostsQuery/IndexQuery.php
@@ -24,7 +24,7 @@ public function __construct(
     }
 
     /** @SuppressWarnings(PHPMD.ElseExpression) */
-    public function query(QueryParams $params, ?string $cursor): self
+    public function query(QueryParams $params, ?string $cursor): void
     {
         /** @var array<string, mixed> $flatParams key by param name */
         $flatParams = array_reduce(
@@ -107,6 +107,5 @@ public function query(QueryParams $params, ?string $cursor): self
         }
 
         $this->setResult($fid, $queries, $cursor, $hasPostIDParam ? $postIDParamName : null);
-        return $this;
     }
 }
diff --git a/symfony/src/PostsQuery/ParamsValidator.php b/symfony/src/PostsQuery/ParamsValidator.php
@@ -12,15 +12,23 @@ class ParamsValidator
 {
     public const array UNIQUE_PARAMS_NAME = ['fid', 'postTypes', 'orderBy'];
 
-    public QueryParams $params;
+    private QueryParams $params;
+
+    public function __construct(private readonly Validator $validator) {}
+
+    public function getParams(): QueryParams
+    {
+        return $this->params;
+    }
 
     /** @param array[] $params */
-    public function __construct(private readonly Validator $validator, array $params)
+    public function setParams(array $params): static
     {
-        $this->validateParamsValue($params);
+        array_map($this->validateParamValue(...), $params);
         $this->params = new QueryParams($params);
         $this->validate40001();
         $this->validate40005();
+        return $this;
     }
 
     public function addDefaultParamsThenValidate(bool $shouldSkip40003): void
@@ -37,33 +45,36 @@ public function addDefaultParamsThenValidate(bool $shouldSkip40003): void
         $this->validate40004($currentPostTypes);
     }
 
-    private function validateParamsValue(array $params): void
+    private function validateParamValue(array $param): void
     {
         $paramsPossibleValue = [
             'userGender' => [0, 1, 2],
             'userManagerType' => ['NULL', 'manager', 'assist', 'voiceadmin'],
         ];
+        $numericParams = collect([
+            'fid',
+            'tid',
+            'pid',
+            'spid',
+            'threadViewCount',
+            'threadShareCount',
+            'threadReplyCount',
+            'replySubReplyCount',
+            'authorUid',
+            'authorExpGrade',
+            'latestReplierUid',
+        ])->mapWithKeys(fn(string $paramName) => [$paramName => new Assert\Type(['digit', 'int'])]);
         // note here we haven't validated that is every sub param have a corresponding main param yet
-        $this->validator->validate($params, new Assert\Collection([
-            'fid' => new Assert\Type('digit'),
+        $this->validator->validate($param, new Assert\Collection([
+            ...$numericParams,
             'postTypes' => new Assert\Collection([new Assert\Choice(Helper::POST_TYPES)]),
             'orderBy' => new Assert\Collection([new Assert\Choice([...Helper::POST_ID, 'postedAt'])]),
             'direction' => new Assert\Choice(['ASC', 'DESC']),
-            'tid' => new Assert\Type('digit'),
-            'pid' => new Assert\Type('digit'),
-            'spid' => new Assert\Type('digit'),
             'postedAt' => new DateTimeRange(),
             'latestReplyPostedAt' => new DateTimeRange(),
-            'threadViewCount' => new Assert\Type('digit'),
-            'threadShareCount' => new Assert\Type('digit'),
-            'threadReplyCount' => new Assert\Type('digit'),
-            'replySubReplyCount' => new Assert\Type('digit'),
             'threadProperties' => new Assert\Collection([new Assert\Choice(['good', 'sticky'])]),
-            'authorUid' => new Assert\Type('digit'),
-            'authorExpGrade' => new Assert\Type('digit'),
             'authorGender' => new Assert\Choice($paramsPossibleValue['userGender']),
             'authorManagerType' => new Assert\Choice($paramsPossibleValue['userManagerType']),
-            'latestReplierUid' => new Assert\Type('digit'),
             'latestReplierGender' => new Assert\Choice($paramsPossibleValue['userGender']),
 
             'not' => new Assert\Type('boolean'),

diff --git a/symfony/src/PostsQuery/SearchQuery.php b/symfony/src/PostsQuery/SearchQuery.php
@@ -22,7 +22,7 @@ public function __construct(
         parent::__construct($serializer, $stopwatch, $cursorCodec, $postRepositoryFactory);
     }
 
-    public function query(QueryParams $params, ?string $cursor): self
+    public function query(QueryParams $params, ?string $cursor): void
     {
         /** @var int $fid */
         $fid = $params->getUniqueParamValue('fid');
@@ -55,7 +55,6 @@ public function query(QueryParams $params, ?string $cursor): self
         }
 
         $this->setResult($fid, $queries, $cursor);
-        return $this;
     }
 
     /**

diff --git a/symfony/src/Repository/Post/PostRepository.php b/symfony/src/Repository/Post/PostRepository.php
@@ -28,7 +28,7 @@ public function __construct(
     ) {
         parent::__construct($registry, $postClass);
         $entityManager->getClassMetadata($postClass)->setPrimaryTable([
-            'name' => "tbmc_f{$fid}_" . $this->getTableNameSuffix()
+            'name' => "\"tbmc_f{$fid}_" . $this->getTableNameSuffix() . '"'
         ]);
     }
 

diff --git a/symfony/src/Repository/Post/SubReplyRepository.php b/symfony/src/Repository/Post/SubReplyRepository.php
@@ -20,6 +20,6 @@ public function __construct(ManagerRegistry $registry, EntityManagerInterface $e
 
     protected function getTableNameSuffix(): string
     {
-        return 'subRreply';
+        return 'subReply';
     }
 }