Merge pull request #1 from singnet/development

vinthedark · web-flow · commit 7a95e9f26f42 · 2019-09-04T12:23:20.000+05:30
Development
diff --git a/README.md b/README.md
@@ -1 +1,2 @@
-# snet-monitoring
+# Snet-Platform-Usage
+[![CircleCI](https://circleci.com/gh/singnet/snet-platform-usage.svg?style=svg)](https://circleci.com/gh/singnet/snet-platform-usage)
diff --git a/metering/constants.py b/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"
diff --git a/metering/handlers/freecall_handler.py b/metering/handlers/freecall_handler.py
@@ -11,15 +11,15 @@
 setup_logger()
 logger = logging.getLogger(__name__)
 
-required_keys = ['username', 'organization_id', 'service_id']
+required_keys = ['organization_id', 'service_id']
 
 
 def main(event, context):
     if validate_request(required_keys, event['queryStringParameters']):
         try:
             org_id = event['queryStringParameters']['organization_id']
             service_id = event['queryStringParameters']['service_id']
-            username = event['requestContext']['authorizer']['claims']['email']
+            username = event['queryStringParameters']['username']
             free_call_details = usage_service.get_free_call_details(
                 username, org_id, service_id)
             return_value = make_response(
diff --git a/metering/handlers/usage_handler.py b/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_response
+from utils import validate_request, make_response, usage_record_add_verify_fields
 
 usage_service = UsageService()
 
@@ -16,24 +16,26 @@
 
 
 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):
+        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})
diff --git a/metering/handlers/verify_handler.py b/metering/handlers/verify_handler.py
@@ -0,0 +1,11 @@
+from constants import StatusCode
+import json
+
+from utils import make_response
+
+
+def main(event, context):
+    return make_response(
+        status_code=StatusCode.SUCCESS_GET_CODE,
+        body=json.dumps({"data": "success"})
+    )
diff --git a/metering/logger.py b/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")
diff --git a/metering/requirements.txt b/metering/requirements.txt
@@ -1,4 +1,5 @@
 alembic==1.0.11
+boto3==1.9.216
 Mako==1.1.0
 MarkupSafe==1.1.1
 PyMySQL==0.9.3
diff --git a/metering/serverless.yml b/metering/serverless.yml
@@ -36,6 +36,35 @@ package:
     - .gitignore
 
 functions:
+  verify-deamon:
+    handler: handlers/verify_handler.main
+    role: ${file(./config.${self:provider.stage}.json):ROLE}
+    vpc:
+      securityGroupIds:
+        - ${file(./config.${self:provider.stage}.json):SG1}
+        - ${file(./config.${self:provider.stage}.json):SG2}
+      subnetIds:
+        - ${file(./config.${self:provider.stage}.json):VPC1}
+        - ${file(./config.${self:provider.stage}.json):VPC2}
+    events:
+      - http:
+          path: /verify
+          method: get
+          authorizer:
+            type: request
+            arn: ${file(./config.${self:provider.stage}.json):SIGN_AUTHORIZER}
+            identitySource: ${file(./config.${self:provider.stage}.json):SIGN_HEADERS}
+          cors:
+            origin: ${self:custom.origin.${self:provider.stage}}
+            headers:
+              - Content-Type
+              - X-Amz-Date
+              - Authorization
+              - X-Api-Key
+              - X-Amz-Security-Token
+              - X-Amz-User-Agent
+              - x-requested-with
+
   get-freecalls:
     handler: handlers/freecall_handler.main
     role: ${file(./config.${self:provider.stage}.json):ROLE}
@@ -53,11 +82,10 @@ functions:
       - http:
           path: /usage/freecalls
           method: get
-          #          authorizer:
-          #            name: user-authorizer
-          #            type: COGNITO_USER_POOLS
-          #            arn: ${file(./config.${self:provider.stage}.json):AUTHORIZER}
-          #            identitySource: method.request.header.Authorization
+          authorizer:
+            type: request
+            arn: ${file(./config.${self:provider.stage}.json):SIGN_AUTHORIZER}
+            identitySource: ${file(./config.${self:provider.stage}.json):SIGN_HEADERS}
           cors:
             origin: ${self:custom.origin.${self:provider.stage}}
             headers:
diff --git a/metering/services.py b/metering/services.py
@@ -1,6 +1,11 @@
+import json
 import logging
 
+import boto3 as boto3
+
+from settings import CONTRACT_API_ARN, CONTRACT_API_STAGE
 from storage import DatabaseStorage
+from utils import is_free_call
 
 logger = logging.getLogger(__name__)
 
@@ -25,5 +30,37 @@ def get_free_call_details(self, username, org_id, service_id, group_id=None):
 
     def save_usage_details(self, usage_details_dict):
         # nedd to introduce entities when we enhance  feature to this service right now directly using dicts
+        if not is_free_call(usage_details_dict):
+            channel_id = usage_details_dict['channel_id']
+            group_id = usage_details_dict['group_id']
+            user_address = APIUtilityService().get_user_address(group_id, channel_id)
+            usage_details_dict['user_address'] = user_address
         self.storage_service.add_usage_data(usage_details_dict)
         return
+
+
+class APIUtilityService:
+
+    def __init__(self):
+        self.lambda_client = boto3.client('lambda')
+
+    def get_user_address(self, group_id, channel_id):
+        lambda_payload = {
+            "httpMethod": "GET",
+            "requestContext": {"stage": CONTRACT_API_STAGE},
+            "path": f"/contract-api/group/{group_id}/channel/{channel_id}"
+        }
+
+        try:
+            response = self.lambda_client.invoke(
+                FunctionName=CONTRACT_API_ARN,
+                Payload=json.dumps(lambda_payload)
+            )
+            response_body_raw = json.loads(
+                response.get('Payload').read())['body']
+            response_body = json.loads(response_body_raw)
+            user_address = response_body['data'][0]['sender']
+        except Exception as e:
+            print(e)
+            raise Exception("Failed to get user address from marketplace")
+        return user_address
diff --git a/metering/storage.py b/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}")
diff --git a/metering/tests/test_contract_api.py b/metering/tests/test_contract_api.py
@@ -0,0 +1,11 @@
+import unittest
+
+from services import APIUtilityService
+
+
+class TestContractAPI(unittest.TestCase):
+    def test_contract_api(self):
+        self.assertEqual(
+            APIUtilityService().get_user_address('m5FKWq4hW0foGW5qSbzGSjgZRuKs7A1ZwbIrJ9e96rc=', 0),
+            '0xabd2cCb3828b4428bBde6C2031A865b0fb272a5A'
+        )
diff --git a/metering/tests/test_total_calls.py b/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': 'freecall',
+            'payment_mode': "freecall",
             "operation": "read",
             "usage_type": "apicall",
             "status": "success",
diff --git a/metering/utils.py b/metering/utils.py
@@ -1,5 +1,7 @@
 import logging
 
+from constants import PAYMENT_MODE_FREECALL_VALUE
+
 
 def make_response(status_code, body, header=None):
     return {
@@ -35,6 +37,25 @@ def validator_usage():
 
 
 def is_free_call(usage_details_dict):
-    if not usage_details_dict['payment_mode'] == 'free_call':
+    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

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-# snet-monitoring`
	`1`	`+# Snet-Platform-Usage`
	`2`	`+[![CircleCI](https://circleci.com/gh/singnet/snet-platform-usage.svg?style=svg)](https://circleci.com/gh/singnet/snet-platform-usage)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`alembic==1.0.11`
	`2`	`+boto3==1.9.216`
`2`	`3`	`Mako==1.1.0`
`3`	`4`	`MarkupSafe==1.1.1`
`4`	`5`	`PyMySQL==0.9.3`