darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 18:01:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

change update_provider_stats to use billable_units

Browse Source 
updated tests etc, and removed some old tests that are no longer relevant
This commit is contained in:
Leo Hemsted
2016-08-03 17:22:20 +01:00
parent 527a5c4eaa
commit 143cfb526c
5 changed files with 19 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/celery/provider_tasks.py
View File

@@ -82,7 +82,7 @@ def send_sms_to_provider(self, service_id, notification_id):
notification_id,
SMS_TYPE,
provider.get_name(),
content_char_count=template.replaced_content_count
billable_units=notification.billable_units
)
notification.sent_at = datetime.utcnow()
@@ -164,7 +164,8 @@ def send_email_to_provider(self, service_id, notification_id):
update_provider_stats(
notification_id,
EMAIL_TYPE,
provider.get_name()
provider.get_name(),
billable_units=1
)
notification.reference = reference
notification.sent_at = datetime.utcnow()

14
app/dao/notifications_dao.py
View File

@@ -299,30 +299,22 @@ def update_provider_stats(
id_,
notification_type,
provider_name,
content_char_count=None):
billable_units=1):
notification = Notification.query.filter(Notification.id == id_).one()
provider = ProviderDetails.query.filter_by(identifier=provider_name).one()
def unit_count():
if notification_type == EMAIL_TYPE:
return 1
else:
if (content_char_count):
return get_sms_fragment_count(content_char_count)
return get_sms_fragment_count(notification.content_char_count)
update_count = db.session.query(ProviderStatistics).filter_by(
day=date.today(),
service_id=notification.service_id,
provider_id=provider.id
).update({'unit_count': ProviderStatistics.unit_count + unit_count()})
).update({'unit_count': ProviderStatistics.unit_count + billable_units})
if update_count == 0:
provider_stats = ProviderStatistics(
day=notification.created_at.date(),
service_id=notification.service_id,
provider_id=provider.id,
unit_count=unit_count()
unit_count=billable_units
)
db.session.add(provider_stats)