From b2cdb1c74b0ae4ff0143dd7243cb7af896fea831 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Thu, 10 Nov 2016 18:40:18 +0100
Subject: [PATCH] Move all into one func returning a tuple #302

---
 server/extension/sql/200_quotas.sql | 60 +++++++----------------------
 1 file changed, 14 insertions(+), 46 deletions(-)

diff --git a/server/extension/sql/200_quotas.sql b/server/extension/sql/200_quotas.sql
index 8ba354b..81676e8 100644
--- a/server/extension/sql/200_quotas.sql
+++ b/server/extension/sql/200_quotas.sql
@@ -18,61 +18,29 @@ RETURNS cdb_dataservices_server.service_params AS $$
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
 
+  today = date.today()
+
   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)]
-    monthly_quota = user_isolines_config.isolines_quota
     user_service = UserMetricsService(user_isolines_config, redis_conn)
-    used_quota = user_service.used_quota(user_isolines_config.service_type, date.today())
+
+    monthly_quota = user_isolines_config.isolines_quota
+    used_quota = user_service.used_quota(user_isolines_config.service_type, today)
     soft_limit = user_isolines_config.soft_isolines_limit
     provider = user_isolines_config.provider
+  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)]
+    user_service = UserMetricsService(user_geocoder_config, redis_conn)
+
+    monthly_quota = user_geocoder_config.geocoding_quota
+    used_quota = user_service.used_quota(user_geocoder_config, today)
+    soft_limit = user_geocoder_config.soft_geocoding_limit
+    provider = user_geocoder_config.provider
   else:
     raise 'not implemented'
 
   return [monthly_quota, used_quota, soft_limit, provider]
 
 $$ LANGUAGE plpythonu;
-
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_monthly_quota(
-  username TEXT,
-  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 == 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;
-
-
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_remaining_quota(
-  username TEXT,
-  orgname TEXT,
-  service TEXT)
-RETURNS integer AS $$
-  from datetime import date
-  from cartodb_services.metrics.user import UserMetricsService
-
-  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':
-    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)]
-    monthly_quota = user_isolines_config.isolines_quota
-
-    user_service = UserMetricsService(user_isolines_config, redis_conn)
-    current_used = user_service.used_quota(user_isolines_config.service_type, date.today())
-    return monthly_quota - current_used
-  else:
-    raise 'not implemented'
-$$ LANGUAGE plpythonu;