fixed free call variable (#49)

fixed free call variable

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

@@ -20,7 +20,6 @@ def main(event, context):
 
     try:
         if validate_request(required_keys, request_dict):
-            print(f"usage record before modification: {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)

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,21 +29,23 @@ 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']
             )
-        else:
+        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'],
                 usage_details['service_id'],
                 usage_details['service_method'],
                 usage_details['group_id']
             )
+        else:
+            raise Exception("Invalid payment mode")
 
         if user_org_group_id is not None:
             return user_org_group_id.id

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):