AKM-24: Connector fails because of invalid entities

oroinc · Jul 8, 2021 · 58ee7bd · 58ee7bd
1 parent d40fcff
commit 58ee7bd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/ImportExport/Strategy/AttributeFamilyImportStrategy.php b/ImportExport/Strategy/AttributeFamilyImportStrategy.php
@@ -259,12 +259,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/BrandImportStrategy.php b/ImportExport/Strategy/BrandImportStrategy.php
@@ -172,12 +172,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/CategoryImportStrategy.php b/ImportExport/Strategy/CategoryImportStrategy.php
@@ -210,12 +210,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/ProductImportStrategy.php b/ImportExport/Strategy/ProductImportStrategy.php
@@ -263,12 +263,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);
                             }
                         }