* remove param $fid @ App\Repository\Post\PostRepository::getPosts(), all its derived classes & its usages in App\PostsQuery\PostsTree::fillWithParentPost()

@ be

Author: n0099

be/src/PostsQuery/PostsTree.php

@@ -60,7 +60,7 @@ public function fillWithParentPost(QueryResult $result): array
             ->map(fn(ReplyKey $postKey) => $postKey->parentPostId)
             ->concat($result->subReplies->map(fn(SubReplyKey $postKey) => $postKey->tid))
             ->unique();
-        $this->threads = collect($postModels['thread']->getPosts($fid, $parentThreadsID->concat($tids)))
+        $this->threads = collect($postModels['thread']->getPosts($parentThreadsID->concat($tids)))
             ->map(fn(\App\Entity\Post\Thread $entity) => Thread::fromEntity($entity))
             ->each(static fn(Thread $thread) =>
                 $thread->setIsMatchQuery($tids->contains($thread->getTid())));
@@ -70,14 +70,14 @@ public function fillWithParentPost(QueryResult $result): array
         /** @var Collection<int, int> $parentRepliesID parent pid of all sub replies */
         $parentRepliesID = $result->subReplies->map(fn(SubReplyKey $postKey) => $postKey->parentPostId)->unique();
         $allRepliesId = $parentRepliesID->concat($pids);
-        $this->replies = collect($postModels['reply']->getPosts($fid, $allRepliesId))
+        $this->replies = collect($postModels['reply']->getPosts($allRepliesId))
             ->map(fn(\App\Entity\Post\Reply $entity) => Reply::fromEntity($entity))
             ->each(static fn(Reply $reply) =>
                 $reply->setIsMatchQuery($pids->contains($reply->getPid())));
         $this->stopwatch->stop('fillWithRepliesFields');
 
         $this->stopwatch->start('fillWithSubRepliesFields');
-        $this->subReplies = collect($postModels['subReply']->getPosts($fid, $spids))
+        $this->subReplies = collect($postModels['subReply']->getPosts($spids))
             ->map(fn(\App\Entity\Post\SubReply $entity) => SubReply::fromEntity($entity));
         $this->stopwatch->stop('fillWithSubRepliesFields');
 

be/src/PostsQuery/QueryResult.php

@@ -23,8 +23,6 @@
 /** @psalm-import-type PostsKeyByTypePluralName from CursorCodec */
 readonly class QueryResult
 {
-    public int $fid;
-
     /** @var Collection<int, ThreadKey> */
     public Collection $threads;
 
@@ -125,9 +123,6 @@ public function setResult(
         $this->threads = $postsKeyByTypePluralName->get('threads', collect());
         $this->replies = $postsKeyByTypePluralName->get('replies', collect());
         $this->subReplies = $postsKeyByTypePluralName->get('subReplies', collect());
-        $this->fid = $this->threads->first()->fid
-            ?? $this->replies->first()->fid
-            ?? $this->subReplies->first()->fid;
         $this->currentCursor = $cursorParamValue ?? '';
         $this->nextCursor = $hasMorePages
             ? $this->cursorCodec->encodeNextCursor($postsKeyByTypePluralName->except(

be/src/Repository/Post/PostRepository.php

@@ -14,5 +14,5 @@ abstract class PostRepository extends BaseRepository
 {
     abstract public function selectUnionPostKey(): QueryBuilder;
 
-    abstract public function getPosts(int $fid, array|\ArrayAccess $postsId): array;
+    abstract public function getPosts(array|\ArrayAccess $postsId): array;
 }

be/src/Repository/Post/ReplyRepository.php

@@ -20,9 +20,9 @@ public function selectUnionPostKey(): QueryBuilder
             ->select("'reply' AS postType", 't.pid AS postId', 't.fid', 't.tid', 't.pid');
     }
 
-    public function getPosts(int $fid, array|\ArrayAccess $postsId): array
+    public function getPosts(array|\ArrayAccess $postsId): array
     {
-        $dql = 'SELECT t FROM App\Entity\Post\Reply t WHERE t.fid = :fid AND t.pid IN (:pid)';
-        return $this->getQueryResultWithParams($dql, ['fid' => $fid, 'pid' => $postsId]);
+        $dql = 'SELECT t FROM App\Entity\Post\Reply t WHERE t.pid IN (:pid)';
+        return $this->getQueryResultWithParams($dql, ['pid' => $postsId]);
     }
 }

be/src/Repository/Post/SubReplyRepository.php

@@ -20,9 +20,9 @@ public function selectUnionPostKey(): QueryBuilder
             ->select("'subReply' AS postType", 't.spid AS postId', 't.fid', 't.tid', 't.pid');
     }
 
-    public function getPosts(int $fid, array|\ArrayAccess $postsId): array
+    public function getPosts(array|\ArrayAccess $postsId): array
     {
-        $dql = 'SELECT t FROM App\Entity\Post\SubReply t WHERE t.fid = :fid AND t.spid IN (:spid)';
-        return $this->getQueryResultWithParams($dql, ['fid' => $fid, 'spid' => $postsId]);
+        $dql = 'SELECT t FROM App\Entity\Post\SubReply t WHERE t.spid IN (:spid)';
+        return $this->getQueryResultWithParams($dql, ['spid' => $postsId]);
     }
 }

be/src/Repository/Post/ThreadRepository.php

@@ -22,10 +22,10 @@ public function selectUnionPostKey(): QueryBuilder
             ->select("'thread' AS postType", 't.tid AS postId', 't.fid', 't.tid', '0 AS pid');
     }
 
-    public function getPosts(int $fid, array|\ArrayAccess $postsId): array
+    public function getPosts(array|\ArrayAccess $postsId): array
     {
-        $dql = 'SELECT t FROM App\Entity\Post\Thread t WHERE t.fid = :fid AND t.tid IN (:tid)';
-        return $this->getQueryResultWithParams($dql, ['fid' => $fid, 'tid' => $postsId]);
+        $dql = 'SELECT t FROM App\Entity\Post\Thread t WHERE t.tid IN (:tid)';
+        return $this->getQueryResultWithParams($dql, ['tid' => $postsId]);
     }
 
     public function getThreadsIdByChunks(int $chunkSize): array