common.clients

Author: JamesW1-NHS

lambdas/batch_processor_filter/src/batch_file_repository.py

@@ -3,9 +3,8 @@
 from csv import writer
 from io import BytesIO, StringIO
 
-import boto3
-
 from batch_file_created_event import BatchFileCreatedEvent
+from common.clients import get_s3_client
 from constants import ACK_BUCKET_NAME, SOURCE_BUCKET_NAME
 
 
@@ -17,7 +16,7 @@ class BatchFileRepository:
     _ACK_BUCKET_NAME: str = ACK_BUCKET_NAME
 
     def __init__(self):
-        self._s3_client = boto3.client("s3")
+        self._s3_client = get_s3_client()
 
     @staticmethod
     def _create_ack_failure_data(
@@ -38,6 +37,7 @@ def _create_ack_failure_data(
             "MESSAGE_DELIVERY": False,
         }
 
+    # TODO: can refactor to move_file()
     def move_source_file_to_archive(self, file_key: str) -> None:
         self._s3_client.copy_object(
             Bucket=self._SOURCE_BUCKET_NAME,

lambdas/batch_processor_filter/src/batch_processor_filter_service.py

@@ -7,7 +7,7 @@
 from batch_audit_repository import BatchAuditRepository
 from batch_file_created_event import BatchFileCreatedEvent
 from batch_file_repository import BatchFileRepository
-from common.clients import logger
+from common.clients import logger, get_sqs_client
 from common.log_firehose import send_log_to_firehose
 from constants import QUEUE_URL, REGION_NAME, FileNotProcessedReason, FileStatus
 from exceptions import EventAlreadyProcessingForSupplierAndVaccTypeError
@@ -26,7 +26,7 @@ def __init__(
     ):
         self._batch_audit_repository = audit_repo
         self._batch_file_repo = batch_file_repo
-        self._queue_client = boto3.client("sqs", region_name=REGION_NAME)
+        self._queue_client = get_sqs_client()
 
     def _is_duplicate_file(self, file_key: str) -> bool:
         """Checks if a file with the same name has already been processed or marked for processing"""