Cleaned the variables usage, inversed the conditions.

Author: Ruslan Baidan

src/Service/InstanceImportService.php

@@ -1338,8 +1338,6 @@ private function processInstanceRisks(
         foreach ($data['risks'] as $instanceRiskData) {
             $threatData = $data['threats'][$instanceRiskData['threat']];
             $vulnerabilityData = $data['vuls'][$instanceRiskData['vulnerability']];
-            $vulnerability = null;
-            $threat = null;
 
             $threatUuid = isset($this->cachedData['threats'][$threatData['uuid']])
                 ? $this->cachedData['threats'][$threatData['uuid']]->getUuid()
@@ -1358,7 +1356,10 @@ private function processInstanceRisks(
 
             if ((int)$instanceRiskData['specific'] === InstanceRisk::TYPE_SPECIFIC) {
                 if (!isset($this->cachedData['threats'][$threatData['uuid']])) {
-                    if (!\in_array((string)$threatData['uuid'], $threatsUuids, true)) {
+                    if (\in_array((string)$threatData['uuid'], $threatsUuids, true)) {
+                        $this->cachedData['threats'][$threatData['uuid']] = $this->threatTable
+                            ->findByAnrAndUuid($anr, (string)$threatData['uuid']);
+                    } else {
                         $threat = (new Threat())
                             ->setUuid($threatData['uuid'])
                             ->setAnr($anr)
@@ -1390,17 +1391,15 @@ private function processInstanceRisks(
 
                         $this->threatTable->saveEntity($threat, false);
 
-                        $this->cachedData['threats'][$threatData['uuid']] = $threat;
-                    } else {
-                        $threat = $this->threatTable->findByAnrAndUuid($anr, (string)$threatData['uuid']);
                         $this->cachedData['threats'][$threatData['uuid']] = $threat;
                     }
-                } else {
-                    $threat = $this->cachedData['threats'][$threatData['uuid']];
                 }
 
                 if (!isset($this->cachedData['vulnerabilities'][$vulnerabilityData['uuid']])) {
-                    if (!\in_array((string)$vulnerabilityData['uuid'], $vulnerabilitiesUuids, true)) {
+                    if (\in_array((string)$vulnerabilityData['uuid'], $vulnerabilitiesUuids, true)) {
+                        $this->cachedData['vulnerabilities'][$vulnerabilityData['uuid']] = $this->vulnerabilityTable
+                            ->findByAnrAndUuid($anr, (string)$vulnerabilityData['uuid']);
+                    } else {
                         $vulnerability = (new Vulnerability())
                             ->setUuid($vulnerabilityData['uuid'])
                             ->setAnr($anr)
@@ -1412,24 +1411,18 @@ private function processInstanceRisks(
                             ->setCreator($this->connectedUser->getEmail());
 
                         $this->vulnerabilityTable->saveEntity($vulnerability, false);
-                    } else {
-                        $vulnerability = $this->vulnerabilityTable->findByAnrAndUuid(
-                            $anr,
-                            (string)$vulnerabilityData['uuid']
-                        );
+
+                        $this->cachedData['vulnerabilities'][$vulnerabilityData['uuid']] = $vulnerability;
                     }
-                    $this->cachedData['vulnerabilities'][$vulnerabilityData['uuid']] = $vulnerability;
-                } else {
-                    $vulnerability = $this->cachedData['vulnerabilities'][$vulnerabilityData['uuid']];
                 }
 
                 $instanceRisk = $this->createInstanceRiskFromData(
                     $instanceRiskData,
                     $anr,
                     $instance,
                     $monarcObject->getAsset(),
-                    $threat,
-                    $vulnerability
+                    $this->cachedData['threats'][$threatData['uuid']],
+                    $this->cachedData['vulnerabilities'][$vulnerabilityData['uuid']]
                 );
 
                 $this->instanceRiskTable->saveEntity($instanceRisk, false);