:recycle: reverting to old sort queries

plugins/cia-endpoints/cia-end-points.php

@@ -66,10 +66,6 @@ add_action( 'rest_api_init', function () {
     $sort_controller->register_custom_route('event/by-current');
     $sort_controller = new Make_Sort_By('exhibition', 'by_current');
     $sort_controller->register_custom_route('exhibition/by-current');
-    $sort_controller = new Make_Sort_By('event', 'by_upcoming');
-    $sort_controller->register_custom_route('event/by-upcoming');
-    $sort_controller = new Make_Sort_By('exhibition', 'by_upcoming');
-    $sort_controller->register_custom_route('exhibition/by-upcoming');
     $sort_controller = new Make_Sort_By('event', 'by_current_and_upcoming');
     $sort_controller->register_custom_route('event/by-current-and-upcoming');
     $sort_controller = new Make_Sort_By('exhibition', 'by_current_and_upcoming');

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

@@ -19,27 +19,6 @@ class Make_Sort_By extends WP_REST_Controller {
             ),
         ]);
     }
-    function _get_args($params) {
-        $args = [
-            'post_type' => $this->post_type,
-            'posts_per_page' => 99,
-            'page' => 1
-        ];
-        if(intval($params['limit']) > 0) {
-            $args['posts_per_page'] = intval($params['limit']);
-        }
-        if(intval($params['p']) > 1) {
-            $args['page'] = intval($params['p']);
-        }
-        return $args;
-    }
-    function _get_page_items($res, $args) {
-        // Get parameters from request,
-        // /?limit=<num>&?orderby=<str>&?order=<str>
-        $index_from_page = $args['page'] - 1;
-        $offset = array_chunk($res, $args['posts_per_page']);
-        return $offset[$index_from_page];
-    }
 
     public function by_alpha( $request ) {
         global $wpdb;
@@ -53,9 +32,8 @@ class Make_Sort_By extends WP_REST_Controller {
             $this->post_type
         ));
         wp_reset_postdata();
-        $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 );
+
+        return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
     }
 
     public function by_material( $request ) {
@@ -88,9 +66,7 @@ class Make_Sort_By extends WP_REST_Controller {
             $end, $time, $this->post_type
         ));
         wp_reset_postdata();
-        $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 );
+        return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
     }
 
     public function by_current( $request ) {
@@ -117,6 +93,7 @@ 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';
@@ -124,45 +101,39 @@ class Make_Sort_By extends WP_REST_Controller {
             $start = 'event-start-time';
             $end = 'event-end-time';
         }
-        $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($found_posts), 200 );
-    }
-    
-    public function by_upcoming( $request ) {
-        global $wpdb;
-        $time = strval(time());
-        $start = 'exhibit-start-date';
-        if($this->post_type == 'event') {
-            $start = 'event-start-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)
+            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, $this->post_type
+            $start, $time, $time, $end, $time, $this->post_type
         ));
         wp_reset_postdata();
-        return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
+
+        // Get parameters from request,
+        // /?limit=<num>&?orderby=<str>&?order=<str>
+        $args = array(
+            'posts_per_page' => -1,
+            'page' => 1
+        );
+        $params = $request->get_params();
+        if(intval($params['limit']) > 0) {
+            $args['posts_per_page'] = intval($params['limit']);
+        }
+        if(intval($params['p']) > 1) {
+            $args['page'] = intval($params['p']);
+        }
+        $index_from_page = $args['page'] - 1;
+        $offset = array_chunk($res, $args['posts_per_page']);
+        $page = $offset[$index_from_page];
+        return new WP_REST_Response( $this->prepare_items_for_reponse($page), 200 );
     }
 
     public function prepare_items_for_reponse( $items ) {
-        $collection = [];
+        $collection = array();
         forEach( $items as $key => $item ) $collection[$key] = default_post_format($item, false);
         return $collection;
     }