Update RecordController store and update

Author: maab16

src/Http/Controllers/RecordController.php

@@ -62,6 +62,7 @@ public function processStoreData($request, $object)
     {
         $originalColumns = Table::getColumnsName($request->table);
         $columns         = json_decode($request->columns);
+        $fields          = json_decode($request->fields);
         $table           = DBM::model($object->model, $request->table);
 
         foreach ($columns as $column => $value) {
@@ -109,7 +110,11 @@ public function update(Request $request)
             }
 
             try {
-                $this->sync($request, $object);
+                $table = $this->processUpdateData($request, $object);
+                if ($table->update()) {
+                    $this->updateRelationshipData($fields, $columns, $object, $table);
+                    return response()->json(['success' => true]);
+                }
                 return response()->json(['success' => true]);
             } catch (\Exception $e) {
                 return $this->generateError([$e->getMessage()]);
@@ -119,6 +124,40 @@ public function update(Request $request)
         return response()->json(['success' => false]);
     }
 
+    public function processUpdateData($request, $object)
+    {
+        $originalColumns = Table::getColumnsName($request->table);
+        $columns         = json_decode($request->columns);
+        $fields          = json_decode($request->fields);
+        $key             = $object->details['findColumn'];
+
+        $table = DBM::model($object->model, $request->table)->where($key, $columns->{$key})->first();
+
+        foreach ($columns as $column => $value) {
+
+            if (in_array($column, $originalColumns)) {
+
+                if ($request->hasFile($column)) {
+                    $value = $this->saveFiles($request, $column, $request->table);
+                }
+
+                if ($value !== null && $value !== "") {
+
+                    if (!Driver::isMongoDB()) {
+                        if ($functionName = $this->hasFunction($fields, $column)) {
+                            $value = $this->executeFunction($functionName, $value);
+                        }
+                    }
+
+                    $table->{$column} = $this->prepareStoreField($value, $request->table, $column);
+                }
+            }
+        }
+
+        return $table;
+
+    }
+
     public function delete(Request $request)
     {
         if ($request->ajax()) {

src/Traits/RecordTrait.php

@@ -3,7 +3,6 @@
 namespace CodexShaper\DBM\Traits;
 
 use CodexShaper\DBM\Database\Drivers\MongoDB\Type;
-use CodexShaper\DBM\Database\Schema\Table;
 use CodexShaper\DBM\Facades\Driver;
 use CodexShaper\DBM\Facades\Manager as DBM;
 use CodexShaper\DBM\Models\DBM_Collection;
@@ -135,43 +134,6 @@ public function prepareJsonFieldData($records, $fields, $object, $findValue)
         ];
     }
 
-    public function sync($request, $object)
-    {
-        $tableName       = $request->table;
-        $originalColumns = Table::getColumnsName($tableName);
-        $columns         = json_decode($request->columns);
-        $fields          = json_decode($request->fields);
-        $key             = $object->details['findColumn'];
-
-        $table = DBM::model($object->model, $tableName)->where($key, $columns->{$key})->first();
-
-        foreach ($columns as $column => $value) {
-
-            if (in_array($column, $originalColumns)) {
-
-                if ($request->hasFile($column)) {
-                    $value = $this->saveFiles($request, $column, $tableName);
-                }
-
-                if ($value !== null && $value !== "") {
-
-                    if (!Driver::isMongoDB()) {
-                        if ($functionName = $this->hasFunction($fields, $column)) {
-                            $value = $this->executeFunction($functionName, $value);
-                        }
-                    }
-
-                    $table->{$column} = $this->prepareStoreField($value, $tableName, $column);
-                }
-            }
-        }
-
-        if ($table->update()) {
-            $this->updateRelationshipData($fields, $columns, $object, $table);
-            return response()->json(['success' => true]);
-        }
-    }
-
     public function getSettingOptions($field)
     {
         $options = $field->settings['options'];