Merge pull request #14 from singnet/pull-13-restyled

Restyle adding python requirements.

Author: vinthedark

metering/alembic/versions/d6ae2a8867cf_added_tables.py renamed to metering/alembic/versions/eeec29a1af7b_added_tables.py

@@ -1,16 +1,16 @@
 """added tables
 
-Revision ID: d6ae2a8867cf
+Revision ID: eeec29a1af7b
 Revises: 
-Create Date: 2019-08-08 15:09:48.362244
+Create Date: 2019-08-08 19:15:24.337631
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'd6ae2a8867cf'
+revision = 'eeec29a1af7b'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -20,7 +20,7 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('service_config',
                     sa.Column('id', sa.Integer(), nullable=False),
-                    sa.Column('row_id', sa.VARCHAR(
+                    sa.Column('org_id', sa.VARCHAR(
                         length=225), nullable=False),
                     sa.Column('service_id', sa.VARCHAR(
                         length=225), nullable=False),
@@ -36,7 +36,7 @@ def upgrade():
     op.create_table('user_org_group',
                     sa.Column('id', sa.Integer(), nullable=False),
                     sa.Column('group', sa.VARCHAR(length=225), nullable=True),
-                    sa.Column('org_name', sa.VARCHAR(
+                    sa.Column('org_id', sa.VARCHAR(
                         length=225), nullable=False),
                     sa.Column('user_name', sa.VARCHAR(
                         length=225), nullable=False),

metering/handlers/freecall_handler.py

@@ -8,7 +8,7 @@
 
 def get_and_validate_requried_params(event):
     try:
-        org_id = event['queryStringParameters']['organisation_id']
+        org_id = event['queryStringParameters']['organization_id']
         service_id = event['queryStringParameters']['service_id']
         user_id = event['queryStringParameters']['user_id']
     except Exception as e:

metering/models.py

@@ -9,7 +9,7 @@
 class OrgServiceConfigModel(Base):
     __tablename__ = 'service_config'
     id = Column('id', Integer, primary_key=True)
-    org_id = Column('row_id', VARCHAR(225), nullable=False)
+    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(
@@ -23,7 +23,7 @@ class UserOrgGroupModel(Base):
     __tablename__ = 'user_org_group'
     id = Column('id', Integer, primary_key=True)
     payment_group_id = Column('group', VARCHAR(225))
-    org_id = Column('org_name', VARCHAR(225), nullable=False)
+    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())

metering/serverless.yml

@@ -1,5 +1,6 @@
 plugins:
   - serverless-offline
+  - serverless-python-requirements
 
 service: metering
 
@@ -18,6 +19,8 @@ provider:
   deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
 
 custom:
+  pythonRequirements:
+    dockerizePip: true
   stages:
     - dev
     - ropsten
@@ -28,7 +31,6 @@ custom:
     mainnet: "snet.com"
 
 package:
-  ? include
   exclude:
     - tests/**
     - .gitignore