TMS-968: Event query fixes

devgeniem · Feb 21, 2024 · 020dbed · 020dbed
1 parent 83d938f
commit 020dbed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,9 @@ and this project adheres to [Semantic Versioning][semver].
 
 ## [Unreleased]
 
-- TMS-968: Add recurring event fields to manual events
+- TMS-968:
+    - Add recurring event fields to manual events
+    - Add recurring event logic to events component, combined event search & combined event listing
 
 ## [1.2.0] - 2024-02-01
 

diff --git a/src/Models/page-combined-events-list.php b/src/Models/page-combined-events-list.php
@@ -141,9 +141,8 @@ protected function get_manual_events() : array {
                     'type'    => 'DATE',
                 ],
                 [
-                    'key'     => 'end_datetime',
-                    'value'   => '',
-                    'compare' => '!=',
+                    'key'   => 'recurring_event',
+                    'value' => 0,
                 ],
             ],
         ];

diff --git a/src/Models/page-combined-events-search.php b/src/Models/page-combined-events-search.php
@@ -184,6 +184,7 @@ protected function get_manual_events( $params ) : array {
             'posts_per_page' => 200, // phpcs:ignore
             's'              => $params['q'] ?? '',
             'meta_query'     => [
+                'relation' => 'AND',
                 [
                     'key'     => 'end_datetime',
                     'value'   => [
@@ -193,6 +194,10 @@ protected function get_manual_events( $params ) : array {
                     'compare' => 'BETWEEN',
                     'type'    => 'DATE',
                 ],
+                [
+                    'key'   => 'recurring_event',
+                    'value' => 0,
+                ],
             ],
         ];