Fixed the risks creation for the child objects of the anr.

monarc-project · Feb 24, 2020 · 0dd391f · 0dd391f
1 parent 40f4596
commit 0dd391f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/Service/InstanceRiskOpService.php b/src/Service/InstanceRiskOpService.php
@@ -76,21 +76,24 @@ public function createInstanceRisksOp($instanceId, $anrId, $object)
                 /** @var InstanceRiskOpTable $instanceRiskOpTable */
                 $instanceRiskOpTable = $this->get('table');
                 foreach ($instances as $instance) {
-                    if ($instance->id != $instanceId) {
-                        $instancesRisksOp = $instanceRiskOpTable->getEntityByFields(['instance' => $instance->id]);
-                        foreach ($instancesRisksOp as $instanceRiskOp) {
-                            /** @var InstanceRiskOp $newInstanceRiskOp */
-                            $newInstanceRiskOp = clone $instanceRiskOp;
-                            $newInstanceRiskOp->setId(null);
-                            $newInstanceRiskOp->setInstance($currentInstance);
-
-                            $newInstanceRiskOp->setCreator(
-                                $this->getConnectedUser()->getFirstname() . ' ' . $this->getConnectedUser()->getLastname()
-                            );
-
-                            $instanceRiskOpTable->save($newInstanceRiskOp);
-                        }
+                    if ($instance->getId() === $instanceId) {
+                        continue;
                     }
+
+                    $instancesRisksOp = $instanceRiskOpTable->getEntityByFields(['instance' => $instance->id]);
+                    foreach ($instancesRisksOp as $instanceRiskOp) {
+                        /** @var InstanceRiskOp $newInstanceRiskOp */
+                        $newInstanceRiskOp = clone $instanceRiskOp;
+                        $newInstanceRiskOp->setId(null);
+                        $newInstanceRiskOp->setInstance($currentInstance);
+
+                        $newInstanceRiskOp->setCreator(
+                            $this->getConnectedUser()->getFirstname() . ' ' . $this->getConnectedUser()->getLastname()
+                        );
+
+                        $instanceRiskOpTable->save($newInstanceRiskOp);
+                    }
+
                     break;
                 }
             } else {

diff --git a/src/Service/InstanceRiskService.php b/src/Service/InstanceRiskService.php
@@ -113,9 +113,9 @@ public function createInstanceRisks($instanceId, $anrId, $object)
                             }
                         }
                     }
-
-                    break;
                 }
+
+                break;
             }
         } else {
             /** @var AmvTable $amvTable */