Merge branch 'master' of https://github.com/vinthedark/snet-platform-usage

vinthedark · vinthedark · commit 62cd5dd30f86 · 2019-08-26T15:43:37.000+05:30
diff --git a/metering/alembic/versions/66d97ed3bdc5_usage_table_update.py b/metering/alembic/versions/66d97ed3bdc5_usage_table_update.py
@@ -0,0 +1,57 @@
+"""usage table update
+
+Revision ID: 66d97ed3bdc5
+Revises: 9ecbd29ee907
+Create Date: 2019-08-20 16:00:09.306326
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = '66d97ed3bdc5'
+down_revision = '9ecbd29ee907'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('usage_table', sa.Column('channel_id', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('client_type', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('error_message', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('ethereum_json_rpc_endpoint', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('group_id', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('operation', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('org_id', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('registry_address_key', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('request_id', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('resource', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('response_code', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('response_time', sa.FLOAT(), nullable=True))
+    op.add_column('usage_table', sa.Column('user_address', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('user_details', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('username', sa.VARCHAR(length=225), nullable=True))
+    op.add_column('usage_table', sa.Column('version', sa.VARCHAR(length=225), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('usage_table', 'version')
+    op.drop_column('usage_table', 'username')
+    op.drop_column('usage_table', 'user_details')
+    op.drop_column('usage_table', 'user_address')
+    op.drop_column('usage_table', 'response_time')
+    op.drop_column('usage_table', 'response_code')
+    op.drop_column('usage_table', 'resource')
+    op.drop_column('usage_table', 'request_id')
+    op.drop_column('usage_table', 'registry_address_key')
+    op.drop_column('usage_table', 'org_id')
+    op.drop_column('usage_table', 'operation')
+    op.drop_column('usage_table', 'group_id')
+    op.drop_column('usage_table', 'ethereum_json_rpc_endpoint')
+    op.drop_column('usage_table', 'error_message')
+    op.drop_column('usage_table', 'client_type')
+    op.drop_column('usage_table', 'channel_id')
+    # ### end Alembic commands ###
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/handlers/freecall_handler.py b/metering/handlers/freecall_handler.py
@@ -19,7 +19,7 @@ def main(event, context):
         try:
             org_id = event['queryStringParameters']['organization_id']
             service_id = event['queryStringParameters']['service_id']
-            username = event['queryStringParameters']['username']
+            username = event['requestContext']['authorizer']['claims']['email']
             free_call_details = usage_service.get_free_call_details(
                 username, org_id, service_id)
             return_value = make_response(
@@ -37,7 +37,7 @@ def main(event, context):
             )
 
     else:
-        logger.error('Request validation failed')
+        logger.error(f"Request validation failed for {event['queryStringParameters']}")
         return_value = make_response(
             status_code=StatusCode.BAD_PARAMETERS_CODE,
             header=HEADER_POST_RESPONSE,
diff --git a/metering/models.py b/metering/models.py
@@ -1,4 +1,4 @@
-from sqlalchemy import Column, Integer, VARCHAR, ForeignKey, TIMESTAMP, func
+from sqlalchemy import Column, Integer, VARCHAR, ForeignKey, TIMESTAMP, func, FLOAT, String
 
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship
@@ -24,7 +24,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)
@@ -43,3 +44,21 @@ 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))
+    response_time = Column('response_time', FLOAT)
+    response_code = Column('response_code', VARCHAR(225))
+    error_message = Column('error_message', VARCHAR(225))
+    version = Column('version', VARCHAR(225))
+    client_type = Column('client_type', VARCHAR(225))
+    user_details = Column('user_details', VARCHAR(225))
+    channel_id = Column('channel_id', VARCHAR(225))
+    operation = Column('operation', VARCHAR(225))
+    user_address = Column('user_address', VARCHAR(225))
+    user_name = Column('username', VARCHAR(225))
+    org_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/requirements.txt b/metering/requirements.txt
@@ -5,4 +5,5 @@ PyMySQL==0.9.3
 python-dateutil==2.8.0
 python-editor==1.0.4
 six==1.12.0
-SQLAlchemy==1.3.6
+SQLAlchemy==1.3.6
+requests==2.22.0
diff --git a/metering/services.py b/metering/services.py
@@ -1,5 +1,9 @@
+import logging
+
 from storage import DatabaseStorage
 
+logger = logging.getLogger(__name__)
+
 
 class UsageService(object):
     storage_service = DatabaseStorage()
@@ -13,8 +17,11 @@ def get_free_call_details(self, username, org_id, service_id, group_id=None):
         if not total_calls:
             total_calls = 0
 
-        return {"username": username, "org_id": org_id, "service_id": service_id, "total_calls_made": total_calls,
-                "free_calls_allowed": free_calls}
+        response = {"username": username, "org_id": org_id, "service_id": service_id, "total_calls_made": total_calls,
+                    "free_calls_allowed": free_calls}
+
+        logger.info(response)
+        return response
 
     def save_usage_details(self, usage_details_dict):
         # nedd to introduce entities when we enhance  feature to this service right now directly using dicts
diff --git a/metering/storage.py b/metering/storage.py
@@ -1,8 +1,13 @@
+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
 
+logger = logging.getLogger(__name__)
+
 
 class Storage(object):
 
@@ -16,47 +21,90 @@ 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()
 
-        return user_org_group_repo_data
+    def get_user_org_group_id(self, usage_details):
+
+        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_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:
+            logger.info(f"No user org group data found for "
+                        f"group_id: {usage_details['group_id']}, "
+                        f"org_id: {usage_details['organization_id']}, "
+                        f"user_name: {usage_details['username']}, "
+                        f"user_address: {usage_details['user_address']}, "
+                        f"service_id: {usage_details['service_id']}, "
+                        f"resource {usage_details['service_method']}")
             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)
+        logger.info(f"Added user org group data\ngroup_id: {usage_details['group_id']}, "
+                    f"org_id: {usage_details['organization_id']}, "
+                    f"user_name: {usage_details['username']}, "
+                    f"user_address: {usage_details['user_address']}, "
+                    f"service_id: {usage_details['service_id']}, "
+                    f"resource {usage_details['service_method']}")
+        user_org_group_id = self.get_user_org_group_id(usage_details)
 
-        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(
+            client_type=usage_details['client_type'],
+            ethereum_json_rpc_endpoint=usage_details['ethereum_json_rpc_endpoint'],
+            registry_address_key=usage_details['registry_address_key'],
             user_org_group_id=user_org_group_id,
             status=usage_details['status'],
+            start_time=usage_details['start_time'],
+            end_time=usage_details['end_time'],
+            response_time=usage_details['response_time'],
+            response_code=usage_details['response_code'],
+            error_message=usage_details['error_message'],
+            version=usage_details['version'],
+            channel_id=usage_details['channel_id'],
+            operation=usage_details['operation'],
+            group_id=usage_details["group_id"],
+            org_id=usage_details["organization_id"],
             usage_type=usage_details['usage_type'],
             usage_value=usage_details['usage_value'],
-            start_time=usage_details['start_time'],
-            end_time=usage_details['end_time']
+            user_details=usage_details['user_details'],
+            user_name=usage_details["username"],
+            service_id=usage_details["service_id"],
+            resource=usage_details["service_method"],
+            request_id=usage_details["request_id"]
         )
         self.usage_repo.create_item(usage_record)
+        logger.info(f"added usage data for {usage_details}")
 
     def get_usage_details(self, user_name, org_id, service_id, group_id=None):
         optin_time = self.usage_repo.get_optin_time(
diff --git a/metering/tests/test_total_calls.py b/metering/tests/test_total_calls.py
diff --git a/metering/utils.py b/metering/utils.py

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:`