@nsshunt/stsappframework 3.1.144 → 3.1.146

package/dist/fhir/dalFhirManagerRedisJson.js

@@ -1,10 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DALFhirManagerRedisJson = void 0;
-const ioredis_1 = require("ioredis");
+const redis_1 = require("redis");
+const chalk_1 = __importDefault(require("chalk"));
 class DALFhirManagerRedisJson {
     #options;
-    #redisSubscriber = null;
+    #redis = null;
+    #indexName = 'idx:stsfhirresindex';
     constructor(options) {
         this.#options = options;
     }
@@ -14,28 +19,76 @@ class DALFhirManagerRedisJson {
     set options(options) {
         this.#options = options;
     }
-    Start() {
-        const redisOptions = {
-            showFriendlyErrorStack: true,
-            maxRetriesPerRequest: 20
+    #CreateIndex = async () => {
+        if (!this.#redis) {
+            return;
+        }
+        try {
+            const retVal = await this.#redis.ft.dropIndex(this.#indexName);
+            console.log(retVal);
+        }
+        catch (error) {
+            console.log(chalk_1.default.red(error));
+        }
+        try {
+            const retVal = await this.#redis.ft.create(this.#indexName, {
+                'id': { type: redis_1.SchemaFieldTypes.TEXT, SORTABLE: true }
+            }, {
+                ON: 'HASH',
+                PREFIX: `${this.#options.resourceName}_`
+            });
+            console.log(retVal);
+        }
+        catch (error) {
+            console.log(chalk_1.default.red(error));
+        }
+    };
+    #SearchBy = async (id) => {
+        if (!this.#redis) {
+            return null;
+        }
+        const queryOptions = {
+            RETURN: ['id', 'data'],
+            LIMIT: {
+                from: 0,
+                size: 100
+            },
+            SORTBY: {
+                BY: 'id',
+                DIRECTION: 'DESC'
+            }
         };
-        this.#redisSubscriber = new ioredis_1.Redis(this.#options.redisUrl, redisOptions);
+        const query = `@id:${this.#options.resourceName}_${id}*`;
+        const retVal = await this.#redis.ft.search(this.#indexName, query, queryOptions);
+        return retVal;
+    };
+    async Start() {
+        this.#redis = await (0, redis_1.createClient)({ url: this.#options.redisUrl })
+            .on('error', error => console.error(chalk_1.default.red(`Error connecting to redis. Error: [${error}]`)))
+            .connect();
+        if (this.#redis) {
+            await this.#CreateIndex();
+        }
+        else {
+            console.error(chalk_1.default.red(`this.#redis instance not created.`));
+        }
     }
-    Stop() {
-        if (this.#redisSubscriber) {
-            this.#redisSubscriber.quit();
-            this.#redisSubscriber.disconnect();
+    async Stop() {
+        if (this.#redis) {
+            //await this.#redis.quit();
+            await this.#redis.disconnect();
         }
     }
     GetResourceType(fhir) {
         return `${this.#options.resourceName}_${fhir.id}`;
     }
     async GetFhirResource(fhir, ecb) {
-        if (this.#redisSubscriber) {
-            const retValRaw = await this.#redisSubscriber?.get(this.GetResourceType(fhir));
+        if (this.#redis) {
+            const retValRaw = await this.#redis.HGETALL(this.GetResourceType(fhir));
             if (retValRaw) {
                 try {
-                    return JSON.parse(retValRaw);
+                    const { id, data } = retValRaw;
+                    return JSON.parse(data);
                 }
                 catch (error) {
                     if (ecb) {
@@ -54,19 +107,40 @@ class DALFhirManagerRedisJson {
     }
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
     async CreateFhirResource(fhir, ecb) {
-        const retVal = await this.#redisSubscriber?.set(this.GetResourceType(fhir), JSON.stringify(fhir));
-        if (retVal) {
-            return fhir;
+        if (this.#redis) {
+            const record = {
+                id: this.GetResourceType(fhir),
+                data: JSON.stringify(fhir)
+            };
+            const keyValuePairs = Object.entries(record).flat();
+            const retVal = await this.#redis.HSET(this.GetResourceType(fhir), keyValuePairs);
+            if (retVal) {
+                return fhir;
+            }
+            else {
+                return null;
+            }
         }
         else {
+            console.error(chalk_1.default.red(`this.#redis not defined.`));
             return null;
         }
     }
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
     async UpdateFhirResource(fhir, ecb) {
-        const retVal = await this.#redisSubscriber?.set(this.GetResourceType(fhir), JSON.stringify(fhir));
-        if (retVal) {
-            return fhir;
+        if (this.#redis) {
+            const record = {
+                id: this.GetResourceType(fhir),
+                data: JSON.stringify(fhir)
+            };
+            const keyValuePairs = Object.entries(record).flat();
+            const retVal = await this.#redis.HSET(this.GetResourceType(fhir), keyValuePairs);
+            if (retVal >= 0) {
+                return fhir;
+            }
+            else {
+                return null;
+            }
         }
         else {
             return null;
@@ -74,11 +148,16 @@ class DALFhirManagerRedisJson {
     }
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
     async DeleteFhirResource(fhir, ecb) {
-        const deleteResource = await this.GetFhirResource(fhir);
-        if (deleteResource) {
-            const retVal = await this.#redisSubscriber?.del(this.GetResourceType(fhir));
-            if (retVal) {
-                return deleteResource;
+        if (this.#redis) {
+            const deleteResource = await this.GetFhirResource(fhir);
+            if (deleteResource) {
+                const retVal = await this.#redis.del(this.GetResourceType(fhir));
+                if (retVal > 0) {
+                    return deleteResource;
+                }
+                else {
+                    return null;
+                }
             }
             else {
                 return null;
@@ -88,10 +167,27 @@ class DALFhirManagerRedisJson {
             return null;
         }
     }
-    async CreateFhirResources(fhir, ecb) {
-        return null;
+    async GetFhirResources(filters, ecb) {
+        const promArray = [];
+        filters.forEach(filter => {
+            const prom = async () => {
+                const retValArray = [];
+                const retVal = await this.#SearchBy(filter);
+                retVal?.documents.forEach(doc => {
+                    retValArray.push(JSON.parse(doc.value.data));
+                });
+                return retValArray;
+            };
+            promArray.push(prom());
+        });
+        const promRetVal = await Promise.all(promArray);
+        let retVal = [];
+        promRetVal.forEach(prv => {
+            retVal = retVal.concat(prv);
+        });
+        return retVal;
     }
-    async GetFhirResources(fhir, ecb) {
+    async CreateFhirResources(fhir, ecb) {
         return null;
     }
     async UpdateFhirResources(fhir, ecb) {

package/dist/fhir/dalFhirManagerRedisJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"dalFhirManagerRedisJson.js","sourceRoot":"","sources":["../../src/fhir/dalFhirManagerRedisJson.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dalFhirManagerRedisJson.js","sourceRoot":"","sources":["../../src/fhir/dalFhirManagerRedisJson.ts"],"names":[],"mappings":"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"}

package/dist/fhir/dalFhirManagerRedisJson.test.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
 const vitest_1 = require("vitest");
@@ -6,6 +9,7 @@ const STSFhirTypes_1 = require("./STSFhirTypes");
 const dalFhirTestHelpers_1 = require("./dalFhirTestHelpers");
 const stsutils_1 = require("@nsshunt/stsutils");
 const dalFhirManager_1 = require("./dalFhirManager");
+const chalk_1 = __importDefault(require("chalk"));
 vitest_1.describe.skip("Test hl7 fhir resource data access layer - RedisJson", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let testHelpers;
@@ -20,14 +24,22 @@ vitest_1.describe.skip("Test hl7 fhir resource data access layer - RedisJson", (
                 redisUrl: testHelpers.ioRedisMessageProcessorUrl
             }
         });
-        fhirManager.fhirDataAccessManager.Start();
+        await fhirManager.fhirDataAccessManager.Start();
     }, 30000);
     (0, vitest_1.test)('Testing Person', async () => {
         vitest_1.expect.assertions(6);
         await testHelpers.TestFhirPerson(fhirManager.fhirDataAccessManager);
     }, 30000);
+    (0, vitest_1.test)('Testing Person', async () => {
+        const iterations = 10;
+        vitest_1.expect.assertions(iterations + 1);
+        await testHelpers.AddFhirPersons(fhirManager.fhirDataAccessManager, iterations);
+        const fhirResources = await fhirManager.fhirDataAccessManager.GetFhirResources(['']);
+        (0, vitest_1.expect)(fhirResources?.length).toEqual(iterations);
+        console.log(chalk_1.default.green(JSON.stringify(fhirResources)));
+    }, 30000);
     (0, vitest_1.afterAll)(async () => {
-        fhirManager.fhirDataAccessManager.Stop();
+        await fhirManager.fhirDataAccessManager.Stop();
         await (0, stsutils_1.JestSleep)();
         await testHelpers.StopRedis();
     }, 5000);

package/dist/fhir/dalFhirManagerRedisJson.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"dalFhirManagerRedisJson.test.js","sourceRoot":"","sources":["../../src/fhir/dalFhirManagerRedisJson.test.ts"],"names":[],"mappings":";;AAAA,kDAAkD,CAAE,UAAU;AAC9D,mCAAqE;AAErE,iDAA8D;AAE9D,6DAAkD;AAElD,gDAA6C;AAE7C,qDAAiD;AAEjD,iBAAQ,CAAC,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAEvE,8DAA8D;IAC9D,IAAI,WAAwB,CAAC;IAC7B,IAAI,WAAoC,CAAA;IAExC,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QAEjB,WAAW,GAAG,IAAI,gCAAW,EAAE,CAAC;QAChC,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;QAE/B,WAAW,GAAG,IAAI,+BAAc,CAAC;YAC7B,eAAe,EAAE,mCAAoB,CAAC,SAAS;YAC/C,sBAAsB,EAAE;gBACpB,YAAY,EAAE,eAAe;gBAC7B,QAAQ,EAAE,WAAW,CAAC,0BAA0B;aACnD;SACJ,CAAC,CAAC;QAEH,WAAW,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;IAC9C,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,IAAA,aAAI,EAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC9B,eAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACxE,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,IAAA,iBAAQ,EAAC,KAAK,IAAI,EAAE;QAEhB,WAAW,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QACzC,MAAM,IAAA,oBAAS,GAAE,CAAC;QAClB,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC,EAAE,IAAI,CAAC,CAAC;AACb,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dalFhirManagerRedisJson.test.js","sourceRoot":"","sources":["../../src/fhir/dalFhirManagerRedisJson.test.ts"],"names":[],"mappings":";;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,mCAAqE;AAErE,iDAA8D;AAE9D,6DAAkD;AAElD,gDAA6C;AAE7C,qDAAiD;AACjD,kDAAyB;AAEzB,iBAAQ,CAAC,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAEvE,8DAA8D;IAC9D,IAAI,WAAwB,CAAC;IAC7B,IAAI,WAAoC,CAAA;IAExC,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QAEjB,WAAW,GAAG,IAAI,gCAAW,EAAE,CAAC;QAChC,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;QAE/B,WAAW,GAAG,IAAI,+BAAc,CAAC;YAC7B,eAAe,EAAE,mCAAoB,CAAC,SAAS;YAC/C,sBAAsB,EAAE;gBACpB,YAAY,EAAE,eAAe;gBAC7B,QAAQ,EAAE,WAAW,CAAC,0BAA0B;aACnD;SACJ,CAAC,CAAC;QAEH,MAAM,WAAW,CAAC,qBAAqB,CAAC,KAAK,EAAE,CAAC;IACpD,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,IAAA,aAAI,EAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC9B,eAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACxE,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,IAAA,aAAI,EAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,eAAM,CAAC,UAAU,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC;QAClC,MAAM,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;QAEhF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACrF,IAAA,eAAM,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAElD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,IAAA,iBAAQ,EAAC,KAAK,IAAI,EAAE;QAEhB,MAAM,WAAW,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAC/C,MAAM,IAAA,oBAAS,GAAE,CAAC;QAClB,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC,EAAE,IAAI,CAAC,CAAC;AACb,CAAC,CAAC,CAAC"}

package/dist/fhir/dalFhirTestHelpers.js

@@ -65,6 +65,28 @@ class TestHelpers {
         const getPerson01AfterDelete = await personManager.GetFhirResource({ id });
         (0, vitest_1.expect)(getPerson01AfterDelete).toBeNull();
     };
+    AddFhirPersons = async (personManager, iterations) => {
+        for (let i = 0; i < iterations; i++) {
+            const id = (0, uuid_1.v4)();
+            const personRecord = {
+                id,
+                _resourceType: 'Person',
+                name: [
+                    {
+                        family: `family ${i}`,
+                        given: [`given ${i}`],
+                        use: `usual`
+                    }
+                ],
+                text: {
+                    div: `New Record ${i}`,
+                    status: 'generated'
+                }
+            };
+            const newPerson01 = await personManager.CreateFhirResource(personRecord);
+            (0, vitest_1.expect)(newPerson01).toMatchObject(personRecord);
+        }
+    };
     StartDatabase = async () => {
         this.#postgresContainer = await new testcontainers_1.GenericContainer("postgres")
             .withExposedPorts(5432)
@@ -117,7 +139,7 @@ class TestHelpers {
         await this.#postgresContainer.stop();
     };
     StartRedis = async () => {
-        this.#ioRedisContainer = await new testcontainers_1.GenericContainer("redis")
+        this.#ioRedisContainer = await new testcontainers_1.GenericContainer("redis/redis-stack-server")
             .withExposedPorts(6379)
             .start();
         this.#ioRedisMessageProcessorUrl = `redis://${this.#ioRedisContainer.getHost()}:${this.#ioRedisContainer.getMappedPort(6379)}`;

package/dist/fhir/dalFhirTestHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"dalFhirTestHelpers.js","sourceRoot":"","sources":["../../src/fhir/dalFhirTestHelpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dalFhirTestHelpers.js","sourceRoot":"","sources":["../../src/fhir/dalFhirTestHelpers.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.144",
+  "version": "3.1.146",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",

package/src/fhir/STSFhirTypes.ts

@@ -498,15 +498,15 @@ export interface IPersonResource {
 
 export interface IDALFhirDataAccessManager<T> {
     GetFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null>
-    GetFhirResources(fhir: Partial<T>[], ecb?: (error: Error) => void): Promise<T[] | null>
+    GetFhirResources(filters: string[], ecb?: (error: Error) => void): Promise<T[] | null>
     CreateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null>
     CreateFhirResources(fhir: T[], ecb?: (error: Error) => void): Promise<T[] | null>
     UpdateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null>
     UpdateFhirResources(fhir: T[], ecb?: (error: Error) => void): Promise<T[] | null>
     DeleteFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null>
     DeleteFhirResources(fhir: Partial<T>[], ecb?: (error: Error) => void): Promise<T[] | null>
-    Start(): void
-    Stop(): void
+    Start(): Promise<void>
+    Stop(): Promise<void>
     get options()
     set options(options: JSONObject)
 }
@@ -531,7 +531,8 @@ export interface IFhirManagerRedisJsonOptions {
 export enum IFhirPersistenceType {
     postgresResources,
     postgresResourcesEntities,
-    redisJson
+    redisJson,
+    ioredisJson
 }
 
 export interface IDALFhirManagerOptions {

package/src/fhir/dalFhirManager.ts

@@ -1,7 +1,9 @@
-import { IDALFhirDataAccessManager, IFhirManagerPGResOptions, IFhirManagerPGResEntityOptions, IFhirManagerRedisJsonOptions, IDALFhirManagerOptions, IFhirPersistenceType } from './STSFhirTypes'
+import { IDALFhirDataAccessManager, IFhirManagerPGResOptions, IFhirManagerPGResEntityOptions, IFhirManagerRedisJsonOptions, 
+    IDALFhirManagerOptions, IFhirPersistenceType } from './STSFhirTypes'
 import { DALFhirManagerPGRes } from './dalFhirManagerPGRes'
 import { DALFhirManagerPGResEntity } from './dalFhirManagerPGResEntity'
 import { DALFhirManagerRedisJson } from './dalFhirManagerRedisJson'
+import { DALFhirManagerIORedisJson } from './dalFhirManagerIORedisJson'
 
 export class DALFhirManager<T> {
     #fhirDataAccessManager: IDALFhirDataAccessManager<T>;
@@ -17,6 +19,9 @@ export class DALFhirManager<T> {
         case IFhirPersistenceType.redisJson:
             this.#fhirDataAccessManager = new DALFhirManagerRedisJson<T>(options.persistenceTypeOptions as IFhirManagerRedisJsonOptions);
             break;
+        case IFhirPersistenceType.ioredisJson:
+            this.#fhirDataAccessManager = new DALFhirManagerIORedisJson<T>(options.persistenceTypeOptions as IFhirManagerRedisJsonOptions);
+            break;
         default :
             this.#fhirDataAccessManager = new DALFhirManagerPGRes<T>(options.persistenceTypeOptions as IFhirManagerPGResOptions);
         }

package/src/fhir/dalFhirManagerIORedisJson.test.ts

@@ -0,0 +1,58 @@
+/* eslint @typescript-eslint/no-explicit-any: 0 */  // --> OFF
+import { beforeAll, afterAll, test, describe, expect } from 'vitest';
+
+import { IPerson, IFhirPersistenceType } from './STSFhirTypes'
+
+import { TestHelpers } from './dalFhirTestHelpers'
+
+import { JestSleep } from '@nsshunt/stsutils'
+
+import { DALFhirManager } from './dalFhirManager'
+
+import chalk from 'chalk'
+
+describe.skip("Test hl7 fhir resource data access layer - RedisJson", () =>
+{
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let testHelpers: TestHelpers;
+    let fhirManager: DALFhirManager<IPerson>
+
+    beforeAll(async () => 
+    {
+        testHelpers = new TestHelpers();
+        await testHelpers.StartRedis();
+
+        fhirManager = new DALFhirManager({
+            persistenceType: IFhirPersistenceType.ioredisJson,
+            persistenceTypeOptions: {
+                resourceName: 'STSFhirPerson',
+                redisUrl: testHelpers.ioRedisMessageProcessorUrl
+            }
+        });
+
+        await fhirManager.fhirDataAccessManager.Start();
+    }, 30000);
+
+    test('Testing Person', async () => {
+        expect.assertions(6);
+        await testHelpers.TestFhirPerson(fhirManager.fhirDataAccessManager);
+    }, 30000);
+
+    test('Testing Person', async () => {
+        const iterations = 10;
+        expect.assertions(iterations + 1);
+        await testHelpers.AddFhirPersons(fhirManager.fhirDataAccessManager, iterations);
+
+        const fhirResources = await fhirManager.fhirDataAccessManager.GetFhirResources(['']);
+        expect(fhirResources?.length).toEqual(iterations);
+
+        console.log(chalk.magenta(JSON.stringify(fhirResources)));
+    }, 30000);
+
+    afterAll(async () =>
+    {
+        await fhirManager.fhirDataAccessManager.Stop();
+        await JestSleep();
+        await testHelpers.StopRedis();
+    }, 5000);
+});