Merge pull request #661 from Health-Informatics-UoN/fix/null-data-dic…

…tionary Fix Scan Report upload without data dictionary
Health-Informatics-UoN · Apr 1, 2024 · 9f9d34e · 9f9d34e
2 parents 91452ce + 45dd365
commit 9f9d34e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/workers/shared_code/api.py b/app/workers/shared_code/api.py
@@ -24,7 +24,7 @@
 class ScanReportStatus(Enum):
     UPLOAD_IN_PROGRESS = "UPINPRO"
     UPLOAD_COMPLETE = "UPCOMPL"
-    UPLOAD_FAILED = "UPFAIL"
+    UPLOAD_FAILED = "UPFAILE"
     PENDING = "PENDING"
     COMPLETE = "COMPLET"
 

diff --git a/app/workers/shared_code/blob_parser.py b/app/workers/shared_code/blob_parser.py
@@ -2,7 +2,7 @@
 import logging
 import os
 from io import BytesIO
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import openpyxl
 from azure.storage.blob import BlobServiceClient
@@ -123,16 +123,18 @@ def get_scan_report(blob: str) -> openpyxl.Workbook:
 
 def get_data_dictionary(
     blob: str,
-) -> Tuple[Dict[str, Dict[str, Any]], Dict[str, Dict[str, Any]]]:
+) -> Tuple[Optional[Dict[str, Dict[str, Any]]], Optional[Dict[str, Dict[str, Any]]]]:
     """
     Retrieves the data dictionary and vocabulary dictionary from a blob storage.
 
     Args:
         blob (str): The name of the blob containing the data dictionary.
 
     Returns:
-        Tuple[Dict[Any, Any], Dict[Any, Any]]: A tuple containing the data dictionary and vocabulary dictionary.
+        Tuple[Optional[Dict[str, Dict[str, Any]]], Optional[Dict[str, Dict[str, Any]]]]: A tuple containing the data dictionary and vocabulary dictionary.
     """
+    if blob == "None":
+        return None, None
 
     # Set Storage Account connection string
     blob_service_client = BlobServiceClient.from_connection_string(