[NDR-315] Some more tidy up

Author: jameslinnell

lambdas/services/upload_document_reference_service.py

@@ -374,8 +374,13 @@ def copy_files_from_staging_bucket(
         """Copy files from staging bucket to destination bucket"""
         try:
             logger.info("Copying files from staging bucket")
-            dest_file_key = f"{document_reference.nhs_number}/{document_reference.id}"
-            if self.doc_type.code != SnomedCodes.PATIENT_DATA.value.code:
+
+            if self.doc_type.code == SnomedCodes.PATIENT_DATA.value.code:
+                dest_file_key = (
+                    f"{document_reference.nhs_number}/{document_reference.id}"
+                )
+                document_reference.s3_file_key = dest_file_key
+            else:
                 dest_file_key = document_reference.s3_file_key
 
             copy_result = self.s3_service.copy_across_bucket(
@@ -384,8 +389,6 @@ def copy_files_from_staging_bucket(
                 dest_bucket=self.destination_bucket_name,
                 dest_file_key=dest_file_key,
             )
-            if self.doc_type.code == SnomedCodes.PATIENT_DATA.value.code:
-                document_reference.s3_file_key = dest_file_key
             document_reference.s3_bucket_name = self.destination_bucket_name
             document_reference.file_location = document_reference._build_s3_location(
                 self.destination_bucket_name, dest_file_key