changes after PR review

Author: pratik-vii

metering/services.py

@@ -1,13 +1,8 @@
-import requests
+import logging
 
-from settings import MARKETPLACE_CHANNEL_USER_URL
 from storage import DatabaseStorage
 
-
-def is_free_call(usage_details_dict):
-    if not usage_details_dict['payment_mode'] == 'free_call':
-        return True
-    return False
+logger = logging.getLogger(__name__)
 
 
 class UsageService(object):
@@ -22,8 +17,11 @@ def get_free_call_details(self, username, org_id, service_id, group_id=None):
         if not total_calls:
             total_calls = 0
 
-        return {"username": username, "org_id": org_id, "service_id": service_id, "total_calls_made": total_calls,
-                "free_calls_allowed": free_calls}
+        response = {"username": username, "org_id": org_id, "service_id": service_id, "total_calls_made": total_calls,
+                    "free_calls_allowed": free_calls}
+
+        logger.info(response)
+        return response
 
     def save_usage_details(self, usage_details_dict):
         # nedd to introduce entities when we enhance  feature to this service right now directly using dicts

metering/storage.py

@@ -1,14 +1,12 @@
+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
 
-
-def is_free_call(usage_details_dict):
-    if not usage_details_dict['payment_mode'] == 'free_call':
-        return True
-    return False
+logger = logging.getLogger(__name__)
 
 
 class Storage(object):
@@ -57,7 +55,7 @@ def add_usage_data(self, usage_details):
         user_org_group_id = self.get_user_org_group_id(usage_details)
 
         if user_org_group_id is None:
-            print(f"No user org group data found for user")
+            logger.info("No user org group data found for user")
             new_user_org_record = UserOrgGroupModel(
                 payment_group_id=usage_details["group_id"],
                 org_id=usage_details["organization_id"],
@@ -67,7 +65,7 @@ def add_usage_data(self, usage_details):
                 resource=usage_details["service_method"]
             )
             self.user_org_group_repo.create_item(new_user_org_record)
-
+        logger.info("Added user org group data")
         user_org_group_id = self.get_user_org_group_id(usage_details)
 
         usage_record = UsageModel(
@@ -95,6 +93,7 @@ def add_usage_data(self, usage_details):
             request_id=usage_details["request_id"]
         )
         self.usage_repo.create_item(usage_record)
+        logger.info("added usage data")
 
     def get_usage_details(self, user_name, org_id, service_id, group_id=None):
         optin_time = self.usage_repo.get_optin_time(
@@ -103,4 +102,4 @@ def get_usage_details(self, user_name, org_id, service_id, group_id=None):
             org_id, service_id, optin_time)
         total_calls = self.usage_repo.get_total_calls(
             user_name, org_id, service_id)
-        return total_calls, free_calls
+        return total_calls, free_calls

metering/utils.py

@@ -32,3 +32,9 @@ def validate_request(required_keys, request_body):
 
 def validator_usage():
     pass
+
+
+def is_free_call(usage_details_dict):
+    if not usage_details_dict['payment_mode'] == 'free_call':
+        return True
+    return False