From 2952b709309a23de5349f11cbdbf798adfb467bd Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Fri, 4 Dec 2020 17:45:23 +0000 Subject: [PATCH] Only create sequential numbers for Vodafone messages --- app/celery/broadcast_message_tasks.py | 4 +++- app/dao/broadcast_message_dao.py | 12 +++++++----- tests/app/db.py | 12 +++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/celery/broadcast_message_tasks.py b/app/celery/broadcast_message_tasks.py index 0cdc2800a..ce80ea54f 100644 --- a/app/celery/broadcast_message_tasks.py +++ b/app/celery/broadcast_message_tasks.py @@ -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_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( f'invoking cbc proxy to send ' diff --git a/app/dao/broadcast_message_dao.py b/app/dao/broadcast_message_dao.py index e79f0a8f8..5332b420d 100644 --- a/app/dao/broadcast_message_dao.py +++ b/app/dao/broadcast_message_dao.py @@ -5,6 +5,7 @@ from app.dao.dao_utils import transactional from app.models import ( BroadcastMessage, BroadcastEvent, + BroadcastProvider, BroadcastProviderMessage, BroadcastProviderMessageNumber, BroadcastProviderMessageStatus @@ -53,9 +54,10 @@ def create_broadcast_provider_message(broadcast_event, provider): ) db.session.add(provider_message) db.session.commit() - - provider_message_number = BroadcastProviderMessageNumber( - broadcast_provider_message_id=broadcast_provider_message_id) - db.session.add(provider_message_number) - db.session.commit() + provider_message_number = None + if provider == BroadcastProvider.VODAFONE: + provider_message_number = BroadcastProviderMessageNumber( + broadcast_provider_message_id=broadcast_provider_message_id) + db.session.add(provider_message_number) + db.session.commit() return provider_message, provider_message_number diff --git a/tests/app/db.py b/tests/app/db.py index 4dd2ec9d1..8208fee49 100644 --- a/tests/app/db.py +++ b/tests/app/db.py @@ -63,6 +63,7 @@ from app.models import ( BroadcastMessage, BroadcastStatusType, BroadcastEvent, + BroadcastProvider, BroadcastProviderMessage, BroadcastProviderMessageNumber ) @@ -1069,9 +1070,10 @@ def create_broadcast_provider_message( db.session.add(provider_message) db.session.commit() - provider_message_number = BroadcastProviderMessageNumber( - broadcast_provider_message_id=broadcast_provider_message_id) - db.session.add(provider_message_number) - - db.session.commit() + provider_message_number = None + if provider == BroadcastProvider.VODAFONE: + provider_message_number = BroadcastProviderMessageNumber( + broadcast_provider_message_id=broadcast_provider_message_id) + db.session.add(provider_message_number) + db.session.commit() return provider_message, provider_message_number