Merge pull request #175 from umccr/dev

umccr · Nov 8, 2023 · 0ac7ab7 · 0ac7ab7
2 parents 5cd12cc + 7fc5b6c
commit 0ac7ab7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,7 +4,7 @@ Changes in this log refer only to changes that make it to the 'main' branch. and
 
 For changes in deployment, please see the [deployment changelog](deploy/cttso-ica-to-pieriandx-cdk/Changelog.md) 
 
-## 2023-11-17
+## 2023-11-07
 
 > Author: Alexis Lucattini
 > Email: [[email protected]](mailto:[email protected])

diff --git a/deploy/cttso-ica-to-pieriandx-cdk/Changelog.md b/deploy/cttso-ica-to-pieriandx-cdk/Changelog.md
@@ -3,7 +3,16 @@
 Changes in this log refer only to changes that make it to the 'main' branch and
 are nested under deploy/cttso-ica-to-pieriandx-cdk.  
 
-## 2023-11-17
+## 2023-11-08
+
+> Author: Alexis Lucattini
+> Email: [[email protected]](mailto:[email protected])
+
+### Hotfixes
+* Update date columns check (https://github.com/umccr/cttso-ica-to-pieriandx/pull/174)
+  * Resolves (https://github.com/umccr/cttso-ica-to-pieriandx/issues/173)
+
+## 2023-11-07
 
 > Author: Alexis Lucattini
 > Email: [[email protected]](mailto:[email protected])

diff --git a/...mbdas/get_metadata_from_portal_and_defaults_and_launch_validation_workflow/lambda_code.py b/...mbdas/get_metadata_from_portal_and_defaults_and_launch_validation_workflow/lambda_code.py
@@ -160,12 +160,6 @@ def lambda_handler(event, context):
         axis="columns"
     )
 
-    # Convert times to utc time and strings
-    for date_column in ["date_received", "date_collected", "date_of_birth"]:
-        sample_df[date_column] = sample_df[date_column].apply(
-            lambda x: datetime_obj_to_utc_isoformat(handle_date(x))
-        )
-
     # Assert expected values exist
     logger.info("Check we have all of the expected information")
     for expected_column in EXPECTED_ATTRIBUTES:
@@ -195,6 +189,14 @@ def lambda_handler(event, context):
             }
         )
 
+    # Convert times to utc time and strings
+    for date_column in ["date_received", "date_collected", "date_of_birth"]:
+        if date_column not in sample_df.columns.tolist():
+            continue
+        sample_df[date_column] = sample_df[date_column].apply(
+            lambda x: datetime_obj_to_utc_isoformat(handle_date(x))
+        )
+
     # Launch batch lambda function
     accession_json: Dict = sample_df.to_dict(orient="records")[0]