Applied the core changes to the controllers to make them work.

monarc-project · Feb 11, 2024 · fe4bd9e · fe4bd9e
1 parent c58572c
commit fe4bd9e
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 121 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "ext-pdo": "*",
         "doctrine/doctrine-orm-module": "^5.1",

diff --git a/config/module.config.php b/config/module.config.php
@@ -215,7 +215,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiDeliveriesModelsController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiDeliveriesModelsController::class),
                     ],
                 ],
             ],
@@ -228,7 +229,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiQuestionsController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiQuestionsController::class),
                     ],
                 ],
             ],
@@ -241,7 +243,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiQuestionsChoicesController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiQuestionsChoicesController::class),
                     ],
                 ],
             ],
@@ -254,7 +257,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiGuidesController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiGuidesController::class),
                     ],
                 ],
             ],
@@ -267,7 +271,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiGuidesItemsController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiGuidesItemsController::class),
                     ],
                 ],
             ],
@@ -293,7 +298,8 @@
                         'id' => '[a-f0-9-]*',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiReferentialsController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiReferentialsController::class),
                     ],
                 ],
             ],
@@ -306,7 +312,8 @@
                         'id' => '[a-f0-9-]*',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiMeasuresController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiMeasuresController::class),
                     ],
                 ],
             ],
@@ -319,7 +326,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiMeasureMeasureController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiMeasureMeasureController::class),
                     ],
                 ],
             ],
@@ -401,7 +409,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiRolfRisksController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiRolfRisksController::class),
                     ],
                 ],
             ],
@@ -414,7 +423,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiRolfTagsController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiRolfTagsController::class),
                     ],
                 ],
             ],
@@ -440,7 +450,8 @@
                         'id' => '[0-9]+',
                     ],
                     'defaults' => [
-                        'controller' => Controller\ApiSoaCategoryController::class,
+                        'controller' => PipeSpec::class,
+                        'middleware' => new PipeSpec(Controller\ApiSoaCategoryController::class),
                     ],
                 ],
             ],

diff --git a/src/Controller/ApiAnrInstancesConsequencesController.php b/src/Controller/ApiAnrInstancesConsequencesController.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2023 Luxembourg House of Cybersecurity LHC.lu - Licensed under GNU Affero GPL v3
+ * @copyright Copyright (c) 2016-2024 Luxembourg House of Cybersecurity LHC.lu - Licensed under GNU Affero GPL v3
  * @license   MONARC is licensed under GNU Affero General Public License version 3
  */
 
@@ -29,6 +29,10 @@ public function __construct(
         $this->patchConsequenceDataInputValidator = $patchConsequenceDataInputValidator;
     }
 
+    /**
+     * The patch endpoint is called only when hide/show consequence action is performed.
+     * Possible data params: $data['isHidden'] = 0|1
+     */
     public function patch($id, $data)
     {
         /** @var Anr $anr */

diff --git a/src/Controller/ApiAnrInstancesController.php b/src/Controller/ApiAnrInstancesController.php
@@ -62,6 +62,8 @@ public function get($id)
     }
 
     /**
+     * Instantiation of an object to the analysis.
+     *
      * @param array $data
      */
     public function create($data)
@@ -78,6 +80,8 @@ public function create($data)
     }
 
     /**
+     * Is called when instances consequences are set (edit impact).
+     *
      * @param array $data
      */
     public function update($id, $data)
@@ -92,6 +96,9 @@ public function update($id, $data)
         return $this->getSuccessfulJsonResponse();
     }
 
+    /**
+     * Is called when we move (drag-n-drop) instance inside of analysis.
+     */
     public function patch($id, $data)
     {
         /** @var Anr $anr */
@@ -106,7 +113,10 @@ public function patch($id, $data)
 
     public function delete($id)
     {
-        $this->instanceService->delete((int)$id);
+        /** @var Anr $anr */
+        $anr = $this->getRequest()->getAttribute('anr');
+
+        $this->instanceService->delete($anr, (int)$id);
 
         return $this->getSuccessfulJsonResponse();
     }

diff --git a/src/Controller/ApiAnrInstancesRisksOpController.php b/src/Controller/ApiAnrInstancesRisksOpController.php
@@ -11,25 +11,42 @@
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Model\Entity\Anr;
 use Monarc\Core\Service\InstanceRiskOpService;
+use Monarc\Core\Validator\InputValidator\InstanceRiskOp\PatchInstanceRiskOpDataInputValidator;
+use Monarc\Core\Validator\InputValidator\InstanceRiskOp\UpdateInstanceRiskOpDataInputValidator;
 
 class ApiAnrInstancesRisksOpController extends AbstractRestfulControllerRequestHandler
 {
     use ControllerRequestResponseHandlerTrait;
 
     private InstanceRiskOpService $instanceRiskOpService;
+    private PatchInstanceRiskOpDataInputValidator $patchInstanceRiskOpDataInputValidator;
+    private UpdateInstanceRiskOpDataInputValidator $updateInstanceRiskOpDataInputValidator;
 
-    public function __construct(InstanceRiskOpService $instanceRiskOpService)
-    {
+    public function __construct(
+        InstanceRiskOpService $instanceRiskOpService,
+        UpdateInstanceRiskOpDataInputValidator $updateInstanceRiskOpDataInputValidator,
+        PatchInstanceRiskOpDataInputValidator $patchInstanceRiskOpDataInputValidator
+    ) {
         $this->instanceRiskOpService = $instanceRiskOpService;
+        $this->updateInstanceRiskOpDataInputValidator = $updateInstanceRiskOpDataInputValidator;
+        $this->patchInstanceRiskOpDataInputValidator = $patchInstanceRiskOpDataInputValidator;
     }
 
+    /**
+     * @param array $data
+     */
     public function update($id, $data)
     {
+        $this->validatePostParams($this->updateInstanceRiskOpDataInputValidator, $data);
         /** @var Anr $anr */
         $anr = $this->getRequest()->getAttribute('anr');
 
         /** @var array $data */
-        $instanceRiskOp = $this->instanceRiskOpService->update($anr, (int)$id, $data);
+        $instanceRiskOp = $this->instanceRiskOpService->update(
+            $anr,
+            (int)$id,
+            $this->updateInstanceRiskOpDataInputValidator->getValidData()
+        );
 
         return $this->getPreparedJsonResponse([
             'cacheBrutRisk' => $instanceRiskOp->getCacheBrutRisk(),
@@ -40,10 +57,15 @@ public function update($id, $data)
 
     public function patch($id, $data)
     {
+        $this->validatePostParams($this->patchInstanceRiskOpDataInputValidator, $data);
         /** @var Anr $anr */
         $anr = $this->getRequest()->getAttribute('anr');
 
-        $instanceRiskOp = $this->instanceRiskOpService->updateScaleValue($anr, (int)$id, $data);
+        $instanceRiskOp = $this->instanceRiskOpService->updateScaleValue(
+            $anr,
+            (int)$id,
+            $this->patchInstanceRiskOpDataInputValidator->getValidData()
+        );
 
         return $this->getPreparedJsonResponse([
             'cacheBrutRisk' => $instanceRiskOp->getCacheBrutRisk(),

diff --git a/src/Controller/ApiAnrRisksOpController.php b/src/Controller/ApiAnrRisksOpController.php
@@ -24,13 +24,14 @@ public function __construct(InstanceRiskOpService $instanceRiskOpService)
     }
 
     /**
-     * @param int $id Instance ID.
+     * @param int|null $id Instance ID.
      */
     public function get($id)
     {
         /** @var Anr $anr */
         $anr = $this->getRequest()->getAttribute('anr');
         $params = $this->parseParams();
+        $id = $id === null ? null : (int)$id;
 
         $risks = $this->instanceRiskOpService->getOperationalRisks($anr, (int)$id, $params);
 
@@ -42,28 +43,19 @@ public function get($id)
 
     public function getList()
     {
-        /** @var Anr $anr */
-        $anr = $this->getRequest()->getAttribute('anr');
-        $params = $this->parseParams();
-
-        $risks = $this->instanceRiskOpService->getOperationalRisks($anr, null, $params);
-
-        return $this->getPreparedJsonResponse([
-            'count' => \count($risks),
-            'oprisks' => \array_slice($risks, ($params['page'] - 1) * $params['limit'], $params['limit']),
-        ]);
+        return $this->get(null);
     }
 
     protected function parseParams(): array
     {
         $params = $this->params();
 
         return [
-            'keywords' => $params->fromQuery("keywords"),
-            'kindOfMeasure' => $params->fromQuery("kindOfMeasure"),
-            'order' => $params->fromQuery("order", "maxRisk"),
-            'order_direction' => $params->fromQuery("order_direction", "desc"),
-            'thresholds' => $params->fromQuery("thresholds"),
+            'keywords' => $params->fromQuery('keywords'),
+            'kindOfMeasure' => $params->fromQuery('kindOfMeasure'),
+            'order' => $params->fromQuery('order', 'maxRisk'),
+            'order_direction' => $params->fromQuery('order_direction', 'desc'),
+            'thresholds' => $params->fromQuery('thresholds'),
             'page' => (int)$params->fromQuery('page', 1),
             'limit' => (int)$params->fromQuery('limit', 50),
         ];

diff --git a/src/Controller/ApiAnrScalesController.php b/src/Controller/ApiAnrScalesController.php
@@ -1,36 +1,34 @@
 <?php declare(strict_types=1);
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2023 Luxembourg House of Cybersecurity LHC.lu - Licensed under GNU Affero GPL v3
+ * @copyright Copyright (c) 2016-2024 Luxembourg House of Cybersecurity LHC.lu - Licensed under GNU Affero GPL v3
  * @license   MONARC is licensed under GNU Affero General Public License version 3
  */
 
 namespace Monarc\BackOffice\Controller;
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\InputFormatter\Scale\GetScalesInputFormatter;
 use Monarc\Core\Model\Entity\Anr;
 use Monarc\Core\Service\ScaleService;
+use Monarc\Core\Validator\InputValidator\Scale\UpdateScalesDataInputValidator;
 
 class ApiAnrScalesController extends AbstractRestfulControllerRequestHandler
 {
     use ControllerRequestResponseHandlerTrait;
 
-    private ScaleService $scaleService;
-
-    private GetScalesInputFormatter $getScalesInputFormatter;
-
-    public function __construct(ScaleService $scaleService, GetScalesInputFormatter $getScalesInputFormatter)
-    {
-        $this->scaleService = $scaleService;
-        $this->getScalesInputFormatter = $getScalesInputFormatter;
+    public function __construct(
+        private ScaleService $scaleService,
+        private UpdateScalesDataInputValidator $updateScalesDataInputValidator
+    ) {
     }
 
     public function getList()
     {
-        $formattedParams = $this->getFormattedInputParams($this->getScalesInputFormatter);
-        $scales = $this->scaleService->getList($formattedParams);
+        /** @var Anr $anr */
+        $anr = $this->getRequest()->getAttribute('anr');
+
+        $scales = $this->scaleService->getList($anr);
 
         return $this->getPreparedJsonResponse([
             'count' => \count($scales),
@@ -40,11 +38,11 @@ public function getList()
 
     public function update($id, $data)
     {
+        $this->validatePostParams($this->updateScalesDataInputValidator, $data);
+
         /** @var Anr $anr */
         $anr = $this->getRequest()->getAttribute('anr');
-
-        /** @var array $data */
-        $this->scaleService->update($anr, (int)$id, $data);
+        $this->scaleService->update($anr, (int)$id, $this->updateScalesDataInputValidator->getValidData());
 
         return $this->getSuccessfulJsonResponse();
     }