fix: Refactor to method

cjmellor · Aug 1, 2022 · e9248ae · e9248ae
1 parent 0fc62ca
commit e9248ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/Concerns/MustBeApproved.php b/src/Concerns/MustBeApproved.php
@@ -43,14 +43,8 @@ protected static function insertApprovalRequest($model)
      */
     protected static function approvalModelExists($model): bool
     {
-        $driver = Approval::make()->getConnection()->getConfig()['driver'] ?? 'sqlite';
-
-        if ($driver === 'sqlite') {
-            return Approval::where([
-                ['state', '=', ApprovalStatus::Pending],
-                ['new_data', '=', json_encode($model->getDirty())],
-                ['original_data', '=', json_encode($model->getOriginalMatchingChanges())],
-            ])->exists();
+        if ($model->make()->getConnection()->getConfig()['driver'] === 'sqlite') {
+            return self::checkDatabaseDriver($model);
         }
 
         return Approval::where('state', ApprovalStatus::Pending)
@@ -85,6 +79,19 @@ public function isApprovalBypassed(): bool
         return $this->bypassApproval;
     }
 
+    /**
+     * @param $model
+     * @return bool
+     */
+    protected static function checkDatabaseDriver($model): bool
+    {
+        return Approval::where([
+            ['state', '=', ApprovalStatus::Pending],
+            ['new_data', '=', json_encode($model->getDirty())],
+            ['original_data', '=', json_encode($model->getOriginalMatchingChanges())],
+        ])->exists();
+    }
+
     /**
      * Approval is ignored and persisted to the database.
      */

diff --git a/tests/database/migrations/2022_06_20_231650_create_fake_model_table.php b/tests/database/migrations/2022_06_20_231650_create_fake_model_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class() extends Migration {
     public function up()
     {
         Schema::create('fake_models', function (Blueprint $table) {