From fffcef90a5722cd95b071fed33441ffa7be11ce2 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Mon, 25 Jan 2016 08:17:03 +0100
Subject: [PATCH] Check for the mandatories configurations in Redis before
 proceed

---
 .../cartodb_geocoder/config_helper.py         | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/server/lib/python/cartodb_geocoder/cartodb_geocoder/config_helper.py b/server/lib/python/cartodb_geocoder/cartodb_geocoder/config_helper.py
index 9c069fc..0c3878e 100644
--- a/server/lib/python/cartodb_geocoder/cartodb_geocoder/config_helper.py
+++ b/server/lib/python/cartodb_geocoder/cartodb_geocoder/config_helper.py
@@ -41,20 +41,29 @@ class GeocoderConfig:
                           heremaps_app_code=None):
         user_config = self._redis_connection.hgetall(
             "rails:users:{0}".format(username))
-        user_config[self.USERNAME_KEY] = username
-        user_config[self.ORGNAME_KEY] = orgname
-        user_config[self.NOKIA_GEOCODER_APP_ID_KEY] = heremaps_app_id
-        user_config[self.NOKIA_GEOCODER_APP_CODE_KEY] = heremaps_app_code
-        if orgname:
-            org_config = self._redis_connection.hgetall(
-                "rails:orgs:{0}".format(orgname))
+        if not user_config:
+            raise ConfigException("""There is no user config available. Please check your configuration.'""")
+        else:
+            user_config[self.USERNAME_KEY] = username
+            user_config[self.ORGNAME_KEY] = orgname
+            user_config[self.NOKIA_GEOCODER_APP_ID_KEY] = heremaps_app_id
+            user_config[self.NOKIA_GEOCODER_APP_CODE_KEY] = heremaps_app_code
+            if orgname:
+                self.__get_organization_config(orgname, user_config)
+
+            return user_config
+
+    def __get_organization_config(self, orgname, user_config):
+        org_config = self._redis_connection.hgetall(
+            "rails:orgs:{0}".format(orgname))
+        if not org_config:
+            raise ConfigException("""There is no organization config available. Please check your configuration.'""")
+        else:
             user_config[self.QUOTA_KEY] = org_config[self.QUOTA_KEY]
             user_config[self.PERIOD_END_DATE] = org_config[self.PERIOD_END_DATE]
             user_config[self.GOOGLE_GEOCODER_CLIENT_ID] = org_config[self.GOOGLE_GEOCODER_CLIENT_ID]
             user_config[self.GOOGLE_GEOCODER_API_KEY] = org_config[self.GOOGLE_GEOCODER_API_KEY]
 
-        return user_config
-
     def __check_config(self, filtered_config):
         if filtered_config[self.GEOCODER_TYPE].lower() == self.NOKIA_GEOCODER:
             if not set(self.NOKIA_GEOCODER_MANDATORY_KEYS).issubset(set(filtered_config.keys())):
@@ -63,8 +72,7 @@ class GeocoderConfig:
                 raise ConfigException("""Nokia geocoder configuration is missing. Check it please""")
         elif filtered_config[self.GEOCODER_TYPE].lower() == self.GOOGLE_GEOCODER:
             if self.GOOGLE_GEOCODER_API_KEY not in filtered_config.keys():
-                raise ConfigException("""Google geocoder need the mandatory
-                                      parameter 'google_maps_private_key'""")
+                raise ConfigException("""Google geocoder need the mandatory parameter 'google_maps_private_key'""")
 
         return True