Merge pull request #172 from gnat42/patch-6

Split writeItem function into two
ddeboer · Mar 19, 2015 · 455c239 · 455c239
2 parents 57031f1 + dc7a103
commit 455c239
Showing 1 changed file with 30 additions and 21 deletions.
diff --git a/src/Ddeboer/DataImport/Writer/DoctrineWriter.php b/src/Ddeboer/DataImport/Writer/DoctrineWriter.php
@@ -189,27 +189,7 @@ public function finish()
     public function writeItem(array $item)
     {
         $this->counter++;
-        $entity = null;
-
-        // If the table was not truncated to begin with, find current entity
-        // first
-        if (false === $this->truncate) {
-            if ($this->lookupFields) {
-                $lookupConditions = array();
-                foreach($this->lookupFields as $fieldName) {
-                    $lookupConditions[$fieldName] = $item[$fieldName];
-                }
-                $entity = $this->entityRepository->findOneBy(
-                    $lookupConditions
-                );
-            } else {
-                $entity = $this->entityRepository->find(current($item));
-            }
-        }
-
-        if (!$entity) {
-            $entity = $this->getNewInstance();
-        }
+        $entity = $this->findOrCreateItem($item);
 
         $this->loadAssociationObjectsToEntity($item, $entity);
 
@@ -300,4 +280,33 @@ protected function reEnableLogging()
         $config = $this->entityManager->getConnection()->getConfiguration();
         $config->setSQLLogger($this->originalLogger);
     }
+
+    /**
+     * Finds existing entity or create a new instance
+     */
+    protected function findOrCreateItem(array $item)
+    {
+        $entity = null;
+        // If the table was not truncated to begin with, find current entity
+        // first
+        if (false === $this->truncate) {
+            if ($this->lookupFields) {
+                $lookupConditions = array();
+                foreach ($this->lookupFields as $fieldName) {
+                    $lookupConditions[$fieldName] = $item[$fieldName];
+                }
+                $entity = $this->entityRepository->findOneBy(
+                    $lookupConditions
+                );
+            } else {
+                $entity = $this->entityRepository->find(current($item));
+            }
+        }
+
+        if (!$entity) {
+            return $this->getNewInstance();
+        }
+
+        return $entity;
+    }
 }