From 9c840b0e9ebe31eec95d97d4391e54b7b519e801 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Tue, 22 Nov 2022 15:54:58 -0500
Subject: [PATCH] add preneed owner to deceased record

---
 temp/legacy.importFromCSV.js | 30 +++++++++++++++---------------
 temp/legacy.importFromCSV.ts | 36 ++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js
index 3cafe0b7..23e47330 100644
--- a/temp/legacy.importFromCSV.js
+++ b/temp/legacy.importFromCSV.js
@@ -281,7 +281,7 @@ function importFromMasterCSV() {
             }
             let preneedOccupancyStartDateString;
             let preneedLotOccupancyId;
-            if (masterRow.CM_PRENEED_ORDER || masterRow.CM_STATUS === "P") {
+            if (masterRow.CM_PRENEED_OWNER || masterRow.CM_STATUS === "P") {
                 preneedOccupancyStartDateString = formatDateString(masterRow.CM_PURCHASE_YR, masterRow.CM_PURCHASE_MON, masterRow.CM_PURCHASE_DAY);
                 let occupancyEndDateString = "";
                 if (masterRow.CM_INTERMENT_YR !== "" && masterRow.CM_INTERMENT_YR !== "0") {
@@ -474,20 +474,20 @@ function importFromMasterCSV() {
                     }, user);
                 }
                 updateLotStatus(lotId, takenLotStatus.lotStatusId, user);
-            }
-            if (masterRow.CM_PRENEED_OWNER) {
-                addLotOccupancyOccupant({
-                    lotOccupancyId: deceasedLotOccupancyId,
-                    lotOccupantTypeId: preneedOwnerLotOccupantType.lotOccupantTypeId,
-                    occupantName: masterRow.CM_PRENEED_OWNER,
-                    occupantAddress1: "",
-                    occupantAddress2: "",
-                    occupantCity: "",
-                    occupantProvince: "",
-                    occupantPostalCode: "",
-                    occupantPhoneNumber: "",
-                    occupantEmailAddress: ""
-                }, user);
+                if (masterRow.CM_PRENEED_OWNER) {
+                    addLotOccupancyOccupant({
+                        lotOccupancyId: deceasedLotOccupancyId,
+                        lotOccupantTypeId: preneedOwnerLotOccupantType.lotOccupantTypeId,
+                        occupantName: masterRow.CM_PRENEED_OWNER,
+                        occupantAddress1: "",
+                        occupantAddress2: "",
+                        occupantCity: "",
+                        occupantProvince: "",
+                        occupantPostalCode: "",
+                        occupantPhoneNumber: "",
+                        occupantEmailAddress: ""
+                    }, user);
+                }
             }
         }
     }
diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts
index 62aed0c4..b5c25156 100644
--- a/temp/legacy.importFromCSV.ts
+++ b/temp/legacy.importFromCSV.ts
@@ -540,7 +540,7 @@ function importFromMasterCSV() {
             let preneedOccupancyStartDateString: string;
             let preneedLotOccupancyId: number;
 
-            if (masterRow.CM_PRENEED_ORDER || masterRow.CM_STATUS === "P") {
+            if (masterRow.CM_PRENEED_OWNER || masterRow.CM_STATUS === "P") {
                 preneedOccupancyStartDateString = formatDateString(
                     masterRow.CM_PURCHASE_YR,
                     masterRow.CM_PURCHASE_MON,
@@ -890,24 +890,24 @@ function importFromMasterCSV() {
                 }
 
                 updateLotStatus(lotId, takenLotStatus.lotStatusId, user);
-            }
 
-            if (masterRow.CM_PRENEED_OWNER) {
-                addLotOccupancyOccupant(
-                    {
-                        lotOccupancyId: deceasedLotOccupancyId,
-                        lotOccupantTypeId: preneedOwnerLotOccupantType.lotOccupantTypeId,
-                        occupantName: masterRow.CM_PRENEED_OWNER,
-                        occupantAddress1: "",
-                        occupantAddress2: "",
-                        occupantCity: "",
-                        occupantProvince: "",
-                        occupantPostalCode: "",
-                        occupantPhoneNumber: "",
-                        occupantEmailAddress: ""
-                    },
-                    user
-                );
+                if (masterRow.CM_PRENEED_OWNER) {
+                    addLotOccupancyOccupant(
+                        {
+                            lotOccupancyId: deceasedLotOccupancyId,
+                            lotOccupantTypeId: preneedOwnerLotOccupantType.lotOccupantTypeId,
+                            occupantName: masterRow.CM_PRENEED_OWNER,
+                            occupantAddress1: "",
+                            occupantAddress2: "",
+                            occupantCity: "",
+                            occupantProvince: "",
+                            occupantPostalCode: "",
+                            occupantPhoneNumber: "",
+                            occupantEmailAddress: ""
+                        },
+                        user
+                    );
+                }
             }
         }
     } catch (error) {