added user address for usage and free calls

pratik-vii · pratik-vii · commit f86cbb6cece3 · 2019-08-23T18:33:19.000+05:30
diff --git a/metering/alembic/versions/b0f9443a30de_user_address_added.py b/metering/alembic/versions/b0f9443a30de_user_address_added.py
@@ -0,0 +1,38 @@
+"""user address added
+
+Revision ID: b0f9443a30de
+Revises: 66d97ed3bdc5
+Create Date: 2019-08-23 18:32:06.447515
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision = 'b0f9443a30de'
+down_revision = '66d97ed3bdc5'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('usage_table', sa.Column('payment_mode', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('service_id', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('user_org_group', sa.Column('user_address', sa.VARCHAR(length=225), nullable=True))
+    op.alter_column('user_org_group', 'user_name',
+                    existing_type=mysql.VARCHAR(length=225),
+                    nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('user_org_group', 'user_name',
+                    existing_type=mysql.VARCHAR(length=225),
+                    nullable=False)
+    op.drop_column('user_org_group', 'user_address')
+    op.drop_column('usage_table', 'service_id')
+    op.drop_column('usage_table', 'payment_mode')
+    # ### end Alembic commands ###
diff --git a/metering/alembic/versions/eeec29a1af7b_added_tables.py b/metering/alembic/versions/eeec29a1af7b_added_tables.py
@@ -27,8 +27,8 @@ def upgrade():
                     sa.Column('free_calls', sa.Integer(), nullable=False),
                     sa.Column('effective_start_date', sa.TIMESTAMP(
                         timezone=True), nullable=True),
-                    sa.Column('effective_end_date', sa.TIMESTAMP(timezone=True),
-                              server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+                    sa.Column('effective_end_date', sa.TIMESTAMP(
+                        timezone=True), nullable=True),
                     sa.Column('created_at', sa.TIMESTAMP(
                         timezone=True), nullable=True),
                     sa.PrimaryKeyConstraint('id')
diff --git a/metering/constants.py b/metering/constants.py
@@ -10,6 +10,7 @@ class StatusCode:
     "Access-Control-Allow-Origin": "*",
     "Access-Control-Allow-Methods": "OPTIONS,POST,GET"
 }
+PAYMENT_MODE_FREE_CALL = 'freecall'
 
 
 class StatusMessage:
diff --git a/metering/models.py b/metering/models.py
@@ -22,7 +22,8 @@ class UserOrgGroupModel(Base):
     id = Column('id', Integer, primary_key=True)
     payment_group_id = Column('group', VARCHAR(225))
     org_id = Column('org_id', VARCHAR(225), nullable=False)
-    user_name = Column('user_name', VARCHAR(225), nullable=False)
+    user_name = Column('user_name', VARCHAR(225))
+    user_address = Column('user_address', VARCHAR(225))
     created_at = Column('created_at', TIMESTAMP(
         timezone=True), nullable=False, server_default=func.current_timestamp())
     service_id = Column('service_id', VARCHAR(225), nullable=False)
@@ -41,7 +42,7 @@ class UsageModel(Base):
     end_time = Column('end_time', TIMESTAMP(timezone=True))
     created_at = Column('created_at', TIMESTAMP(
         timezone=True), nullable=False, server_default=func.current_timestamp())
-
+    payment_mode = Column('payment_mode', VARCHAR(225))
     group_id = Column('group_id', VARCHAR(225))
     registry_address_key = Column('registry_address_key', VARCHAR(225))
     ethereum_json_rpc_endpoint = Column('ethereum_json_rpc_endpoint', VARCHAR(225))
@@ -56,6 +57,6 @@ class UsageModel(Base):
     user_address = Column('user_address', VARCHAR(225))
     user_name = Column('username', VARCHAR(225))
     org_id = Column('org_id', VARCHAR(225))
-    service_id = Column('org_id', VARCHAR(225))
+    service_id = Column('service_id', VARCHAR(225))
     resource = Column('resource', VARCHAR(225))
     request_id = Column('request_id', VARCHAR(225))
diff --git a/metering/repository/user_org_group_repository.py b/metering/repository/user_org_group_repository.py
@@ -3,18 +3,26 @@
 
 
 class UserOrgGroupRepository(BaseRepository):
-    def get_user_org_group_data(self, payment_group_id, org_id, user_name, service_id, resource):
+
+    def get_user_org_group_id_by_username(self, username, org_id, service_id, resource):
         session = self.get_default_session()
-        user_org_query = session.query(UserOrgGroupModel) \
-            .filter(UserOrgGroupModel.resource == resource) \
+        user_org_query = session.query(UserOrgGroupModel).filter(UserOrgGroupModel.user_name == username) \
             .filter(UserOrgGroupModel.service_id == service_id) \
-            .filter(UserOrgGroupModel.user_name == user_name) \
+            .filter(UserOrgGroupModel.resource == resource) \
             .filter(UserOrgGroupModel.org_id == org_id)
 
-        if payment_group_id is not None:
-            user_org_query = user_org_query.filter(
-                UserOrgGroupModel.payment_group_id == payment_group_id)
+        user_org_group_data = user_org_query.first()
+        session.commit()
+        session.flush()
+        return user_org_group_data
 
+    def get_user_org_group_id_by_user_address(self, user_address, org_id, service_id, resource, payment_group_id):
+        session = self.get_default_session()
+        user_org_query = session.query(UserOrgGroupModel).filter(UserOrgGroupModel.user_address == user_address) \
+            .filter(UserOrgGroupModel.service_id == service_id) \
+            .filter(UserOrgGroupModel.resource == resource) \
+            .filter(UserOrgGroupModel.org_id == org_id) \
+            .filter(UserOrgGroupModel.payment_group_id == payment_group_id)
         user_org_group_data = user_org_query.first()
         session.commit()
         session.flush()
diff --git a/metering/serverless.yml b/metering/serverless.yml
@@ -1,6 +1,3 @@
-plugins:
-  - serverless-offline
-  - serverless-python-requirements
 
 service: metering
 
@@ -38,14 +35,14 @@ package:
 functions:
   get-freecalls:
     handler: handlers/freecall_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}
+    #    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}
     #    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
@@ -70,25 +67,25 @@ functions:
               - x-requested-with
   create-usage:
     handler: handlers.usage_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}
+    #    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}
     #    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:
-            type: request
-            arn: ${file(./config.${self:provider.stage}.json):SIGN_AUTHORIZER}
-            identitySource: ${file(./config.${self:provider.stage}.json):SIGN_HEADERS}
+          #          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
@@ -5,9 +5,9 @@
 
 
 def is_free_call(usage_details_dict):
-    if not usage_details_dict['username'] or len(usage_details_dict['username']):
-        return False
-    return True
+    if not usage_details_dict['payment_mode'] == 'free_call':
+        return True
+    return False
 
 
 class UsageService(object):
@@ -27,25 +27,5 @@ 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 is_free_call(usage_details_dict):
-            channel_id = usage_details_dict['channel_id']
-            group_id = usage_details_dict['group_id']
-            username = APIUtilityService().get_user_name(channel_id, group_id)
-            usage_details_dict['username'] = username
         self.storage_service.add_usage_data(usage_details_dict)
         return
-
-
-class APIUtilityService:
-
-    @staticmethod
-    def get_user_name(channel_id, group_id):
-        url = MARKETPLACE_CHANNEL_USER_URL.format(group_id, channel_id)
-        response = requests.get(url)
-        user_data = response.json()
-        try:
-            username = user_data[0]['username']
-        except Exception as e:
-            print(e)
-            raise Exception("Failed to get username from marketplace")
-        return username
diff --git a/metering/storage.py b/metering/storage.py
@@ -1,9 +1,16 @@
+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
+
+
 class Storage(object):
 
     # Interface to raad write data fom cache or database
@@ -16,38 +23,56 @@ def get_usage_details(self, username, org_id, service_id, group_id=None):
 
 
 class DatabaseStorage(Storage):
-    usage_repo = UsageRepository()
-    org_service_config_repo = OrgServiceRepo()
-    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["group_id"],
-            org_id=usage_details["organization_id"],
-            user_name=usage_details["username"],
-            service_id=usage_details["service_id"],
-            resource=usage_details["service_method"]
-        )
+    def __init__(self):
+        self.usage_repo = UsageRepository()
+        self.org_service_config_repo = OrgServiceRepo()
+        self.user_org_group_repo = UserOrgGroupRepository()
+
+    def get_user_org_group_id(self, usage_details):
 
-        return user_org_group_repo_data
+        if usage_details['payment_mode'] == PAYMENT_MODE_FREE_CALL:
+            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:
+            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'],
+                usage_details['service_id'],
+                usage_details['service_method'],
+                usage_details['group_id']
+            )
+        else:
+            raise Exception('Unknown user request error')
+
+        if user_org_group_id is not None:
+            return user_org_group_id.id
+        return user_org_group_id
+
+    def add_user_org_group(self, username, user_address, service_id, group_id):
+        pass
 
     def add_usage_data(self, usage_details):
-        existing_user_org_group_repo_data = self.get_user_org_group(
-            usage_details)
+        user_org_group_id = self.get_user_org_group_id(usage_details)
 
-        if existing_user_org_group_repo_data is None:
-            print("existing_user_org_group_repo_data is None")
+        if user_org_group_id is None:
+            print(f"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"],
                 user_name=usage_details["username"],
+                user_address=usage_details["user_address"],
                 service_id=usage_details["service_id"],
                 resource=usage_details["service_method"]
             )
             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
+        user_org_group_id = self.get_user_org_group_id(usage_details)
+
         usage_record = UsageModel(
             client_type=usage_details['client_type'],
             ethereum_json_rpc_endpoint=usage_details['ethereum_json_rpc_endpoint'],
@@ -70,8 +95,7 @@ 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"]
         )
         self.usage_repo.create_item(usage_record)
 
@@ -82,4 +106,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
diff --git a/metering/tests/test_total_calls.py b/metering/tests/test_total_calls.py
@@ -50,6 +50,7 @@ def test_success_usage_record(self):
             "error_message": "",
             "version": "v1.0.0",
             'username': 'user@snet',
+            'payment_mode': 'freecall',
             "operation": "read",
             "usage_type": "apicall",
             "status": "success",
@@ -60,7 +61,8 @@ def test_success_usage_record(self):
             "client_type": None,
             "channel_id": None,
             "user_details": None,
-            "user_agent": None
+            "user_agent": None,
+            "user_address": None
         })
 
         self.storage_service.add_usage_data({
@@ -79,6 +81,7 @@ def test_success_usage_record(self):
             "error_message": "",
             "version": "v1.0.0",
             'username': 'user@snet',
+            'payment_mode': 'freecall',
             "operation": "read",
             "usage_type": "apicall",
             "status": "failed",
@@ -89,7 +92,8 @@ def test_success_usage_record(self):
             "client_type": None,
             "channel_id": None,
             "user_details": None,
-            "user_agent": None
+            "user_agent": None,
+            "user_address": None
         })
         self.assertEqual((1, 100), self.storage_service.get_usage_details(
             user_name='user@snet', org_id='snet', service_id='example-service'))

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ class StatusCode:`
`10`	`10`	`"Access-Control-Allow-Origin": "*",`
`11`	`11`	`"Access-Control-Allow-Methods": "OPTIONS,POST,GET"`
`12`	`12`	`}`
	`13`	`+PAYMENT_MODE_FREE_CALL = 'freecall'`
`13`	`14`
`14`	`15`
`15`	`16`	`class StatusMessage:`