:sparkles: experimenting with meta_query

plugins/cia-endpoints/includes/class.make-sortby.php

@@ -21,6 +21,7 @@ class Make_Sort_By extends WP_REST_Controller {
     }
     function _get_args($params) {
         $args = [
+            'post_type' => $this->post_type,
             'posts_per_page' => 99,
             'page' => 1
         ];
@@ -32,11 +33,9 @@ class Make_Sort_By extends WP_REST_Controller {
         }
         return $args;
     }
-    function _get_page_items($res, $request) {
+    function _get_page_items($res, $args) {
         // Get parameters from request,
         // /?limit=<num>&?orderby=<str>&?order=<str>
-        $args = $this->_get_args($request->get_params());
-        
         $index_from_page = $args['page'] - 1;
         $offset = array_chunk($res, $args['posts_per_page']);
         return $offset[$index_from_page];
@@ -54,8 +53,9 @@ class Make_Sort_By extends WP_REST_Controller {
             $this->post_type
         ));
         wp_reset_postdata();
-
-        return new WP_REST_Response( $this->prepare_items_for_reponse($this->_get_page_items($res, $request)), 200 );
+        $args = $this->_get_args($request->get_params());
+        $found_posts = $this->_get_page_items($res, $args);
+        return new WP_REST_Response( $this->prepare_items_for_reponse($found_posts), 200 );
     }
 
     public function by_material( $request ) {
@@ -88,7 +88,9 @@ class Make_Sort_By extends WP_REST_Controller {
             $end, $time, $this->post_type
         ));
         wp_reset_postdata();
-        return new WP_REST_Response( $this->prepare_items_for_reponse($this->_get_page_items($res, $request)), 200 );
+        $args = $this->_get_args($request->get_params());
+        $found_posts = $this->_get_page_items($res, $args);
+        return new WP_REST_Response( $this->prepare_items_for_reponse($found_posts), 200 );
     }
 
     public function by_current( $request ) {
@@ -115,7 +117,6 @@ class Make_Sort_By extends WP_REST_Controller {
     }
     
     public function by_current_and_upcoming( $request ) {
-        global $wpdb;
         $time = strval(time());
         $start = 'exhibit-start-date';
         $end = 'exhibit-end-date';
@@ -123,18 +124,22 @@ class Make_Sort_By extends WP_REST_Controller {
             $start = 'event-start-time';
             $end = 'event-end-time';
         }
-        $res = $wpdb->get_results($wpdb->prepare(
-            "SELECT DISTINCT wp_posts.* FROM wp_posts 
-            JOIN wp_postmeta AS starts
-            ON (starts.post_id = wp_posts.ID AND starts.meta_key = %s AND starts.meta_value <= %s OR starts.meta_value > %s)
-            JOIN wp_postmeta AS ends
-            ON (ends.post_id = wp_posts.ID AND ends.meta_key = %s AND ends.meta_value >= %s)
-            WHERE post_type = %s AND post_status = 'publish'
-            ORDER BY ends.meta_value ASC",
-            $start, $time, $time, $end, $time, $this->post_type
-        ));
+        $args = $this->_get_args($request->get_params());
+        $args['meta_query'] = [
+            'relation' => 'AND',
+            [
+                'relation' => 'OR',
+                ['key' => $start, 'value' => $time, 'compare' => '>'],
+                ['key' => $start, 'value' => $time, 'compare' => '<='],
+            ],
+            ['key' => $end, 'value' => $time, 'compare' => '>=']
+        ];
+        $q = new WP_Query($args);
+        $found_posts = $q->get_posts();
+        
         wp_reset_postdata();
-        return new WP_REST_Response( $this->prepare_items_for_reponse($this->_get_page_items($res, $request)), 200 );
+        // return new WP_REST_Response( $this->prepare_items_for_reponse($this->_get_page_items($res, $request)), 200 );
+        return new WP_REST_Response( $this->prepare_items_for_reponse($found_posts), 200 );
     }
     
     public function by_upcoming( $request ) {

plugins/cia-endpoints/includes/formats.php

@@ -16,6 +16,7 @@ function default_post_format( $item, $include_content ) {
     $filtered[title] = $item->post_title;
     $filtered[excerpt] = $item->post_excerpt;
     $filtered[date] = $item->post_date;
+    $filtered[now] = strval(time());
     if(!$filtered[excerpt]) {
         $filtered[excerpt] = get_the_excerpt($item);
     }