:recycle: updating materials sort to find terms | updating subtype sort to paginate

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

@@ -81,6 +81,12 @@ add_action( 'rest_api_init', function () {
         'object', 'publication',
     ];
     _make_sorts($by_material_types, $material_sorts);
+    
+    $subtype_sorts = ['by_type'];
+    $by_subtype_types = [
+        'artist', 'event', 'post'
+    ];
+    _make_sorts($by_subtype_types, $subtype_sorts);
 });
 
 /**

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

@@ -34,31 +34,16 @@ class Make_Sort_By extends WP_REST_Controller {
             $args['orderby'] = 'ends';
         }
         
-        if($this->post_type == 'artist') {
-            //  Default to all materials
-            $tax_id_array = [2, 3, 4, 5, 6, 7, 8];
-
-            if ($params['materials']) {
-                $tax_id_array = explode( ',', $params['materials'] );
-            }
-            // 2 clay
-            // 3 fiber
-            // 4 glass
-            // 5 metals
-            // 6 other
-            // 7 paper
-            // 8 wood
-            $args['tax_query'] = array(
-                [
-                    'taxonomy' => 'material',
-                    'field'    => 'term_id',
-                    'terms'    => $tax_id_array
-                ]
-            );
-        }
-
         return $args;
     }
+    function make_terms_array($taxonomy, $field) {
+        $terms = get_terms([
+            'taxonomy'   => $taxonomy,
+            'hide_empty' => true,
+            'fields'     => $field
+        ]);
+        return $terms;
+    }
     /**
      * Register the routes for the objects of the controller.
      */
@@ -105,9 +90,51 @@ class Make_Sort_By extends WP_REST_Controller {
         return new WP_REST_Response( $this->prepare_items_for_reponse($page, false), 200 );
     }
 
+    public function by_type( $request ) {
+        $args = $this->make_args($request, null);
+        $params = $request->get_params();
+        
+        // Get all term ID's in a given taxonomy
+        $taxonomy = $this->post_type . '_type';
+        if($this->post_type == 'post') $taxonomy = 'category';
+
+        $tax_id_array = $this->make_terms_array($taxonomy, 'ids');
+        $args['tax_query'] = array([
+            'taxonomy' => $taxonomy,
+            'field'    => 'term_id',
+            'terms'    => $tax_id_array,
+        ]);
+
+        $q = new WP_Query($args);
+        $found_posts = $q->get_posts();
+        wp_reset_postdata();
+
+        return new WP_REST_Response( $this->prepare_items_for_reponse($found_posts), 200 );
+    }
+    
     public function by_material( $request ) {
-        $q = new WP_Query($this->make_args($request, null));
-        // $args['max'] $q->max_num_pages;
+        $args = $this->make_args($request, null);
+        $params = $request->get_params();
+        
+        //  Default to all materials
+        $taxonomy = 'material';
+        $tax_id_array = $this->make_terms_array($taxonomy, 'ids');
+
+        // Filter with a materials array
+        // 2: clay
+        // 3: fiber
+        // 4: glass
+        // 5: metals
+        // 6: other
+        // 7: paper
+        // 8: wood
+        if ($params['materials']) $tax_id_array = explode( ',', $params['materials'] );
+        $args['tax_query'] = array([
+            'taxonomy' => $taxonomy,
+            'field'    => 'term_id',
+            'terms'    => $tax_id_array
+        ]);
+        $q = new WP_Query($args);
         $found_posts = $q->get_posts();
         wp_reset_postdata();
 
@@ -116,19 +143,15 @@ class Make_Sort_By extends WP_REST_Controller {
     
     public function by_past( $request ) {
         $q = new WP_Query($this->make_args($request, '<='));
-        // $args['max'] $q->max_num_pages;
         $found_posts = $q->get_posts();
         wp_reset_postdata();
-
         return new WP_REST_Response( $this->prepare_items_for_reponse($found_posts), 200 );
     }
     
     public function by_current_and_upcoming( $request ) {
         $q = new WP_Query($this->make_args($request, '>='));
-        // $args['max'] $q->max_num_pages;
         $found_posts = $q->get_posts();
         wp_reset_postdata();
-
         return new WP_REST_Response( $this->prepare_items_for_reponse($found_posts), 200 );
     }
 

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

@@ -2,6 +2,14 @@
 // include('formats.php');
 
 class Make_Terms_Endpoint extends WP_REST_Controller {
+    function make_args($request, $post_type) {
+        $args = [
+            'post_type'       => $post_type,
+            'post_status'     => ['publish'],
+            'posts_per_page'  => -1,
+            'page'            => 1
+        ];
+    }
     /**
      * Register the routes for the objects of the controller.
      */

plugins/cia-post-types/includes/custom-taxonomies.php

@@ -1,18 +1,13 @@
 <?php
     function create_materials_taxonomy() {
         $post_types_that_show_materials = [
-            'artist',
-            'short',
-            'guide',
-            'exhibition',
-            'event',
-            'object',
-            'publication',
+            'artist', 'guide', 'short',
+            'object', 'publication',
         ];
         register_taxonomy('material', $post_types_that_show_materials, ['label' => 'Materials']);
     }
     function create_types_taxonomy() {
-        $post_types = [ 'artist', 'exhibition', 'event' ];
+        $post_types = [ 'artist', 'event' ];
         foreach ( $post_types as $post_type ) {
             register_taxonomy($post_type . '_type', $post_type, ['label' => ucfirst($post_type) . ' Type']);
         }