added Background to description; fix for alias_name etl (#1383)

bcgov · Feb 5, 2024 · fd3596b · fd3596b
1 parent d25b2ca
commit fd3596b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py b/bin/migrate-oats-data/applications/submissions/parcels/owners/application_owners.py
@@ -133,10 +133,13 @@ def _map_data(row, insert_index):
 
 
 def _get_organization_name(row):
-    return (
-        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
-    )
+    organization_name = (row.get("organization_name") or "").strip()
+    alias_name = (row.get("alias_name") or "").strip()
+
+    if not organization_name and not alias_name:
+        return None
 
+    return f"{organization_name} {alias_name}".strip()
 
 def _get_name(row):
     first_name = row.get("first_name", None)

diff --git a/...oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py b/...oats-data/applications/submissions/parcels/primary_contact/application_primary_contact.py
@@ -121,9 +121,13 @@ def _map_data(row):
     }
 
 def _get_organization_name(row):
-    return (
-        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
-    )
+    organization_name = (row.get("organization_name") or "").strip()
+    alias_name = (row.get("alias_name") or "").strip()
+
+    if not organization_name and not alias_name:
+        return None
+
+    return f"{organization_name} {alias_name}".strip()
 
 
 def _get_name(row):

diff --git a/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py b/bin/migrate-oats-data/noi/notice_of_intent_submissions/notice_of_intent_proposal_fields.py
@@ -122,7 +122,7 @@ def _map_fields(data):
     if not summary and (not background_description or len(background_description) < 11):
         data["purpose"] = NO_DATA_IN_OATS
     else:
-        data["purpose"] = f"{summary} {background_description}"
+        data["purpose"] = f"{summary} . Background: {background_description}"
 
     data["soil_is_follow_up"] = data["ministry_notice_ref_no"] != None
     data["soil_has_submitted_notice"] = data["followup_noi_number"] != None

diff --git a/...rate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py b/...rate-oats-data/noi/notice_of_intent_submissions/parcels/owners/notice_of_intent_owners.py
@@ -133,9 +133,13 @@ def _map_data(row, insert_index):
 
 
 def _get_organization_name(row):
-    return (
-        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
-    )
+    organization_name = (row.get("organization_name") or "").strip()
+    alias_name = (row.get("alias_name") or "").strip()
+
+    if not organization_name and not alias_name:
+        return None
+
+    return f"{organization_name} {alias_name}".strip()
 
 
 def _get_name(row):

diff --git a/...notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_primary_contact.py b/...notice_of_intent_submissions/parcels/primary_contacts/notice_of_intent_primary_contact.py
@@ -122,9 +122,13 @@ def _map_data(row):
 
 
 def _get_organization_name(row):
-    return (
-        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
-    )
+    organization_name = (row.get("organization_name") or "").strip()
+    alias_name = (row.get("alias_name") or "").strip()
+
+    if not organization_name and not alias_name:
+        return None
+
+    return f"{organization_name} {alias_name}".strip()
 
 
 def _get_name(row):