darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 00:41:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only create sequential numbers for Vodafone messages

Browse Source
This commit is contained in:
Pea Tyczynska
2020-12-04 17:45:23 +00:00
parent 932a09fe5b
commit 2952b70930
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/celery/broadcast_message_tasks.py
View File

@@ -33,7 +33,9 @@ def send_broadcast_provider_message(broadcast_event_id, provider):
broadcast_event = dao_get_broadcast_event_by_id(broadcast_event_id) broadcast_event = dao_get_broadcast_event_by_id(broadcast_event_id)
broadcast_provider_message, message_number = create_broadcast_provider_message(broadcast_event, provider) broadcast_provider_message, message_number = create_broadcast_provider_message(broadcast_event, provider)
formatted_message_number = format_sequential_number(message_number.broadcast_provider_message_number) formatted_message_number = None
if provider == BroadcastProvider.VODAFONE:
formatted_message_number = format_sequential_number(message_number.broadcast_provider_message_number)
current_app.logger.info( current_app.logger.info(
f'invoking cbc proxy to send ' f'invoking cbc proxy to send '

12
app/dao/broadcast_message_dao.py
View File

@@ -5,6 +5,7 @@ from app.dao.dao_utils import transactional
from app.models import ( from app.models import (
BroadcastMessage, BroadcastMessage,
BroadcastEvent, BroadcastEvent,
BroadcastProvider,
BroadcastProviderMessage, BroadcastProviderMessage,
BroadcastProviderMessageNumber, BroadcastProviderMessageNumber,
BroadcastProviderMessageStatus BroadcastProviderMessageStatus
@@ -53,9 +54,10 @@ def create_broadcast_provider_message(broadcast_event, provider):
) )
db.session.add(provider_message) db.session.add(provider_message)
db.session.commit() db.session.commit()
provider_message_number = None
provider_message_number = BroadcastProviderMessageNumber( if provider == BroadcastProvider.VODAFONE:
broadcast_provider_message_id=broadcast_provider_message_id) provider_message_number = BroadcastProviderMessageNumber(
db.session.add(provider_message_number) broadcast_provider_message_id=broadcast_provider_message_id)
db.session.commit() db.session.add(provider_message_number)
db.session.commit()
return provider_message, provider_message_number return provider_message, provider_message_number

12
tests/app/db.py
View File

@@ -63,6 +63,7 @@ from app.models import (
BroadcastMessage, BroadcastMessage,
BroadcastStatusType, BroadcastStatusType,
BroadcastEvent, BroadcastEvent,
BroadcastProvider,
BroadcastProviderMessage, BroadcastProviderMessage,
BroadcastProviderMessageNumber BroadcastProviderMessageNumber
) )
@@ -1069,9 +1070,10 @@ def create_broadcast_provider_message(
db.session.add(provider_message) db.session.add(provider_message)
db.session.commit() db.session.commit()
provider_message_number = BroadcastProviderMessageNumber( provider_message_number = None
broadcast_provider_message_id=broadcast_provider_message_id) if provider == BroadcastProvider.VODAFONE:
db.session.add(provider_message_number) provider_message_number = BroadcastProviderMessageNumber(
broadcast_provider_message_id=broadcast_provider_message_id)
db.session.commit() db.session.add(provider_message_number)
db.session.commit()
return provider_message, provider_message_number return provider_message, provider_message_number