@nsshunt/stsdatamanagement 1.18.131 → 1.18.133

package/db-scripts/builddb.sql

@@ -11,7 +11,7 @@ CREATE TABLE stsresfhir (
     RES_PUBLISHED BIGINT NOT NULL,
     RES_UPDATED BIGINT NOT NULL,
     RES_DELETED_AT BIGINT,
-    UNIQUE (RES_ID, RES_TYPE)
+    UNIQUE (RES_TYPE, RES_ID)
 );
 
 ---- stsresfhirver ------------------------------------------------------------------------------------------
@@ -25,11 +25,15 @@ CREATE TABLE stsresfhirver (
 	RES_TYPE TEXT NOT NULL,
     RES_VER INTEGER NOT NULL,
     RES TEXT NOT NULL,
-    UNIQUE (RES_ID, RES_TYPE, RES_VER),
+	-- Uniqueness of each version per resource:
+    CONSTRAINT uq_stsresfhirver_triplet UNIQUE (RES_TYPE, RES_ID, RES_VER),
 	-- We only need (RES_ID, RES_TYPE) as the FK because the parent table always holds the current version.
-    FOREIGN KEY (RES_ID, RES_TYPE) REFERENCES stsresfhir(RES_ID, RES_TYPE)
+    FOREIGN KEY (RES_TYPE, RES_ID) REFERENCES stsresfhir(RES_TYPE, RES_ID)
 );
 
+-- Seek-friendly sort index for keyset pagination:
+CREATE INDEX idx_stsresfhirver_seek ON stsresfhirver (RES_TYPE, RES_ID, RES_VER DESC);
+
 ---- stsresfhirlink ------------------------------------------------------------------------------------------
 
 CREATE TABLE stsresfhirlink (
@@ -48,6 +52,10 @@ CREATE TABLE stsresfhirlink (
     UPDATED BIGINT NOT NULL
 );
 
+CREATE INDEX idx_stsresfhirlink_identity ON stsresfhirlink (SP_NAME, SRC_RESOURCE_TYPE);
+CREATE INDEX idx_stsresfhirlink_identity_target_id ON stsresfhirlink (SP_NAME, SRC_RESOURCE_TYPE, TARGET_RESOURCE_TYPE, TARGET_RESOURCE_ID);
+CREATE INDEX idx_stsresfhirlink_identity_target_url ON stsresfhirlink (SP_NAME, SRC_RESOURCE_TYPE, TARGET_RESOURCE_TYPE, TARGET_RESOURCE_URL);
+
 ---- stsresfhirstring ------------------------------------------------------------------------------------------
 
 CREATE TABLE stsresfhirstring (
@@ -68,8 +76,9 @@ CREATE TABLE stsresfhirstring (
 );
 
 CREATE INDEX idx_stsresfhirstring_hash_identity ON stsresfhirstring (HASH_IDENTITY);
-CREATE INDEX idx_stsresfhirstring_hash_exact ON stsresfhirstring (HASH_EXACT);
-CREATE INDEX idx_stsresfhirstring_hash_value ON stsresfhirstring (HASH_IDENTITY, SP_VALUE_NORMALIZED);
+CREATE INDEX idx_stsresfhirstring_hash_exact ON stsresfhirstring (HASH_EXACT, SP_VALUE_EXACT);
+CREATE INDEX idx_stsresfhirstring_hash_value_norm ON stsresfhirstring (HASH_IDENTITY, SP_VALUE_NORMALIZED);
+CREATE INDEX idx_stsresfhirstring_hash_value_exact ON stsresfhirstring (HASH_IDENTITY, SP_VALUE_EXACT);
 
 ---- stsresfhirtoken ------------------------------------------------------------------------------------------
 
@@ -93,9 +102,10 @@ CREATE TABLE stsresfhirtoken (
 );
 
 CREATE INDEX idx_stsresfhirtoken_hash_identity ON stsresfhirtoken (HASH_IDENTITY);
-CREATE INDEX idx_stsresfhirtoken_hash_value ON stsresfhirtoken (HASH_VALUE);
-CREATE INDEX idx_stsresfhirtoken_hash_sys ON stsresfhirtoken (HASH_SYS);
-CREATE INDEX idx_stsresfhirtoken_hash_sys_and_value ON stsresfhirtoken (HASH_SYS_AND_VALUE);
+CREATE INDEX idx_stsresfhirtoken_hash_identity_value ON stsresfhirtoken (HASH_IDENTITY, SP_VALUE);
+CREATE INDEX idx_stsresfhirtoken_hash_value ON stsresfhirtoken (HASH_VALUE, SP_VALUE);
+CREATE INDEX idx_stsresfhirtoken_hash_sys ON stsresfhirtoken (HASH_SYS, SP_SYSTEM);
+CREATE INDEX idx_stsresfhirtoken_hash_sys_and_value ON stsresfhirtoken (HASH_SYS_AND_VALUE, SP_SYSTEM, SP_VALUE);
 
 ---- stsresfhirquantity ------------------------------------------------------------------------------------------
 
@@ -119,8 +129,9 @@ CREATE TABLE stsresfhirquantity (
 );
 
 CREATE INDEX idx_stsresfhirquantity_hash_identity ON stsresfhirquantity (HASH_IDENTITY);
-CREATE INDEX idx_stsresfhirquantity_hash_units ON stsresfhirquantity (HASH_IDENTITY_AND_UNITS);
-CREATE INDEX idx_stsresfhirquantity_hash_sys_units ON stsresfhirquantity (HASH_IDENTITY_SYS_UNITS);
+CREATE INDEX idx_stsresfhirquantity_hash_identity_value ON stsresfhirquantity (HASH_IDENTITY, SP_VALUE);
+CREATE INDEX idx_stsresfhirquantity_hash_units ON stsresfhirquantity (HASH_IDENTITY_AND_UNITS, SP_UNITS);
+CREATE INDEX idx_stsresfhirquantity_hash_sys_units ON stsresfhirquantity (HASH_IDENTITY_SYS_UNITS, SP_SYSTEM, SP_UNITS);
 
 ---- stsresfhirnumber ------------------------------------------------------------------------------------------
 
@@ -140,6 +151,7 @@ CREATE TABLE stsresfhirnumber (
 );
 
 CREATE INDEX idx_stsresfhirnumber_hash_identity ON stsresfhirnumber (HASH_IDENTITY);
+CREATE INDEX idx_stsresfhirnumber_hash_identity_value ON stsresfhirnumber (HASH_IDENTITY, SP_VALUE);
 
 ---- stsresfhiruri ------------------------------------------------------------------------------------------
 
@@ -160,7 +172,8 @@ CREATE TABLE stsresfhiruri (
 );
 
 CREATE INDEX idx_stsresfhiruri_hash_identity ON stsresfhiruri (HASH_IDENTITY);
-CREATE INDEX idx_stsresfhiruri_hash_uri ON stsresfhiruri (HASH_URI);
+CREATE INDEX idx_stsresfhiruri_hash_uri ON stsresfhiruri (HASH_URI, SP_URI);
+CREATE INDEX idx_stsresfhiruri_identity_uri ON stsresfhiruri (HASH_IDENTITY, SP_URI);
 
 ---- stsresfhirdate ------------------------------------------------------------------------------------------
 
@@ -183,6 +196,8 @@ CREATE TABLE stsresfhirdate (
 );
 
 CREATE INDEX idx_stsresfhirdate_hash_identity ON stsresfhirdate (HASH_IDENTITY);
+CREATE INDEX idx_stsresfhirdate_hash_identity_low ON stsresfhirdate (HASH_IDENTITY, SP_VALUE_LOW);
+CREATE INDEX idx_stsresfhirdate_hash_identity_high ON stsresfhirdate (HASH_IDENTITY, SP_VALUE_HIGH);
 
 ---- stsresfhircoords ------------------------------------------------------------------------------------------
 
@@ -203,6 +218,7 @@ CREATE TABLE stsresfhircoords (
 );
 
 CREATE INDEX idx_stsresfhircoords_hash_identity ON stsresfhircoords (HASH_IDENTITY);
+CREATE INDEX idx_stsresfhircoords_hash_identity_lat_long ON stsresfhircoords (HASH_IDENTITY, SP_LATITUDE, SP_LONGITUDE);
 
 ---- stsresfhircombo ------------------------------------------------------------------------------------------
 
@@ -226,6 +242,7 @@ CREATE TABLE stsresfhircombo (
 
 CREATE INDEX idx_stsresfhircombo_hash_identity ON stsresfhircombo (HASH_IDENTITY);
 CREATE INDEX idx_stsresfhircombo_hash_complete ON stsresfhircombo (HASH_COMPLETE);
+CREATE INDEX idx_stsresfhircombo_hash_identity_string ON stsresfhircombo (HASH_IDENTITY, IDX_STRING);
 
 ---- STS Generic Resource/Entity Tables and Procs ---------------------------------------------------------------
 

package/dist/dalUserManager.test.js

@@ -74,7 +74,7 @@ var eResouceStatus;
         });
         logger.info(chalk_1.default.green(`accessLayer:startdatabase()`));
         await accessLayer.StartDatabase();
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing STSUser', async () => {
         vitest_1.expect.assertions(6);
         const userManager = new dalUserManager_1.DALUserManager({
@@ -106,7 +106,7 @@ var eResouceStatus;
         (0, vitest_1.expect)(deleteUser01).toMatchObject(userRecord);
         const getUser01AfterDelete = await userManager.GetUser({ name: 'user01' });
         (0, vitest_1.expect)(getUser01AfterDelete).toBeNull();
-    }, 30000);
+    }, 60000);
     (0, vitest_1.afterAll)(async () => {
         await accessLayer.EndDatabase();
         await (0, stsutils_1.JestSleep)();

package/dist/dbaccess.test.js

@@ -32,7 +32,7 @@ vitest_1.describe.skip("Testing Database Functions", () => {
     test('Testing Database entity delete and creates', async () =>
     {
     
-        jest.setTimeout(30000);
+        jest.setTimeout(60000);
         expect.assertions(1);
 
         let start = 100;

package/dist/pcaccesslayer-entity.test.js

@@ -83,7 +83,7 @@ const sort = (a, b) => {
         });
         logger.info(chalk_1.default.green(`accessLayer:startdatabase()`));
         await accessLayer.StartDatabase();
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity create, update, patch, read and delete', async () => {
         vitest_1.expect.assertions(30);
         const userResourceOptions = {
@@ -327,7 +327,7 @@ const sort = (a, b) => {
             detail: createCount
         };
         (0, vitest_1.expect)(entityCountPostMultiCreate).toMatchObject(matchEntityCountPostMultiCreate);
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Create', async () => {
         const createStart = 100;
         const createNum = 60;
@@ -365,7 +365,7 @@ const sort = (a, b) => {
             (0, vitest_1.expect)(new Date(createdRecord.validfrom).getTime()).toBeLessThanOrEqual(new Date().getTime());
             (0, vitest_1.expect)(parseInt(createdRecord.oid)).toBeGreaterThan(0);
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Create using Update', async () => {
         const updateStart = 100;
         const updateNum = 5;
@@ -420,7 +420,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(updatedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Update', async () => {
         const updateStart = 100;
         const updateNum = 5;
@@ -475,7 +475,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(updatedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Update with Errors', async () => {
         const updateErrorStart = 110;
         const updateErrorNum = 5;
@@ -549,7 +549,7 @@ const sort = (a, b) => {
                 }
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Patch', async () => {
         const patchStart = 120;
         const patchNum = 5;
@@ -608,7 +608,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(updatedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Patch with Errors', async () => {
         const patchErrorStart = 130;
         const patchErrorNum = 5;
@@ -687,7 +687,7 @@ const sort = (a, b) => {
                 }
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Delete', async () => {
         const deleteStart = 140;
         const deleteNum = 5;
@@ -745,7 +745,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(updatedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity Batch Delete with Errors', async () => {
         const deleteErrorStart = 150;
         const deleteErrorNum = 5;
@@ -816,7 +816,7 @@ const sort = (a, b) => {
                 }
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Get All user_patch_test_ Resources', async () => {
         vitest_1.expect.assertions(51);
         // All Records

package/dist/pcaccesslayer.test.js

@@ -77,7 +77,7 @@ const sort = (a, b) => {
         });
         logger.info(chalk_1.default.green(`accessLayer:startdatabase()`));
         await accessLayer.StartDatabase();
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource create, update, patch, read and delete', async () => {
         vitest_1.expect.assertions(22);
         const initialCount = await accessLayer.GetResourceCount();
@@ -246,7 +246,7 @@ const sort = (a, b) => {
             }
         });
         (0, vitest_1.expect)(resources.detail.length).toEqual(10);
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Entity create, update, patch, read and delete', async () => {
         vitest_1.expect.assertions(30);
         const userResourceType = {
@@ -494,7 +494,7 @@ const sort = (a, b) => {
             detail: createCount
         };
         (0, vitest_1.expect)(entityCountPostMultiCreate).toMatchObject(matchEntityCountPostMultiCreate);
-    }, 30000);
+    }, 60000);
     /*
     test('Testing Database Resource create and patch', async () => {
         const createStart = 100;
@@ -726,7 +726,7 @@ const sort = (a, b) => {
             console.log(detail);
         });
 
-    }, 30000);
+    }, 60000);
     
     test('Testing Database Entity create and patch', async () => {
         expect.assertions(5);
@@ -816,7 +816,7 @@ const sort = (a, b) => {
         console.log(getRecord2);
 
         expect(getRecord2).toMatchObject(userEntity01PatchedRecord);
-    }, 30000);
+    }, 60000);
 
 
     const __TestBatchOperationsForResources = async <T>(start: number, iterations: number, GetResourceData: (i: number) => Partial<T>, GetTestObject: null | ((i: number) => IDBReturnData<Partial<T>>), cb: (p: ResourceParameterRecords<T>) => Promise<IDBReturnData<T>>) => {
@@ -1104,7 +1104,7 @@ const sort = (a, b) => {
             });
             console.log(detail);
         });
-    }, 30000);
+    }, 60000);
     */
     (0, vitest_1.test)('Testing Database Resource Batch Create', async () => {
         const createStart = 100;
@@ -1139,7 +1139,7 @@ const sort = (a, b) => {
             (0, vitest_1.expect)(new Date(createdResourceRecord.validfrom).getTime()).toBeLessThanOrEqual(new Date().getTime());
             (0, vitest_1.expect)(parseInt(createdResourceRecord.oid)).toBeGreaterThan(0);
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Create using Update', async () => {
         const updateStart = 100;
         const updateNum = 5;
@@ -1191,7 +1191,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(updatedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Update', async () => {
         const updateStart = 100;
         const updateNum = 5;
@@ -1243,7 +1243,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(updatedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Update with Errors', async () => {
         const updateErrorStart = 110;
         const updateErrorNum = 5;
@@ -1315,7 +1315,7 @@ const sort = (a, b) => {
                 }
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Patch', async () => {
         const patchStart = 120;
         const patchNum = 5;
@@ -1371,7 +1371,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(patchedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Patch with Errors', async () => {
         const patchErrorStart = 130;
         const patchErrorNum = 5;
@@ -1442,7 +1442,7 @@ const sort = (a, b) => {
                 }
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Delete', async () => {
         const deleteStart = 140;
         const deleteNum = 5;
@@ -1497,7 +1497,7 @@ const sort = (a, b) => {
                 (0, vitest_1.expect)(parseInt(deletedResourceRecord.oid)).toBeGreaterThan(0);
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Testing Database Resource Batch Delete with Error', async () => {
         const deleteErrorStart = 150;
         const deleteErrorNum = 5;
@@ -1566,7 +1566,7 @@ const sort = (a, b) => {
                 }
             }
         }
-    }, 30000);
+    }, 60000);
     (0, vitest_1.test)('Get All user_patch_test_ Resources', async () => {
         vitest_1.expect.assertions(51);
         // All Records

package/dist/redisDatabase.test.js

@@ -207,7 +207,7 @@ vitest_1.describe.skip("Test Auth Controller", () => {
             d.value.resdesc = ConvertUserData(d.value.resdesc);
             console.log(d);
         });
-    }, 30000);
+    }, 60000);
     (0, vitest_1.afterAll)(async () => {
         await (0, stsutils_1.JestSleep)();
         if (ioRedisClient) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nsshunt/stsdatamanagement",
-    "version": "1.18.131",
+    "version": "1.18.133",
     "description": "STS Data Management Modules, Utilities and Services",
     "main": "./dist/dbaccess.js",
     "types": "./types/dbaccess.d.ts",
@@ -12,15 +12,15 @@
         "README.md"
     ],
     "dependencies": {
-        "@aws-sdk/client-dynamodb": "^3.857.0",
-        "@aws-sdk/lib-dynamodb": "^3.857.0",
-        "@nsshunt/stsconfig": "^1.27.25",
-        "@nsshunt/stsutils": "^1.19.36",
+        "@aws-sdk/client-dynamodb": "^3.862.0",
+        "@aws-sdk/lib-dynamodb": "^3.862.0",
+        "@nsshunt/stsconfig": "^1.27.26",
+        "@nsshunt/stsutils": "^1.19.37",
         "axios": "^1.11.0",
         "chalk": "^4.1.2",
         "cli-progress": "^3.12.0",
         "http-status-codes": "^2.3.0",
-        "ioredis": "^5.6.1",
+        "ioredis": "^5.7.0",
         "pg": "^8.16.3",
         "pg-copy-streams": "^7.0.0",
         "prompts": "^2.4.2",
@@ -32,19 +32,19 @@
     },
     "devDependencies": {
         "@types/cli-progress": "^3.11.6",
-        "@types/node": "^24.1.0",
+        "@types/node": "^24.2.0",
         "@types/pg": "^8.15.5",
         "@types/pg-copy-streams": "^1.2.5",
         "@types/prompts": "^2.4.9",
         "@types/uuid": "^10.0.0",
-        "@typescript-eslint/eslint-plugin": "^8.38.0",
-        "@typescript-eslint/parser": "^8.38.0",
+        "@typescript-eslint/eslint-plugin": "^8.39.0",
+        "@typescript-eslint/parser": "^8.39.0",
         "eslint": "^9.32.0",
         "globals": "^16.3.0",
         "rollup-plugin-polyfill-node": "^0.13.0",
         "rollup-plugin-visualizer": "^6.0.3",
-        "testcontainers": "^11.4.0",
-        "typescript": "^5.8.3",
+        "testcontainers": "^11.5.1",
+        "typescript": "^5.9.2",
         "vite": "^6.3.5",
         "vitest": "^3.2.4"
     },