do not fetch user_Address if it is freecall (#40)

do not fetch user_Address if it is freecall

Author: keshrisohit

metering/handlers/usage_handler.py

@@ -4,6 +4,7 @@
 from constants import StatusCode, StatusMessage
 from logger import setup_logger
 from services import UsageService
+from settings import PAYMENT_MODE_FREECALL_VALUE
 from utils import validate_request, make_response
 
 usage_service = UsageService()
@@ -16,19 +17,19 @@
 
 
 def add_verify_fields(usage_detail_dict):
-    new_requred_keys = {
+    new_required_keys = {
         'usage_type', 'status', 'usage_value', 'start_time', 'end_time',
         'created_at', 'payment_mode', 'group_id', 'registry_address_key',
         'ethereum_json_rpc_endpoint', 'response_time', 'response_code', 'error_message',
         'version', 'client_type', 'user_details', 'channel_id', 'operation', 'user_address',
         'username', 'org_id', 'service_id', 'resource', 'request_id'
     }
-    for key in new_requred_keys:
-        if key not in usage_detail_dict:
+    for key in new_required_keys:
+        if (key not in usage_detail_dict) or (usage_detail_dict[key] == ""):
             usage_detail_dict[key] = None
 
     if usage_detail_dict['username'] is not None and usage_detail_dict['user_address'] is None:
-        usage_detail_dict['payment_mode'] = 'freecall'
+        usage_detail_dict['payment_mode'] = PAYMENT_MODE_FREECALL_VALUE
     else:
         usage_detail_dict['payment_mode'] = 'paid'
     return usage_detail_dict

metering/services.py

@@ -48,14 +48,15 @@ def get_user_address(self, group_id, channel_id):
             "requestContext": {"stage": CONTRACT_API_STAGE},
             "path": f"/contract-api/group/{group_id}/channel/{channel_id}"
         }
-        response = self.lambda_client.invoke(
-            FunctionName=CONTRACT_API_ARN,
-            Payload=json.dumps(lambda_payload)
-        )
-        response_body_raw = json.loads(
-            response.get('Payload').read())['body']
-        response_body = json.loads(response_body_raw)
+
         try:
+            response = self.lambda_client.invoke(
+                FunctionName=CONTRACT_API_ARN,
+                Payload=json.dumps(lambda_payload)
+            )
+            response_body_raw = json.loads(
+                response.get('Payload').read())['body']
+            response_body = json.loads(response_body_raw)
             user_address = response_body['data'][0]['sender']
         except Exception as e:
             print(e)

metering/tests/test_total_calls.py

@@ -51,7 +51,7 @@ def test_success_usage_record(self):
             "error_message": "",
             "version": "v1.0.0",
             'username': 'user@snet',
-            'payment_mode': 'freecall',
+            'payment_mode': "",
             "operation": "read",
             "usage_type": "apicall",
             "status": "success",

metering/utils.py

@@ -1,5 +1,7 @@
 import logging
 
+from settings import PAYMENT_MODE_FREECALL_VALUE
+
 
 def make_response(status_code, body, header=None):
     return {
@@ -35,6 +37,6 @@ def validator_usage():
 
 
 def is_free_call(usage_details_dict):
-    if not usage_details_dict['payment_mode'] == 'free_call':
+    if usage_details_dict['payment_mode'] == PAYMENT_MODE_FREECALL_VALUE:
         return True
     return False