Fix: when a sub-migration is skipped in a step of a loop, do not halt…

… the loop immediately but go on un til the end; references are now resolved for the "over" element of loops
kaliop-uk · Nov 8, 2018 · 5980e71 · 5980e71
1 parent 65e33af
commit 5980e71
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/Core/Executor/IgnorableStepExecutorTrait.php b/Core/Executor/IgnorableStepExecutorTrait.php
@@ -34,4 +34,4 @@ protected function matchConditions($conditions)
         return reset($match);
     }
 
-}
+}
diff --git a/Core/Executor/LoopExecutor.php b/Core/Executor/LoopExecutor.php
@@ -5,6 +5,8 @@
 use Kaliop\eZMigrationBundle\API\Value\MigrationStep;
 use Kaliop\eZMigrationBundle\Core\MigrationService;
 use Kaliop\eZMigrationBundle\Core\ReferenceResolver\LoopResolver;
+use Kaliop\eZMigrationBundle\API\ReferenceResolverInterface;
+use Kaliop\eZMigrationBundle\API\Exception\MigrationStepSkippedException;
 
 class LoopExecutor extends AbstractExecutor
 {
@@ -18,10 +20,13 @@ class LoopExecutor extends AbstractExecutor
     /** @var LoopResolver $loopResolver */
     protected $loopResolver;
 
-    public function __construct($migrationService, $loopResolver)
+    protected $referenceResolver;
+
+    public function __construct($migrationService, $loopResolver, ReferenceResolverInterface $referenceResolver)
     {
         $this->migrationService = $migrationService;
         $this->loopResolver = $loopResolver;
+        $this->referenceResolver = $referenceResolver;
     }
 
     /**
@@ -64,17 +69,20 @@ public function execute(MigrationStep $step)
 
         $this->loopResolver->beginLoop();
         $result = null;
-
         if (isset($step->dsl['over'])) {
-            foreach ($step->dsl['over'] as $key => $value) {
-
+            $over = $this->referenceResolver->resolveReference($step->dsl['over']);
+            foreach ($over as $key => $value) {
                 $this->loopResolver->loopStep($key, $value);
 
                 foreach ($step->dsl['steps'] as $j => $stepDef) {
                     $type = $stepDef['type'];
                     unset($stepDef['type']);
                     $subStep = new MigrationStep($type, $stepDef, array_merge($step->context, array()));
-                    $result = $stepExecutors[$j]->execute($subStep);
+                    try {
+                        $result = $stepExecutors[$j]->execute($subStep);
+                    } catch(MigrationStepSkippedException $e) {
+                        // all ok, continue the loop
+                    }
                 }
             }
         } else {
@@ -87,7 +95,11 @@ public function execute(MigrationStep $step)
                     $type = $stepDef['type'];
                     unset($stepDef['type']);
                     $subStep = new MigrationStep($type, $stepDef, array_merge($step->context, array()));
-                    $result = $stepExecutors[$j]->execute($subStep);
+                    try {
+                        $result = $stepExecutors[$j]->execute($subStep);
+                    } catch(MigrationStepSkippedException $e) {
+                        // all ok, continue the loop
+                    }
                 }
             }
         }

diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -223,6 +223,7 @@ services:
         arguments:
             - '@ez_migration_bundle.migration_service'
             - '@ez_migration_bundle.reference_resolver.loop'
+            - '@ez_migration_bundle.reference_resolver.customreference'
         calls:
             - ['setReferenceMatcher', ['@ez_migration_bundle.reference_matcher']]
         tags:

diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -1,3 +1,11 @@
+Version 5.4.1
+=============
+
+* Fix: when a sub-migration is skipped in a step of a loop, do not halt the loop immediately but go on un til the end
+
+* Fix: references are now resolved for the "over" element of loops
+
+
 Version 5.4
 ===========