Move date check logic

ryanmitchell · May 15, 2024 · 101356a · 101356a
1 parent ce617bd
commit 101356a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Stache/Query/QueriesEntryStatus.php b/src/Stache/Query/QueriesEntryStatus.php
@@ -22,14 +22,21 @@ public function whereStatus(string $status)
 
         return $this->where(fn ($query) => $this
             ->getCollectionsForStatusQuery()
-            ->filter(fn ($collection) => $collection->dated())
             ->each(fn ($collection) => $query->orWhere(fn ($q) => $this->addCollectionStatusLogicToQuery($q, $status, $collection))));
     }
 
     private function addCollectionStatusLogicToQuery($query, $status, $collection): void
     {
         $this->addCollectionWhereToStatusQuery($query, $collection->handle());
 
+        if (! $collection->dated()) {
+            if ($status !== 'published') {
+                $query->where('date', 'invalid'); // intentionally trigger no results.
+            }
+
+            return;
+        }
+
         if ($collection->futureDateBehavior() === 'public' && $collection->pastDateBehavior() === 'public') {
             if ($status === 'scheduled' || $status === 'expired') {
                 $query->where('date', 'invalid'); // intentionally trigger no results.