refactor: AdminService 调整, 增加事务

slowlyo · Oct 30, 2024 · 5d8e5c2 · 5d8e5c2
1 parent 75e94ea
commit 5d8e5c2
Showing 1 changed file with 63 additions and 26 deletions.
diff --git a/src/Services/AdminService.php b/src/Services/AdminService.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Slowlyo\OwlAdmin\Renderers\Page;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Schema;
@@ -229,7 +230,7 @@ public function searchable($query)
         collect(array_keys(request()->query()))
             ->intersect($this->getTableColumns())
             ->map(function ($field) use ($query) {
-                $query->when(request($field), function ($query) use ($field) {
+                $query->when(filled(request($field)), function ($query) use ($field) {
                     $query->where($field, 'like', '%' . request($field) . '%');
                 });
             });
@@ -293,22 +294,31 @@ public function list()
      */
     public function update($primaryKey, $data)
     {
-        $this->saving($data, $primaryKey);
+        DB::beginTransaction();
+        try {
+            $this->saving($data, $primaryKey);
 
-        $model = $this->query()->whereKey($primaryKey)->first();
+            $model = $this->query()->whereKey($primaryKey)->first();
 
-        foreach ($data as $k => $v) {
-            if (!$this->hasColumn($k)) {
-                continue;
+            foreach ($data as $k => $v) {
+                if (!$this->hasColumn($k)) {
+                    continue;
+                }
+
+                $model->setAttribute($k, $v);
             }
 
-            $model->setAttribute($k, $v);
-        }
+            $result = $model->save();
+
+            if ($result) {
+                $this->saved($model, true);
+            }
 
-        $result = $model->save();
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
 
-        if ($result) {
-            $this->saved($model, true);
+            admin_abort($e->getMessage());
         }
 
         return $result;
@@ -323,22 +333,31 @@ public function update($primaryKey, $data)
      */
     public function store($data)
     {
-        $this->saving($data);
+        DB::beginTransaction();
+        try {
+            $this->saving($data);
 
-        $model = $this->getModel();
+            $model = $this->getModel();
+
+            foreach ($data as $k => $v) {
+                if (!$this->hasColumn($k)) {
+                    continue;
+                }
 
-        foreach ($data as $k => $v) {
-            if (!$this->hasColumn($k)) {
-                continue;
+                $model->setAttribute($k, $v);
             }
 
-            $model->setAttribute($k, $v);
-        }
+            $result = $model->save();
+
+            if ($result) {
+                $this->saved($model);
+            }
 
-        $result = $model->save();
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
 
-        if ($result) {
-            $this->saved($model);
+            admin_abort($e->getMessage());
         }
 
         return $result;
@@ -353,10 +372,19 @@ public function store($data)
      */
     public function delete(string $ids)
     {
-        $result = $this->query()->whereIn($this->primaryKey(), explode(',', $ids))->delete();
+        DB::beginTransaction();
+        try {
+            $result = $this->query()->whereIn($this->primaryKey(), explode(',', $ids))->delete();
+
+            if ($result) {
+                $this->deleted($ids);
+            }
 
-        if ($result) {
-            $this->deleted($ids);
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            admin_abort($e->getMessage());
         }
 
         return $result;
@@ -373,8 +401,17 @@ public function quickEdit($data)
     {
         $rowsDiff = data_get($data, 'rowsDiff', []);
 
-        foreach ($rowsDiff as $item) {
-            $this->update(Arr::pull($item, $this->primaryKey()), $item);
+        DB::beginTransaction();
+        try {
+            foreach ($rowsDiff as $item) {
+                $this->update(Arr::pull($item, $this->primaryKey()), $item);
+            }
+
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            admin_abort($e->getMessage());
         }
 
         return true;