@sphereon/ssi-sdk.data-store 0.34.1-feature.FIDES.1.274 → 0.34.1-feature.IDK.11.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+  "version": "0.34.1-feature.IDK.11.48+640da718",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,17 +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.FIDES.1.274+3d1f4edd",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.FIDES.1.274+3d1f4edd",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.FIDES.1.274+3d1f4edd",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.FIDES.1.274+3d1f4edd",
-    "@sphereon/ssi-sdk.data-store-types": "0.34.1-feature.FIDES.1.274+3d1f4edd",
-    "@sphereon/ssi-types": "0.34.1-feature.FIDES.1.274+3d1f4edd",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.IDK.11.48+640da718",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.IDK.11.48+640da718",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.IDK.11.48+640da718",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.IDK.11.48+640da718",
+    "@sphereon/ssi-types": "0.34.1-feature.IDK.11.48+640da718",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
     "class-validator": "0.14.1",
-    "dcql": "1.0.1",
+    "dcql": "0.2.19",
     "debug": "^4.3.5",
     "typeorm": "0.3.20"
   },
@@ -66,5 +65,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "3d1f4edd13301b5e8ae524e80249b5e25f99eeac"
+  "gitHead": "640da718d6ce394653ae6ef0276b584b2b7456df"
 }

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

@@ -1,8 +1,6 @@
 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,11 +16,18 @@ import { PartyEntity } from '../entities/contact/PartyEntity'
 import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
 import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
 import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
-import { contactMetadataItemEntityFrom, DataStoreContactEntities, DataStoreMigrations, identityMetadataItemEntityFrom, partyTypeFrom } from '../index'
 import {
+  contactMetadataItemEntityFrom,
+  CredentialRole,
+  DataStoreContactEntities,
+  DataStoreMigrations,
+  identityMetadataItemEntityFrom,
   IdentityOrigin,
   MetadataTypes,
   PartyOrigin,
+  partyTypeFrom,
+} from '../index'
+import {
   ConnectionType,
   CorrelationIdentifierType,
   NaturalPerson,
@@ -38,7 +43,7 @@ import {
   NonPersistedPhysicalAddress,
   Organization,
   PartyTypeType,
-} from '@sphereon/ssi-sdk.data-store-types'
+} from '../types'
 import {
   connectionEntityFrom,
   didAuthConfigEntityFrom,
@@ -52,6 +57,7 @@ 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

@@ -1,7 +1,10 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DataSource } from 'typeorm'
+import { ConnectionType, DataStoreContactEntities, DataStoreMigrations, IdentityOrigin, MetadataItem, MetadataTypes, PartyOrigin } from '../index'
+import { ContactStore } from '../contact/ContactStore'
 import {
-  ConnectionType,
   CorrelationIdentifierType,
+  CredentialRole,
   ElectronicAddress,
   GetElectronicAddressesArgs,
   GetIdentitiesArgs,
@@ -9,9 +12,6 @@ import {
   GetPhysicalAddressesArgs,
   GetRelationshipsArgs,
   Identity,
-  IdentityOrigin,
-  MetadataItem,
-  MetadataTypes,
   NaturalPerson,
   NonPersistedElectronicAddress,
   NonPersistedIdentity,
@@ -21,17 +21,12 @@ import {
   NonPersistedPartyType,
   NonPersistedPhysicalAddress,
   Party,
-  PartyOrigin,
   PartyRelationship,
   PartyType,
   PartyTypeType,
   PhysicalAddress,
-} from '@sphereon/ssi-sdk.data-store-types'
-import { CredentialRole } from '@sphereon/ssi-types'
-import { DataSource } from 'typeorm'
+} from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { ContactStore } from '../contact/ContactStore'
-import { DataStoreContactEntities, DataStoreMigrations } from '../index'
 
 describe('Contact store tests', (): void => {
   let dbConnection: DataSource
@@ -54,7 +49,7 @@ describe('Contact store tests', (): void => {
   })
 
   afterEach(async (): Promise<void> => {
-    await dbConnection.destroy()
+    await (await dbConnection).destroy()
   })
 
   it('should get party by contact metadata', async (): Promise<void> => {

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

@@ -1,20 +1,13 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import {
-  AddCredentialArgs,
-  CredentialCorrelationType,
-  CredentialDocumentFormat,
-  DocumentType,
-  NonPersistedDigitalCredential,
-} from '@sphereon/ssi-sdk.data-store-types'
-import { CredentialRole } from '@sphereon/ssi-types'
-import { computeEntryHash } from '@veramo/utils'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
-import { DataStoreDigitalCredentialEntities } from '../index'
+import { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
 import { DataStoreDigitalCredentialMigrations } from '../migrations'
+import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
+import { computeEntryHash } from '@veramo/utils'
 import { nonPersistedDigitalCredentialEntityFromAddArgs } from '../utils/digitalCredential/MappingUtils'
+import { AddCredentialArgs, CredentialCorrelationType, CredentialDocumentFormat, DocumentType, NonPersistedDigitalCredential } 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__/digitalCredential.store.test.ts

@@ -1,11 +1,9 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import { CredentialRole, IVerifiablePresentation } from '@sphereon/ssi-types'
+import { IVerifiablePresentation } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { DigitalCredentialStore } from '../digitalCredential/DigitalCredentialStore'
-import { DataStoreDigitalCredentialEntities } from '../index'
 import { DataStoreDigitalCredentialMigrations } from '../migrations'
+import { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
+import { DigitalCredentialStore } from '../digitalCredential/DigitalCredentialStore'
 import {
   AddCredentialArgs,
   CredentialCorrelationType,
@@ -15,7 +13,9 @@ import {
   DocumentType,
   GetCredentialsArgs,
   GetCredentialsResponse,
-} from '@sphereon/ssi-sdk.data-store-types'
+} 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__/eventLogger.entities.test.ts

@@ -2,12 +2,12 @@ import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { CredentialType, PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import { ActionType, InitiatorType, LoggingEventType, LogLevel, SubSystem, System, SystemCorrelationIdType } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
 import { DataStoreEventLoggerEntities } from '../index'
 import { DataStoreEventLoggerMigrations } from '../migrations'
-import { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '@sphereon/ssi-sdk.data-store-types'
+import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
+import { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../types'
 import { activityEventEntityFrom, auditEventEntityFrom } from '../utils/eventLogger/MappingUtils'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

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

@@ -2,16 +2,11 @@ import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { ActivityLoggingEvent, AuditLoggingEvent, CredentialType, PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import { ActionType, InitiatorType, LoggingEventType, LogLevel, SubSystem, System, SystemCorrelationIdType } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { EventLoggerStore } from '../eventLogger/EventLoggerStore'
-import { DataStoreEventLoggerEntities } from '../index'
 import { DataStoreEventLoggerMigrations } from '../migrations'
-import {
-  GetActivityEventsArgs,
-  GetAuditEventsArgs,
-  NonPersistedActivityLoggingEvent,
-  NonPersistedAuditLoggingEvent,
-} from '@sphereon/ssi-sdk.data-store-types'
+import { DataStoreEventLoggerEntities } from '../index'
+import { EventLoggerStore } from '../eventLogger/EventLoggerStore'
+import { GetActivityEventsArgs, GetAuditEventsArgs, NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../types'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,6 +1,6 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource, Repository } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { DataStoreMigrations } from '../migrations'
 import {
   CredentialBrandingEntity,
   credentialBrandingEntityFrom,
@@ -16,7 +16,7 @@ import {
   IssuerLocaleBrandingEntity,
   issuerLocaleBrandingEntityFrom,
 } from '../index'
-import { DataStoreMigrations } from '../migrations'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,6 +1,7 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { IssuanceBrandingStore } from '../issuanceBranding/IssuanceBrandingStore'
+import { DataStoreMigrations } from '../migrations'
 import {
   BackgroundAttributesEntity,
   CredentialLocaleBrandingEntity,
@@ -25,8 +26,7 @@ import {
   IUpdateIssuerLocaleBrandingArgs,
   TextAttributesEntity,
 } from '../index'
-import { IssuanceBrandingStore } from '../issuanceBranding/IssuanceBrandingStore'
-import { DataStoreMigrations } from '../migrations'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Issuance branding store tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,9 +1,9 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { MachineStateInfoEntity } from '../entities/machineState/MachineStateInfoEntity'
 
 import { DataStoreMachineStateEntities, DataStoreMachineStateMigrations, MachineStateStore, StoreMachineStatePersistArgs } from '../index'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Machine State Info Database entities tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,8 +1,8 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { DataStoreMachineStateEntities, MachineStateStore, StoreMachineStatePersistArgs, StoreMachineStatesFindActiveArgs } from '../index'
 import { DataStoreMachineStateMigrations } from '../migrations'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Machine State store tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,12 +1,11 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { DcqlQueryItemEntity } from '../entities/presentationDefinition/DcqlQueryItemEntity'
-import { DataStorePresentationDefinitionEntities } from '../index'
+import { PresentationDefinitionItemEntity } from '../entities/presentationDefinition/PresentationDefinitionItemEntity'
 import { DataStorePresentationDefinitionMigrations } from '../migrations'
-import { SAMPLE_DCQL_QUERY_IMPORT } from './pd-manager.store.test'
+import { DataStorePresentationDefinitionEntities } from '../index'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
-describe('DcqlQueryItemEntity tests', (): void => {
+describe('PresentationDefinitionItemEntity tests', (): void => {
   let dbConnection: DataSource
 
   beforeEach(async (): Promise<void> => {
@@ -26,34 +25,59 @@ describe('DcqlQueryItemEntity tests', (): void => {
     await dbConnection.destroy()
   })
 
-  it('should create and retrieve DcqlQueryItemEntity', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(DcqlQueryItemEntity)
-    const entity = new DcqlQueryItemEntity()
-    entity.queryId = 'ajax-club'
+  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.query = JSON.stringify(SAMPLE_DCQL_QUERY_IMPORT.query)
+    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.query).toBeDefined()
+    expect(savedEntity.dcqlPayload).toBeDefined()
 
     const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
     expect(retrievedEntity).toBeDefined()
-    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)
+    expect(retrievedEntity!.dcqlPayload).toBeDefined()
+    const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
+    expect(parsedDcql.credentials[0].id).toEqual('credential1')
   })
 
-  it('should update DcqlQueryItemEntity dcql query', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(DcqlQueryItemEntity)
-    const entity = new DcqlQueryItemEntity()
-    entity.queryId = 'ajax-club'
+  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.query = JSON.stringify(SAMPLE_DCQL_QUERY_IMPORT.query)
+    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()
@@ -61,20 +85,67 @@ describe('DcqlQueryItemEntity tests', (): void => {
     const updatedDcql = {
       credentials: [
         {
-          id: 'updated-clubcard',
+          id: 'credential2',
           format: 'jwt_vc',
           claims: [
             {
-              path: ['name'],
+              namespace: 'test',
+              claim_name: 'updatedClaim',
             },
           ],
         },
       ],
     }
-    savedEntity.query = JSON.stringify(updatedDcql)
+    savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
     const updatedEntity = await repository.save(savedEntity)
     expect(updatedEntity).toBeDefined()
-    expect(JSON.parse(updatedEntity.query).credentials[0].id).toEqual('updated-clubcard')
-    expect(JSON.parse(updatedEntity.query).credentials[0].format).toEqual('jwt_vc')
+    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()
+    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()
   })
 })