spreate hasCategoies into strict and normal

Author: FreedomKnight

src/Categorizable.php

@@ -37,6 +37,13 @@ public function recategorize(...$categories): self
     }
 
     public function scopeHasCategories(Builder $builder, ...$categories): Builder
+    {
+        return $builder->whereHas('categories', function (Builder $query) use ($categories) {
+            $query->whereIn('category_id', Category::descendantsAndSelf($this->normalize($categories))->pluck('id'));
+        });
+    }
+
+    public function scopeHasStrictCategories(Builder $builder, ...$categories): Builder
     {
         return $builder->whereHas('categories', function (Builder $query) use ($categories) {
             $query->whereIn('category_id', $this->normalize($categories));

tests/CategoryTest.php

@@ -173,12 +173,22 @@ public function testRemoveCategory()
         ]);
     }
 
-    public function testFindModelHasCategories()
+    public function testFindModelHasStrictCategories()
     {
         $category = Category::create(['name' => 'News']);
         $thing = TestModel::create(['title' => 'foo']);
         $thing->categorize($category->id);
 
+        $this->assertCount(1, TestModel::hasStrictCategories('News')->get());
+    }
+
+    public function testFindModelHasCategories()
+    {
+        $parent = Category::create(['name' => 'News']);
+        $child = Category::create(['name' => 'HeadLine', 'parent_id' => $parent->id]);
+        $thing = TestModel::create(['title' => 'foo']);
+        $thing->categorize($child->id);
+
         $this->assertCount(1, TestModel::hasCategories('News')->get());
     }