@sphereon/ssi-sdk.data-store 0.32.1-next.12 → 0.32.1-next.141

package/dist/utils/statusList/MappingUtils.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.statusListFrom = exports.statusListEntityFrom = void 0;
+const StatusListEntities_1 = require("../../entities/statusList/StatusListEntities");
+const ssi_types_1 = require("@sphereon/ssi-types");
+const FormattingUtils_1 = require("../FormattingUtils");
+const statusListEntityFrom = (args) => {
+    if (args.type === ssi_types_1.StatusListType.StatusList2021) {
+        const entity = new StatusListEntities_1.StatusList2021Entity();
+        const sl2021 = args;
+        entity.indexingDirection = sl2021.indexingDirection;
+        entity.statusPurpose = sl2021.statusPurpose;
+        setBaseFields(entity, args);
+        Object.defineProperty(entity, 'type', {
+            value: ssi_types_1.StatusListType.StatusList2021,
+            enumerable: true,
+            configurable: true,
+        });
+        return entity;
+    }
+    if (args.type === ssi_types_1.StatusListType.OAuthStatusList) {
+        const entity = new StatusListEntities_1.OAuthStatusListEntity();
+        const oauthSl = args;
+        entity.bitsPerStatus = oauthSl.bitsPerStatus;
+        entity.expiresAt = oauthSl.expiresAt;
+        setBaseFields(entity, args);
+        Object.defineProperty(entity, 'type', {
+            value: ssi_types_1.StatusListType.OAuthStatusList,
+            enumerable: true,
+            configurable: true,
+        });
+        return entity;
+    }
+    throw new Error(`Invalid status list type ${args.type}`);
+};
+exports.statusListEntityFrom = statusListEntityFrom;
+const statusListFrom = (entity) => {
+    if (entity instanceof StatusListEntities_1.StatusList2021Entity) {
+        const result = Object.assign(Object.assign({}, getBaseFields(entity)), { type: ssi_types_1.StatusListType.StatusList2021, indexingDirection: entity.indexingDirection, statusPurpose: entity.statusPurpose });
+        return (0, FormattingUtils_1.replaceNullWithUndefined)(result);
+    }
+    if (entity instanceof StatusListEntities_1.OAuthStatusListEntity) {
+        const result = Object.assign(Object.assign({}, getBaseFields(entity)), { type: ssi_types_1.StatusListType.OAuthStatusList, bitsPerStatus: entity.bitsPerStatus, expiresAt: entity.expiresAt });
+        return (0, FormattingUtils_1.replaceNullWithUndefined)(result);
+    }
+    throw new Error(`Invalid status list type ${typeof entity}`);
+};
+exports.statusListFrom = statusListFrom;
+const setBaseFields = (entity, args) => {
+    entity.id = args.id;
+    entity.correlationId = args.correlationId;
+    entity.length = args.length;
+    entity.issuer = args.issuer;
+    entity.driverType = args.driverType;
+    entity.credentialIdMode = args.credentialIdMode;
+    entity.proofFormat = args.proofFormat;
+    entity.statusListCredential = args.statusListCredential;
+};
+const getBaseFields = (entity) => ({
+    id: entity.id,
+    correlationId: entity.correlationId,
+    length: entity.length,
+    issuer: entity.issuer,
+    driverType: entity.driverType,
+    credentialIdMode: entity.credentialIdMode,
+    proofFormat: entity.proofFormat,
+    statusListCredential: entity.statusListCredential,
+});
+//# sourceMappingURL=MappingUtils.js.map

package/dist/utils/statusList/MappingUtils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.32.1-next.12+cd321acb",
+  "version": "0.32.1-next.141+5862bf90",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,13 +18,14 @@
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
-    "@sphereon/ssi-sdk.agent-config": "0.32.1-next.12+cd321acb",
-    "@sphereon/ssi-sdk.core": "0.32.1-next.12+cd321acb",
-    "@sphereon/ssi-types": "0.32.1-next.12+cd321acb",
+    "@sphereon/ssi-sdk.agent-config": "0.32.1-next.141+5862bf90",
+    "@sphereon/ssi-sdk.core": "0.32.1-next.141+5862bf90",
+    "@sphereon/ssi-types": "0.32.1-next.141+5862bf90",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
     "class-validator": "^0.14.1",
+    "dcql": "0.2.19",
     "debug": "^4.3.5",
     "typeorm": "^0.3.20"
   },
@@ -53,5 +54,5 @@
     "Contact Store"
   ],
   "nx": {},
-  "gitHead": "cd321acb679d70af853b7bad5548baa2345a4291"
+  "gitHead": "5862bf90d03a6d50882f12d5e4be150a3d53f823"
 }

package/src/__tests__/pd-manager.entities.test.ts

@@ -24,6 +24,83 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     await dbConnection.destroy()
   })
 
+  it('should create and retrieve PresentationDefinitionItemEntity with dcqlPayload', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
+    const entity = new PresentationDefinitionItemEntity()
+    entity.definitionId = 'definition1'
+    entity.version = '1.0'
+    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
+    entity.dcqlPayload = JSON.stringify({
+      credentials: [
+        {
+          id: 'credential1',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'testClaim',
+            },
+          ],
+        },
+      ],
+    })
+
+    const savedEntity = await repository.save(entity)
+    expect(savedEntity).toBeDefined()
+    expect(savedEntity.id).toBeDefined()
+    expect(savedEntity.dcqlPayload).toBeDefined()
+
+    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
+    expect(retrievedEntity).toBeDefined()
+    expect(retrievedEntity!.dcqlPayload).toBeDefined()
+    const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
+    expect(parsedDcql.credentials[0].id).toEqual('credential1')
+  })
+
+  it('should update PresentationDefinitionItemEntity dcqlPayload', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
+    const entity = new PresentationDefinitionItemEntity()
+    entity.definitionId = 'definition1'
+    entity.version = '1.0'
+    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
+    entity.dcqlPayload = JSON.stringify({
+      credentials: [
+        {
+          id: 'credential1',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'testClaim',
+            },
+          ],
+        },
+      ],
+    })
+
+    const savedEntity = await repository.save(entity)
+    expect(savedEntity).toBeDefined()
+
+    const updatedDcql = {
+      credentials: [
+        {
+          id: 'credential2',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'updatedClaim',
+            },
+          ],
+        },
+      ],
+    }
+    savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
+    const updatedEntity = await repository.save(savedEntity)
+    expect(updatedEntity).toBeDefined()
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('credential2')
+  })
+
   it('should create and retrieve PresentationDefinitionItemEntity', async (): Promise<void> => {
     const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
     const entity = new PresentationDefinitionItemEntity()

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

@@ -0,0 +1,215 @@
+import { DataSource } from 'typeorm'
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DataStoreStatusListEntities, StatusListEntryEntity } from '../index'
+import { DataStoreStatusListMigrations } from '../migrations'
+import { OAuthStatusListEntity, StatusList2021Entity } from '../entities/statusList/StatusListEntities'
+import { IIssuer, StatusListCredentialIdMode, StatusListDriverType } from '@sphereon/ssi-types'
+
+describe('Status list entities tests', () => {
+  let dbConnection: DataSource
+
+  beforeEach(async () => {
+    DataSources.singleInstance().defaultDbType = 'sqlite'
+    dbConnection = await new DataSource({
+      type: 'sqlite',
+      database: ':memory:',
+      migrationsRun: false,
+      migrations: DataStoreStatusListMigrations,
+      synchronize: false,
+      entities: [...DataStoreStatusListEntities],
+    }).initialize()
+    await dbConnection.runMigrations()
+    expect(await dbConnection.showMigrations()).toBeFalsy()
+  })
+
+  afterEach(async () => {
+    await dbConnection.destroy()
+  })
+
+  it('should save status list to database', async () => {
+    const statusList = new StatusList2021Entity()
+    statusList.id = 'test-list-1'
+    statusList.correlationId = 'correlation-1'
+    statusList.driverType = StatusListDriverType.AGENT_TYPEORM
+    statusList.length = 100000
+    statusList.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    statusList.proofFormat = 'jwt'
+    statusList.statusPurpose = 'revocation'
+    statusList.indexingDirection = 'rightToLeft'
+    statusList.issuer = 'did:example:123'
+
+    const fromDb = await dbConnection.getRepository(StatusList2021Entity).save(statusList)
+    expect(fromDb).toBeDefined()
+    expect(fromDb.id).toEqual(statusList.id)
+    expect(fromDb.correlationId).toEqual(statusList.correlationId)
+    expect(fromDb.length).toEqual(statusList.length)
+    expect(fromDb.credentialIdMode).toEqual(statusList.credentialIdMode)
+    expect(fromDb.statusPurpose).toEqual(statusList.statusPurpose)
+    expect(fromDb.indexingDirection).toEqual(statusList.indexingDirection)
+    expect(fromDb.issuer).toEqual(statusList.issuer)
+  })
+
+  it('should save status list entry to database', async () => {
+    const statusList = new StatusList2021Entity()
+    statusList.id = 'test-list-1'
+    statusList.correlationId = 'correlation-1'
+    statusList.driverType = StatusListDriverType.AGENT_TYPEORM
+    statusList.length = 100000
+    statusList.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    statusList.proofFormat = 'jwt'
+    statusList.statusPurpose = 'revocation'
+    statusList.indexingDirection = 'rightToLeft'
+    statusList.issuer = 'did:example:123'
+
+    await dbConnection.getRepository(StatusList2021Entity).save(statusList)
+
+    const entry = new StatusListEntryEntity()
+    entry.statusList = statusList
+    entry.statusListIndex = 1
+    entry.credentialId = 'credential-1'
+    entry.credentialHash = 'hash-1'
+    entry.correlationId = 'correlation-1'
+    entry.value = '1'
+
+    const fromDb = await dbConnection.getRepository(StatusListEntryEntity).save(entry)
+    expect(fromDb).toBeDefined()
+    expect(fromDb.statusListIndex).toEqual(entry.statusListIndex)
+    expect(fromDb.credentialId).toEqual(entry.credentialId)
+    expect(fromDb.credentialHash).toEqual(entry.credentialHash)
+    expect(fromDb.correlationId).toEqual(entry.correlationId)
+    expect(fromDb.value).toEqual(entry.value)
+  })
+
+  it('should handle complex issuer object', async () => {
+    const statusList = new StatusList2021Entity()
+    statusList.id = 'test-list-1'
+    statusList.correlationId = 'correlation-1'
+    statusList.driverType = StatusListDriverType.AGENT_TYPEORM
+    statusList.length = 100000
+    statusList.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    statusList.proofFormat = 'jwt'
+    statusList.statusPurpose = 'revocation'
+    statusList.indexingDirection = 'rightToLeft'
+    statusList.issuer = { id: 'did:example:123', name: 'Test Issuer' }
+
+    const fromDb = await dbConnection.getRepository(StatusList2021Entity).save(statusList)
+    expect(fromDb).toBeDefined()
+    expect(fromDb.issuer).toEqual(statusList.issuer)
+    expect(typeof fromDb.issuer).toEqual('object')
+    expect((fromDb.issuer as IIssuer).id).toEqual('did:example:123')
+    expect((fromDb.issuer as IIssuer).name).toEqual('Test Issuer')
+  })
+
+  it('should save OAuth status list to database', async () => {
+    const statusList = new OAuthStatusListEntity()
+    statusList.id = 'oauth-list-1'
+    statusList.correlationId = 'correlation-oauth-1'
+    statusList.driverType = StatusListDriverType.AGENT_TYPEORM
+    statusList.length = 100000
+    statusList.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    statusList.proofFormat = 'jwt'
+    statusList.bitsPerStatus = 1
+    statusList.expiresAt = new Date('2025-01-01T00:00:00Z')
+    statusList.issuer = 'did:example:123'
+
+    const fromDb = await dbConnection.getRepository(OAuthStatusListEntity).save(statusList)
+    expect(fromDb).toBeDefined()
+    expect(fromDb.id).toEqual(statusList.id)
+    expect(fromDb.correlationId).toEqual(statusList.correlationId)
+    expect(fromDb.length).toEqual(statusList.length)
+    expect(fromDb.credentialIdMode).toEqual(statusList.credentialIdMode)
+    expect(fromDb.bitsPerStatus).toEqual(statusList.bitsPerStatus)
+    expect(fromDb.expiresAt).toEqual(statusList.expiresAt)
+    expect(fromDb.issuer).toEqual(statusList.issuer)
+  })
+
+  it('should handle both status list types having entries', async () => {
+    const statusList2021 = new StatusList2021Entity()
+    statusList2021.id = 'test-list-1'
+    statusList2021.correlationId = 'correlation-1'
+    statusList2021.driverType = StatusListDriverType.AGENT_TYPEORM
+    statusList2021.length = 100000
+    statusList2021.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    statusList2021.proofFormat = 'jwt'
+    statusList2021.statusPurpose = 'revocation'
+    statusList2021.indexingDirection = 'rightToLeft'
+    statusList2021.issuer = 'did:example:123'
+    await dbConnection.getRepository(StatusList2021Entity).save(statusList2021)
+
+    const oauthStatusList = new OAuthStatusListEntity()
+    oauthStatusList.id = 'oauth-list-1'
+    oauthStatusList.correlationId = 'correlation-oauth-1'
+    oauthStatusList.driverType = StatusListDriverType.AGENT_TYPEORM
+    oauthStatusList.length = 100000
+    oauthStatusList.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    oauthStatusList.proofFormat = 'jwt'
+    oauthStatusList.bitsPerStatus = 1
+    oauthStatusList.issuer = 'did:example:456'
+    await dbConnection.getRepository(OAuthStatusListEntity).save(oauthStatusList)
+
+    const entry2021 = new StatusListEntryEntity()
+    entry2021.statusList = statusList2021
+    entry2021.statusListIndex = 1
+    entry2021.credentialId = 'credential-1'
+    entry2021.credentialHash = 'hash-1'
+    entry2021.value = '1'
+    await dbConnection.getRepository(StatusListEntryEntity).save(entry2021)
+
+    const entryOAuth = new StatusListEntryEntity()
+    entryOAuth.statusList = oauthStatusList
+    entryOAuth.statusListIndex = 1
+    entryOAuth.credentialId = 'credential-2'
+    entryOAuth.credentialHash = 'hash-2'
+    entryOAuth.value = '1'
+    await dbConnection.getRepository(StatusListEntryEntity).save(entryOAuth)
+
+    const found2021Entry = await dbConnection.getRepository(StatusListEntryEntity).findOne({
+      where: { statusList: statusList2021.id, statusListIndex: 1 },
+    })
+    const foundOAuthEntry = await dbConnection.getRepository(StatusListEntryEntity).findOne({
+      where: { statusList: oauthStatusList.id, statusListIndex: 1 },
+    })
+
+    expect(found2021Entry).toBeDefined()
+    expect(found2021Entry?.credentialId).toEqual('credential-1')
+    expect(foundOAuthEntry).toBeDefined()
+    expect(foundOAuthEntry?.credentialId).toEqual('credential-2')
+  })
+
+  it('should cascade delete entries when status list is deleted', async () => {
+    const statusList = new StatusList2021Entity()
+    statusList.id = 'test-list-1'
+    statusList.correlationId = 'correlation-1'
+    statusList.driverType = StatusListDriverType.AGENT_TYPEORM
+    statusList.length = 100000
+    statusList.credentialIdMode = StatusListCredentialIdMode.ISSUANCE
+    statusList.proofFormat = 'jwt'
+    statusList.statusPurpose = 'revocation'
+    statusList.indexingDirection = 'rightToLeft'
+    statusList.issuer = 'did:example:123'
+
+    const savedStatusList = await dbConnection.getRepository(StatusList2021Entity).save(statusList)
+
+    const entry = new StatusListEntryEntity()
+    entry.statusList = statusList
+    entry.statusListIndex = 1
+    entry.credentialId = 'credential-1'
+    entry.credentialHash = 'hash-1'
+    entry.correlationId = 'correlation-1'
+    entry.value = '1'
+
+    await dbConnection.getRepository(StatusListEntryEntity).save(entry)
+
+    // First delete entry, otherwise constraint fails
+    await dbConnection.getRepository(StatusListEntryEntity).delete({ statusList: savedStatusList.id })
+    await dbConnection.getRepository(StatusList2021Entity).remove(savedStatusList)
+
+    const foundEntry = await dbConnection.getRepository(StatusListEntryEntity).findOne({
+      where: {
+        statusList: statusList.id,
+        statusListIndex: entry.statusListIndex,
+      },
+    })
+    expect(foundEntry).toBeNull()
+  })
+})

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

@@ -0,0 +1,232 @@
+import { DataSource } from 'typeorm'
+import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DataStoreStatusListEntities } from '../index'
+import { DataStoreStatusListMigrations } from '../migrations'
+import { StatusListStore } from '../statusList/StatusListStore'
+import { IStatusList2021Entity, IStatusListEntryEntity, IOAuthStatusListEntity } from '../types'
+import { StatusListCredentialIdMode, StatusListDriverType, StatusListType } from '@sphereon/ssi-types'
+
+describe('Status list store tests', () => {
+  let dbConnection: DataSource
+  let statusListStore: StatusListStore
+
+  beforeEach(async () => {
+    DataSources.singleInstance().defaultDbType = 'sqlite'
+    dbConnection = await new DataSource({
+      type: 'sqlite',
+      database: ':memory:',
+      migrationsRun: false,
+      migrations: DataStoreStatusListMigrations,
+      synchronize: false,
+      entities: DataStoreStatusListEntities,
+    }).initialize()
+    await dbConnection.runMigrations()
+    expect(await dbConnection.showMigrations()).toBeFalsy()
+    statusListStore = new StatusListStore(dbConnection)
+  })
+
+  afterEach(async () => {
+    await dbConnection.destroy()
+  })
+
+  it('should store status list', async () => {
+    const statusList: IStatusList2021Entity = {
+      id: 'test-list-1',
+      correlationId: 'correlation-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'revocation',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:123',
+    }
+
+    const result = await statusListStore.addStatusList(statusList)
+    expect(result).toBeDefined()
+    expect(result.id).toEqual(statusList.id)
+    expect(result.correlationId).toEqual(statusList.correlationId)
+  })
+
+  it('should store status list entry', async () => {
+    const statusList: IStatusList2021Entity = {
+      id: 'test-list-1',
+      correlationId: 'correlation-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'revocation',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:123',
+    }
+
+    await statusListStore.addStatusList(statusList)
+
+    const entry: IStatusListEntryEntity = {
+      statusList: statusList.id,
+      statusListIndex: 1,
+      credentialId: 'credential-1',
+      credentialHash: 'hash-1',
+      correlationId: 'correlation-1',
+      value: '1',
+    }
+
+    const result = await statusListStore.addStatusListEntry(entry)
+    expect(result).toBeDefined()
+    expect(result.statusListIndex).toEqual(entry.statusListIndex)
+    expect(result.credentialId).toEqual(entry.credentialId)
+  })
+
+  it('should store OAuth status list', async () => {
+    const statusList: IOAuthStatusListEntity = {
+      id: 'oauth-list-1',
+      correlationId: 'correlation-oauth-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.OAuthStatusList,
+      proofFormat: 'jwt',
+      bitsPerStatus: 1,
+      expiresAt: new Date('2025-01-01T00:00:00Z'),
+      issuer: 'did:example:123',
+    }
+
+    const result = (await statusListStore.addStatusList(statusList)) as IOAuthStatusListEntity
+    expect(result).toBeDefined()
+    expect(result.id).toEqual(statusList.id)
+    expect(result.correlationId).toEqual(statusList.correlationId)
+    expect(result.bitsPerStatus).toEqual(statusList.bitsPerStatus)
+    expect(result.expiresAt).toEqual(statusList.expiresAt)
+  })
+
+  it('should store and retrieve both types of status lists', async () => {
+    const statusList2021: IStatusList2021Entity = {
+      id: 'test-list-1',
+      correlationId: 'correlation-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'revocation',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:123',
+    }
+
+    const oauthStatusList: IOAuthStatusListEntity = {
+      id: 'oauth-list-1',
+      correlationId: 'correlation-oauth-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.OAuthStatusList,
+      proofFormat: 'jwt',
+      bitsPerStatus: 1,
+      issuer: 'did:example:456',
+    }
+
+    await statusListStore.addStatusList(statusList2021)
+    await statusListStore.addStatusList(oauthStatusList)
+
+    const found2021 = (await statusListStore.getStatusList({ id: statusList2021.id })) as IStatusList2021Entity
+    const foundOAuth = (await statusListStore.getStatusList({ id: oauthStatusList.id })) as IOAuthStatusListEntity
+
+    expect(found2021.type).toEqual(StatusListType.StatusList2021)
+    expect(found2021.statusPurpose).toEqual('revocation')
+    expect(foundOAuth.type).toEqual(StatusListType.OAuthStatusList)
+    expect((foundOAuth as IOAuthStatusListEntity).bitsPerStatus).toEqual(1)
+  })
+
+  it('should get status list by id', async () => {
+    const statusList: IStatusList2021Entity = {
+      id: 'test-list-1',
+      correlationId: 'correlation-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'revocation',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:123',
+    }
+
+    await statusListStore.addStatusList(statusList)
+
+    const result = await statusListStore.getStatusList({ id: statusList.id })
+    expect(result).toBeDefined()
+    expect(result.id).toEqual(statusList.id)
+  })
+
+  it('should get status lists with filter', async () => {
+    const statusList1: IStatusList2021Entity = {
+      id: 'test-list-1',
+      correlationId: 'correlation-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'revocation',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:123',
+    }
+
+    const statusList2: IStatusList2021Entity = {
+      id: 'test-list-2',
+      correlationId: 'correlation-2',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'suspension',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:456',
+    }
+
+    await statusListStore.addStatusList(statusList1)
+    await statusListStore.addStatusList(statusList2)
+
+    const result = await statusListStore.getStatusLists({
+      filter: [{ statusPurpose: 'revocation' }],
+    })
+
+    expect(result.length).toEqual(1)
+    expect(result[0].id).toEqual(statusList1.id)
+  })
+
+  it('should delete status list', async () => {
+    const statusList: IStatusList2021Entity = {
+      id: 'test-list-1',
+      correlationId: 'correlation-1',
+      driverType: StatusListDriverType.AGENT_TYPEORM,
+      length: 100000,
+      credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
+      type: StatusListType.StatusList2021,
+      proofFormat: 'jwt',
+      statusPurpose: 'revocation',
+      indexingDirection: 'rightToLeft',
+      issuer: 'did:example:123',
+    }
+
+    await statusListStore.addStatusList(statusList)
+    const entry: IStatusListEntryEntity = {
+      statusList: statusList.id,
+      statusListIndex: 1,
+      credentialId: 'credential-1',
+      credentialHash: 'hash-1',
+      correlationId: 'correlation-1',
+      value: '1',
+    }
+    await statusListStore.addStatusListEntry(entry)
+
+    const result = await statusListStore.removeStatusList({ id: statusList.id })
+    expect(result).toEqual(true)
+
+    await expect(statusListStore.getStatusList({ id: statusList.id })).rejects.toThrow(`No status list found for id ${statusList.id}`)
+  })
+})

package/src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts

@@ -25,10 +25,14 @@ export class PresentationDefinitionItemEntity extends BaseEntity {
   @Column({ name: 'name', length: 255, type: 'varchar', nullable: true, unique: false })
   name?: string
 
-  @Column({ name: 'definition_payload', type: 'text', nullable: false, unique: false })
-  @IsNotEmpty({ message: 'A blank definition payload field is not allowed' })
+  @Column({ name: 'definition_payload', type: 'text', nullable: false, unique: false }) // TODO should this become nullable now we have dcqlPayload?
+  @IsNotEmpty({ message: 'A blank PD definition payload field is not allowed' })
   definitionPayload!: string
 
+  @Column({ name: 'dcql_payload', type: 'text', nullable: true, unique: false })
+  @IsNotEmpty({ message: 'A blank dcql definition payload field is not allowed' })
+  dcqlPayload!: string
+
   @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 

package/src/entities/{statusList2021 → statusList}/StatusList2021EntryEntity.ts

@@ -1,7 +1,7 @@
 import { Validate } from 'class-validator'
 import { BaseEntity, Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
-import { StatusListEntity } from './StatusList2021Entity'
+import { StatusListEntity } from './StatusListEntities'
 
 @Entity('StatusListEntry')
 // @Unique('uq_credential_statuslist', ['statusList', 'credentialId']) // disabled because one prop can be null