:sparkles: sorting by current, upcoming, and past for events and exhibitions added to api

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

@@ -58,8 +58,18 @@ add_action( 'rest_api_init', function () {
     $sort_controller->register_custom_route('artists/by-alpha');
     $sort_controller = new Make_Sort_By('artist', 'by_material');
     $sort_controller->register_custom_route('artists/by-material');
-    $sort_controller = new Make_Sort_By('event', 'by_upcoming_event');
+    $sort_controller = new Make_Sort_By('event', 'by_past');
+    $sort_controller->register_custom_route('events/by-past');
+    $sort_controller = new Make_Sort_By('exhibition', 'by_past');
+    $sort_controller->register_custom_route('exhibitions/by-past');
+    $sort_controller = new Make_Sort_By('event', 'by_current');
+    $sort_controller->register_custom_route('events/by-current');
+    $sort_controller = new Make_Sort_By('exhibition', 'by_current');
+    $sort_controller->register_custom_route('exhibitions/by-current');
+    $sort_controller = new Make_Sort_By('event', 'by_upcoming');
     $sort_controller->register_custom_route('events/by-upcoming');
+    $sort_controller = new Make_Sort_By('exhibition', 'by_upcoming');
+    $sort_controller->register_custom_route('exhibitions/by-upcoming');
 });
 
 /**

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

@@ -42,7 +42,7 @@ class Make_Sort_By extends WP_REST_Controller {
         $res = $wpdb->get_results($wpdb->prepare(
             "SELECT * FROM wp_posts
             WHERE post_type = %s
-            AND post_status='publish'",
+            AND post_status = 'publish'",
             $this->post_type
         ));
         wp_reset_postdata();
@@ -50,37 +50,64 @@ class Make_Sort_By extends WP_REST_Controller {
         return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
     }
     
-    public function by_upcoming_event( $request   ) {
+    public function by_past( $request ) {
         global $wpdb;
-        $time = new DateTime();
-        $timestamp = $time->getTimestamp();
+        $time = strval(time());
+        $end = 'exhibit-end-date';
+        if($this->post_type == 'event') {
+            $end = 'event-end-time';
+        }
         $res = $wpdb->get_results($wpdb->prepare(
-            "SELECT DISTINCT wp_posts.*
-            FROM wp_posts LEFT JOIN wp_postmeta AS ends
-            ON (ends.post_id = wp_posts.ID AND ends.meta_key='event-end-time' AND ends.meta_value <= %d)
-            WHERE post_type = %s
-            AND CONVERT('event-end-time', DATETIME) >= CONVERT('2021-10-31', DATETIME)
-            AND post_status='publish'
+            "SELECT DISTINCT wp_posts.* FROM wp_posts
+            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 DESC",
-            $time, $this->post_type
+            $end, $time, $this->post_type
         ));
         wp_reset_postdata();
+        return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
+    }
 
+    public function by_current( $request ) {
+        global $wpdb;
+        $time = strval(time());
+        $start = 'exhibit-start-date';
+        $end = 'exhibit-end-date';
+        if($this->post_type == 'event') {
+            $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)
+            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 starts.meta_value DESC",
+            $start, $time, $end, $time, $this->post_type
+        ));
+        wp_reset_postdata();
         return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
     }
-    public function by_upcoming_exhibition( $request ) {
+    
+    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 LEFT JOIN wp_postmeta
-            ON (wp_postmeta.post_id = wp_posts.ID AND wp_postmeta.meta_key='exhibit-end-date')
-            WHERE post_type = 'exhibition'
-            AND post_status='publish'
-            ORDER BY 'exhibit-end-date'",
-            $this->post_type
+            "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)
+            WHERE post_type = %s AND post_status = 'publish'
+            ORDER BY starts.meta_value DESC",
+            $start, $time, $this->post_type
         ));
         wp_reset_postdata();
-
         return new WP_REST_Response( $this->prepare_items_for_reponse($res), 200 );
     }
 

plugins/cia-endpoints/includes/formats.php

@@ -43,10 +43,12 @@ function default_post_format( $item, $include_content ) {
     if($item->post_type === 'event') {
         $filtered[start] = get_post_meta( $item->ID, 'event-start-time', true );
         $filtered[end] = get_post_meta( $item->ID, 'event-end-time', true );
+        $filtered[now] = time();
     }
     if($item->post_type === 'exhibition') {
         $filtered[start] = get_post_meta( $item->ID, 'exhibit-start-date', true );
         $filtered[end] = get_post_meta( $item->ID, 'exhibit-end-date', true );
+        $filtered[now] = time();
     }
 
     // Post categories and tags (store just the slugs)