fix tests

Karaka-Management · Sep 29, 2023 · c553431 · c553431
1 parent 50c72a3
commit c553431
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
@@ -408,8 +408,11 @@ public function apiTemplateCreate(RequestAbstract $request, ResponseAbstract $re
         }
 
         // is allowed to create
-        if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->unitId, null, self::NAME, PermissionCategory::TEMPLATE)) {
+        if (!$this->app->accountManager->get($request->header->account)
+                ->hasPermission(PermissionType::CREATE, $this->app->unitId, null, self::NAME, PermissionCategory::TEMPLATE)
+        ) {
             $response->header->status = RequestStatusCode::R_403;
+            $this->createInvalidCreateResponse($request, $response, []);
 
             return;
         }
@@ -440,25 +443,25 @@ public function apiTemplateCreate(RequestAbstract $request, ResponseAbstract $re
         }
 
         /** @var Collection $collection */
-        $collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia(
+        $collection = $this->app->moduleManager->get('Media', 'Api')->createMediaCollectionFromMedia(
             $request->getDataString('name') ?? '',
             $request->getDataString('description') ?? '',
             $files,
             $request->header->account
         );
 
-        if ($collection->id === 0) {
+        $collection->setPath('/Modules/Media/Files/Modules/Helper/' . ($request->getDataString('name') ?? ''));
+        $collection->setVirtualPath('/Modules/Helper');
+
+        $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
+
+        if ($collection->id < 1) {
             $response->header->status = RequestStatusCode::R_403;
             $this->createInvalidCreateResponse($request, $response, $collection);
 
             return;
         }
 
-        $collection->setPath('/Modules/Media/Files/Modules/Helper/' . ($request->getDataString('name') ?? ''));
-        $collection->setVirtualPath('/Modules/Helper');
-
-        $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
-
         $template = $this->createTemplateFromRequest($request, $collection->id);
 
         $this->app->moduleManager->get('Admin')->createAccountModelPermission(
@@ -600,15 +603,15 @@ public function apiReportCreate(RequestAbstract $request, ResponseAbstract $resp
         $collection->setPath('/Modules/Media/Files/Modules/Helper/' . ($request->getDataString('name') ?? ''));
         $collection->setVirtualPath('/Modules/Helper');
 
-        if ($collection->id === 0) {
+        $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
+
+        if ($collection->id < 1) {
             $response->header->status = RequestStatusCode::R_403;
             $this->createInvalidCreateResponse($request, $response, $collection);
 
             return;
         }
 
-        $this->createModel($request->header->account, $collection, CollectionMapper::class, 'collection', $request->getOrigin());
-
         $report = $this->createReportFromRequest($request, $response, $collection->id);
 
         $this->app->moduleManager->get('Admin')->createAccountModelPermission(

diff --git a/tests/Autoloader.php b/tests/Autoloader.php
@@ -79,7 +79,7 @@ public static function defaultAutoloader(string $class) : void
         $class  = \strtr($class, '_\\', '//');
 
         if (\stripos($class, 'Web/Backend') !== false || \stripos($class, 'Web/Api') !== false) {
-            $class = \str_replace('Web/', 'Install/Application/', $class);
+            $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'Karaka/Web/', $class);
         }
 
         $class2 = $class;

diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
@@ -60,6 +60,7 @@ protected function setUp() : void
         $this->app = new class() extends ApplicationAbstract
         {
             protected string $appName = 'Api';
+            protected int $appId = 1;
         };
 
         $this->app->dbPool          = $GLOBALS['dbpool'];