fix: freecall joining failed for user_org_group_id (#43)

fix: freecall joining failed for user_org_group_id

Author: keshrisohit

metering/handlers/usage_handler.py

@@ -4,8 +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
+from utils import validate_request, make_response, usage_record_add_verify_fields
 
 usage_service = UsageService()
 
@@ -16,48 +15,31 @@
                  'service_method', 'group_id', 'status', 'start_time', 'end_time']
 
 
-def add_verify_fields(usage_detail_dict):
-    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_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'] = PAYMENT_MODE_FREECALL_VALUE
-    else:
-        usage_detail_dict['payment_mode'] = 'paid'
-    return usage_detail_dict
-
-
 def main(event, context):
-    usage_detail_dict = json.loads(event['body'])
+    request_dict = json.loads(event['body'])
 
     try:
-        if validate_request(required_keys, usage_detail_dict):
-            usage_detail_dict = add_verify_fields(usage_detail_dict)
+        if validate_request(required_keys, request_dict):
+            usage_detail_dict = usage_record_add_verify_fields(request_dict)
+            logger.info(f"Modified usage record: {usage_detail_dict}")
             usage_service.save_usage_details(usage_detail_dict)
             response = make_response(
                 StatusCode.SUCCESS_GET_CODE,
                 json.dumps({"status": StatusMessage.SUCCESS_POST_CODE})
             )
         else:
-            logger.error(f'Request validation failed {usage_detail_dict}')
+            logger.error(f'Request validation failed {request_dict}')
             response = make_response(
                 StatusCode.BAD_PARAMETERS_CODE,
                 json.dumps({"status": StatusMessage.BAD_PARAMETER})
             )
     except Exception as e:
         logger.error(e)
-        logger.error(f'failed for request {usage_detail_dict}')
+        logger.error(f'failed for request {request_dict}')
         response = make_response(
             StatusCode.SERVER_ERROR_CODE,
             json.dumps({"status": StatusMessage.SERVER_ERROR_MSG})
         )
 
     return response
+

metering/storage.py

@@ -36,16 +36,14 @@ def get_user_org_group_id(self, usage_details):
                 usage_details['service_id'],
                 usage_details['service_method']
             )
-        elif usage_details['user_address'] is None:
+        else:
             user_org_group_id = self.user_org_group_repo.get_user_org_group_id_by_user_address(
                 usage_details['user_address'],
                 usage_details['organization_id'],
                 usage_details['service_id'],
                 usage_details['service_method'],
                 usage_details['group_id']
             )
-        else:
-            raise Exception('Unknown user request error')
 
         if user_org_group_id is not None:
             return user_org_group_id.id
@@ -101,7 +99,8 @@ def add_usage_data(self, usage_details):
             user_name=usage_details["username"],
             service_id=usage_details["service_id"],
             resource=usage_details["service_method"],
-            request_id=usage_details["request_id"]
+            request_id=usage_details["request_id"],
+            payment_mode=usage_details["payment_mode"]
         )
         self.usage_repo.create_item(usage_record)
         logger.info(f"added usage data for {usage_details}")

metering/utils.py

@@ -40,3 +40,22 @@ def is_free_call(usage_details_dict):
     if usage_details_dict['payment_mode'] == PAYMENT_MODE_FREECALL_VALUE:
         return True
     return False
+
+
+def usage_record_add_verify_fields(usage_detail_dict):
+    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_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'] = PAYMENT_MODE_FREECALL_VALUE
+    else:
+        usage_detail_dict['payment_mode'] = 'paid'
+    return usage_detail_dict