@sphereon/ssi-sdk.data-store 0.18.2-unstable.60 → 0.18.2-unstable.67

package/dist/xstatePersistence/XStateStore.js

@@ -15,25 +15,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XStateStore = void 0;
 const debug_1 = __importDefault(require("debug"));
 const StateEntity_1 = require("../entities/xstatePersistence/StateEntity");
-const MappingUtils_1 = require("../utils/contact/MappingUtils");
 const IAbstractXStateStore_1 = require("./IAbstractXStateStore");
 const debug = (0, debug_1.default)('sphereon:ssi-sdk:xstatePersistence');
 class XStateStore extends IAbstractXStateStore_1.IAbstractXStateStore {
     constructor(dbConnection) {
         super();
+        this.stateFrom = (state) => {
+            return {
+                state: state.id,
+                type: state.type,
+                createdAt: state.createdAt,
+                updatedAt: state.updatedAt,
+                completedAt: state.completedAt,
+                tenantId: state.tenantId
+            };
+        };
         this.dbConnection = dbConnection;
     }
     saveState(state) {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.dbConnection;
-            debug.log(`Executing persistState with state: ${JSON.stringify(state)}`);
-            yield connection.getRepository(StateEntity_1.StateEntity).save(state);
+            debug(`Executing saveState with state: ${JSON.stringify(state)}`);
+            return connection.getRepository(StateEntity_1.StateEntity).save(state);
         });
     }
     getState(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.dbConnection;
-            debug.log(`Executing loadState query with type: ${args.type}`);
+            debug(`Executing loadState query with type: ${args.type}`);
             const result = yield connection.getRepository(StateEntity_1.StateEntity)
                 .findOne({
                 where: { type: args.type }
@@ -41,15 +50,26 @@ class XStateStore extends IAbstractXStateStore_1.IAbstractXStateStore {
             if (!result) {
                 return Promise.reject(Error(`No state found for type: ${args.type}`));
             }
-            return (0, MappingUtils_1.stateFrom)(result);
+            return this.stateFrom(result);
+        });
+    }
+    getStates(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const connection = yield this.dbConnection; // TODO apply everywhere
+            debug('Getting states', args);
+            const result = yield connection.getRepository(StateEntity_1.StateEntity).find(Object.assign({}, ((args === null || args === void 0 ? void 0 : args.filter) && { where: args === null || args === void 0 ? void 0 : args.filter })));
+            return result.map((event) => this.stateFrom(event));
         });
     }
     deleteState(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const connection = yield this.dbConnection;
-            debug.log(`Executing loadState query with type: ${args.type}`);
-            yield connection.getRepository(StateEntity_1.StateEntity)
-                .delete({ type: args.type });
+            debug(`Executing deleteState query with where clause: ${args.where} and params: ${JSON.stringify(args.parameters)}`);
+            yield connection.createQueryBuilder()
+                .delete()
+                .from(StateEntity_1.StateEntity)
+                .where(args.where, args.parameters)
+                .execute();
         });
     }
 }

package/dist/xstatePersistence/XStateStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"XStateStore.js","sourceRoot":"","sources":["../../src/xstatePersistence/XStateStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAAyB;AAGzB,2EAAsE;AAEtE,gEAAwD;AACxD,iEAA4D;AAE5D,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAA;AAEzD,MAAa,WAAY,SAAQ,2CAAoB;IAGjD,YAAY,YAAmC;QAC3C,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAEK,SAAS,CAAC,KAAoB;;YAChC,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA;YACtD,KAAK,CAAC,GAAG,CAAC,sCAAsC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACxE,MAAM,UAAU,CAAC,aAAa,CAAC,yBAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC3D,CAAC;KAAA;IAEK,QAAQ,CAAC,IAAkB;;YAC7B,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA;YACtD,KAAK,CAAC,GAAG,CAAC,wCAAwC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAC9D,MAAM,MAAM,GAAuB,MAAM,UAAU,CAAC,aAAa,CAAC,yBAAW,CAAC;iBACzE,OAAO,CAAC;gBACL,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;aAC7B,CAAC,CAAA;YACN,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;aACxE;YACD,OAAO,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAA;QAC5B,CAAC;KAAA;IAEK,WAAW,CAAC,IAAqB;;YACnC,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA;YACtD,KAAK,CAAC,GAAG,CAAC,wCAAwC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAC9D,MAAM,UAAU,CAAC,aAAa,CAAC,yBAAW,CAAC;iBACtC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QACpC,CAAC;KAAA;CACJ;AAjCD,kCAiCC"}
+{"version":3,"file":"XStateStore.js","sourceRoot":"","sources":["../../src/xstatePersistence/XStateStore.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,kDAAyB;AAGzB,2EAAsE;AAEtE,iEAA4D;AAE5D,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,oCAAoC,CAAC,CAAA;AAEzD,MAAa,WAAY,SAAQ,2CAAoB;IAGjD,YAAY,YAAmC;QAC3C,KAAK,EAAE,CAAA;QA2CH,cAAS,GAAG,CAAC,KAAkB,EAAS,EAAE;YAC9C,OAAO;gBACH,KAAK,EAAE,KAAK,CAAC,EAAE;gBACf,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,QAAQ,EAAE,KAAK,CAAC,QAAQ;aAC3B,CAAA;QACL,CAAC,CAAA;QAnDG,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAEK,SAAS,CAAC,KAAoB;;YAChC,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA;YACtD,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACjE,OAAO,UAAU,CAAC,aAAa,CAAC,yBAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC;KAAA;IAEK,QAAQ,CAAC,IAAkB;;YAC7B,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA;YACtD,KAAK,CAAC,wCAAwC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1D,MAAM,MAAM,GAAuB,MAAM,UAAU,CAAC,aAAa,CAAC,yBAAW,CAAC;iBACzE,OAAO,CAAC;gBACL,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;aAC7B,CAAC,CAAA;YACN,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;aACxE;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACjC,CAAC;KAAA;IAEK,SAAS,CAAC,IAAoB;;YAChC,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA,CAAC,wBAAwB;YAC/E,KAAK,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAA;YAC7B,MAAM,MAAM,GAAuB,MAAM,UAAU,CAAC,aAAa,CAAC,yBAAW,CAAC,CAAC,IAAI,mBAC5E,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,KAAI,EAAE,KAAK,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE,CAAC,EAC9C,CAAA;YAEF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QACpE,CAAC;KAAA;IAEK,WAAW,CAAC,IAAqB;;YACnC,MAAM,UAAU,GAAe,MAAM,IAAI,CAAC,YAAY,CAAA;YACtD,KAAK,CAAC,kDAAkD,IAAI,CAAC,KAAK,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YACpH,MAAM,UAAU,CAAC,kBAAkB,EAAE;iBAChC,MAAM,EAAE;iBACR,IAAI,CAAC,yBAAW,CAAC;iBACjB,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC;iBAClC,OAAO,EAAE,CAAA;QAClB,CAAC;KAAA;CAYJ;AAzDD,kCAyDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.18.2-unstable.60+94c434d4",
+  "version": "0.18.2-unstable.67+3c9bd888",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,8 +13,8 @@
     "typeorm-postgres:migration:run": "pnpm run typeorm -- migration:run -c migration-postgres"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk.core": "0.18.2-unstable.60+94c434d4",
-    "@sphereon/ssi-types": "0.18.2-unstable.60+94c434d4",
+    "@sphereon/ssi-sdk.core": "0.18.2-unstable.67+3c9bd888",
+    "@sphereon/ssi-types": "0.18.2-unstable.67+3c9bd888",
     "@veramo/core": "4.2.0",
     "class-validator": "^0.14.0",
     "debug": "^4.3.4",
@@ -43,5 +43,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "94c434d4e81b633acc2efd02e4898e589338de9e"
+  "gitHead": "3c9bd88842928319f8e8c72d0b17c82b7c84010e"
 }

package/src/__tests__/xstatePersistence.entities.test.ts

@@ -0,0 +1,45 @@
+import {DataSource} from 'typeorm'
+import {StateEntity, stateEntityFrom} from "../entities/xstatePersistence/StateEntity";
+
+import {DataStoreXStateStoreEntities, DataStoreXStateStoreMigrations, NonPersistedXStateStoreEvent} from '../index'
+
+describe('Database entities tests', (): void => {
+    let dbConnection: DataSource
+
+    beforeEach(async (): Promise<void> => {
+        dbConnection = await new DataSource({
+            type: 'sqlite',
+            database: ':memory:',
+            //logging: 'all',
+            migrationsRun: false,
+            migrations: DataStoreXStateStoreMigrations,
+            synchronize: false,
+            entities: [...DataStoreXStateStoreEntities],
+        }).initialize()
+        await dbConnection.runMigrations()
+        expect(await dbConnection.showMigrations()).toBeFalsy()
+    })
+
+    afterEach(async (): Promise<void> => {
+        await dbConnection.destroy()
+    })
+
+    it('should save xstate event to database', async (): Promise<void> => {
+        const xstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'b40b8474-58a2-4b23-9fde-bd6ee1902cdb',
+            completedAt:  new Date(),
+            tenantId: 'test_tenant_id'
+        }
+
+        const xstateEventEntity: StateEntity  = stateEntityFrom(xstateEvent)
+        const fromDb: StateEntity = await dbConnection.getRepository(StateEntity).save(xstateEventEntity)
+
+        expect(fromDb).toBeDefined()
+        expect(fromDb?.id).not.toBeNull()
+        expect(fromDb?.type).toEqual(xstateEvent.type)
+        expect(fromDb?.state).toEqual(xstateEvent.state)
+        expect(fromDb?.tenantId).toEqual(xstateEvent.tenantId)
+        expect(fromDb?.completedAt).toEqual(xstateEvent.completedAt)
+    })
+})

package/src/__tests__/xstatePersistence.store.test.ts

@@ -0,0 +1,120 @@
+import {DataSource} from 'typeorm'
+import {DataStoreXStateStoreEntities, GetStateArgs, NonPersistedXStateStoreEvent, State, XStateStore} from '../index'
+import {DataStoreXStateStoreMigrations} from '../migrations'
+
+describe('Database entities tests', (): void => {
+    let dbConnection: DataSource
+    let xstateStore: XStateStore
+
+    beforeEach(async (): Promise<void> => {
+        dbConnection = await new DataSource({
+            type: 'sqlite',
+            database: ':memory:',
+            logging: 'all',
+            migrationsRun: false,
+            migrations: DataStoreXStateStoreMigrations,
+            synchronize: false,
+            entities: DataStoreXStateStoreEntities,
+        }).initialize()
+        await dbConnection.runMigrations()
+        expect(await dbConnection.showMigrations()).toBeFalsy()
+        xstateStore = new XStateStore(dbConnection)
+    })
+
+    afterEach(async (): Promise<void> => {
+        await dbConnection.destroy()
+    })
+
+    it('should store xstate event', async (): Promise<void> => {
+        const xstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'b40b8474-58a2-4b23-9fde-bd6ee1902cdb',
+            createdAt: new Date(),
+            updatedAt: new Date(),
+            completedAt:  new Date(),
+            tenantId: 'test_tenant_id'
+        }
+
+        const savedXStoreEvent: State = await xstateStore.saveState(xstateEvent)
+        expect(savedXStoreEvent).toBeDefined()
+    })
+
+    it('should get all state events', async (): Promise<void> => {
+        const xstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'b40b8474-58a2-4b23-9fde-bd6ee1902cdb',
+            completedAt:  new Date(),
+            tenantId: 'test_tenant_id'
+        }
+
+        const stateEvent1: NonPersistedXStateStoreEvent = await xstateStore.saveState({...xstateEvent})
+        expect(stateEvent1).toBeDefined()
+
+        const stateEvent2: NonPersistedXStateStoreEvent = await xstateStore.saveState({...xstateEvent})
+        expect(stateEvent2).toBeDefined()
+
+        const result: Array<State> = await xstateStore.getStates()
+        expect(result).toHaveLength(2)
+    })
+
+    it('should retrieve an xstate event', async (): Promise<void> => {
+        const xstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'b40b8474-58a2-4b23-9fde-bd6ee1902cdb',
+            completedAt:  new Date(),
+            tenantId: 'test_tenant_id'
+        }
+
+        const savedXStoreEvent1: State = await xstateStore.saveState(xstateEvent)
+        expect(savedXStoreEvent1).toBeDefined()
+
+        const result: State = await xstateStore.getState(xstateEvent)
+        expect(result).toBeDefined()
+    })
+
+    it('should return an error if type filter does not match', async (): Promise<void> => {
+        const args: GetStateArgs = {
+            type: 'unknown_event'
+        }
+
+        await expect(xstateStore.getState(args)).rejects.toEqual(Error('No state found for type: unknown_event'))
+    })
+
+    it('should delete the expired records', async () => {
+        const now = new Date()
+        const newestXstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'test_type_1',
+            createdAt: now,
+            completedAt: new Date(),
+            tenantId: 'test_tenant_id'
+        }
+        const middleXstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'test_type_2',
+            createdAt: new Date(+now - 30000),
+            completedAt:  new Date(),
+            tenantId: 'test_tenant_id'
+        }
+
+        const oldestXstateEvent: NonPersistedXStateStoreEvent = {
+            state: 'test_state',
+            type: 'test_type_3',
+            createdAt: new Date(+now - 60000),
+            completedAt: new Date(),
+            tenantId: 'test_tenant_id'
+        }
+
+        await xstateStore.saveState(oldestXstateEvent)
+        await xstateStore.saveState(middleXstateEvent)
+        await xstateStore.saveState(newestXstateEvent)
+
+        await xstateStore.deleteState({
+            where: `created_at < datetime('now', :ttl)`, parameters: { ttl: '-30 seconds' }
+        })
+
+        await expect(xstateStore.getState({ type: 'test_type_1'})).resolves.toBeDefined()
+        await expect(xstateStore.getState({ type: 'test_type_2'})).resolves.toBeDefined()
+        await expect(xstateStore.getState({ type: 'test_type_3'})).rejects.toEqual(Error('No state found for type: test_type_3'))
+    })
+})

package/src/entities/xstatePersistence/StateEntity.ts

@@ -1,29 +1,35 @@
-import {BaseEntity, Column, Entity, PrimaryColumn} from "typeorm";
+import {BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn} from "typeorm"
+import {NonPersistedXStateStoreEvent} from "../../types";
 
 @Entity('StateEntity')
 export class StateEntity extends BaseEntity {
-    @PrimaryColumn({ name: 'id', type: 'varchar' })
-    // @ts-ignore
-    id: string
-    @Column()
-    // @ts-ignore
-    state: string
-    @Column()
-    // @ts-ignore
-    type: string
-    @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
-    // @ts-ignore
-    createdAt: Date
-    @Column({ type: 'timestamp', onUpdate: 'CURRENT_TIMESTAMP', nullable: true })
-    // @ts-ignore
-    updatedAt: Date
-    @Column({ type: 'timestamp', nullable: true })
-    // @ts-ignore
-    completedAt: Date
-    @Column()
-    // @ts-ignore
+    @PrimaryGeneratedColumn('uuid', { name: 'id' })
+    id!: string
+
+    @Column({ name: 'state', nullable: false })
+    state!: string
+
+    @Column({ name: 'type', nullable: false })
+    type!: string
+
+    @CreateDateColumn({ name: 'created_at', nullable: false })
+    createdAt!: Date
+
+    @UpdateDateColumn({ name: 'updated_at', nullable: false })
+    updatedAt!: Date
+
+    @Column({ name: 'completed_at', type: 'datetime', nullable: true })
+    completedAt?: Date
+
+    @Column({ name: 'tenant_id', type: 'varchar', nullable: true })
     tenantId?: string
-    @Column({ default: 0 })
-    // @ts-ignore
-    ttl: number
+}
+
+export const stateEntityFrom = (args: NonPersistedXStateStoreEvent): StateEntity => {
+    const stateEntity = new StateEntity()
+    stateEntity.state = args.state
+    stateEntity.type = args.type
+    stateEntity.completedAt = args.completedAt
+    stateEntity.tenantId = args.tenantId
+    return stateEntity
 }

package/src/index.ts

@@ -18,7 +18,7 @@ import { IssuerBrandingEntity, issuerBrandingEntityFrom } from './entities/issua
 import { TextAttributesEntity, textAttributesEntityFrom } from './entities/issuanceBranding/TextAttributesEntity'
 import { StatusListEntity } from './entities/statusList2021/StatusList2021Entity'
 import { StatusListEntryEntity } from './entities/statusList2021/StatusList2021EntryEntity'
-import {StateEntity} from "./entities/xstatePersistence/StateEntity";
+import { StateEntity } from "./entities/xstatePersistence/StateEntity";
 import { IStatusListEntity, IStatusListEntryEntity } from './types'
 import { PartyRelationshipEntity } from './entities/contact/PartyRelationshipEntity'
 import { PartyTypeEntity } from './entities/contact/PartyTypeEntity'
@@ -42,7 +42,7 @@ export {
   DataStoreContactMigrations,
   DataStoreIssuanceBrandingMigrations,
   DataStoreStatusListMigrations,
-  DataStoreXStatePersistenceMigration,
+  DataStoreXStateStoreMigrations,
 } from './migrations'
 export * from './types'
 export * from './utils/contact/MappingUtils'

package/src/migrations/generic/index.ts

@@ -18,7 +18,7 @@ export const DataStoreContactMigrations = [CreateContacts1659463079429, CreateCo
 export const DataStoreIssuanceBrandingMigrations = [CreateIssuanceBranding1659463079429]
 export const DataStoreStatusListMigrations = [CreateStatusList1693866470000]
 export const DataStoreEventLoggerMigrations = [CreateAuditEvents1701635835330]
-export const DataStoreXStatePersistenceMigration = [CreateXStateStore1708098041262]
+export const DataStoreXStateStoreMigrations = [CreateXStateStore1708098041262]
 
 // All migrations together
 export const DataStoreMigrations = [
@@ -26,5 +26,5 @@ export const DataStoreMigrations = [
   ...DataStoreIssuanceBrandingMigrations,
   ...DataStoreStatusListMigrations,
   ...DataStoreEventLoggerMigrations,
-  ...DataStoreXStatePersistenceMigration
+  ...DataStoreXStateStoreMigrations
 ]

package/src/migrations/index.ts

@@ -4,5 +4,5 @@ export {
   DataStoreContactMigrations,
   DataStoreIssuanceBrandingMigrations,
   DataStoreStatusListMigrations,
-  DataStoreXStatePersistenceMigration
+  DataStoreXStateStoreMigrations
 } from './generic'

package/src/migrations/postgres/1708097018115-CreateXStateStore.ts

@@ -7,12 +7,12 @@ export class CreateXStateStore1708097018115 implements MigrationInterface {
     public async up(queryRunner: QueryRunner): Promise<any> {
         await enablePostgresUuidExtension(queryRunner)
         await queryRunner.query(
-            `CREATE TABLE "XStateStore" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "state" varchar(255) NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP, CONSTRAINT PK_XStateStore_id PRIMARY KEY ("id")`
+            `CREATE TABLE "StateEntity" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "state" varchar(255) NOT NULL, "type" varchar(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "updated_at" TIMESTAMP NOT NULL DEFAULT now(), "completed_at" TIMESTAMP, "tenant_id" varchar(255) NULL, "ttl" INTEGER NULL, CONSTRAINT PK_XStateStore_id PRIMARY KEY ("id"))`
         )
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "XStateStore" DROP CONSTRAINT "PK_XStateStore_id"`)
-        await queryRunner.query(`DROP TABLE "XStateEntity"`)
+        await queryRunner.query(`ALTER TABLE "StateEntity" DROP CONSTRAINT "PK_StateStore_id"`)
+        await queryRunner.query(`DROP TABLE "StateEntity"`)
     }
 }

package/src/migrations/sqlite/1708096002272-CreateXStateStore.ts

@@ -5,12 +5,12 @@ export class CreateXStateStore1708096002272 implements MigrationInterface {
 
     public async up(queryRunner: QueryRunner): Promise<any> {
         await queryRunner.query(
-            `CREATE TABLE "XStateEntity" ("id" varchar PRIMARY KEY NOT NULL, "state" varchar(255) NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT (datetime('now')), "updatedAt" TIMESTAMP NOT NULL DEFAULT (datetime('now')), "deletedAt" TIMESTAMP, CONSTRAINT "PK_XStateEntity_id")`
+            `CREATE TABLE "StateEntity" ("id" varchar PRIMARY KEY, "state" varchar(255) NOT NULL, "type" varchar(255) NOT NULL, "created_at" DATETIME NOT NULL DEFAULT (datetime('now')), "updated_at" DATETIME NOT NULL DEFAULT (datetime('now')), "completed_at" DATETIME, "tenant_id" varchar(255) NULL, "ttl" INTEGER NULL)`
         )
     }
 
     public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "XStateEntity" DROP CONSTRAINT "PK_XStateEntity_id"`)
-        await queryRunner.query(`DROP TABLE "XStateEntity"`)
+        await queryRunner.query(`ALTER TABLE "StateEntity"`)
+        await queryRunner.query(`DROP TABLE "StateEntity"`)
     }
 }

package/src/types/index.ts

@@ -7,4 +7,4 @@ export * from './statusList/statusList'
 export * from './statusList/IAbstractStatusListStore'
 export * from './eventLogger/IAbstractEventLoggerStore'
 export * from './eventLogger/eventLogger'
-export * from './xstatePersistence/types'
+export * from './xstatePersistence/IAbstractXStateStore'

package/src/types/xstatePersistence/IAbstractXStateStore.ts

@@ -0,0 +1,33 @@
+import {ObjectLiteral} from "typeorm";
+
+export type SaveStateArgs = {
+    state: string
+    type: string
+    createdAt?: Date
+    updatedAt?: Date
+    completedAt?: Date
+    tenantId?: string
+}
+
+export type GetStateArgs = Pick<SaveStateArgs, 'type'>
+
+export type FindStatesArgs = Partial<SaveStateArgs>
+
+export type GetStatesArgs = {
+    filter: FindStatesArgs
+}
+
+export type NonPersistedXStateStoreEvent = SaveStateArgs
+
+export type DeleteStateArgs = { where: string, parameters?: ObjectLiteral }
+
+export type VoidResult = void
+
+export type State = {
+    state: string
+    type: string
+    createdAt: Date
+    updatedAt: Date
+    completedAt?: Date
+    tenantId?: string
+}

package/src/utils/contact/MappingUtils.ts

@@ -1,4 +1,3 @@
-import {StateEntity} from "../../entities/xstatePersistence/StateEntity";
 import {
   Connection,
   ConnectionConfig,
@@ -27,7 +26,7 @@ import {
   Organization,
   Party,
   PartyRelationship,
-  PartyType, State,
+  PartyType,
 } from '../../types'
 import { PartyEntity } from '../../entities/contact/PartyEntity'
 import { IdentityEntity } from '../../entities/contact/IdentityEntity'
@@ -343,15 +342,3 @@ export const isOpenIdConfig = (config: NonPersistedConnectionConfig | BaseConfig
 
 export const isDidAuthConfig = (config: NonPersistedConnectionConfig | BaseConfigEntity): config is DidAuthConfig | DidAuthConfigEntity =>
   'identifier' in config && 'redirectUrl' in config && 'sessionId' in config
-
-export const stateFrom = (state: StateEntity): State => {
-  return {
-    state: state.id,
-    type: state.type,
-    createdAt: state.createdAt,
-    updatedAt: state.updatedAt,
-    completedAt: state.completedAt,
-    tenantId: state.tenantId,
-    ttl: state.ttl
-  }
-}

package/src/xstatePersistence/IAbstractXStateStore.ts

@@ -1,7 +1,8 @@
-import {GetStateArgs, GetStateResult, SaveStateArgs, VoidResult} from "../types";
+import {DeleteStateArgs, GetStateArgs, GetStatesArgs, SaveStateArgs, State, VoidResult} from "../types";
 
 export abstract class IAbstractXStateStore {
-    abstract saveState(state: SaveStateArgs): Promise<VoidResult>
-    abstract getState(args: GetStateArgs): Promise<GetStateResult>
-    abstract deleteState(args: GetStateArgs): Promise<VoidResult>
+    abstract saveState(state: SaveStateArgs): Promise<State>
+    abstract getState(args: GetStateArgs): Promise<State>
+    abstract getStates(args?: GetStatesArgs): Promise<Array<State>>
+    abstract deleteState(args: DeleteStateArgs): Promise<VoidResult>
 }

package/src/xstatePersistence/XStateStore.ts

@@ -3,8 +3,7 @@ import Debug from 'debug'
 import {DataSource} from "typeorm";
 
 import {StateEntity} from "../entities/xstatePersistence/StateEntity";
-import {DeleteStateArgs, GetStateArgs, GetStateResult, SaveStateArgs, VoidResult,} from "../types";
-import {stateFrom} from "../utils/contact/MappingUtils";
+import {DeleteStateArgs, GetStateArgs, GetStatesArgs, SaveStateArgs, State, VoidResult,} from "../types";
 import {IAbstractXStateStore} from "./IAbstractXStateStore";
 
 const debug = Debug('sphereon:ssi-sdk:xstatePersistence')
@@ -17,15 +16,15 @@ export class XStateStore extends IAbstractXStateStore {
         this.dbConnection = dbConnection
     }
 
-    async saveState(state: SaveStateArgs): Promise<VoidResult> {
+    async saveState(state: SaveStateArgs): Promise<State> {
         const connection: DataSource = await this.dbConnection
-        debug.log(`Executing persistState with state: ${JSON.stringify(state)}`)
-        await connection.getRepository(StateEntity).save(state)
+        debug(`Executing saveState with state: ${JSON.stringify(state)}`)
+        return connection.getRepository(StateEntity).save(state);
     }
 
-    async getState(args: GetStateArgs): Promise<GetStateResult> {
+    async getState(args: GetStateArgs): Promise<State> {
         const connection: DataSource = await this.dbConnection
-        debug.log(`Executing loadState query with type: ${args.type}`)
+        debug(`Executing loadState query with type: ${args.type}`)
         const result: StateEntity | null = await connection.getRepository(StateEntity)
             .findOne({
                 where: { type: args.type }
@@ -33,13 +32,37 @@ export class XStateStore extends IAbstractXStateStore {
         if (!result) {
             return Promise.reject(Error(`No state found for type: ${args.type}`))
         }
-        return stateFrom(result)
+        return this.stateFrom(result)
+    }
+
+    async getStates(args?: GetStatesArgs): Promise<Array<State>> {
+        const connection: DataSource = await this.dbConnection // TODO apply everywhere
+        debug('Getting states', args)
+        const result: Array<StateEntity> = await connection.getRepository(StateEntity).find({
+            ...(args?.filter && { where: args?.filter }),
+        })
+
+        return result.map((event: StateEntity) => this.stateFrom(event))
     }
 
     async deleteState(args: DeleteStateArgs): Promise<VoidResult> {
         const connection: DataSource = await this.dbConnection
-        debug.log(`Executing loadState query with type: ${args.type}`)
-        await connection.getRepository(StateEntity)
-            .delete({ type: args.type })
+        debug(`Executing deleteState query with where clause: ${args.where} and params: ${JSON.stringify(args.parameters)}`)
+        await connection.createQueryBuilder()
+            .delete()
+            .from(StateEntity)
+            .where(args.where, args.parameters)
+            .execute()
+    }
+
+    private stateFrom = (state: StateEntity): State => {
+        return {
+            state: state.id,
+            type: state.type,
+            createdAt: state.createdAt,
+            updatedAt: state.updatedAt,
+            completedAt: state.completedAt,
+            tenantId: state.tenantId
+        }
     }
 }

package/dist/types/xstatePersistence/types.d.ts

@@ -1,23 +0,0 @@
-export type SaveStateArgs = {
-    state: string;
-    type: string;
-    createdAt: Date;
-    updatedAt: Date;
-    completedAt: Date;
-    tenantId?: string;
-    ttl: number;
-};
-export type GetStateArgs = Pick<SaveStateArgs, 'type'>;
-export type DeleteStateArgs = Pick<SaveStateArgs, 'type'>;
-export type VoidResult = void;
-export type GetStateResult = State;
-export type State = {
-    state: string;
-    type: string;
-    createdAt: Date;
-    updatedAt: Date;
-    completedAt: Date;
-    tenantId?: string;
-    ttl: number;
-};
-//# sourceMappingURL=types.d.ts.map

package/dist/types/xstatePersistence/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types/xstatePersistence/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GAAG;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,IAAI,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;IACf,WAAW,EAAE,IAAI,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AAEtD,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AAEzD,MAAM,MAAM,UAAU,GAAG,IAAI,CAAA;AAE7B,MAAM,MAAM,cAAc,GAAG,KAAK,CAAA;AAElC,MAAM,MAAM,KAAK,GAAG;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,IAAI,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;IACf,WAAW,EAAE,IAAI,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;CACd,CAAA"}

package/dist/types/xstatePersistence/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/types/xstatePersistence/types.ts"],"names":[],"mappings":""}

package/src/types/xstatePersistence/types.ts

@@ -1,27 +0,0 @@
-export type SaveStateArgs = {
-    state: string
-    type: string
-    createdAt: Date
-    updatedAt: Date
-    completedAt: Date
-    tenantId?: string
-    ttl: number
-}
-
-export type GetStateArgs = Pick<SaveStateArgs, 'type'>
-
-export type DeleteStateArgs = Pick<SaveStateArgs, 'type'>
-
-export type VoidResult = void
-
-export type GetStateResult = State
-
-export type State = {
-    state: string
-    type: string
-    createdAt: Date
-    updatedAt: Date
-    completedAt: Date
-    tenantId?: string
-    ttl: number
-}