Merge branch 'master' of https://github.com/singnet/snet-platform-usage into metering

# Conflicts:
#	metering/alembic/versions/eeec29a1af7b_added_tables.py

Author: pratik-vii

metering/adaptors.py

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

metering/handlers/freecall_handler.py

@@ -19,7 +19,8 @@ def get_and_validate_requried_params(event):
 
 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)
+    free_call_details = usage_service.get_free_call_details(
+        user_id, org_id, service_id)
 
     return_value = {
         "statusCode": 200,

metering/models.py

@@ -12,8 +12,10 @@ class OrgServiceConfigModel(Base):
     org_id = Column('org_id', VARCHAR(225), nullable=False)
     service_id = Column('service_id', VARCHAR(225), nullable=False)
     free_calls = Column('free_calls', Integer, nullable=False)
-    effective_start_date = Column('effective_start_date', TIMESTAMP(timezone=True))
-    effective_end_date = Column('effective_end_date', TIMESTAMP(timezone=True), server_default=func.current_timestamp())
+    effective_start_date = Column(
+        'effective_start_date', TIMESTAMP(timezone=True))
+    effective_end_date = Column('effective_end_date', TIMESTAMP(
+        timezone=True), server_default=func.current_timestamp())
     created_at = Column('created_at', TIMESTAMP(timezone=True))
 
 
@@ -23,17 +25,20 @@ class UserOrgGroupModel(Base):
     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)
-    created_at = Column('created_at', TIMESTAMP(timezone=True), nullable=False, server_default=func.current_timestamp())
+    created_at = Column('created_at', TIMESTAMP(
+        timezone=True), nullable=False, server_default=func.current_timestamp())
     service_id = Column('service_id', VARCHAR(225), nullable=False)
     resource = Column('resource', VARCHAR(225))
 
 
 class UsageModel(Base):
     __tablename__ = 'usage_table'
     id = Column('id', Integer, primary_key=True)
-    user_org_group_id = Column('user_org_group_id', Integer, ForeignKey('user_org_group.id'), nullable=False)
+    user_org_group_id = Column('user_org_group_id', Integer, ForeignKey(
+        'user_org_group.id'), nullable=False)
     usage_type = Column('usage_type', VARCHAR(225), nullable=False)
     usage_value = Column('usage_value', Integer, nullable=False)
     start_time = Column('start_time', TIMESTAMP(timezone=True))
     end_time = Column('end_time', TIMESTAMP(timezone=True))
-    created_at = Column('created_at', TIMESTAMP(timezone=True), nullable=False, server_default=func.current_timestamp())
+    created_at = Column('created_at', TIMESTAMP(
+        timezone=True), nullable=False, server_default=func.current_timestamp())

metering/repository/user_org_group_repository.py

@@ -12,7 +12,8 @@ def get_user_org_group_data(self, payment_group_id, org_id, user_name, service_i
             .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_query = user_org_query.filter(
+                UserOrgGroupModel.payment_group_id == payment_group_id)
 
         user_org_group_data = user_org_query.first()
         return user_org_group_data

metering/serverless.yml

@@ -1,4 +1,3 @@
-
 plugins:
   - serverless-offline
   - serverless-python-requirements
@@ -28,12 +27,10 @@ custom:
     - mainnet
   origin:
     local: localhost
-    ropsten: '*'
-    mainnet:  'snet.com'
-
+    ropsten: "*"
+    mainnet: "snet.com"
 
 package:
-  include:
   exclude:
     - tests/**
     - .gitignore
@@ -42,9 +39,9 @@ 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
+    #    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

metering/services.py

@@ -5,7 +5,8 @@ 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)
+        free_calls, total_calls = self.storage_service.get_usage_details(
+            user_name, org_id, service_id, group_id)
 
         if not free_calls:
             free_calls = 0

metering/storage.py

@@ -32,7 +32,8 @@ def get_user_org_group(self, usage_details):
         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)
+        existing_user_org_group_repo_data = self.get_user_org_group(
+            usage_details)
 
         if existing_user_org_group_repo_data is None:
             print("existing_user_org_group_repo_data is None")
@@ -57,7 +58,10 @@ def add_usage_data(self, usage_details):
         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)
+        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

metering/utils.py

@@ -7,6 +7,7 @@ def make_response(status_code, body):
         "body": body
     }
 
+
 def configure_log(logger):
     logger.setLevel(logging.INFO)