review changes

Author: pratik-vii

metering/constants.py

@@ -5,6 +5,13 @@ class StatusCode:
     SUCCESS_GET_CODE = 200
 
 
+HEADER_POST_RESPONSE = {
+    "Content-Type": "application/json",
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "OPTIONS,POST,GET"
+}
+
+
 class StatusMessage:
     BAD_PARAMETER = "Request validation failed"
     SERVER_ERROR_MSG = "failed"

metering/handlers/freecall_handler.py

@@ -1,10 +1,10 @@
 import json
 import logging
 
-from constants import StatusCode, StatusMessage
+from constants import StatusCode, StatusMessage, HEADER_POST_RESPONSE
 from services import UsageService
 from logger import setup_logger
-from utils import validate_request, make_freecalls_response
+from utils import validate_request, make_response
 
 usage_service = UsageService()
 
@@ -15,30 +15,33 @@
 
 
 def main(event, context):
-    if validate_request(event['queryStringParameters']):
+    if validate_request(required_keys, event['queryStringParameters']):
         try:
             org_id = event['queryStringParameters']['organization_id']
             service_id = event['queryStringParameters']['service_id']
             username = event['queryStringParameters']['username']
             free_call_details = usage_service.get_free_call_details(
                 username, org_id, service_id)
-            return_value = make_freecalls_response(
-                StatusCode.SUCCESS_GET_CODE,
-                json.dumps(free_call_details)
+            return_value = make_response(
+                status_code=StatusCode.SUCCESS_GET_CODE,
+                header=HEADER_POST_RESPONSE,
+                body=json.dumps(free_call_details)
             )
 
         except Exception as e:
             logger.error(e)
-            return_value = make_freecalls_response(
-                StatusCode.SERVER_ERROR_CODE,
-                json.dumps({"error": StatusMessage.SERVER_ERROR_MSG})
+            return_value = make_response(
+                status_code=StatusCode.SERVER_ERROR_CODE,
+                header=HEADER_POST_RESPONSE,
+                body=json.dumps({"error": StatusMessage.SERVER_ERROR_MSG})
             )
 
     else:
         logger.error('Request validation failed')
-        return_value = make_freecalls_response(
-            StatusCode.BAD_PARAMETERS_CODE,
-            json.dumps({"error": StatusMessage.BAD_PARAMETER})
+        return_value = make_response(
+            status_code=StatusCode.BAD_PARAMETERS_CODE,
+            header=HEADER_POST_RESPONSE,
+            body=json.dumps({"error": StatusMessage.BAD_PARAMETER})
         )
 
     return return_value

metering/handlers/usage_handler.py

@@ -4,7 +4,7 @@
 from constants import StatusCode, StatusMessage
 from logger import setup_logger
 from services import UsageService
-from utils import validate_request, make_record_usage_response
+from utils import validate_request, make_response
 
 usage_service = UsageService()
 
@@ -19,22 +19,22 @@ def main(event, context):
     usage_detail_dict = json.loads(event['body'])
 
     try:
-        if validate_request(usage_detail_dict):
+        if validate_request(required_keys, usage_detail_dict):
             usage_service.save_usage_details(usage_detail_dict)
-            response = make_record_usage_response(
+            response = make_response(
                 StatusCode.SUCCESS_GET_CODE,
                 json.dumps({"status": StatusMessage.SUCCESS_POST_CODE})
             )
         else:
             logger.error(f'Request validation failed {usage_detail_dict}')
-            response = make_record_usage_response(
+            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}')
-        response = make_record_usage_response(
+        response = make_response(
             StatusCode.SERVER_ERROR_CODE,
             json.dumps({"status": StatusMessage.SERVER_ERROR_MSG})
         )

metering/utils.py

@@ -1,22 +1,10 @@
-import json
 import logging
 
 
-def make_record_usage_response(status_code, body):
+def make_response(status_code, body, header=None, ):
     return {
         "statusCode": status_code,
-        "body": body
-    }
-
-
-def make_freecalls_response(status_code, body):
-    return {
-        "statusCode": status_code,
-        "headers": {
-            "Content-Type": "application/json",
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Methods": "OPTIONS,POST,GET"
-        },
+        "headers": header,
         "body": body
     }