Refactor resolvers to use defaultClauses pattern

src/resolvers-cassandra/Facts/queries.js

@@ -22,16 +22,23 @@ function cassandraRowToFact(row) {
   };
 }
 
-function appendDefaultFilters(query, params) {
-  query += ' AND pipeline IN (\'TadaWeb", \'Bing\', \'CustomEvent\')';
-  return {query: query, params: params};
+function makeDefaultClauses() {
+  const clauses = [];
+  const params = [];
+
+  clauses.push('(pipeline IN (\'TadaWeb\', \'Bing\', \'CustomEvent\'))');
+
+  return {clauses: clauses, params: params};
 }
 
 function makeListQuery(args) {
-  const tagsCondition = args.tagFilter.map(_ => 'detectedkeywords CONTAINS ?').join(' OR '); // eslint-disable-line no-unused-vars
-  const query = `SELECT * FROM fortis.events WHERE (${tagsCondition})`;
-  const params = args.tagFilter.slice();
-  return appendDefaultFilters(query, params);
+  let {clauses, params} = makeDefaultClauses();
+
+  clauses.push(`(${args.tagFilter.map(_ => 'detectedkeywords CONTAINS ?').join(' OR ')})`); // eslint-disable-line no-unused-vars
+  params = params.concat(args.tagFilter);
+
+  const query = `SELECT * FROM fortis.events WHERE (${clauses.join(' AND ')})`;
+  return {query: query, params: params};
 }
 
 /**
@@ -56,9 +63,13 @@ function list(args, res) { // eslint-disable-line no-unused-vars
 }
 
 function makeGetQuery(args) {
-  let query = 'SELECT * FROM fortis.events WHERE id = ?';
-  let params = [args.id];
-  return appendDefaultFilters(query, params);
+  let {clauses, params} = makeDefaultClauses();
+
+  clauses.push('(id = ?)');
+  params.push(args.id);
+
+  let query = `SELECT * FROM fortis.events WHERE ${clauses.join(' AND ')}`;
+  return {query: query, params: params};
 }
 
 /**

src/resolvers-cassandra/Tiles/queries.js

@@ -8,7 +8,7 @@ const withRunTime = require('../shared').withRunTime;
 const trackEvent = require('../../clients/appinsights/AppInsightsClient').trackEvent;
 const { makeMap, makeSet } = require('../../utils/collections');
 
-function makeDefaultFilters(args) {
+function makeDefaultClauses(args) {
   let params = [];
   let clauses = [];
 
@@ -42,7 +42,7 @@ function makeDefaultFilters(args) {
 }
 
 function makeTilesQuery(args, tileIds) {
-  const {clauses, params} = makeDefaultFilters(args);
+  const {clauses, params} = makeDefaultClauses(args);
 
   tileIds.forEach(tileId => {
     clauses.push('(tileid = ?)');
@@ -54,7 +54,7 @@ function makeTilesQuery(args, tileIds) {
 }
 
 function makeLocationsQuery(args, locationIds) {
-  let {clauses, params} = makeDefaultFilters(args);
+  let {clauses, params} = makeDefaultClauses(args);
 
   clauses.push(`(${locationIds.map(_ => '(placeids CONTAINS ?)').join(' OR ')})`); // eslint-disable-line no-unused-vars
   params = params.concat(locationIds);