@sphereon/ssi-sdk.data-store 0.36.1-feature.fides.fixes.111 → 0.36.1-feature.fides.fixes.117

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.36.1-feature.fides.fixes.111+275075fd",
+  "version": "0.36.1-feature.fides.fixes.117+9acc9ac1",
   "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.fides.fixes.111+275075fd",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-feature.fides.fixes.111+275075fd",
-    "@sphereon/ssi-sdk.agent-config": "0.36.1-feature.fides.fixes.111+275075fd",
-    "@sphereon/ssi-sdk.core": "0.36.1-feature.fides.fixes.111+275075fd",
-    "@sphereon/ssi-sdk.data-store-types": "0.36.1-feature.fides.fixes.111+275075fd",
-    "@sphereon/ssi-types": "0.36.1-feature.fides.fixes.111+275075fd",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-feature.fides.fixes.117+9acc9ac1",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.36.1-feature.fides.fixes.117+9acc9ac1",
+    "@sphereon/ssi-sdk.agent-config": "0.36.1-feature.fides.fixes.117+9acc9ac1",
+    "@sphereon/ssi-sdk.core": "0.36.1-feature.fides.fixes.117+9acc9ac1",
+    "@sphereon/ssi-sdk.data-store-types": "0.36.1-feature.fides.fixes.117+9acc9ac1",
+    "@sphereon/ssi-types": "0.36.1-feature.fides.fixes.117+9acc9ac1",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
@@ -66,5 +66,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "275075fdc7753426df398e771e7ecdf28b7d1e3b"
+  "gitHead": "9acc9ac1a855c5327269e9c76e7028987057c777"
 }

package/src/contact/ContactStore.ts

@@ -109,7 +109,10 @@ export class ContactStore extends AbstractContactStore {
     const initialResult = await partyRepository.find({ select: ['id'], where: filterConditions })
 
     // Fetch the complete entities based on the initial result IDs
-    const result = await partyRepository.find({ where: { id: In(initialResult.map((party) => party.id)) } })
+    const result = await partyRepository.find({
+      where: { id: In(initialResult.map((party) => party.id)) },
+      relations: ['contact'], // Explicit load prevents eager loading issues
+    })
     debug(`getParties() resulted in ${result.length} parties`)
     return result
       .filter((party) => {

package/src/entities/issuanceBranding/CredentialBrandingEntity.ts

@@ -62,7 +62,9 @@ export class CredentialBrandingEntity extends BaseEntity {
   @BeforeInsert()
   @BeforeUpdate()
   setState(): void {
-    this.state = this.computeState()
+    if (this.localeBranding && Array.isArray(this.localeBranding)) {
+      this.state = this.computeState()
+    }
   }
 
   @BeforeInsert()

package/src/issuanceBranding/IssuanceBrandingStore.ts

@@ -94,20 +94,48 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     }
 
     debug('Getting credential branding', args)
-    const result: Array<CredentialBrandingEntity> = await (await this.dbConnection).getRepository(CredentialBrandingEntity).find({
-      ...(filter && { where: filter }),
-    })
+    const repository: Repository<CredentialBrandingEntity> = (await this.dbConnection).getRepository(CredentialBrandingEntity)
+
+    if (knownStates && Object.keys(knownStates).length > 0) {
+      // First do a lightweight query selecting only id and state to determine which records are "dirty"
+      const stateQuery = repository
+        .createQueryBuilder('branding')
+        .select(['branding.id', 'branding.state'])
+      if (filter) {
+        stateQuery.where(filter)
+      }
+      const stateResults: Array<{ id: string; state: string }> = await stateQuery.getRawMany().then((rows) =>
+        rows.map((row) => ({
+          id: row.branding_id,
+          state: row.branding_state,
+        })),
+      )
 
-    const credentialBranding: Array<ICredentialBranding> = result.map((branding: CredentialBrandingEntity) => credentialBrandingFrom(branding))
+      // Filter to find dirty record ids (new or changed state)
+      const dirtyIds: Array<string> = stateResults
+        .filter((result) => {
+          const knownState: string | undefined = knownStates[result.id]
+          return !knownState || knownState !== result.state
+        })
+        .map((result) => result.id)
+
+      if (dirtyIds.length === 0) {
+        return []
+      }
+
+      // Only fetch full data for dirty records
+      const result: Array<CredentialBrandingEntity> = await repository.find({
+        where: { id: In(dirtyIds) },
+      })
 
-    if (!knownStates) {
-      return credentialBranding
+      return result.map((branding: CredentialBrandingEntity) => credentialBrandingFrom(branding))
     }
 
-    return credentialBranding.filter((branding: ICredentialBranding) => {
-      const knownState: string | undefined = knownStates[branding.id]
-      return !knownState || knownState !== branding.state
+    const result: Array<CredentialBrandingEntity> = await repository.find({
+      ...(filter && { where: filter }),
     })
+
+    return result.map((branding: CredentialBrandingEntity) => credentialBrandingFrom(branding))
   }
 
   public removeCredentialBranding = async (args: IRemoveCredentialBrandingArgs): Promise<void> => {

package/src/migrations/sqlite/1766000000000-AddBrandingState.ts

@@ -4,11 +4,17 @@ export class AddBrandingStateSqlite1766000000000 implements MigrationInterface {
   name = 'AddBrandingState1766000000000'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
+    // Add state column with empty string default for existing records
+    // Note: Existing records will have state='', which won't match computed hashes.
+    // This makes the knownStates optimization ineffective until records are naturally updated.
     await queryRunner.query(`ALTER TABLE "CredentialBranding" ADD COLUMN "state" varchar(255) NOT NULL DEFAULT ''`)
     await queryRunner.query(`ALTER TABLE "BaseLocaleBranding" ADD COLUMN "state" varchar(255) NOT NULL DEFAULT ''`)
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
+    // Disable foreign key constraints during migration to avoid issues with DROP TABLE operations
+    await queryRunner.query(`PRAGMA foreign_keys = OFF`)
+
     // Recreate CredentialBranding without the state column
     await queryRunner.query(`
             CREATE TABLE "CredentialBranding_old"
@@ -67,8 +73,15 @@ export class AddBrandingStateSqlite1766000000000 implements MigrationInterface {
         `)
     await queryRunner.query(`DROP TABLE "BaseLocaleBranding"`)
     await queryRunner.query(`ALTER TABLE "BaseLocaleBranding_old" RENAME TO "BaseLocaleBranding"`)
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_CredentialLocaleBrandingEntity_credentialBranding_locale" ON "BaseLocaleBranding" ("credentialBrandingId", "locale")`)
-    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_IssuerLocaleBrandingEntity_issuerBranding_locale" ON "BaseLocaleBranding" ("issuerBrandingId", "locale")`)
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_CredentialLocaleBrandingEntity_credentialBranding_locale" ON "BaseLocaleBranding" ("credentialBrandingId", "locale")`,
+    )
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX "IDX_IssuerLocaleBrandingEntity_issuerBranding_locale" ON "BaseLocaleBranding" ("issuerBrandingId", "locale")`,
+    )
     await queryRunner.query(`CREATE INDEX "IDX_BaseLocaleBranding_type" ON "BaseLocaleBranding" ("type")`)
+
+    // Re-enable foreign key constraints
+    await queryRunner.query(`PRAGMA foreign_keys = ON`)
   }
 }