@sphereon/ssi-sdk.data-store 0.36.1-feature.vdx24.einvoice.inbox.138 → 0.36.1-feature.vdx24.einvoice.inbox.142

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
+  "version": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,12 +28,12 @@
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
-    "@sphereon/ssi-sdk.agent-config": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
-    "@sphereon/ssi-sdk.core": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
-    "@sphereon/ssi-sdk.data-store-types": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
-    "@sphereon/ssi-types": "0.36.1-feature.vdx24.einvoice.inbox.138+fa0621e6",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
+    "@sphereon/ssi-sdk.agent-config": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
+    "@sphereon/ssi-sdk.core": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
+    "@sphereon/ssi-sdk.data-store-types": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
+    "@sphereon/ssi-types": "0.36.1-feature.vdx24.einvoice.inbox.142+ff40ab64",
     "@veramo/core": "4.2.0",
     "@veramo/data-store": "4.2.0",
     "@veramo/utils": "4.2.0",
@@ -67,5 +67,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "fa0621e62e4e3e9669e087da06fcde71a3ce1ba1"
+  "gitHead": "ff40ab64b07e77c8565ed97a027c74bb4d754f28"
 }

package/src/contact/ContactStore.ts

@@ -249,10 +249,45 @@ export class ContactStore extends AbstractContactStore {
       }
     }
 
-    const identityEntity: IdentityEntity = identityEntityFrom(identity)
+    const identityRepository = (await this.dbConnection).getRepository(IdentityEntity)
+    const correlationIdentifierRepository = (await this.dbConnection).getRepository(CorrelationIdentifierEntity)
+
+    // First check if an identity with the same correlationId already exists
+    const existingCorrelationIdentifier = await correlationIdentifierRepository.findOne({
+      where: { correlationId: identity.identifier.correlationId },
+    })
+
+    if (existingCorrelationIdentifier) {
+      // The same identifier already exists, return the existing identity
+      const existingIdentity = await identityRepository.findOne({
+        where: { identifier: { id: existingCorrelationIdentifier.id } },
+      })
+      if (existingIdentity) {
+        debug('Identity with same correlationId already exists, returning existing identity', identity.identifier.correlationId)
+        return identityFrom(existingIdentity)
+      }
+    }
+
+    // Check if an identity with the same alias exists (but different correlationId)
+    const existingAlias = await identityRepository.findOne({
+      where: { alias: identity.alias },
+    })
+
+    let uniqueAlias = identity.alias
+    if (existingAlias) {
+      // Generate a unique alias by appending a counter
+      let counter = 1
+      while (await identityRepository.findOne({ where: { alias: `${identity.alias}_${counter}` } })) {
+        counter++
+      }
+      uniqueAlias = `${identity.alias}_${counter}`
+      debug('Alias collision detected, using unique alias', { original: identity.alias, unique: uniqueAlias })
+    }
+
+    const identityEntity: IdentityEntity = identityEntityFrom({ ...identity, alias: uniqueAlias })
     identityEntity.party = party
     debug('Adding identity', identity)
-    const result: IdentityEntity = await (await this.dbConnection).getRepository(IdentityEntity).save(identityEntity, {
+    const result: IdentityEntity = await identityRepository.save(identityEntity, {
       transaction: true,
     })