@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.45.94 → 0.34.1-feature.SSISDK.46.151

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-feature.SSISDK.45.94+24a0078a",
+  "version": "0.34.1-feature.SSISDK.46.151+d3c33df4",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,16 +28,16 @@
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.45.94+24a0078a",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.45.94+24a0078a",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.45.94+24a0078a",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.45.94+24a0078a",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.45.94+24a0078a",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.46.151+d3c33df4",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.46.151+d3c33df4",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.46.151+d3c33df4",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.46.151+d3c33df4",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.46.151+d3c33df4",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
     "class-validator": "0.14.1",
-    "dcql": "0.2.19",
+    "dcql": "1.0.1",
     "debug": "^4.3.5",
     "typeorm": "0.3.20"
   },
@@ -65,5 +65,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "24a0078a739502cd84e93cc2d4c3938c8854087a"
+  "gitHead": "d3c33df44daea79ddf7863e0bf12234ec4837cfd"
 }

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

@@ -1,6 +1,8 @@
 import { getDID } from '@sphereon/ssi-sdk-ext.did-utils'
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { CredentialRole } from '@sphereon/ssi-types'
 import { DataSource, FindOptionsWhere } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { BaseContactEntity } from '../entities/contact/BaseContactEntity'
 import { ConnectionEntity } from '../entities/contact/ConnectionEntity'
 import { ContactMetadataItemEntity } from '../entities/contact/ContactMetadataItemEntity'
@@ -18,7 +20,6 @@ import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
 import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
 import {
   contactMetadataItemEntityFrom,
-  CredentialRole,
   DataStoreContactEntities,
   DataStoreMigrations,
   identityMetadataItemEntityFrom,
@@ -57,7 +58,6 @@ import {
   partyTypeEntityFrom,
   physicalAddressEntityFrom,
 } from '../utils/contact/MappingUtils'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 // TODO write test adding two contacts reusing the same contactType
 
 describe('Database entities tests', (): void => {

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

@@ -4,7 +4,6 @@ import { ConnectionType, DataStoreContactEntities, DataStoreMigrations, Identity
 import { ContactStore } from '../contact/ContactStore'
 import {
   CorrelationIdentifierType,
-  CredentialRole,
   ElectronicAddress,
   GetElectronicAddressesArgs,
   GetIdentitiesArgs,
@@ -27,6 +26,7 @@ import {
   PhysicalAddress,
 } from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { CredentialRole } from "@sphereon/ssi-types"
 
 describe('Contact store tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,6 +1,7 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { CredentialRole } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
+import { DataStoreDigitalCredentialEntities } from '../index'
 import { DataStoreDigitalCredentialMigrations } from '../migrations'
 import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
 import { computeEntryHash } from '@veramo/utils'

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

@@ -1,9 +1,11 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { IVerifiablePresentation } from '@sphereon/ssi-types'
+import { defaultHasher } from '@sphereon/ssi-sdk.core'
+import { CredentialRole, IVerifiablePresentation } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { DataStoreDigitalCredentialMigrations } from '../migrations'
-import { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { DigitalCredentialStore } from '../digitalCredential/DigitalCredentialStore'
+import { DataStoreDigitalCredentialEntities } from '../index'
+import { DataStoreDigitalCredentialMigrations } from '../migrations'
 import {
   AddCredentialArgs,
   CredentialCorrelationType,
@@ -14,8 +16,6 @@ import {
   GetCredentialsArgs,
   GetCredentialsResponse,
 } from '../types'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,9 +1,11 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DcqlQuery } from 'dcql'
 import { DataSource } from 'typeorm'
 import { PresentationDefinitionItemEntity } from '../entities/presentationDefinition/PresentationDefinitionItemEntity'
 import { DataStorePresentationDefinitionMigrations } from '../migrations'
 import { DataStorePresentationDefinitionEntities } from '../index'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { SAMPLE_DCQL_QUERY_PAYLOAD } from './pd-manager.store.test'
 
 describe('PresentationDefinitionItemEntity tests', (): void => {
   let dbConnection: DataSource
@@ -28,23 +30,9 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
   it('should create and retrieve PresentationDefinitionItemEntity with dcqlPayload', async (): Promise<void> => {
     const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
     const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
+    entity.definitionId = 'ajax-club'
     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',
-            },
-          ],
-        },
-      ],
-    })
+    entity.dcqlPayload = JSON.stringify(SAMPLE_DCQL_QUERY_PAYLOAD.dcqlQuery)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
@@ -55,29 +43,18 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     expect(retrievedEntity).toBeDefined()
     expect(retrievedEntity!.dcqlPayload).toBeDefined()
     const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
-    expect(parsedDcql.credentials[0].id).toEqual('credential1')
+    expect(parsedDcql.credentials[0].id).toEqual('clubcard-v1')
+    expect(parsedDcql.credentials[0].format).toEqual('dc+sd-jwt')
+    expect(parsedDcql.credentials[0].meta.vct_values).toContain('clubcard-v1')
+    expect(parsedDcql.credentials[0].claims).toHaveLength(4)
   })
 
   it('should update PresentationDefinitionItemEntity dcqlPayload', async (): Promise<void> => {
     const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
     const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
+    entity.definitionId = 'ajax-club'
     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',
-            },
-          ],
-        },
-      ],
-    })
+    entity.dcqlPayload = JSON.stringify(SAMPLE_DCQL_QUERY_PAYLOAD.dcqlQuery)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
@@ -85,12 +62,11 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     const updatedDcql = {
       credentials: [
         {
-          id: 'credential2',
+          id: 'updated-clubcard',
           format: 'jwt_vc',
           claims: [
             {
-              namespace: 'test',
-              claim_name: 'updatedClaim',
+              path: ['name'],
             },
           ],
         },
@@ -99,7 +75,8 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
     const updatedEntity = await repository.save(savedEntity)
     expect(updatedEntity).toBeDefined()
-    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('credential2')
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('updated-clubcard')
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].format).toEqual('jwt_vc')
   })
 
   it('should create and retrieve PresentationDefinitionItemEntity', async (): Promise<void> => {

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

@@ -1,9 +1,41 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DcqlQueryPayload } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
 import { DataStorePresentationDefinitionEntities, DataStorePresentationDefinitionMigrations, PDStore } from '../index'
 import { GetDefinitionsArgs, NonPersistedPresentationDefinitionItem, PresentationDefinitionItem } from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
+export const SAMPLE_DCQL_QUERY_PAYLOAD: DcqlQueryPayload = {
+  queryId: 'ajax-club',
+  dcqlQuery: {
+    credentials: [
+      {
+        id: 'clubcard-v1',
+        format: 'dc+sd-jwt',
+        require_cryptographic_holder_binding: true,
+        multiple: false,
+        meta: {
+          vct_values: ['clubcard-v1'],
+        },
+        claims: [
+          {
+            path: ['personData', 'name'],
+          },
+          {
+            path: ['personData', 'birthDate'],
+          },
+          {
+            path: ['membershipData', 'membershipId'],
+          },
+          {
+            path: ['membershipData', 'season'],
+          },
+        ],
+      },
+    ],
+  },
+}
+
 describe('PDStore tests', (): void => {
   let dbConnection: DataSource
   let pdStore: PDStore
@@ -130,6 +162,23 @@ describe('PDStore tests', (): void => {
     expect(result.definitionId).toEqual(definition.definitionId)
   })
 
+  it('should add definition with dcqlPayload', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+
+    const result: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+
+    expect(result).toBeDefined()
+    expect(result.definitionId).toEqual(definition.definitionId)
+    expect(result.dcqlPayload).toBeDefined()
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].id).toEqual('clubcard-v1')
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].format).toEqual('dc+sd-jwt')
+  })
+
   it('should update definition', async (): Promise<void> => {
     const definition: NonPersistedPresentationDefinitionItem = {
       definitionId: 'definition1',
@@ -151,6 +200,90 @@ describe('PDStore tests', (): void => {
     expect(result.version).toEqual('1.1')
   })
 
+  it('should update definition with dcqlPayload', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const updatedDcqlQueryPayload = {
+      ...SAMPLE_DCQL_QUERY_PAYLOAD,
+      dcqlQuery: {
+        credentials: [
+          {
+            id: 'updated-clubcard',
+            format: 'dc+sd-jwt',
+            claims: [
+              {
+                path: ['name'],
+              },
+            ],
+          },
+        ],
+      },
+    } as unknown as DcqlQueryPayload // FIXME I do not have another solution for this atm, I can do Partial<DcqlQuery> but that does not work for its child entities
+
+    const updatedDefinition: PresentationDefinitionItem = {
+      ...savedDefinition,
+      version: '1.1',
+      dcqlPayload: updatedDcqlQueryPayload,
+    }
+
+    await pdStore.updateDefinition(updatedDefinition)
+    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+
+    expect(result).toBeDefined()
+    expect(result.version).toEqual('1.1')
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].id).toEqual('updated-clubcard')
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].format).toEqual('dc+sd-jwt')
+  })
+
+  it('should get definition with dcqlPayload by id', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+
+    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+
+    expect(result).toBeDefined()
+    expect(result.dcqlPayload).toBeDefined()
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].format).toBe('dc+sd-jwt')
+    if (result.dcqlPayload?.dcqlQuery.credentials[0].format === 'dc+sd-jwt') {
+      expect(result.dcqlPayload.dcqlQuery.credentials[0].meta?.vct_values).toContain('clubcard-v1')
+    }
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].claims).toHaveLength(4)
+  })
+
+  it('should get definitions with dcqlPayload by filter', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const args: GetDefinitionsArgs = {
+      filter: [{ definitionId: 'ajax-club' }],
+    }
+    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions(args)
+
+    expect(result.length).toEqual(1)
+    expect(result[0].dcqlPayload).toBeDefined()
+    expect(result[0].dcqlPayload?.dcqlQuery.credentials[0].id).toEqual('clubcard-v1')
+  })
+
   it('should delete definition', async (): Promise<void> => {
     const definition: NonPersistedPresentationDefinitionItem = {
       definitionId: 'definition1',

package/src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts

@@ -25,7 +25,7 @@ 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 }) // TODO should this become nullable now we have dcqlPayload?
+  @Column({ name: 'definition_payload', type: 'text', nullable: true, unique: false })
   @IsNotEmpty({ message: 'A blank PD definition payload field is not allowed' })
   definitionPayload!: string
 

package/src/migrations/generic/12-CreateBitstringStatusList.ts

@@ -1,5 +1,6 @@
 import Debug from 'debug'
 import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+
 import {
   AddBitstringStatusListEnumPG1741895823000,
   CreateBitstringStatusListPG1741895823000,

package/src/migrations/generic/13-UpdatePresentationDefinitionItemNullable.ts

@@ -0,0 +1,67 @@
+import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+
+import { UpdatePresentationDefinitionItemNullablePG1741895824000 } from '../postgres/1756975509000-UpdatePresentationDefinitionItemNullable'
+import { UpdatePresentationDefinitionItemNullableSqlite1756975340000 } from '../sqlite/1756975340000-UpdatePresentationDefinitionItemNullable'
+
+const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class UpdatePresentationDefinitionItemNullable1741895824000 implements MigrationInterface {
+  name = 'UpdatePresentationDefinitionItemNullable1741895824000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: updating presentation definition item nullable fields')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file')
+        const mig: UpdatePresentationDefinitionItemNullablePG1741895824000 = new UpdatePresentationDefinitionItemNullablePG1741895824000()
+        await mig.up(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file')
+        const mig: UpdatePresentationDefinitionItemNullableSqlite1756975340000 = new UpdatePresentationDefinitionItemNullableSqlite1756975340000()
+        await mig.up(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: reverting presentation definition item nullable fields')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file')
+        const mig: UpdatePresentationDefinitionItemNullablePG1741895824000 = new UpdatePresentationDefinitionItemNullablePG1741895824000()
+        await mig.down(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file')
+        const mig: UpdatePresentationDefinitionItemNullableSqlite1756975340000 = new UpdatePresentationDefinitionItemNullableSqlite1756975340000()
+        await mig.down(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+}

package/src/migrations/generic/index.ts

@@ -2,6 +2,7 @@ import { CreateContacts1659463079429 } from './1-CreateContacts'
 import { CreatePresentationDefinitions1716533767523 } from './10-CreatePresentationDefinitions'
 import { FixCredentialClaimsReferencesUuid1741895822987 } from './11-FixCredentialClaimsReferenceUuid'
 import { AddBitstringStatusListEnum1741895823000, CreateBitstringStatusList1741895823000 } from './12-CreateBitstringStatusList'
+import { UpdatePresentationDefinitionItemNullable1741895824000 } from './13-UpdatePresentationDefinitionItemNullable'
 import { CreateIssuanceBranding1659463079429 } from './2-CreateIssuanceBranding'
 import { CreateContacts1690925872318 } from './3-CreateContacts'
 import { CreateStatusList1693866470000 } from './4-CreateStatusList'
@@ -35,7 +36,10 @@ export const DataStoreStatusListMigrations = [
 export const DataStoreEventLoggerMigrations = [CreateAuditEvents1701635835330]
 export const DataStoreDigitalCredentialMigrations = [CreateDigitalCredential1708525189000]
 export const DataStoreMachineStateMigrations = [CreateMachineStateStore1708098041262]
-export const DataStorePresentationDefinitionMigrations = [CreatePresentationDefinitions1716533767523]
+export const DataStorePresentationDefinitionMigrations = [
+  CreatePresentationDefinitions1716533767523,
+  UpdatePresentationDefinitionItemNullable1741895824000,
+]
 
 // All migrations together
 export const DataStoreMigrations = [

package/src/migrations/postgres/1756975509000-UpdatePresentationDefinitionItemNullable.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdatePresentationDefinitionItemNullablePG1741895824000 implements MigrationInterface {
+  name = 'UpdatePresentationDefinitionItemNullable1741895824000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Make definition_payload nullable
+    await queryRunner.query(`ALTER TABLE "PresentationDefinitionItem" ALTER COLUMN "definition_payload" DROP NOT NULL`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Make definition_payload NOT NULL again
+    await queryRunner.query(`ALTER TABLE "PresentationDefinitionItem" ALTER COLUMN "definition_payload" SET NOT NULL`)
+  }
+}

package/src/migrations/sqlite/1756975340000-UpdatePresentationDefinitionItemNullable.ts

@@ -0,0 +1,77 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdatePresentationDefinitionItemNullableSqlite1756975340000 implements MigrationInterface {
+  name = 'UpdatePresentationDefinitionItemNullable1756975340000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Create temporary table with updated schema (definition_payload nullable)
+    await queryRunner.query(`
+      CREATE TABLE "temporary_PresentationDefinitionItem" (
+                                                            "id" varchar PRIMARY KEY NOT NULL,
+                                                            "definition_id" varchar(255) NOT NULL,
+                                                            "version" varchar(255) NOT NULL,
+                                                            "tenant_id" varchar(255),
+                                                            "purpose" varchar(255),
+                                                            "name" varchar(255),
+                                                            "definition_payload" text,
+                                                            "dcql_payload" text,
+                                                            "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            CONSTRAINT "UQ_PresentationDefinitionItem_definition_id_version" UNIQUE ("definition_id", "version")
+      )
+    `)
+
+    // Copy data from old table
+    await queryRunner.query(`
+      INSERT INTO "temporary_PresentationDefinitionItem"(
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      )
+      SELECT
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      FROM "PresentationDefinitionItem"
+    `)
+
+    // Drop old table and rename
+    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`)
+    await queryRunner.query(`ALTER TABLE "temporary_PresentationDefinitionItem" RENAME TO "PresentationDefinitionItem"`)
+
+    // Recreate index
+    await queryRunner.query(`CREATE INDEX "IDX_PresentationDefinitionItem_version" ON "PresentationDefinitionItem" ("version")`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Revert to original schema (definition_payload NOT NULL, dcql_payload nullable)
+    await queryRunner.query(`
+      CREATE TABLE "temporary_PresentationDefinitionItem" (
+                                                            "id" varchar PRIMARY KEY NOT NULL,
+                                                            "definition_id" varchar(255) NOT NULL,
+                                                            "version" varchar(255) NOT NULL,
+                                                            "tenant_id" varchar(255),
+                                                            "purpose" varchar(255),
+                                                            "name" varchar(255),
+                                                            "definition_payload" text NOT NULL,
+                                                            "dcql_payload" text,
+                                                            "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                                            CONSTRAINT "UQ_PresentationDefinitionItem_definition_id_version" UNIQUE ("definition_id", "version")
+      )
+    `)
+
+    await queryRunner.query(`
+      INSERT INTO "temporary_PresentationDefinitionItem"(
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      )
+      SELECT
+        "id", "definition_id", "version", "tenant_id", "purpose", "name",
+        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
+      FROM "PresentationDefinitionItem"
+    `)
+
+    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`)
+    await queryRunner.query(`ALTER TABLE "temporary_PresentationDefinitionItem" RENAME TO "PresentationDefinitionItem"`)
+    await queryRunner.query(`CREATE INDEX "IDX_PresentationDefinitionItem_version" ON "PresentationDefinitionItem" ("version")`)
+  }
+}

package/src/presentationDefinition/PDStore.ts

@@ -106,7 +106,12 @@ export class PDStore extends AbstractPDStore {
     updatedEntity.version = item.version
     updatedEntity.name = item.name
     updatedEntity.purpose = item.purpose
-    updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload!)
+    if (item.definitionPayload) {
+      updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload!)
+    }
+    if (item.dcqlPayload) {
+      updatedEntity.dcqlPayload = JSON.stringify(item.dcqlPayload!.dcqlQuery)
+    }
 
     debug('Updating presentation definition entity', updatedEntity)
     const updateResult: PresentationDefinitionItemEntity = await pdRepository.save(updatedEntity, {

package/src/types/presentationDefinition/presentationDefinition.ts

@@ -1,5 +1,5 @@
 import { IPresentationDefinition } from '@sphereon/pex'
-import { DcqlQueryREST } from '@sphereon/ssi-types'
+import { DcqlQueryPayload } from '@sphereon/ssi-types'
 
 export type PresentationDefinitionItem = {
   id: string
@@ -8,8 +8,8 @@ export type PresentationDefinitionItem = {
   version: string
   name?: string
   purpose?: string
-  definitionPayload: IPresentationDefinition
-  dcqlPayload?: DcqlQueryREST
+  definitionPayload?: IPresentationDefinition
+  dcqlPayload?: DcqlQueryPayload
   createdAt: Date
   lastUpdatedAt: Date
 }