fix freecall config issue (#50)

fix freecall config issue

Author: keshrisohit

metering/constants.py

@@ -10,10 +10,13 @@ class StatusCode:
     "Access-Control-Allow-Origin": "*",
     "Access-Control-Allow-Methods": "OPTIONS,POST,GET"
 }
-PAYMENT_MODE_FREE_CALL = 'freecall'
 
 
 class StatusMessage:
     BAD_PARAMETER = "Request validation failed"
     SERVER_ERROR_MSG = "failed"
     SUCCESS_POST_CODE = "successful"
+
+
+PAYMENT_MODE_FREECALL_VALUE = "freecall"
+PAYMENT_MODE_ESCROW_VALUE = "escrow"

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,45 +15,27 @@
                  '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)
+            print(f"usage record after modification: {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})

metering/logger.py

@@ -2,59 +2,11 @@
 
 
 def setup_logger():
-    logging.config.dictConfig({
-        "version": 1,
-        "disable_existing_loggers": False,
-        "formatters": {
-            "simple": {
-                "format": "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-            }
-        },
+    logging.basicConfig(
+        level=logging.INFO, format='%(asctime)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S')
 
-        "handlers": {
-            "console": {
-                "class": "logging.StreamHandler",
-                "level": "DEBUG",
-                "formatter": "simple",
-                "stream": "ext://sys.stdout"
-            }
 
-            # "info_file_handler": {
-            #     "class": "logging.handlers.RotatingFileHandler",
-            #     "level": "INFO",
-            #     "formatter": "simple",
-            #     "filename": "info.log",
-            # },
-            #
-            # "error_file_handler": {
-            #     "class": "logging.handlers.RotatingFileHandler",
-            #     "level": "ERROR",
-            #     "formatter": "simple",
-            #     "filename": "error.log",
-            #     "encoding": "utf8"
-            # }
-        },
-
-        "loggers": {
-            "sqlalchemy": {
-                "level": "ERROR",
-                "handlers": ["console"],
-                "propagate": "no"
-            },
-            "freecall_handler": {
-                "level": "ERROR",
-                "handlers": ["console"],
-                "propagate": "no"
-            },
-            "": {
-                "level": "ERROR",
-                "handlers": ["console"],
-                "propagate": "no"
-            }
-        },
-
-        "root": {
-            "level": "ERROR",
-            "handlers": ["console"]
-        }
-    })
+if __name__ == '__main__':
+    setup_logger()
+    logger = logging.getLogger()
+    logger.info("hi, it is test")

metering/services.py

@@ -40,7 +40,9 @@ def save_usage_details(self, usage_details_dict):
 
 
 class APIUtilityService:
-    lambda_client = boto3.client('lambda')
+
+    def __init__(self):
+        self.lambda_client = boto3.client('lambda')
 
     def get_user_address(self, group_id, channel_id):
         lambda_payload = {

metering/storage.py

@@ -1,10 +1,10 @@
 import logging
 
-from constants import PAYMENT_MODE_FREE_CALL
 from models import UserOrgGroupModel, UsageModel
 from repository.org_service_config_repository import OrgServiceRepo
 from repository.usage_repository import UsageRepository
 from repository.user_org_group_repository import UserOrgGroupRepository
+from constants import PAYMENT_MODE_FREECALL_VALUE, PAYMENT_MODE_ESCROW_VALUE
 
 logger = logging.getLogger(__name__)
 
@@ -29,14 +29,14 @@ def __init__(self):
 
     def get_user_org_group_id(self, usage_details):
 
-        if usage_details['payment_mode'] == PAYMENT_MODE_FREE_CALL:
+        if usage_details['payment_mode'] == PAYMENT_MODE_FREECALL_VALUE:
             user_org_group_id = self.user_org_group_repo.get_user_org_group_id_by_username(
                 usage_details['username'],
                 usage_details['organization_id'],
                 usage_details['service_id'],
                 usage_details['service_method']
             )
-        elif usage_details['user_address'] is None:
+        elif usage_details['payment_mode'] == PAYMENT_MODE_ESCROW_VALUE:
             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'],
@@ -45,7 +45,7 @@ def get_user_org_group_id(self, usage_details):
                 usage_details['group_id']
             )
         else:
-            raise Exception('Unknown user request error')
+            raise Exception("Invalid payment mode")
 
         if user_org_group_id is not None:
             return user_org_group_id.id
@@ -101,7 +101,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/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': "",
+            'payment_mode': "freecall",
             "operation": "read",
             "usage_type": "apicall",
             "status": "success",

metering/utils.py

@@ -1,6 +1,6 @@
 import logging
 
-from settings import PAYMENT_MODE_FREECALL_VALUE
+from constants import PAYMENT_MODE_FREECALL_VALUE
 
 
 def make_response(status_code, body, header=None):
@@ -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