fixes (#146)

Co-authored-by: Tomasz Smolarek <tomasz.smolarek@escolasoft.com>

src/Http/Controllers/ContentApiController.php

@@ -34,9 +34,17 @@ public function __construct(HeadlessH5PServiceContract $hh5pService, H5PContentR
     public function index(ContentListRequest $request): JsonResponse
     {
         $contentFilterDto = ContentFilterCriteriaDto::instantiateFromRequest($request);
+        $columns = [
+            'hh5p_contents.title',
+            'hh5p_contents.id',
+            'hh5p_contents.uuid',
+            'hh5p_contents.library_id',
+            'hh5p_contents.user_id',
+            'hh5p_contents.author'
+        ];
         $list = $request->get('per_page') !== null && $request->get('per_page') == 0 ?
-            $this->contentRepository->unpaginatedList($contentFilterDto) :
-            $this->contentRepository->list($contentFilterDto, $request->get('per_page'));
+            $this->contentRepository->unpaginatedList($contentFilterDto, $columns) :
+            $this->contentRepository->list($contentFilterDto, $request->get('per_page'), $columns);
 
         return $this->sendResponseForResource(ContentIndexResource::collection($list));
     }

src/Repositories/H5PContentRepository.php

@@ -109,7 +109,6 @@ private function moveTmpFilesToContentFolders($nonce, $contentId): bool
 
         $files = H5PTempFile::where(['nonce' => $nonce])->get();
 
-
         foreach ($files as $file) {
             $old_path = $storage_path . $file->path;
             if (strpos($file->path, '/editor') !== false) {

testbench.yaml

@@ -10,4 +10,5 @@ providers:
   - Spatie\Permission\PermissionServiceProvider
   - Laravel\Passport\PassportServiceProvider
   - EscolaLms\Core\EscolaLmsServiceProvider
+  - EscolaLms\Settings\EscolaLmsSettingsServiceProvider
   - EscolaLms\HeadlessH5P\HeadlessH5PServiceProvider

tests/Models/Client.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace EscolaLms\HeadlessH5P\Tests\Models;
+
+class Client extends \Laravel\Passport\Client
+{
+    public function getIdAttribute()
+    {
+        return $this->attributes['id'];
+    }
+}

tests/Models/User.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace EscolaLms\HeadlessH5P\Tests\Models;
+
+use EscolaLms\Courses\Models\User as CoursesUser;
+
+class User extends CoursesUser
+{
+}

tests/Repositories/H5PEditorAjaxRepositoryTest.php

@@ -2,6 +2,7 @@
 namespace EscolaLms\HeadlessH5P\Tests\Repositories;
 
 
+use Carbon\Carbon;
 use EscolaLms\Core\Tests\CreatesUsers;
 use EscolaLms\HeadlessH5P\Models\H5PContent;
 use EscolaLms\HeadlessH5P\Models\H5PContentLibrary;
@@ -164,24 +165,32 @@ public function testGetAuthorsRecentlyUsedLibrariesShouldGetEmptyArrayWhenUserNo
         $this->assertCount(0, $result);
     }
 
-    public function testValidateEditorToken(): void
+    public function tokenDataProvider(): array
     {
-        $this->authenticateAsAdmin();
-        $token = $this->user->createToken("test")->accessToken;
-
-        $result = $this->repository->validateEditorToken($token);
-
-        $this->assertTrue($result);
+        return [
+            [
+                'expire' => fn() => Passport::personalAccessTokensExpireIn(now()->subDay()),
+                'assert' => fn($result) => $this->assertFalse($result)
+            ],
+            [
+                'expire' => fn() => Passport::personalAccessTokensExpireIn(now()->addDay()),
+                'assert' => fn($result) => $this->assertTrue($result)
+            ],
+        ];
     }
 
-    public function testValidateEditorTokenExpiredToken(): void
+    /**
+     * @dataProvider tokenDataProvider
+     */
+    public function testValidateEditorToken($expireIn, $assert): void
     {
-        Passport::personalAccessTokensExpireIn(now()->subDay());
+        $expireIn();
+
         $this->authenticateAsAdmin();
         $token = $this->user->createToken("test")->accessToken;
 
         $result = $this->repository->validateEditorToken($token);
 
-        $this->assertFalse($result);
+        $assert($result);
     }
 }

tests/TestCase.php

@@ -5,10 +5,12 @@
 use EscolaLms\Core\EscolaLmsServiceProvider;
 use EscolaLms\Core\Models\User;
 use EscolaLms\HeadlessH5P\Database\Seeders\PermissionTableSeeder;
+use EscolaLms\HeadlessH5P\Tests\Models\Client;
 use EscolaLms\Settings\EscolaLmsSettingsServiceProvider;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
+use Laravel\Passport\Passport;
 use Laravel\Passport\PassportServiceProvider;
 use EscolaLms\HeadlessH5P\HeadlessH5PServiceProvider;
 use Spatie\Permission\PermissionServiceProvider;
@@ -24,6 +26,7 @@ class TestCase extends \EscolaLms\Core\Tests\TestCase
     protected function setUp(): void
     {
         parent::setUp();
+        Passport::useClientModel(Client::class);
         $this->seed(PermissionTableSeeder::class);
     }