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

Refactor the sms sender code to remove any unused methods.

Browse Source 
Refactor tests/db/create_service() to behave more like the real world.
Created new create_service_with_inbound_number and create_service_with_defined_sms_sender() test/db methods.
This commit is contained in:
Rebecca Law
2017-11-07 14:26:18 +00:00
parent 430342b567
commit 0054361044
15 changed files with 224 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/dao/services_dao.py
View File

@@ -159,8 +159,6 @@ def dao_create_service(service, user, service_id=None, service_permissions=None)
# the default property does not appear to work when there is a difference between the sqlalchemy schema and the
# db schema (ie: during a migration), so we have to set sms_sender manually here. After the GOVUK sms_sender
# migration is completed, this code should be able to be removed.
if not service.sms_sender:
service.sms_sender = current_app.config['FROM_NUMBER']
if service_permissions is None:
service_permissions = DEFAULT_SERVICE_PERMISSIONS
@@ -179,7 +177,8 @@ def dao_create_service(service, user, service_id=None, service_permissions=None)
service_permission = ServicePermission(service_id=service.id, permission=permission)
service.permissions.append(service_permission)
insert_service_sms_sender(service, service.sms_sender)
# do we just add the default - or will we get a value from FE?
insert_service_sms_sender(service, current_app.config['FROM_NUMBER'])
dao_insert_annual_billing(service)
db.session.add(service)