@sphereon/ssi-sdk.data-store 0.34.1-fix.170 → 0.34.1-fix.182

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-fix.170+4049c8c7",
+  "version": "0.34.1-fix.182+7d393013",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,11 +28,11 @@
   "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-fix.170+4049c8c7",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.170+4049c8c7",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.170+4049c8c7",
-    "@sphereon/ssi-sdk.core": "0.34.1-fix.170+4049c8c7",
-    "@sphereon/ssi-types": "0.34.1-fix.170+4049c8c7",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.182+7d393013",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.182+7d393013",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.182+7d393013",
+    "@sphereon/ssi-sdk.core": "0.34.1-fix.182+7d393013",
+    "@sphereon/ssi-types": "0.34.1-fix.182+7d393013",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
@@ -65,5 +65,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "4049c8c7de4357ef6a5772807aec15769ce714cf"
+  "gitHead": "7d393013f6a3e887f41600f6683179c647aa19b9"
 }

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

@@ -1,13 +1,12 @@
 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'
+import { DcqlQueryItemEntity } from '../entities/presentationDefinition/DcqlQueryItemEntity'
+import { DataStorePresentationDefinitionEntities } from '../index'
+import { DataStorePresentationDefinitionMigrations } from '../migrations'
+import { SAMPLE_DCQL_QUERY_IMPORT } from './pd-manager.store.test'
 
-describe('PresentationDefinitionItemEntity tests', (): void => {
+describe('DcqlQueryItemEntity tests', (): void => {
   let dbConnection: DataSource
 
   beforeEach(async (): Promise<void> => {
@@ -27,34 +26,34 @@ 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 = 'ajax-club'
+  it('should create and retrieve DcqlQueryItemEntity', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(DcqlQueryItemEntity)
+    const entity = new DcqlQueryItemEntity()
+    entity.queryId = 'ajax-club'
     entity.version = '1.0'
-    entity.dcqlPayload = JSON.stringify(SAMPLE_DCQL_QUERY_PAYLOAD.dcqlQuery)
+    entity.query = JSON.stringify(SAMPLE_DCQL_QUERY_IMPORT.query)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
     expect(savedEntity.id).toBeDefined()
-    expect(savedEntity.dcqlPayload).toBeDefined()
+    expect(savedEntity.query).toBeDefined()
 
     const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
     expect(retrievedEntity).toBeDefined()
-    expect(retrievedEntity!.dcqlPayload).toBeDefined()
-    const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
+    expect(retrievedEntity!.query).toBeDefined()
+    const parsedDcql = JSON.parse(retrievedEntity!.query)
     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 = 'ajax-club'
+  it('should update DcqlQueryItemEntity dcql query', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(DcqlQueryItemEntity)
+    const entity = new DcqlQueryItemEntity()
+    entity.queryId = 'ajax-club'
     entity.version = '1.0'
-    entity.dcqlPayload = JSON.stringify(SAMPLE_DCQL_QUERY_PAYLOAD.dcqlQuery)
+    entity.query = JSON.stringify(SAMPLE_DCQL_QUERY_IMPORT.query)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
@@ -72,57 +71,10 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
         },
       ],
     }
-    savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
+    savedEntity.query = JSON.stringify(updatedDcql)
     const updatedEntity = await repository.save(savedEntity)
     expect(updatedEntity).toBeDefined()
-    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> => {
-    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
-    const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
-    entity.version = '1.0'
-    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
-
-    const savedEntity = await repository.save(entity)
-    expect(savedEntity).toBeDefined()
-    expect(savedEntity.id).toBeDefined()
-
-    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
-    expect(retrievedEntity).toBeDefined()
-    expect(retrievedEntity!.definitionId).toEqual('definition1')
-  })
-
-  it('should update PresentationDefinitionItemEntity', 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: [] })
-
-    const savedEntity = await repository.save(entity)
-    expect(savedEntity).toBeDefined()
-
-    savedEntity.version = '1.1'
-    const updatedEntity = await repository.save(savedEntity)
-    expect(updatedEntity).toBeDefined()
-    expect(updatedEntity.version).toEqual('1.1')
-  })
-
-  it('should delete PresentationDefinitionItemEntity', 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: [] })
-
-    const savedEntity = await repository.save(entity)
-    expect(savedEntity).toBeDefined()
-
-    await repository.delete(savedEntity.id)
-    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
-    expect(retrievedEntity).toBeNull()
+    expect(JSON.parse(updatedEntity.query).credentials[0].id).toEqual('updated-clubcard')
+    expect(JSON.parse(updatedEntity.query).credentials[0].format).toEqual('jwt_vc')
   })
 })

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

@@ -1,13 +1,19 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { DcqlQueryPayload } from '@sphereon/ssi-types'
+import { DcqlQuery } from 'dcql'
 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 = {
+import {
+  DataStorePresentationDefinitionEntities,
+  DataStorePresentationDefinitionMigrations,
+  type DeleteDefinitionsArgs,
+  ImportDcqlQueryItem,
+  PDStore,
+} from '../index'
+import { DcqlQueryItem, GetDefinitionsArgs, NonPersistedDcqlQueryItem } from '../types'
+
+export const SAMPLE_DCQL_QUERY_IMPORT: ImportDcqlQueryItem = {
   queryId: 'ajax-club',
-  dcqlQuery: {
+  query: {
     credentials: [
       {
         id: 'clubcard-v1',
@@ -60,237 +66,148 @@ describe('PDStore tests', (): void => {
     await dbConnection.destroy()
   })
 
-  it('should check if definition exists', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const exists: boolean = await pdStore.hasDefinition({ itemId: savedDefinition.id })
-
-    expect(exists).toBeTruthy()
-  })
-
-  it('should check if definitions exist by filter', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const exists: boolean = await pdStore.hasDefinitions({ filter: [{ definitionId: 'definition1' }] })
-
-    expect(exists).toBeTruthy()
-  })
-
-  it('should get definition by id', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
-
-    expect(result).toBeDefined()
-  })
-
-  it('should throw error when getting definition with unknown id', async (): Promise<void> => {
+  it('should throw error when getting query with unknown id', async (): Promise<void> => {
     const itemId = 'unknownDefinitionId'
 
     await expect(pdStore.getDefinition({ itemId })).rejects.toThrow(`No presentation definition item found for id: ${itemId}`)
   })
 
-  it('should get all definitions', async (): Promise<void> => {
-    const definition1: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should get all queries', async (): Promise<void> => {
+    const definition1: NonPersistedDcqlQueryItem = {
+      queryId: 'definition1',
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: {
+        credentials: [
+          {
+            id: 'id-card-v1',
+            format: 'dc+sd-jwt',
+            require_cryptographic_holder_binding: true,
+            multiple: false,
+            claims: [
+              {
+                path: ['name'],
+              },
+            ],
+          },
+        ],
+      },
     }
-    const savedDefinition1: PresentationDefinitionItem = await pdStore.addDefinition(definition1)
+    const savedDefinition1: DcqlQueryItem = await pdStore.addDefinition(definition1)
     expect(savedDefinition1).toBeDefined()
 
-    const definition2: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition2',
+    const definition2: NonPersistedDcqlQueryItem = {
+      queryId: 'definition2',
       version: '1.0',
-      definitionPayload: { id: 'definition2', input_descriptors: [] },
+      query: {
+        credentials: [
+          {
+            id: 'driver-license-v1',
+            format: 'dc+sd-jwt',
+            require_cryptographic_holder_binding: true,
+            multiple: false,
+            claims: [
+              {
+                path: ['dateOfBirth'],
+              },
+            ],
+          },
+        ],
+      },
     }
-    const savedDefinition2: PresentationDefinitionItem = await pdStore.addDefinition(definition2)
+    const savedDefinition2: DcqlQueryItem = await pdStore.addDefinition(definition2)
     expect(savedDefinition2).toBeDefined()
 
-    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions({})
+    const result: Array<DcqlQueryItem> = await pdStore.getDefinitions({})
 
     expect(result).toBeDefined()
     expect(result.length).toEqual(2)
   })
 
-  it('should get definitions by filter', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should update dcql query', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: SAMPLE_DCQL_QUERY_IMPORT.queryId,
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
-    const args: GetDefinitionsArgs = {
-      filter: [{ definitionId: 'definition1' }],
-    }
-    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions(args)
-
-    expect(result.length).toEqual(1)
-  })
-
-  it('should add definition', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-
-    const result: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-
-    expect(result).toBeDefined()
-    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',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const updatedDefinition: PresentationDefinitionItem = {
-      ...savedDefinition,
-      version: '1.1',
-    }
-
-    await pdStore.updateDefinition(updatedDefinition)
-    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
-
-    expect(result).toBeDefined()
-    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 updatedDcqlQuery = DcqlQuery.parse({
+      credentials: [
+        {
+          id: 'updated-clubcard',
+          format: 'dc+sd-jwt',
+          claims: [
+            {
+              path: ['name'],
+            },
+          ],
+        },
+      ],
+    })
 
-    const updatedDefinition: PresentationDefinitionItem = {
+    const updatedDefinition: DcqlQueryItem = {
       ...savedDefinition,
       version: '1.1',
-      dcqlPayload: updatedDcqlQueryPayload,
+      query: updatedDcqlQuery,
     }
 
     await pdStore.updateDefinition(updatedDefinition)
-    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+    const result: DcqlQueryItem = 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')
+    expect(result.query?.credentials[0].id).toEqual('updated-clubcard')
+    expect(result.query?.credentials[0].format).toEqual('dc+sd-jwt')
   })
 
-  it('should get definition with dcqlPayload by id', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'ajax-club',
+  it('should get dcql queries by id', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: SAMPLE_DCQL_QUERY_IMPORT.queryId,
       version: '1.0',
-      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
-      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
 
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
-    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+    const result: DcqlQueryItem = 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.query).toBeDefined()
+    expect(result.query.credentials[0].format).toBe('dc+sd-jwt')
+    if (result.query.credentials[0].format === 'dc+sd-jwt') {
+      expect(result.query.credentials[0].meta?.vct_values).toContain('clubcard-v1')
     }
-    expect(result.dcqlPayload?.dcqlQuery.credentials[0].claims).toHaveLength(4)
+    expect(result.query.credentials[0].claims).toHaveLength(4)
   })
 
-  it('should get definitions with dcqlPayload by filter', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'ajax-club',
+  it('should get dcql queries by filter', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: SAMPLE_DCQL_QUERY_IMPORT.queryId,
       version: '1.0',
-      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
-      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
     const args: GetDefinitionsArgs = {
-      filter: [{ definitionId: 'ajax-club' }],
+      filter: [{ queryId: 'ajax-club' }],
     }
-    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions(args)
+    const result: Array<DcqlQueryItem> = 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')
+    expect(result[0].query).toBeDefined()
+    expect(result[0].query.credentials[0].id).toEqual('clubcard-v1')
   })
 
-  it('should delete definition', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should delete dcql query', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: 'definition1',
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
     await pdStore.deleteDefinition({ itemId: savedDefinition.id })
@@ -300,28 +217,28 @@ describe('PDStore tests', (): void => {
     )
   })
 
-  it('should delete definitions by filter', async (): Promise<void> => {
-    const definition1: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should delete dcql queries by filter', async (): Promise<void> => {
+    const definition1: NonPersistedDcqlQueryItem = {
+      queryId: 'definition1',
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition1: PresentationDefinitionItem = await pdStore.addDefinition(definition1)
+    const savedDefinition1: DcqlQueryItem = await pdStore.addDefinition(definition1)
     expect(savedDefinition1).toBeDefined()
 
-    const definition2: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition2',
+    const definition2: NonPersistedDcqlQueryItem = {
+      queryId: 'definition2',
       version: '1.0',
-      definitionPayload: { id: 'definition2', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition2: PresentationDefinitionItem = await pdStore.addDefinition(definition2)
+    const savedDefinition2: DcqlQueryItem = await pdStore.addDefinition(definition2)
     expect(savedDefinition2).toBeDefined()
 
-    const filter = { filter: [{ definitionId: 'definition1' }] }
+    const filter = { filter: [{ queryId: 'definition1' }] } satisfies DeleteDefinitionsArgs
     await pdStore.deleteDefinitions(filter)
 
-    const remainingDefinitions: Array<PresentationDefinitionItem> = await pdStore.getDefinitions({})
+    const remainingDefinitions: Array<DcqlQueryItem> = await pdStore.getDefinitions({})
     expect(remainingDefinitions.length).toEqual(1)
-    expect(remainingDefinitions[0].definitionId).toEqual('definition2')
+    expect(remainingDefinitions[0].queryId).toEqual('definition2')
   })
 })

package/src/entities/presentationDefinition/{PresentationDefinitionItemEntity.ts → DcqlQueryItemEntity.ts}

@@ -2,15 +2,15 @@ import { BaseEntity, BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entit
 import { IsNotEmpty } from 'class-validator'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
-@Entity('PresentationDefinitionItem')
+@Entity('DcqlQueryItem')
 @Index(['version'], { unique: false })
-export class PresentationDefinitionItemEntity extends BaseEntity {
+export class DcqlQueryItemEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @Column({ name: 'definition_id', length: 255, type: 'varchar', nullable: false, unique: false })
-  @IsNotEmpty({ message: 'A blank definition id field is not allowed' })
-  definitionId!: string
+  @Column({ name: 'query_id', length: 255, type: 'varchar', nullable: false, unique: false })
+  @IsNotEmpty({ message: 'A blank query id field is not allowed' })
+  queryId!: string
 
   @Column({ name: 'version', length: 255, type: 'varchar', nullable: false, unique: false })
   @IsNotEmpty({ message: 'A blank version field is not allowed' })
@@ -25,13 +25,9 @@ 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: true, unique: false })
-  @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
+  @Column({ name: 'query', type: 'text', nullable: false, unique: false })
+  @IsNotEmpty({ message: 'A blank dcql query payload field is not allowed' })
+  query!: string
 
   @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date

package/src/index.ts

@@ -29,7 +29,7 @@ import { ElectronicAddressEntity } from './entities/contact/ElectronicAddressEnt
 import { PhysicalAddressEntity } from './entities/contact/PhysicalAddressEntity'
 import { AuditEventEntity } from './entities/eventLogger/AuditEventEntity'
 import { DigitalCredentialEntity } from './entities/digitalCredential/DigitalCredentialEntity'
-import { PresentationDefinitionItemEntity } from './entities/presentationDefinition/PresentationDefinitionItemEntity'
+import { DcqlQueryItemEntity } from './entities/presentationDefinition/DcqlQueryItemEntity'
 import { ContactMetadataItemEntity } from './entities/contact/ContactMetadataItemEntity'
 import { CredentialClaimsEntity } from './entities/issuanceBranding/CredentialClaimsEntity'
 
@@ -99,7 +99,7 @@ export const DataStoreIssuanceBrandingEntities = [
   CredentialClaimsEntity,
 ]
 
-export const DataStorePresentationDefinitionEntities = [PresentationDefinitionItemEntity]
+export const DataStorePresentationDefinitionEntities = [DcqlQueryItemEntity]
 
 export const DataStoreStatusListEntities = [
   StatusListEntity,
@@ -158,7 +158,7 @@ export {
   AuditEventEntity,
   DigitalCredentialEntity,
   MachineStateInfoEntity,
-  PresentationDefinitionItemEntity,
+  DcqlQueryItemEntity,
   ContactMetadataItemEntity,
   CredentialClaimsEntity,
   Oid4vcStateEntity,