Skip to content

Commit 34598b6

Browse files
restyled-commitsrestyled-commits
committed
Restyled by autopep8
1 parent c5ceacc commit 34598b6

File tree

8 files changed

+70
-41
lines changed

8 files changed

+70
-41
lines changed

‎metering/adaptors.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
def usage_entity_to_model():
22
pass
33

4+
45
def usage_model_to_entity():
56
pass
6-

‎metering/alembic/versions/d6ae2a8867cf_added_tables.py‎

Lines changed: 44 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,52 @@
1919
def upgrade():
2020
# ### commands auto generated by Alembic - please adjust! ###
2121
op.create_table('service_config',
22-
sa.Column('id', sa.Integer(), nullable=False),
23-
sa.Column('row_id', sa.VARCHAR(length=225), nullable=False),
24-
sa.Column('service_id', sa.VARCHAR(length=225), nullable=False),
25-
sa.Column('free_calls', sa.Integer(), nullable=False),
26-
sa.Column('effective_start_date', sa.TIMESTAMP(timezone=True), nullable=True),
27-
sa.Column('effective_end_date', sa.TIMESTAMP(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
28-
sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=True),
29-
sa.PrimaryKeyConstraint('id')
30-
)
22+
sa.Column('id', sa.Integer(), nullable=False),
23+
sa.Column('row_id', sa.VARCHAR(
24+
length=225), nullable=False),
25+
sa.Column('service_id', sa.VARCHAR(
26+
length=225), nullable=False),
27+
sa.Column('free_calls', sa.Integer(), nullable=False),
28+
sa.Column('effective_start_date', sa.TIMESTAMP(
29+
timezone=True), nullable=True),
30+
sa.Column('effective_end_date', sa.TIMESTAMP(timezone=True),
31+
server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
32+
sa.Column('created_at', sa.TIMESTAMP(
33+
timezone=True), nullable=True),
34+
sa.PrimaryKeyConstraint('id')
35+
)
3136
op.create_table('user_org_group',
32-
sa.Column('id', sa.Integer(), nullable=False),
33-
sa.Column('group', sa.VARCHAR(length=225), nullable=True),
34-
sa.Column('org_name', sa.VARCHAR(length=225), nullable=False),
35-
sa.Column('user_name', sa.VARCHAR(length=225), nullable=False),
36-
sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
37-
sa.Column('service_id', sa.VARCHAR(length=225), nullable=False),
38-
sa.Column('resource', sa.VARCHAR(length=225), nullable=True),
39-
sa.PrimaryKeyConstraint('id')
40-
)
37+
sa.Column('id', sa.Integer(), nullable=False),
38+
sa.Column('group', sa.VARCHAR(length=225), nullable=True),
39+
sa.Column('org_name', sa.VARCHAR(
40+
length=225), nullable=False),
41+
sa.Column('user_name', sa.VARCHAR(
42+
length=225), nullable=False),
43+
sa.Column('created_at', sa.TIMESTAMP(timezone=True),
44+
server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
45+
sa.Column('service_id', sa.VARCHAR(
46+
length=225), nullable=False),
47+
sa.Column('resource', sa.VARCHAR(
48+
length=225), nullable=True),
49+
sa.PrimaryKeyConstraint('id')
50+
)
4151
op.create_table('usage_table',
42-
sa.Column('id', sa.Integer(), nullable=False),
43-
sa.Column('user_org_group_id', sa.Integer(), nullable=False),
44-
sa.Column('usage_type', sa.VARCHAR(length=225), nullable=False),
45-
sa.Column('usage_value', sa.Integer(), nullable=False),
46-
sa.Column('start_time', sa.TIMESTAMP(timezone=True), nullable=True),
47-
sa.Column('end_time', sa.TIMESTAMP(timezone=True), nullable=True),
48-
sa.Column('created_at', sa.TIMESTAMP(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
49-
sa.ForeignKeyConstraint(['user_org_group_id'], ['user_org_group.id'], ),
50-
sa.PrimaryKeyConstraint('id')
51-
)
52+
sa.Column('id', sa.Integer(), nullable=False),
53+
sa.Column('user_org_group_id',
54+
sa.Integer(), nullable=False),
55+
sa.Column('usage_type', sa.VARCHAR(
56+
length=225), nullable=False),
57+
sa.Column('usage_value', sa.Integer(), nullable=False),
58+
sa.Column('start_time', sa.TIMESTAMP(
59+
timezone=True), nullable=True),
60+
sa.Column('end_time', sa.TIMESTAMP(
61+
timezone=True), nullable=True),
62+
sa.Column('created_at', sa.TIMESTAMP(timezone=True),
63+
server_default=sa.text('CURRENT_TIMESTAMP'), nullable=False),
64+
sa.ForeignKeyConstraint(['user_org_group_id'], [
65+
'user_org_group.id'], ),
66+
sa.PrimaryKeyConstraint('id')
67+
)
5268
# ### end Alembic commands ###
5369

5470

‎metering/handlers/freecall_handler.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ def get_and_validate_requried_params(event):
1919

2020
def main(event, context):
2121
org_id, service_id, user_id = get_and_validate_requried_params(event)
22-
free_call_details = usage_service.get_free_call_details(user_id, org_id, service_id)
22+
free_call_details = usage_service.get_free_call_details(
23+
user_id, org_id, service_id)
2324

2425
return_value = {
2526
"statusCode": 200,

‎metering/models.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ class OrgServiceConfigModel(Base):
1212
org_id = Column('row_id', VARCHAR(225), nullable=False)
1313
service_id = Column('service_id', VARCHAR(225), nullable=False)
1414
free_calls = Column('free_calls', Integer, nullable=False)
15-
effective_start_date = Column('effective_start_date', TIMESTAMP(timezone=True))
16-
effective_end_date = Column('effective_end_date', TIMESTAMP(timezone=True), server_default=func.current_timestamp())
15+
effective_start_date = Column(
16+
'effective_start_date', TIMESTAMP(timezone=True))
17+
effective_end_date = Column('effective_end_date', TIMESTAMP(
18+
timezone=True), server_default=func.current_timestamp())
1719
created_at = Column('created_at', TIMESTAMP(timezone=True))
1820

1921

@@ -23,17 +25,20 @@ class UserOrgGroupModel(Base):
2325
payment_group_id = Column('group', VARCHAR(225))
2426
org_id = Column('org_name', VARCHAR(225), nullable=False)
2527
user_name = Column('user_name', VARCHAR(225), nullable=False)
26-
created_at = Column('created_at', TIMESTAMP(timezone=True), nullable=False, server_default=func.current_timestamp())
28+
created_at = Column('created_at', TIMESTAMP(
29+
timezone=True), nullable=False, server_default=func.current_timestamp())
2730
service_id = Column('service_id', VARCHAR(225), nullable=False)
2831
resource = Column('resource', VARCHAR(225))
2932

3033

3134
class UsageModel(Base):
3235
__tablename__ = 'usage_table'
3336
id = Column('id', Integer, primary_key=True)
34-
user_org_group_id = Column('user_org_group_id', Integer, ForeignKey('user_org_group.id'), nullable=False)
37+
user_org_group_id = Column('user_org_group_id', Integer, ForeignKey(
38+
'user_org_group.id'), nullable=False)
3539
usage_type = Column('usage_type', VARCHAR(225), nullable=False)
3640
usage_value = Column('usage_value', Integer, nullable=False)
3741
start_time = Column('start_time', TIMESTAMP(timezone=True))
3842
end_time = Column('end_time', TIMESTAMP(timezone=True))
39-
created_at = Column('created_at', TIMESTAMP(timezone=True), nullable=False, server_default=func.current_timestamp())
43+
created_at = Column('created_at', TIMESTAMP(
44+
timezone=True), nullable=False, server_default=func.current_timestamp())

‎metering/repository/user_org_group_repository.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ def get_user_org_group_data(self, payment_group_id, org_id, user_name, service_i
1212
.filter(UserOrgGroupModel.org_id == org_id)
1313

1414
if payment_group_id is not None:
15-
user_org_query = user_org_query.filter(UserOrgGroupModel.payment_group_id == payment_group_id)
15+
user_org_query = user_org_query.filter(
16+
UserOrgGroupModel.payment_group_id == payment_group_id)
1617

1718
user_org_group_data = user_org_query.first()
1819
return user_org_group_data

‎metering/services.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ class UsageService(object):
55
storage_service = DatabaseStorage()
66

77
def get_free_call_details(self, user_name, org_id, service_id, group_id=None):
8-
free_calls, total_calls = self.storage_service.get_usage_details(user_name, org_id, service_id, group_id)
8+
free_calls, total_calls = self.storage_service.get_usage_details(
9+
user_name, org_id, service_id, group_id)
910

1011
if not free_calls:
1112
free_calls = 0

‎metering/storage.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ def get_user_org_group(self, usage_details):
3232
return user_org_group_repo_data
3333

3434
def add_usage_data(self, usage_details):
35-
existing_user_org_group_repo_data = self.get_user_org_group(usage_details)
35+
existing_user_org_group_repo_data = self.get_user_org_group(
36+
usage_details)
3637

3738
if existing_user_org_group_repo_data is None:
3839
print("existing_user_org_group_repo_data is None")
@@ -57,7 +58,10 @@ def add_usage_data(self, usage_details):
5758
self.usage_repo.create_item(usage_record)
5859

5960
def get_usage_details(self, user_name, org_id, service_id, group_id=None):
60-
optin_time = self.usage_repo.get_optin_time(user_name, org_id, service_id)
61-
free_calls = self.org_service_config_repo.get_service_config(org_id, service_id, optin_time)
62-
total_calls = self.usage_repo.get_total_calls(user_name, org_id, service_id)
61+
optin_time = self.usage_repo.get_optin_time(
62+
user_name, org_id, service_id)
63+
free_calls = self.org_service_config_repo.get_service_config(
64+
org_id, service_id, optin_time)
65+
total_calls = self.usage_repo.get_total_calls(
66+
user_name, org_id, service_id)
6367
return total_calls, free_calls

‎metering/utils.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ def make_response(status_code, body):
77
"body": body
88
}
99

10+
1011
def configure_log(logger):
1112
logger.setLevel(logging.INFO)
1213

0 commit comments

Comments
 (0)