removing references from NotificationTemplates table and other files

bcgov · Aug 20, 2024 · 308ed55 · 308ed55
1 parent 03307a3
commit 308ed55
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 19 deletions.
diff --git a/express-api/src/controllers/tools/toolsSchema.ts b/express-api/src/controllers/tools/toolsSchema.ts
@@ -16,7 +16,6 @@ const ProjectSchema = z.object({
   status: z.string(),
   agency: z.string(),
   description: z.string(),
-  landLegalDescription: z.string(),
   risk: z.string(),
   manager: z.string(),
   location: z.string(),
@@ -76,7 +75,6 @@ const PropertySchema = z.object({
   latitude: z.number(),
   longitude: z.number(),
   landArea: z.number(),
-  landLegalDescription: z.string(),
   buildingFloorCount: z.number(),
   buildingConstructionType: z.string(),
   buildingPredominateUse: z.string(),

diff --git a/express-api/src/notificationTemplates/ErpNotificationOwningAgency30Day.njk b/express-api/src/notificationTemplates/ErpNotificationOwningAgency30Day.njk
@@ -19,7 +19,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationOwningAgency60Day.njk b/express-api/src/notificationTemplates/ErpNotificationOwningAgency60Day.njk
@@ -19,7 +19,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationOwningAgency90Day.njk b/express-api/src/notificationTemplates/ErpNotificationOwningAgency90Day.njk
@@ -19,7 +19,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationParentAgency30Day.njk b/express-api/src/notificationTemplates/ErpNotificationParentAgency30Day.njk
@@ -21,7 +21,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationParentAgency60Day.njk b/express-api/src/notificationTemplates/ErpNotificationParentAgency60Day.njk
@@ -20,7 +20,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationParentAgency90Day.njk b/express-api/src/notificationTemplates/ErpNotificationParentAgency90Day.njk
@@ -20,7 +20,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationPurchasingAgency30Day.njk b/express-api/src/notificationTemplates/ErpNotificationPurchasingAgency30Day.njk
@@ -19,7 +19,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationPurchasingAgency60Day.njk b/express-api/src/notificationTemplates/ErpNotificationPurchasingAgency60Day.njk
@@ -19,7 +19,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/ErpNotificationPurchasingAgency90Day.njk b/express-api/src/notificationTemplates/ErpNotificationPurchasingAgency90Day.njk
@@ -19,7 +19,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/notificationTemplates/NewPropertiesOnERP.njk b/express-api/src/notificationTemplates/NewPropertiesOnERP.njk
@@ -20,7 +20,6 @@
                             Site Size: {{ property.LandArea }} ha<br>
                             Zoned: {{ property.Zoning }}<br>
                             PID: {{ property.PID }} <br>
-                            Legal: {{ property.LandLegalDescription }}<br>
                             Current Holder of the Property: {{ property.Agency?.Name }} <br>
                             {% if Project.Appraised != null and Project.Appraised.Value > 0 %}
                                 <span>Appraised Value: ${{ Project.Appraised.Value }}</span>

diff --git a/express-api/src/services/properties/propertiesServices.ts b/express-api/src/services/properties/propertiesServices.ts
@@ -437,7 +437,6 @@ const makeParcelUpsertObject = async (
     IsVisibleToOtherAgencies: true,
     PropertyTypeId: 0,
     Description: row.Description,
-    LandLegalDescription: row.LandLegalDescription,
     LandArea: numberOrNull(row.LandArea),
     Evaluations: currRowEvaluations,
     Fiscals: currRowFiscals,

diff --git a/express-api/src/typeorm/Migrations/1724169663927-RemoveLegalDescriptionLineFromTemplates.ts b/express-api/src/typeorm/Migrations/1724169663927-RemoveLegalDescriptionLineFromTemplates.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveLegalDescriptionLineFromTemplates1724169663927 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        -- Remove 'Legal' line with leading and trailing spaces and line breaks
+        UPDATE notification_template
+        SET body = REPLACE(body, '
+                    Legal: {{ property.LandLegalDescription }}
+                    <br> ', '')
+        WHERE body LIKE '%Legal: {{ property.LandLegalDescription }}%';
+
+        -- Remove 'Legal' line with leading spaces and line breaks but without trailing spaces
+        UPDATE notification_template
+        SET body = REPLACE(body, '
+                    Legal: {{ property.LandLegalDescription }}
+<br> ', '')
+        WHERE body LIKE '%Legal: {{ property.LandLegalDescription }}%';
+
+        -- Remove 'Legal' line with no leading spaces
+        UPDATE notification_template
+        SET body = REPLACE(body, 'Legal: {{ property.LandLegalDescription }}<br>', '')
+        WHERE body LIKE '%Legal: {{ property.LandLegalDescription }}%';
+    `);
+  }
+
+  public async down(): Promise<void> {}
+}
diff --git a/express-api/tests/integration/parcels/parcels.test.ts b/express-api/tests/integration/parcels/parcels.test.ts
@@ -31,7 +31,6 @@ const mockParcel: Partial<Parcel> = {
   PID: faker.number.int(),
   PIN: faker.number.int(),
   LandArea: 0,
-  LandLegalDescription: faker.string.alpha(),
   Zoning: '',
   ZoningPotential: '',
   ParentParcelId: 1,

diff --git a/express-api/tests/integration/tools/tools.test.ts b/express-api/tests/integration/tools/tools.test.ts
@@ -15,7 +15,6 @@ describe('INTEGRATION - Tools', () => {
     status: 'Draft',
     agency: faker.company.name(),
     description: faker.lorem.sentence(),
-    landLegalDescription: faker.lorem.sentence(),
     risk: 'High',
     manager: faker.person.firstName(),
     location: faker.location.city(),
@@ -76,7 +75,6 @@ describe('INTEGRATION - Tools', () => {
     latitude: faker.location.latitude(),
     longitude: faker.location.longitude(),
     landArea: faker.number.int(),
-    landLegalDescription: faker.lorem.sentence(),
     buildingFloorCount: faker.number.int(),
     buildingConstructionType: faker.lorem.word(),
     buildingPredominateUse: faker.lorem.word(),

diff --git a/express-api/tests/testUtils/factories.ts b/express-api/tests/testUtils/factories.ts
@@ -225,7 +225,6 @@ export const produceParcel = (): Parcel => {
     CreatedOn: faker.date.anytime(),
     UpdatedOn: faker.date.anytime(),
     Name: faker.string.alphanumeric(),
-    LandLegalDescription: faker.string.alphanumeric(),
     PID: faker.number.int({ min: 111111111, max: 999999999 }),
     PIN: undefined,
     LandArea: undefined,

diff --git a/react-app/src/components/property/AddProperty.tsx b/react-app/src/components/property/AddProperty.tsx
@@ -57,7 +57,6 @@ const AddProperty = () => {
       IsSensitive: false,
       ClassificationId: null,
       Description: '',
-      LandLegalDescription: '',
       Name: '',
       BuildingPredominateUseId: null,
       BuildingConstructionTypeId: null,

diff --git a/react-app/src/hooks/api/useParcelsApi.ts b/react-app/src/hooks/api/useParcelsApi.ts
@@ -39,7 +39,6 @@ export interface Parcel extends Property {
   Evaluations?: ParcelEvaluation[] | null;
   Fiscals?: ParcelFiscal[] | null;
   LandArea?: number;
-  LandLegalDescription?: string;
   Zoning?: string;
   ZoningPotential?: string;
   ParentParcelId?: number;