cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #356 from CartoDB/http-409-status-on-template-limit-reached

Browse Source 
Send 409 error code when maximum number of templates limit is reached
This commit is contained in:
Raul Ochoa 2016-01-12 16:14:37 +01:00
commit 3b7ff2285c
2 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cartodb/backends/template_maps.js
View File

@ -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);
},

78
test/integration/template-maps-limits.js Normal file
View File

@ -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();
});
});
});
});