@nsshunt/stsfhirpg 1.2.31 → 1.2.32

package/dist/index.mjs

@@ -6196,9 +6196,20 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		return true;
 	}
 	async EndDatabase() {
-		if (this.#poolManager) await this.#poolManager.End();
-		this.#poolManager = null;
-		return true;
+		if (!this.#poolManager) {
+			const errorMessage = `EndDatabase(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			await this.#poolManager.End();
+			this.#poolManager = null;
+			return true;
+		} catch (error) {
+			const message = `PGFhirAccessLayer:EndDatabase(): Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		}
 	}
 	GetFhirResourceController = () => {
 		return this.#dbSTSResource;
@@ -6206,179 +6217,177 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 	GetFhirResourceVersionController = () => {
 		return this.#dbSTSResourceVersion;
 	};
+	async DeleteAllIndexes(client, data) {
+		try {
+			await client.query(`
+                DELETE FROM stsresfhirlink WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhirstring WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhirtoken WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhirquantity WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhirnumber WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhirdate WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhiruri WHERE RES_ID = $1 AND RES_TYPE = $2;
+                DELETE FROM stsresfhircombo WHERE RES_ID = $1 AND RES_TYPE = $2;
+            `, [data.RES_ID, data.RES_TYPE]);
+		} catch (error) {
+			const message = `PGFhirAccessLayer:DeleteAllIndexes(): Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		}
+	}
 	UpdateIndexes = async (client, resource) => {
 		let start = performance.now();
 		const oa = start;
-		const searchIndexData = await this.#dbSearchIndex.GetSearchIndexData(resource);
-		const lap1 = performance.now() - start;
-		start = performance.now();
-		const InsertResourceLinkRecord = async (client, resourceLinkIndexRecord) => {
-			await this.#dbSTSResourceLink.InsertResourceLink(client, resourceLinkIndexRecord);
-		};
-		const InsertResourceStringRecord = async (client, stringRecord) => {
-			await this.#dbSTSString.InsertRecord(client, stringRecord);
-		};
-		const InsertResourceTokenRecord = async (client, tokenRecord) => {
-			await this.#dbSTSToken.InsertRecord(client, tokenRecord);
-		};
-		const InsertResourceQuantityRecord = async (client, quantityRecord) => {
-			await this.#dbSTSQuantity.InsertRecord(client, quantityRecord);
-		};
-		const InsertResourceNumberRecord = async (client, numberRecord) => {
-			await this.#dbSTSNumber.InsertRecord(client, numberRecord);
-		};
-		const InsertResourceDateRecord = async (client, dateRecord) => {
-			await this.#dbSTSDate.InsertRecord(client, dateRecord);
-		};
-		const InsertResourceUriRecord = async (client, uriRecord) => {
-			await this.#dbSTSUri.InsertRecord(client, uriRecord);
-		};
-		const InsertResourceComboRecord = async (client, comboRecord) => {
-			await this.#dbSTSCombo.InsertRecord(client, comboRecord);
-		};
-		await this.#dbSTSResourceLink.DeleteResourceLinkRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSString.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSToken.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSQuantity.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSNumber.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSDate.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSUri.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		await this.#dbSTSCombo.DeleteRecord(client, {
-			RES_ID: resource.id,
-			RES_TYPE: resource.resourceType
-		});
-		const lap2 = performance.now() - start;
-		start = performance.now();
+		let lap1;
+		let lap2;
+		let lap3;
+		let searchIndexData;
+		try {
+			searchIndexData = await this.#dbSearchIndex.GetSearchIndexData(resource);
+			lap1 = performance.now() - start;
+			start = performance.now();
+			await this.DeleteAllIndexes(client, {
+				RES_ID: resource.id,
+				RES_TYPE: resource.resourceType
+			});
+			lap2 = performance.now() - start;
+			start = performance.now();
+		} catch (error) {
+			const message = `PGFhirAccessLayer:UpdateIndexes():lap1: Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		}
+		let si = void 0;
 		try {
 			for (let i = 0; i < searchIndexData.length; i++) {
-				const si = searchIndexData[i];
+				si = searchIndexData[i];
 				performance.now();
-				if (si && si.SP_MISSING) {}
 				switch (si.SP_PARAM_TYPE) {
 					case "reference":
-						await InsertResourceLinkRecord(client, si);
+						await this.#dbSTSResourceLink.InsertResourceLink(client, si);
 						break;
 					case "string":
-						await InsertResourceStringRecord(client, si);
+						await this.#dbSTSString.InsertRecord(client, si);
 						break;
 					case "token":
-						await InsertResourceTokenRecord(client, si);
+						await this.#dbSTSToken.InsertRecord(client, si);
 						break;
 					case "quantity":
-						await InsertResourceQuantityRecord(client, si);
+						await this.#dbSTSQuantity.InsertRecord(client, si);
 						break;
 					case "number":
-						await InsertResourceNumberRecord(client, si);
+						await this.#dbSTSNumber.InsertRecord(client, si);
 						break;
 					case "date":
-						await InsertResourceDateRecord(client, si);
+						await this.#dbSTSDate.InsertRecord(client, si);
 						break;
 					case "uri":
-						await InsertResourceUriRecord(client, si);
+						await this.#dbSTSUri.InsertRecord(client, si);
 						break;
 					case "composite":
-						await InsertResourceComboRecord(client, si);
+						await this.#dbSTSCombo.InsertRecord(client, si);
 						break;
 					default:
 				}
 			}
 		} catch (error) {
-			console.error(error);
+			let message;
+			if (si) message = `PGFhirAccessLayer:UpdateIndexes():lap2: Param Type: [${si.SP_PARAM_TYPE}], Error: [${error}]`;
+			else message = `PGFhirAccessLayer:UpdateIndexes():lap2: Param Type: [undefined], Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
 		}
-		const lap3 = performance.now() - start;
+		lap3 = performance.now() - start;
 		const total = performance.now() - oa;
-		if (total > 100) console.log(chalk.hex("#E33A36")(`--> Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}]`));
-		else if (total > 75) console.log(chalk.hex("#e27270")(`--> Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}]`));
-		else if (total > 50) console.log(chalk.hex("#e2c3c2")(`--> Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}]`));
-	};
-	#isInTransaction = async (client) => {
-		return (await client.query(`
-            SELECT txid_current_if_assigned() AS txid
-        `)).rows[0].txid !== null;
+		try {
+			if (total > 1e3) console.log(chalk.hex("#ff0400")(`--> Very Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}] ResourceType: [${resource.resourceType}]`));
+			else if (total > 100) console.log(chalk.hex("#E33A36")(`--> Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}] ResourceType: [${resource.resourceType}]`));
+			else if (total > 75) console.log(chalk.hex("#e27270")(`--> Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}] ResourceType: [${resource.resourceType}]`));
+			else if (total > 50) console.log(chalk.hex("#e2c3c2")(`--> Slow: O/A:[${total.toFixed(2)}] Index Calc:[${lap1.toFixed(2)}] Delete:[${lap2.toFixed(2)}] Insert:[${lap3.toFixed(2)}] ResourceType: [${resource.resourceType}]`));
+		} catch (error) {
+			const message = `PGFhirAccessLayer:UpdateIndexes():lap3: Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		}
 	};
 	BeginTransaction = async () => {
-		if (this.#poolManager) try {
-			const transactionHandle = randomUUID$1();
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				await client.query("BEGIN");
-				this.#transactions[transactionHandle] = {
-					client,
-					timeout: setTimeout(async () => {
-						await this.#transactions[transactionHandle].client.query("ROLLBACK");
-						client.release();
-						delete this.#transactions[transactionHandle];
-					}, this.#maxTransactionTime)
-				};
-				return transactionHandle;
-			} catch (error) {
-				console.error(error);
-				client.release();
-			}
+		if (!this.#poolManager) {
+			const errorMessage = `PGFhirAccessLayer:BeginTransaction(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		let transactionHandle = randomUUID$1();
+		let client;
+		try {
+			client = await this.#poolManager.connectReadWrite();
 		} catch (error) {
-			console.error(error);
+			const errorMessage = `PGFhirAccessLayer:BeginTransaction(): connectReadWrite: Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			await client.query("BEGIN");
+			this.#transactions[transactionHandle] = {
+				client,
+				timeout: setTimeout(async () => {
+					await this.#transactions[transactionHandle].client.query("ROLLBACK");
+					client.release();
+					delete this.#transactions[transactionHandle];
+					const errorMessage = `PGFhirAccessLayer:BeginTransaction(): Error: [Transaction [${transactionHandle}] timeout. Timeout value: [${this.#maxTransactionTime}]]`;
+					this.#options.logger.error(errorMessage);
+				}, this.#maxTransactionTime)
+			};
+			return transactionHandle;
+		} catch (error) {
+			client.release();
+			const errorMessage = `PGFhirAccessLayer:BeginTransaction(): Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
 		}
 	};
 	CommitTransaction = async (transactionHandle) => {
 		if (this.#transactions[transactionHandle]) {
-			clearInterval(this.#transactions[transactionHandle].timeout);
-			const client = this.#transactions[transactionHandle].client;
+			let client = void 0;
 			try {
+				clearInterval(this.#transactions[transactionHandle].timeout);
+				client = this.#transactions[transactionHandle].client;
 				await client.query("COMMIT");
 				client.release();
 				delete this.#transactions[transactionHandle];
 				return true;
 			} catch (error) {
-				console.error(error);
-				client.release();
+				if (client) client.release();
 				delete this.#transactions[transactionHandle];
-				return false;
+				const errorMessage = `PGFhirAccessLayer:CommitTransaction(): Error: [${error}]`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
 			}
 		}
 		return false;
 	};
 	RollbackTransaction = async (transactionHandle) => {
 		if (this.#transactions[transactionHandle]) {
-			clearInterval(this.#transactions[transactionHandle].timeout);
-			const client = this.#transactions[transactionHandle].client;
+			let client = void 0;
 			try {
+				clearInterval(this.#transactions[transactionHandle].timeout);
+				client = this.#transactions[transactionHandle].client;
 				await client.query("ROLLBACK");
 				client.release();
 				delete this.#transactions[transactionHandle];
 				return true;
 			} catch (error) {
-				console.error(error);
-				client.release();
+				if (client) client.release();
 				delete this.#transactions[transactionHandle];
-				return false;
+				const errorMessage = `PGFhirAccessLayer:RollbackTransaction(): Error: [${error}]`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
 			}
 		}
 		return false;
 	};
 	CreateResource = async (resource, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `CreateResource(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:CreateResource(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
@@ -6393,7 +6402,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				useTransaction = true;
 			}
 		} catch (error) {
-			const errorMessage = `CreateResource(): Could not get connection: Error: [${error}]`;
+			const errorMessage = `PGFhirAccessLayer:CreateResource(): Could not get connection: Error: [${error}]`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
@@ -6414,7 +6423,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				RES_UPDATED: now
 			});
 			if (newVersion === void 0) {
-				const errorMessage = `CreateResource(): Version Conflict. newVersion is undefined.`;
+				const errorMessage = `PGFhirAccessLayer:CreateResource(): Version Conflict. newVersion is undefined.`;
 				this.#options.logger.error(errorMessage);
 				throw new Error(errorMessage);
 			}
@@ -6432,7 +6441,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				OPERATION: "POST",
 				RES
 			}) === void 0) {
-				const errorMessage = `CreateResource(): Version Conflict. resourceVersionRunResult is undefined.`;
+				const errorMessage = `PGFhirAccessLayer:CreateResource(): Version Conflict. resourceVersionRunResult is undefined.`;
 				this.#options.logger.error(errorMessage);
 				throw new Error(errorMessage);
 			}
@@ -6442,7 +6451,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			return resource;
 		} catch (error) {
 			if (useTransaction) await client.query("ROLLBACK");
-			const errorMessage = `CreateResource(): Error: [${error}]`;
+			const errorMessage = `PGFhirAccessLayer:CreateResource(): Error: [${error}]`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		} finally {
@@ -6451,7 +6460,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 	};
 	UpdateResource = async (resource, RES_VER, operation, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `UpdateResource(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:UpdateResource(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
@@ -6466,7 +6475,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				useTransaction = true;
 			}
 		} catch (error) {
-			const errorMessage = `UpdateResource(): Could not get connection: Error: [${error}]`;
+			const errorMessage = `PGFhirAccessLayer:UpdateResource(): Could not get connection: Error: [${error}]`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
@@ -6482,7 +6491,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				RES_UPDATED: now
 			});
 			if (newVersion === void 0) {
-				const errorMessage = `UpdateResource(): Version Conflict. newVersion is undefined. RES_VER: [${RES_VER}]`;
+				const errorMessage = `PGFhirAccessLayer:UpdateResource(): Version Conflict. newVersion is undefined. RES_VER: [${RES_VER}]`;
 				this.#options.logger.error(errorMessage);
 				throw new Error(errorMessage);
 			}
@@ -6500,7 +6509,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				OPERATION: operation,
 				RES
 			}) === void 0) {
-				const errorMessage = `UpdateResource(): Version Conflict. resourceVersionRunResult is undefined. RES_VER: [${RES_VER}]`;
+				const errorMessage = `PGFhirAccessLayer:UpdateResource(): Version Conflict. resourceVersionRunResult is undefined. RES_VER: [${RES_VER}]`;
 				this.#options.logger.error(errorMessage);
 				throw new Error(errorMessage);
 			}
@@ -6509,7 +6518,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			return resource;
 		} catch (error) {
 			if (useTransaction) await client.query("ROLLBACK");
-			const errorMessage = `UpdateResource(): Error: [${error}]`;
+			const errorMessage = `PGFhirAccessLayer:UpdateResource(): Error: [${error}]`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		} finally {
@@ -6518,7 +6527,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 	};
 	DeleteResource = async (resource, RES_VER, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `DeleteResource(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:DeleteResource(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
@@ -6533,7 +6542,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				useTransaction = true;
 			}
 		} catch (error) {
-			const errorMessage = `DeleteResource(): Could not get connection: Error: [${error}]`;
+			const errorMessage = `PGFhirAccessLayer:DeleteResource(): Could not get connection: Error: [${error}]`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
@@ -6550,7 +6559,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				RES_UPDATED: now
 			});
 			if (newVersion === void 0) {
-				const errorMessage = `DeleteResource(): Version Conflict. newVersion is undefined. RES_VER: [${RES_VER}]`;
+				const errorMessage = `PGFhirAccessLayer:DeleteResource(): Version Conflict. newVersion is undefined. RES_VER: [${RES_VER}]`;
 				this.#options.logger.error(errorMessage);
 				throw new Error(errorMessage);
 			}
@@ -6567,7 +6576,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				OPERATION: "DELETE",
 				RES: ""
 			}) === void 0) {
-				const errorMessage = `DeleteResource(): Version Conflict. resourceVersionRunResult is undefined. RES_VER: [${RES_VER}]`;
+				const errorMessage = `PGFhirAccessLayer:DeleteResource(): Version Conflict. resourceVersionRunResult is undefined. RES_VER: [${RES_VER}]`;
 				this.#options.logger.error(errorMessage);
 				throw new Error(errorMessage);
 			}
@@ -6576,7 +6585,7 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			return resource;
 		} catch (error) {
 			if (useTransaction) await client.query("ROLLBACK");
-			const errorMessage = `DeleteResource(): Error: [${error}]`;
+			const errorMessage = `PGFhirAccessLayer:DeleteResource(): Error: [${error}]`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		} finally {
@@ -6585,13 +6594,13 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 	};
 	ReadResourceRecord = async (RES_TYPE, RES_ID, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ReadResourceRecord(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ReadResourceRecord(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
 		try {
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6599,39 +6608,43 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				return (await client.query(`
-                    SELECT
-                        r.*, v.* FROM stsresfhir r
-                    JOIN 
-                        stsresfhirver v
-                    ON 
-                        r.RES_ID = v.RES_ID AND 
-                        r.RES_TYPE = v.RES_TYPE AND
-                        r.RES_VER = v.RES_VER
-                    WHERE
-                        r.RES_ID = $1 AND
-                        r.RES_TYPE = $2 AND
-                        r.RES_DELETED_AT IS NULL
-                `, [RES_ID, RES_TYPE])).rows[0];
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Connection Error: [${error}]`);
+			const errorMessage = `PGFhirAccessLayer:ReadResourceRecord(): Connection Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			return (await client.query(`
+                SELECT
+                    r.*, v.* FROM stsresfhir r
+                JOIN 
+                    stsresfhirver v
+                ON 
+                    r.RES_ID = v.RES_ID AND 
+                    r.RES_TYPE = v.RES_TYPE AND
+                    r.RES_VER = v.RES_VER
+                WHERE
+                    r.RES_ID = $1 AND
+                    r.RES_TYPE = $2 AND
+                    r.RES_DELETED_AT IS NULL
+            `, [RES_ID, RES_TYPE])).rows[0];
+		} catch (error) {
+			const errorMessage = `PGFhirAccessLayer:ReadResourceRecord(): Query Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	ReadResourceRecordWithVersion = async (RES_TYPE, RES_ID, RES_VER, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ReadResourceRecordWithVersion(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ReadResourceRecordWithVersion(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
 		try {
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6639,42 +6652,46 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				return (await client.query(`
-                    SELECT
-                        r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
-                    JOIN 
-                        stsresfhirver v
-                    ON 
-                        r.RES_ID = v.RES_ID AND 
-                        r.RES_TYPE = v.RES_TYPE
-                    WHERE
-                        r.RES_ID = $1 AND
-                        r.RES_TYPE = $2 AND
-                        v.RES_VER = $3
-                `, [
-					RES_ID,
-					RES_TYPE,
-					RES_VER
-				])).rows[0];
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Connection Error: [${error}]`);
+			const errorMessage = `PGFhirAccessLayer:ReadResourceRecordWithVersion(): Connection Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			return (await client.query(`
+                SELECT
+                    r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
+                JOIN 
+                    stsresfhirver v
+                ON 
+                    r.RES_ID = v.RES_ID AND 
+                    r.RES_TYPE = v.RES_TYPE
+                WHERE
+                    r.RES_ID = $1 AND
+                    r.RES_TYPE = $2 AND
+                    v.RES_VER = $3
+            `, [
+				RES_ID,
+				RES_TYPE,
+				RES_VER
+			])).rows[0];
+		} catch (error) {
+			const errorMessage = `PGFhirAccessLayer:ReadResourceRecordWithVersion(): Query Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	ReadResourceInstanceWithAllVersions = async (RES_TYPE, RES_ID, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ReadResourceInstanceWithAllVersions(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ReadResourceInstanceWithAllVersions(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
 		try {
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6682,39 +6699,43 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				return (await client.query(`
-                    SELECT
-                        r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
-                    JOIN 
-                        stsresfhirver v
-                    ON 
-                        r.RES_ID = v.RES_ID AND 
-                        r.RES_TYPE = v.RES_TYPE
-                    WHERE
-                        r.RES_ID = $1 AND
-                        r.RES_TYPE = $2
-                    ORDER BY
-                        v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
-                `, [RES_ID, RES_TYPE])).rows;
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Connection Error: [${error}]`);
+			const errorMessage = `PGFhirAccessLayer:ReadResourceInstanceWithAllVersions(): Connection Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			return (await client.query(`
+                SELECT
+                    r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
+                JOIN 
+                    stsresfhirver v
+                ON 
+                    r.RES_ID = v.RES_ID AND 
+                    r.RES_TYPE = v.RES_TYPE
+                WHERE
+                    r.RES_ID = $1 AND
+                    r.RES_TYPE = $2
+                ORDER BY
+                    v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
+            `, [RES_ID, RES_TYPE])).rows;
+		} catch (error) {
+			const errorMessage = `PGFhirAccessLayer:ReadResourceInstanceWithAllVersions(): Query Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	ReadResourcesWithAllVersions = async (RES_TYPE, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ReadResourcesWithAllVersions(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ReadResourcesWithAllVersions(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
 		try {
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6722,38 +6743,42 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				return (await client.query(`
-                    SELECT
-                        r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
-                    JOIN 
-                        stsresfhirver v
-                    ON 
-                        r.RES_ID = v.RES_ID AND 
-                        r.RES_TYPE = v.RES_TYPE
-                    WHERE
-                        r.RES_TYPE = $1
-                    ORDER BY
-                        v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
-                `, [RES_TYPE])).rows;
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Connection Error: [${error}]`);
+			const errorMessage = `PGFhirAccessLayer:ReadResourcesWithAllVersions(): Connection Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			return (await client.query(`
+                SELECT
+                    r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
+                JOIN 
+                    stsresfhirver v
+                ON 
+                    r.RES_ID = v.RES_ID AND 
+                    r.RES_TYPE = v.RES_TYPE
+                WHERE
+                    r.RES_TYPE = $1
+                ORDER BY
+                    v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
+            `, [RES_TYPE])).rows;
+		} catch (error) {
+			const errorMessage = `PGFhirAccessLayer:ReadResourcesWithAllVersions(): Query Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	ReadAllResourcesWithVersions = async (transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ReadAllResourcesWithVersions(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ReadAllResourcesWithVersions(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
 		try {
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6761,25 +6786,29 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				return (await client.query(`
-                    SELECT
-                        r.*, v.* FROM stsresfhir r
-                    JOIN 
-                        stsresfhirver v
-                    ON 
-                        r.RES_ID = v.RES_ID AND 
-                        r.RES_TYPE = v.RES_TYPE AND
-                    ORDER BY
-                        v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
-                `)).rows;
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Connection Error: [${error}]`);
+			const errorMessage = `PGFhirAccessLayer:ReadAllResourcesWithVersions(): Connection Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			return (await client.query(`
+                SELECT
+                    r.*, v.* FROM stsresfhir r
+                JOIN 
+                    stsresfhirver v
+                ON 
+                    r.RES_ID = v.RES_ID AND 
+                    r.RES_TYPE = v.RES_TYPE AND
+                ORDER BY
+                    v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
+            `)).rows;
+		} catch (error) {
+			const errorMessage = `PGFhirAccessLayer:ReadAllResourcesWithVersions(): Query Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	ReadAllResourceVersionRecord = () => {
@@ -6787,23 +6816,23 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 	};
 	ReadResourceIndexes = async (resource, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ReadResourceIndexes(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ReadResourceIndexes(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
+		const resultSet = {
+			"stsresfhirlink": [],
+			"stsresfhirstring": [],
+			"stsresfhirtoken": [],
+			"stsresfhirquantity": [],
+			"stsresfhirnumber": [],
+			"stsresfhirdate": [],
+			"stsresfhiruri": [],
+			"stsresfhircombo": []
+		};
 		try {
-			const resultSet = {
-				"stsresfhirlink": [],
-				"stsresfhirstring": [],
-				"stsresfhirtoken": [],
-				"stsresfhirquantity": [],
-				"stsresfhirnumber": [],
-				"stsresfhirdate": [],
-				"stsresfhiruri": [],
-				"stsresfhircombo": []
-			};
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6811,34 +6840,38 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				resultSet["stsresfhirlink"] = await this.#dbSTSResourceLink.ReadResourceLinkByResourceIdRecord(client, resource.id, resource.resourceType);
-				resultSet["stsresfhirstring"] = await this.#dbSTSString.ReadByResID(client, resource.id, resource.resourceType);
-				resultSet["stsresfhirtoken"] = await this.#dbSTSToken.ReadByResID(client, resource.id, resource.resourceType);
-				resultSet["stsresfhirquantity"] = await this.#dbSTSQuantity.ReadByResID(client, resource.id, resource.resourceType);
-				resultSet["stsresfhirnumber"] = await this.#dbSTSNumber.ReadByResID(client, resource.id, resource.resourceType);
-				resultSet["stsresfhirdate"] = await this.#dbSTSDate.ReadByResID(client, resource.id, resource.resourceType);
-				resultSet["stsresfhiruri"] = await this.#dbSTSUri.ReadByResID(client, resource.id, resource.resourceType);
-				resultSet["stsresfhircombo"] = await this.#dbSTSCombo.ReadByResID(client, resource.id, resource.resourceType);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceIndexes(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
-			return resultSet;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceIndexes(): Connection Error: [${error}]`);
+			const errorMessage = `PGFhirAccessLayer:ReadResourceIndexes(): Connection Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			resultSet["stsresfhirlink"] = await this.#dbSTSResourceLink.ReadResourceLinkByResourceIdRecord(client, resource.id, resource.resourceType);
+			resultSet["stsresfhirstring"] = await this.#dbSTSString.ReadByResID(client, resource.id, resource.resourceType);
+			resultSet["stsresfhirtoken"] = await this.#dbSTSToken.ReadByResID(client, resource.id, resource.resourceType);
+			resultSet["stsresfhirquantity"] = await this.#dbSTSQuantity.ReadByResID(client, resource.id, resource.resourceType);
+			resultSet["stsresfhirnumber"] = await this.#dbSTSNumber.ReadByResID(client, resource.id, resource.resourceType);
+			resultSet["stsresfhirdate"] = await this.#dbSTSDate.ReadByResID(client, resource.id, resource.resourceType);
+			resultSet["stsresfhiruri"] = await this.#dbSTSUri.ReadByResID(client, resource.id, resource.resourceType);
+			resultSet["stsresfhircombo"] = await this.#dbSTSCombo.ReadByResID(client, resource.id, resource.resourceType);
+		} catch (error) {
+			const errorMessage = `PGFhirAccessLayer:ReadResourceIndexes(): Query Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
+		return resultSet;
 	};
 	ExecuteReadQuery = async (queryData, transactionHandle) => {
 		if (!this.#poolManager) {
-			const errorMessage = `ExecuteReadQuery(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:ExecuteReadQuery(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
+		let useTransaction;
 		try {
-			let client;
-			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6846,36 +6879,44 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadOnly();
 				useTransaction = true;
 			}
-			try {
-				const { queryText, vals } = queryData;
-				return (await client.query(queryText, vals)).rows;
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ExecuteReadQuery(): Query Error: [${error}]`);
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ExecuteReadQuery(): Connection Error: [${error}]`);
+			const message = `PGFhirAccessLayer:ExecuteReadQuery(): Connection Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		}
+		try {
+			const { queryText, vals } = queryData;
+			return (await client.query(queryText, vals)).rows;
+		} catch (error) {
+			const message = `PGFhirAccessLayer:ExecuteReadQuery(): Query Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	TruncateAll = async () => {
 		if (!this.#poolManager) {
-			const errorMessage = `TruncateAll(): poolManager not set`;
+			const errorMessage = `PGFhirAccessLayer:TruncateAll(): poolManager not set`;
 			this.#options.logger.error(errorMessage);
 			throw new Error(errorMessage);
 		}
+		let client;
 		try {
-			let client;
 			client = await this.#poolManager.connectReadWrite();
-			try {
-				client.query("TRUNCATE TABLE stsresfhir, stsresfhirver, stsresfhirlink, stsresfhirstring, stsresfhirtoken, stsresfhirquantity, stsresfhirnumber, stsresfhiruri, stsresfhirdate, stsresfhircoords, stsresfhircombo");
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:TruncateAll(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:TruncateAll(): Connection Error: [${error}]`);
+			const message = `PGFhirAccessLayer:TruncateAll(): Connection Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		}
+		try {
+			client.query("TRUNCATE TABLE stsresfhir, stsresfhirver, stsresfhirlink, stsresfhirstring, stsresfhirtoken, stsresfhirquantity, stsresfhirnumber, stsresfhiruri, stsresfhirdate, stsresfhircoords, stsresfhircombo");
+		} catch (error) {
+			const message = `PGFhirAccessLayer:TruncateAll(): Query Error: [${error}]`;
+			this.#options.logger.error(message);
+			throw new Error(message);
+		} finally {
+			client.release();
 		}
 	};
 };