mirror of
https://github.com/GSA/notifications-api.git
synced 2026-09-10 01:56:03 -04:00
cleanup
This commit is contained in:
@@ -267,7 +267,7 @@ class Config(object):
|
||||
FREE_SMS_TIER_FRAGMENT_COUNT = 250000
|
||||
|
||||
DAILY_MESSAGE_LIMIT = 5000
|
||||
TOTAL_MESSAGE_LIMIT = 7
|
||||
TOTAL_MESSAGE_LIMIT = 250000
|
||||
|
||||
HIGH_VOLUME_SERVICE = json.loads(getenv('HIGH_VOLUME_SERVICE', '[]'))
|
||||
|
||||
|
||||
@@ -435,8 +435,7 @@ class Service(db.Model, Versioned):
|
||||
onupdate=datetime.datetime.utcnow)
|
||||
active = db.Column(db.Boolean, index=False, unique=False, nullable=False, default=True)
|
||||
message_limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False)
|
||||
# TODO nullable if we are adding it late?
|
||||
total_message_limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=7)
|
||||
total_message_limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False)
|
||||
restricted = db.Column(db.Boolean, index=False, unique=False, nullable=False)
|
||||
research_mode = db.Column(db.Boolean, index=False, unique=False, nullable=False, default=False)
|
||||
email_from = db.Column(db.Text, index=False, unique=True, nullable=False)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from flask import current_app
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
from app.config import QueueNames
|
||||
|
||||
@@ -891,7 +891,7 @@ def test_update_service_permissions_will_add_service_permissions(client, sample_
|
||||
auth_header = create_admin_authorization_header()
|
||||
|
||||
data = {
|
||||
'permissions': [EMAIL_TYPE, SMS_TYPE],
|
||||
'permissions': [EMAIL_TYPE, SMS_TYPE]
|
||||
}
|
||||
|
||||
resp = client.post(
|
||||
@@ -1015,7 +1015,7 @@ def test_should_not_update_service_with_duplicate_name(notify_api,
|
||||
email_from='another.name')
|
||||
data = {
|
||||
'name': service_name,
|
||||
'created_by': str(service.created_by.id),
|
||||
'created_by': str(service.created_by.id)
|
||||
}
|
||||
|
||||
auth_header = create_admin_authorization_header()
|
||||
@@ -1046,7 +1046,7 @@ def test_should_not_update_service_with_duplicate_email_from(notify_api,
|
||||
data = {
|
||||
'name': service_name,
|
||||
'email_from': email_from,
|
||||
'created_by': str(service.created_by.id),
|
||||
'created_by': str(service.created_by.id)
|
||||
}
|
||||
|
||||
auth_header = create_admin_authorization_header()
|
||||
|
||||
@@ -88,6 +88,7 @@ def _notify_db(notify_api, worker_id):
|
||||
ALEMBIC_CONFIG = os.path.join(BASE_DIR, 'migrations')
|
||||
config = Config(ALEMBIC_CONFIG + '/alembic.ini')
|
||||
config.set_main_option("script_location", ALEMBIC_CONFIG)
|
||||
|
||||
with notify_api.app_context():
|
||||
upgrade(config, 'head')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user