:bug: tweaking sql query for by-episode sort

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

@@ -156,9 +156,10 @@ class Make_Sort_By extends WP_REST_Controller {
     public function by_episode( $request ) {
         $q = new WP_Query($this->make_args($request, null));
         global $wpdb;
+        
         $type = $q->query['post_type'] . 's';
+        
         // TODO: optimize this query
-        // $items = $q->get_posts();
         $items = $wpdb->get_results($wpdb->prepare(
             "SELECT DISTINCT wp_posts.*, 
                 header.post_title AS related_episode 
@@ -166,10 +167,10 @@ class Make_Sort_By extends WP_REST_Controller {
             ON (wp_p2p.p2p_from = wp_posts.ID OR wp_p2p.p2p_to = wp_posts.ID) 
             LEFT JOIN wp_posts AS header 
             ON header.ID = IF(wp_posts.ID = wp_p2p.p2p_to, wp_p2p.p2p_from, wp_p2p.p2p_to) 
-            WHERE wp_posts.post_type = %s AND wp_posts.post_status = 'publish' 
+            WHERE wp_posts.post_status = 'publish' 
                 AND (wp_p2p.p2p_type = %s OR wp_p2p.p2p_type = %s) 
             ORDER BY header.post_date DESC, related_episode, wp_posts.post_date DESC",
-            trim($type, 's'), $type . "_to_episodes" , "episodes_to_" . $type,
+            trim($type, 's'), $type . '_to_episodes' , 'episodes_to_' . $type,
         ));
         wp_reset_postdata();
 

vue-theme/src/store/modules/arrangements.js

@@ -1,12 +1,16 @@
 import { sortTypes } from '../../utils/helpers'
 
-const _makeFlatpack = bySort => {
-    const flatPacked = []
-    Object.keys(bySort).forEach(sort => {
-        flatPacked.push({ slug: sort, title: sort, inbetween: true })
-        bySort[sort].forEach(post => flatPacked.push(post))
+const _insertInBetweens = bySort => {
+    const postListWithInBetweens = []
+    Object.keys(bySort).forEach(term => {
+        postListWithInBetweens.push({ 
+            slug: term,
+            title: term,
+            inbetween: true
+        })
+        bySort[term].forEach(post => postListWithInBetweens.push(post))
     })
-    return flatPacked
+    return postListWithInBetweens
 }
 
 const _arrangeByMaterial = postsList => {
@@ -19,7 +23,7 @@ const _arrangeByMaterial = postsList => {
             byMaterial[mat].push(post)
         })
     })
-    const flatPacked = _makeFlatpack(byMaterial)
+    const flatPacked = _insertInBetweens(byMaterial)
     return flatPacked
 }
 
@@ -32,7 +36,7 @@ const _arrangeByType = postsList => {
             byType[type].push(post)
         })
     })
-    const flatPacked = _makeFlatpack(byType)
+    const flatPacked = _insertInBetweens(byType)
     return flatPacked
 }
 
@@ -65,7 +69,7 @@ const _arrangeByEpisode = postsList => {
         if(!byEpisode[relatedEpisode]) byEpisode[relatedEpisode] = []
         byEpisode[relatedEpisode].push(post)
     })
-    const flatPacked = _makeFlatpack(byEpisode)
+    const flatPacked = _insertInBetweens(byEpisode)
     return flatPacked
 }