From 8444b7669094ab9d4528eb63bdcb03312403dd3a Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Fri, 9 Aug 2024 09:18:58 -0700 Subject: [PATCH] fix flake8 --- app/dao/provider_details_dao.py | 2 +- app/notifications/rest.py | 3 +-- app/service/send_notification.py | 3 +-- app/v2/notifications/post_notifications.py | 2 +- tests/app/dao/test_provider_details_dao.py | 2 -- tests/app/service/send_notification/test_send_notification.py | 2 +- .../send_notification/test_send_one_off_notification.py | 2 -- 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/dao/provider_details_dao.py b/app/dao/provider_details_dao.py index 9b6b3b726..b0ab48d09 100644 --- a/app/dao/provider_details_dao.py +++ b/app/dao/provider_details_dao.py @@ -1,7 +1,7 @@ from datetime import datetime from flask import current_app -from sqlalchemy import asc, desc, func +from sqlalchemy import desc, func from app import db from app.dao.dao_utils import autocommit diff --git a/app/notifications/rest.py b/app/notifications/rest.py index af1cd3ca4..43224f0e7 100644 --- a/app/notifications/rest.py +++ b/app/notifications/rest.py @@ -2,9 +2,8 @@ from flask import Blueprint, current_app, jsonify, request from app import api_user, authenticated_service from app.aws.s3 import get_personalisation_from_s3, get_phone_number_from_s3 -from app.config import QueueNames from app.dao import notifications_dao -from app.enums import KeyType, NotificationType, TemplateProcessType +from app.enums import KeyType, NotificationType from app.errors import InvalidRequest, register_errors from app.notifications.process_notifications import ( persist_notification, diff --git a/app/service/send_notification.py b/app/service/send_notification.py index 62628b1c4..6e29c0e59 100644 --- a/app/service/send_notification.py +++ b/app/service/send_notification.py @@ -1,12 +1,11 @@ from sqlalchemy.orm.exc import NoResultFound -from app.config import QueueNames from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id from app.dao.services_dao import dao_fetch_service_by_id from app.dao.templates_dao import dao_get_template_by_id_and_service_id from app.dao.users_dao import get_user_by_id -from app.enums import KeyType, NotificationType, TemplateProcessType +from app.enums import KeyType, NotificationType from app.errors import BadRequestError from app.notifications.process_notifications import ( persist_notification, diff --git a/app/v2/notifications/post_notifications.py b/app/v2/notifications/post_notifications.py index eb1457d0a..b006b57f5 100644 --- a/app/v2/notifications/post_notifications.py +++ b/app/v2/notifications/post_notifications.py @@ -8,7 +8,7 @@ from app import api_user, authenticated_service, document_download_client, encry from app.celery.tasks import save_api_email, save_api_sms from app.clients.document_download import DocumentDownloadError from app.config import QueueNames -from app.enums import KeyType, NotificationStatus, NotificationType, TemplateProcessType +from app.enums import KeyType, NotificationStatus, NotificationType from app.models import Notification from app.notifications.process_notifications import ( persist_notification, diff --git a/tests/app/dao/test_provider_details_dao.py b/tests/app/dao/test_provider_details_dao.py index 5a6f5c218..fd8f4a43d 100644 --- a/tests/app/dao/test_provider_details_dao.py +++ b/tests/app/dao/test_provider_details_dao.py @@ -2,7 +2,6 @@ from datetime import datetime, timedelta import pytest from freezegun import freeze_time -from sqlalchemy.sql import desc from app import notification_provider_clients from app.dao.provider_details_dao import ( @@ -15,7 +14,6 @@ from app.dao.provider_details_dao import ( ) from app.enums import NotificationType, TemplateType from app.models import ProviderDetails, ProviderDetailsHistory -from app.utils import utc_now from tests.app.db import create_ft_billing, create_service, create_template from tests.conftest import set_config diff --git a/tests/app/service/send_notification/test_send_notification.py b/tests/app/service/send_notification/test_send_notification.py index 464077bf0..dcd6cc8e7 100644 --- a/tests/app/service/send_notification/test_send_notification.py +++ b/tests/app/service/send_notification/test_send_notification.py @@ -11,7 +11,7 @@ from app.dao import notifications_dao from app.dao.api_key_dao import save_model_api_key from app.dao.services_dao import dao_update_service from app.dao.templates_dao import dao_get_all_templates_for_service, dao_update_template -from app.enums import KeyType, NotificationType, TemplateProcessType, TemplateType +from app.enums import KeyType, NotificationType, TemplateType from app.errors import InvalidRequest, RateLimitError from app.models import ApiKey, Notification, NotificationHistory, Template from app.service.send_notification import send_one_off_notification diff --git a/tests/app/service/send_notification/test_send_one_off_notification.py b/tests/app/service/send_notification/test_send_one_off_notification.py index 889a3e0c1..78ab0977e 100644 --- a/tests/app/service/send_notification/test_send_one_off_notification.py +++ b/tests/app/service/send_notification/test_send_one_off_notification.py @@ -3,14 +3,12 @@ from unittest.mock import Mock import pytest -from app.config import QueueNames from app.dao.service_guest_list_dao import dao_add_and_commit_guest_list_contacts from app.enums import ( KeyType, NotificationType, RecipientType, ServicePermissionType, - TemplateProcessType, TemplateType, ) from app.errors import BadRequestError