AKM-24: Connector fails because of invalid entities

oroinc · Jul 8, 2021 · 0bf54f5 · 0bf54f5
1 parent 76eaa19
commit 0bf54f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ImportExport/Strategy/CategoryImportStrategy.php b/ImportExport/Strategy/CategoryImportStrategy.php
@@ -211,12 +211,10 @@ protected function updateRelations($entity, array $itemData = null)
                                 true
                             );
 
+                            $key = $relationCollection->indexOf($collectionEntity);
+                            $relationCollection->removeElement($collectionEntity);
                             if ($existingCollectionEntity) {
-                                if (!$relationCollection->contains($existingCollectionEntity)) {
-                                    $relationCollection->removeElement($collectionEntity);
-                                    $relationCollection->add($existingCollectionEntity);
-                                }
-
+                                $relationCollection->set($key, $existingCollectionEntity);
                                 $this->cacheInverseFieldRelation($entityName, $fieldName, $existingCollectionEntity);
                             }
                         }

diff --git a/ImportExport/Strategy/ImportStrategyHelper.php b/ImportExport/Strategy/ImportStrategyHelper.php
@@ -93,7 +93,7 @@ public function importEntity($databaseEntity, $importedEntity, array $excludedPr
     /**
      * {@inheritdoc}
      */
-    protected function getEntityPropertiesByClassName($entityClassName)
+    private function getEntityPropertiesByClassName($entityClassName)
     {
         /*
          * In case if we work with configured entities then we should use fieldHelper