From 7a32ace1aca220fbe42868a524142ee3ef4f73e8 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Thu, 10 Nov 2016 17:00:25 +0100 Subject: [PATCH] Add the hires_geocoder to cdb_monthly_quota #302 --- server/extension/sql/200_quotas.sql | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server/extension/sql/200_quotas.sql b/server/extension/sql/200_quotas.sql index c5d4f36..93d77d9 100644 --- a/server/extension/sql/200_quotas.sql +++ b/server/extension/sql/200_quotas.sql @@ -3,15 +3,22 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_monthly_quota( orgname TEXT, service TEXT) RETURNS integer AS $$ + import cartodb_services.metrics.quota as quota plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username)) redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] - if service == 'isolines': + if service == quota.Service.ISOLINES: plpy.execute("SELECT cdb_dataservices_server._get_isolines_routing_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname))) user_isolines_config = GD["user_isolines_routing_config_{0}".format(username)] - return user_isolines_config.isolines_quota + monthly_quota = user_isolines_config.isolines_quota + elif service == quota.Service.HIRES_GEOCODER: + plpy.execute("SELECT cdb_dataservices_server._get_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname))) + user_geocoder_config = GD["user_geocoder_config_{0}".format(username)] + monthly_quota = user_geocoder_config.geocoding_quota else: raise 'not implemented' + + return monthly_quota $$ LANGUAGE plpythonu;