diff --git a/application/quality_checker/check_dos.py b/application/quality_checker/check_dos.py index bf00ff951..c98ba5942 100644 --- a/application/quality_checker/check_dos.py +++ b/application/quality_checker/check_dos.py @@ -7,8 +7,8 @@ search_for_matching_services, search_for_pharmacy_ods_codes, ) +from common.commissioned_service_type import BLOOD_PRESSURE, CONTRACEPTION, CommissionedServiceType from common.dos import DoSService -from common.service_type import BLOOD_PRESSURE, CONTRACEPTION, ServiceType logger = Logger(child=True) @@ -26,12 +26,12 @@ def check_pharmacy_profiling(connection: Connection) -> None: check_for_multiple_of_service_type(matched_services, CONTRACEPTION) -def check_incorrect_zcode_profiling(connection: Connection, service_type: ServiceType) -> None: +def check_incorrect_zcode_profiling(connection: Connection, service_type: CommissionedServiceType) -> None: """Check the palliative care profiling data quality of the dos database. Args: connection (Connection): Connection to the DoS DB. - service_type (ServiceType): Service type to check for. + service_type (CommissionedServiceType): Service type to check for. """ if incorrectly_profiled_services := search_for_incorrectly_profiled_z_code(connection, service_type): logger.info( @@ -46,12 +46,14 @@ def check_incorrect_zcode_profiling(connection: Connection, service_type: Servic ) -def check_for_multiple_of_service_type(matched_services: list[DoSService], service_type: ServiceType) -> None: +def check_for_multiple_of_service_type( + matched_services: list[DoSService], service_type: CommissionedServiceType, +) -> None: """Check for multiple of service type. Args: matched_services (list[DoSService]): List of matched services. - service_type (ServiceType): Service type to check for. + service_type (CommissionedServiceType): Service type to check for. """ matched_service_types = [service for service in matched_services if service.typeid == service_type.DOS_TYPE_ID] if len(matched_service_types) > 1: diff --git a/application/quality_checker/quality_checker.py b/application/quality_checker/quality_checker.py index 6e7ed098d..451f965bf 100644 --- a/application/quality_checker/quality_checker.py +++ b/application/quality_checker/quality_checker.py @@ -11,9 +11,9 @@ check_incorrect_zcode_profiling, check_pharmacy_profiling, ) +from common.commissioned_service_type import BLOOD_PRESSURE, CONTRACEPTION, PALLIATIVE_CARE from common.dos_db_connection import connect_to_dos_db_replica from common.middlewares import unhandled_exception_logging -from common.service_type import BLOOD_PRESSURE, CONTRACEPTION, PALLIATIVE_CARE logger = Logger() tracer = Tracer() diff --git a/application/quality_checker/search_dos.py b/application/quality_checker/search_dos.py index 89d677b75..bdd827f81 100644 --- a/application/quality_checker/search_dos.py +++ b/application/quality_checker/search_dos.py @@ -1,10 +1,10 @@ from aws_lambda_powertools.logging import Logger from psycopg import Connection +from common.commissioned_service_type import CommissionedServiceType from common.constants import DOS_ACTIVE_STATUS_ID, PHARMACY_SERVICE_TYPE_IDS from common.dos import DoSService from common.dos_db_connection import query_dos_db -from common.service_type import ServiceType logger = Logger(child=True) @@ -55,12 +55,15 @@ def search_for_matching_services(connection: Connection, odscode: str) -> list[D return services -def search_for_incorrectly_profiled_z_code(connection: Connection, service_type: ServiceType) -> list[DoSService]: +def search_for_incorrectly_profiled_z_code( + connection: Connection, + service_type: CommissionedServiceType, +) -> list[DoSService]: """Search for matching services in DoS DB using odscode. Args: connection (Connection): Connection to the DoS DB. - service_type (ServiceType): Service type to check for. + service_type (CommissionedServiceType): Service type to check for. Returns: list[DoSService]: List of matching services. diff --git a/application/quality_checker/tests/test_check_dos.py b/application/quality_checker/tests/test_check_dos.py index 7cdbd138c..3d0ff9b4e 100644 --- a/application/quality_checker/tests/test_check_dos.py +++ b/application/quality_checker/tests/test_check_dos.py @@ -1,6 +1,6 @@ from unittest.mock import MagicMock, call, patch -from application.common.service_type import BLOOD_PRESSURE, CONTRACEPTION +from application.common.commissioned_service_type import BLOOD_PRESSURE, CONTRACEPTION from application.quality_checker.check_dos import ( check_for_multiple_of_service_type, check_incorrect_zcode_profiling, diff --git a/application/quality_checker/tests/test_quality_checker.py b/application/quality_checker/tests/test_quality_checker.py index 1656e7b36..02385bda7 100644 --- a/application/quality_checker/tests/test_quality_checker.py +++ b/application/quality_checker/tests/test_quality_checker.py @@ -4,7 +4,7 @@ import pytest from aws_lambda_powertools.utilities.typing import LambdaContext -from application.common.service_type import BLOOD_PRESSURE, CONTRACEPTION, PALLIATIVE_CARE +from application.common.commissioned_service_type import BLOOD_PRESSURE, CONTRACEPTION, PALLIATIVE_CARE from application.quality_checker.quality_checker import check_dos_data_quality, lambda_handler FILE_PATH = "application.quality_checker.quality_checker" diff --git a/application/quality_checker/tests/test_search_dos.py b/application/quality_checker/tests/test_search_dos.py index 8e5804231..f735aed24 100644 --- a/application/quality_checker/tests/test_search_dos.py +++ b/application/quality_checker/tests/test_search_dos.py @@ -7,9 +7,9 @@ search_for_matching_services, search_for_pharmacy_ods_codes, ) +from common.commissioned_service_type import BLOOD_PRESSURE from common.constants import DOS_ACTIVE_STATUS_ID, PHARMACY_SERVICE_TYPE_IDS from common.dos import DoSService -from common.service_type import BLOOD_PRESSURE FILE_PATH = "application.quality_checker.search_dos"