@nsshunt/stsdatamanagement 1.18.209 → 1.18.210

package/dist/pgaccesslayer.js

@@ -1,10 +1,10 @@
 /* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
-import { StatusCodes } from 'http-status-codes';
+import { StatusCodes } from "http-status-codes";
 import { Redis } from "ioredis";
-import { goptions } from '@nsshunt/stsconfig';
-import { PGPoolManager } from './pgpoolmanager.js';
-import { IDBAccessLayerEvents, eOperations } from './commonTypes.js';
-import { TinyEmitter } from 'tiny-emitter';
+import { goptions } from "@nsshunt/stsconfig";
+import { PGPoolManager } from "./pgpoolmanager.js";
+import { IDBAccessLayerEvents, eOperations, } from "./commonTypes.js";
+import { TinyEmitter } from "tiny-emitter";
 export var updateMode;
 (function (updateMode) {
     updateMode[updateMode["patchResources"] = 0] = "patchResources";
@@ -25,13 +25,13 @@ export class PGAccessLayer extends TinyEmitter {
         const { useRedisDatabaseCache, redisDatabaseCacheUrl } = goptions;
         this.#poolManager = new PGPoolManager({
             logger: this.#options.logger,
-            usedefaultdb: this.#options.usedefaultdb
+            usedefaultdb: this.#options.usedefaultdb,
         });
         this.#poolManager.on(IDBAccessLayerEvents.UpdateInstruments, this.#UpdateInstruments);
         if (useRedisDatabaseCache === true) {
             const redisOptions = {
                 showFriendlyErrorStack: true,
-                maxRetriesPerRequest: 20
+                maxRetriesPerRequest: 20,
             };
             this.#cache = new Redis(redisDatabaseCacheUrl, redisOptions);
         }
@@ -46,48 +46,50 @@ export class PGAccessLayer extends TinyEmitter {
         this.#options.logger.error(message);
     };
     #buildQueryString = (filters, restype) => {
-        const { resname, entname, resvnum, entvnum, filter, incdel, startdate, enddate, resenddate, dbaction, dbactionuser } = filters;
+        const { resname, entname, resvnum, entvnum, filter, incdel, startdate, enddate, resenddate, dbaction, dbactionuser, } = filters;
         // Build query string
         const qparams = [];
-        let qstring = ' where ';
-        let sep = '';
+        let qstring = " where ";
+        let sep = "";
         let qnum = 0;
         if (resname !== undefined) {
             qparams.push(resname);
-            qstring += sep + 'r.resname = $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + "r.resname = $" + ++qnum;
+            sep = " and ";
         }
         if (entname !== undefined) {
             qparams.push(entname);
-            qstring += sep + 'e.entname = $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + "e.entname = $" + ++qnum;
+            sep = " and ";
         }
         if (resvnum !== undefined) {
             qparams.push(resvnum);
-            qstring += sep + 'r.vnum = $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + "r.vnum = $" + ++qnum;
+            sep = " and ";
         }
         if (entvnum !== undefined) {
             qparams.push(entvnum);
-            qstring += sep + 'e.vnum = $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + "e.vnum = $" + ++qnum;
+            sep = " and ";
         }
         // Only get current version provided enddate is not specified
         if (enddate === undefined) {
-            qstring += sep + restype + '.validto is null';
-            sep = ' and ';
+            qstring += sep + restype + ".validto is null";
+            sep = " and ";
         }
-        if (Object.hasOwn(filters, 'resenddate') && resenddate === null) {
-            qstring += sep + 'r.validto is null';
-            sep = ' and ';
+        if (Object.hasOwn(filters, "resenddate") && resenddate === null) {
+            qstring += sep + "r.validto is null";
+            sep = " and ";
         }
         if (filter !== undefined) {
-            if (restype === 'r') {
+            if (restype === "r") {
                 // This old method using LIKE and % is slow AF esp when using order by in the clause
                 // qparams.push(filter);
                 // qstring += sep + restype + '.resname like $' + ++qnum;
                 let useFilter = filter;
-                if (filter && filter.length > 0 && filter.charAt(filter.length - 1) === '%') {
+                if (filter &&
+                    filter.length > 0 &&
+                    filter.charAt(filter.length - 1) === "%") {
                     useFilter = filter.slice(0, -1);
                 }
                 qparams.push(useFilter);
@@ -101,7 +103,9 @@ export class PGAccessLayer extends TinyEmitter {
                 //qparams.push(filter);
                 //qstring += sep + restype + '.entname like $' + ++qnum;
                 let useFilter = filter;
-                if (filter && filter.length > 0 && filter.charAt(filter.length - 1) === '%') {
+                if (filter &&
+                    filter.length > 0 &&
+                    filter.charAt(filter.length - 1) === "%") {
                     useFilter = filter.slice(0, -1);
                 }
                 qparams.push(useFilter);
@@ -110,32 +114,32 @@ export class PGAccessLayer extends TinyEmitter {
                 const p2 = ++qnum;
                 qstring += `${sep}${restype}.entname >= $${p1} and ${restype}.entname < $${p2}`;
             }
-            sep = ' and ';
+            sep = " and ";
         }
         if (startdate !== undefined) {
             qparams.push(startdate);
-            qstring += sep + restype + '.validfrom >= $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + restype + ".validfrom >= $" + ++qnum;
+            sep = " and ";
         }
         if (enddate !== undefined) {
             qparams.push(enddate);
-            qstring += sep + restype + '.validto <= $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + restype + ".validto <= $" + ++qnum;
+            sep = " and ";
         }
-        if (incdel === undefined || incdel.toLowerCase() === 'n') {
+        if (incdel === undefined || incdel.toLowerCase() === "n") {
             qparams.push(3);
-            qstring += sep + restype + '.dbaction != $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + restype + ".dbaction != $" + ++qnum;
+            sep = " and ";
         }
         if (dbaction !== undefined) {
             qparams.push(dbaction);
-            qstring += sep + restype + '.dbaction = $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + restype + ".dbaction = $" + ++qnum;
+            sep = " and ";
         }
         if (dbactionuser !== undefined) {
             qparams.push(dbactionuser);
-            qstring += sep + restype + '.dbactionuser = $' + ++qnum;
-            sep = ' and ';
+            qstring += sep + restype + ".dbactionuser = $" + ++qnum;
+            sep = " and ";
         }
         if (qnum === 0) {
             return null;
@@ -145,10 +149,10 @@ export class PGAccessLayer extends TinyEmitter {
         }
     };
     #IsErrorWithMessage = (error) => {
-        return (typeof error === 'object' &&
+        return (typeof error === "object" &&
             error !== null &&
-            'message' in error &&
-            typeof error.message === 'string');
+            "message" in error &&
+            typeof error.message === "string");
     };
     #ToErrorWithMessage = (maybeError) => {
         if (this.#IsErrorWithMessage(maybeError))
@@ -172,8 +176,8 @@ export class PGAccessLayer extends TinyEmitter {
                 status,
                 operation: fname.toString(),
                 error: new Error(message),
-                errorMessage: message
-            }
+                errorMessage: message,
+            },
         };
     };
     #LogAndGetErrorMessage = (options, status, fname, message) => {
@@ -204,24 +208,24 @@ export class PGAccessLayer extends TinyEmitter {
         return true;
     }
     async GetResourceCount(options) {
-        const useOptions = (options ? options : {});
+        const useOptions = options ? options : {};
         try {
             let query = `select count(*) from stsresource r`;
             let values = [];
-            const qs = this.#buildQueryString((options ? options.filters : {}), 'r');
+            const qs = this.#buildQueryString((options ? options.filters : {}), "r");
             if (qs !== null) {
                 query += qs.qstring;
                 values = qs.qparams;
             }
-            const client = await this.#poolManager?.connectReadOnly();
+            const client = (await this.#poolManager?.connectReadOnly());
             try {
                 const { rows } = await client.query(query, values);
                 const dbResponse = rows[0];
                 return {
                     options: useOptions,
-                    operation: 'GetResourceCount',
+                    operation: "GetResourceCount",
                     status: StatusCodes.OK,
-                    detail: parseInt(dbResponse.count) //@@ needs to be number
+                    detail: parseInt(dbResponse.count), //@@ needs to be number
                 };
             }
             catch (error) {
@@ -237,20 +241,22 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async GetEntityCount(options) {
         try {
-            const requiredFields = ['resname'];
-            const checkAllKeys = requiredFields.every(f => Object.hasOwn(options.filters, f));
+            const requiredFields = ["resname"];
+            const checkAllKeys = requiredFields.every((f) => Object.hasOwn(options.filters, f));
             if (checkAllKeys) {
                 let query = `select count(*) from stsentity e join stsresource r on e.resourceoid = r.oid`;
                 let values = [];
-                const qs = this.#buildQueryString((options ? {
-                    resenddate: null,
-                    ...options.filters
-                } : {}), 'e');
+                const qs = this.#buildQueryString((options
+                    ? {
+                        resenddate: null,
+                        ...options.filters,
+                    }
+                    : {}), "e");
                 if (qs !== null) {
                     query += qs.qstring;
                     values = qs.qparams;
                 }
-                const client = await this.#poolManager?.connectReadOnly();
+                const client = (await this.#poolManager?.connectReadOnly());
                 try {
                     const { rows } = await client.query(query, values);
                     const dbResponse = rows[0];
@@ -258,7 +264,7 @@ export class PGAccessLayer extends TinyEmitter {
                         status: StatusCodes.OK,
                         options,
                         detail: parseInt(dbResponse.count), //@@ needs to be number
-                        operation: 'GetEntityCount'
+                        operation: "GetEntityCount",
                     };
                 }
                 catch (error) {
@@ -277,15 +283,15 @@ export class PGAccessLayer extends TinyEmitter {
         }
     }
     async #__CreateResource(client, options, operation, resource) {
-        const requiredFields = ['dbactionuser', 'resname'];
-        const checkAllKeys = requiredFields.every(f => Object.hasOwn(options.filters, f));
+        const requiredFields = ["dbactionuser", "resname"];
+        const checkAllKeys = requiredFields.every((f) => Object.hasOwn(options.filters, f));
         if (checkAllKeys) {
             let createQuery = null;
             createQuery = `select * from create_stsresource($1, $2, $3)`;
             const values = [
                 options.filters?.dbactionuser,
                 options.filters?.resname,
-                JSON.stringify(resource)
+                JSON.stringify(resource),
             ];
             try {
                 const { rows } = await client.query(createQuery, values);
@@ -295,11 +301,11 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.CREATED,
                     detail: dbResponse,
                     options,
-                    operation
+                    operation,
                 };
             }
             catch (error) {
-                if (error.code === '23505') {
+                if (error.code === "23505") {
                     return this.#LogAndGetErrorMessage(options, StatusCodes.CONFLICT, eOperations.CreateResource, `pgaccesslayer:__CreateResource(): resourceid [${options.filters?.resname}] already exists. Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 else {
@@ -313,20 +319,20 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async CreateResource(options, resource) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const retVal = await this.#__CreateResource(client, options, eOperations.CreateResource, resource);
                 if (retVal.status === StatusCodes.CREATED) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.CreateResource, `pgaccesslayer:CreateResource(): Operation was not successful (__CreateResource). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -339,13 +345,13 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async #__GetResource(client, options) {
         try {
-            const requiredFields = ['resname'];
-            const checkAllKeys = requiredFields.every(f => Object.hasOwn(options.filters, f));
+            const requiredFields = ["resname"];
+            const checkAllKeys = requiredFields.every((f) => Object.hasOwn(options.filters, f));
             if (checkAllKeys) {
-                let query = 'select r.oid::bigint, r.resname, r.resdesc, r.vnum::bigint, r.validfrom, r.validto, r.dbaction, r.dbactionuser from stsresource r';
+                let query = "select r.oid::bigint, r.resname, r.resdesc, r.vnum::bigint, r.validfrom, r.validto, r.dbaction, r.dbactionuser from stsresource r";
                 let values = [];
                 const resourceid = options.filters?.resname;
-                const qs = this.#buildQueryString(options.filters, 'r');
+                const qs = this.#buildQueryString(options.filters, "r");
                 if (qs !== null) {
                     query += qs.qstring;
                     values = qs.qparams;
@@ -371,7 +377,7 @@ export class PGAccessLayer extends TinyEmitter {
                         status: StatusCodes.OK,
                         detail: dbResponse,
                         operation: eOperations.GetResource,
-                        options
+                        options,
                     };
                 }
                 catch (error) {
@@ -390,10 +396,12 @@ export class PGAccessLayer extends TinyEmitter {
         try {
             let client;
             if (options.useMultipleDatabases) {
-                client = await this.#poolManager?.connectReadOnly();
+                client =
+                    (await this.#poolManager?.connectReadOnly());
             }
             else {
-                client = await this.#poolManager?.connectReadWrite();
+                client =
+                    (await this.#poolManager?.connectReadWrite());
             }
             const retVal = await this.#__GetResource(client, options);
             client.release();
@@ -409,7 +417,7 @@ export class PGAccessLayer extends TinyEmitter {
             const values = [
                 options.filters?.dbactionuser,
                 options.filters?.resname,
-                JSON.stringify(resource)
+                JSON.stringify(resource),
             ];
             try {
                 const { rows } = await client.query(createQuery, values);
@@ -419,11 +427,11 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.OK,
                     detail: dbResponse,
                     operation,
-                    options
+                    options,
                 };
             }
             catch (error) {
-                if (error.code === 'P0002') {
+                if (error.code === "P0002") {
                     return this.#LogAndGetErrorMessage(options, StatusCodes.NOT_FOUND, eOperations.UpdateResource, `pgaccesslayer:__UpdateResource(): resourceid [${options.filters?.resname}] not found or not current. Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 else {
@@ -437,20 +445,20 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async UpdateResource(options, resource) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const retVal = await this.#__UpdateResource(client, options, eOperations.UpdateResource, resource);
                 if (retVal.status === StatusCodes.OK) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.UpdateResource, `pgaccesslayer:UpdateResource(): Operation was not successful (__GetResource). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -463,28 +471,31 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async PatchResource(options, resource) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const currentResource = await this.#__GetResource(client, options);
                 if (currentResource.status === StatusCodes.OK) {
-                    const updatedRecord = { ...currentResource.detail.resdesc, ...resource };
+                    const updatedRecord = {
+                        ...currentResource.detail.resdesc,
+                        ...resource,
+                    };
                     const retVal = await this.#__UpdateResource(client, options, eOperations.PatchResource, updatedRecord);
                     if (retVal.status === StatusCodes.OK) {
-                        await client.query('COMMIT');
+                        await client.query("COMMIT");
                     }
                     else {
-                        await client.query('ROLLBACK');
+                        await client.query("ROLLBACK");
                     }
                     return retVal;
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                     return currentResource;
                 }
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.PatchResource, `pgaccesslayer:PatchResource(): Operation was not successful (__GetResource). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -497,75 +508,109 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async #__UpdateOrPatchResources(resourceParameterRecords, mode, operation) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const promArray = [];
-                resourceParameterRecords.forEach(rpr => {
+                resourceParameterRecords.forEach((rpr) => {
                     const UpdateRecordPromise = new Promise((resolve, reject) => {
-                        if (mode === updateMode.updateResources || mode === updateMode.patchResources || mode === updateMode.deleteResources) {
-                            this.#__GetResource(client, rpr.opitons).then((currentResource) => {
-                                if (currentResource.status === StatusCodes.OK) {
+                        if (mode === updateMode.updateResources ||
+                            mode === updateMode.patchResources ||
+                            mode === updateMode.deleteResources) {
+                            this.#__GetResource(client, rpr.opitons)
+                                .then((currentResource) => {
+                                if (currentResource.status ===
+                                    StatusCodes.OK) {
                                     let updatedRecord;
                                     switch (mode) {
                                         case updateMode.patchResources:
-                                            updatedRecord = { ...currentResource.detail.resdesc, ...rpr.resource };
-                                            this.#__UpdateResource(client, rpr.opitons, operation, updatedRecord).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                            updatedRecord = {
+                                                ...currentResource.detail.resdesc,
+                                                ...rpr.resource,
+                                            };
+                                            this.#__UpdateResource(client, rpr.opitons, operation, updatedRecord)
+                                                .then((retVal) => resolve(retVal))
+                                                .catch((error) => reject(error));
                                             break;
                                         case updateMode.updateResources:
                                             updatedRecord = rpr.resource;
-                                            this.#__UpdateResource(client, rpr.opitons, operation, updatedRecord).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                            this.#__UpdateResource(client, rpr.opitons, operation, updatedRecord)
+                                                .then((retVal) => resolve(retVal))
+                                                .catch((error) => reject(error));
                                             break;
                                         case updateMode.deleteResources:
-                                            this.#__DeleteResource(client, rpr.opitons, operation).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                            this.#__DeleteResource(client, rpr.opitons, operation)
+                                                .then((retVal) => resolve(retVal))
+                                                .catch((error) => reject(error));
                                             break;
                                         default:
                                             reject(`pgaccesslayer:#__UpdateOrPatchResources(): Unknown mode (resource): [${mode}]`);
                                     }
                                 }
-                                else if (currentResource.status === StatusCodes.NOT_FOUND
-                                    && mode === updateMode.updateResources
-                                    && !rpr.opitons.errorOnBatchUpdate) {
+                                else if (currentResource.status ===
+                                    StatusCodes.NOT_FOUND &&
+                                    mode ===
+                                        updateMode.updateResources &&
+                                    !rpr.opitons.errorOnBatchUpdate) {
                                     const createNewResourceRecord = rpr.resource;
-                                    this.#__CreateResource(client, rpr.opitons, eOperations.UpdateResources, createNewResourceRecord).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                    this.#__CreateResource(client, rpr.opitons, eOperations.UpdateResources, createNewResourceRecord)
+                                        .then((retVal) => resolve(retVal))
+                                        .catch((error) => reject(error));
                                 }
                                 else {
                                     resolve(currentResource);
                                 }
-                            }).catch((error) => {
+                            })
+                                .catch((error) => {
                                 reject(error);
                             });
                         }
                         else {
-                            this.#__GetEntity(client, rpr.opitons).then((currentEntity) => {
-                                if (currentEntity.status === StatusCodes.OK) {
+                            this.#__GetEntity(client, rpr.opitons)
+                                .then((currentEntity) => {
+                                if (currentEntity.status ===
+                                    StatusCodes.OK) {
                                     let updatedRecord;
                                     switch (mode) {
                                         case updateMode.patchEntities:
-                                            updatedRecord = { ...currentEntity.detail.entvalue, ...rpr.entity };
-                                            this.#__UpdateEntity(client, rpr.opitons, operation, updatedRecord).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                            updatedRecord = {
+                                                ...currentEntity.detail.entvalue,
+                                                ...rpr.entity,
+                                            };
+                                            this.#__UpdateEntity(client, rpr.opitons, operation, updatedRecord)
+                                                .then((retVal) => resolve(retVal))
+                                                .catch((error) => reject(error));
                                             break;
                                         case updateMode.updateEntities:
                                             updatedRecord = rpr.entity;
-                                            this.#__UpdateEntity(client, rpr.opitons, operation, updatedRecord).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                            this.#__UpdateEntity(client, rpr.opitons, operation, updatedRecord)
+                                                .then((retVal) => resolve(retVal))
+                                                .catch((error) => reject(error));
                                             break;
                                         case updateMode.deleteEntities:
-                                            this.#__DeleteEntity(client, rpr.opitons, operation).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                            this.#__DeleteEntity(client, rpr.opitons, operation)
+                                                .then((retVal) => resolve(retVal))
+                                                .catch((error) => reject(error));
                                             break;
                                         default:
                                             reject(`pgaccesslayer:#__UpdateOrPatchResources(): Unknown mode (entity): [${mode}]`);
                                     }
                                 }
-                                else if (currentEntity.status === StatusCodes.NOT_FOUND
-                                    && mode === updateMode.updateEntities
-                                    && !rpr.opitons.errorOnBatchUpdate) {
+                                else if (currentEntity.status ===
+                                    StatusCodes.NOT_FOUND &&
+                                    mode ===
+                                        updateMode.updateEntities &&
+                                    !rpr.opitons.errorOnBatchUpdate) {
                                     const createNewEntityRecord = rpr.entity;
-                                    this.#__CreateEntity(client, rpr.opitons, eOperations.UpdateEntities, createNewEntityRecord).then(retVal => resolve(retVal)).catch(error => reject(error));
+                                    this.#__CreateEntity(client, rpr.opitons, eOperations.UpdateEntities, createNewEntityRecord)
+                                        .then((retVal) => resolve(retVal))
+                                        .catch((error) => reject(error));
                                 }
                                 else {
                                     resolve(currentEntity);
                                 }
-                            }).catch((error) => {
+                            })
+                                .catch((error) => {
                                 reject(error);
                             });
                         }
@@ -577,18 +622,20 @@ export class PGAccessLayer extends TinyEmitter {
                     promRetVal = await Promise.all(promArray);
                 }
                 catch (error) {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                     return this.#LogAndGetErrorMessage({}, StatusCodes.INTERNAL_SERVER_ERROR, operation, `pgaccesslayer:#__UpdateOrPatchResources(): Operation was not successful (Promise.all(promArray)). Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 const retVal = {
                     status: StatusCodes.OK,
                     detail: [],
                     options: {},
-                    operation: operation
+                    operation: operation,
                 };
-                promRetVal.forEach(prv => {
-                    if (!(prv.status === StatusCodes.OK || prv.status === StatusCodes.CREATED)) {
-                        if (retVal.status === StatusCodes.OK) { // only set the first error
+                promRetVal.forEach((prv) => {
+                    if (!(prv.status === StatusCodes.OK ||
+                        prv.status === StatusCodes.CREATED)) {
+                        if (retVal.status === StatusCodes.OK) {
+                            // only set the first error
                             const message = `pgaccesslayer:#__UpdateOrPatchResources(): Operation was not successful. Check array for specific details.`;
                             retVal.status = StatusCodes.INTERNAL_SERVER_ERROR;
                             retVal.options = prv.options;
@@ -597,25 +644,25 @@ export class PGAccessLayer extends TinyEmitter {
                                 error: new Error(message),
                                 errorMessage: message,
                                 operation: prv.operation,
-                                status: StatusCodes.INTERNAL_SERVER_ERROR
+                                status: StatusCodes.INTERNAL_SERVER_ERROR,
                             };
                         }
                     }
                     retVal.detail.push(prv);
                 });
                 if (retVal.status === StatusCodes.OK) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    retVal.detail.forEach(detail => {
+                    retVal.detail.forEach((detail) => {
                         detail.detail = null;
                     });
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage({}, StatusCodes.INTERNAL_SERVER_ERROR, operation, `pgaccesslayer:__#UpdateOrPatchResources(): Operation was not successful (Promise processing). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -649,7 +696,7 @@ export class PGAccessLayer extends TinyEmitter {
             const createQuery = `select * from delete_stsresource_latest($1, $2)`;
             const values = [
                 options.filters?.dbactionuser,
-                options.filters?.resname
+                options.filters?.resname,
             ];
             try {
                 const { rows } = await client.query(createQuery, values);
@@ -659,11 +706,11 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.OK,
                     detail: dbResponse,
                     options,
-                    operation
+                    operation,
                 };
             }
             catch (error) {
-                if (error.code === 'P0002') {
+                if (error.code === "P0002") {
                     return this.#LogAndGetErrorMessage(options, StatusCodes.NOT_FOUND, eOperations.DeleteResource, `pgaccesslayer:DeleteResource(): resourceid [${options.filters?.resname}] not found or not current. Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 else {
@@ -677,20 +724,20 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async DeleteResource(options) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const retVal = await this.#__DeleteResource(client, options, eOperations.DeleteResource);
                 if (retVal.status === StatusCodes.OK) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.DeleteResource, `pgaccesslayer:DeleteResource(): Operation was not successful (__GetResource). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -702,18 +749,18 @@ export class PGAccessLayer extends TinyEmitter {
         }
     }
     async #__CreateEntity(client, options, operation, entity) {
-        const requiredFields = ['dbactionuser', 'resname', 'entname'];
-        const checkAllKeys = requiredFields.every(f => Object.hasOwn(options.filters, f));
+        const requiredFields = ["dbactionuser", "resname", "entname"];
+        const checkAllKeys = requiredFields.every((f) => Object.hasOwn(options.filters, f));
         if (checkAllKeys) {
             const createQuery = `select * from create_stsentity_latest($1, $2, $3, $4)`;
             const values = [
                 options.filters?.dbactionuser,
                 options.filters?.resname,
                 options.filters?.entname,
-                JSON.stringify(entity)
+                JSON.stringify(entity),
             ];
             try {
-                const { rows } = (await client.query(createQuery, values));
+                const { rows } = await client.query(createQuery, values);
                 const dbResponse = rows[0];
                 // Convert the resourceoid to a string
                 dbResponse.resourceoid = dbResponse.resourceoid.toString();
@@ -722,11 +769,11 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.CREATED,
                     detail: dbResponse,
                     options,
-                    operation
+                    operation,
                 };
             }
             catch (error) {
-                if (error.code === '23505') {
+                if (error.code === "23505") {
                     return this.#LogAndGetErrorMessage(options, StatusCodes.CONFLICT, eOperations.CreateEntity, `pgaccesslayer:CreateEntity(): entityid [${options.filters?.entname}] already exists. Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 else {
@@ -740,20 +787,20 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async CreateEntity(options, entity) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const retVal = await this.#__CreateEntity(client, options, eOperations.CreateEntity, entity);
                 if (retVal.status === StatusCodes.CREATED) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.CreateEntity, `pgaccesslayer:CreateEntity(): Operation was not successful. Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -766,15 +813,15 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async #__GetEntity(client, options) {
         try {
-            const requiredFields = ['resname', 'entname'];
-            const checkAllKeys = requiredFields.every(f => Object.hasOwn(options.filters, f));
+            const requiredFields = ["resname", "entname"];
+            const checkAllKeys = requiredFields.every((f) => Object.hasOwn(options.filters, f));
             if (checkAllKeys) {
-                let query = 'select e.* from stsentity e join stsresource r on e.resourceoid = r.oid';
+                let query = "select e.* from stsentity e join stsresource r on e.resourceoid = r.oid";
                 let values = [];
                 const qs = this.#buildQueryString({
                     resenddate: null,
-                    ...options.filters
-                }, 'e');
+                    ...options.filters,
+                }, "e");
                 //let entityid = filters.entname;
                 if (qs !== null) {
                     query += qs.qstring;
@@ -797,7 +844,7 @@ export class PGAccessLayer extends TinyEmitter {
                         status: StatusCodes.OK,
                         detail: dbResponse,
                         options,
-                        operation: eOperations.GetEntity
+                        operation: eOperations.GetEntity,
                     };
                 }
                 catch (error) {
@@ -814,7 +861,7 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async GetEntity(options) {
         try {
-            const client = await this.#poolManager?.connectReadOnly();
+            const client = (await this.#poolManager?.connectReadOnly());
             const retVal = await this.#__GetEntity(client, options);
             client.release();
             return retVal;
@@ -830,7 +877,7 @@ export class PGAccessLayer extends TinyEmitter {
                 options.filters?.dbactionuser,
                 options.filters?.resname,
                 options.filters?.entname,
-                JSON.stringify(entity)
+                JSON.stringify(entity),
             ];
             try {
                 const { rows } = await client.query(createQuery, values);
@@ -842,11 +889,11 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.OK,
                     detail: dbResponse,
                     options,
-                    operation
+                    operation,
                 };
             }
             catch (error) {
-                if (error.code === 'P0002') {
+                if (error.code === "P0002") {
                     return this.#LogAndGetErrorMessage(options, StatusCodes.NOT_FOUND, eOperations.UpdateEntity, `resname: [${options.filters?.resname}], entname: [${options.filters?.entname}] not found or not current. Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 else {
@@ -860,20 +907,20 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async UpdateEntity(options, entity) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const retVal = await this.#__UpdateEntity(client, options, eOperations.UpdateEntity, entity);
                 if (retVal.status === StatusCodes.OK) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.UpdateEntity, `pgaccesslayer:GetEntity(): Operation was not successful (__GetEntity). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -886,28 +933,31 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async PatchEntity(options, entity) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const currentEntity = await this.#__GetEntity(client, options);
                 if (currentEntity.status === StatusCodes.OK) {
-                    const updatedRecord = { ...currentEntity.detail.entvalue, ...entity };
+                    const updatedRecord = {
+                        ...currentEntity.detail.entvalue,
+                        ...entity,
+                    };
                     const retVal = await this.#__UpdateEntity(client, options, eOperations.PatchEntity, updatedRecord);
                     if (retVal.status === StatusCodes.OK) {
-                        await client.query('COMMIT');
+                        await client.query("COMMIT");
                     }
                     else {
-                        await client.query('ROLLBACK');
+                        await client.query("ROLLBACK");
                     }
                     return retVal;
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                     return currentEntity;
                 }
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.PatchEntity, `pgaccesslayer:PatchEntity(): Operation was not successful (__GetEntity). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -924,7 +974,7 @@ export class PGAccessLayer extends TinyEmitter {
             const values = [
                 options.filters?.dbactionuser,
                 options.filters?.resname,
-                options.filters?.entname
+                options.filters?.entname,
             ];
             try {
                 const { rows } = await client.query(createQuery, values);
@@ -936,11 +986,11 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.OK,
                     detail: dbResponse,
                     options,
-                    operation
+                    operation,
                 };
             }
             catch (error) {
-                if (error.code === 'P0002') {
+                if (error.code === "P0002") {
                     return this.#LogAndGetErrorMessage(options, StatusCodes.NOT_FOUND, eOperations.DeleteEntity, `resname: [${options.filters?.resname}], entname: [${options.filters?.entname}] not found or not current. Error: [${this.#ToErrorWithMessage(error).message}]`);
                 }
                 else {
@@ -954,20 +1004,20 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async DeleteEntity(options) {
         try {
-            const client = await this.#poolManager?.connectReadWrite();
+            const client = (await this.#poolManager?.connectReadWrite());
             try {
-                await client.query('BEGIN');
+                await client.query("BEGIN");
                 const retVal = await this.#__DeleteEntity(client, options, eOperations.DeleteEntity);
                 if (retVal.status === StatusCodes.OK) {
-                    await client.query('COMMIT');
+                    await client.query("COMMIT");
                 }
                 else {
-                    await client.query('ROLLBACK');
+                    await client.query("ROLLBACK");
                 }
                 return retVal;
             }
             catch (error) {
-                await client.query('ROLLBACK');
+                await client.query("ROLLBACK");
                 return this.#LogAndGetErrorMessage(options, StatusCodes.INTERNAL_SERVER_ERROR, eOperations.DeleteEntity, `pgaccesslayer:DeleteEntity(): Operation was not successful (__GetEntity). Error: [${this.#ToErrorWithMessage(error).message}]`);
             }
             finally {
@@ -979,11 +1029,11 @@ export class PGAccessLayer extends TinyEmitter {
         }
     }
     async GetResources(options) {
-        const useOptions = (options ? options : {});
+        const useOptions = options ? options : {};
         try {
-            let query = 'select r.* from stsresource r';
+            let query = "select r.* from stsresource r";
             let values = [];
-            const qs = this.#buildQueryString((options ? options.filters : {}), 'r');
+            const qs = this.#buildQueryString((options ? options.filters : {}), "r");
             if (qs !== null) {
                 query += qs.qstring;
                 values = qs.qparams;
@@ -992,21 +1042,21 @@ export class PGAccessLayer extends TinyEmitter {
             if (options && options.filters && options.filters.limit) {
                 query += ` limit ${options.filters.limit}`;
             }
-            const client = await this.#poolManager?.connectReadOnly();
+            const client = (await this.#poolManager?.connectReadOnly());
             try {
                 //const start = performance.now();
                 const { rows } = await client.query(query, values);
                 const dbResponse = rows;
                 //const end = performance.now();
                 //console.log(chalk.green(`QQQ: [${query}] [${values}] ${end - start}`));
-                dbResponse.forEach(r => {
+                dbResponse.forEach((r) => {
                     r.resdesc = this.#JSONParse(r.resdesc);
                 });
                 return {
                     status: StatusCodes.OK,
                     detail: dbResponse,
                     options: useOptions,
-                    operation: eOperations.GetResources
+                    operation: eOperations.GetResources,
                 };
             }
             catch (error) {
@@ -1022,15 +1072,17 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async GetEntities(options) {
         try {
-            const requiredFields = ['resname'];
-            const checkAllKeys = requiredFields.every(f => Object.hasOwn(options.filters, f));
+            const requiredFields = ["resname"];
+            const checkAllKeys = requiredFields.every((f) => Object.hasOwn(options.filters, f));
             if (checkAllKeys) {
                 let query = `select e.* from stsentity e join stsresource r on e.resourceoid = r.oid`;
                 let values = [];
-                const qs = this.#buildQueryString((options ? {
-                    resenddate: null,
-                    ...options.filters
-                } : {}), 'e');
+                const qs = this.#buildQueryString((options
+                    ? {
+                        resenddate: null,
+                        ...options.filters,
+                    }
+                    : {}), "e");
                 if (qs !== null) {
                     query += qs.qstring;
                     values = qs.qparams;
@@ -1039,14 +1091,14 @@ export class PGAccessLayer extends TinyEmitter {
                 if (options && options.filters && options.filters.limit) {
                     query += ` limit ${options.filters.limit}`;
                 }
-                const client = await this.#poolManager?.connectReadOnly();
+                const client = (await this.#poolManager?.connectReadOnly());
                 try {
                     //const start = performance.now();
                     const { rows } = await client.query(query, values);
                     const dbResponse = rows;
                     //const end = performance.now();
                     //console.log(chalk.green(`YYY: [${query}] [${values}] ${end - start}`));
-                    dbResponse.forEach(r => {
+                    dbResponse.forEach((r) => {
                         // Convert the resourceoid to a string
                         r.resourceoid = r.resourceoid.toString();
                         r.entvalue = this.#JSONParse(r.entvalue);
@@ -1055,7 +1107,7 @@ export class PGAccessLayer extends TinyEmitter {
                         status: StatusCodes.OK,
                         detail: dbResponse,
                         options,
-                        operation: eOperations.GetEntities
+                        operation: eOperations.GetEntities,
                     };
                 }
                 catch (error) {
@@ -1075,14 +1127,14 @@ export class PGAccessLayer extends TinyEmitter {
     }
     async #__SearchResources(client, options, searchOptions) {
         try {
-            const useOptions = (options ? options : {});
-            let paramList = '(';
-            let paramSep = '';
+            const useOptions = options ? options : {};
+            let paramList = "(";
+            let paramSep = "";
             for (let i = 0; i < Object.values(searchOptions.searchParameters).length; i++) {
-                paramList = paramList + paramSep + '$' + (i + 1).toString();
-                paramSep = ', ';
+                paramList = paramList + paramSep + "$" + (i + 1).toString();
+                paramSep = ", ";
             }
-            paramList = paramList + ')';
+            paramList = paramList + ")";
             let query = `select * from ${searchOptions.queryFunctionName}${paramList}`;
             let values = Object.values(searchOptions.searchParameters);
             try {
@@ -1090,10 +1142,10 @@ export class PGAccessLayer extends TinyEmitter {
                 let dbResponse;
                 if (searchOptions.returnsResourceList === true) {
                     dbResponse = rows;
-                    dbResponse.forEach(r => {
+                    dbResponse.forEach((r) => {
                         try {
                             r.resdesc = this.#JSONParse(r.resdesc);
-                            // eslint-disable-next-line  @typescript-eslint/no-unused-vars                                
+                            // eslint-disable-next-line  @typescript-eslint/no-unused-vars
                         }
                         catch (error) {
                             // Do nothing
@@ -1107,7 +1159,7 @@ export class PGAccessLayer extends TinyEmitter {
                     status: StatusCodes.OK,
                     detail: dbResponse,
                     options: useOptions,
-                    operation: eOperations.GetResources
+                    operation: eOperations.GetResources,
                 };
             }
             catch (error) {
@@ -1122,10 +1174,12 @@ export class PGAccessLayer extends TinyEmitter {
         try {
             let client;
             if (options.useMultipleDatabases) {
-                client = await this.#poolManager?.connectReadOnly();
+                client =
+                    (await this.#poolManager?.connectReadOnly());
             }
             else {
-                client = await this.#poolManager?.connectReadWrite();
+                client =
+                    (await this.#poolManager?.connectReadWrite());
             }
             const retVal = await this.#__SearchResources(client, options, searchOptions);
             client.release();