@sphereon/ssi-sdk.data-store 0.24.0 → 0.24.1-next.42

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

@@ -1,5 +1,5 @@
 import { DataSource } from 'typeorm'
-import { DataStoreContactEntities, DataStoreMigrations, PartyOrigin } from '../index'
+import { DataStoreContactEntities, DataStoreMigrations, IdentityOrigin, MetadataItem, MetadataTypes, PartyOrigin } from '../index'
 import { ContactStore } from '../contact/ContactStore'
 import {
   CorrelationIdentifierType,
@@ -10,7 +10,7 @@ import {
   GetPhysicalAddressesArgs,
   GetRelationshipsArgs,
   Identity,
-  IdentityRole,
+  CredentialRole,
   NaturalPerson,
   NonPersistedElectronicAddress,
   NonPersistedIdentity,
@@ -49,6 +49,157 @@ describe('Contact store tests', (): void => {
     await (await dbConnection).destroy()
   })
 
+  it('should get party by contact metadata', async (): Promise<void> => {
+    const dateOfBirth = new Date(2016, 0, 5)
+    const party: NonPersistedParty = {
+      uri: 'example.com',
+      partyType: {
+        type: PartyTypeType.NATURAL_PERSON,
+        tenantId: '0605761c-4113-4ce5-a6b2-9cbae2f9d289',
+        name: 'example_name',
+        origin: PartyOrigin.EXTERNAL,
+      },
+      contact: {
+        firstName: 'example_first_name',
+        middleName: 'example_middle_name',
+        lastName: 'example_last_name',
+        metadata: [
+          { label: 'grade', value: '5th' },
+          { label: 'dateOfBirth', value: dateOfBirth },
+        ] as Array<MetadataItem<MetadataTypes>>,
+        displayName: 'example_display_name',
+      },
+    }
+
+    const savedParty: Party = await contactStore.addParty(party)
+    expect(savedParty).toBeDefined()
+
+    const singleResult: Party = await contactStore.getParty({ partyId: savedParty.id })
+    expect(singleResult).toBeDefined()
+
+    const args: GetPartiesArgs = {
+      filter: [{ contact: { metadata: { label: 'dateOfBirth', value: dateOfBirth } } }],
+    }
+    const result: Array<Party> = await contactStore.getParties(args)
+    expect(result).toBeDefined()
+    expect(result.length).toEqual(1)
+    expect(result[0]).toBeDefined()
+  })
+
+  it('should get a party by identity metadata', async (): Promise<void> => {
+    const party: NonPersistedParty = {
+      uri: 'example.com',
+      partyType: {
+        type: PartyTypeType.NATURAL_PERSON,
+        tenantId: '0605761c-4113-4ce5-a6b2-9cbae2f9d289',
+        name: 'example_name',
+        origin: PartyOrigin.EXTERNAL,
+      },
+      contact: {
+        firstName: 'example_first_name',
+        middleName: 'example_middle_name',
+        lastName: 'example_last_name',
+        displayName: 'example_display_name',
+      },
+    }
+
+    const savedParty: Party = await contactStore.addParty(party)
+    expect(savedParty).toBeDefined()
+
+    const identity: NonPersistedIdentity = {
+      alias: 'test_alias',
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
+      identifier: {
+        type: CorrelationIdentifierType.DID,
+        correlationId: 'example_did',
+      },
+      metadata: [
+        {
+          label: 'label1',
+          value: 'example_value',
+        },
+        {
+          label: 'label2',
+          value: 'example_value',
+        },
+      ],
+    }
+    const savedIdentity: Identity = await contactStore.addIdentity({ partyId: savedParty.id, identity: identity })
+    expect(savedIdentity).toBeDefined()
+
+    const args: GetPartiesArgs = {
+      filter: [{ identities: { metadata: { label: 'label1', value: 'example_value' } } }],
+    }
+    const result: Array<Party> = await contactStore.getParties(args)
+    expect(result).toBeDefined()
+    expect(result.length).toEqual(1)
+    expect(result[0]).toBeDefined()
+  })
+
+  it('should get party by both contact and identity metadata', async (): Promise<void> => {
+    const example_date = new Date(2016, 0, 5)
+    const party: NonPersistedParty = {
+      uri: 'example.com',
+      partyType: {
+        type: PartyTypeType.NATURAL_PERSON,
+        tenantId: '0605761c-4113-4ce5-a6b2-9cbae2f9d289',
+        name: 'example_name',
+        origin: PartyOrigin.EXTERNAL,
+      },
+      contact: {
+        firstName: 'example_first_name',
+        middleName: 'example_middle_name',
+        lastName: 'example_last_name',
+        displayName: 'example_display_name',
+        metadata: [
+          { label: 'label1', value: 'example_value' },
+          { label: 'label2', value: example_date },
+        ] as Array<MetadataItem<MetadataTypes>>,
+      },
+    }
+
+    const savedParty: Party = await contactStore.addParty(party)
+    expect(savedParty).toBeDefined()
+
+    const identity: NonPersistedIdentity = {
+      alias: 'test_alias',
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
+      identifier: {
+        type: CorrelationIdentifierType.DID,
+        correlationId: 'example_did',
+      },
+      metadata: [
+        {
+          label: 'label3',
+          value: 'example_value',
+        },
+        {
+          label: 'label4',
+          value: 'example_value',
+        },
+      ],
+    }
+    const savedIdentity: Identity = await contactStore.addIdentity({ partyId: savedParty.id, identity: identity })
+    expect(savedIdentity).toBeDefined()
+
+    const args: GetPartiesArgs = {
+      filter: [
+        {
+          contact: { metadata: { label: 'label2', value: example_date } },
+          identities: { metadata: { label: 'label3', value: 'example_value' } },
+        },
+      ],
+    }
+
+    const result: Array<Party> = await contactStore.getParties(args)
+
+    expect(result).toBeDefined()
+    expect(result.length).toEqual(1)
+    expect(result[0]).toBeDefined()
+  })
+
   it('should get party by id', async (): Promise<void> => {
     const party: NonPersistedParty = {
       uri: 'example.com',
@@ -189,7 +340,8 @@ describe('Contact store tests', (): void => {
       identities: [
         {
           alias: 'test_alias1',
-          roles: [IdentityRole.ISSUER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.ISSUER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did1',
@@ -197,7 +349,8 @@ describe('Contact store tests', (): void => {
         },
         {
           alias: 'test_alias2',
-          roles: [IdentityRole.VERIFIER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.VERIFIER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did2',
@@ -205,7 +358,8 @@ describe('Contact store tests', (): void => {
         },
         {
           alias: 'test_alias3',
-          roles: [IdentityRole.HOLDER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.HOLDER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did3',
@@ -413,7 +567,8 @@ describe('Contact store tests', (): void => {
       identities: [
         {
           alias: 'test_alias1',
-          roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did1',
@@ -421,7 +576,8 @@ describe('Contact store tests', (): void => {
         },
         {
           alias: 'test_alias2',
-          roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did2',
@@ -457,7 +613,8 @@ describe('Contact store tests', (): void => {
       identities: [
         {
           alias: 'test_alias1',
-          roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
           identifier: {
             type: CorrelationIdentifierType.URL,
             correlationId: 'example_did1',
@@ -465,7 +622,8 @@ describe('Contact store tests', (): void => {
         },
         {
           alias: 'test_alias2',
-          roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did2',
@@ -498,7 +656,8 @@ describe('Contact store tests', (): void => {
 
     const identity1: NonPersistedIdentity = {
       alias: 'test_alias1',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did1',
@@ -509,7 +668,8 @@ describe('Contact store tests', (): void => {
 
     const identity2: NonPersistedIdentity = {
       alias: 'test_alias2',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did2',
@@ -589,7 +749,8 @@ describe('Contact store tests', (): void => {
 
     const identity: NonPersistedIdentity = {
       alias: 'test_alias',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did',
@@ -624,7 +785,8 @@ describe('Contact store tests', (): void => {
 
     const identity: NonPersistedIdentity = {
       alias: 'test_alias',
-      roles: [IdentityRole.HOLDER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.HOLDER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did',
@@ -665,7 +827,8 @@ describe('Contact store tests', (): void => {
 
     const identity1: NonPersistedIdentity = {
       alias: 'test_alias1',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did1',
@@ -676,7 +839,8 @@ describe('Contact store tests', (): void => {
 
     const identity2: NonPersistedIdentity = {
       alias: 'test_alias2',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did2',
@@ -715,7 +879,8 @@ describe('Contact store tests', (): void => {
 
     const identity1: NonPersistedIdentity = {
       alias: 'test_alias1',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did1',
@@ -726,7 +891,8 @@ describe('Contact store tests', (): void => {
 
     const identity2: NonPersistedIdentity = {
       alias: 'test_alias2',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did2',
@@ -762,7 +928,8 @@ describe('Contact store tests', (): void => {
     const alias = 'test_alias1'
     const identity1: NonPersistedIdentity = {
       alias,
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did1',
@@ -773,7 +940,8 @@ describe('Contact store tests', (): void => {
 
     const identity2: NonPersistedIdentity = {
       alias: 'test_alias2',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did2',
@@ -813,7 +981,8 @@ describe('Contact store tests', (): void => {
     const alias = 'test_alias1'
     const identity1: NonPersistedIdentity = {
       alias,
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did1',
@@ -833,7 +1002,7 @@ describe('Contact store tests', (): void => {
     expect(savedIdentity1).toBeDefined()
 
     const args: GetIdentitiesArgs = {
-      filter: [{ metadata: { label: 'label1' } }],
+      filter: [{ metadata: { label: 'label1', value: 'example_value' } }],
     }
 
     const result: Array<Identity> = await contactStore.getIdentities(args)
@@ -863,7 +1032,8 @@ describe('Contact store tests', (): void => {
 
     const identity: NonPersistedIdentity = {
       alias: 'test_alias',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did',
@@ -904,7 +1074,8 @@ describe('Contact store tests', (): void => {
     const correlationId = 'missing_connection_example'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.URL,
         correlationId,
@@ -938,7 +1109,8 @@ describe('Contact store tests', (): void => {
     const correlationId = 'missing_connection_example'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER, IdentityRole.HOLDER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER, CredentialRole.HOLDER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId,
@@ -973,7 +1145,8 @@ describe('Contact store tests', (): void => {
 
     const identity: NonPersistedIdentity = {
       alias: 'example_did',
-      roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+      origin: IdentityOrigin.EXTERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierType.DID,
         correlationId: 'example_did',
@@ -1008,7 +1181,8 @@ describe('Contact store tests', (): void => {
       identities: [
         {
           alias: 'test_alias1',
-          roles: [IdentityRole.VERIFIER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.VERIFIER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did1',
@@ -1016,7 +1190,8 @@ describe('Contact store tests', (): void => {
         },
         {
           alias: 'test_alias2',
-          roles: [IdentityRole.ISSUER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.ISSUER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did2',
@@ -1024,7 +1199,8 @@ describe('Contact store tests', (): void => {
         },
         {
           alias: 'test_alias3',
-          roles: [IdentityRole.HOLDER],
+          origin: IdentityOrigin.EXTERNAL,
+          roles: [CredentialRole.HOLDER],
           identifier: {
             type: CorrelationIdentifierType.DID,
             correlationId: 'example_did3',
@@ -1038,7 +1214,7 @@ describe('Contact store tests', (): void => {
 
     expect(result.roles).toBeDefined()
     expect(result.roles.length).toEqual(3)
-    expect(result.roles).toEqual([IdentityRole.VERIFIER, IdentityRole.ISSUER, IdentityRole.HOLDER])
+    expect(result.roles).toEqual([CredentialRole.VERIFIER, CredentialRole.ISSUER, CredentialRole.HOLDER])
   })
 
   it('should add relationship', async (): Promise<void> => {

package/src/contact/ContactStore.ts

@@ -1,5 +1,5 @@
 import { OrPromise } from '@sphereon/ssi-types'
-import { DataSource, In, Repository } from 'typeorm'
+import { BaseEntity, DataSource, FindOptionsWhere, In, Repository } from 'typeorm'
 import Debug from 'debug'
 import { AbstractContactStore } from './AbstractContactStore'
 import { PartyEntity } from '../entities/contact/PartyEntity'
@@ -54,6 +54,8 @@ import {
   GetRelationshipArgs,
   GetRelationshipsArgs,
   Identity,
+  MetadataItem,
+  MetadataTypes,
   NonPersistedConnectionConfig,
   NonPersistedContact,
   Party,
@@ -99,21 +101,16 @@ export class ContactStore extends AbstractContactStore {
   }
 
   getParties = async (args?: GetPartiesArgs): Promise<Array<Party>> => {
-    debug(`getParties()`, args)
+    debug('getParties()', args)
     const { filter } = args ?? {}
-    const partyRepository: Repository<PartyEntity> = (await this.dbConnection).getRepository(PartyEntity)
-    const initialResult: Array<PartyEntity> = await partyRepository.find({
-      ...(filter && { where: filter }),
-    })
+    const partyRepository = (await this.dbConnection).getRepository(PartyEntity)
+    const filterConditions = this.buildFilters(filter)
+    const initialResult = await partyRepository.find({ select: ['id'], where: filterConditions })
 
-    const result: Array<PartyEntity> = await partyRepository.find({
-      where: {
-        id: In(initialResult.map((party: PartyEntity) => party.id)),
-      },
-    })
+    // Fetch the complete entities based on the initial result IDs
+    const result = await partyRepository.find({ where: { id: In(initialResult.map((party) => party.id)) } })
     debug(`getParties() resulted in ${result.length} parties`)
-
-    return result.map((party: PartyEntity) => partyFrom(party))
+    return result.map(partyFrom)
   }
 
   addParty = async (args: AddPartyArgs): Promise<Party> => {
@@ -211,18 +208,12 @@ export class ContactStore extends AbstractContactStore {
 
   getIdentities = async (args?: GetIdentitiesArgs): Promise<Array<Identity>> => {
     const { filter } = args ?? {}
-    const identityRepository: Repository<IdentityEntity> = (await this.dbConnection).getRepository(IdentityEntity)
-    const initialResult: Array<IdentityEntity> = await identityRepository.find({
-      ...(filter && { where: filter }),
-    })
-
-    const result: Array<IdentityEntity> = await identityRepository.find({
-      where: {
-        id: In(initialResult.map((identity: IdentityEntity) => identity.id)),
-      },
-    })
+    const identityRepository = (await this.dbConnection).getRepository(IdentityEntity)
+    const filterConditions = this.buildFilters(filter)
+    const initialResult = await identityRepository.find({ select: ['id'], where: filterConditions })
 
-    return result.map((identity: IdentityEntity) => identityFrom(identity))
+    const result = await identityRepository.find({ where: { id: In(initialResult.map((identity) => identity.id)) } })
+    return result.map(identityFrom)
   }
 
   addIdentity = async (args: AddIdentityArgs): Promise<Identity> => {
@@ -622,7 +613,7 @@ export class ContactStore extends AbstractContactStore {
     await physicalAddressRepository.delete(physicalAddressId)
   }
 
-  private hasCorrectConnectionConfig(type: ConnectionType, config: NonPersistedConnectionConfig): boolean {
+  private hasCorrectConnectionConfig = (type: ConnectionType, config: NonPersistedConnectionConfig): boolean => {
     switch (type) {
       case ConnectionType.OPENID_CONNECT:
         return isOpenIdConfig(config)
@@ -633,7 +624,7 @@ export class ContactStore extends AbstractContactStore {
     }
   }
 
-  private hasCorrectPartyType(type: PartyTypeType, contact: NonPersistedContact): boolean {
+  private hasCorrectPartyType = (type: PartyTypeType, contact: NonPersistedContact): boolean => {
     switch (type) {
       case PartyTypeType.NATURAL_PERSON:
         return isNaturalPerson(contact)
@@ -644,7 +635,7 @@ export class ContactStore extends AbstractContactStore {
     }
   }
 
-  private async deleteIdentities(identities: Array<IdentityEntity>): Promise<void> {
+  private deleteIdentities = async (identities: Array<IdentityEntity>): Promise<void> => {
     debug('Removing identities', identities)
 
     const connection: DataSource = await this.dbConnection
@@ -680,7 +671,7 @@ export class ContactStore extends AbstractContactStore {
     })
   }
 
-  private async deleteElectronicAddresses(electronicAddresses: Array<ElectronicAddressEntity>): Promise<void> {
+  private deleteElectronicAddresses = async (electronicAddresses: Array<ElectronicAddressEntity>): Promise<void> => {
     debug('Removing electronic addresses', electronicAddresses)
 
     const electronicAddressRepository: Repository<ElectronicAddressEntity> = (await this.dbConnection).getRepository(ElectronicAddressEntity)
@@ -691,7 +682,7 @@ export class ContactStore extends AbstractContactStore {
     })
   }
 
-  private async deletePhysicalAddresses(physicalAddresses: Array<PhysicalAddressEntity>): Promise<void> {
+  private deletePhysicalAddresses = async (physicalAddresses: Array<PhysicalAddressEntity>): Promise<void> => {
     debug('Removing physical addresses', physicalAddresses)
 
     const physicalAddressRepository: Repository<PhysicalAddressEntity> = (await this.dbConnection).getRepository(PhysicalAddressEntity)
@@ -702,7 +693,7 @@ export class ContactStore extends AbstractContactStore {
     })
   }
 
-  private async assertRelationshipSides(leftId: string, rightId: string): Promise<void> {
+  private assertRelationshipSides = async (leftId: string, rightId: string): Promise<void> => {
     const partyRepository: Repository<PartyEntity> = (await this.dbConnection).getRepository(PartyEntity)
     const leftParty: PartyEntity | null = await partyRepository.findOne({
       where: { id: leftId },
@@ -720,4 +711,57 @@ export class ContactStore extends AbstractContactStore {
       return Promise.reject(Error(`No party found for right side of the relationship, party id: ${rightId}`))
     }
   }
+
+  private buildFilters = <T extends BaseEntity>(filter?: Array<Record<string, any>>): Array<FindOptionsWhere<T>> | FindOptionsWhere<T> => {
+    if (!filter) return {}
+
+    return filter.map((condition) => this.processCondition(condition))
+  }
+
+  private processCondition = (condition: Record<string, any>): Record<string, any> => {
+    const conditionObject: Record<string, any> = {}
+
+    Object.keys(condition).forEach((key) => {
+      const value = condition[key]
+
+      if (key === 'metadata' && value) {
+        conditionObject[key] = this.buildMetadataCondition(value)
+      } else if (typeof value === 'object' && value !== null) {
+        conditionObject[key] = this.processCondition(value)
+      } else {
+        conditionObject[key] = value
+      }
+    })
+
+    return conditionObject
+  }
+
+  private buildMetadataCondition = <T extends MetadataItem<MetadataTypes>>(metadata: Partial<T>): FindOptionsWhere<IMetadataEntity> => {
+    const metadataCondition: FindOptionsWhere<any> = {
+      label: metadata.label,
+    }
+
+    switch (typeof metadata.value) {
+      case 'string':
+        metadataCondition.stringValue = metadata.value as string
+        break
+      case 'number':
+        metadataCondition.numberValue = metadata.value as number
+        break
+      case 'boolean':
+        metadataCondition.boolValue = metadata.value as boolean
+        break
+      case 'object':
+        if (metadata.value instanceof Date) {
+          metadataCondition.dateValue = metadata.value as Date
+        } else {
+          // For now, we only support / implement not-primitive type Date in the entity
+          throw new Error(`Unsupported object type: ${Object.prototype.toString.call(metadata.value).slice(8, -1)} for value ${metadata.value}`) // slice to extract type from string [object String]
+        }
+        break
+      default:
+        throw new Error(`Unsupported value type: ${typeof metadata.value}`)
+    }
+    return metadataCondition
+  }
 }

package/src/entities/contact/BaseContactEntity.ts

@@ -5,12 +5,14 @@ import {
   CreateDateColumn,
   Entity,
   JoinColumn,
+  OneToMany,
   OneToOne,
   PrimaryGeneratedColumn,
   TableInheritance,
   UpdateDateColumn,
 } from 'typeorm'
 import { PartyEntity } from './PartyEntity'
+import { ContactMetadataItemEntity } from './ContactMetadataItemEntity'
 
 @Entity('BaseContact')
 @TableInheritance({ column: { type: 'varchar', name: 'type' } })
@@ -30,6 +32,15 @@ export abstract class BaseContactEntity extends BaseEntity {
   @JoinColumn({ name: 'party_id' })
   party!: PartyEntity
 
+  @OneToMany(() => ContactMetadataItemEntity, (metadata: ContactMetadataItemEntity) => metadata.contact, {
+    cascade: true,
+    onDelete: 'CASCADE',
+    eager: true,
+    nullable: false,
+  })
+  @JoinColumn({ name: 'metadata_id' })
+  metadata!: Array<ContactMetadataItemEntity>
+
   // By default, @UpdateDateColumn in TypeORM updates the timestamp only when the entity's top-level properties change.
   @BeforeInsert()
   @BeforeUpdate()

package/src/entities/contact/ConnectionEntity.ts

@@ -13,6 +13,12 @@ export class ConnectionEntity extends BaseEntity {
   @Column('simple-enum', { name: 'type', enum: ConnectionType, nullable: false })
   type!: ConnectionType
 
+  @Column({name: 'tenant_id', nullable: true})
+  tenantId?: string
+
+  @Column({name: 'owner_id', nullable: true})
+  ownerId?: string
+
   @OneToOne(() => BaseConfigEntity, (config: OpenIdConfigEntity | DidAuthConfigEntity) => config.connection, {
     cascade: true,
     onDelete: 'CASCADE',