darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-11 10:28:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Kenneth Kehl
2023-05-01 13:41:48 -07:00
parent be04edd04a
commit 0dce30bf5e
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config.py
+1 -1
View File
@@ -267,7 +267,7 @@ class Config(object):
FREE_SMS_TIER_FRAGMENT_COUNT = 250000 FREE_SMS_TIER_FRAGMENT_COUNT = 250000
DAILY_MESSAGE_LIMIT = 5000 DAILY_MESSAGE_LIMIT = 5000
TOTAL_MESSAGE_LIMIT = 7 TOTAL_MESSAGE_LIMIT = 250000
HIGH_VOLUME_SERVICE = json.loads(getenv('HIGH_VOLUME_SERVICE', '[]')) HIGH_VOLUME_SERVICE = json.loads(getenv('HIGH_VOLUME_SERVICE', '[]'))
app/models.py
+1 -2
View File
@@ -435,8 +435,7 @@ class Service(db.Model, Versioned):
onupdate=datetime.datetime.utcnow) onupdate=datetime.datetime.utcnow)
active = db.Column(db.Boolean, index=False, unique=False, nullable=False, default=True) 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) 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)
total_message_limit = db.Column(db.BigInteger, index=False, unique=False, nullable=False, default=7)
restricted = db.Column(db.Boolean, 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) 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) email_from = db.Column(db.Text, index=False, unique=True, nullable=False)
app/service/send_notification.py
-1
View File
@@ -1,4 +1,3 @@
from flask import current_app
from sqlalchemy.orm.exc import NoResultFound from sqlalchemy.orm.exc import NoResultFound
from app.config import QueueNames from app.config import QueueNames
tests/app/service/test_rest.py
+3 -3
View File
@@ -891,7 +891,7 @@ def test_update_service_permissions_will_add_service_permissions(client, sample_
auth_header = create_admin_authorization_header() auth_header = create_admin_authorization_header()
data = { data = {
'permissions': [EMAIL_TYPE, SMS_TYPE], 'permissions': [EMAIL_TYPE, SMS_TYPE]
} }
resp = client.post( resp = client.post(
@@ -1015,7 +1015,7 @@ def test_should_not_update_service_with_duplicate_name(notify_api,
email_from='another.name') email_from='another.name')
data = { data = {
'name': service_name, 'name': service_name,
'created_by': str(service.created_by.id), 'created_by': str(service.created_by.id)
} }
auth_header = create_admin_authorization_header() auth_header = create_admin_authorization_header()
@@ -1046,7 +1046,7 @@ def test_should_not_update_service_with_duplicate_email_from(notify_api,
data = { data = {
'name': service_name, 'name': service_name,
'email_from': email_from, 'email_from': email_from,
'created_by': str(service.created_by.id), 'created_by': str(service.created_by.id)
} }
auth_header = create_admin_authorization_header() auth_header = create_admin_authorization_header()
tests/conftest.py
+1
View File
@@ -88,6 +88,7 @@ def _notify_db(notify_api, worker_id):
ALEMBIC_CONFIG = os.path.join(BASE_DIR, 'migrations') ALEMBIC_CONFIG = os.path.join(BASE_DIR, 'migrations')
config = Config(ALEMBIC_CONFIG + '/alembic.ini') config = Config(ALEMBIC_CONFIG + '/alembic.ini')
config.set_main_option("script_location", ALEMBIC_CONFIG) config.set_main_option("script_location", ALEMBIC_CONFIG)
with notify_api.app_context(): with notify_api.app_context():
upgrade(config, 'head') upgrade(config, 'head')