mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-23 00:41:35 -05:00
Remove the or current_app['FROM_NUMBER'] since sms_sender is a required field.
This commit is contained in:
@@ -245,7 +245,7 @@ class Service(db.Model, Versioned):
|
||||
if self.inbound_number and self.inbound_number.active:
|
||||
return self.inbound_number.number
|
||||
else:
|
||||
return self.sms_sender or current_app.config['FROM_NUMBER']
|
||||
return self.sms_sender
|
||||
|
||||
|
||||
class InboundNumber(db.Model):
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: 0119_insert_service_sms_senders
|
||||
Revises: 0118_service_sms_senders
|
||||
Create Date: 2017-09-05 17:21:14.816199
|
||||
|
||||
"""
|
||||
import uuid
|
||||
|
||||
from alembic import op
|
||||
|
||||
revision = '0119_insert_service_sms_senders'
|
||||
down_revision = '0118_service_sms_senders'
|
||||
|
||||
|
||||
def upgrade():
|
||||
query = """SELECT id, number, service_id
|
||||
FROM inbound_numbers
|
||||
WHERE service_id is not null"""
|
||||
|
||||
conn = op.get_bind()
|
||||
results = conn.execute(query)
|
||||
res = results.fetchall()
|
||||
|
||||
for x in res:
|
||||
op.execute(
|
||||
"""
|
||||
INSERT INTO service_sms_senders
|
||||
(
|
||||
id,
|
||||
sms_sender,
|
||||
service_id,
|
||||
inbound_number_id,
|
||||
is_default,
|
||||
created_at
|
||||
)
|
||||
VALUES
|
||||
(
|
||||
'{}',
|
||||
'{}',
|
||||
'{}',
|
||||
'{}',
|
||||
True,
|
||||
now()
|
||||
)
|
||||
""".format(uuid.uuid4(), x.number, x.service_id, x.id)
|
||||
)
|
||||
|
||||
|
||||
def downgrade():
|
||||
op.execute(
|
||||
"""
|
||||
DELETE FROM service_sms_senders
|
||||
"""
|
||||
)
|
||||
Reference in New Issue
Block a user