attach alias name to organization name (#1375)

bcgov · Feb 2, 2024 · 3f1a9c0 · 3f1a9c0
1 parent 3f6ad6e
commit 3f1a9c0
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 4 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
@@ -120,7 +120,7 @@ def _map_data(row, insert_index):
     return {
         "first_name": _get_name(row),
         "last_name": row["last_name"],
-        "organization_name": row["organization_name"],
+        "organization_name": _get_organization_name(row),
         "application_submission_uuid": row["application_submission_uuid"],
         "email": row["email_address"],
         "phone_number": row.get("phone_number", "cell_phone_number"),
@@ -132,6 +132,12 @@ def _map_data(row, insert_index):
     }
 
 
+def _get_organization_name(row):
+    return (
+        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
+    )
+
+
 def _get_name(row):
     first_name = row.get("first_name", None)
     middle_name = row.get("middle_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
@@ -111,7 +111,7 @@ def _map_data(row):
     return {
         "first_name": _get_name(row),
         "last_name": row["last_name"],
-        "organization_name": row["organization_name"],
+        "organization_name": _get_organization_name(row),
         "application_submission_uuid": row["application_submission_uuid"],
         "email": row["email_address"],
         "phone_number": row.get("phone_number", "cell_phone_number"),
@@ -120,6 +120,11 @@ def _map_data(row):
         "audit_created_by": OATS_ETL_USER,
     }
 
+def _get_organization_name(row):
+    return (
+        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
+    )
+
 
 def _get_name(row):
     first_name = row.get("first_name", "")

diff --git a/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql b/bin/migrate-oats-data/applications/submissions/sql/parcels/owners/application_owner.sql
@@ -8,6 +8,7 @@ SELECT osp.subject_property_id,
     op.middle_name,
     oo.organization_id,
     oo.organization_name,
+    oo.alias_name,
     opo.phone_number,
     opo.cell_phone_number,
     opo.email_address,

diff --git a/...data/applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql b/...data/applications/submissions/sql/parcels/primary_contact/application_primary_contact.sql
@@ -6,6 +6,7 @@ WITH ordered_parties AS (
         op.last_name,
         oo.organization_id,
         oo.organization_name,
+        oo.alias_name,
         opo.phone_number,
         opo.cell_phone_number,
         opo.email_address,
@@ -43,6 +44,7 @@ parties_with_submission_uuid as (
         last_name,
         organization_id,
         organization_name,
+        alias_name,
         phone_number,
         cell_phone_number,
         email_address,

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
@@ -120,7 +120,7 @@ def _map_data(row, insert_index):
     return {
         "first_name": _get_name(row),
         "last_name": row["last_name"],
-        "organization_name": row["organization_name"],
+        "organization_name": _get_organization_name(row),
         "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"],
         "email": row["email_address"],
         "phone_number": row.get("phone_number", "cell_phone_number"),
@@ -132,6 +132,12 @@ def _map_data(row, insert_index):
     }
 
 
+def _get_organization_name(row):
+    return (
+        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
+    )
+
+
 def _get_name(row):
     first_name = row.get("first_name", None)
     middle_name = row.get("middle_name", None)

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
@@ -111,7 +111,7 @@ def _map_data(row):
     return {
         "first_name": _get_name(row),
         "last_name": row["last_name"],
-        "organization_name": row["organization_name"],
+        "organization_name": _get_organization_name(row),
         "notice_of_intent_submission_uuid": row["notice_of_intent_submission_uuid"],
         "email": row["email_address"],
         "phone_number": row.get("phone_number", "cell_phone_number"),
@@ -121,6 +121,12 @@ def _map_data(row):
     }
 
 
+def _get_organization_name(row):
+    return (
+        f"{row.get('organization_name','')} {row.get('alias_name', '')}".strip() or None
+    )
+
+
 def _get_name(row):
     first_name = row.get("first_name", "")
     middle_name = row.get("middle_name", "")

diff --git a/...e-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql b/...e-oats-data/noi/sql/notice_of_intent_submission/parcels/owners/notice_of_intent_owner.sql
@@ -7,6 +7,7 @@ SELECT osp.subject_property_id,
     op.middle_name,
     oo.organization_id,
     oo.organization_name,
+    oo.alias_name,
     opo.phone_number,
     opo.cell_phone_number,
     opo.email_address,

diff --git a/.../noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql b/.../noi/sql/notice_of_intent_submission/primary_contact/notice_of_intent_primary_contact.sql
@@ -6,6 +6,7 @@ WITH ordered_parties AS (
         op.last_name,
         oo.organization_id,
         oo.organization_name,
+        oo.alias_name,
         opo.phone_number,
         opo.cell_phone_number,
         opo.email_address,
@@ -43,6 +44,7 @@ parties_with_submission_uuid as (
         last_name,
         organization_id,
         organization_name,
+        alias_name,
         phone_number,
         cell_phone_number,
         email_address,