From fa62f17b9b3572c4677e9fefdec3acff3c59809e Mon Sep 17 00:00:00 2001
From: mgtennant <100305096+mgtennant@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:56:10 -0800
Subject: [PATCH 1/2] nfr display data instead of lur for grazing lease

---
 frontend/public/js/util.js             |  1 -
 frontend/src/app.controller.ts         | 14 ++----
 frontend/views/pages/grazing-lease.hbs | 67 +++++++++-----------------
 3 files changed, 28 insertions(+), 54 deletions(-)

diff --git a/frontend/public/js/util.js b/frontend/public/js/util.js
index 52117d25..0096474f 100644
--- a/frontend/public/js/util.js
+++ b/frontend/public/js/util.js
@@ -20,7 +20,6 @@ async function generateReport(documentType) {
     .catch(() => {
       location.reload();
     });
-  console.log(reportName)
   const data = {
     prdid: prdid,
     dtid: dtid,
diff --git a/frontend/src/app.controller.ts b/frontend/src/app.controller.ts
index 0aafb32b..ac80068b 100644
--- a/frontend/src/app.controller.ts
+++ b/frontend/src/app.controller.ts
@@ -406,16 +406,10 @@ export class AppController {
           console.log(err);
           console.log(err.response.data);
         });
-      ttlsJSON = await this.ttlsService.sendToBackend(response);
-      ttlsJSON["cityProvPostal"] = this.ttlsService.concatCityProvPostal(
-        response.tenantAddr ? response.tenantAddr[0] : null
-      );
-      if (ttlsJSON.inspected_date) {
-        ttlsJSON["inspected_date"] = this.ttlsService.formatInspectedDate(
-          ttlsJSON.inspected_date.toString()
-        );
-      }
-      primaryContactName = ttlsJSON.licence_holder_name;
+      ttlsJSON = await this.ttlsService.formatNFRData(response);
+      primaryContactName = ttlsJSON.licenceHolderName;
+      const interestedParties = nfrInterestedParties(response.tenantAddr);
+      ttlsJSON["interestedParties"] = interestedParties;
       return res.render("grazing-lease", {
         title: title,
         idirUsername: session.data.activeAccount
diff --git a/frontend/views/pages/grazing-lease.hbs b/frontend/views/pages/grazing-lease.hbs
index 182e19fc..90b3cfc2 100644
--- a/frontend/views/pages/grazing-lease.hbs
+++ b/frontend/views/pages/grazing-lease.hbs
@@ -7,51 +7,30 @@
                 <hr />
 
                 <div class="titleSpacing dataSection"><b>DTID:</b> <span id="dtid">{{message.dtid}}</span></div>
-                <div class="titleSpacing dataSection"><b>Tenure File Number:</b> <span id="tfn">{{message.tenure_file_number}}</span></div>
+                <div class="titleSpacing dataSection"><b>Tenure File Number:</b> <span id="tfn">{{message.fileNum}}</span></div>
                 <div class="titleSpacing dataSection"><b>Primary Contact Name:</b> {{primaryContactName}}</div>
                 
                 <fieldset class="form-group collapsible">
                     <legend style="cursor: pointer" class='togvis sectionTitle'><i class="fa fa-plus"></i>  Disposition Transaction ID Details</legend>
                     <div class="contents" style="display: none;">
                         <div class="form-row">
-                            <div class="form-group col-md-5 dataSection dataSection">
-                                <dt>Contact/Agent Name</dt>
-                                <dd>{{message.contact_agent}}</dd>
-                            </div>
                             <div class="form-group col-md-5 dataSection dataSection">
                                 <dt>Organization Unit</dt>
-                                <dd id="orgUnit">{{ message.organization_unit }}</dd>
+                                <dd id="orgUnit">{{ message.orgUnit }}</dd>
                             </div>
-                            
-                        </div>
-                        <div class="form-row">
                             <div class="form-group col-md-5 dataSection dataSection">
                                 <dt>Primary Contact Email Address</dt>
-                                <dd>{{ message.email_address }}</dd>
-                            </div>
-                            <div class="form-group col-md-5 dataSection dataSection">
-                                <dt>Primary Contact Phone Number</dt>
-                                <dd id="phoneNumber">{{ message.phone_number }}</dd>
-                            </div>
-                        </div>
-                        <div class="form-row">
-                            <div class="form-group col-md-5 dataSection dataSection">
-                                <dt>Contact/Agent Email Address</dt>
-                                <dd>{{ message.contact_email_address }}</dd>
-                            </div>
-                            <div class="form-group col-md-5 dataSection dataSection">
-                                <dt>Contact/Agent Phone Number</dt>
-                                <dd id="phoneNumber2">{{ message.contact_phone_number }}</dd>
+                                <dd>{{ message.emailAddress }}</dd>
                             </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-5 dataSection dataSection">
                                 <dt>Incorporation Number</dt>
-                                <dd>{{ message.incorporation_number }}</dd>
+                                <dd id="orgUnit">{{ message.incorporationNum }}</dd>
                             </div>
                             <div class="form-group col-md-5 dataSection dataSection">
-                                <dt>Inspected Date</dt>
-                                <dd>{{ message.inspected_date }}</dd>
+                                <dt>Primary Contact Phone Number</dt>
+                                <dd id="phoneNumber">{{ message.phoneNumber }}</dd>
                             </div>
                         </div>
                     </div>
@@ -62,49 +41,51 @@
                         <div class="form-row">
                             <div class="form-group col-md-5 dataSection">
                                 <dt>Type</dt>
-                                <dd id="type">{{ message.type_name }}</dd>
+                                <dd id="type">{{ message.type }}</dd>
                             </div>
                             <div class="form-group col-md-5 dataSection">
                                 <dt>Subtype</dt>
-                                <dd id="subType">{{message.sub_type_name}}</dd>
+                                <dd id="subType">{{message.subType}}</dd>
                             </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-5 dataSection">
                                 <dt>Purpose</dt>
-                                <dd id="purpose">{{ message.purpose_name }}</dd>
+                                <dd id="purpose">{{ message.purpose }}</dd>
                             </div>
                             <div class="form-group col-md-5 dataSection">
                                 <dt>Subpurpose</dt>
-                                <dd id="subPurpose">{{message.sub_purpose_name}}</dd>
+                                <dd id="subPurpose">{{message.subPurpose}}</dd>
                             </div>
                         </div>
                         <div class="form-row">
                             <div class="form-group col-md-5 dataSection">
                                 <dt>Mailing Address</dt>
-                                <dd id="address">{{message.mailing_address}}</dd>
+                                <dd id="address1">{{message.addrLine1}}</dd>
+                                <dd id="address2">{{message.addrLine2}}</dd>
+                                <dd id="address3">{{message.addrLine3}}</dd>
                                 <dd id="cityProvPostal">{{message.cityProvPostal}}</dd>
-                                <dd id="postalCode">{{message.mailing_country}}</dd>
+                                <dd id="county">{{message.country}}</dd>
                             </div>
                             <div class="form-group col-md-5 dataSection">
                                 <dt>Location of Land</dt>
-                                <dd id="locLand">{{message.location_description}}</dd>
+                                <dd id="locLand">{{message.locLand}}</dd>
                             </div>
                         </div>
                     </div>
                 </fieldset>
                 <fieldset class="form-group collapsible">
-                    <legend style="cursor: pointer" class='togvis sectionTitle'><i class="fa fa-plus"></i>  Area</legend>
+                    <legend style="cursor: pointer" class='togvis sectionTitle'><i class="fa fa-plus"></i>  Interested Parties</legend>
                     <div class="contents" style="display: none;">
-                        {{#each message.tenure}}
+                        {{#each message.interestedParties}}
                         <div class="form-row">
-                            <div class="form-group col-md-2 dataSection">
-                                <dt>Area</dt>
-                                <dd id="area">{{ this.Area }}</dd>
+                            <div class="form-group col-md-5 dataSection">
+                                <dt>Client Name</dt>
+                                <dd id="clientName">{{ this.clientName }}</dd>
                             </div>
-                            <div class="form-group col-md-10">
-                                <dt>Legal Description</dt>
-                                <dd class="legalDesc" title="{{this.LegalDescription}}">{{this.LegalDescription}}</dd>
+                            <div class="form-group col-md-5 dataSection">
+                                <dt>Address</dt>
+                                <dd id="address">{{this.address}}</dd>
                             </div>
                         </div>
                         {{/each}}
@@ -123,7 +104,7 @@
         $( document ).ready(function() {
             console.log({{message.err}});
             $("#prdid").text("{{this.prdid}}");
-            $("#tfn").text("{{message.tenure_file_number}}");
+            $("#tfn").text("{{message.fileNum}}");
 
             $(".dataSection dd").each(function(){
                 if ($(this).text() == "" || $(this).text() == "TBD") {

From f3cc91661d627fb0bc993686343e25e5321274e5 Mon Sep 17 00:00:00 2001
From: mgtennant <100305096+mgtennant@users.noreply.github.com>
Date: Wed, 29 Nov 2023 17:35:41 -0800
Subject: [PATCH 2/2] update gl variables

---
 frontend/src/report/report.service.ts |   4 +-
 frontend/utils/util.ts                | 168 +++++++++++++++++++++++---
 2 files changed, 153 insertions(+), 19 deletions(-)

diff --git a/frontend/src/report/report.service.ts b/frontend/src/report/report.service.ts
index d471a967..95b7019b 100644
--- a/frontend/src/report/report.service.ts
+++ b/frontend/src/report/report.service.ts
@@ -182,9 +182,9 @@ export class ReportService {
     const data = {
       DB_File_Number: rawData.fileNum,
       DB_Document_Number: dtid,
-      DB_Address_Street_Tenant: glVariables.streetAddress,
+      DB_Address_Street_Tenant: glVariables.glStreetAddress || glVariables.glMailingAddress,
       DB_Address_Regional_Office: glVariables.addressRegionalOffice,
-      DB_Address_Mailing_Tenant: glVariables.mailingAddress,
+      DB_Address_Mailing_Tenant: glVariables.glMailingAddress || glVariables.glStreetAddress,
       DB_Name_Tenant: glVariables.mailingName,
       DB_Name_Tenant_List: glVariables.mailingNameList,
       DB_Name_Corporation: glVariables.mailingCorp,
diff --git a/frontend/utils/util.ts b/frontend/utils/util.ts
index 13e84631..acbfbc74 100644
--- a/frontend/utils/util.ts
+++ b/frontend/utils/util.ts
@@ -14,22 +14,22 @@ export function formatPostalCode(value: string) {
 /**
  * Outputs a string:
  * <Name 1>
- * <addrLine1>
+ * <addrLine1>, <addrLine2>, <addrLine3>
  * <city prov postalCode>
  *
  * If there are two individuals that share an address, then:
  * <Name 1>
  * <Name 2>
- * <addrLine1>
+ * <addrLine1>, <addrLine2>, <addrLine3>
  * <city prov postalCode>
  *
  * Combined example:
  * <Name 1> - different address from Name 2/3
- * <addrLine1>
+ * <addrLine1>, <addrLine2>, <addrLine3>
  * <city prov postalCode>
  * <Name 2>
  * <Name 3> - same address as Name 2
- * <addrLine1>
+ * <addrLine1>, <addrLine2>, <addrLine3>
  * <city prov postalCode>
  */
 export function nfrAddressBuilder(tenantAddr: any[]): string {
@@ -97,6 +97,128 @@ export function nfrAddressBuilder(tenantAddr: any[]): string {
   return formattedAddresses.join("\n");
 }
 
+/**
+ * Similar to nfrAddressBuilder, slightly modified for gl
+ * Outputs a string:
+ * <Name 1>
+ * <addrLine1>, <addrLine2>, <addrLine3>
+ * <city prov postalCode>
+ *
+ * If there are two individuals that share an address, then:
+ * <Name 1>
+ * <Name 2>
+ * <addrLine1>, <addrLine2>, <addrLine3>
+ * <city prov postalCode>
+ *
+ * Combined example:
+ * <Name 1> - different address from Name 2/3
+ * <addrLine1>, <addrLine2>, <addrLine3>
+ * <city prov postalCode>
+ * <Name 2>
+ * <Name 3> - same address as Name 2
+ * <addrLine1>, <addrLine2>, <addrLine3>
+ * <city prov postalCode>
+ */
+export function glAddressBuilder(tenantAddr: {
+  addrLine1: string;
+  addrLine2: string;
+  addrLine3: string;
+  addrType: string;
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  legalName: string;
+  city: string;
+  country: string;
+  provAbbr: string;
+  postalCode: string;
+}[]): { glMailingAddress: string; glStreetAddress: string } {
+  if (!tenantAddr) {
+    return {glMailingAddress: '', glStreetAddress: ''};
+  }
+  const uniqueMailingAddresses = new Map<string, { names: Set<string>; addressLines: string; cityProvPostal: string }>();
+  const uniqueStreetAddresses = new Map<string, { names: Set<string>; addressLines: string; cityProvPostal: string }>();
+
+  for (const addressObj of tenantAddr) {
+    const {
+      legalName,
+      firstName,
+      middleName,
+      lastName,
+      addrLine1,
+      addrLine2,
+      addrLine3,
+      addrType,
+      city,
+      provAbbr,
+      postalCode,
+    } = addressObj;
+
+    let name = null;
+    if (legalName) {
+      name = legalName;
+    } else if (firstName || middleName || lastName) {
+      const parts = [firstName, middleName, lastName];
+      const filteredParts = parts.filter((part) => part !== null && part !== undefined);
+      name = filteredParts.join(" ");
+    }
+
+    const parts = [];
+    if (city) {
+      parts.push(city);
+    }
+    if (provAbbr) {
+      parts.push(provAbbr);
+    }
+    if (postalCode) {
+      parts.push(formatPostalCode(postalCode));
+    }
+    const cityProvPostal = parts.join(" ");
+
+    let addressLines = [];
+    if (addrLine1) addressLines.push(addrLine1);
+    if (addrLine2) addressLines.push(addrLine2);
+    if (addrLine3) addressLines.push(addrLine3);
+    let joinedAddressLines = addressLines.join(', ');
+
+    const key = joinedAddressLines + cityProvPostal;
+
+    if (addrType === 'MAILING') {
+      if (uniqueMailingAddresses.has(key)) {
+        const existingEntry = uniqueMailingAddresses.get(key);
+        existingEntry.names.add(name);
+      } else {
+        uniqueMailingAddresses.set(key, { names: new Set([name]), addressLines: joinedAddressLines, cityProvPostal });
+      }
+    } else if (addrType === 'STREET') {
+      if (uniqueStreetAddresses.has(key)) {
+        const existingEntry = uniqueStreetAddresses.get(key);
+        existingEntry.names.add(name);
+      } else {
+        uniqueStreetAddresses.set(key, { names: new Set([name]), addressLines: joinedAddressLines, cityProvPostal });
+      }
+    }
+  }
+
+  const formattedMailingAddresses: string[] = [];
+  for (const { names, addressLines, cityProvPostal } of uniqueMailingAddresses.values()) {
+    const formattedNames = Array.from(names).join("\n");
+    formattedMailingAddresses.push(`${formattedNames}\n${addressLines}\n${cityProvPostal}\n`);
+  }
+
+  const formattedStreetAddresses: string[] = [];
+  for (const { names, addressLines, cityProvPostal } of uniqueStreetAddresses.values()) {
+    const formattedNames = Array.from(names).join("\n");
+    formattedStreetAddresses.push(`${formattedNames}\n${addressLines}\n${cityProvPostal}\n`);
+  }
+
+  return {
+    glMailingAddress: formattedMailingAddresses.join("\n"),
+    glStreetAddress: formattedStreetAddresses.join("\n"),
+  };
+}
+
+
 export function grazingLeaseVariables(tenantAddr: [{
   addrLine1: string;
   addrLine2: string;
@@ -113,7 +235,8 @@ export function grazingLeaseVariables(tenantAddr: [{
 }], interestParcel: [{
   legalDescription: string;
 }], regVars: {regOfficeStreet: string, regOfficeCity: string, regOfficeProv: string, regOfficePostalCode: string}): 
-{streetAddress: string; streetName: string; streetCorp: string; mailingAddress: string; mailingName: string; mailingNameList: {name: string}[]; mailingCorp: string; legalDescription: string; addressRegionalOffice: string} {
+{streetAddress: string; streetName: string; streetCorp: string; mailingAddress: string; mailingName: string; mailingNameList: {name: string}[]; 
+  mailingCorp: string; legalDescription: string; addressRegionalOffice: string, glMailingAddress: string, glStreetAddress: string} {
   let streetAddress = '';
   let streetName = '';
   let streetNameList = [];
@@ -124,6 +247,7 @@ export function grazingLeaseVariables(tenantAddr: [{
   let mailingCorp = '';
   let legalDescription = '';
   let addressRegionalOffice = '';
+  const {glMailingAddress, glStreetAddress} = glAddressBuilder(tenantAddr);
 
   if (tenantAddr) {
     for (let tenant of tenantAddr) {
@@ -191,7 +315,7 @@ export function grazingLeaseVariables(tenantAddr: [{
     addressRegionalOffice = [addressRegionalOffice, regVars.regOfficePostalCode].join(', ');
   }
 
-  return {streetAddress, streetName, streetCorp, mailingAddress, mailingName, mailingNameList, mailingCorp, legalDescription, addressRegionalOffice}
+  return {streetAddress, streetName, streetCorp, mailingAddress, mailingName, mailingNameList, mailingCorp, legalDescription, addressRegionalOffice, glMailingAddress, glStreetAddress}
 }
 
 function getFullName(tenant: {
@@ -220,7 +344,20 @@ function getCorp(tenant: {
   return tenant.legalName??'';
 }
 
+/**
+ * Used by grazingLeaseVariables, formats and returns a mailing address
+ * 
+ * @param tenantAddr: {addrLine1, addrLine2, addrLine3, city, country, provAbbr, postalCode}
+ * @returns
+ * 
+ * addrLine1, addrLine2, addrLine3
+ * city, provAbbr postalCode
+ */
 export function getMailingAddress(tenantAddr: {
+  firstName: string;
+  middleName: string;
+  lastName: string;
+  legalName: string;
   addrLine1: string;
   addrLine2: string;
   addrLine3: string;
@@ -239,18 +376,15 @@ export function getMailingAddress(tenantAddr: {
     .filter(component => !!component) // Filter out undefined or empty components
     .join(', ');
 
-  const remainingComponents = [
-    tenantAddr.city,
-    tenantAddr.provAbbr,
-    tenantAddr.country,
-    tenantAddr.postalCode
-  ];
-
-  const spaceSeparated = remainingComponents
-    .filter(component => !!component) // Filter out undefined or empty components
-    .join(' ');
+    const cityPostalCode = [
+      tenantAddr.city,
+      tenantAddr.provAbbr,
+      tenantAddr.postalCode
+    ]
+      .filter(component => !!component)
+      .join(' ');
 
-  const mailingAddress = [combinedAddress, spaceSeparated].filter(part => !!part).join(', ');
+    const mailingAddress = [combinedAddress, cityPostalCode].filter(part => !!part).join('\n');
 
   return mailingAddress;
 }