[PRMP-1495] - Fix stitching for all records not 1of1 (#1116)

Author: MohammadIqbalAD-NHS

lambdas/services/document_service.py

@@ -172,10 +172,15 @@ def get_nhs_numbers_based_on_ods_code(
     ) -> list[str]:
         """Get unique NHS numbers for patients with given ODS code."""
         table_name = table_name or self.table_name
-        filter_expression = Attr("Author").eq(ods_code) & Attr("FileName").begins_with(
-            "2of",
-        )
         projection_expression = "NhsNumber"
+        if ods_code == "ALL":
+            filter_expression = Attr("FileName").begins_with(
+                "2of",
+            )
+        else:
+            filter_expression = Attr("Author").eq(ods_code) & Attr("FileName").begins_with(
+                "2of",
+            )
 
         logger.info("Starting scan of table for NHS numbers based on ODS code...")
         results = self.dynamo_service.scan_whole_table(

lambdas/services/pdf_stitching_service.py

@@ -59,7 +59,7 @@ def retrieve_multipart_references(
         )
 
         if doc_type == SupportedDocumentTypes.LG:
-            if any("1of1" in result.file_name for result in document_references):
+            if any("1of1_" in result.file_name for result in document_references):
                 logger.error(
                     "There is already a stitched LG document reference present in DynamoDb"
                 )

lambdas/services/virus_scan_result_service.py

@@ -117,13 +117,16 @@ def get_new_access_token(self):
             self.access_token = response.json()["accessToken"]
 
             self.update_ssm_access_token(self.access_token)
-        except Exception as e:
-            # ignore TooManyRequests exception as it will be handled by the retry mechanism in request_virus_scan
+        except ClientError as e:
+            # ignore TooManyRequests error as it will be handled by the retry mechanism in request_virus_scan
             # this is to prevent a scenario where multiple concurrent Lambda executions all attempt to refresh the token at the same time, 
             # resulting in a flood of requests to the token endpoint and subsequent failures. By ignoring the TooManyRequests exception, 
             # we allow the retry mechanism to handle the situation gracefully without overwhelming the token service.
-            if str(e).find("TooManyRequests") != -1:
+            if "TooManyRequests" in str(e):
+                logger.info("Failed to store token in SSM, too many requests, starting retry")
                 return
+            
+        except Exception as e:
             logger.error(
                 f"{LambdaError.VirusScanNoToken.to_str()}: {str(e)}",
                 {"Result": FAIL_SCAN},