@sphereon/ssi-sdk.data-store 0.30.2-feature.SPRIND.77.133 → 0.30.2-feature.SPRIND.84.142

package/src/entities/issuanceBranding/ImageAttributesEntity.ts

@@ -1,7 +1,8 @@
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { ImageDimensionsEntity } from './ImageDimensionsEntity'
+import { IBasicImageAttributes } from '../../types'
+import { ImageDimensionsEntity, imageDimensionsEntityFrom } from './ImageDimensionsEntity'
 import { validate, Validate, ValidationError } from 'class-validator'
-import { IsNonEmptyStringConstraint } from '../validators'
+import { isEmptyString, IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('ImageAttributes')
 export class ImageAttributesEntity extends BaseEntity {
@@ -43,3 +44,14 @@ export class ImageAttributesEntity extends BaseEntity {
     return
   }
 }
+
+export const imageAttributesEntityFrom = (args: IBasicImageAttributes): ImageAttributesEntity => {
+  const imageAttributesEntity: ImageAttributesEntity = new ImageAttributesEntity()
+  imageAttributesEntity.uri = isEmptyString(args.uri) ? undefined : args.uri
+  imageAttributesEntity.dataUri = isEmptyString(args.dataUri) ? undefined : args.dataUri
+  imageAttributesEntity.mediaType = isEmptyString(args.mediaType) ? undefined : args.mediaType
+  imageAttributesEntity.alt = isEmptyString(args.alt) ? undefined : args.alt
+  imageAttributesEntity.dimensions = args.dimensions ? imageDimensionsEntityFrom(args.dimensions) : undefined
+
+  return imageAttributesEntity
+}

package/src/entities/issuanceBranding/ImageDimensionsEntity.ts

@@ -1,4 +1,5 @@
 import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
+import { IBasicImageDimensions } from '../../types'
 
 @Entity('ImageDimensions')
 export class ImageDimensionsEntity extends BaseEntity {
@@ -11,3 +12,11 @@ export class ImageDimensionsEntity extends BaseEntity {
   @Column('integer', { name: 'height', nullable: false, unique: false })
   height!: number
 }
+
+export const imageDimensionsEntityFrom = (args: IBasicImageDimensions): ImageDimensionsEntity => {
+  const imageDimensionsEntity: ImageDimensionsEntity = new ImageDimensionsEntity()
+  imageDimensionsEntity.width = args.width
+  imageDimensionsEntity.height = args.height
+
+  return imageDimensionsEntity
+}

package/src/entities/issuanceBranding/IssuerBrandingEntity.ts

@@ -12,7 +12,8 @@ import {
 } from 'typeorm'
 import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { IssuerLocaleBrandingEntity } from './IssuerLocaleBrandingEntity'
+import { IssuerLocaleBrandingEntity, issuerLocaleBrandingEntityFrom } from './IssuerLocaleBrandingEntity'
+import { IBasicIssuerBranding, IBasicIssuerLocaleBranding } from '../../types'
 
 @Entity('IssuerBranding')
 @Index('IDX_IssuerBrandingEntity_issuerCorrelationId', ['issuerCorrelationId'])
@@ -60,3 +61,13 @@ export class IssuerBrandingEntity extends BaseEntity {
     return
   }
 }
+
+export const issuerBrandingEntityFrom = (args: IBasicIssuerBranding): IssuerBrandingEntity => {
+  const issuerBrandingEntity: IssuerBrandingEntity = new IssuerBrandingEntity()
+  issuerBrandingEntity.issuerCorrelationId = args.issuerCorrelationId
+  issuerBrandingEntity.localeBranding = args.localeBranding.map((localeBranding: IBasicIssuerLocaleBranding) =>
+    issuerLocaleBrandingEntityFrom(localeBranding),
+  )
+
+  return issuerBrandingEntity
+}

package/src/entities/issuanceBranding/IssuerLocaleBrandingEntity.ts

@@ -1,8 +1,11 @@
 import { ChildEntity, Column, Index, JoinColumn, ManyToOne } from 'typeorm'
+import { IBasicIssuerLocaleBranding } from '../../types'
+import { backgroundAttributesEntityFrom } from './BackgroundAttributesEntity'
+import { imageAttributesEntityFrom } from './ImageAttributesEntity'
 import { IssuerBrandingEntity } from './IssuerBrandingEntity'
 import { BaseLocaleBrandingEntity } from './BaseLocaleBrandingEntity'
-import { IsNonEmptyStringConstraint } from '../validators'
-import { Validate } from 'class-validator'
+import { textAttributesEntityFrom } from './TextAttributesEntity'
+import { isEmptyString } from '../validators'
 
 @ChildEntity('IssuerLocaleBranding')
 @Index('IDX_IssuerLocaleBrandingEntity_issuerBranding_locale', ['issuerBranding', 'locale'], { unique: true })
@@ -13,21 +16,18 @@ export class IssuerLocaleBrandingEntity extends BaseLocaleBrandingEntity {
   @JoinColumn({ name: 'issuerBrandingId' })
   issuerBranding!: IssuerBrandingEntity
 
-  @Column('text', { name: 'client_uri', nullable: true, unique: false })
-  @Validate(IsNonEmptyStringConstraint, { message: 'Blank client uris are not allowed' })
-  clientUri?: string
-
-  @Column('text', { name: 'tos_uri', nullable: true, unique: false })
-  @Validate(IsNonEmptyStringConstraint, { message: 'Blank tos uris are not allowed' })
-  tosUri?: string
-
-  @Column('text', { name: 'policy_uri', nullable: true, unique: false })
-  @Validate(IsNonEmptyStringConstraint, { message: 'Blank policy uris are not allowed' })
-  policyUri?: string
-
-  @Column('simple-array', { name: 'contacts', nullable: true, unique: false })
-  contacts?: Array<string>
-
   @Column('text', { name: 'issuerBrandingId', nullable: false })
   issuerBrandingId!: string
 }
+
+export const issuerLocaleBrandingEntityFrom = (args: IBasicIssuerLocaleBranding): IssuerLocaleBrandingEntity => {
+  const issuerLocaleBrandingEntity: IssuerLocaleBrandingEntity = new IssuerLocaleBrandingEntity()
+  issuerLocaleBrandingEntity.alias = isEmptyString(args.alias) ? undefined : args.alias
+  issuerLocaleBrandingEntity.locale = args.locale ? args.locale : ''
+  issuerLocaleBrandingEntity.logo = args.logo ? imageAttributesEntityFrom(args.logo) : undefined
+  issuerLocaleBrandingEntity.description = isEmptyString(args.description) ? undefined : args.description
+  issuerLocaleBrandingEntity.background = args.background ? backgroundAttributesEntityFrom(args.background) : undefined
+  issuerLocaleBrandingEntity.text = args.text ? textAttributesEntityFrom(args.text) : undefined
+
+  return issuerLocaleBrandingEntity
+}

package/src/entities/issuanceBranding/TextAttributesEntity.ts

@@ -1,6 +1,7 @@
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
+import { IBasicTextAttributes } from '../../types'
 import { validate, Validate, ValidationError } from 'class-validator'
-import { IsNonEmptyStringConstraint } from '../validators'
+import { isEmptyString, IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('TextAttributes')
 export class TextAttributesEntity extends BaseEntity {
@@ -21,3 +22,10 @@ export class TextAttributesEntity extends BaseEntity {
     return
   }
 }
+
+export const textAttributesEntityFrom = (args: IBasicTextAttributes): TextAttributesEntity => {
+  const textAttributesEntity: TextAttributesEntity = new TextAttributesEntity()
+  textAttributesEntity.color = isEmptyString(args.color) ? undefined : args.color
+
+  return textAttributesEntity
+}

package/src/eventLogger/EventLoggerStore.ts

@@ -3,13 +3,12 @@ import { LoggingEventType, OrPromise } from '@sphereon/ssi-types'
 import Debug, { Debugger } from 'debug'
 import { DataSource } from 'typeorm'
 import { AbstractEventLoggerStore } from './AbstractEventLoggerStore'
-import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
 import {
   activityEventEntityFrom,
-  activityEventFrom,
-  auditEventEntityFrom,
-  auditEventFrom
-} from '../utils/eventLogger/MappingUtils'
+  AuditEventEntity,
+  auditEventEntityFrom
+} from '../entities/eventLogger/AuditEventEntity'
+import { activityEventFrom, auditEventFrom } from '../utils/eventLogger/MappingUtils'
 import {
   GetActivityEventsArgs,
   GetAuditEventsArgs,

package/src/index.ts

@@ -8,14 +8,14 @@ import { DidAuthConfigEntity } from './entities/contact/DidAuthConfigEntity'
 import { IdentityEntity } from './entities/contact/IdentityEntity'
 import { IdentityMetadataItemEntity } from './entities/contact/IdentityMetadataItemEntity'
 import { OpenIdConfigEntity } from './entities/contact/OpenIdConfigEntity'
-import { BackgroundAttributesEntity } from './entities/issuanceBranding/BackgroundAttributesEntity'
-import { CredentialBrandingEntity } from './entities/issuanceBranding/CredentialBrandingEntity'
-import { CredentialLocaleBrandingEntity } from './entities/issuanceBranding/CredentialLocaleBrandingEntity'
-import { ImageAttributesEntity } from './entities/issuanceBranding/ImageAttributesEntity'
-import { ImageDimensionsEntity } from './entities/issuanceBranding/ImageDimensionsEntity'
-import { IssuerLocaleBrandingEntity } from './entities/issuanceBranding/IssuerLocaleBrandingEntity'
-import { IssuerBrandingEntity } from './entities/issuanceBranding/IssuerBrandingEntity'
-import { TextAttributesEntity } from './entities/issuanceBranding/TextAttributesEntity'
+import { BackgroundAttributesEntity, backgroundAttributesEntityFrom } from './entities/issuanceBranding/BackgroundAttributesEntity'
+import { CredentialBrandingEntity, credentialBrandingEntityFrom } from './entities/issuanceBranding/CredentialBrandingEntity'
+import { CredentialLocaleBrandingEntity, credentialLocaleBrandingEntityFrom } from './entities/issuanceBranding/CredentialLocaleBrandingEntity'
+import { ImageAttributesEntity, imageAttributesEntityFrom } from './entities/issuanceBranding/ImageAttributesEntity'
+import { ImageDimensionsEntity, imageDimensionsEntityFrom } from './entities/issuanceBranding/ImageDimensionsEntity'
+import { IssuerLocaleBrandingEntity, issuerLocaleBrandingEntityFrom } from './entities/issuanceBranding/IssuerLocaleBrandingEntity'
+import { IssuerBrandingEntity, issuerBrandingEntityFrom } from './entities/issuanceBranding/IssuerBrandingEntity'
+import { TextAttributesEntity, textAttributesEntityFrom } from './entities/issuanceBranding/TextAttributesEntity'
 import { StatusListEntity } from './entities/statusList2021/StatusList2021Entity'
 import { StatusListEntryEntity } from './entities/statusList2021/StatusList2021EntryEntity'
 import { MachineStateInfoEntity } from './entities/machineState/MachineStateInfoEntity'
@@ -33,8 +33,10 @@ export { DigitalCredentialStore } from './digitalCredential/DigitalCredentialSto
 export { AbstractIssuanceBrandingStore } from './issuanceBranding/AbstractIssuanceBrandingStore'
 export { IssuanceBrandingStore } from './issuanceBranding/IssuanceBrandingStore'
 export { StatusListStore } from './statusList/StatusListStore'
-import { AuditEventEntity } from './entities/eventLogger/AuditEventEntity'
+import { AuditEventEntity, auditEventEntityFrom } from './entities/eventLogger/AuditEventEntity'
 import { DigitalCredentialEntity } from './entities/digitalCredential/DigitalCredentialEntity'
+import { digitalCredentialFrom, digitalCredentialsFrom, nonPersistedDigitalCredentialEntityFromAddArgs } from './utils/digitalCredential/MappingUtils'
+import { isPresentationDefinitionEqual } from './utils/presentationDefinition/MappingUtils'
 import { PresentationDefinitionItemEntity } from './entities/presentationDefinition/PresentationDefinitionItemEntity'
 import { ContactMetadataItemEntity } from './entities/contact/ContactMetadataItemEntity'
 export { AbstractEventLoggerStore } from './eventLogger/AbstractEventLoggerStore'
@@ -57,10 +59,6 @@ export {
 export * from './types'
 export * from './utils/contact/MappingUtils'
 export * from './utils/digitalCredential/MappingUtils'
-export * from './utils/eventLogger/MappingUtils'
-export * from './utils/issuanceBranding/MappingUtils'
-export * from './utils/presentationDefinition/MappingUtils'
-export * from './utils/hasher'
 
 export const DataStoreContactEntities = [
   BaseConfigEntity,
@@ -135,13 +133,28 @@ export {
   IssuerLocaleBrandingEntity,
   ElectronicAddressEntity,
   PhysicalAddressEntity,
+  backgroundAttributesEntityFrom,
+  credentialBrandingEntityFrom,
+  imageAttributesEntityFrom,
+  imageDimensionsEntityFrom,
+  issuerBrandingEntityFrom,
+  textAttributesEntityFrom,
+  issuerLocaleBrandingEntityFrom,
+  credentialLocaleBrandingEntityFrom,
   IStatusListEntity,
   IStatusListEntryEntity,
   StatusListEntity,
   StatusListEntryEntity,
   AuditEventEntity,
+  auditEventEntityFrom,
   DigitalCredentialEntity,
+  digitalCredentialFrom,
+  digitalCredentialsFrom,
+  nonPersistedDigitalCredentialEntityFromAddArgs,
   MachineStateInfoEntity,
   PresentationDefinitionItemEntity,
+  isPresentationDefinitionEqual,
   ContactMetadataItemEntity,
 }
+
+export * from './utils/hasher'

package/src/issuanceBranding/IssuanceBrandingStore.ts

@@ -1,25 +1,17 @@
-import { OrPromise } from '@sphereon/ssi-types'
 import Debug from 'debug'
 import { DataSource, DeleteResult, In, Not, Repository } from 'typeorm'
-import {
-  credentialBrandingEntityFrom,
-  credentialBrandingFrom,
-  credentialLocaleBrandingEntityFrom,
-  issuerBrandingEntityFrom,
-  issuerBrandingFrom,
-  issuerLocaleBrandingEntityFrom,
-  localeBrandingFrom
-} from '../utils/issuanceBranding/MappingUtils'
+import { OrPromise } from '@sphereon/ssi-types'
 import { BackgroundAttributesEntity } from '../entities/issuanceBranding/BackgroundAttributesEntity'
 import { ImageAttributesEntity } from '../entities/issuanceBranding/ImageAttributesEntity'
 import { ImageDimensionsEntity } from '../entities/issuanceBranding/ImageDimensionsEntity'
-import { IssuerBrandingEntity } from '../entities/issuanceBranding/IssuerBrandingEntity'
-import { CredentialBrandingEntity } from '../entities/issuanceBranding/CredentialBrandingEntity'
-import { CredentialLocaleBrandingEntity } from '../entities/issuanceBranding/CredentialLocaleBrandingEntity'
-import { IssuerLocaleBrandingEntity } from '../entities/issuanceBranding/IssuerLocaleBrandingEntity'
+import { IssuerBrandingEntity, issuerBrandingEntityFrom } from '../entities/issuanceBranding/IssuerBrandingEntity'
+import { CredentialBrandingEntity, credentialBrandingEntityFrom } from '../entities/issuanceBranding/CredentialBrandingEntity'
+import { CredentialLocaleBrandingEntity, credentialLocaleBrandingEntityFrom } from '../entities/issuanceBranding/CredentialLocaleBrandingEntity'
+import { IssuerLocaleBrandingEntity, issuerLocaleBrandingEntityFrom } from '../entities/issuanceBranding/IssuerLocaleBrandingEntity'
 import { BaseLocaleBrandingEntity } from '../entities/issuanceBranding/BaseLocaleBrandingEntity'
 import { TextAttributesEntity } from '../entities/issuanceBranding/TextAttributesEntity'
 import { AbstractIssuanceBrandingStore } from './AbstractIssuanceBrandingStore'
+import { credentialBrandingFrom, issuerBrandingFrom, localeBrandingFrom } from '../utils/issuanceBranding/MappingUtils'
 import {
   IAddCredentialBrandingArgs,
   IAddCredentialLocaleBrandingArgs,

package/src/migrations/postgres/1685628974232-CreateIssuanceBranding.ts

@@ -19,7 +19,7 @@ export class CreateIssuanceBranding1685628974232 implements MigrationInterface {
       `CREATE TABLE "TextAttributes" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "color" character varying(255), CONSTRAINT "PK_TextAttributes_id" PRIMARY KEY ("id"))`,
     )
     await queryRunner.query(
-      `CREATE TABLE "BaseLocaleBranding" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "alias" character varying(255), "locale" character varying(255) NOT NULL, "description" character varying(255), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "credentialBrandingId" uuid, "issuerBrandingId" uuid, "type" character varying NOT NULL, "logoId" uuid, "backgroundId" uuid, "textId" uuid, "client_uri" character varying, "tos_uri" character varying, "policy_uri" character varying, "contacts" character varying, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"), CONSTRAINT "PK_BaseLocaleBranding_id" PRIMARY KEY ("id"))`,
+      `CREATE TABLE "BaseLocaleBranding" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "alias" character varying(255), "locale" character varying(255) NOT NULL, "description" character varying(255), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), "credentialBrandingId" uuid, "issuerBrandingId" uuid, "type" character varying NOT NULL, "logoId" uuid, "backgroundId" uuid, "textId" uuid, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"), CONSTRAINT "PK_BaseLocaleBranding_id" PRIMARY KEY ("id"))`,
     )
     await queryRunner.query(
       `CREATE UNIQUE INDEX "IDX_CredentialLocaleBrandingEntity_credentialBranding_locale" ON "BaseLocaleBranding" ("credentialBrandingId", "locale")`,

package/src/migrations/sqlite/1685628973231-CreateIssuanceBranding.ts

@@ -13,7 +13,7 @@ export class CreateIssuanceBranding1685628973231 implements MigrationInterface {
     )
     await queryRunner.query(`CREATE TABLE "TextAttributes" ("id" varchar PRIMARY KEY NOT NULL, "color" varchar(255))`)
     await queryRunner.query(
-      `CREATE TABLE "BaseLocaleBranding" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255), "locale" varchar(255) NOT NULL, "description" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "credentialBrandingId" varchar, "issuerBrandingId" varchar, "type" varchar NOT NULL, "logoId" varchar, "backgroundId" varchar, "textId" varchar, "client_uri" varchar, "tos_uri" varchar, "policy_uri" varchar, "contacts" varchar, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"))`,
+      `CREATE TABLE "BaseLocaleBranding" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255), "locale" varchar(255) NOT NULL, "description" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "credentialBrandingId" varchar, "issuerBrandingId" varchar, "type" varchar NOT NULL, "logoId" varchar, "backgroundId" varchar, "textId" varchar, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"))`,
     )
     await queryRunner.query(
       `CREATE UNIQUE INDEX "IDX_CredentialLocaleBrandingEntity_credentialBranding_locale" ON "BaseLocaleBranding" ("credentialBrandingId", "locale")`,
@@ -51,7 +51,7 @@ export class CreateIssuanceBranding1685628973231 implements MigrationInterface {
     await queryRunner.query(`DROP INDEX "IDX_IssuerLocaleBrandingEntity_issuerBranding_locale"`)
     await queryRunner.query(`DROP INDEX "IDX_BaseLocaleBranding_type"`)
     await queryRunner.query(
-      `CREATE TABLE "temporary_BaseLocaleBranding" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255), "locale" varchar(255) NOT NULL, "description" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "credentialBrandingId" varchar, "issuerBrandingId" varchar, "type" varchar NOT NULL, "logoId" varchar, "backgroundId" varchar, "textId" varchar, "client_uri" varchar, "tos_uri" varchar, "policy_uri" varchar, "contacts" varchar, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"), CONSTRAINT "FK_BaseLocaleBranding_logoId" FOREIGN KEY ("logoId") REFERENCES "ImageAttributes" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_backgroundId" FOREIGN KEY ("backgroundId") REFERENCES "BackgroundAttributes" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_textId" FOREIGN KEY ("textId") REFERENCES "TextAttributes" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_credentialBrandingId" FOREIGN KEY ("credentialBrandingId") REFERENCES "CredentialBranding" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_issuerBrandingId" FOREIGN KEY ("issuerBrandingId") REFERENCES "IssuerBranding" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`,
+      `CREATE TABLE "temporary_BaseLocaleBranding" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255), "locale" varchar(255) NOT NULL, "description" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "credentialBrandingId" varchar, "issuerBrandingId" varchar, "type" varchar NOT NULL, "logoId" varchar, "backgroundId" varchar, "textId" varchar, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"), CONSTRAINT "FK_BaseLocaleBranding_logoId" FOREIGN KEY ("logoId") REFERENCES "ImageAttributes" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_backgroundId" FOREIGN KEY ("backgroundId") REFERENCES "BackgroundAttributes" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_textId" FOREIGN KEY ("textId") REFERENCES "TextAttributes" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_credentialBrandingId" FOREIGN KEY ("credentialBrandingId") REFERENCES "CredentialBranding" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_BaseLocaleBranding_issuerBrandingId" FOREIGN KEY ("issuerBrandingId") REFERENCES "IssuerBranding" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`,
     )
     await queryRunner.query(
       `INSERT INTO "temporary_BaseLocaleBranding"("id", "alias", "locale", "description", "created_at", "last_updated_at", "credentialBrandingId", "issuerBrandingId", "type", "logoId", "backgroundId", "textId") SELECT "id", "alias", "locale", "description", "created_at", "last_updated_at", "credentialBrandingId", "issuerBrandingId", "type", "logoId", "backgroundId", "textId" FROM "BaseLocaleBranding"`,
@@ -73,7 +73,7 @@ export class CreateIssuanceBranding1685628973231 implements MigrationInterface {
     await queryRunner.query(`DROP INDEX "IDX_CredentialLocaleBrandingEntity_credentialBranding_locale"`)
     await queryRunner.query(`ALTER TABLE "BaseLocaleBranding" RENAME TO "temporary_BaseLocaleBranding"`)
     await queryRunner.query(
-      `CREATE TABLE "BaseLocaleBranding" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255), "locale" varchar(255) NOT NULL, "description" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "credentialBrandingId" varchar, "issuerBrandingId" varchar, "type" varchar NOT NULL, "logoId" varchar, "backgroundId" varchar, "textId" varchar, "client_uri" varchar, "tos_uri" varchar, "policy_uri" varchar, "contacts" varchar, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"))`,
+      `CREATE TABLE "BaseLocaleBranding" ("id" varchar PRIMARY KEY NOT NULL, "alias" varchar(255), "locale" varchar(255) NOT NULL, "description" varchar(255), "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), "credentialBrandingId" varchar, "issuerBrandingId" varchar, "type" varchar NOT NULL, "logoId" varchar, "backgroundId" varchar, "textId" varchar, CONSTRAINT "UQ_logoId" UNIQUE ("logoId"), CONSTRAINT "UQ_backgroundId" UNIQUE ("backgroundId"), CONSTRAINT "UQ_textId" UNIQUE ("textId"))`,
     )
     await queryRunner.query(
       `INSERT INTO "BaseLocaleBranding"("id", "alias", "locale", "description", "created_at", "last_updated_at", "credentialBrandingId", "issuerBrandingId", "type", "logoId", "backgroundId", "textId") SELECT "id", "alias", "locale", "description", "created_at", "last_updated_at", "credentialBrandingId", "issuerBrandingId", "type", "logoId", "backgroundId", "textId" FROM "BaseLocaleBranding"`,

package/src/types/issuanceBranding/issuanceBranding.ts

@@ -80,23 +80,17 @@ export interface IPartialCredentialBranding extends Partial<Omit<ICredentialBran
   localeBranding?: IPartialCredentialLocaleBranding
 }
 
-export interface IIssuerLocaleBranding extends ILocaleBranding {
-  clientUri?: string
-  tosUri?: string
-  policyUri?: string
-  contacts?: Array<string>
-}
+export interface IIssuerLocaleBranding extends ILocaleBranding {}
 export interface IBasicIssuerLocaleBranding
   extends Omit<IIssuerLocaleBranding, 'id' | 'createdAt' | 'lastUpdatedAt' | 'logo' | 'background' | 'text'> {
   logo?: IBasicImageAttributes
   background?: IBasicBackgroundAttributes
   text?: IBasicTextAttributes
 }
-export interface IPartialIssuerLocaleBranding extends Partial<Omit<IIssuerLocaleBranding, 'logo' | 'background' | 'text' | 'contacts'>> {
+export interface IPartialIssuerLocaleBranding extends Partial<Omit<IIssuerLocaleBranding, 'logo' | 'background' | 'text'>> {
   logo?: IPartialImageAttributes
   background?: IPartialBackgroundAttributes
   text?: IPartialTextAttributes
-  contacts?: string
 }
 
 export interface IIssuerBranding {
@@ -109,7 +103,7 @@ export interface IIssuerBranding {
 export interface IBasicIssuerBranding extends Omit<IIssuerBranding, 'id' | 'createdAt' | 'lastUpdatedAt' | 'localeBranding'> {
   localeBranding: Array<IBasicIssuerLocaleBranding>
 }
-export interface IPartialIssuerBranding extends Partial<Omit<IIssuerBranding, 'localeBranding'>> {
+export interface IPartialIssuerBranding extends Partial<Omit<ICredentialBranding, 'localeBranding'>> {
   localeBranding?: IPartialIssuerLocaleBranding
 }
 

package/src/utils/eventLogger/MappingUtils.ts

@@ -1,8 +1,7 @@
+import { AuditEventEntity } from '../../entities/eventLogger/AuditEventEntity'
 import { ActivityLoggingEvent, AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
 import { LoggingEventType } from '@sphereon/ssi-types'
 import { replaceNullWithUndefined } from '../FormattingUtils'
-import { AuditEventEntity } from '../../entities/eventLogger/AuditEventEntity'
-import { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../../types'
 
 export const auditEventFrom = (event: AuditEventEntity): AuditLoggingEvent => {
   const result: AuditLoggingEvent = {
@@ -30,32 +29,8 @@ export const auditEventFrom = (event: AuditEventEntity): AuditLoggingEvent => {
   return replaceNullWithUndefined(result)
 }
 
-export const auditEventEntityFrom = (args: NonPersistedAuditLoggingEvent): AuditEventEntity => {
-  const auditEventEntity: AuditEventEntity = new AuditEventEntity()
-  auditEventEntity.type = LoggingEventType.AUDIT
-  auditEventEntity.timestamp = args.timestamp
-  auditEventEntity.level = args.level
-  auditEventEntity.correlationId = args.correlationId
-  auditEventEntity.system = args.system
-  auditEventEntity.subSystemType = args.subSystemType
-  auditEventEntity.actionType = args.actionType
-  auditEventEntity.actionSubType = args.actionSubType
-  auditEventEntity.initiatorType = args.initiatorType
-  auditEventEntity.systemCorrelationIdType = args.systemCorrelationIdType
-  auditEventEntity.systemCorrelationId = args.systemCorrelationId
-  auditEventEntity.systemAlias = args.systemAlias
-  auditEventEntity.partyCorrelationType = args.partyCorrelationType
-  auditEventEntity.partyCorrelationId = args.partyCorrelationId
-  auditEventEntity.partyAlias = args.partyAlias
-  auditEventEntity.description = args.description
-  auditEventEntity.partyCorrelationType = args.partyCorrelationType
-  auditEventEntity.data = JSON.stringify(args.data)
-  auditEventEntity.diagnosticData = JSON.stringify(args.diagnosticData)
-
-  return auditEventEntity
-}
-
 export const activityEventFrom = (event: AuditEventEntity): ActivityLoggingEvent => {
+
   const result: ActivityLoggingEvent =  {
     id: event.id,
     type: LoggingEventType.ACTIVITY,
@@ -84,33 +59,3 @@ export const activityEventFrom = (event: AuditEventEntity): ActivityLoggingEvent
 
   return replaceNullWithUndefined(result)
 }
-
-export const activityEventEntityFrom = (args: NonPersistedActivityLoggingEvent): AuditEventEntity => {
-  const activityEventEntity: AuditEventEntity = new AuditEventEntity()
-  activityEventEntity.type = LoggingEventType.ACTIVITY
-  activityEventEntity.timestamp = args.timestamp
-  activityEventEntity.level = args.level
-  activityEventEntity.correlationId = args.correlationId
-  activityEventEntity.system = args.system
-  activityEventEntity.subSystemType = args.subSystemType
-  activityEventEntity.actionType = args.actionType
-  activityEventEntity.actionSubType = args.actionSubType
-  activityEventEntity.initiatorType = args.initiatorType
-  activityEventEntity.systemCorrelationIdType = args.systemCorrelationIdType
-  activityEventEntity.systemCorrelationId = args.systemCorrelationId
-  activityEventEntity.systemAlias = args.systemAlias
-  activityEventEntity.partyCorrelationType = args.partyCorrelationType
-  activityEventEntity.partyCorrelationId = args.partyCorrelationId
-  activityEventEntity.partyAlias = args.partyAlias
-  activityEventEntity.description = args.description
-  activityEventEntity.partyCorrelationType = args.partyCorrelationType
-  activityEventEntity.data = JSON.stringify(args.data)
-  activityEventEntity.sharePurpose = args.sharePurpose
-  activityEventEntity.credentialType = args.credentialType
-  activityEventEntity.originalCredential = args.originalCredential
-  activityEventEntity.credentialHash = args.credentialHash
-  activityEventEntity.parentCredentialHash = args.parentCredentialHash
-  activityEventEntity.diagnosticData = JSON.stringify(args.diagnosticData)
-
-  return activityEventEntity
-}

package/src/utils/issuanceBranding/MappingUtils.ts

@@ -1,27 +1,8 @@
-import { replaceNullWithUndefined } from '../FormattingUtils'
-import { isEmptyString } from '../../entities/validators'
 import { CredentialBrandingEntity } from '../../entities/issuanceBranding/CredentialBrandingEntity'
 import { BaseLocaleBrandingEntity } from '../../entities/issuanceBranding/BaseLocaleBrandingEntity'
 import { IssuerBrandingEntity } from '../../entities/issuanceBranding/IssuerBrandingEntity'
-import { ImageAttributesEntity } from '../../entities/issuanceBranding/ImageAttributesEntity'
-import { BackgroundAttributesEntity } from '../../entities/issuanceBranding/BackgroundAttributesEntity'
-import { TextAttributesEntity } from '../../entities/issuanceBranding/TextAttributesEntity'
-import { IssuerLocaleBrandingEntity } from '../../entities/issuanceBranding/IssuerLocaleBrandingEntity'
-import { CredentialLocaleBrandingEntity } from '../../entities/issuanceBranding/CredentialLocaleBrandingEntity'
-import { ImageDimensionsEntity } from '../../entities/issuanceBranding/ImageDimensionsEntity'
-import {
-  IBasicBackgroundAttributes,
-  IBasicCredentialBranding,
-  IBasicCredentialLocaleBranding,
-  IBasicImageAttributes,
-  IBasicImageDimensions,
-  IBasicIssuerBranding,
-  IBasicIssuerLocaleBranding,
-  IBasicTextAttributes,
-  ICredentialBranding,
-  IIssuerBranding,
-  ILocaleBranding
-} from '../../types'
+import { replaceNullWithUndefined } from '../FormattingUtils'
+import { ICredentialBranding, IIssuerBranding, ILocaleBranding } from '../../types'
 
 export const credentialBrandingFrom = (credentialBranding: CredentialBrandingEntity): ICredentialBranding => {
   const result: ICredentialBranding = {
@@ -49,87 +30,3 @@ export const localeBrandingFrom = (localeBranding: BaseLocaleBrandingEntity): IL
 
   return replaceNullWithUndefined(result)
 }
-
-
-export const issuerLocaleBrandingEntityFrom = (args: IBasicIssuerLocaleBranding): IssuerLocaleBrandingEntity => {
-  const issuerLocaleBrandingEntity: IssuerLocaleBrandingEntity = new IssuerLocaleBrandingEntity()
-  issuerLocaleBrandingEntity.alias = isEmptyString(args.alias) ? undefined : args.alias
-  issuerLocaleBrandingEntity.locale = args.locale ? args.locale : ''
-  issuerLocaleBrandingEntity.logo = args.logo ? imageAttributesEntityFrom(args.logo) : undefined
-  issuerLocaleBrandingEntity.description = isEmptyString(args.description) ? undefined : args.description
-  issuerLocaleBrandingEntity.background = args.background ? backgroundAttributesEntityFrom(args.background) : undefined
-  issuerLocaleBrandingEntity.text = args.text ? textAttributesEntityFrom(args.text) : undefined
-  issuerLocaleBrandingEntity.clientUri = isEmptyString(args.clientUri) ? undefined : args.clientUri
-  issuerLocaleBrandingEntity.tosUri = isEmptyString(args.tosUri) ? undefined : args.tosUri
-  issuerLocaleBrandingEntity.policyUri = isEmptyString(args.policyUri) ? undefined : args.policyUri
-  issuerLocaleBrandingEntity.contacts = args.contacts
-
-  return issuerLocaleBrandingEntity
-}
-
-export const backgroundAttributesEntityFrom = (args: IBasicBackgroundAttributes): BackgroundAttributesEntity => {
-  const backgroundAttributesEntity: BackgroundAttributesEntity = new BackgroundAttributesEntity()
-  backgroundAttributesEntity.color = isEmptyString(args.color) ? undefined : args.color
-  backgroundAttributesEntity.image = args.image ? imageAttributesEntityFrom(args.image) : undefined
-
-  return backgroundAttributesEntity
-}
-
-export const credentialBrandingEntityFrom = (args: IBasicCredentialBranding): CredentialBrandingEntity => {
-  const credentialBrandingEntity: CredentialBrandingEntity = new CredentialBrandingEntity()
-  credentialBrandingEntity.issuerCorrelationId = args.issuerCorrelationId
-  credentialBrandingEntity.vcHash = args.vcHash
-  credentialBrandingEntity.localeBranding = args.localeBranding.map((localeBranding: IBasicCredentialLocaleBranding) =>
-    credentialLocaleBrandingEntityFrom(localeBranding),
-  )
-
-  return credentialBrandingEntity
-}
-
-export const credentialLocaleBrandingEntityFrom = (args: IBasicCredentialLocaleBranding): CredentialLocaleBrandingEntity => {
-  const credentialLocaleBrandingEntity: CredentialLocaleBrandingEntity = new CredentialLocaleBrandingEntity()
-  credentialLocaleBrandingEntity.alias = isEmptyString(args.alias) ? undefined : args.alias
-  credentialLocaleBrandingEntity.locale = args.locale ? args.locale : ''
-  credentialLocaleBrandingEntity.logo = args.logo ? imageAttributesEntityFrom(args.logo) : undefined
-  credentialLocaleBrandingEntity.description = isEmptyString(args.description) ? undefined : args.description
-  credentialLocaleBrandingEntity.background = args.background ? backgroundAttributesEntityFrom(args.background) : undefined
-  credentialLocaleBrandingEntity.text = args.text ? textAttributesEntityFrom(args.text) : undefined
-
-  return credentialLocaleBrandingEntity
-}
-
-export const imageAttributesEntityFrom = (args: IBasicImageAttributes): ImageAttributesEntity => {
-  const imageAttributesEntity: ImageAttributesEntity = new ImageAttributesEntity()
-  imageAttributesEntity.uri = isEmptyString(args.uri) ? undefined : args.uri
-  imageAttributesEntity.dataUri = isEmptyString(args.dataUri) ? undefined : args.dataUri
-  imageAttributesEntity.mediaType = isEmptyString(args.mediaType) ? undefined : args.mediaType
-  imageAttributesEntity.alt = isEmptyString(args.alt) ? undefined : args.alt
-  imageAttributesEntity.dimensions = args.dimensions ? imageDimensionsEntityFrom(args.dimensions) : undefined
-
-  return imageAttributesEntity
-}
-
-export const imageDimensionsEntityFrom = (args: IBasicImageDimensions): ImageDimensionsEntity => {
-  const imageDimensionsEntity: ImageDimensionsEntity = new ImageDimensionsEntity()
-  imageDimensionsEntity.width = args.width
-  imageDimensionsEntity.height = args.height
-
-  return imageDimensionsEntity
-}
-
-export const issuerBrandingEntityFrom = (args: IBasicIssuerBranding): IssuerBrandingEntity => {
-  const issuerBrandingEntity: IssuerBrandingEntity = new IssuerBrandingEntity()
-  issuerBrandingEntity.issuerCorrelationId = args.issuerCorrelationId
-  issuerBrandingEntity.localeBranding = args.localeBranding.map((localeBranding: IBasicIssuerLocaleBranding) =>
-    issuerLocaleBrandingEntityFrom(localeBranding),
-  )
-
-  return issuerBrandingEntity
-}
-
-export const textAttributesEntityFrom = (args: IBasicTextAttributes): TextAttributesEntity => {
-  const textAttributesEntity: TextAttributesEntity = new TextAttributesEntity()
-  textAttributesEntity.color = isEmptyString(args.color) ? undefined : args.color
-
-  return textAttributesEntity
-}