code cleaning

Author: prashantramangupta

platform-usage-authorizer/authorizer.py

@@ -1,10 +1,9 @@
 from repository import Repository
-
+from constant import METRICS_NETWORK_ID
 
 class Token:
-    def __init__(self, net_id):
-        self.net_id = net_id
-        self.repo = Repository(net_id)
+    def __init__(self):
+        self.repo = Repository(METRICS_NETWORK_ID)
 
     def validate_token(self, daemon_id, token):
         print("validate_token::daemon_id: ", daemon_id);

platform-usage-authorizer/lambda_handler.py

@@ -2,7 +2,6 @@
 import os
 
 from authorizer import Token
-from constant import METRICS_NETWORK_ID
 
 
 def request_handler(event, context):
@@ -14,11 +13,12 @@ def request_handler(event, context):
         if "/event" == path:
             payload_dict = event['headers']
             print("Processing [" + str(path) + "] with body [" + str(payload_dict) + "]")
-            net_id = METRICS_NETWORK_ID
-            token_instance = Token(net_id)
+            token_instance = Token()
             data = token_instance.validate_token(daemon_id=payload_dict['x-daemonid'],
                                                  token=payload_dict['x-token'])
             print(data)
+        else:
+            return get_response(500, "Invalid URL path.")
         response = get_lambda_authorizer_response_format(event=event, allow=data.get('validated', False))
         return response
     except Exception as e:

platform-usage-process/lambda_handler.py

@@ -1,8 +1,7 @@
 import json
 
-from register import Token
-from constant import METRICS_NETWORK_ID
 from metrics import Metrics
+from register import Token
 
 
 def request_handler(event, context):
@@ -13,17 +12,19 @@ def request_handler(event, context):
         path = event['path'].lower()
         data = None
         payload_dict = payload_check(payload=event['body'], path=path)
-        net_id = METRICS_NETWORK_ID
         if "/register" == path:
-            token_instance = Token(net_id)
+            token_instance = Token()
             data = token_instance.process_token(daemon_id=payload_dict['daemonId'])
         elif "/event" == path:
-            obj_metrics = Metrics(net_id=net_id)
+            obj_metrics = Metrics()
             if payload_dict['type'] == 'request':
                 obj_metrics.handle_request_type(payload_dict)
             elif payload_dict['type'] == 'response':
                 obj_metrics.handle_response_type(payload_dict)
             data = {}
+        else:
+            return get_response(500, "Invalid URL path.")
+
 
         if data is None:
             response = get_response("400", {"status": "failed",

platform-usage-process/metrics.py

@@ -1,12 +1,12 @@
 from datetime import datetime as dt
 
+from constant import METRICS_NETWORK_ID
 from repository import Repository
 
 
 class Metrics:
-    def __init__(self, net_id):
-        self.net_id = net_id
-        self.repo = Repository(net_id)
+    def __init__(self):
+        self.repo = Repository(METRICS_NETWORK_ID)
 
     def handle_request_type(self, params):
         try:
@@ -15,10 +15,10 @@ def handle_request_type(self, params):
                               "service_method, row_created, row_updated) " \
                               "VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"
             dm_req_params = (params['ethereum_json_rpc_endpoint'], params['group_id'], params['input_data_size'],
-                       params['organization_id'], params['registry_address_key'], params['request_id'],
-                       params['request_received_time'][:19], params['service_id'], params['service_method'],
-                       dt.utcnow(),
-                       dt.utcnow())
+                             params['organization_id'], params['registry_address_key'], params['request_id'],
+                             params['request_received_time'][:19], params['service_id'], params['service_method'],
+                             dt.utcnow(),
+                             dt.utcnow())
             self.repo.execute(insrt_dm_rq_sts, dm_req_params)
         except Exception as e:
             print(repr(e))
@@ -32,10 +32,11 @@ def handle_response_type(self, params):
                               "VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"
             dm_rs_params = (params['error_message'], params['ethereum_json_rpc_endpoint'], params['group_id'],
                             params['organization_id'], params['registry_address_key'], params['request_id'],
-                            params['request_received_time'][:19], params['response_code'], params['response_sent_time'][:19],
+                            params['request_received_time'][:19], params['response_code'],
+                            params['response_sent_time'][:19],
                             params['response_time'], params['service_id'], params['service_method'], dt.utcnow(),
                             dt.utcnow())
             self.repo.execute(insrt_dm_rs_sts, dm_rs_params)
         except Exception as e:
             print(repr(e))
-            raise e
+            raise e

platform-usage-process/register.py

@@ -3,13 +3,13 @@
 import time
 from datetime import datetime as dt
 
+from constant import METRICS_NETWORK_ID
 from repository import Repository
 
 
 class Token:
-    def __init__(self, net_id):
-        self.net_id = net_id
-        self.repo = Repository(net_id)
+    def __init__(self):
+        self.repo = Repository(METRICS_NETWORK_ID)
 
     def process_token(self, daemon_id):
         print("process_token::daemon_id: ", daemon_id);
@@ -39,4 +39,4 @@ def daemon_id_exist(self, daemon_id):
         res = self.repo.execute(qry, [daemon_id])
         if len(res) > 0:
             return {'status': True, "token": res[0]['token']}
-        return {'status': False}
+        return {'status': False}