Improve update/insert models by id in import

ereminmdev · Apr 13, 2021 · 04980f2 · 04980f2
1 parent 700b1b4
commit 04980f2
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/components/CrudImport.php b/components/CrudImport.php
@@ -99,6 +99,9 @@ public function import()
         $fields = array_shift($rows);
         array_shift($rows); // extract 2nd row
 
+        /* @var $modelClass ActiveRecord */
+        $modelClass = $this->modelClass;
+
         foreach ($rows as $idx => $row) {
             $values = array_combine($fields, $row);
             foreach ($values as $key => $value) {
@@ -107,11 +110,14 @@ public function import()
 
             $this->prepareData($values);
 
-            /* @var $model ActiveRecord */
-            $model = new $this->modelClass;
+            $model = new $modelClass;
+
             if ($id = ArrayHelper::getValue($values, 'id')) {
-                $model->setAttribute('id', $id);
-                $model->setIsNewRecord(false);
+                $model = $modelClass::findOne($id);
+                if ($model === null) {
+                    $model = new $modelClass;
+                    $model->setAttribute('id', $id);
+                }
             }
             $model->setAttributes($values);