Add maxLimit as default limit for queries (#138)

* add maxLimit as default limit for queries * fix maxLimit config reference
MusicConnectionMachine · May 1, 2017 · f6e4717 · f6e4717
1 parent ab08812
commit f6e4717
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/api/dsap/artists.js b/api/dsap/artists.js
@@ -1,5 +1,7 @@
 'use strict';
 
+var config = require('../../config.js.template');
+
 module.exports = function(context) {
         // Imports
     var artists = context.models.artists;
@@ -18,13 +20,19 @@ module.exports = function(context) {
                 }
             }
 
+            let limit = config.api.maxLimit;
+
+            if (options && options.limit && options.limit < limit) {
+                limit = options.limit;
+            }
+
             return artists.findAndCountAll({
                 attributes: ['name', 'id', 'artist_type', 'dateOfBirth', 'placeOfBirth', 'dateOfDeath',
                     'placeOfDeath', 'nationality', 'tags', 'pseudonym', 'source_link', 'wiki_link', 'wiki_pageid'
                 ],
                 where: whereClause,
                 order: [['id', 'DESC']],
-                limit: options && options.limit,
+                limit: limit,
                 offset: options && options.offset
             }).then(results => {
                 return {

diff --git a/api/dsap/instruments.js b/api/dsap/instruments.js
@@ -1,4 +1,7 @@
 'use strict';
+
+var config = require('../../config.js.template');
+
 module.exports = function (context) {
     // Imports
     var instruments = context.models.instruments;
@@ -14,11 +17,17 @@ module.exports = function (context) {
                 }
             }
 
+            let limit = config.api.maxLimit;
+
+            if (options && options.limit && options.limit < limit) {
+                limit = options.limit;
+            }
+
             return instruments.findAndCountAll({
                 attributes: ['name', 'id'],
                 where: whereClause,
                 order: [['id', 'DESC']],
-                limit: options && options.limit,
+                limit: limit,
                 offset: options && options.offset
             }).then(results => {
                 return {

diff --git a/api/dsap/releases.js b/api/dsap/releases.js
@@ -1,4 +1,7 @@
 'use strict';
+
+var config = require('../../config.js.template');
+
 module.exports = function (context) {
     // Imports
     var releases = context.models.releases;
@@ -14,11 +17,17 @@ module.exports = function (context) {
                 }
             }
 
+            let limit = config.api.maxLimit;
+
+            if (options && options.limit && options.limit < limit) {
+                limit = options.limit;
+            }
+
             return releases.findAndCountAll({
                 attributes: ['title', 'id', 'format', 'date', 'country', 'label'],
                 where: whereClause,
                 order: [['id', 'DESC']],
-                limit: options && options.limit,
+                limit: limit,
                 offset: options && options.offset
             }).then(results => {
                 return {

diff --git a/api/dsap/works.js b/api/dsap/works.js
@@ -1,4 +1,7 @@
 'use strict';
+
+var config = require('../../config.js.template');
+
 module.exports = function(context) {
     var works = context.models.works;
     return {
@@ -13,11 +16,17 @@ module.exports = function(context) {
                 }
             }
 
+            let limit = config.api.maxLimit;
+
+            if (options && options.limit && options.limit < limit) {
+                limit = options.limit;
+            }
+
             return works.findAndCountAll({
                 attributes: ['title', 'id', 'compositionyear'],
                 where: whereClause,
                 order: [['id', 'DESC']],
-                limit: options && options.limit,
+                limit: limit,
                 offset: options && options.offset
             }).then(results => {
                 return {

diff --git a/config.js.template b/config.js.template
@@ -7,7 +7,8 @@ module.exports = {
     "collection": process.env.databasecollection || "postgres",
   },
   "api" : {
-    "apiKey": process.env.apikey || "not so secret"
+    "apiKey": process.env.apikey || "not so secret",
+    "maxLimit": process.env.maxlimit || 50,
   },
   "general": {
     "logging": process.env.logging ? console.log : false