[PRMT-71] - removed commented code

Author: PedroSoaresNHS

lambdas/services/generate_document_manifest_zip_service.py

@@ -20,25 +20,15 @@ class DocumentManifestZipService:
     def __init__(self, zip_trace: DocumentManifestZipTrace):
         self.s3_service = S3Service()
         self.dynamo_service = DynamoDBService()
-        # self.temp_output_dir = tempfile.mkdtemp()
-        # self.temp_downloads_dir = tempfile.mkdtemp()
         self.zip_trace_object = zip_trace
         self.zip_output_bucket = os.environ["ZIPPED_STORE_BUCKET_NAME"]
         self.zip_trace_table = os.environ["ZIPPED_STORE_DYNAMODB_NAME"]
         self.zip_file_name = f"patient-record-{zip_trace.job_id}.zip"
-        # self.zip_file_path = os.path.join(self.temp_output_dir, self.zip_file_name)
 
     def handle_zip_request(self):
         self.update_processing_status()
-        # self.download_documents_to_be_zipped()
-        # Stream and zip the documents in memory
         zip_buffer = self.stream_zip_documents()
-        # Upload the zip file to S3
         self.upload_zip_file(zip_buffer)
-
-        # self.zip_files()
-        # self.upload_zip_file()
-        # self.cleanup_temp_files()
         self.update_dynamo_with_fields({"job_status", "zip_file_location"})
 
     def stream_zip_documents(self) -> io.BytesIO:
@@ -87,27 +77,6 @@ def stream_zip_documents(self) -> io.BytesIO:
                 status_code=500, error=LambdaError.ZipCreationError
             )
 
-    # def download_documents_to_be_zipped(self):
-    #     logger.info("Downloading documents to be zipped")
-    #     documents = self.zip_trace_object.files_to_download
-    #     for document_location, document_name in documents.items():
-    #         self.download_file_from_s3(document_name, document_location)
-    #
-    # def download_file_from_s3(self, document_name: str, document_location: str):
-    #     download_path = os.path.join(self.temp_downloads_dir, document_name)
-    #     file_bucket, file_key = self.get_file_bucket_and_key(document_location)
-    #     try:
-    #         self.s3_service.download_file(file_bucket, file_key, download_path)
-    #     except ClientError as e:
-    #         self.update_failed_status()
-    #         msg = f"{file_key} may reference missing file in s3 bucket: {file_bucket}"
-    #         logger.error(
-    #             f"{LambdaError.ZipServiceClientError.to_str()} {msg + str(e)}",
-    #             {"Result": "Failed to create document manifest"},
-    #         )
-    #         raise GenerateManifestZipException(
-    #             status_code=500, error=LambdaError.ZipServiceClientError
-
     def get_file_bucket_and_key(self, file_location: str):
         try:
             file_bucket, file_key = file_location.replace("s3://", "").split("/", 1)
@@ -140,36 +109,6 @@ def upload_zip_file(self, zip_buffer: io.BytesIO):
 
         self.zip_trace_object.job_status = TraceStatus.COMPLETED
 
-    # def upload_zip_file(self):
-    #     logger.info("Uploading zip file to s3")
-    #     self.zip_trace_object.zip_file_location = (
-    #         f"s3://{self.zip_output_bucket}/{self.zip_file_name}"
-    #     )
-    #
-    #     try:
-    #         self.s3_service.upload_file(
-    #             file_name=self.zip_file_path,
-    #             s3_bucket_name=self.zip_output_bucket,
-    #             file_key=f"{self.zip_file_name}",
-    #         )
-    #     except ClientError as e:
-    #         self.update_failed_status()
-    #         logger.error(e, {"Result": "Failed to create document manifest"})
-    #         raise GenerateManifestZipException(
-    #             status_code=500, error=LambdaError.ZipServiceClientError
-    #         )
-    #
-    #     self.zip_trace_object.job_status = TraceStatus.COMPLETED
-
-    # def zip_files(self):
-    #     logger.info("Creating zip from files")
-    #     with zipfile.ZipFile(self.zip_file_path, "w", zipfile.ZIP_DEFLATED) as zipf:
-    #         for root, _, files in os.walk(self.temp_downloads_dir):
-    #             for file in files:
-    #                 file_path = os.path.join(root, file)
-    #                 arc_name = os.path.relpath(file_path, self.temp_downloads_dir)
-    #                 zipf.write(file_path, arc_name)
-
     def update_dynamo_with_fields(self, fields: set):
         logger.info("Writing zip trace to db")
         self.dynamo_service.update_item(
@@ -187,7 +126,3 @@ def update_processing_status(self):
     def update_failed_status(self):
         self.zip_trace_object.job_status = TraceStatus.FAILED
         self.update_dynamo_with_fields({"job_status"})
-
-    # def cleanup_temp_files(self):
-    #     shutil.rmtree(self.temp_downloads_dir)
-    #     shutil.rmtree(self.temp_output_dir)

lambdas/tests/unit/services/test_generate_document_manifest_zip_service.py

@@ -20,9 +20,6 @@
     TEST_UUID,
 )
 
-# from unittest.mock import call
-
-
 TEST_TIME = "2024-07-02T15:00:00.000000Z"
 TEST_DYNAMO_RESPONSE = {
     "ID": TEST_UUID,
@@ -48,11 +45,8 @@ def mock_service(mocker, set_env, mock_temp_folder):
 
 
 @pytest.fixture
-def mock_s3_service(mock_service, mocker):
-    mock_s3_service = mock_service.s3_service
-    # mocker.patch.object(mock_s3_service, "download_file")
-    # mocker.patch.object(mock_s3_service, "upload_file")
-    yield mock_s3_service
+def mock_s3_service(mock_service):
+    yield mock_service.s3_service
 
 
 @pytest.fixture
@@ -77,48 +71,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
     return _stream_context_manager
 
 
-# def test_download_documents_to_be_zipped(mocker, mock_service):
-#     mock_service.download_file_from_s3 = mocker.MagicMock()
-#     mock_service.download_documents_to_be_zipped()
-#
-#     calls = [
-#         call(TEST_FILE_NAME, TEST_DOCUMENT_LOCATION),
-#         call(f"{TEST_FILE_KEY}2", f"{TEST_DOCUMENT_LOCATION}2"),
-#     ]
-#
-#     mock_service.download_file_from_s3.assert_has_calls(calls)
-
-
-# def test_download_file_from_s3(mock_service, mock_s3_service):
-#     mock_service.download_file_from_s3(TEST_FILE_NAME, TEST_DOCUMENT_LOCATION)
-#
-#     mock_s3_service.download_file.assert_called_once_with(
-#         MOCK_BUCKET,
-#         TEST_FILE_KEY,
-#         f"{mock_service.temp_downloads_dir}/{TEST_FILE_NAME}",
-#     )
-#     assert mock_service.zip_trace_object.job_status != TraceStatus.FAILED
-#
-#
-# def test_download_file_from_s3_raises_exception(mock_service, mock_s3_service):
-#     mock_s3_service.download_file.side_effect = ClientError(
-#         {"Error": {"Code": "500", "Message": "test error"}}, "testing"
-#     )
-#
-#     with pytest.raises(GenerateManifestZipException) as e:
-#         mock_service.download_file_from_s3(TEST_FILE_NAME, TEST_DOCUMENT_LOCATION)
-#
-#     mock_s3_service.download_file.assert_called_once_with(
-#         MOCK_BUCKET,
-#         TEST_FILE_KEY,
-#         f"{mock_service.temp_downloads_dir}/{TEST_FILE_NAME}",
-#     )
-#     assert e.value == GenerateManifestZipException(
-#         500, LambdaError.ZipServiceClientError
-#     )
-#     assert mock_service.zip_trace_object.job_status == TraceStatus.FAILED
-
-
 def test_get_file_bucket_and_key_returns_correct_items(mock_service):
     zip_trace_object = mock_service.zip_trace_object
     documents = zip_trace_object.files_to_download