Added timerange filters. Refactored releases module for more efficient queries.

src/releases.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const knex = require('./knex');
+const whereOr = require('./utils/where-or');
 
 async function curateRelease(release) {
     const [actors, tags, media] = await Promise.all([
@@ -70,10 +71,13 @@ function curateReleases(releases) {
     return Promise.all(releases.map(async release => curateRelease(release)));
 }
 
-async function fetchReleases(releaseId, filter = []) {
-    // const straightFilter = filter.includes('straight') ? ['gay', 'lesbian'] : [];
-
-    const releases = await knex('releases')
+function commonQuery(queryBuilder, {
+    filter = [],
+    after = new Date(0), // January 1970
+    before = new Date(2 ** 44), // May 2109
+    limit = 100,
+}) {
+    queryBuilder
         .leftJoin('sites', 'releases.site_id', 'sites.id')
         .leftJoin('studios', 'releases.studio_id', 'studios.id')
         .leftJoin('networks', 'sites.network_id', 'networks.id')
@@ -84,7 +88,7 @@ async function fetchReleases(releaseId, filter = []) {
             'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description',
         )
         .whereNotExists((builder) => {
-            // apply filters
+            // apply tag filters
             builder
                 .select('*')
                 .from('tags_associated')
@@ -92,91 +96,58 @@ async function fetchReleases(releaseId, filter = []) {
                 .whereIn('tags.slug', filter)
                 .andWhereRaw('tags_associated.release_id = releases.id');
         })
-        .andWhere(releaseId ? { 'releases.id': releaseId } : {})
+        .andWhere('date', '>', after)
+        .andWhere('date', '<=', before)
         .orderBy([{ column: 'date', order: 'desc' }, { column: 'created_at', order: 'desc' }])
-        .limit(100);
-
-    return curateReleases(releases);
+        .limit(limit);
 }
 
-async function fetchSiteReleases(siteId, siteSlug) {
+async function fetchReleases(queryObject = {}, options = {}) {
     const releases = await knex('releases')
-        .where({ 'sites.id': siteId })
-        .orWhere({ 'sites.slug': siteSlug })
-        .select(
-            'releases.*',
-            'sites.name as site_name', 'sites.slug as site_slug', 'sites.url as site_url', 'sites.network_id', 'sites.parameters as site_parameters',
-            'studios.name as studio_name', 'sites.slug as site_slug', 'studios.url as studio_url',
-            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url',
-        )
-        .leftJoin('sites', 'releases.site_id', 'sites.id')
-        .leftJoin('studios', 'releases.studio_id', 'studios.id')
-        .leftJoin('networks', 'sites.network_id', 'networks.id')
-        .orderBy([{ column: 'date', order: 'desc' }, { column: 'created_at', order: 'desc' }])
-        .limit(100);
+        .modify(commonQuery, options)
+        .andWhere(builder => whereOr(queryObject, 'releases', builder));
 
     return curateReleases(releases);
 }
 
-async function fetchNetworkReleases(networkId, networkSlug) {
+async function fetchSiteReleases(queryObject, options = {}) {
     const releases = await knex('releases')
-        .where({ 'networks.id': networkId })
-        .orWhere({ 'networks.slug': networkSlug })
-        .select(
-            'releases.*',
-            'sites.name as site_name', 'sites.slug as site_slug', 'sites.url as site_url', 'sites.network_id', 'sites.parameters as site_parameters',
-            'studios.name as studio_name', 'sites.slug as site_slug', 'studios.url as studio_url',
-            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url',
-        )
-        .leftJoin('sites', 'releases.site_id', 'sites.id')
-        .leftJoin('studios', 'releases.studio_id', 'studios.id')
-        .leftJoin('networks', 'sites.network_id', 'networks.id')
-        .orderBy([{ column: 'date', order: 'desc' }, { column: 'created_at', order: 'desc' }])
-        .limit(100);
+        .modify(commonQuery, options)
+        .where(builder => whereOr(queryObject, 'sites', builder));
 
     return curateReleases(releases);
 }
 
-async function fetchActorReleases(actorId, actorSlug) {
+async function fetchNetworkReleases(queryObject, options = {}) {
+    const releases = await knex('releases')
+        .modify(commonQuery, options)
+        .where(builder => whereOr(queryObject, 'networks', builder));
+
+    return curateReleases(releases);
+}
+
+async function fetchActorReleases(queryObject, options = {}) {
     const releases = await knex('actors_associated')
-        .where({ 'actors.id': actorId })
-        .orWhere({ 'actors.slug': actorSlug })
-        .select(
-            'releases.*',
-            'actors.name as actor_name',
-            'sites.name as site_name', 'sites.slug as site_slug', 'sites.url as site_url', 'sites.network_id', 'sites.parameters as site_parameters',
-            'studios.name as studio_name', 'sites.slug as site_slug', 'studios.url as studio_url',
-            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url',
-        )
         .leftJoin('releases', 'actors_associated.release_id', 'releases.id')
         .leftJoin('actors', 'actors_associated.actor_id', 'actors.id')
-        .leftJoin('sites', 'releases.site_id', 'sites.id')
-        .leftJoin('studios', 'releases.studio_id', 'studios.id')
-        .leftJoin('networks', 'sites.network_id', 'networks.id')
-        .orderBy([{ column: 'releases.date', order: 'desc' }, { column: 'releases.created_at', order: 'desc' }])
-        .limit(100);
+        .select(
+            'actors.name as actor_name',
+        )
+        .modify(commonQuery, options)
+        .where(builder => whereOr(queryObject, 'actors', builder));
 
     return curateReleases(releases);
 }
 
-async function fetchTagReleases(tagId, tagSlug) {
+async function fetchTagReleases(queryObject, options = {}) {
     const releases = await knex('tags_associated')
-        .where({ 'tags.id': tagId })
-        .orWhere({ 'tags.slug': tagSlug })
-        .select(
-            'releases.*',
-            'tags.name as tag_name',
-            'sites.name as site_name', 'sites.slug as site_slug', 'sites.url as site_url', 'sites.network_id',
-            'studios.name as studio_name', 'sites.slug as site_slug', 'studios.url as studio_url',
-            'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url',
-        )
         .leftJoin('releases', 'tags_associated.release_id', 'releases.id')
         .leftJoin('tags', 'tags_associated.tag_id', 'tags.id')
-        .leftJoin('sites', 'releases.site_id', 'sites.id')
-        .leftJoin('studios', 'releases.studio_id', 'studios.id')
-        .leftJoin('networks', 'sites.network_id', 'networks.id')
-        .orderBy([{ column: 'releases.date', order: 'desc' }, { column: 'releases.created_at', order: 'desc' }])
-        .limit(100);
+        .select(
+            'tags.name as tag_name',
+        )
+        .modify(commonQuery, options)
+        .where(builder => whereOr(queryObject, 'tags', builder));
 
     return curateReleases(releases);
 }