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

Fixed up dates so that we respect mills

Browse Source
This commit is contained in:
Martyn Inglis
2016-03-08 17:45:37 +00:00
parent 67c4bd2263
commit e07d16e8c6
5 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/__init__.py
View File

@@ -13,6 +13,8 @@ from app.clients.sms.firetext import FiretextClient
from app.clients.email.aws_ses import AwsSesClient
from app.encryption import Encryption
DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
db = SQLAlchemy()
ma = Marshmallow()
notify_celery = NotifyCelery()

12
app/celery/tasks.py
View File

@@ -1,4 +1,4 @@
from app import create_uuid
from app import create_uuid, DATETIME_FORMAT
from app import notify_celery, encryption, firetext_client, aws_ses_client
from app.clients.email.aws_ses import AwsSesClientException
from app.clients.sms.firetext import FiretextClientException
@@ -38,7 +38,7 @@ def process_job(job_id):
str(job.service_id),
str(create_uuid()),
encrypted,
str(datetime.utcnow())),
datetime.utcnow().strftime(DATETIME_FORMAT)),
queue='bulk-sms'
)
@@ -49,7 +49,7 @@ def process_job(job_id):
job.template.subject,
"{}@{}".format(job.service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),
encrypted,
str(datetime.utcnow())),
datetime.utcnow().strftime(DATETIME_FORMAT)),
queue='bulk-email')
finished = datetime.utcnow()
@@ -88,7 +88,7 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
service_id=service_id,
job_id=notification.get('job', None),
status=status,
created_at=created_at,
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
sent_at=sent_at,
sent_by=client.get_name()
)
@@ -158,11 +158,11 @@ def send_email(service_id, notification_id, subject, from_address, encrypted_not
service_id=service_id,
job_id=notification.get('job', None),
status=status,
created_at=created_at,
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
sent_at=sent_at,
sent_by=client.get_name()
)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_SMS)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_EMAIL)
if can_send:
try:

6
app/notifications/rest.py
View File

@@ -10,7 +10,7 @@ from flask import (
from utils.template import Template, NeededByTemplateError, NoPlaceholderForDataError
from app import api_user, encryption, create_uuid
from app import api_user, encryption, create_uuid, DATETIME_FORMAT
from app.authentication.auth import require_admin
from app.dao import (
templates_dao,
@@ -178,7 +178,7 @@ def send_notification(notification_type):
service_id,
notification_id,
encryption.encrypt(notification),
str(datetime.utcnow())
datetime.utcnow().strftime(DATETIME_FORMAT)
), queue='sms')
else:
if service.restricted and notification['to'] not in [user.email_address for user in service.users]:
@@ -190,6 +190,6 @@ def send_notification(notification_type):
template.subject,
"{}@{}".format(service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),
encryption.encrypt(notification),
str(datetime.utcnow())
datetime.utcnow().strftime(DATETIME_FORMAT)
), queue='email')
return jsonify({'notification_id': notification_id}), 201