diff --git a/database/parkingDB-reporting.js b/database/parkingDB-reporting.js index 0ce701cd..e912f56f 100644 --- a/database/parkingDB-reporting.js +++ b/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); diff --git a/database/parkingDB-reporting.ts b/database/parkingDB-reporting.ts index da60a01d..ad068425 100644 --- a/database/parkingDB-reporting.ts +++ b/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 = ?' diff --git a/helpers/functions.owner.js b/helpers/functions.owner.js index e6a5e15a..d799fbd4 100644 --- a/helpers/functions.owner.js +++ b/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']}`; }; diff --git a/helpers/functions.owner.ts b/helpers/functions.owner.ts index 146185a0..c796b538 100644 --- a/helpers/functions.owner.ts +++ b/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}` } diff --git a/package-lock.json b/package-lock.json index ae52b346..36cc8d2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,26 +39,26 @@ "@cityssm/bulma-sticky-table": "^2.1.0", "@cityssm/bulma-webapp-css": "^0.12.0", "@cityssm/simple-fa5-checkbox": "^0.2.1", - "@types/activedirectory2": "^1.2.5", - "@types/better-sqlite3": "^7.6.6", - "@types/compression": "^1.7.4", - "@types/cookie-parser": "^1.4.5", - "@types/csurf": "^1.11.4", - "@types/debug": "^4.1.10", - "@types/ejs": "^3.1.4", - "@types/express": "^4.17.20", - "@types/express-serve-static-core": "^4.17.39", - "@types/express-session": "^1.17.9", + "@types/activedirectory2": "^1.2.6", + "@types/better-sqlite3": "^7.6.7", + "@types/compression": "^1.7.5", + "@types/cookie-parser": "^1.4.6", + "@types/csurf": "^1.11.5", + "@types/debug": "^4.1.11", + "@types/ejs": "^3.1.5", + "@types/express": "^4.17.21", + "@types/express-serve-static-core": "^4.17.41", + "@types/express-session": "^1.17.10", "@types/gulp": "^4.0.16", - "@types/gulp-changed": "^0.0.38", - "@types/gulp-minify": "^3.1.4", - "@types/html-pdf": "^3.0.2", - "@types/http-errors": "^2.0.3", - "@types/mocha": "^10.0.3", - "@types/multer": "^1.4.9", + "@types/gulp-changed": "^0.0.39", + "@types/gulp-minify": "^3.1.5", + "@types/html-pdf": "^3.0.3", + "@types/http-errors": "^2.0.4", + "@types/mocha": "^10.0.4", + "@types/multer": "^1.4.10", "@types/node-fetch": "^3.0.2", - "@types/node-windows": "^0.1.5", - "@types/papaparse": "^5.3.10", + "@types/node-windows": "^0.1.6", + "@types/papaparse": "^5.3.11", "@types/session-file-store": "^1.2.4", "@types/set-interval-async": "^1.0.2", "bulma": "^0.9.4", @@ -572,18 +572,18 @@ "hasInstallScript": true }, "node_modules/@types/activedirectory2": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/@types/activedirectory2/-/activedirectory2-1.2.5.tgz", - "integrity": "sha512-CpsZN9KyL0Vowm6Ws1bFia7w4kjVxwN50y77ljo13jDXSfcfH4BzM4HYAJCIV4+FcZ1BTWnxuAimN6BTfT60Bw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@types/activedirectory2/-/activedirectory2-1.2.6.tgz", + "integrity": "sha512-mJsoOWf9LRpYBkExOWstWe6g6TQnZyZjVULNrX8otcCJgVliesk9T/+W+1ahrx2zaevxsp28sSKOwo/b7TOnSg==", "dev": true, "dependencies": { "@types/ldapjs": "*" } }, "node_modules/@types/better-sqlite3": { - "version": "7.6.6", - "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.6.tgz", - "integrity": "sha512-nuFAptzt0hZYBvyLzKQCbuCCK+RN9PHH4ezar5EJLIg2qpVhwQ/uLvLO/K8A9O7N8DafawgFupiyXQSs0U48Ng==", + "version": "7.6.7", + "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.7.tgz", + "integrity": "sha512-+c2YGPWY5831v3uj2/X0HRTK94u1GXU3sCnLqu7AKlxlSfawswnAiJR//TFzSL5azWsLQkG/uS+YnnqHtuZxPw==", "dev": true, "dependencies": { "@types/node": "*" @@ -600,9 +600,9 @@ } }, "node_modules/@types/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-sdFVnQJRkQBX83ydsLCBm4A39p45y0QkxdAR689yOtAFNbbS9Acrp86RZWJj6BHRXyZH9tX4t1dU7XDiGdY3nA==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.7.5.tgz", + "integrity": "sha512-AAQvK5pxMpaT+nDvhHrsBhLSYG5yQdtkaJE1WYieSNY2mVFKAgmU4ks65rkZD5oqnGCFLyQpUr1CqI4DmUMyDg==", "dev": true, "dependencies": { "@types/express": "*" @@ -618,36 +618,36 @@ } }, "node_modules/@types/cookie-parser": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.5.tgz", - "integrity": "sha512-cbpH1NldYslPt7WRHXZFm+G7DTfUg57dQSCf1qrHwT8wtGX41JHLYf3Cieiqg7waPWjorVgcSSllZov+A1PJbg==", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@types/cookie-parser/-/cookie-parser-1.4.6.tgz", + "integrity": "sha512-KoooCrD56qlLskXPLGUiJxOMnv5l/8m7cQD2OxJ73NPMhuSz9PmvwRD6EpjDyKBVrdJDdQ4bQK7JFNHnNmax0w==", "dev": true, "dependencies": { "@types/express": "*" } }, "node_modules/@types/csurf": { - "version": "1.11.4", - "resolved": "https://registry.npmjs.org/@types/csurf/-/csurf-1.11.4.tgz", - "integrity": "sha512-AN4kWHIIrkphg/yWplRD66MSLLpbEnQD8Iikm/gY8NmSwDzzUgZVgkBr4oNEHOW4jsKPgF+x48UndWH01hquBQ==", + "version": "1.11.5", + "resolved": "https://registry.npmjs.org/@types/csurf/-/csurf-1.11.5.tgz", + "integrity": "sha512-5rw87+5YGixyL2W8wblSUl5DSZi5YOlXE6Awwn2ofLvqKr/1LruKffrQipeJKUX44VaxKj8m5es3vfhltJTOoA==", "dev": true, "dependencies": { "@types/express-serve-static-core": "*" } }, "node_modules/@types/debug": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.10.tgz", - "integrity": "sha512-tOSCru6s732pofZ+sMv9o4o3Zc+Sa8l3bxd/tweTQudFn06vAzb13ZX46Zi6m6EJ+RUbRTHvgQJ1gBtSgkaUYA==", + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.11.tgz", + "integrity": "sha512-R2qflTjHDs4CL6D/6TkqBeIHr54WzZfIxN729xvCNlYIVp2LknlnCro5Yo3frNaX2E5gO9pZ3/QAPVdGmu+q9w==", "dev": true, "dependencies": { "@types/ms": "*" } }, "node_modules/@types/ejs": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.4.tgz", - "integrity": "sha512-fnM/NjByiWdSRJRrmGxgqOSAnmOnsvX1QcNYk5TVyIIj+7ZqOKMb9gQa4OIl/lil2w/8TiTWV+nz3q8yqxez/w==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz", + "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==", "dev": true }, "node_modules/@types/expect": { @@ -657,9 +657,9 @@ "dev": true }, "node_modules/@types/express": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz", - "integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", "dev": true, "dependencies": { "@types/body-parser": "*", @@ -669,9 +669,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.39", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz", - "integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==", + "version": "4.17.41", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz", + "integrity": "sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==", "dev": true, "dependencies": { "@types/node": "*", @@ -681,9 +681,9 @@ } }, "node_modules/@types/express-session": { - "version": "1.17.9", - "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.17.9.tgz", - "integrity": "sha512-yIqficLlTPdloeEPhOVenpOUWILkdaXHUWhTOqFGx9JoSuTgeatNjb97k8VvJehbTk0kUSUAHy5r27PXMga89Q==", + "version": "1.17.10", + "resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.17.10.tgz", + "integrity": "sha512-U32bC/s0ejXijw5MAzyaV4tuZopCh/K7fPoUDyNbsRXHvPSeymygYD1RFL99YOLhF5PNOkzswvOTRaVHdL1zMw==", "dev": true, "dependencies": { "@types/express": "*" @@ -722,9 +722,9 @@ } }, "node_modules/@types/gulp-changed": { - "version": "0.0.38", - "resolved": "https://registry.npmjs.org/@types/gulp-changed/-/gulp-changed-0.0.38.tgz", - "integrity": "sha512-LU5jQvMcCU+degVp21l6fHfnUQpJC7MpU+T7aGZS2kOswGh0h+FfA9eJD+JpSqzCVVSOIqb8mKM0M/xUCKEc4Q==", + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/gulp-changed/-/gulp-changed-0.0.39.tgz", + "integrity": "sha512-iW/0E8aQAZIVD6OAK2azY/5JCH77y2OPIjnNrjfQHmE6k05+51ABfsPospkZm+3S0jHrKuJ7ucImRLvKaR61Hg==", "dev": true, "dependencies": { "@types/node": "*", @@ -732,27 +732,27 @@ } }, "node_modules/@types/gulp-minify": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@types/gulp-minify/-/gulp-minify-3.1.4.tgz", - "integrity": "sha512-XgdrmmgsNcXHSaIpC6bxmLp3DnQSJeeiIzA57vgkefa30dOOh8/GGw9G7NyXN8Ss90YwKPFYjCtY7Wk1jFW7+A==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@types/gulp-minify/-/gulp-minify-3.1.5.tgz", + "integrity": "sha512-Dx6dQ/o+FcXJQ0XntPCu7hL5iYMFIudQTnc11Cx9ZoOGA6ycnllqlm6zRwiQpwVm6HrA/GLUwYdU2E2DwXGBAg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/html-pdf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/html-pdf/-/html-pdf-3.0.2.tgz", - "integrity": "sha512-54ZW4+zCgjV6gq4qxwW12eIvlrulZqYDpHciltpamkX/OwCOPBkNWcyHkhHzd/Z+7ak7x9ZXIv/h/0OYzIX2eA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/html-pdf/-/html-pdf-3.0.3.tgz", + "integrity": "sha512-Cw6EpCU5OdSG/yytol7hFNLHxwNoYqOeYL+1GqjhA3YBMJTC8mvT5tFmpLpjrj4WKqe7QoerX4pDwQcXsTotIA==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@types/http-errors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz", - "integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==", "dev": true }, "node_modules/@types/json-schema": { @@ -789,9 +789,9 @@ "dev": true }, "node_modules/@types/mocha": { - "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.3.tgz", - "integrity": "sha512-RsOPImTriV/OE4A9qKjMtk2MnXiuLLbcO3nCXK+kvq4nr0iMfFgpjaX3MPLb6f7+EL1FGSelYvuJMV6REH+ZPQ==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.4.tgz", + "integrity": "sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w==", "dev": true }, "node_modules/@types/ms": { @@ -801,9 +801,9 @@ "dev": true }, "node_modules/@types/multer": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.9.tgz", - "integrity": "sha512-9NSvPJ2E8bNTc8XtJq1Cimx2Wrn2Ah48F15B2Du/hM8a8CHLhVbJMlF3ZCqhvMdht7Sa+YdP0aKP7N4fxDcrrg==", + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/@types/multer/-/multer-1.4.10.tgz", + "integrity": "sha512-6l9mYMhUe8wbnz/67YIjc7ZJyQNZoKq7fRXVf7nMdgWgalD0KyzJ2ywI7hoATUSXSbTu9q2HBiEwzy0tNN1v2w==", "dev": true, "dependencies": { "@types/express": "*" @@ -826,9 +826,9 @@ } }, "node_modules/@types/node-windows": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@types/node-windows/-/node-windows-0.1.5.tgz", - "integrity": "sha512-pMuZvm53W8wFe82qAOZC4yeesnE0tCYRsgHxGy67qXI6Lr7H8ygChrNZNLQu8Bj5qGV4GXyr9oZEBVtqyEnfPA==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@types/node-windows/-/node-windows-0.1.6.tgz", + "integrity": "sha512-vbjaBtsF23Nprkw8rQFwskWzv5l6grWbUerYBHHjY/hqp/vIBAPGVQnr3dqsd75SwCQIAoZeBr/b+AbFFV/LfQ==", "dev": true, "dependencies": { "@types/node": "*" @@ -841,9 +841,9 @@ "dev": true }, "node_modules/@types/papaparse": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.10.tgz", - "integrity": "sha512-mS1Fta/xJ9EDYmAvpeWzcV9Gr0cOl1ClpW7di9+wSUNDIDO55tBtyXg97O7K+Syrd9rDEmuejM2iqmJIJ1SO5g==", + "version": "5.3.11", + "resolved": "https://registry.npmjs.org/@types/papaparse/-/papaparse-5.3.11.tgz", + "integrity": "sha512-ISil0lMkpRDrBTKRPnUgVb5IqxWwj19gWBrX/ROk3pbkkslBN3URa713r/BSfAUj+w9gTPg3S3f45aMToVfh1w==", "dev": true, "dependencies": { "@types/node": "*" diff --git a/package.json b/package.json index 2e0d422d..58ac75b7 100644 --- a/package.json +++ b/package.json @@ -56,26 +56,26 @@ "@cityssm/bulma-sticky-table": "^2.1.0", "@cityssm/bulma-webapp-css": "^0.12.0", "@cityssm/simple-fa5-checkbox": "^0.2.1", - "@types/activedirectory2": "^1.2.5", - "@types/better-sqlite3": "^7.6.6", - "@types/compression": "^1.7.4", - "@types/cookie-parser": "^1.4.5", - "@types/csurf": "^1.11.4", - "@types/debug": "^4.1.10", - "@types/ejs": "^3.1.4", - "@types/express": "^4.17.20", - "@types/express-serve-static-core": "^4.17.39", - "@types/express-session": "^1.17.9", + "@types/activedirectory2": "^1.2.6", + "@types/better-sqlite3": "^7.6.7", + "@types/compression": "^1.7.5", + "@types/cookie-parser": "^1.4.6", + "@types/csurf": "^1.11.5", + "@types/debug": "^4.1.11", + "@types/ejs": "^3.1.5", + "@types/express": "^4.17.21", + "@types/express-serve-static-core": "^4.17.41", + "@types/express-session": "^1.17.10", "@types/gulp": "^4.0.16", - "@types/gulp-changed": "^0.0.38", - "@types/gulp-minify": "^3.1.4", - "@types/html-pdf": "^3.0.2", - "@types/http-errors": "^2.0.3", - "@types/mocha": "^10.0.3", - "@types/multer": "^1.4.9", + "@types/gulp-changed": "^0.0.39", + "@types/gulp-minify": "^3.1.5", + "@types/html-pdf": "^3.0.3", + "@types/http-errors": "^2.0.4", + "@types/mocha": "^10.0.4", + "@types/multer": "^1.4.10", "@types/node-fetch": "^3.0.2", - "@types/node-windows": "^0.1.5", - "@types/papaparse": "^5.3.10", + "@types/node-windows": "^0.1.6", + "@types/papaparse": "^5.3.11", "@types/session-file-store": "^1.2.4", "@types/set-interval-async": "^1.0.2", "bulma": "^0.9.4", diff --git a/test/parkingDB.js b/test/parkingDB.js index e98411dc..76b7f779 100644 --- a/test/parkingDB.js +++ b/test/parkingDB.js @@ -126,7 +126,7 @@ describe('database/parkingDB', () => { }); it('should execute getConvictionBatch()', () => { const batch = parkingDB_getConvictionBatch.getConvictionBatch(-1); - assert.ok(batch === undefined || batch.lockDate === undefined); + assert.ok(batch?.lockDate === undefined); }); it('should execute parkingDB_isConvictionBatchUpdatable()', () => { const isConvicted = parkingDB_isConvictionBatchUpdatable.isConvictionBatchUpdatable(-1); diff --git a/test/parkingDB.ts b/test/parkingDB.ts index 95a69a6d..d8a6dcd7 100644 --- a/test/parkingDB.ts +++ b/test/parkingDB.ts @@ -227,7 +227,7 @@ describe('database/parkingDB', () => { it('should execute getConvictionBatch()', () => { const batch = parkingDB_getConvictionBatch.getConvictionBatch(-1) - assert.ok(batch === undefined || batch.lockDate === undefined) + assert.ok(batch?.lockDate === undefined) }) it('should execute parkingDB_isConvictionBatchUpdatable()', () => {