Merge pull request #1 from keshrisohit/service_Changes

integrated service chnages with db changes

Author: pratik-vii

metering/adaptors.py

@@ -0,0 +1,6 @@
+def usage_entity_to_model():
+    pass
+
+def usage_model_to_entity():
+    pass
+

metering/repository.py renamed to metering/entities.py

@@ -0,0 +1,23 @@
+import json
+
+from services import UsageService
+from utils import make_response
+
+usage_service = UsageService()
+
+
+def get_and_validate_requried_params(event):
+    try:
+        org_id = event['queryStringParameters']['org_id']
+        service_id = event['queryStringParameters']['service_id']
+        user_id = event['queryStringParameters']['service_id']
+    except Exception as e:
+        raise e
+
+    return org_id, service_id, user_id
+
+
+def main(event, context):
+    org_id, service_id, user_id = get_and_validate_requried_params(event)
+    free_call_details = usage_service.get_free_call_details(user_id, org_id, service_id)
+    return make_response(200, json.dumps(free_call_details))

metering/handler.py

@@ -0,0 +1,28 @@
+import json
+
+from services import UsageService
+from utils import make_response, check_given_key
+
+usage_service = UsageService()
+
+
+def get_and_validate_requried_params(event):
+    try:
+        body = json.loads(event['body'])
+        if not check_given_key('org_id'):
+            raise Exception("Org id is compulsory parameter in body request")
+    except Exception as e:
+        raise e
+    return body
+
+
+def main(event, context):
+    usage_detail_dict = get_and_validate_requried_params(event)
+    usage_service.save_usage_details(usage_detail_dict)
+
+    response = {
+        "statusCode": 201,
+        "body": json.dumps({"status": "successfull"})
+    }
+
+    return response

metering/handlers/__init__.py

@@ -18,7 +18,7 @@ def get_default_session(self, session=None):
 
         return session
 
-    def add_item(self, item, session=None):
+    def create_item(self, item, session=None):
         session = self.get_default_session(session)
         session.add(item)
         return item

metering/handlers/freecall_handler.py

@@ -0,0 +1,88 @@
+
+plugins:
+  - serverless-offline
+
+service: metering
+
+provider:
+  name: aws
+  runtime: python3.7
+  stage: ${opt:stage,'dev'}
+  timeout: 30
+  description: Metering service entrypoints # optional, Description to publish to AWS
+  memorySize: 128
+  deploymentBucket:
+    name: snet-serverless-artifacts # Deployment bucket name. Default is generated by the framework
+    serverSideEncryption: AES256 # when using server-side encryption
+    tags: # Tags that will be added to each of the deployment resources
+      key1: metering
+  deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
+
+custom:
+  stages:
+    - dev
+    - ropsten
+    - mainnet
+  origin:
+    local: localhost
+    ropsten: '*'
+    mainnet:  'snet.com'
+
+
+package:
+  include:
+  exclude:
+    - tests/**
+    - .gitignore
+
+functions:
+  get-freecalls:
+    handler: handlers/freecall_handler.main
+
+#    The following are a few example events you can configure
+#    NOTE: Please make sure to change your handler code to work with those events
+#    Check the event documentation for details
+    events:
+      - 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
+          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
+  create-usage:
+    handler: handlers.usage_handler.main
+
+    #    The following are a few example events you can configure
+    #    NOTE: Please make sure to change your handler code to work with those events
+    #    Check the event documentation for details
+    events:
+      - http:
+          path: /usage
+          method: post
+          #          authorizer:
+          #            name: user-authorizer
+          #            type: COGNITO_USER_POOLS
+          #            arn: ${file(./config.${self:provider.stage}.json):AUTHORIZER}
+          #            identitySource: method.request.header.Authorization
+          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

metering/handlers/usage_handler.py

@@ -0,0 +1,17 @@
+from metering.storage import DatabaseStorage
+
+
+class UsageService(object):
+    storage_service = DatabaseStorage()
+
+    def get_free_call_details(self, user_name, org_id, service_id, group_id=None):
+        free_calls, total_calls = self.storage_service.get_usage_details(user_name, org_id, service_id, group_id)
+        return {"username": user_name, "org_id": org_id, "service_id": service_id, "total_calls": total_calls,
+                "free_calls": free_calls}
+
+
+
+    def save_usage_details(self, usage_details_dict):
+        # nedd to introduce entities when we enhance  feature to this service right now directly using dicts
+        self.storage_service.add_usage_data(usage_details_dict)
+        return

metering/repository/base_repository.py

@@ -4,56 +4,65 @@
 from repository.user_org_group_repository import UserOrgGroupRepository
 
 
-def add_usage_data(usage_details):
-    user_org_group_repo = UserOrgGroupRepository()
-    user_org_group_repo_data = user_org_group_repo.get_user_org_group_data(
-        payment_group_id=usage_details.payment_group_id,
-        org_id=usage_details.org_id,
-        user_name=usage_details.user_name,
-        user_id=usage_details.user_id,
-        service_id=usage_details.service_id,
-        resource=add_usage_data.resource
-    )
-
-    if user_org_group_repo_data is None:
-        new_user_org_record = UserOrgGroupModel(
-            payment_group_id=usage_details.payment_group_id,
-            org_id=usage_details.org_id,
-            user_name=usage_details.user_name,
-            user_id=usage_details.user_id,
-            service_id=usage_details.service_id,
-            resource=add_usage_data.resource
-        )
-        user_org_group_repo.add_item(new_user_org_record)
-        user_org_group_repo_data = user_org_group_repo.get_user_org_group_data(
-            payment_group_id=usage_details.payment_group_id,
-            org_id=usage_details.org_id,
-            user_name=usage_details.user_name,
-            user_id=usage_details.user_id,
-            service_id=usage_details.service_id,
-            resource=add_usage_data.resource
-        )
+class Storage(object):
 
-    user_org_group_id = user_org_group_repo_data.id
-    usage_record = UsageModel(
-        user_org_group_id=user_org_group_id,
-        usage_type=usage_details.usage_type,
-        usage_value=usage_details.usage_type,
-        start_time=usage_details.start_time,
-        end_time=usage_details.start_time
-    )
-    usage_repo = UsageRepository()
-    usage_repo.add_item(usage_record)
+    # Interface to raad write data fom cache or database
 
+    def add_usage_data(self, usage_detail):
+        pass
 
-def get_usage_details(user_name, org_id, service_id):
+    def get_usage_details(self, username, org_id, service_id, group_id=None):
+        pass
+
+
+class DatabaseStorage(Storage):
     usage_repo = UsageRepository()
     org_service_config_repo = OrgServiceRepo()
-    optin_time = usage_repo.get_optin_time(user_name, org_id, service_id)
-    free_calls = org_service_config_repo.get_service_config(org_id, service_id, optin_time)
-    total_calls = usage_repo.get_total_calls(user_name, org_id, service_id)
-    return total_calls, free_calls
+    user_org_group_repo = UserOrgGroupRepository()
+
+    def get_user_org_group(self, usage_details):
+        user_org_group_repo_data = self.user_org_group_repo.get_user_org_group_data(
+            payment_group_id=usage_details["payment_group_id"],
+            org_id=usage_details["org_id"],
+            user_name=usage_details["user_name"],
+            user_id=usage_details["user_id"],
+            service_id=usage_details["service_id"],
+            resource=usage_details["resource"]
+        )
+
+        return user_org_group_repo_data
+
+    def add_usage_data(self, usage_details):
+        existing_user_org_group_repo_data = self.get_user_org_group(usage_details)
+
+        if existing_user_org_group_repo_data is None:
+            new_user_org_record = UserOrgGroupModel(
+                payment_group_id=usage_details["payment_group_id"],
+                org_id=usage_details["org_id"],
+                user_name=usage_details["user_name"],
+                user_id=usage_details["user_id"],
+                service_id=usage_details["service_id"],
+                resource=usage_details["resource"]
+            )
+            self.user_org_group_repo.create_item(new_user_org_record)
+
+        user_org_group_repo_data = self.get_user_org_group(usage_details)
+        user_org_group_id = user_org_group_repo_data.id
+        usage_record = UsageModel(
+            user_org_group_id=user_org_group_id,
+            usage_type=usage_details.usage_type,
+            usage_value=usage_details.usage_type,
+            start_time=usage_details.start_time,
+            end_time=usage_details.start_time
+        )
+        self.usage_repo.create_item(usage_record)
+
+    def get_usage_details(self, user_name, org_id, service_id, group_id=None):
+        optin_time = self.usage_repo.get_optin_time(user_name, org_id, service_id)
+        free_calls = self.org_service_config_repo.get_service_config(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
 
 
 if __name__ == '__main__':
-    get_usage_details('1', '1', '2')
+    DatabaseStorage().get_usage_details('1', '1', '2')