contentprovider lookup should be working

Author: chreman

server/workers/api/src/apis/base.py

@@ -39,6 +39,22 @@
                                                       description='raw results from ElasticSearch')})
 
 
+def get_or_create_contentprovider_lookup():
+    try:
+        k = str(uuid.uuid4())
+        d = {"id": k, "params": {},"endpoint": "contentproviders"}
+        base_ns.logger.debug(d)
+        redis_store.rpush("base", json.dumps(d))
+        result = get_key(redis_store, k)
+        df = pd.DataFrame(json.loads(result["contentproviders"]))
+        df.set_index("internal_name", inplace=True)
+        cp_dict = df.name.to_dict()
+        return cp_dict
+    except Exception as e:
+        base_ns.logger.error(e)
+   
+contentprovider_lookup = get_or_create_contentprovider_lookup()
+
 @base_ns.route('/search')
 class Search(Resource):
     @base_ns.doc(responses={200: 'OK',
@@ -53,6 +69,9 @@ def post(self):
         if "optradio" in params:
             del params["optradio"]
         errors = search_param_schema.validate(params, partial=True)
+        if "repo" in params:
+            contentprovider_long = contentprovider_lookup.get(params["repo"])
+            params["contentprovider_long"] = contentprovider_long
         params["limit"] = 120
         params["list_size"] = 100
         base_ns.logger.debug(errors)
@@ -85,25 +104,7 @@ def post(self):
             base_ns.logger.error(e)
             abort(500, "Problem encountered, check logs.")
 
-def get_or_create_contentprovider_lookup():
-    try:
-        k = str(uuid.uuid4())
-        d = {"id": k, "params": {},
-                "endpoint": "contentproviders"}
-        base_ns.logger.debug(d)
-        redis_store.rpush("base", json.dumps(d))
-        result = get_key(redis_store, k)
-        df = pd.DataFrame(json.loads(result))
-        df.set_index("internal_name", inplace=True)
-        cp_dict = df.name.to_dict()
-        return cp_dict
-    except Exception as e:
-        base_ns.logger.error(e)
-   
-contentprovider_lookup = get_or_create_contentprovider_lookup()
-base_ns.logger.debug(len(contentprovider_lookup))
-
-@base_ns.route('contentprovider')
+@base_ns.route('/contentproviders')
 class ContentProvider(Resource):
     @base_ns.doc(responses={200: 'OK',
                               400: 'Invalid search parameters'})
@@ -121,7 +122,7 @@ def post(self):
         if not params:
             result = contentprovider_lookup
         else:
-            result = contentprovider_lookup.get(params["repo"])
+            result = {"contentprovider_long": contentprovider_lookup.get(params["repo"])}
         try:
             headers = {}
             headers["Content-Type"] = "application/json"

server/workers/base/src/base.py

@@ -90,6 +90,7 @@ def run(self):
                 except Exception as e:
                     self.logger.exception("Exception during data retrieval.")
                     self.logger.error(params)
+                    self.logger.error(e)
 
             if endpoint == "contentproviders":
                 try:
@@ -99,4 +100,5 @@ def run(self):
                 except Exception as e:
                     self.logger.exception("Exception during retrieval of contentproviders.")
                     self.logger.error(params)
+                    self.logger.error(e)