Skip to content

Commit a628acb

Browse files
restyled-commitsrestyled-commits
committed
Restyled by yapf
1 parent 1f75783 commit a628acb

File tree

5 files changed

+56
-50
lines changed

5 files changed

+56
-50
lines changed

‎metering/handlers/freecall_handler.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@ def main(event, context):
2222
service_id = event["queryStringParameters"]["service_id"]
2323
username = event["queryStringParameters"]["username"]
2424

25-
logger.info(
26-
f"Fetched values from request \n"
27-
f"username: {username} \n"
28-
f"org_id: {org_id} \n"
29-
f"service_id: {service_id} \n"
30-
)
25+
logger.info(f"Fetched values from request \n"
26+
f"username: {username} \n"
27+
f"org_id: {org_id} \n"
28+
f"service_id: {service_id} \n")
3129

3230
free_call_details = usage_service.get_free_call_details(
33-
username, org_id, service_id
34-
)
31+
username, org_id, service_id)
3532
response = free_call_details
3633
status_code = StatusCode.SUCCESS_GET_CODE
3734
else:
@@ -42,7 +39,7 @@ def main(event, context):
4239
except Exception as e:
4340
logger.error("Failed to get free call details")
4441
logger.info(event)
45-
status_code = (StatusCode.SERVER_ERROR_CODE,)
42+
status_code = (StatusCode.SERVER_ERROR_CODE, )
4643
response = StatusMessage.SERVER_ERROR_MSG
4744

4845
return generate_lambda_response(status_code, response)

‎metering/handlers/usage_handler.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ def main(event, context):
3434
request_dict = json.loads(event["body"])
3535
if validate_request(required_keys, request_dict):
3636
usage_detail_dict = usage_record_add_verify_fields(request_dict)
37-
logging.info(f"usage record after modification: {usage_detail_dict}")
37+
logging.info(
38+
f"usage record after modification: {usage_detail_dict}")
3839
usage_service.save_usage_details(usage_detail_dict)
3940
response = "success"
4041
status_code = StatusCode.SUCCESS_GET_CODE
@@ -46,7 +47,7 @@ def main(event, context):
4647
except Exception as e:
4748
logger.error("Failed to get free call details")
4849
logger.info(event)
49-
status_code = (StatusCode.SERVER_ERROR_CODE,)
50+
status_code = (StatusCode.SERVER_ERROR_CODE, )
5051
response = StatusMessage.SERVER_ERROR_MSG
5152

5253
return generate_lambda_response(status_code, response)

‎metering/services.py‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,13 @@
1414
class UsageService(object):
1515
storage_service = DatabaseStorage()
1616

17-
def get_free_call_details(self, username, org_id, service_id, group_id=None):
17+
def get_free_call_details(self,
18+
username,
19+
org_id,
20+
service_id,
21+
group_id=None):
1822
total_calls, free_calls = self.storage_service.get_usage_details(
19-
username, org_id, service_id, group_id
20-
)
23+
username, org_id, service_id, group_id)
2124

2225
logger.info(
2326
f"Free calls allowed: {free_calls}, Total calls made: {total_calls}"
@@ -45,9 +48,11 @@ def save_usage_details(self, usage_details_dict):
4548
channel_id = usage_details_dict["channel_id"]
4649
group_id = usage_details_dict["group_id"]
4750

48-
user_address = APIUtilityService().get_user_address(group_id, channel_id)
51+
user_address = APIUtilityService().get_user_address(
52+
group_id, channel_id)
4953
usage_details_dict["user_address"] = user_address
50-
logger.info(f"fetched user address from contract api: {user_address}")
54+
logger.info(
55+
f"fetched user address from contract api: {user_address}")
5156

5257
self.storage_service.add_usage_data(usage_details_dict)
5358
return
@@ -60,16 +65,19 @@ def __init__(self):
6065
def get_user_address(self, group_id, channel_id):
6166
lambda_payload = {
6267
"httpMethod": "GET",
63-
"requestContext": {"stage": CONTRACT_API_STAGE},
68+
"requestContext": {
69+
"stage": CONTRACT_API_STAGE
70+
},
6471
"path": f"/contract-api/group/{group_id}/channel/{channel_id}",
6572
}
6673

6774
try:
6875
logger.info(f"Calling contract api for user_address")
6976
response = self.lambda_client.invoke(
70-
FunctionName=CONTRACT_API_ARN, Payload=json.dumps(lambda_payload)
71-
)
72-
response_body_raw = json.loads(response.get("Payload").read())["body"]
77+
FunctionName=CONTRACT_API_ARN,
78+
Payload=json.dumps(lambda_payload))
79+
response_body_raw = json.loads(
80+
response.get("Payload").read())["body"]
7381
response_body = json.loads(response_body_raw)
7482
user_address = response_body["data"][0]["sender"]
7583
except Exception as e:

‎metering/storage.py‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,13 @@ def add_usage_data(self, usage_details):
5858
user_org_group_id = self.get_user_org_group_id(usage_details)
5959

6060
if user_org_group_id is None:
61-
logger.info(
62-
f"No user org group data found for "
63-
f"group_id: {usage_details['group_id']}, "
64-
f"org_id: {usage_details['organization_id']}, "
65-
f"user_name: {usage_details['username']}, "
66-
f"user_address: {usage_details['user_address']}, "
67-
f"service_id: {usage_details['service_id']}, "
68-
f"resource {usage_details['service_method']}"
69-
)
61+
logger.info(f"No user org group data found for "
62+
f"group_id: {usage_details['group_id']}, "
63+
f"org_id: {usage_details['organization_id']}, "
64+
f"user_name: {usage_details['username']}, "
65+
f"user_address: {usage_details['user_address']}, "
66+
f"service_id: {usage_details['service_id']}, "
67+
f"resource {usage_details['service_method']}")
7068
new_user_org_record = UserOrgGroupModel(
7169
payment_group_id=usage_details["group_id"],
7270
org_id=usage_details["organization_id"],
@@ -82,13 +80,13 @@ def add_usage_data(self, usage_details):
8280
f"user_name: {usage_details['username']}, "
8381
f"user_address: {usage_details['user_address']}, "
8482
f"service_id: {usage_details['service_id']}, "
85-
f"resource {usage_details['service_method']}"
86-
)
83+
f"resource {usage_details['service_method']}")
8784
user_org_group_id = self.get_user_org_group_id(usage_details)
8885

8986
usage_record = UsageModel(
9087
client_type=usage_details["client_type"],
91-
ethereum_json_rpc_endpoint=usage_details["ethereum_json_rpc_endpoint"],
88+
ethereum_json_rpc_endpoint=usage_details[
89+
"ethereum_json_rpc_endpoint"],
9290
registry_address_key=usage_details["registry_address_key"],
9391
user_org_group_id=user_org_group_id,
9492
status=usage_details["status"],
@@ -115,17 +113,16 @@ def add_usage_data(self, usage_details):
115113
logger.info(f"added usage data for {usage_details}")
116114

117115
def get_usage_details(self, user_name, org_id, service_id, group_id=None):
118-
optin_time = self.usage_repo.get_optin_time(user_name, org_id, service_id)
119-
logger.info(
120-
f"opt in for the user{user_name}, \n"
121-
f"org_id: {org_id}, service_id: {service_id} \n"
122-
f"{optin_time.strftime('%Y-%m-%d %H:%M:%S')}"
123-
)
116+
optin_time = self.usage_repo.get_optin_time(user_name, org_id,
117+
service_id)
118+
logger.info(f"opt in for the user{user_name}, \n"
119+
f"org_id: {org_id}, service_id: {service_id} \n"
120+
f"{optin_time.strftime('%Y-%m-%d %H:%M:%S')}")
124121

125122
free_calls = self.org_service_config_repo.get_service_config(
126-
org_id, service_id, optin_time
127-
)
123+
org_id, service_id, optin_time)
128124

129-
total_calls = self.usage_repo.get_total_calls(user_name, org_id, service_id)
125+
total_calls = self.usage_repo.get_total_calls(user_name, org_id,
126+
service_id)
130127

131128
return total_calls, free_calls

‎metering/utils.py‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,17 @@ def generate_lambda_response(status_code, message, headers=None):
99
"statusCode": status_code,
1010
"body": json.dumps(message),
1111
"headers": {
12-
"Content-Type": "application/json",
13-
"X-Requested-With": "*",
14-
"Access-Control-Allow-Headers": "Access-Control-Allow-Origin, Content-Type,X-Amz-Date,Authorization,"
12+
"Content-Type":
13+
"application/json",
14+
"X-Requested-With":
15+
"*",
16+
"Access-Control-Allow-Headers":
17+
"Access-Control-Allow-Origin, Content-Type,X-Amz-Date,Authorization,"
1518
"X-Api-Key,x-requested-with",
16-
"Access-Control-Allow-Origin": "*",
17-
"Access-Control-Allow-Methods": "GET,OPTIONS,POST",
19+
"Access-Control-Allow-Origin":
20+
"*",
21+
"Access-Control-Allow-Methods":
22+
"GET,OPTIONS,POST",
1823
},
1924
}
2025
if headers is not None:
@@ -70,10 +75,8 @@ def usage_record_add_verify_fields(usage_detail_dict):
7075
if (key not in usage_detail_dict) or (usage_detail_dict[key] == ""):
7176
usage_detail_dict[key] = None
7277

73-
if (
74-
usage_detail_dict["username"] is not None
75-
and usage_detail_dict["user_address"] is None
76-
):
78+
if (usage_detail_dict["username"] is not None
79+
and usage_detail_dict["user_address"] is None):
7780
usage_detail_dict["payment_mode"] = PAYMENT_MODE_FREECALL_VALUE
7881
else:
7982
usage_detail_dict["payment_mode"] = "paid"

0 commit comments

Comments
 (0)