Added the threat validation to manage the evaluation and treands upda…

…te fields, fixed the local risk threat modification, fixed reports generation.

config/module.config.php

@@ -1651,22 +1651,21 @@
                 ReflectionBasedAbstractFactory::class,
             InputValidator\InstanceRiskOp\UpdateInstanceRiskOpDataInputValidator::class =>
                 ReflectionBasedAbstractFactory::class,
-            CoreInputValidator\Asset\PostAssetDataInputValidator::class => static function (
-                Containerinterface $container
-            ) {
-                return new CoreInputValidator\Asset\PostAssetDataInputValidator(
+            InputValidator\Threat\PostThreatDataInputValidator::class => static function (Containerinterface $container)
+            {
+                return new InputValidator\Threat\PostThreatDataInputValidator(
                     $container->get('config'),
                     $container->get(CoreInputValidator\InputValidationTranslator::class),
-                    $container->get(Table\AssetTable::class)
+                    $container->get(Table\ThreatTable::class)
                 );
             },
-            CoreInputValidator\Threat\PostThreatDataInputValidator::class => static function (
+            CoreInputValidator\Asset\PostAssetDataInputValidator::class => static function (
                 Containerinterface $container
             ) {
-                return new CoreInputValidator\Threat\PostThreatDataInputValidator(
+                return new CoreInputValidator\Asset\PostAssetDataInputValidator(
                     $container->get('config'),
                     $container->get(CoreInputValidator\InputValidationTranslator::class),
-                    $container->get(Table\ThreatTable::class)
+                    $container->get(Table\AssetTable::class)
                 );
             },
             CoreInputValidator\Vulnerability\PostVulnerabilityDataInputValidator::class => static function (

src/Controller/ApiAnrDeliverableController.php

@@ -7,11 +7,13 @@
 
 namespace Monarc\FrontOffice\Controller;
 
+use Laminas\Diactoros\Response;
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
 use Monarc\Core\Exception\Exception;
 use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\DeliverableGenerationService;
+use function strlen;
 
 class ApiAnrDeliverableController extends AbstractRestfulControllerRequestHandler
 {
@@ -36,17 +38,17 @@ public function create($data)
             throw new Exception('Generated file is not found: ' . $filePath);
         }
 
-        $response = $this->getResponse();
-        $response->setContent(file_get_contents($filePath));
-
+        $reportContent = file_get_contents($filePath);
+        $stream = fopen('php://memory', 'rb+');
+        fwrite($stream, $reportContent);
+        rewind($stream);
         unlink($filePath);
 
-        $headers = $response->getHeaders();
-        $headers->clearHeaders()
-            ->addHeaderLine('Content-Type', 'text/plain; charset=utf-8')
-            ->addHeaderLine('Content-Disposition', 'attachment; filename="deliverable.docx"');
-
-        return $this->response;
+        return new Response($stream, 200, [
+            'Content-Type' => 'text/plain; charset=utf-8',
+            'Content-Length' => strlen($reportContent),
+            'Content-Disposition' => 'attachment; filename="deliverable.docx"',
+        ]);
     }
 
     public function get($id)

src/Controller/ApiAnrThreatsController.php

@@ -9,10 +9,10 @@
 
 use Monarc\Core\Controller\Handler\AbstractRestfulControllerRequestHandler;
 use Monarc\Core\Controller\Handler\ControllerRequestResponseHandlerTrait;
-use Monarc\Core\Validator\InputValidator\Threat\PostThreatDataInputValidator;
 use Monarc\FrontOffice\InputFormatter\Threat\GetThreatsInputFormatter;
 use Monarc\FrontOffice\Entity\Anr;
 use Monarc\FrontOffice\Service\AnrThreatService;
+use Monarc\FrontOffice\Validator\InputValidator\Threat\PostThreatDataInputValidator;
 
 class ApiAnrThreatsController extends AbstractRestfulControllerRequestHandler
 {

src/Service/AnrInstanceRiskService.php

@@ -445,8 +445,9 @@ private function updateInstanceRiskData(Entity\InstanceRisk $instanceRisk, array
         if (isset($data['reductionAmount'])) {
             $instanceRisk->setReductionAmount((int)$data['reductionAmount']);
         }
-        if (isset($data['threatRate'])) {
-            $instanceRisk->setThreatRate((int)$data['threatRate']);
+        if (isset($data['threatRate']) && $instanceRisk->getThreatRate() !== $data['threatRate']) {
+            $instanceRisk->setThreatRate((int)$data['threatRate'])
+                ->setIsThreatRateNotSetOrModifiedExternally(false);
         }
         if (isset($data['vulnerabilityRate'])) {
             $instanceRisk->setVulnerabilityRate((int)$data['vulnerabilityRate']);

src/Service/AnrThreatService.php

@@ -189,7 +189,9 @@ public function deleteList(Anr $anr, array $data): void
     private function manageQualification(Threat $threat, array $data): void
     {
         if (isset($data['qualification'])) {
-            $instancesRisks = $this->instanceRiskTable->findByAnrThreatExcludeLocallySetThreatRatesOrNot(
+            $threat->setQualification($data['qualification']);
+
+            $instancesRisks = $this->instanceRiskTable->findByAnrAndThreatExcludeLocallySet(
                 $threat->getAnr(),
                 $threat,
                 empty($data['forceQualification'])
@@ -202,9 +204,9 @@ private function manageQualification(Threat $threat, array $data): void
                     $instanceRisk->setIsThreatRateNotSetOrModifiedExternally(true);
                 }
 
-                $this->instanceRiskTable->save($instanceRisk, false);
-
                 $this->anrInstanceRiskService->recalculateRiskRatesAndUpdateRecommendationsPositions($instanceRisk);
+
+                $this->instanceRiskTable->save($instanceRisk, false);
             }
         }
     }