darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

disable cache until we can fix on cloud deployment

Browse Source
This commit is contained in:
James Moffet
2022-07-26 11:17:43 -07:00
parent e6b36becf1
commit 4c25a81004
11 changed files with 88 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/main/views/platform_admin.py
View File

@@ -3,7 +3,7 @@ import re
from collections import OrderedDict
from datetime import datetime
from flask import abort, flash, redirect, render_template, request, url_for
from flask import abort, flash, redirect, render_template, request, url_for, current_app
from notifications_python_client.errors import HTTPError
from app import (
@@ -460,12 +460,13 @@ def platform_admin_returned_letters():
try:
letter_jobs_client.submit_returned_letters(references)
redis_client.delete_by_pattern(
'service-????????-????-????-????-????????????-returned-letters-statistics'
)
redis_client.delete_by_pattern(
'service-????????-????-????-????-????????????-returned-letters-summary'
)
if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']:
redis_client.delete_by_pattern(
'service-????????-????-????-????-????????????-returned-letters-statistics'
)
redis_client.delete_by_pattern(
'service-????????-????-????-????-????????????-returned-letters-summary'
)
except HTTPError as error:
if error.status_code == 400:
error_references = [
@@ -538,10 +539,13 @@ def clear_cache():
groups = map(CACHE_KEYS.get, group_keys)
patterns = list(itertools.chain(*groups))
num_deleted = sum(
redis_client.delete_by_pattern(pattern)
for pattern in patterns
)
if current_app.config['NOTIFY_ADMIN_API_CACHE_ENABLED']:
num_deleted = sum(
redis_client.delete_by_pattern(pattern)
for pattern in patterns
)
else:
num_deleted = 0
msg = (
f'Removed {num_deleted} objects '

32
app/main/views/send.py
View File

@@ -598,12 +598,14 @@ def send_from_contact_list(service_id, template_id, contact_list_id):
def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_pdf=False):
current_app.logger.info('Running _check_messages')
try:
# The happy path is that the job doesn’t already exist, so the
# API will return a 404 and the client will raise HTTPError.
current_app.logger.info('Requesting job from api with upload_id/job_id: {}'.format(upload_id))
job_api_client.get_job(service_id, upload_id)
current_app.logger.info('Job already exists for upload_id/job_id: {}, sending 302'.format(upload_id))
# the job exists already - so go back to the templates page
# If we just return a `redirect` (302) object here, we'll get
# errors when we try and unpack in the check_messages route.
@@ -614,15 +616,25 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
template_id=template_id
))
except HTTPError as e:
current_app.logger.info('Job does not exist for upload_id/job_id: {}'.format(upload_id))
if e.status_code != 404:
current_app.logger.info('Expected 404 when fetching job with upload_id/job_id: {}, instead got: {}'.format(upload_id, e.status_code))
raise
current_app.logger.info('_check_messages is now evaluating uploaded file')
notification_count = service_api_client.get_notification_count(service_id)
current_app.logger.info('_check_messages notification_count is {}'.format(notification_count))
remaining_messages = (current_service.message_limit - notification_count)
current_app.logger.info('_check_messages remaining_messages is {}'.format(remaining_messages))
contents = s3download(service_id, upload_id)
current_app.logger.info('_check_messages obtained file contents' )
db_template = current_service.get_template_with_user_permission_or_403(template_id, current_user)
current_app.logger.info('_check_messages got db template with type: {}'.format(db_template['template_type']))
email_reply_to = None
sms_sender = None
@@ -631,6 +643,8 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
elif db_template['template_type'] == 'sms':
sms_sender = get_sms_sender_from_session()
current_app.logger.info('_check_messages creating template from db_template')
template = get_template(
db_template,
current_service,
@@ -650,6 +664,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
# recalculate the page count once we have the values
page_count=get_page_count_for_letter(db_template),
)
current_app.logger.info('_check_messages creating recipients from file contents')
recipients = RecipientCSV(
contents,
template=template,
@@ -681,8 +696,11 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
page_count = get_page_count_for_letter(db_template, template.values)
template.page_count = page_count
current_app.logger.info('_check_messages getting csv metadata')
original_file_name = get_csv_metadata(service_id, upload_id).get('original_file_name', '')
current_app.logger.info('_check_messages returning dict')
return dict(
recipients=recipients,
template=template,
@@ -720,7 +738,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
)
@user_has_permissions('send_messages', restrict_admin_usage=True)
def check_messages(service_id, template_id, upload_id, row_index=2):
current_app.logger.info('Check messages, getting data from upload with id {}'.format(upload_id))
data = _check_messages(service_id, template_id, upload_id, row_index)
data['allowed_file_extensions'] = Spreadsheet.ALLOWED_FILE_EXTENSIONS
@@ -732,17 +750,21 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
or data['recipients'].missing_column_headers
or data['sent_previously']
):
current_app.logger.info('Found column errors in upload')
return render_template('views/check/column-errors.html', **data)
if data['row_errors']:
current_app.logger.info('Found row errors in upload')
return render_template('views/check/row-errors.html', **data)
if (
data['errors']
or data['trying_to_send_letters_in_trial_mode']
):
current_app.logger.info('Found other errors in upload')
return render_template('views/check/column-errors.html', **data)
current_app.logger.info('Writing upload metadata')
metadata_kwargs = {
'notification_count': data['count_of_recipients'],
'template_id': template_id,
@@ -754,8 +776,10 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
# sender_id is not an option for sending letters.
metadata_kwargs['sender_id'] = session['sender_id']
current_app.logger.info('Setting upload metadata')
set_metadata_on_csv_upload(service_id, upload_id, **metadata_kwargs)
current_app.logger.info('Returning 200 from check messages')
return render_template('views/check/ok.html', **data)
@@ -769,11 +793,13 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
)
@user_has_permissions('send_messages')
def check_messages_preview(service_id, template_id, upload_id, filetype, row_index=2):
current_app.logger.info('Check messages preview, checking filetype')
if filetype == 'pdf':
page = None
elif filetype == 'png':
page = request.args.get('page', 1)
else:
current_app.logger.info('Check messages preview, filetype is neither pdf nor png, so we return 404')
abort(404)
template = _check_messages(