From 007741fe4489dcafa79b0456b542bed564d19c65 Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Fri, 17 Feb 2023 14:28:43 -0500 Subject: [PATCH] remove some letter upload code --- app/dao/uploads_dao.py | 20 ----------- app/upload/rest.py | 38 ++------------------ tests/app/dao/test_uploads_dao.py | 58 +------------------------------ tests/app/service/test_rest.py | 1 - 4 files changed, 3 insertions(+), 114 deletions(-) diff --git a/app/dao/uploads_dao.py b/app/dao/uploads_dao.py index c3d525459..056c60898 100644 --- a/app/dao/uploads_dao.py +++ b/app/dao/uploads_dao.py @@ -129,23 +129,3 @@ def dao_get_uploads_by_service_id(service_id, limit_days=None, page=1, page_size ).order_by( desc("processing_started"), desc("created_at") ).paginate(page=page, per_page=page_size) - - -def dao_get_uploaded_letters_by_print_date(service_id, letter_print_date, page=1, page_size=50): - return db.session.query( - Notification, - ).join( - Template, Notification.template_id == Template.id - ).filter( - Notification.service_id == service_id, - Notification.notification_type == LETTER_TYPE, - Notification.api_key_id.is_(None), - Notification.status != NOTIFICATION_CANCELLED, - Template.hidden.is_(True), - _get_printing_day(Notification.created_at) == letter_print_date.date(), - ).order_by( - desc(Notification.created_at) - ).paginate( - page=page, - per_page=page_size, - ) diff --git a/app/upload/rest.py b/app/upload/rest.py index 30a93cd39..3dc380107 100644 --- a/app/upload/rest.py +++ b/app/upload/rest.py @@ -1,17 +1,11 @@ -from datetime import datetime - -from flask import Blueprint, abort, current_app, jsonify, request +from flask import Blueprint, current_app, jsonify, request from app.dao.fact_notification_status_dao import ( fetch_notification_statuses_for_job, ) from app.dao.jobs_dao import dao_get_notification_outcomes_for_job -from app.dao.uploads_dao import ( - dao_get_uploaded_letters_by_print_date, - dao_get_uploads_by_service_id, -) +from app.dao.uploads_dao import dao_get_uploads_by_service_id from app.errors import register_errors -from app.schemas import notification_with_template_schema from app.utils import midnight_n_days_ago, pagination_links upload_blueprint = Blueprint('upload', __name__, url_prefix='/service//upload') @@ -73,31 +67,3 @@ def get_paginated_uploads(service_id, limit_days, page): service_id=service_id ) } - - -@upload_blueprint.route('/uploaded-letters/', methods=['GET']) -def get_uploaded_letter_by_service_and_print_day(service_id, letter_print_date): - try: - letter_print_datetime = datetime.strptime(letter_print_date, '%Y-%m-%d') - except ValueError: - abort(400) - pagination = dao_get_uploaded_letters_by_print_date( - service_id, - letter_print_date=letter_print_datetime, - page=request.args.get('page', type=int), - page_size=current_app.config['PAGE_SIZE'] - ) - return jsonify({ - 'notifications': notification_with_template_schema.dump( - pagination.items, - many=True, - ), - 'page_size': pagination.per_page, - 'total': pagination.total, - 'links': pagination_links( - pagination, - '.get_uploaded_letter_by_service_and_print_day', - service_id=service_id, - letter_print_date=letter_print_date, - ), - }) diff --git a/tests/app/dao/test_uploads_dao.py b/tests/app/dao/test_uploads_dao.py index 80ba2f3e1..95887b393 100644 --- a/tests/app/dao/test_uploads_dao.py +++ b/tests/app/dao/test_uploads_dao.py @@ -2,10 +2,7 @@ from datetime import datetime, timedelta from freezegun import freeze_time -from app.dao.uploads_dao import ( - dao_get_uploaded_letters_by_print_date, - dao_get_uploads_by_service_id, -) +from app.dao.uploads_dao import dao_get_uploads_by_service_id from app.models import JOB_STATUS_IN_PROGRESS, LETTER_TYPE from tests.app.db import ( create_job, @@ -316,56 +313,3 @@ def test_get_uploads_is_paginated(sample_template): def test_get_uploads_returns_empty_list(sample_service): items = dao_get_uploads_by_service_id(sample_service.id).items assert items == [] - - -@freeze_time('2020-02-02 14:00') -def test_get_uploaded_letters_by_print_date(sample_template): - letter_template = create_uploaded_template(sample_template.service) - - # Letters for the previous day’s run - for _ in range(3): - create_uploaded_letter( - letter_template, sample_template.service, status='delivered', - created_at=datetime.utcnow().replace(day=1, hour=22, minute=29, second=59) - ) - - # Letters from yesterday that rolled into today’s run - for _ in range(30): - create_uploaded_letter( - letter_template, sample_template.service, status='delivered', - created_at=datetime.utcnow().replace(day=1, hour=22, minute=30, second=0) - ) - - # Letters that just made today’s run - for _ in range(30): - create_uploaded_letter( - letter_template, sample_template.service, status='delivered', - created_at=datetime.utcnow().replace(hour=22, minute=29, second=59) - ) - - # Letters that just missed today’s run - for _ in range(3): - create_uploaded_letter( - letter_template, sample_template.service, status='delivered', - created_at=datetime.utcnow().replace(hour=22, minute=30, second=0) - ) - - result = dao_get_uploaded_letters_by_print_date( - sample_template.service_id, - datetime.utcnow(), - ) - assert result.total == 60 - assert len(result.items) == 50 - assert result.has_next is True - assert result.has_prev is False - - result = dao_get_uploaded_letters_by_print_date( - sample_template.service_id, - datetime.utcnow(), - page=10, - page_size=2, - ) - assert result.total == 60 - assert len(result.items) == 2 - assert result.has_next is True - assert result.has_prev is True diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py index 05d043661..c82679b45 100644 --- a/tests/app/service/test_rest.py +++ b/tests/app/service/test_rest.py @@ -34,7 +34,6 @@ from app.models import ( Permission, Service, ServiceEmailReplyTo, - ServiceLetterContact, ServicePermission, ServiceSmsSender, User,