Added processing of the anr instance fields when models created.

monarc-project · Aug 30, 2024 · 4eadc69 · 4eadc69
1 parent 17f1337
commit 4eadc69
Show file tree

Hide file tree

Showing 53 changed files with 68 additions and 67 deletions.
diff --git a/src/Adapter/Authentication.php b/src/Adapter/Authentication.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.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-2020 SMILE GIE Securitymadein.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
  */
 
@@ -12,7 +12,6 @@
 /**
  * Index Controller to load the Homepage. This is pretty much the only non-REST-API page since the app in an SPA, which
  * means all the browser routing is done client-side by the frontend code.
- * @package Monarc\Core\Controller
  */
 class IndexController extends AbstractRestfulController
 {

diff --git a/src/Entity/Instance.php b/src/Entity/Instance.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/InstanceConsequence.php b/src/Entity/InstanceConsequence.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 
@@ -10,8 +10,6 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Instance Consequence
- *
  * @ORM\Table(name="instances_consequences", indexes={
  *      @ORM\Index(name="anr", columns={"anr_id"}),
  *      @ORM\Index(name="instance_id", columns={"instance_id"}),

diff --git a/src/Entity/InstanceRisk.php b/src/Entity/InstanceRisk.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 
@@ -10,8 +10,6 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * InstanceRisk
- *
  * @ORM\Table(name="instances_risks", indexes={
  *      @ORM\Index(name="anr", columns={"anr_id"}),
  *      @ORM\Index(name="amv_id", columns={"amv_id"}),

diff --git a/src/Entity/InstanceRiskOp.php b/src/Entity/InstanceRiskOp.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 
@@ -10,8 +10,6 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Instance Risk Op
- *
  * @ORM\Table(name="instances_risks_op", indexes={
  *      @ORM\Index(name="anr_id", columns={"anr_id"}),
  *      @ORM\Index(name="instance_id", columns={"instance_id"}),

diff --git a/src/Entity/Model.php b/src/Entity/Model.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/OperationalInstanceRiskScale.php b/src/Entity/OperationalInstanceRiskScale.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-2021 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/OperationalInstanceRiskScaleSuperClass.php b/src/Entity/OperationalInstanceRiskScaleSuperClass.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-2021 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/OperationalRiskScale.php b/src/Entity/OperationalRiskScale.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-2021 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/OperationalRiskScaleSuperClass.php b/src/Entity/OperationalRiskScaleSuperClass.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-2021 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/OperationalRiskScaleTypeSuperClass.php b/src/Entity/OperationalRiskScaleTypeSuperClass.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-2021 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/PasswordToken.php b/src/Entity/PasswordToken.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 
@@ -10,8 +10,6 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Password Token
- *
  * @ORM\Table(name="passwords_tokens")
  * @ORM\Entity
  */

diff --git a/src/Entity/PasswordTokenSuperClass.php b/src/Entity/PasswordTokenSuperClass.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 
@@ -11,8 +11,6 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Password Token
- *
  * @ORM\Table(name="passwords_tokens", indexes={
  *      @ORM\Index(name="user_id", columns={"user_id"})
  * }), uniqueConstraints={@ORM\UniqueConstraint(name="token", columns={"token"})}

diff --git a/src/Entity/ScaleImpactTypeSuperClass.php b/src/Entity/ScaleImpactTypeSuperClass.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/Traits/CreateEntityTrait.php b/src/Entity/Traits/CreateEntityTrait.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/Traits/UpdateEntityTrait.php b/src/Entity/Traits/UpdateEntityTrait.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/UserRole.php b/src/Entity/UserRole.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/UserRoleSuperClass.php b/src/Entity/UserRoleSuperClass.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @link      https://github.com/monarc-project for the canonical source repository
- * @copyright Copyright (c) 2016-2020 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Entity/UserSuperClass.php b/src/Entity/UserSuperClass.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-2022 SMILE GIE Securitymadein.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
  */
 
@@ -10,7 +10,6 @@
 use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use http\Params;
 use Monarc\Core\Entity\Traits;
 
 /**

diff --git a/src/Exception/ActionForbiddenException.php b/src/Exception/ActionForbiddenException.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-2020 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Exception/UserNotLoggedInException.php b/src/Exception/UserNotLoggedInException.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-2020 SMILE GIE Securitymadein.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
  */
 
@@ -11,7 +11,7 @@
 
 class UserNotLoggedInException extends \Exception
 {
-    public function __construct($message = "User is not logged in.", $code = 401, Throwable $previous = null)
+    public function __construct($message = 'User is not logged in.', $code = 401, Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

diff --git a/src/InputFormatter/Model/GetModelsInputFormatter.php b/src/InputFormatter/Model/GetModelsInputFormatter.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/InputFormatter/Object/GetObjectInputFormatter.php b/src/InputFormatter/Object/GetObjectInputFormatter.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/InputFormatter/Object/GetObjectsInputFormatter.php b/src/InputFormatter/Object/GetObjectsInputFormatter.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/InputFormatter/ObjectCategory/ObjectCategoriesInputFormatter.php b/src/InputFormatter/ObjectCategory/ObjectCategoriesInputFormatter.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/InputFormatter/User/GetUsersInputFormatter.php b/src/InputFormatter/User/GetUsersInputFormatter.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Request/Psr7Bridge/RequestConverter.php b/src/Request/Psr7Bridge/RequestConverter.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Request/Request.php b/src/Request/Request.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Service/AnrInstanceMetadataFieldService.php b/src/Service/AnrInstanceMetadataFieldService.php
@@ -81,9 +81,11 @@ public function getAnrInstanceMetadataField(Anr $anr, int $id, string $language)
         ];
     }
 
-    public function create(Anr $anr, array $data): AnrInstanceMetadataField
+    public function create(Anr $anr, array $data, bool $saveInDb = true): AnrInstanceMetadataField
     {
+        // TODO: check why front-end doesn't pass the param when called.
         $metadataFieldData = current($data['metadataField']);
+        /** @var AnrInstanceMetadataField $metadataField */
         $metadataField = (new AnrInstanceMetadataField())
             ->setLabelTranslationKey((string)Uuid::uuid4())
             ->setAnr($anr)
@@ -103,7 +105,6 @@ public function create(Anr $anr, array $data): AnrInstanceMetadataField
 
         $this->anrInstanceMetadataFieldTable->save($metadataField);
 
-        /** @var AnrInstanceMetadataField $metadataField */
         return $metadataField;
     }
 

diff --git a/src/Service/Interfaces/PositionUpdatableServiceInterface.php b/src/Service/Interfaces/PositionUpdatableServiceInterface.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Service/ModelService.php b/src/Service/ModelService.php
@@ -24,6 +24,7 @@ public function __construct(
         private ModelTable $modelTable,
         private AnrTable $anrTable,
         private AnrService $anrService,
+        private AnrInstanceMetadataFieldService $anrInstanceMetadataFieldService,
         ConnectedUserService $connectedUserService
     ) {
         $this->connectedUser = $connectedUserService->getConnectedUser();
@@ -64,6 +65,12 @@ public function create(array $data): int
         $model = $this->setModelData($model, $data)
             ->setCreator($this->connectedUser->getEmail());
 
+        if (!empty($data['metadataFields'])) {
+            foreach ($data['metadataFields'] as $metadataFieldData) {
+                $this->anrInstanceMetadataFieldService->create($anr, [$metadataFieldData], false);
+            }
+        }
+
         $this->modelTable->save($model);
 
         return $model->getId();

diff --git a/src/Service/ThreatService.php b/src/Service/ThreatService.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-2022 SMILE GIE Securitymadein.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
  */
 

diff --git a/src/Service/UserProfileService.php b/src/Service/UserProfileService.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-2022 SMILE GIE Securitymadein.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
  */