Moved all the entities to the src folder, fixed the controllers responses.

Author: ruslanbaidan

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