[5.x] When augmenting terms, entries_count should only consider pub…

…lished entries (#10727)

Co-authored-by: duncanmcclean <[email protected]>
Co-authored-by: Jason Varga <[email protected]>

src/Stache/Repositories/TermRepository.php

@@ -7,6 +7,7 @@
 use Statamic\Exceptions\TaxonomyNotFoundException;
 use Statamic\Exceptions\TermNotFoundException;
 use Statamic\Facades\Collection;
+use Statamic\Facades\Entry;
 use Statamic\Facades\Taxonomy;
 use Statamic\Stache\Query\TermQueryBuilder;
 use Statamic\Stache\Stache;
@@ -138,7 +139,7 @@ public function make(?string $slug = null): Term
         return app(Term::class)->slug($slug);
     }
 
-    public function entriesCount(Term $term): int
+    public function entriesCount(Term $term, ?string $status = null): int
     {
         $items = $this->store->store($term->taxonomyHandle())
             ->index('associations')
@@ -153,6 +154,14 @@ public function entriesCount(Term $term): int
             $items = $items->where('collection', $collection->handle());
         }
 
+        if ($status) {
+            return Entry::query()
+                ->whereIn('id', $items->pluck('entry')->all())
+                ->when($collection, fn ($query) => $query->where('collection', $collection->handle()))
+                ->whereStatus($status)
+                ->count();
+        }
+
         return $items->count();
     }
 

src/Taxonomies/AugmentedTerm.php

@@ -3,6 +3,8 @@
 namespace Statamic\Taxonomies;
 
 use Statamic\Data\AbstractAugmented;
+use Statamic\Facades\Blink;
+use Statamic\Facades\Term;
 use Statamic\Query\StatusQueryBuilder;
 use Statamic\Statamic;
 
@@ -80,4 +82,16 @@ public function title()
 
         return $this->wrapValue($title, 'title');
     }
+
+    public function entriesCount()
+    {
+        $key = vsprintf('term-published-entries-count-%s-%s', [
+            $this->data->id(),
+            optional($this->data->collection())->handle(),
+        ]);
+
+        return Blink::once($key, function () {
+            return Term::entriesCount($this->data, 'published');
+        });
+    }
 }