From 4c75c5f2610a8f0b22da99b8f0294605a6dd614f Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@cartodb.com>
Date: Thu, 24 Nov 2016 17:33:06 +0100
Subject: [PATCH] Revert internal geocoder related stuff #302

This reverts commits 579d11e, 4af5975 and a2da597
---
 server/extension/sql/200_quotas.sql             | 16 +---------------
 .../cartodb_services/metrics/config.py          | 17 +----------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/server/extension/sql/200_quotas.sql b/server/extension/sql/200_quotas.sql
index 65541cd..0b8ccd2 100644
--- a/server/extension/sql/200_quotas.sql
+++ b/server/extension/sql/200_quotas.sql
@@ -85,18 +85,6 @@ RETURNS SETOF cdb_dataservices_server.service_params AS $$
   provider = user_obs_config.provider
   ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
 
-  #-- Internal geocoder
-  service = 'internal_geocoder'
-  plpy.execute("SELECT cdb_dataservices_server._get_internal_geocoder_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname)))
-  user_geocoder_config = GD["user_internal_geocoder_config_{0}".format(username)]
-  user_service = UserMetricsService(user_geocoder_config, redis_conn)
-
-  monthly_quota = user_geocoder_config.monthly_quota
-  used_quota = user_service.used_quota(user_geocoder_config.service_type, today)
-  soft_limit = user_geocoder_config.soft_limit
-  provider = user_geocoder_config.provider
-  ret += [[service, monthly_quota, used_quota, soft_limit, provider]]
-
   return ret
 $$ LANGUAGE plpythonu;
 
@@ -113,8 +101,6 @@ returns BOOLEAN AS $$
     SELECT * INTO params
       FROM cdb_dataservices_server.cdb_service_params(username, orgname) AS p
       WHERE p.service = service_;
-    RETURN params.soft_limit
-           OR params.monthly_quota IS NULL -- account for the internal_geocoder
-           OR ((params.used_quota + input_size) <= params.monthly_quota);
+    RETURN params.soft_limit OR ((params.used_quota + input_size) <= params.monthly_quota);
   END
 $$ LANGUAGE plpgsql;
diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
index 1bc7011..7cdac6a 100644
--- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
+++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py
@@ -281,13 +281,11 @@ class IsolinesRoutingConfig(ServiceConfig):
 class InternalGeocoderConfig(ServiceConfig):
 
     METRICS_LOG_KEY = 'geocoder_log_path'
-    PERIOD_END_DATE = 'period_end_date'
 
     def __init__(self, redis_connection, db_conn, username, orgname=None):
         # For now, internal geocoder doesn't use the redis config
-        super(InternalGeocoderConfig, self).__init__(redis_connection, db_conn,
+        super(InternalGeocoderConfig, self).__init__(None, db_conn,
                                                      username, orgname)
-        self._period_end_date = date_parse(self._redis_config[self.PERIOD_END_DATE])
 
     @property
     def service_type(self):
@@ -305,23 +303,10 @@ class InternalGeocoderConfig(ServiceConfig):
     def geocoding_quota(self):
         return None
 
-    @property
-    def monthly_quota(self):
-        return None
-
     @property
     def provider(self):
         return 'internal'
 
-    @property
-    def period_end_date(self):
-        return self._period_end_date
-
-    @property
-    def soft_limit(self):
-        return False
-
-
 
 class GeocoderConfig(ServiceConfig):