Taxonomy wheres should use entry query builder, not stache (#432)

* Taxonomy wheres should use entry query builder, not stache

* 🍺

* Scope to the right collections

* only taxonomize if we are stache

* Add some test coverage

Author: ryanmitchell

src/Entries/EntryQueryBuilder.php

@@ -9,6 +9,7 @@
 use Statamic\Facades\Blink;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Taxonomy;
 use Statamic\Query\EloquentQueryBuilder;
 use Statamic\Stache\Query\QueriesEntryStatus;
 use Statamic\Stache\Query\QueriesTaxonomizedEntries;
@@ -222,4 +223,56 @@ private function getCollectionsForStatusQuery(): \Illuminate\Support\Collection
             ->flatMap(fn ($where) => $where['values'] ?? [$where['value']])
             ->map(fn ($handle) => Collection::find($handle));
     }
+
+    private function getKeysForTaxonomyWhereBasic($where)
+    {
+        $term = $where['value'];
+
+        [$taxonomy, $slug] = explode('::', $term);
+
+        if (! $taxonomy = Taxonomy::find($taxonomy)) {
+            return collect();
+        }
+
+        return app('statamic.eloquent.entries.model')::query()
+            ->select(['id'])
+            ->whereIn('collection', $taxonomy->collections()->map->handle()->all())
+            ->whereJsonContains($this->column($taxonomy->handle()), $term)
+            ->get()
+            ->pluck('id');
+    }
+
+    private function getKeysForTaxonomyWhereIn($where)
+    {
+        // Get the terms grouped by taxonomy.
+        // [tags::foo, categories::baz, tags::bar]
+        // becomes [tags => [foo, bar], categories => [baz]]
+        $taxonomies = collect($where['values'])
+            ->map(function ($value) {
+                [$taxonomy, $term] = explode('::', $value);
+
+                return compact('taxonomy', 'term');
+            })
+            ->groupBy->taxonomy
+            ->map(function ($group) {
+                return collect($group)->map->term;
+            });
+
+        return $taxonomies->flatMap(function ($terms, $taxonomy) {
+            if (! $taxonomy = Taxonomy::find($taxonomy)) {
+                return collect();
+            }
+
+            return app('statamic.eloquent.entries.model')::query()
+                ->select(['id'])
+                ->whereIn('collection', $taxonomy->collections()->map->handle()->all())
+                ->where(function ($query) use ($taxonomy, $terms) {
+                    foreach ($terms as $term) {
+                        $query->orWhereJsonContains($this->column($taxonomy->handle()), $term);
+                    }
+                })
+                ->get()
+                ->pluck('id');
+        });
+    }
 }

src/Entries/EntryRepository.php

@@ -115,4 +115,13 @@ public function updateParents($collection, $ids = null)
                 $dispatch->onQueue(config('statamic.eloquent-driver.collections.update_entry_parent_queue', 'default'));
             });
     }
+
+    public function taxonomize($entry)
+    {
+        if (config('statamic.eloquent-driver.taxonomies.driver') === 'eloquent') {
+            return;
+        }
+
+        parent::taxonomize($entry);
+    }
 }

tests/Entries/EntryTest.php

@@ -4,17 +4,25 @@
 
 use Facades\Statamic\Fields\BlueprintRepository;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Facade;
 use PHPUnit\Framework\Attributes\Test;
+use Statamic\Contracts\Taxonomies\TaxonomyRepository as TaxonomyRepositoryContract;
 use Statamic\Eloquent\Collections\Collection;
 use Statamic\Eloquent\Entries\Entry;
 use Statamic\Eloquent\Entries\EntryModel;
+use Statamic\Eloquent\Taxonomies\Taxonomy;
 use Statamic\Facades;
 use Statamic\Facades\Collection as CollectionFacade;
 use Statamic\Facades\Entry as EntryFacade;
+use Statamic\Facades\Stache;
+use Statamic\Facades\Term as TermFacade;
+use Statamic\Statamic;
+use Statamic\Testing\Concerns\PreventsSavingStacheItemsToDisk;
 use Tests\TestCase;
 
 class EntryTest extends TestCase
 {
+    use PreventsSavingStacheItemsToDisk;
     use RefreshDatabase;
 
     #[Test]
@@ -346,4 +354,47 @@ public function null_values_are_removed_from_data()
 
         $this->assertArrayNotHasKey('null_value', $entry->model()->data);
     }
+
+    #[Test]
+    public function it_doesnt_build_stache_associations_when_taxonomy_driver_is_eloquent()
+    {
+        Taxonomy::make('test')->title('test')->save();
+
+        TermFacade::make('test-term')->taxonomy('test')->data([])->save();
+
+        $taxonomyStore = Stache::stores()->get('terms');
+        $this->assertCount(0, $taxonomyStore->store('test')->index('associations')->items());
+
+        $collection = \Statamic\Facades\Collection::make('blog')->routes('blog/{slug}')->taxonomies(['test'])->save();
+
+        (new Entry)->id(1)->collection($collection)->data(['title' => 'Post 1', 'test' => ['test-term']])->slug('alfa')->save();
+        (new Entry)->id(2)->collection($collection)->data(['title' => 'Post 2', 'test' => ['test-term']])->slug('bravo')->save();
+        (new Entry)->id(3)->collection($collection)->data(['title' => 'Post 3'])->slug('charlie')->save();
+
+        $this->assertCount(0, $taxonomyStore->store('test')->index('associations')->items());
+    }
+
+    #[Test]
+    public function it_build_stache_associations_when_taxonomy_driver_is_not_eloquent()
+    {
+        config()->set('statamic.eloquent-driver.taxonomies.driver', 'file');
+
+        Facade::clearResolvedInstance(TaxonomyRepositoryContract::class);
+        Statamic::repository(TaxonomyRepositoryContract::class, \Statamic\Stache\Repositories\TaxonomyRepository::class);
+
+        Taxonomy::make('test')->title('test')->save();
+
+        TermFacade::make('test-term')->taxonomy('test')->data([])->save();
+
+        $taxonomyStore = Stache::stores()->get('terms');
+        $this->assertCount(0, $taxonomyStore->store('test')->index('associations')->items());
+
+        $collection = \Statamic\Facades\Collection::make('blog')->routes('blog/{slug}')->taxonomies(['test'])->save();
+
+        (new Entry)->id(1)->collection($collection)->data(['title' => 'Post 1', 'test' => ['test-term']])->slug('alfa')->save();
+        (new Entry)->id(2)->collection($collection)->data(['title' => 'Post 2', 'test' => ['test-term']])->slug('bravo')->save();
+        (new Entry)->id(3)->collection($collection)->data(['title' => 'Post 3'])->slug('charlie')->save();
+
+        $this->assertCount(2, $taxonomyStore->store('test')->index('associations')->items());
+    }
 }

tests/Terms/TermTest.php

@@ -85,6 +85,8 @@ public function it_gets_entry_count_for_term()
     #[Test]
     public function it_build_stache_associations_when_taxonomy_driver_is_not_eloquent()
     {
+        config()->set('statamic.eloquent-driver.taxonomies.driver', 'file');
+
         Facade::clearResolvedInstance(TaxonomyRepositoryContract::class);
         Statamic::repository(TaxonomyRepositoryContract::class, \Statamic\Stache\Repositories\TaxonomyRepository::class);