code cleanup

database/parkingDB-reporting.js

@@ -192,16 +192,14 @@ export const getReportData = (reportName, requestQuery) => {
     let sqlParameters = [];
     switch (reportName) {
         case 'lookupAudit': {
-            sql =
-                'select b.batchID,' +
-                    ' sentDate as batchSentDate,' +
-                    ' e.licencePlateCountry, e.licencePlateProvince, e.licencePlateNumber,' +
-                    ' e.ticketID as ticketID,' +
-                    ' t.ticketNumber as ticketNumber' +
-                    ' from LicencePlateLookupBatches b' +
-                    ' left join LicencePlateLookupBatchEntries e on b.batchID = e.batchID' +
-                    ' left join ParkingTickets t on e.ticketID = t.ticketID' +
-                    ' where b.sentDate is not null';
+            sql = `select b.batchID,
+        sentDate as batchSentDate,
+        e.licencePlateCountry, e.licencePlateProvince, e.licencePlateNumber,
+        e.ticketID as ticketID, t.ticketNumber as ticketNumber
+        from LicencePlateLookupBatches b
+        left join LicencePlateLookupBatchEntries e on b.batchID = e.batchID
+        left join ParkingTickets t on e.ticketID = t.ticketID
+        where b.sentDate is not null`;
             if (requestQuery.batchID && requestQuery.batchID !== '') {
                 sql += ' and b.batchID = ?';
                 sqlParameters.push(requestQuery.batchID);

database/parkingDB-reporting.ts

@@ -240,16 +240,14 @@ export const getReportData = (
   // eslint-disable-next-line sonarjs/no-small-switch
   switch (reportName) {
     case 'lookupAudit': {
-      sql =
-        'select b.batchID,' +
-        ' sentDate as batchSentDate,' +
-        ' e.licencePlateCountry, e.licencePlateProvince, e.licencePlateNumber,' +
-        ' e.ticketID as ticketID,' +
-        ' t.ticketNumber as ticketNumber' +
-        ' from LicencePlateLookupBatches b' +
-        ' left join LicencePlateLookupBatchEntries e on b.batchID = e.batchID' +
-        ' left join ParkingTickets t on e.ticketID = t.ticketID' +
-        ' where b.sentDate is not null'
+      sql = `select b.batchID,
+        sentDate as batchSentDate,
+        e.licencePlateCountry, e.licencePlateProvince, e.licencePlateNumber,
+        e.ticketID as ticketID, t.ticketNumber as ticketNumber
+        from LicencePlateLookupBatches b
+        left join LicencePlateLookupBatchEntries e on b.batchID = e.batchID
+        left join ParkingTickets t on e.ticketID = t.ticketID
+        where b.sentDate is not null`
 
       if (requestQuery.batchID && requestQuery.batchID !== '') {
         sql += ' and b.batchID = ?'

helpers/functions.owner.js

@@ -1,16 +1,9 @@
 export const getFormattedOwnerAddress = (owner) => {
     const fieldPrefix = 'ownerName1' in owner ? '' : 'owner_';
-    return (owner[fieldPrefix + 'ownerName1'] +
-        '\n' +
-        (owner[fieldPrefix + 'ownerName2'] &&
-            owner[fieldPrefix + 'ownerName2'] !== ''
-            ? owner[fieldPrefix + 'ownerName2'] + '\n'
-            : '') +
-        owner[fieldPrefix + 'ownerAddress'] +
-        '\n' +
-        owner[fieldPrefix + 'ownerCity'] +
-        ', ' +
-        owner[fieldPrefix + 'ownerProvince'] +
-        '  ' +
-        owner[fieldPrefix + 'ownerPostalCode']);
+    return `${owner[fieldPrefix + 'ownerName1']}\n
+      ${owner[fieldPrefix + 'ownerName2'] &&
+        owner[fieldPrefix + 'ownerName2'] !== ''
+        ? owner[fieldPrefix + 'ownerName2'] + '\n'
+        : ''}${owner[fieldPrefix + 'ownerAddress']}\n
+      ${owner[fieldPrefix + 'ownerCity']}, ${owner[fieldPrefix + 'ownerProvince']}  ${owner[fieldPrefix + 'ownerPostalCode']}`;
 };

helpers/functions.owner.ts

@@ -6,19 +6,14 @@ export const getFormattedOwnerAddress = (
 ): string => {
   const fieldPrefix = 'ownerName1' in owner ? '' : 'owner_'
 
-  return (
-    (owner[fieldPrefix + 'ownerName1'] as string) +
-    '\n' +
-    (owner[fieldPrefix + 'ownerName2'] &&
-    owner[fieldPrefix + 'ownerName2'] !== ''
-      ? (owner[fieldPrefix + 'ownerName2'] as string) + '\n'
-      : '') +
-    (owner[fieldPrefix + 'ownerAddress'] as string) +
-    '\n' +
-    (owner[fieldPrefix + 'ownerCity'] as string) +
-    ', ' +
-    (owner[fieldPrefix + 'ownerProvince'] as string) +
-    '  ' +
-    (owner[fieldPrefix + 'ownerPostalCode'] as string)
-  )
+  return `${owner[fieldPrefix + 'ownerName1'] as string}\n
+      ${
+        owner[fieldPrefix + 'ownerName2'] &&
+        owner[fieldPrefix + 'ownerName2'] !== ''
+          ? (owner[fieldPrefix + 'ownerName2'] as string) + '\n'
+          : ''
+      }${owner[fieldPrefix + 'ownerAddress'] as string}\n
+      ${owner[fieldPrefix + 'ownerCity'] as string}, ${
+    owner[fieldPrefix + 'ownerProvince'] as string
+  }  ${owner[fieldPrefix + 'ownerPostalCode'] as string}`
 }