Added wrapper function for demon request checks (#31)

Added wrapper function for demon request checks

Author: keshrisohit

metering/handlers/usage_handler.py

@@ -15,11 +15,31 @@
                  'service_method', 'group_id', 'status', 'start_time', 'end_time']
 
 
+def add_verify_fields(usage_detail_dict):
+    new_requred_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:
+            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'
+    else:
+        usage_detail_dict['payment_mode'] = 'paid'
+    return usage_detail_dict
+
+
 def main(event, context):
     usage_detail_dict = json.loads(event['body'])
 
     try:
         if validate_request(required_keys, usage_detail_dict):
+            usage_detail_dict = add_verify_fields(usage_detail_dict)
             usage_service.save_usage_details(usage_detail_dict)
             response = make_response(
                 StatusCode.SUCCESS_GET_CODE,

metering/services.py

@@ -1,6 +1,12 @@
+import json
 import logging
 
+import boto3 as boto3
+import requests
+
+from settings import MARKETPLACE_CHANNEL_USER_URL, CONTRACT_API_ARN, CONTRACT_API_STAGE
 from storage import DatabaseStorage
+from utils import is_free_call
 
 logger = logging.getLogger(__name__)
 
@@ -25,5 +31,34 @@ def get_free_call_details(self, username, org_id, service_id, group_id=None):
 
     def save_usage_details(self, usage_details_dict):
         # nedd to introduce entities when we enhance  feature to this service right now directly using dicts
+        if is_free_call(usage_details_dict):
+            channel_id = usage_details_dict['channel_id']
+            group_id = usage_details_dict['group_id']
+            user_address = APIUtilityService().get_user_address(group_id, channel_id)
+            usage_details_dict['user_address'] = user_address
         self.storage_service.add_usage_data(usage_details_dict)
         return
+
+
+class APIUtilityService:
+    lambda_client = boto3.client('lambda')
+
+    def get_user_address(self, group_id, channel_id):
+        lambda_payload = {
+            "httpMethod": "GET",
+            "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:
+            user_address = response_body['data'][0]['sender']
+        except Exception as e:
+            print(e)
+            raise Exception("Failed to get user address from marketplace")
+        return user_address

metering/tests/test_contract_api.py

@@ -0,0 +1,11 @@
+import unittest
+
+from services import APIUtilityService
+
+
+class TestContractAPI(unittest.TestCase):
+    def test_contract_api(self):
+        self.assertEqual(
+            APIUtilityService().get_user_address('m5FKWq4hW0foGW5qSbzGSjgZRuKs7A1ZwbIrJ9e96rc=', 0),
+            '0xabd2cCb3828b4428bBde6C2031A865b0fb272a5A'
+        )