Merge pull request #604 from plural/fix-card-importer

Process foreign keys before optional fields to fix dependency order.
NetrunnerDB · Mar 6, 2022 · 95571a5 · 95571a5
2 parents f0fd166 + 9ba8901
commit 95571a5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/AppBundle/Command/ImportStdCommand.php b/src/AppBundle/Command/ImportStdCommand.php
@@ -569,10 +569,6 @@ protected function getEntityFromData(string $entityName, array $data, array $man
             $this->copyKeyToEntity($entity, $entityName, $data, $key, true);
         }
 
-        foreach ($optionalKeys as $key) {
-            $this->copyKeyToEntity($entity, $entityName, $data, $key, false);
-        }
-
         foreach ($foreignKeys as $key) {
             $foreignEntityShortName = ucfirst(str_replace('_code', '', $key));
 
@@ -601,6 +597,10 @@ protected function getEntityFromData(string $entityName, array $data, array $man
             }
         }
 
+        foreach ($optionalKeys as $key) {
+            $this->copyKeyToEntity($entity, $entityName, $data, $key, false);
+        }
+
         // special case for Card
         if ($entity instanceof Card) {
             // calling a function whose name depends on the type_code