refactor

AnourValar · May 24, 2020 · 62bd16d · 62bd16d
1 parent c9cd1db
commit 62bd16d
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/src/Service.php b/src/Service.php
@@ -86,7 +86,7 @@ public function onCommit(callable $closure, string $connection = null) : void
             $connection = \DB::getDefaultConnection();
         }
 
-        if (! \DB::connection($connection)->transactionLevel()) {
+        if ($this->shouldCommit($connection)) {
             $closure();
             return;
         }
@@ -99,7 +99,7 @@ public function onCommit(callable $closure, string $connection = null) : void
                 return;
             }
 
-            if (! \DB::connection($connection)->transactionLevel()) {
+            if ($this->shouldCommit($connection)) {
                 $triggered = true;
                 if ($event instanceof TransactionCommitted) {
                     $closure();
@@ -121,7 +121,7 @@ public function onRollBack(callable $closure, string $connection = null) : void
             $connection = \DB::getDefaultConnection();
         }
 
-        if (! \DB::connection($connection)->transactionLevel()) {
+        if ($this->shouldRollBack($connection)) {
             return;
         }
 
@@ -133,7 +133,7 @@ public function onRollBack(callable $closure, string $connection = null) : void
                 return;
             }
 
-            if (! \DB::connection($connection)->transactionLevel()) {
+            if ($this->shouldRollBack($connection)) {
                 $triggered = true;
                 if ($event instanceof TransactionRolledBack) {
                     $closure();
@@ -186,4 +186,22 @@ protected function cleanUp(\Illuminate\Database\Connection $connection, string $
                 ->delete();
         }
     }
+
+    /**
+     * @param mixed $connection
+     * @return boolean
+     */
+    protected function shouldCommit($connection)
+    {
+         return (! \DB::connection($connection)->transactionLevel());
+    }
+
+    /**
+     * @param mixed $connection
+     * @return boolean
+     */
+    protected function shouldRollBack($connection)
+    {
+         return (! \DB::connection($connection)->transactionLevel());
+    }
 }