Skip to content

Commit 4b0587a

Browse files
committed
added status for the demon record usage call
1 parent e95d9af commit 4b0587a

File tree

4 files changed

+32
-1
lines changed

4 files changed

+32
-1
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
"""status added in calls tables
2+
3+
Revision ID: 9ecbd29ee907
4+
Revises: eeec29a1af7b
5+
Create Date: 2019-08-12 15:13:51.507698
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
11+
12+
# revision identifiers, used by Alembic.
13+
revision = '9ecbd29ee907'
14+
down_revision = 'eeec29a1af7b'
15+
branch_labels = None
16+
depends_on = None
17+
18+
19+
def upgrade():
20+
# ### commands auto generated by Alembic - please adjust! ###
21+
op.add_column('usage_table', sa.Column('status', sa.VARCHAR(length=225), nullable=False))
22+
# ### end Alembic commands ###
23+
24+
25+
def downgrade():
26+
# ### commands auto generated by Alembic - please adjust! ###
27+
op.drop_column('usage_table', 'status')
28+
# ### end Alembic commands ###

metering/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class UsageModel(Base):
3737
user_org_group_id = Column('user_org_group_id', Integer, ForeignKey(
3838
'user_org_group.id'), nullable=False)
3939
usage_type = Column('usage_type', VARCHAR(225), nullable=False)
40+
status = Column('status', VARCHAR(225), nullable=False)
4041
usage_value = Column('usage_value', Integer, nullable=False)
4142
start_time = Column('start_time', TIMESTAMP(timezone=True))
4243
end_time = Column('end_time', TIMESTAMP(timezone=True))

metering/repository/usage_repository.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ def get_total_calls(self, user_name, org_id, service_id):
1010
query_data = session.query(func.count(UsageModel.id).label('total_calls')).join(UserOrgGroupModel) \
1111
.filter(UserOrgGroupModel.user_name == user_name)\
1212
.filter(UserOrgGroupModel.org_id == org_id) \
13-
.filter(UserOrgGroupModel.service_id == service_id).all()
13+
.filter(UserOrgGroupModel.service_id == service_id)\
14+
.filter(UsageModel.status == 'success').all()
1415
session.commit()
1516
session.flush()
1617
return query_data[0].total_calls

metering/storage.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def add_usage_data(self, usage_details):
5050
user_org_group_id = user_org_group_repo_data.id
5151
usage_record = UsageModel(
5252
user_org_group_id=user_org_group_id,
53+
status=usage_details['status'],
5354
usage_type=usage_details['usage_type'],
5455
usage_value=usage_details['usage_value'],
5556
start_time=usage_details['start_time'],

0 commit comments

Comments
 (0)