Merge pull request #28 from cybercog/feature/skip-verify-scope-auto-apply

Add ability to skip auto apply Verified flags scopes

Author: Pe Ell

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `laravel-eloquent-flag` will be documented in this file.
 
+## [3.10.0] - 2017-02-13
+
+### Added
+
+- `shouldApplyVerifiedAtScope` & `shouldApplyVerifiedFlagScope` methods to skip Verified flags global scope auto apply.
+
 ## [3.9.0] - 2017-02-03
 
 ### Added
@@ -133,6 +139,7 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
 
 - `is_active` boolean flag added.
 
+[3.10.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.9.0...3.10.0
 [3.9.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.8.0...3.9.0
 [3.8.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.7.0...3.8.0
 [3.7.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.6.0...3.7.0

src/Scopes/Classic/VerifiedAtScope.php

@@ -39,6 +39,10 @@ class VerifiedAtScope implements Scope
      */
     public function apply(Builder $builder, Model $model)
     {
+        if (method_exists($model, 'shouldApplyVerifiedAtScope') && !$model->shouldApplyVerifiedAtScope()) {
+            return $builder;
+        }
+
         return $builder->whereNotNull('verified_at');
     }
 

src/Scopes/Classic/VerifiedFlagScope.php

@@ -38,6 +38,10 @@ class VerifiedFlagScope implements Scope
      */
     public function apply(Builder $builder, Model $model)
     {
+        if (method_exists($model, 'shouldApplyVerifiedFlagScope') && !$model->shouldApplyVerifiedFlagScope()) {
+            return $builder;
+        }
+
         return $builder->where('is_verified', 1);
     }
 

tests/stubs/Models/Classic/EntityWithVerifiedAtUnapplied.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of Laravel Eloquent Flag.
+ *
+ * (c) Anton Komarev <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Cog\Flag\Tests\Stubs\Models\Classic;
+
+/**
+ * Class EntityWithVerifiedAtUnapplied.
+ *
+ * @package Cog\Flag\Tests\Stubs\Models\Classic
+ */
+class EntityWithVerifiedAtUnapplied extends EntityWithVerifiedAt
+{
+    /**
+     * Determine if VerifiedAtScope should be applied by default.
+     *
+     * @return bool
+     */
+    public function shouldApplyVerifiedAtScope()
+    {
+        return false;
+    }
+}

tests/stubs/Models/Classic/EntityWithVerifiedFlagUnapplied.php

@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of Laravel Eloquent Flag.
+ *
+ * (c) Anton Komarev <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Cog\Flag\Tests\Stubs\Models\Classic;
+
+/**
+ * Class EntityWithVerifiedFlagUnapplied.
+ *
+ * @package Cog\Flag\Tests\Stubs\Models\Classic
+ */
+class EntityWithVerifiedFlagUnapplied extends EntityWithVerifiedFlag
+{
+    /**
+     * Determine if VerifiedFlagScope should be applied by default.
+     *
+     * @return bool
+     */
+    public function shouldApplyVerifiedFlagScope()
+    {
+        return false;
+    }
+}

tests/unit/Scopes/Classic/VerifiedAtScopeTest.php

@@ -13,6 +13,7 @@
 
 use Carbon\Carbon;
 use Cog\Flag\Tests\Stubs\Models\Classic\EntityWithVerifiedAt;
+use Cog\Flag\Tests\Stubs\Models\Classic\EntityWithVerifiedAtUnapplied;
 use Cog\Flag\Tests\TestCase;
 
 /**
@@ -109,4 +110,19 @@ public function it_can_unverify_model()
 
         $this->assertNull($model->verified_at);
     }
+
+    /** @test */
+    public function it_can_skip_apply()
+    {
+        factory(EntityWithVerifiedAt::class, 3)->create([
+            'verified_at' => Carbon::now()->subDay(),
+        ]);
+        factory(EntityWithVerifiedAt::class, 2)->create([
+            'verified_at' => null,
+        ]);
+
+        $entities = EntityWithVerifiedAtUnapplied::all();
+
+        $this->assertCount(5, $entities);
+    }
 }

tests/unit/Scopes/Classic/VerifiedFlagScopeTest.php

@@ -12,6 +12,7 @@
 namespace Cog\Flag\Tests\Unit\Scopes\Classic;
 
 use Cog\Flag\Tests\Stubs\Models\Classic\EntityWithVerifiedFlag;
+use Cog\Flag\Tests\Stubs\Models\Classic\EntityWithVerifiedFlagUnapplied;
 use Cog\Flag\Tests\TestCase;
 
 /**
@@ -108,4 +109,19 @@ public function it_can_unverify_model()
 
         $this->assertFalse($model->is_verified);
     }
+
+    /** @test */
+    public function it_can_skip_apply()
+    {
+        factory(EntityWithVerifiedFlag::class, 3)->create([
+            'is_verified' => true,
+        ]);
+        factory(EntityWithVerifiedFlag::class, 2)->create([
+            'is_verified' => false,
+        ]);
+
+        $entities = EntityWithVerifiedFlagUnapplied::all();
+
+        $this->assertCount(5, $entities);
+    }
 }