exclude records from update if there is no applicant (#1366)

bcgov · Jan 31, 2024 · 0b1b99f · 0b1b99f
1 parent 0ed0f07
commit 0b1b99f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/bin/migrate-oats-data/applications/submissions/application_applicant_on_submissions.py b/bin/migrate-oats-data/applications/submissions/application_applicant_on_submissions.py
@@ -86,20 +86,27 @@ def _update_records(conn, batch_size, cursor, rows):
 def _prepare_data(rows):
     data_list = []
     for row in rows:
-        data_list.append(_map_data(row))
+        parsed_data = _map_data(row)
+        if parsed_data:
+            data_list.append(parsed_data)
 
     return data_list
 
 
 def _map_data(row):
     applicant = (
-        row.get("last_name") if row.get("last_name") else row.get("organization_name")
+        row.get("last_name")
+        if row.get("last_name", None)
+        else row.get("organization_name", None)
     )
 
-    if applicant and row.get("owner_count_extension"):
-        applicant = f"{applicant} {row.get('owner_count_extension')}"
+    if applicant:
+        if row.get("owner_count_extension"):
+            applicant = f"{applicant} {row.get('owner_count_extension')}"
 
-    return {"applicant": applicant, "submission_uuid": row["submission_uuid"]}
+        return {"applicant": applicant, "submission_uuid": row["submission_uuid"]}
+
+    return None
 
 
 _update_query = """

diff --git a/...e-oats-data/noi/notice_of_intent_submissions/notice_of_intent_applicant_on_submissions.py b/...e-oats-data/noi/notice_of_intent_submissions/notice_of_intent_applicant_on_submissions.py
@@ -86,20 +86,27 @@ def _update_records(conn, batch_size, cursor, rows):
 def _prepare_data(rows):
     data_list = []
     for row in rows:
-        data_list.append(_map_data(row))
+        parsed_data = _map_data(row)
+        if parsed_data:
+            data_list.append(parsed_data)
 
     return data_list
 
 
 def _map_data(row):
     applicant = (
-        row.get("last_name") if row.get("last_name") else row.get("organization_name")
+        row.get("last_name")
+        if row.get("last_name", None)
+        else row.get("organization_name", None)
     )
 
-    if applicant and row.get("owner_count_extension"):
-        applicant = f"{applicant} {row.get('owner_count_extension')}"
+    if applicant:
+        if row.get("owner_count_extension"):
+            applicant = f"{applicant} {row.get('owner_count_extension')}"
 
-    return {"applicant": applicant, "submission_uuid": row["submission_uuid"]}
+        return {"applicant": applicant, "submission_uuid": row["submission_uuid"]}
+
+    return None
 
 
 _update_query = """