Moved all the entities to the src folder, fixed the controllers respo…

…nses.

Module.php

@@ -153,7 +153,7 @@ public function checkRbac(MvcEvent $mvcEvent)
 
         $roles[] = 'guest';
         if ($connectedUser !== null) {
-            $roles = $connectedUser->getRoles();
+            $roles = $connectedUser->getRolesArray();
         }
 
         foreach ($roles as $role) {

config/module.config.php

@@ -25,7 +25,7 @@
 use Monarc\FrontOffice\Import;
 use Monarc\FrontOffice\Middleware\AnrValidationMiddleware;
 use Monarc\FrontOffice\Model\DbCli;
-use Monarc\FrontOffice\Model\Entity;
+use Monarc\FrontOffice\Entity;
 use Monarc\FrontOffice\Model\Table as DeprecatedTable;
 use Monarc\FrontOffice\Service;
 use Monarc\FrontOffice\Service\Model\Entity as ModelFactory;
@@ -173,9 +173,9 @@
             'monarc_api_client_anr' => [
                 'type' => 'segment',
                 'options' => [
-                    'route' => '/api/client-anr[/:anrid]',
+                    'route' => '/api/client-anr[/:id]',
                     'constraints' => [
-                        'anrid' => '[0-9]+',
+                        'id' => '[0-9]+',
                     ],
                     'defaults' => [
                         'controller' => PipeSpec::class,
@@ -1504,6 +1504,7 @@
             Table\ThreatTable::class => ClientEntityManagerFactory::class,
             Table\UserTable::class => ClientEntityManagerFactory::class,
             Table\UserAnrTable::class => ClientEntityManagerFactory::class,
+            Table\UserTokenTable::class => ClientEntityManagerFactory::class,
             Table\VulnerabilityTable::class => ClientEntityManagerFactory::class,
             CronTask\Table\CronTaskTable::class => ClientEntityManagerFactory::class,
 
@@ -1705,7 +1706,7 @@
             'orm_cli' => [
                 'class' => MappingDriverChain::class,
                 'drivers' => [
-                    'Monarc\FrontOffice\Model\Entity' => 'Monarc_cli_driver',
+                    'Monarc\FrontOffice\Entity' => 'Monarc_cli_driver',
                 ],
             ],
         ],

migrations/db/20210521090000_changeable_operational_impact.php

@@ -1,8 +1,8 @@
 <?php
 
-use Monarc\FrontOffice\Model\Entity\OperationalRiskScale;
-use Monarc\FrontOffice\Model\Entity\OperationalRiskScaleComment;
-use Monarc\FrontOffice\Model\Entity\Translation;
+use Monarc\FrontOffice\Entity\OperationalRiskScale;
+use Monarc\FrontOffice\Entity\OperationalRiskScaleComment;
+use Monarc\FrontOffice\Entity\Translation;
 use Phinx\Migration\AbstractMigration;
 use Ramsey\Uuid\Uuid;
 

migrations/db/20220511123641_add_customizable_soa_scale.php

@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 use Ramsey\Uuid\Uuid;
-use Monarc\Core\Model\Entity\Translation;
+use Monarc\Core\Entity\Translation;
 
 class AddCustomizableSoaScale extends AbstractMigration
 {

migrations/db/20220829123641_fix_issue_with_specific_model.php

@@ -2,7 +2,7 @@
 
 use Phinx\Migration\AbstractMigration;
 use Ramsey\Uuid\Uuid;
-use Monarc\Core\Model\Entity\Translation;
+use Monarc\Core\Entity\Translation;
 
 class FixIssueWithSpecificModel extends AbstractMigration
 {

src/Command/CreateUsersCommand.php

@@ -2,8 +2,8 @@
 
 namespace Monarc\FrontOffice\Command;
 
-use Monarc\FrontOffice\Model\Entity\User;
-use Monarc\FrontOffice\Model\Entity\UserRole;
+use Monarc\FrontOffice\Entity\User;
+use Monarc\FrontOffice\Entity\UserRole;
 use Monarc\FrontOffice\Table\UserTable;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;

src/Controller/ApiAnrAmvsController.php

@@ -11,7 +11,7 @@
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Validator\InputValidator\Amv\PostAmvDataInputValidator;
 use Monarc\FrontOffice\InputFormatter\Amv\GetAmvsInputFormatter;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrAmvService;
 
 class ApiAnrAmvsController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrAssetsController.php

@@ -11,7 +11,7 @@
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Validator\InputValidator\Asset\PostAssetDataInputValidator;
 use Monarc\FrontOffice\InputFormatter\Asset\GetAssetsInputFormatter;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrAssetService;
 
 class ApiAnrAssetsController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrService;
 use Monarc\FrontOffice\Validator\InputValidator\Anr\CreateAnrDataInputValidator;
 

src/Controller/ApiAnrDeliverableController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\DeliverableGenerationService;
 
 class ApiAnrDeliverableController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrInstancesConsequencesController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Validator\InputValidator\InstanceConsequence\PatchConsequenceDataInputValidator;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceConsequenceService;
 
 class ApiAnrInstancesConsequencesController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrInstancesController.php

@@ -13,7 +13,7 @@
 use Monarc\Core\Validator\InputValidator\Instance\CreateInstanceDataInputValidator;
 use Monarc\Core\Validator\InputValidator\Instance\PatchInstanceDataInputValidator;
 use Monarc\Core\Validator\InputValidator\Instance\UpdateInstanceDataInputValidator;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceRiskOpService;
 use Monarc\FrontOffice\Service\AnrInstanceRiskService;
 use Monarc\FrontOffice\Service\AnrInstanceService;

src/Controller/ApiAnrInstancesMetadataFieldsController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceMetadataFieldService;
 
 class ApiAnrInstancesMetadataFieldsController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrInstancesRisksController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceRiskService;
 use Monarc\FrontOffice\Validator\InputValidator\InstanceRisk\PostSpecificInstanceRiskDataInputValidator;
 use Monarc\FrontOffice\Validator\InputValidator\InstanceRisk\UpdateInstanceRiskDataInputValidator;

src/Controller/ApiAnrInstancesRisksOpController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Validator\InputValidator\InstanceRiskOp\PatchInstanceRiskOpDataInputValidator;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceRiskOpService;
 use Monarc\FrontOffice\Validator\InputValidator\InstanceRiskOp\PostSpecificInstanceRiskOpDataInputValidator;
 use Monarc\FrontOffice\Validator\InputValidator\InstanceRiskOp\UpdateInstanceRiskOpDataInputValidator;

src/Controller/ApiAnrLibraryController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrObjectService;
 
 class ApiAnrLibraryController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrObjectsCategoriesController.php

@@ -11,7 +11,7 @@
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\InputFormatter\ObjectCategory\ObjectCategoriesInputFormatter;
 use Monarc\Core\Validator\InputValidator\ObjectCategory\PostObjectCategoryDataInputValidator;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrObjectCategoryService;
 
 class ApiAnrObjectsCategoriesController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrObjectsController.php

@@ -12,7 +12,7 @@
 use Monarc\Core\InputFormatter\Object\GetObjectInputFormatter;
 use Monarc\FrontOffice\Import\Service\ObjectImportService;
 use Monarc\FrontOffice\InputFormatter\Object\GetObjectsInputFormatter;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrObjectService;
 use Monarc\FrontOffice\Validator\InputValidator\Object\PostObjectDataInputValidator;
 
@@ -71,6 +71,8 @@ public function get($id)
      */
     public function create($data)
     {
+        // TODO: Validate the 3 import + 1 MOSP cases and 1 manual ...
+
         /** @var Anr $anr */
         $anr = $this->getRequest()->getAttribute('anr');
         if (!empty($data['mosp'])) {

src/Controller/ApiAnrObjectsDuplicationController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrObjectService;
 use Monarc\FrontOffice\Validator\InputValidator\Object\DuplicateObjectDataInputValidator;
 

src/Controller/ApiAnrObjectsObjectsController.php

@@ -11,7 +11,7 @@
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Validator\InputValidator\ObjectComposition\CreateDataInputValidator;
 use Monarc\Core\Validator\InputValidator\ObjectComposition\MovePositionDataInputValidator;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrObjectObjectService;
 
 class ApiAnrObjectsObjectsController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrRecommendationsController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\FrontOffice\InputFormatter\Recommendation\GetRecommendationsInputFormatter;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrRecommendationService;
 use Monarc\FrontOffice\Validator\InputValidator\Recommendation\PostRecommendationDataInputValidator;
 

src/Controller/ApiAnrRecommendationsHistoryController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrRecommendationHistoryService;
 
 class ApiAnrRecommendationsHistoryController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrRecommendationsRisksController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\FrontOffice\InputFormatter\RecommendationRisk\GetRecommendationRisksInputFormatter;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrRecommendationRiskService;
 use Monarc\FrontOffice\Validator\InputValidator\RecommendationRisk\PatchRecommendationRiskDataInputValidator;
 use Monarc\FrontOffice\Validator\InputValidator\RecommendationRisk\PostRecommendationRiskDataInputValidator;

src/Controller/ApiAnrRecommendationsRisksValidateController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrRecommendationRiskService;
 use Monarc\FrontOffice\Validator\InputValidator\RecommendationRisk\ValidateRecommendationRiskDataInputValidator;
 

src/Controller/ApiAnrRecommendationsSetsController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrRecommendationSetService;
 use Monarc\FrontOffice\Validator\InputValidator\RecommendationSet\PostRecommendationSetDataInputValidator;
 

src/Controller/ApiAnrRecordsController.php

@@ -8,9 +8,9 @@
 namespace Monarc\FrontOffice\Controller;
 
 use Monarc\Core\Exception\Exception;
-use Monarc\Core\Model\Entity\AbstractEntity;
-use Monarc\FrontOffice\Model\Entity\RecordPersonalData;
-use Monarc\FrontOffice\Model\Entity\RecordProcessor;
+use Monarc\Core\Entity\AbstractEntity;
+use Monarc\FrontOffice\Entity\RecordPersonalData;
+use Monarc\FrontOffice\Entity\RecordProcessor;
 use Monarc\FrontOffice\Service\AnrRecordService;
 use Doctrine\ORM\PersistentCollection;
 

src/Controller/ApiAnrRecordsImportController.php

@@ -9,11 +9,14 @@
 
 use Laminas\View\Model\JsonModel;
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
+use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
 use Monarc\FrontOffice\Service\AnrRecordService;
 
 class ApiAnrRecordsImportController extends AbstractRestfulControllerRequestHandler
 {
+    use ControllerRequestResponseHandlerTrait;
+
     public function __construct(private AnrRecordService $anrRecordService)
     {
     }
@@ -33,8 +36,7 @@ public function create($data)
 
         [$ids, $errors] = $this->anrRecordService->importFromFile($anrId, $data);
 
-        return new JsonModel([
-            'status' => 'ok',
+        return $this->getSuccessfulJsonResponse([
             'id' => $ids,
             'errors' => $errors,
         ]);

src/Controller/ApiAnrRiskOwnersController.php

@@ -9,7 +9,7 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\InstanceRiskOwnerService;
 
 class ApiAnrRiskOwnersController extends AbstractRestfulControllerRequestHandler

src/Controller/ApiAnrRisksController.php

@@ -8,16 +8,18 @@
 namespace Monarc\FrontOffice\Controller;
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceRiskService;
 use Laminas\Http\Response;
-use Laminas\View\Model\JsonModel;
 
 /**
  * The controller is responsible to fetch instance risks for the whole analysis or a single instance.
  */
 class ApiAnrRisksController extends AbstractRestfulControllerRequestHandler
 {
+    use ControllerRequestResponseHandlerTrait;
+
     public function __construct(private AnrInstanceRiskService $anrInstanceRiskService)
     {
     }
@@ -45,7 +47,7 @@ public function get($id)
 
         $risks = $this->anrInstanceRiskService->getInstanceRisks($anr, $id, $params);
 
-        return new JsonModel([
+        return $this->getPreparedJsonResponse([
             'count' => \count($risks),
             'risks' => $params['limit'] > 0
                 ? \array_slice($risks, ($params['page'] - 1) * $params['limit'], $params['limit'])

src/Controller/ApiAnrRisksOpController.php

@@ -10,7 +10,7 @@
 use Laminas\Http\Response;
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrInstanceRiskOpService;
 
 /**
@@ -20,11 +20,8 @@ class ApiAnrRisksOpController extends AbstractRestfulControllerRequestHandler
 {
     use ControllerRequestResponseHandlerTrait;
 
-    private AnrInstanceRiskOpService $anrInstanceRiskOpService;
-
-    public function __construct(AnrInstanceRiskOpService $anrInstanceRiskOpService)
+    public function __construct(private AnrInstanceRiskOpService $anrInstanceRiskOpService)
     {
-        $this->anrInstanceRiskOpService = $anrInstanceRiskOpService;
     }
 
     /**
@@ -62,7 +59,7 @@ public function get($id)
 
     public function getList()
     {
-        $this->get(null);
+        return $this->get(null);
     }
 
     protected function getFilterParams(): array

src/Controller/ApiAnrRolfRisksController.php

@@ -8,7 +8,7 @@
 namespace Monarc\FrontOffice\Controller;
 
 use Monarc\FrontOffice\Service\AnrRolfRiskService;
-use Monarc\FrontOffice\Model\Entity\Measure;
+use Monarc\FrontOffice\Entity\Measure;
 
 class ApiAnrRolfRisksController extends ApiAnrAbstractController
 {

src/Controller/ApiAnrScalesCommentsController.php

@@ -10,7 +10,7 @@
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\InputFormatter\ScaleComment\GetScaleCommentsInputFormatter;
-use Monarc\FrontOffice\Model\Entity\Anr;
+use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrScaleCommentService;
 
 class ApiAnrScalesCommentsController extends AbstractRestfulControllerRequestHandler