fix router

Author: krkabol

htdocs/app/Core/RouterFactory.php

@@ -15,7 +15,14 @@ final class RouterFactory
 	public static function createRouter(): RouteList
 	{
 		$router = new RouteList;
-        $router->addRoute('resolve[/<id>]', 'Home:resolve');
+        $router->addRoute(
+            'resolve[/<valueOfArk .+>]',
+            'Home:resolve'
+        );
+        $router->addRoute(
+            'full[/<ark .+>]',
+            'Home:full'
+        );
         $router->addRoute('<presenter>/<action>[/<id>]', 'Home:default');
         return $router;
 	}

htdocs/app/Presentation/Home/HomePresenter.php

@@ -24,17 +24,9 @@ public function renderDefault()
 
     }
 
-    public function actionResolve(?string $id, ?string $ark): void
+    public function actionFull(string $ark)
     {
-        if (!empty($ark)) { //http://localhost:8081/resolve-ark?ark=ark:xxxx/servicestatus
-            $this->fullARK($ark);
-        }
-
-        if (!empty($id)) { //http://localhost:8081/resolve/servicestatus
-            $this->valueOfARK($id);
-        }
-        $this->getParameter('NAAN');
-        $this->redirect(':default');
+        $this->fullARK($ark);
     }
 
     protected function fullARK(string $ark)
@@ -64,6 +56,12 @@ protected function keepAlive()
         $this->sendResponse($response);
     }
 
+    public function actionResolve(string $valueOfArk): void
+    {
+
+        $this->valueOfARK($valueOfArk);
+    }
+
     protected function valueOfARK(string $arkValue)
     {
         $prefixes = [

htdocs/app/Presentation/Home/default.latte

@@ -8,7 +8,7 @@
     <li><code>{$basePath}/resolve?ark=&#36;&#123;pid&#125;</code> - resolves the whole ARK PID</li>
     both with relevant health checks:
     <li><a n:href=":resolve App\Presentation\Home\HomePresenter::HealthCheck ">{link //:resolve, App\Presentation\Home\HomePresenter::HealthCheck|replace:'http://','https://'}</a> --> <a href="https://n2t.net/ark:12661/servicestatus">https://n2t.net/ark:12661/servicestatus</a></li>
-    <li><a n:href=":resolve null, 'ark:'.$naan.'/'.App\Presentation\Home\HomePresenter::HealthCheck ">{link //:resolve, null, 'ark:'.$naan.'/'.App\Presentation\Home\HomePresenter::HealthCheck|replace:'http://','https://'}</a></li>
+    <li><a n:href=":full 'ark:'.$naan.'/'.App\Presentation\Home\HomePresenter::HealthCheck ">{link //:full, 'ark:'.$naan.'/'.App\Presentation\Home\HomePresenter::HealthCheck|replace:'http://','https://'}</a></li>
 </ul>