@nsshunt/stsappframework 3.1.146 → 3.1.148

package/src/fhir/dalFhirManagerPGResEntity.ts

@@ -2,23 +2,15 @@
 import { IDBAccessLayer, IDBResource, IDBEntity } from '@nsshunt/stsdatamanagement'
 
 import { IDomainResource, IFHIRResource, IDALFhirDataAccessManager, IFhirManagerPGResEntityOptions } from './STSFhirTypes'
+import { DALFhirManagerBase } from './dalFhirManagerBase';
 
-export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T> {
-    #options: IFhirManagerPGResEntityOptions;
+export class DALFhirManagerPGResEntity<T> extends DALFhirManagerBase<T> implements IDALFhirDataAccessManager<T> {
     #fhirResource: IDBResource<IFHIRResource> | undefined;
     #accessLayer: IDBAccessLayer;
 
     constructor(options: IFhirManagerPGResEntityOptions) {
-        this.#options = options;
-        this.#accessLayer = this.#options.accessLayer;
-    }
-
-    get options() {
-        return this.#options;
-    }
-
-    set options(options: IFhirManagerPGResEntityOptions) {
-        this.#options = options;
+        super(options);
+        this.#accessLayer = (this.options as IFhirManagerPGResEntityOptions).accessLayer;
     }
 
     async Start() {
@@ -33,20 +25,20 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         if (!this.#fhirResource) {
             this.#fhirResource = ((await this.#accessLayer.GetResource<IFHIRResource>({
                 filters: {
-                    resname: this.#options.resourceName
+                    resname: this.options.resourceName
                 }
             })).detail as IDBResource<IFHIRResource>);
 
             if (!this.#fhirResource) {
                 const fhirResourceType: IFHIRResource = {
-                    name: this.#options.resourceName,
-                    description: `${this.#options.resourceName} description`,
-                    notes: `${this.#options.resourceName} notes`,
+                    name: this.options.resourceName,
+                    description: `${this.options.resourceName} description`,
+                    notes: `${this.options.resourceName} notes`,
                 }
                 this.#fhirResource = ((await this.#accessLayer.CreateResource<IFHIRResource>({
                     filters: {
-                        dbactionuser: this.#options.dbactionuser,
-                        resname: this.#options.resourceName
+                        dbactionuser: this.options.dbactionuser,
+                        resname: this.options.resourceName
                     }
                 }, fhirResourceType)).detail as IDBResource<IFHIRResource>);
             }
@@ -55,7 +47,7 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         return this.#fhirResource;
     }
 
-    async GetFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
+    async GetFhirResource(fhir: Partial<T>, ecb?: (fhir: Partial<T>, error: Error) => void): Promise<T | null> {
         if (!this.#accessLayer) {
             return null;
         }
@@ -69,7 +61,7 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         });
         if (retVal.error) {
             if (ecb) {
-                ecb(retVal.error.error);
+                ecb(fhir, retVal.error.error);
             }
             return null;
         } else {
@@ -77,7 +69,7 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         }
     }
 
-    async CreateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
+    async CreateFhirResource(fhir: T, ecb?: (fhir: T, error: Error) => void): Promise<T | null> {
         if (!this.#accessLayer) {
             return null;
         }
@@ -85,14 +77,14 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         const fhirResource = await this.#GetSTSFhirBaseResource();
         const retVal = await this.#accessLayer.CreateEntity<T>({
             filters: {
-                dbactionuser: this.#options.dbactionuser,
+                dbactionuser: this.options.dbactionuser,
                 resname: fhirResource.resname,
                 entname: (fhir as Partial<IDomainResource>).id
             }
         }, fhir);
         if (retVal.error) {
             if (ecb) {
-                ecb(retVal.error.error);
+                ecb(fhir, retVal.error.error);
             }
             return null;
         } else {
@@ -100,7 +92,7 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         }
     }
 
-    async UpdateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
+    async UpdateFhirResource(fhir: T, ecb?: (fhir: T, error: Error) => void): Promise<T | null> {
         if (!this.#accessLayer) {
             return null;
         }
@@ -108,14 +100,14 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         const fhirResource = await this.#GetSTSFhirBaseResource();
         const retVal = await this.#accessLayer.UpdateEntity<T>({
             filters: {
-                dbactionuser: this.#options.dbactionuser,
+                dbactionuser: this.options.dbactionuser,
                 resname: fhirResource.resname,
                 entname: (fhir as Partial<IDomainResource>).id
             }
         }, fhir);
         if (retVal.error) {
             if (ecb) {
-                ecb(retVal.error.error);
+                ecb(fhir, retVal.error.error);
             }
             return null;
         } else {
@@ -123,7 +115,7 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         }
     }
 
-    async DeleteFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
+    async DeleteFhirResource(fhir: Partial<T>, ecb?: (fhir: Partial<T>, error: Error) => void): Promise<T | null> {
         if (!this.#accessLayer) {
             return null;
         }
@@ -131,14 +123,14 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         const fhirResource = await this.#GetSTSFhirBaseResource();
         const retVal = await this.#accessLayer.DeleteEntity<T>({
             filters: {
-                dbactionuser: this.#options.dbactionuser,
+                dbactionuser: this.options.dbactionuser,
                 resname: fhirResource.resname,
                 entname: (fhir as Partial<IDomainResource>).id
             }
         });
         if (retVal.error) {
             if (ecb) {
-                ecb(retVal.error.error);
+                ecb(fhir, retVal.error.error);
             }
             return null;
         } else {
@@ -146,69 +138,46 @@ export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T
         }
     }
 
-    async GetFhirResources(filters: string[], ecb?: (error: Error) => void): Promise<T[] | null> {
+    async GetFhirResources(filters: string[], ecb?: (filters: string[], error: Error) => void): Promise<T[] | null> {
         if (!this.#accessLayer) {
             return null;
         }
 
-        const fhirResource = await this.#GetSTSFhirBaseResource();
-        const promArray: Promise<T[]>[] = [ ];
-        filters.forEach(filter => {
-            const prom = async (): Promise<T[]> => {
-                const retVal: T[] = [ ];
-
-                const entities = await this.#accessLayer.GetEntities<T>({
-                    filters: {
-                        resname: fhirResource.resname,
-                        filter: `${filter}%`
-                    }
-                })
-        
-                const dbResources = (entities.detail as IDBEntity<T>[]);
-
-                dbResources.forEach(dbResource => {
-                    retVal.push(dbResource.entvalue);
-                });
-
-                return retVal;
-            }
-            promArray.push(prom());
-        })
-        const promRetVal = await Promise.all(promArray);
-        let retVal: T[] = [ ];
-        promRetVal.forEach(prv => {
-            retVal = retVal.concat(prv);
-        });
-        return retVal;
-    }
-
-    async CreateFhirResources(fhir: T[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        return null;
-    }
-
-    async UpdateFhirResources(fhir: T[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        return null
-    }
-
-    async DeleteFhirResources(fhir: Partial<T>[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        return null;
-    }
-
-    /*
-
-        const resources = await accessLayer.GetResources<IUserResourceType>({
-            filters: {
-                filter: 'RESCP-%',
-                limit: '10',
+        try {
+            const fhirResource = await this.#GetSTSFhirBaseResource();
+            const promArray: Promise<T[]>[] = [ ];
+            filters.forEach(filter => {
+                const prom = async (): Promise<T[]> => {
+                    const retVal: T[] = [ ];
+
+                    const entities = await this.#accessLayer.GetEntities<T>({
+                        filters: {
+                            resname: fhirResource.resname,
+                            filter: `${filter}%`
+                        }
+                    })
+            
+                    const dbResources = (entities.detail as IDBEntity<T>[]);
+
+                    dbResources.forEach(dbResource => {
+                        retVal.push(dbResource.entvalue);
+                    });
+
+                    return retVal;
+                }
+                promArray.push(prom());
+            })
+            const promRetVal = await Promise.all(promArray);
+            let retVal: T[] = [ ];
+            promRetVal.forEach(prv => {
+                retVal = retVal.concat(prv);
+            });
+            return retVal;
+        } catch (error) {
+            if (ecb) {
+                ecb(filters, error as Error);
             }
-        })
-
-    const entities = await accessLayer.GetEntities<IUserEntity>({
-        filters: {
-            resname: 'user-t2',
-            filter: '%'
+            return null;
         }
-    })
-        */
-
+    }
 }

package/src/fhir/dalFhirManagerRedisJson.test.ts

@@ -10,6 +10,8 @@ import { JestSleep } from '@nsshunt/stsutils'
 import { DALFhirManager } from './dalFhirManager'
 import chalk from 'chalk'
 
+import { SYSTEM_USER_ID } from '@nsshunt/stsdatamanagement'
+
 describe.skip("Test hl7 fhir resource data access layer - RedisJson", () =>
 {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -25,6 +27,7 @@ describe.skip("Test hl7 fhir resource data access layer - RedisJson", () =>
             persistenceType: IFhirPersistenceType.redisJson,
             persistenceTypeOptions: {
                 resourceName: 'STSFhirPerson',
+                dbactionuser: SYSTEM_USER_ID,
                 redisUrl: testHelpers.ioRedisMessageProcessorUrl
             }
         });
@@ -37,7 +40,7 @@ describe.skip("Test hl7 fhir resource data access layer - RedisJson", () =>
         await testHelpers.TestFhirPerson(fhirManager.fhirDataAccessManager);
     }, 30000);
 
-    test('Testing Person', async () => {
+    test('Testing Persons with Search', async () => {
         const iterations = 10;
         expect.assertions(iterations + 1);
         await testHelpers.AddFhirPersons(fhirManager.fhirDataAccessManager, iterations);
@@ -48,6 +51,39 @@ describe.skip("Test hl7 fhir resource data access layer - RedisJson", () =>
         console.log(chalk.green(JSON.stringify(fhirResources)));
     }, 30000);
 
+    test('Testing Persons with Bulk Insert', async () => {
+        const iterations = 10;
+        expect.assertions(2);
+        await testHelpers.AddFhirPersonsByArray(fhirManager.fhirDataAccessManager, iterations);
+
+        const fhirResources = await fhirManager.fhirDataAccessManager.GetFhirResources(['bulk_']);
+        expect(fhirResources?.length).toEqual(iterations);
+
+        console.log(chalk.rgb(133, 161, 142)(JSON.stringify(fhirResources)));
+    }, 30000);
+
+    test('Testing Persons with Bulk Update', async () => {
+        const iterations = 10;
+        expect.assertions(2);
+        await testHelpers.UpdateFhirPersonsByArray(fhirManager.fhirDataAccessManager, iterations);
+
+        const fhirResources = await fhirManager.fhirDataAccessManager.GetFhirResources(['bulk_']);
+        expect(fhirResources?.length).toEqual(iterations);
+
+        console.log(chalk.rgb(157, 133, 161)(JSON.stringify(fhirResources)));
+    }, 30000);
+
+    test('Testing Persons with Bulk Delete', async () => {
+        const iterations = 7;
+        expect.assertions(2);
+        await testHelpers.DeleteFhirPersonsByArray(fhirManager.fhirDataAccessManager, iterations);
+
+        const fhirResources = await fhirManager.fhirDataAccessManager.GetFhirResources(['bulk_']);
+        expect(fhirResources?.length).toEqual(10 - iterations);
+
+        console.log(chalk.rgb(105, 97, 50)(JSON.stringify(fhirResources)));
+    }, 30000);
+
     afterAll(async () =>
     {
         await fhirManager.fhirDataAccessManager.Stop();

package/src/fhir/dalFhirManagerRedisJson.ts

@@ -3,24 +3,16 @@
 import { IDomainResource, IDALFhirDataAccessManager, IFhirManagerRedisJsonOptions } from './STSFhirTypes'
 
 import { SchemaFieldTypes, createClient, RedisClientType, AggregateSteps, AggregateGroupByReducers } from 'redis';
+import { DALFhirManagerBase } from './dalFhirManagerBase';
 
 import chalk from 'chalk'
 
-export class DALFhirManagerRedisJson<T> implements IDALFhirDataAccessManager<T> {
-    #options: IFhirManagerRedisJsonOptions;
+export class DALFhirManagerRedisJson<T> extends DALFhirManagerBase<T> implements IDALFhirDataAccessManager<T> {
     #redis: RedisClientType | null = null;
     #indexName: string = 'idx:stsfhirresindex';
 
     constructor(options: IFhirManagerRedisJsonOptions) {
-        this.#options = options;
-    }
-
-    get options() {
-        return this.#options;
-    }
-
-    set options(options: IFhirManagerRedisJsonOptions) {
-        this.#options = options;
+        super(options);
     }
 
     #CreateIndex = async () => {
@@ -40,7 +32,7 @@ export class DALFhirManagerRedisJson<T> implements IDALFhirDataAccessManager<T>
                 'id': { type: SchemaFieldTypes.TEXT, SORTABLE: true }
             }, {
                 ON: 'HASH',
-                PREFIX: `${this.#options.resourceName}_`
+                PREFIX: `${this.options.resourceName}_`
             });
             console.log(retVal);
         } catch (error) {
@@ -65,7 +57,7 @@ export class DALFhirManagerRedisJson<T> implements IDALFhirDataAccessManager<T>
             }
         } as any;
 
-        const query = `@id:${this.#options.resourceName}_${id}*`;
+        const query = `@id:${this.options.resourceName}_${id}*`;
 
         const retVal = await this.#redis.ft.search(this.#indexName, query, queryOptions);
 
@@ -73,7 +65,7 @@ export class DALFhirManagerRedisJson<T> implements IDALFhirDataAccessManager<T>
     }
 
     async Start() {
-        this.#redis = await createClient({url: this.#options.redisUrl})
+        this.#redis = await createClient({url: (this.options as IFhirManagerRedisJsonOptions).redisUrl})
             .on('error', error => console.error(chalk.red(`Error connecting to redis. Error: [${error}]`)))
             .connect() as any
 
@@ -92,124 +84,147 @@ export class DALFhirManagerRedisJson<T> implements IDALFhirDataAccessManager<T>
     }
 
     GetResourceType(fhir: Partial<T>): string {
-        return `${this.#options.resourceName}_${(fhir as Partial<IDomainResource>).id}`;
+        return `${this.options.resourceName}_${(fhir as Partial<IDomainResource>).id}`;
     }
 
-    async GetFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
-        if (this.#redis) {
-            const retValRaw = await this.#redis.HGETALL(this.GetResourceType(fhir))
-            if (retValRaw) {
-                try {
-                    const { id, data } = retValRaw;
-                    return JSON.parse(data) as T;
-                } catch (error: unknown) {
-                    if (ecb) {
-                        ecb(error as Error);
+    async GetFhirResource(fhir: Partial<T>, ecb?: (fhir: Partial<T>, error: Error) => void): Promise<T | null> {
+        try {
+            if (this.#redis) {
+                const retValRaw = await this.#redis.HGETALL(this.GetResourceType(fhir))
+                if (retValRaw) {
+                    try {
+                        const { id, data } = retValRaw;
+                        return JSON.parse(data) as T;
+                    } catch (error: unknown) {
+                        if (ecb) {
+                            ecb(fhir, error as Error);
+                        }
+                        return null;
                     }
+                } else {
                     return null;
                 }
             } else {
                 return null;
             }
-        } else {
+        } catch (error) {
+            if (ecb) {
+                ecb(fhir, error as Error);
+            }
             return null;
         }
     }
 
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
-    async CreateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
-        if (this.#redis) {
-            const record = {
-                id: this.GetResourceType(fhir),
-                data: JSON.stringify(fhir)
-            } as any;
+    async CreateFhirResource(fhir: T, ecb?: (fhir: T, error: Error) => void): Promise<T | null> {
+        try {
+            if (this.#redis) {
+                const record = {
+                    id: this.GetResourceType(fhir),
+                    data: JSON.stringify(fhir)
+                } as any;
 
-            const keyValuePairs: any = Object.entries(record).flat();
+                const keyValuePairs: any = Object.entries(record).flat();
 
-            const retVal = await this.#redis.HSET(this.GetResourceType(fhir), keyValuePairs);
+                const retVal = await this.#redis.HSET(this.GetResourceType(fhir), keyValuePairs);
 
-            if (retVal) {
-                return fhir;
+                if (retVal) {
+                    return fhir;
+                } else {
+                    return null;
+                }
             } else {
+                console.error(chalk.red(`this.#redis not defined.`))
                 return null;
             }
-        } else {
-            console.error(chalk.red(`this.#redis not defined.`))
+        } catch (error) {
+            if (ecb) {
+                ecb(fhir, error as Error);
+            }
             return null;
         }
     }
 
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
-    async UpdateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
-        if (this.#redis) {
-            const record = {
-                id: this.GetResourceType(fhir),
-                data: JSON.stringify(fhir)
-            } as any;
+    async UpdateFhirResource(fhir: T, ecb?: (fhir: T, error: Error) => void): Promise<T | null> {
+        try {
+            if (this.#redis) {
+                const record = {
+                    id: this.GetResourceType(fhir),
+                    data: JSON.stringify(fhir)
+                } as any;
 
-            const keyValuePairs: any = Object.entries(record).flat();
+                const keyValuePairs: any = Object.entries(record).flat();
 
-            const retVal = await this.#redis.HSET(this.GetResourceType(fhir), keyValuePairs);
-            if (retVal >= 0) {
-                return fhir;
+                const retVal = await this.#redis.HSET(this.GetResourceType(fhir), keyValuePairs);
+                if (retVal >= 0) {
+                    return fhir;
+                } else {
+                    return null;
+                }
             } else {
                 return null;
             }
-        } else {
+        } catch (error) {
+            if (ecb) {
+                ecb(fhir, error as Error);
+            }
             return null;
         }
     }
 
     // eslint-disable-next-line  @typescript-eslint/no-unused-vars
-    async DeleteFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
-        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;
+    async DeleteFhirResource(fhir: Partial<T>, ecb?: (fhir: Partial<T>, error: Error) => void): Promise<T | null> {
+        try {
+            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;
                 }
             } else {
                 return null;
             }
-        } else {
+        } catch (error) {
+            if (ecb) {
+                ecb(fhir, error as Error);
+            }
             return null;
         }
     }
 
-    async GetFhirResources(filters: string[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        const promArray: Promise<T[]>[] = [ ];
-        filters.forEach(filter => {
-            const prom = async (): Promise<T[]> => {
-                const retValArray: T[] = [ ];
-                const retVal = await this.#SearchBy(filter);
-                retVal?.documents.forEach(doc => {
-                    retValArray.push(JSON.parse(doc.value.data as string) as T);
-                })
-                return retValArray;
-            }
-            promArray.push(prom());
-        });
-
-        const promRetVal = await Promise.all(promArray);
-        let retVal: T[] = [ ];
-        promRetVal.forEach(prv => {
-            retVal = retVal.concat(prv);
-        });
-        return retVal;
-    }
-
-    async CreateFhirResources(fhir: T[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        return null;
-    }
-
-    async UpdateFhirResources(fhir: T[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        return null
-    }
+    async GetFhirResources(filters: string[], ecb?: (filters: string[], error: Error) => void): Promise<T[] | null> {
+        try {
+            const promArray: Promise<T[]>[] = [ ];
+            filters.forEach(filter => {
+                const prom = async (): Promise<T[]> => {
+                    const retValArray: T[] = [ ];
+                    const retVal = await this.#SearchBy(filter);
+                    retVal?.documents.forEach(doc => {
+                        retValArray.push(JSON.parse(doc.value.data as string) as T);
+                    })
+                    return retValArray;
+                }
+                promArray.push(prom());
+            });
 
-    async DeleteFhirResources(fhir: Partial<T>[], ecb?: (error: Error) => void): Promise<T[] | null> {
-        return null;
+            const promRetVal = await Promise.all(promArray);
+            let retVal: T[] = [ ];
+            promRetVal.forEach(prv => {
+                retVal = retVal.concat(prv);
+            });
+            return retVal;
+        } catch (error) {
+            if (ecb) {
+                ecb(filters, error as Error);
+            }
+            return null;
+        }
     }
 }