Fixed some anr creation issues.

monarc-project · Mar 23, 2024 · dbfec07 · dbfec07
1 parent 41997df
commit dbfec07
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/Service/AnrInstanceRiskService.php b/src/Service/AnrInstanceRiskService.php
@@ -202,8 +202,11 @@ public function createInstanceRisks(
                         $instanceRiskData = array_values($params['risks'])[$riskKey];
                         $instanceRisk->setContext($instanceRiskData['context'] ?? '');
                         if (!empty($instanceRiskData['riskOwner'])) {
+                            /** @var Entity\Anr $anr */
+                            $anr = $instance->getAnr();
                             $instanceRiskOwner = $this->instanceRiskOwnerService->getOrCreateInstanceRiskOwner(
-                                $instance->getAnr(),
+                                $anr,
+                                $anr,
                                 $instanceRiskData['riskOwner']
                             );
                             $instanceRisk->setInstanceRiskOwner($instanceRiskOwner);

diff --git a/src/Service/AnrService.php b/src/Service/AnrService.php
@@ -961,7 +961,7 @@ private function duplicateRolfRisks(
         foreach ($sourceRolfRisks as $sourceRolfRisk) {
             $newRolfRisk = (new Entity\RolfRisk())
                 ->setAnr($newAnr)
-                ->setCode($sourceRolfRisk->getCode)
+                ->setCode($sourceRolfRisk->getCode())
                 ->setLabels($sourceRolfRisk->getLabels())
                 ->setDescriptions($sourceRolfRisk->getDescriptions())
                 ->setCreator($this->connectedUser->getEmail());
@@ -1185,7 +1185,7 @@ private function duplicateObjectCategoryAndItsParents(
         if ($sourceObjectCategory->getParent() !== null
             && !isset($objectCategoryOldIdsToNewObjects[$sourceObjectCategory->getParent()->getId()])
         ) {
-            $objectCategoryOldIdsToNewObjects = $this->duplicateObjectCategoryAndItsParents(
+            $objectCategoryOldIdsToNewObjects += $this->duplicateObjectCategoryAndItsParents(
                 $newAnr,
                 $sourceObjectCategory->getParent(),
                 $objectCategoryOldIdsToNewObjects
@@ -1195,7 +1195,9 @@ private function duplicateObjectCategoryAndItsParents(
         $objectCategoryOldIdsToNewObjects[$sourceObjectCategory->getId()] = $this->anrObjectCategoryService->create(
             $newAnr,
             array_merge([
-                'parent' => $objectCategoryOldIdsToNewObjects[$sourceObjectCategory->getParent()->getId()] ?? null,
+                'parent' => $sourceObjectCategory->getParent() !== null
+                    ? $objectCategoryOldIdsToNewObjects[$sourceObjectCategory->getParent()->getId()]
+                    : null,
                 'setOnlyExactPosition' => true,
                 'position' => $sourceObjectCategory->getPosition(),
             ], $sourceObjectCategory->getLabels()),
@@ -1426,7 +1428,10 @@ private function duplicateInstanceRisks(
             if ($sourceInstanceRisk instanceof Entity\InstanceRisk
                 && $sourceInstanceRisk->getInstanceRiskOwner() !== null
             ) {
+                /** @var Entity\Anr $sourceAnr */
+                $sourceAnr = $sourceInstance->getAnr();
                 $newInstanceRisk->setInstanceRiskOwner($this->instanceRiskOwnerService->getOrCreateInstanceRiskOwner(
+                    $sourceAnr,
                     $newAnr,
                     $sourceInstanceRisk->getInstanceRiskOwner()->getName(),
                 ));
@@ -1463,7 +1468,10 @@ private function duplicateOperationalInstanceRisks(
             if ($sourceInstanceRiskOp instanceof Entity\InstanceRiskOp
                 && $sourceInstanceRiskOp->getInstanceRiskOwner() !== null
             ) {
+                /** @var Entity\Anr $sourceAnr */
+                $sourceAnr = $sourceInstance->getAnr();
                 $instanceRiskOwner = $this->instanceRiskOwnerService->getOrCreateInstanceRiskOwner(
+                    $sourceAnr,
                     $newAnr,
                     $sourceInstanceRiskOp->getInstanceRiskOwner()->getName(),
                 );

diff --git a/src/Service/InstanceRiskOwnerService.php b/src/Service/InstanceRiskOwnerService.php
@@ -41,11 +41,12 @@ public function create(Anr $anr, string $ownerName, bool $saveIdDb = false): Ins
     }
 
     public function getOrCreateInstanceRiskOwner(
+        Anr $sourceAnr,
         Anr $anr,
         string $ownerName
     ): InstanceRiskOwner {
         if (!isset($this->cachedData['instanceRiskOwners'][$ownerName])) {
-            $instanceRiskOwner = $this->instanceRiskOwnerTable->findByAnrAndName($anr, $ownerName);
+            $instanceRiskOwner = $this->instanceRiskOwnerTable->findByAnrAndName($sourceAnr, $ownerName);
             if ($instanceRiskOwner === null) {
                 $instanceRiskOwner = $this->create($anr, $ownerName);
             }