Fixed test and a reference error from post model

Author: Grimur Vid Neyst

js/src/@types/shims.d.ts

@@ -39,6 +39,6 @@ declare module 'flarum/common/models/User' {
 
 declare module 'flarum/common/models/Post' {
   export default interface Post {
-    canSelectBestAnswer(): boolean;
+    canSelectAsBestAnswer(): boolean;
   }
 }

js/src/forum/addBestAnswerAction.tsx

@@ -10,7 +10,7 @@ import extractText from 'flarum/common/utils/extractText';
 
 export default function addBestAnswerAction() {
   const ineligible = (discussion: Discussion, post: Post) => {
-    return post.isHidden() || post.number() === 1 || !post.canSelectBestAnswer() || !app.session.user;
+    return post.isHidden() || post.number() === 1 || !post.canSelectAsBestAnswer() || !app.session.user;
   };
 
   const isThisBestAnswer = (discussion: Discussion, post: Post): boolean => {

js/src/forum/extend.ts

@@ -18,5 +18,5 @@ export default [
     .attribute<number>('bestAnswerCount'),
 
   new Extend.Model(Post) //
-    .attribute<boolean>('canSelectBestAnswer'),
+    .attribute<boolean>('canSelectAsBestAnswer'),
 ];

src/Api/PostAttributes.php

@@ -17,14 +17,17 @@
 
 class PostAttributes
 {
+    protected $bestAnswerRepository;
+
     public function __construct(
-        protected BestAnswerRepository $bestAnswerRepository,
+        BestAnswerRepository $bestAnswerRepository,
     ) {
+        $this->bestAnswerRepository = $bestAnswerRepository;
     }
 
     public function __invoke(PostSerializer $serializer, Post $post, array $attributes): array
     {
-        $attributes['canSelectBestAnswer'] = $this->bestAnswerRepository->canSelectPostAsBestAnswer($serializer->getActor(), $post);
+        $attributes['canSelectAsBestAnswer'] = $this->bestAnswerRepository->canSelectPostAsBestAnswer($serializer->getActor(), $post);
 
         return $attributes;
     }

tests/integration/api/SetBestAnswerTest.php

@@ -82,8 +82,16 @@ public function notAllowedUsersProvider(): array
     private function getCanSelectBestAnswer(array $included, int $userId): bool
     {
         foreach ($included as $item) {
-            if (($item['type'] ?? null) === 'posts' && isset($item['attributes']['canSelectBestAnswer']) && $item['relationships']['user']['data']['id'] == $userId) {
-                return $item['attributes']['canSelectBestAnswer'];
+            if (isset($item['attributes']['canSelectAsBestAnswer']) && $item['relationships']['user']['data']['id'] == $userId) {
+                $currentPostId = $item['attributes']['number'];
+
+                if ($currentPostId === 1) {
+                    continue;
+                }
+
+                if ($item['attributes']['canSelectAsBestAnswer'] == true) {
+                    return true;
+                }
             }
         }
 
@@ -98,6 +106,7 @@ public function getDiscussion(int $userId): ResponseInterface
                 '/api/discussions/1',
                 [
                     'authenticatedAs' => $userId,
+                    'queryParam' => ['include' => 'posts'],
                 ]
             )
         );

tests/integration/api/UnsetBestAnswerTest.php

@@ -65,6 +65,7 @@ public function getBestAnswerDiscussion(int $userId = 2): ResponseInterface
                 '/api/discussions/1',
                 [
                     'authenticatedAs' => $userId,
+                    'queryParam' => ['include' => 'posts'],
                 ]
             )
         );
@@ -85,6 +86,7 @@ public function user_can_unset_best_answer_in_own_discussion_and_select_a_differ
         $attributes = $data['data']['attributes'];
         $this->assertEquals(2, $attributes['hasBestAnswer'], 'Expected best answer post ID to be 2');
 
+        $postId = 0;
         // Unset best answer
         $response = $this->send(
             $this->request(
@@ -94,7 +96,7 @@ public function user_can_unset_best_answer_in_own_discussion_and_select_a_differ
                     'json' => [
                         'data' => [
                             'attributes' => [
-                                'bestAnswerPostId' => 0,
+                                'bestAnswerPostId' => $postId,
                             ],
                         ],
 
@@ -120,7 +122,7 @@ public function user_can_unset_best_answer_in_own_discussion_and_select_a_differ
 
         $attributes = $data['data']['attributes'];
         $this->assertFalse($attributes['hasBestAnswer']);
-        $this->assertTrue($this->getCanSelectBestAnswer($data['included'], 2), 'Expected user to be able to set a best answer');
+        $this->assertTrue($this->getCanSelectBestAnswer($data['included'], $postId), 'Expected user to be able to set a best answer');
 
         // Set a different post as best answer
         $response = $this->send(
@@ -149,12 +151,19 @@ public function user_can_unset_best_answer_in_own_discussion_and_select_a_differ
         $this->assertEquals(3, $attributes['hasBestAnswer'], 'Expected best answer post ID to be 3');
     }
 
-    private function getCanSelectBestAnswer(array $included, int $userId): bool
+    private function getCanSelectBestAnswer(array $included, int $postId): bool
     {
         foreach ($included as $item) {
-            if (($item['type'] ?? null) === 'posts' && isset($item['attributes']['canSelectBestAnswer'])
-                && $item['relationships']['user']['data']['id'] == $userId) {
-                return $item['attributes']['canSelectBestAnswer'];
+            if (!isset($item['attributes']['canSelectAsBestAnswer'])) {
+                continue;
+            }
+            $currentPostId = $item['attributes']['number'];
+            if ($currentPostId === 1 || $currentPostId !== $postId) {
+                continue;
+            }
+
+            if ($item['attributes']['canSelectAsBestAnswer'] == true) {
+                return true;
             }
         }