@nsshunt/stsdatamanagement 1.3.18 → 1.3.19

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@nsshunt/stsdatamanagement",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "description": "STS Data Management Modules, Utilities and Services",
   "main": "dbaccess.js",
   "dependencies": {
-    "@nsshunt/stsconfig": "^1.3.19",
-    "@nsshunt/stsutils": "^1.3.25",
+    "@nsshunt/stsconfig": "^1.3.22",
+    "@nsshunt/stsutils": "^1.3.26",
     "axios": "^0.24.0",
     "bcryptjs": "^2.4.3",
     "cli-progress": "^3.9.1",
     "colors": "^1.4.0",
     "debug": "^4.3.3",
-    "ioredis": "^4.28.1",
+    "ioredis": "^4.28.2",
     "pg": "^8.7.1",
     "pg-copy-streams": "^6.0.2",
     "prompts": "^2.4.2",
@@ -31,7 +31,7 @@
     "@babel/plugin-proposal-class-properties": "^7.16.0",
     "@babel/plugin-proposal-private-methods": "^7.16.0",
     "eslint": "^8.3.0",
-    "jest": "^27.3.1"
+    "jest": "^27.4.3"
   },
   "scripts": {
     "lint": "eslint . --ext js,jsx,ts,tsx --fix",

package/pgaccesslayer.js

@@ -9,29 +9,29 @@ const debug = require('debug')(`proc:${process.pid}`);
 
 class PGAccessLayer
 {
-    #cache = null;
-    #pgpool = null;
-    #logger = null;
+	#cache = null;
+	#pgpool = null;
+	#logger = null;
 
-    constructor(poolManager)
-    {
+	constructor(poolManager)
+	{
     	this.#pgpool = poolManager.pool;
     	if (useRedis === true)
     	{
     		this.#cache = new Redis(redisPort, redisServer);
     	}
-    }
+	}
 
-    #latestResourceVersion(inputfilter)
-    {
+	#latestResourceVersion(inputfilter)
+	{
     	// Check if we are getting the latest version
     	const { resname, entname, vnum, filter, incdel, startdate, enddate, dbaction, dbactionuser } = inputfilter;
     	return (resname !== undefined && entname === undefined && vnum === undefined && filter === undefined && incdel === undefined && startdate === undefined
         && enddate === undefined && dbaction === undefined && dbactionuser === undefined);
-    }
+	}
 
-    #buildQueryString(filters, restype)
-    {
+	#buildQueryString(filters, restype)
+	{
     	const { resname, entname, vnum, filter, incdel, startdate, enddate, dbaction, dbactionuser } = filters;
 
     	// Build query string
@@ -111,15 +111,15 @@ class PGAccessLayer
     	} else {
     		return { qstring: qstring, qparams: qparams };
     	}
-    }
+	}
 
-    async getLatestResource(resid)
-    {
+	async getLatestResource(resid)
+	{
     	return await this.getResource({ resname: resid });
-    }
+	}
 
-    async saveResource(userid, resid, data)
-    {
+	async saveResource(userid, resid, data)
+	{
     	let retVal = await this.getLatestResource(resid);
     	if (retVal.status !== status.success)
     	{
@@ -128,20 +128,20 @@ class PGAccessLayer
     		let vnum = retVal.detail.vnum;
     		await this.updateResource(userid, resid, vnum, data);
     	}
-    }
+	}
 
-    async getDefaultConfig()
-    {
+	async getDefaultConfig()
+	{
     	return await this.getLatestResource(defaultConfigId);
-    }
+	}
 
-    async saveDefaultConfig(config)
-    {
+	async saveDefaultConfig(config)
+	{
     	await this.saveResource(systemUserId, defaultConfigId, config);
-    }
+	}
 
-    async getResourceCount(filter = null)
-    {
+	async getResourceCount(filter = null)
+	{
     	const fname = 'getResourceCount';
     	try
     	{
@@ -166,10 +166,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async createResource(userid, resourceid, payload)
-    {
+	async createResource(userid, resourceid, payload)
+	{
     	const fname = 'createResource';
     	try
     	{
@@ -206,10 +206,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async beginX()
-    {
+	async beginX()
+	{
     	const fname = 'beginX';
     	try
     	{
@@ -222,10 +222,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async commitX(client)
-    {
+	async commitX(client)
+	{
     	const fname = 'commitX';
     	try
     	{
@@ -237,10 +237,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async rollbackX(client)
-    {
+	async rollbackX(client)
+	{
     	const fname = 'rollbackX';
     	try
     	{
@@ -252,10 +252,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async createResourceX(client, userid, resourceid, payload)
-    {
+	async createResourceX(client, userid, resourceid, payload)
+	{
     	const fname = 'createResourceX';
     	const createQuery = `select * from create_stsresource($1, $2, $3)`;
     	const values = [
@@ -277,10 +277,10 @@ class PGAccessLayer
     		}
     		return err;
     	}
-    }
+	}
 
-    async updateResource(userid, resourceid, resourcevnum, payload)
-    {
+	async updateResource(userid, resourceid, resourcevnum, payload)
+	{
     	const fname = 'updateResource';
     	try
     	{
@@ -330,10 +330,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async deleteResource(userid, resourceid, resourcevnum)
-    {
+	async deleteResource(userid, resourceid, resourcevnum)
+	{
     	const fname = 'deleteResource';
     	try
     	{
@@ -378,10 +378,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async createEntity(userid, resourceid, resourcevnum, entityid, payload)
-    {
+	async createEntity(userid, resourceid, resourcevnum, entityid, payload)
+	{
     	const fname = 'createEntity';
     	try
     	{
@@ -417,10 +417,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async updateEntity(userid, resourceid, resourcevnum, entityid, entityvnum, payload)
-    {
+	async updateEntity(userid, resourceid, resourcevnum, entityid, entityvnum, payload)
+	{
     	const fname = 'updateEntity';
     	try
     	{
@@ -461,10 +461,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async deleteEntity(userid, resourceid, resourcevnum, entityid, entityvnum)
-    {
+	async deleteEntity(userid, resourceid, resourcevnum, entityid, entityvnum)
+	{
     	const fname = 'deleteEntity';
     	try
     	{
@@ -504,11 +504,11 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    // get single resource and all associated entities for this resource
-    async getResource(filters)
-    {
+	// get single resource and all associated entities for this resource
+	async getResource(filters)
+	{
     	const fname = 'getResource';
     	try
     	{
@@ -564,11 +564,11 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    // get single resource and all associated entities for this resource
-    async getEntity(filters)
-    {
+	// get single resource and all associated entities for this resource
+	async getEntity(filters)
+	{
     	const fname = 'getEntity';
     	try
     	{
@@ -607,11 +607,11 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    // get single resource and all associated entities for this resource
-    async getEntities(filters)
-    {
+	// get single resource and all associated entities for this resource
+	async getEntities(filters)
+	{
     	const fname = 'getEntities';
     	try
     	{
@@ -642,11 +642,11 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    // get current resource
-    async getResources(filters)
-    {
+	// get current resource
+	async getResources(filters)
+	{
     	const fname = 'getResources';
     	try
     	{
@@ -675,10 +675,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
   
-    async deleteResources(resname, actionuser)
-    {
+	async deleteResources(resname, actionuser)
+	{
     	const fname = 'deleteResources';
     	try
     	{
@@ -703,10 +703,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async deleteAllResources()
-    {
+	async deleteAllResources()
+	{
     	const fname = 'createResource';
     	try
     	{
@@ -731,10 +731,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async getTotalResources()
-    {
+	async getTotalResources()
+	{
     	const fname = 'getTotalResources';
     	try
     	{
@@ -758,10 +758,10 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`[${fname}]: Could not get client from pool: ${error}`);
     		return { status: status.error, error: `[${fname}]: Operation was not successful`, detail: error };
     	}
-    }
+	}
 
-    async executedbscript(scriptfile)
-    {
+	async executedbscript(scriptfile)
+	{
     	try
     	{
     		const fname = 'executedbscript';
@@ -794,19 +794,19 @@ class PGAccessLayer
     		if (consoleLogErrors) console.error(`Error executing script: [${scriptfile}]`);
     		throw error;
     	}
-    }
+	}
 
-    // Method only used for testing. Ensure that if redis is being used that the cache is always flushed.
-    async startdatabase()
-    {
+	// Method only used for testing. Ensure that if redis is being used that the cache is always flushed.
+	async startdatabase()
+	{
     	if (this.#cache !== null)
     	{
     		await this.#cache.flushall();
     	}
-    }
+	}
 
-    async enddatabase()
-    {
+	async enddatabase()
+	{
     	debug(`Ending database for process PID: ${process.pid}`);
     	await this.#pgpool.end();
     	if (this.#cache !== null)
@@ -819,10 +819,10 @@ class PGAccessLayer
     		await this.#cache.quit();
     		this.#cache = null;
     	}
-    }
+	}
 
-    bulkInsert(fakerdata)
-    {
+	bulkInsert(fakerdata)
+	{
     	return new Promise((resolve, reject) =>
     	{
     		this.#pgpool.connect().then(client => 
@@ -883,7 +883,7 @@ class PGAccessLayer
     			console.log(error);
     		});
     	});
-    }
+	}
 }
 
 module.exports = { PGAccessLayer };