From 8203c878f41b61414618717b6ce4ef3632fecd54 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 12 Jan 2016 15:53:16 +0100 Subject: [PATCH] Send 409 error code when maximum number of templates limit is reached Closes #346 --- lib/cartodb/backends/template_maps.js | 6 +- test/integration/template-maps-limits.js | 78 ++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 test/integration/template-maps-limits.js diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js index 680cfe3a..c30b964c 100644 --- a/lib/cartodb/backends/template_maps.js +++ b/lib/cartodb/backends/template_maps.js @@ -224,8 +224,10 @@ o.addTemplate = function(owner, template, callback) { function installTemplateIfDoesNotExist(err, numberOfTemplates) { assert.ifError(err); if ( limit && numberOfTemplates >= limit ) { - throw new Error("User '" + owner + "' reached limit on number of templates " + - "("+ numberOfTemplates + "/" + limit + ")"); + var limitReachedError = new Error("User '" + owner + "' reached limit on number of templates (" + + numberOfTemplates + "/" + limit + ")"); + limitReachedError.http_status = 409; + throw limitReachedError; } self._redisCmd('HSETNX', [ userTemplatesKey, templateName, JSON.stringify(template) ], this); }, diff --git a/test/integration/template-maps-limits.js b/test/integration/template-maps-limits.js new file mode 100644 index 00000000..12150c68 --- /dev/null +++ b/test/integration/template-maps-limits.js @@ -0,0 +1,78 @@ +require('../support/test_helper'); + +var assert = require('assert'); +var redis = require('redis'); +var RedisPool = require('redis-mpool'); +var TemplateMaps = require('../../lib/cartodb/backends/template_maps'); + + +describe('TemplateMaps limits', function() { + + var OWNER = 'username'; + var templateCounter = 0; + function templateUniqueName() { + return 'tpl_' + templateCounter++; + } + function createTemplate() { + return { + version: '0.0.1', + name: templateUniqueName(), + layergroup: { + layers: [ + { + type: 'plain', + options: { + color: 'blue' + } + } + ] + } + }; + } + + var redisClient = redis.createClient(global.environment.redis.port); + var redisPool = new RedisPool(global.environment.redis); + + afterEach(function(done) { + redisClient.del('map_tpl|' + OWNER, done); + }); + + it('should allow to create templates when there is no limit in options', function(done) { + var templateMaps = new TemplateMaps(redisPool); + + templateMaps.addTemplate(OWNER, createTemplate(), function(err, templateName, template) { + assert.ok(!err, err); + assert.ok(template); + + templateMaps.addTemplate(OWNER, createTemplate(), function(err, templateName, template) { + assert.ok(!err, err); + assert.ok(template); + done(); + }); + }); + }); + + it('should allow to create templates with limit in options', function(done) { + var templateMaps = new TemplateMaps(redisPool, {max_user_templates: 1}); + + templateMaps.addTemplate(OWNER, createTemplate(), function(err, templateName, template) { + assert.ok(!err, err); + assert.ok(template); + done(); + }); + }); + + it('should fail to create more templates than allowed by options', function(done) { + var templateMaps = new TemplateMaps(redisPool, {max_user_templates: 1}); + + templateMaps.addTemplate(OWNER, createTemplate(), function(err, templateName, template) { + assert.ok(!err, err); + assert.ok(template); + templateMaps.addTemplate(OWNER, createTemplate(), function(err) { + assert.ok(err); + assert.equal(err.http_status, 409); + done(); + }); + }); + }); +});