@sphereon/ssi-sdk.data-store 0.36.1-next.11 → 0.36.1-next.39

package/src/migrations/postgres/1763387280001-AddLinkedVpFields.ts

@@ -0,0 +1,39 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class AddLinkedVpFields1763387280001 implements MigrationInterface {
+  name = 'AddLinkedVpFields1763387280001'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_id" text
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_from" TIMESTAMP
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_until" TIMESTAMP
+    `)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential"
+        DROP COLUMN "linked_vp_until"
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      DROP COLUMN "linked_vp_from"
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      DROP COLUMN "linked_vp_id"
+    `)
+  }
+}

package/src/migrations/sqlite/1763387280002-AddLinkedVpFields.ts

@@ -0,0 +1,39 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class AddLinkedVpFields1763387280002 implements MigrationInterface {
+  name = 'AddLinkedVpFields1763387280002'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_id" text
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_from" datetime
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_until" datetime
+    `)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      DROP COLUMN "linked_vp_from"
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      DROP COLUMN "linked_vp_until"
+    `)
+
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      DROP COLUMN "linked_vp_id"
+    `)
+  }
+}

package/src/utils/digitalCredential/MappingUtils.ts

@@ -1,6 +1,11 @@
 import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import type { AddCredentialArgs, DigitalCredential, NonPersistedDigitalCredential } from '@sphereon/ssi-sdk.data-store-types'
-import { CredentialDocumentFormat, DocumentType, RegulationType } from '@sphereon/ssi-sdk.data-store-types'
+import type {
+  AddCredentialArgs,
+  DigitalCredential,
+  NonPersistedDigitalCredential,
+  UpdateCredentialStateArgs,
+} from '@sphereon/ssi-sdk.data-store-types'
+import { CredentialDocumentFormat, CredentialStateType, DocumentType, RegulationType } from '@sphereon/ssi-sdk.data-store-types'
 import {
   CredentialMapper,
   DocumentFormat,
@@ -66,6 +71,20 @@ function determineCredentialDocumentFormat(documentFormat: DocumentFormat): Cred
   }
 }
 
+/**
+ * Normalizes nullable fields by converting undefined to null.
+ * This ensures TypeORM actually clears the database fields instead of ignoring them.
+ */
+export function normalizeNullableFields<T extends Record<string, any>>(obj: T, nullableKeys: Array<keyof T>): T {
+  const normalized = { ...obj }
+  for (const key of nullableKeys) {
+    if (normalized[key] === undefined) {
+      normalized[key] = null as any
+    }
+  }
+  return normalized
+}
+
 function getValidUntil(uniformDocument: IVerifiableCredential | IVerifiablePresentation | SdJwtDecodedVerifiableCredentialPayload): Date | undefined {
   if ('expirationDate' in uniformDocument && uniformDocument.expirationDate) {
     return new Date(uniformDocument.expirationDate)
@@ -127,6 +146,54 @@ export const nonPersistedDigitalCredentialEntityFromAddArgs = (addCredentialArgs
   }
 }
 
+export const persistedDigitalCredentialEntityFromUpdateArgs = (
+  existingCredential: DigitalCredentialEntity,
+  updates: Partial<DigitalCredential>,
+): DigitalCredentialEntity => {
+  const entity = new DigitalCredentialEntity()
+
+  // Copy all fields from existing credential
+  Object.assign(entity, existingCredential)
+
+  // Normalize nullable fields before applying updates
+  const normalizedUpdates = normalizeNullableFields(updates, ['linkedVpId', 'linkedVpFrom', 'linkedVpUntil'])
+
+  // Apply updates
+  Object.assign(entity, normalizedUpdates)
+
+  // Ensure these fields are never overwritten
+  entity.id = existingCredential.id
+  entity.hash = existingCredential.hash
+  entity.createdAt = existingCredential.createdAt
+  entity.lastUpdatedAt = new Date()
+
+  return entity
+}
+
+export const persistedDigitalCredentialEntityFromStateArgs = (
+  existingCredential: DigitalCredentialEntity,
+  args: UpdateCredentialStateArgs,
+): DigitalCredentialEntity => {
+  const entity = new DigitalCredentialEntity()
+
+  // Copy all fields from existing credential
+  Object.assign(entity, existingCredential)
+
+  // Apply state updates
+  entity.verifiedState = args.verifiedState
+  entity.lastUpdatedAt = new Date()
+
+  if (args.verifiedState === CredentialStateType.REVOKED && args.revokedAt) {
+    entity.revokedAt = args.revokedAt
+  }
+
+  if (args.verifiedState !== CredentialStateType.REVOKED && args.verifiedAt) {
+    entity.verifiedAt = args.verifiedAt
+  }
+
+  return entity
+}
+
 export const digitalCredentialFrom = (credentialEntity: DigitalCredentialEntity): DigitalCredential => {
   const result: DigitalCredential = {
     ...credentialEntity,