@sphereon/ssi-sdk.data-store 0.30.2-feature.SPRIND.61.JARM.pex.fixes.39 → 0.30.2-feature.SPRIND.77.133

package/src/entities/issuanceBranding/BackgroundAttributesEntity.ts

@@ -1,8 +1,7 @@
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { IBasicBackgroundAttributes } from '../../types'
-import { ImageAttributesEntity, imageAttributesEntityFrom } from './ImageAttributesEntity'
+import { ImageAttributesEntity } from './ImageAttributesEntity'
 import { validate, Validate, ValidationError } from 'class-validator'
-import { isEmptyString, IsNonEmptyStringConstraint } from '../validators'
+import { IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('BackgroundAttributes')
 export class BackgroundAttributesEntity extends BaseEntity {
@@ -32,11 +31,3 @@ export class BackgroundAttributesEntity extends BaseEntity {
     return
   }
 }
-
-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
-}

package/src/entities/issuanceBranding/CredentialBrandingEntity.ts

@@ -12,8 +12,7 @@ import {
 } from 'typeorm'
 import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { CredentialLocaleBrandingEntity, credentialLocaleBrandingEntityFrom } from './CredentialLocaleBrandingEntity'
-import { IBasicCredentialBranding, IBasicCredentialLocaleBranding } from '../../types'
+import { CredentialLocaleBrandingEntity } from './CredentialLocaleBrandingEntity'
 
 @Entity('CredentialBranding')
 @Index('IDX_CredentialBrandingEntity_vcHash', ['vcHash'])
@@ -66,14 +65,3 @@ export class CredentialBrandingEntity extends BaseEntity {
     return
   }
 }
-
-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
-}

package/src/entities/issuanceBranding/CredentialLocaleBrandingEntity.ts

@@ -1,11 +1,6 @@
 import { ChildEntity, Column, JoinColumn, ManyToOne, Index } from 'typeorm'
-import { IBasicCredentialLocaleBranding } from '../../types'
-import { backgroundAttributesEntityFrom } from './BackgroundAttributesEntity'
 import { CredentialBrandingEntity } from './CredentialBrandingEntity'
-import { imageAttributesEntityFrom } from './ImageAttributesEntity'
 import { BaseLocaleBrandingEntity } from './BaseLocaleBrandingEntity'
-import { textAttributesEntityFrom } from './TextAttributesEntity'
-import { isEmptyString } from '../validators'
 
 @ChildEntity('CredentialLocaleBranding')
 @Index('IDX_CredentialLocaleBrandingEntity_credentialBranding_locale', ['credentialBranding', 'locale'], { unique: true })
@@ -19,15 +14,3 @@ export class CredentialLocaleBrandingEntity extends BaseLocaleBrandingEntity {
   @Column('text', { name: 'credentialBrandingId', nullable: false })
   credentialBrandingId!: string
 }
-
-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
-}

package/src/entities/issuanceBranding/ImageAttributesEntity.ts

@@ -1,8 +1,7 @@
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { IBasicImageAttributes } from '../../types'
-import { ImageDimensionsEntity, imageDimensionsEntityFrom } from './ImageDimensionsEntity'
+import { ImageDimensionsEntity } from './ImageDimensionsEntity'
 import { validate, Validate, ValidationError } from 'class-validator'
-import { isEmptyString, IsNonEmptyStringConstraint } from '../validators'
+import { IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('ImageAttributes')
 export class ImageAttributesEntity extends BaseEntity {
@@ -44,14 +43,3 @@ 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,5 +1,4 @@
 import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
-import { IBasicImageDimensions } from '../../types'
 
 @Entity('ImageDimensions')
 export class ImageDimensionsEntity extends BaseEntity {
@@ -12,11 +11,3 @@ 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,8 +12,7 @@ import {
 } from 'typeorm'
 import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { IssuerLocaleBrandingEntity, issuerLocaleBrandingEntityFrom } from './IssuerLocaleBrandingEntity'
-import { IBasicIssuerBranding, IBasicIssuerLocaleBranding } from '../../types'
+import { IssuerLocaleBrandingEntity } from './IssuerLocaleBrandingEntity'
 
 @Entity('IssuerBranding')
 @Index('IDX_IssuerBrandingEntity_issuerCorrelationId', ['issuerCorrelationId'])
@@ -61,13 +60,3 @@ 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,11 +1,8 @@
 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 { textAttributesEntityFrom } from './TextAttributesEntity'
-import { isEmptyString } from '../validators'
+import { IsNonEmptyStringConstraint } from '../validators'
+import { Validate } from 'class-validator'
 
 @ChildEntity('IssuerLocaleBranding')
 @Index('IDX_IssuerLocaleBrandingEntity_issuerBranding_locale', ['issuerBranding', 'locale'], { unique: true })
@@ -16,18 +13,21 @@ export class IssuerLocaleBrandingEntity extends BaseLocaleBrandingEntity {
   @JoinColumn({ name: 'issuerBrandingId' })
   issuerBranding!: IssuerBrandingEntity
 
-  @Column('text', { name: 'issuerBrandingId', nullable: false })
-  issuerBrandingId!: string
-}
+  @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
 
-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
+  @Column('text', { name: 'policy_uri', nullable: true, unique: false })
+  @Validate(IsNonEmptyStringConstraint, { message: 'Blank policy uris are not allowed' })
+  policyUri?: string
 
-  return issuerLocaleBrandingEntity
+  @Column('simple-array', { name: 'contacts', nullable: true, unique: false })
+  contacts?: Array<string>
+
+  @Column('text', { name: 'issuerBrandingId', nullable: false })
+  issuerBrandingId!: string
 }

package/src/entities/issuanceBranding/TextAttributesEntity.ts

@@ -1,7 +1,6 @@
 import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
-import { IBasicTextAttributes } from '../../types'
 import { validate, Validate, ValidationError } from 'class-validator'
-import { isEmptyString, IsNonEmptyStringConstraint } from '../validators'
+import { IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('TextAttributes')
 export class TextAttributesEntity extends BaseEntity {
@@ -22,10 +21,3 @@ 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/AbstractEventLoggerStore.ts

@@ -1,7 +1,14 @@
-import { GetAuditEventsArgs, StoreAuditEventArgs } from '../types'
-import { AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
+import { ActivityLoggingEvent, AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
+import {
+  GetActivityEventsArgs,
+  GetAuditEventsArgs,
+  StoreActivityEventArgs,
+  StoreAuditEventArgs
+} from '../types'
 
 export abstract class AbstractEventLoggerStore {
   abstract getAuditEvents(args: GetAuditEventsArgs): Promise<Array<AuditLoggingEvent>>
+  abstract getActivityEvents(args: GetActivityEventsArgs): Promise<Array<ActivityLoggingEvent>>
   abstract storeAuditEvent(args: StoreAuditEventArgs): Promise<AuditLoggingEvent>
+  abstract storeActivityEvent(args: StoreActivityEventArgs): Promise<ActivityLoggingEvent>
 }

package/src/eventLogger/EventLoggerStore.ts

@@ -1,10 +1,21 @@
+import { ActivityLoggingEvent, AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
+import { LoggingEventType, OrPromise } from '@sphereon/ssi-types'
 import Debug, { Debugger } from 'debug'
 import { DataSource } from 'typeorm'
-import { AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
-import { OrPromise } from '@sphereon/ssi-types'
 import { AbstractEventLoggerStore } from './AbstractEventLoggerStore'
-import { AuditEventEntity, auditEventEntityFrom } from '../entities/eventLogger/AuditEventEntity'
-import { GetAuditEventsArgs, StoreAuditEventArgs } from '../types'
+import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
+import {
+  activityEventEntityFrom,
+  activityEventFrom,
+  auditEventEntityFrom,
+  auditEventFrom
+} from '../utils/eventLogger/MappingUtils'
+import {
+  GetActivityEventsArgs,
+  GetAuditEventsArgs,
+  StoreActivityEventArgs,
+  StoreAuditEventArgs
+} from '../types'
 
 const debug: Debugger = Debug('sphereon:ssi-sdk:event-store')
 
@@ -17,46 +28,58 @@ export class EventLoggerStore extends AbstractEventLoggerStore {
   }
 
   getAuditEvents = async (args?: GetAuditEventsArgs): Promise<Array<AuditLoggingEvent>> => {
-    const connection: DataSource = await this.dbConnection // TODO apply everywhere
+    const { filter = [] } = args ?? {}
+
+    const auditEventsFilter = filter.map((item) => ({ ...item, type: LoggingEventType.AUDIT }))
+    if (auditEventsFilter.length === 0) {
+      auditEventsFilter.push({ type: LoggingEventType.AUDIT })
+    }
+
+    const connection = await this.dbConnection
     debug('Getting audit events', args)
-    const result: Array<AuditEventEntity> = await connection.getRepository(AuditEventEntity).find({
-      ...(args?.filter && { where: args?.filter }),
+    const result = await connection.getRepository(AuditEventEntity).find({
+      where: auditEventsFilter
     })
 
-    return result.map((event: AuditEventEntity) => this.auditEventFrom(event))
+    return result.map((event: AuditEventEntity) => auditEventFrom(event))
   }
 
   storeAuditEvent = async (args: StoreAuditEventArgs): Promise<AuditLoggingEvent> => {
     const { event } = args
 
-    const auditEventEntity: AuditEventEntity = auditEventEntityFrom(event)
-    const connection: DataSource = await this.dbConnection
+    const auditEventEntity = auditEventEntityFrom(event)
+    const connection = await this.dbConnection
     debug('Storing audit event', auditEventEntity)
-    const createdResult: AuditEventEntity = await connection.getRepository(AuditEventEntity).save(auditEventEntity)
+    const createdResult = await connection.getRepository(AuditEventEntity).save(auditEventEntity)
 
-    return this.auditEventFrom(createdResult)
+    return auditEventFrom(createdResult)
   }
 
-  private auditEventFrom = (event: AuditEventEntity): AuditLoggingEvent => {
-    return {
-      id: event.id,
-      description: event.description,
-      timestamp: event.timestamp,
-      level: event.level,
-      correlationId: event.correlationId,
-      actionType: event.actionType,
-      actionSubType: event.actionSubType,
-      initiatorType: event.initiatorType,
-      partyAlias: event.partyAlias,
-      partyCorrelationId: event.partyCorrelationId,
-      partyCorrelationType: event.partyCorrelationType,
-      subSystemType: event.subSystemType,
-      system: event.system,
-      systemAlias: event.systemAlias,
-      systemCorrelationId: event.systemCorrelationId,
-      systemCorrelationIdType: event.systemCorrelationIdType,
-      ...(event.data && { data: JSON.parse(event.data) }),
-      ...(event.diagnosticData && { diagnosticData: JSON.parse(event.diagnosticData) }),
+  getActivityEvents = async (args?: GetActivityEventsArgs): Promise<Array<ActivityLoggingEvent>> => {
+    const { filter = [] } = args ?? {}
+
+    const activityEventsFilter = filter.map((item) => ({ ...item, type: LoggingEventType.ACTIVITY }))
+    if (activityEventsFilter.length === 0) {
+      activityEventsFilter.push({ type: LoggingEventType.ACTIVITY })
     }
+
+    const connection = await this.dbConnection
+    debug('Getting activity events', args)
+    const result = await connection.getRepository(AuditEventEntity).find({
+      where: activityEventsFilter
+    })
+
+    return result.map((event: AuditEventEntity) => activityEventFrom(event))
+  }
+
+  storeActivityEvent = async (args: StoreActivityEventArgs): Promise<ActivityLoggingEvent> => {
+    const { event } = args
+
+    const activityEventEntity = activityEventEntityFrom(event)
+    const connection = await this.dbConnection
+    debug('Storing activity event', activityEventEntity)
+    const createdResult = await connection.getRepository(AuditEventEntity).save(activityEventEntity)
+
+    return activityEventFrom(createdResult)
   }
 }

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, 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 { 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 { StatusListEntity } from './entities/statusList2021/StatusList2021Entity'
 import { StatusListEntryEntity } from './entities/statusList2021/StatusList2021EntryEntity'
 import { MachineStateInfoEntity } from './entities/machineState/MachineStateInfoEntity'
@@ -33,10 +33,8 @@ export { DigitalCredentialStore } from './digitalCredential/DigitalCredentialSto
 export { AbstractIssuanceBrandingStore } from './issuanceBranding/AbstractIssuanceBrandingStore'
 export { IssuanceBrandingStore } from './issuanceBranding/IssuanceBrandingStore'
 export { StatusListStore } from './statusList/StatusListStore'
-import { AuditEventEntity, auditEventEntityFrom } from './entities/eventLogger/AuditEventEntity'
+import { AuditEventEntity } 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'
@@ -59,6 +57,10 @@ 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,
@@ -133,28 +135,13 @@ 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,13 +1,22 @@
+import { OrPromise } from '@sphereon/ssi-types'
 import Debug from 'debug'
 import { DataSource, DeleteResult, In, Not, Repository } from 'typeorm'
-import { OrPromise } from '@sphereon/ssi-types'
+import {
+  credentialBrandingEntityFrom,
+  credentialBrandingFrom,
+  credentialLocaleBrandingEntityFrom,
+  issuerBrandingEntityFrom,
+  issuerBrandingFrom,
+  issuerLocaleBrandingEntityFrom,
+  localeBrandingFrom
+} from '../utils/issuanceBranding/MappingUtils'
 import { BackgroundAttributesEntity } from '../entities/issuanceBranding/BackgroundAttributesEntity'
 import { ImageAttributesEntity } from '../entities/issuanceBranding/ImageAttributesEntity'
 import { ImageDimensionsEntity } from '../entities/issuanceBranding/ImageDimensionsEntity'
-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 { IssuerBrandingEntity } from '../entities/issuanceBranding/IssuerBrandingEntity'
+import { CredentialBrandingEntity } from '../entities/issuanceBranding/CredentialBrandingEntity'
+import { CredentialLocaleBrandingEntity } from '../entities/issuanceBranding/CredentialLocaleBrandingEntity'
+import { IssuerLocaleBrandingEntity } from '../entities/issuanceBranding/IssuerLocaleBrandingEntity'
 import { BaseLocaleBrandingEntity } from '../entities/issuanceBranding/BaseLocaleBrandingEntity'
 import { TextAttributesEntity } from '../entities/issuanceBranding/TextAttributesEntity'
 import { AbstractIssuanceBrandingStore } from './AbstractIssuanceBrandingStore'
@@ -30,7 +39,6 @@ import {
   IIssuerBrandingFilter,
   IIssuerLocaleBranding,
   IIssuerLocaleBrandingFilter,
-  ILocaleBranding,
   IRemoveCredentialBrandingArgs,
   IRemoveCredentialLocaleBrandingArgs,
   IRemoveIssuerBrandingArgs,
@@ -71,7 +79,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Adding credential branding', credentialBrandingEntity)
     const createdResult: CredentialBrandingEntity = await repository.save(credentialBrandingEntity)
 
-    return this.credentialBrandingFrom(createdResult)
+    return credentialBrandingFrom(createdResult)
   }
 
   public getCredentialBranding = async (args?: IGetCredentialBrandingArgs): Promise<Array<ICredentialBranding>> => {
@@ -89,7 +97,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       ...(filter && { where: filter }),
     })
 
-    return result.map((credentialBranding: CredentialBrandingEntity) => this.credentialBrandingFrom(credentialBranding))
+    return result.map((credentialBranding: CredentialBrandingEntity) => credentialBrandingFrom(credentialBranding))
   }
 
   public removeCredentialBranding = async (args: IRemoveCredentialBrandingArgs): Promise<void> => {
@@ -133,7 +141,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating credential branding', branding)
     const result: CredentialBrandingEntity = await repository.save(branding, { transaction: true })
 
-    return this.credentialBrandingFrom(result)
+    return credentialBrandingFrom(result)
   }
 
   public addCredentialLocaleBranding = async (args: IAddCredentialLocaleBrandingArgs): Promise<ICredentialBranding> => {
@@ -188,7 +196,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       return Promise.reject(Error('Unable to get updated credential branding'))
     }
 
-    return this.credentialBrandingFrom(result)
+    return credentialBrandingFrom(result)
   }
 
   public getCredentialLocaleBranding = async (args?: IGetCredentialLocaleBrandingArgs): Promise<Array<ICredentialLocaleBranding>> => {
@@ -210,8 +218,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
 
     return credentialBrandingLocale
       ? credentialBrandingLocale.map(
-          (credentialLocaleBranding: CredentialLocaleBrandingEntity) =>
-            this.localeBrandingFrom(credentialLocaleBranding) as ICredentialLocaleBranding,
+          (credentialLocaleBranding: CredentialLocaleBrandingEntity) => localeBrandingFrom(credentialLocaleBranding) as ICredentialLocaleBranding,
         )
       : []
   }
@@ -259,7 +266,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating credential locale branding', localeBranding)
     const updatedResult: CredentialLocaleBrandingEntity = await repository.save(localeBranding, { transaction: true })
 
-    return this.localeBrandingFrom(updatedResult) as ICredentialLocaleBranding
+    return localeBrandingFrom(updatedResult) as ICredentialLocaleBranding
   }
 
   public addIssuerBranding = async (args: IAddIssuerBrandingArgs): Promise<IIssuerBranding> => {
@@ -281,7 +288,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Adding issuer branding', issuerBrandingEntity)
     const createdResult: IssuerBrandingEntity = await repository.save(issuerBrandingEntity)
 
-    return this.issuerBrandingFrom(createdResult)
+    return issuerBrandingFrom(createdResult)
   }
 
   public getIssuerBranding = async (args?: IGetIssuerBrandingArgs): Promise<Array<IIssuerBranding>> => {
@@ -299,7 +306,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       ...(filter && { where: filter }),
     })
 
-    return result.map((issuerBranding: IssuerBrandingEntity) => this.issuerBrandingFrom(issuerBranding))
+    return result.map((issuerBranding: IssuerBrandingEntity) => issuerBrandingFrom(issuerBranding))
   }
 
   public removeIssuerBranding = async (args: IRemoveIssuerBrandingArgs): Promise<void> => {
@@ -343,7 +350,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating issuer branding', branding)
     const result: IssuerBrandingEntity = await repository.save(branding, { transaction: true })
 
-    return this.issuerBrandingFrom(result)
+    return issuerBrandingFrom(result)
   }
 
   public addIssuerLocaleBranding = async (args: IAddIssuerLocaleBrandingArgs): Promise<IIssuerBranding> => {
@@ -394,7 +401,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
       return Promise.reject(Error('Unable to get updated issuer branding'))
     }
 
-    return this.issuerBrandingFrom(result)
+    return issuerBrandingFrom(result)
   }
 
   public getIssuerLocaleBranding = async (args?: IGetIssuerLocaleBrandingArgs): Promise<Array<IIssuerLocaleBranding>> => {
@@ -416,7 +423,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
 
     return issuerLocaleBranding
       ? issuerLocaleBranding.map(
-          (issuerLocaleBranding: IssuerLocaleBrandingEntity) => this.localeBrandingFrom(issuerLocaleBranding) as IIssuerLocaleBranding,
+          (issuerLocaleBranding: IssuerLocaleBrandingEntity) => localeBrandingFrom(issuerLocaleBranding) as IIssuerLocaleBranding,
         )
       : []
   }
@@ -462,56 +469,7 @@ export class IssuanceBrandingStore extends AbstractIssuanceBrandingStore {
     debug('Updating issuer locale branding', localeBranding)
     const updatedResult: IssuerLocaleBrandingEntity = await repository.save(localeBranding, { transaction: true })
 
-    return this.localeBrandingFrom(updatedResult) as IIssuerLocaleBranding
-  }
-
-  private credentialBrandingFrom = (credentialBranding: CredentialBrandingEntity): ICredentialBranding => {
-    const result: ICredentialBranding = {
-      ...credentialBranding,
-      localeBranding: credentialBranding.localeBranding.map((localeBranding: BaseLocaleBrandingEntity) => this.localeBrandingFrom(localeBranding)),
-    }
-
-    return this.replaceNullWithUndefined(result)
-  }
-
-  private issuerBrandingFrom = (issuerBranding: IssuerBrandingEntity): IIssuerBranding => {
-    const result: IIssuerBranding = {
-      ...issuerBranding,
-      localeBranding: issuerBranding.localeBranding.map((localeBranding: BaseLocaleBrandingEntity) => this.localeBrandingFrom(localeBranding)),
-    }
-
-    return this.replaceNullWithUndefined(result)
-  }
-
-  private localeBrandingFrom = (localeBranding: BaseLocaleBrandingEntity): ILocaleBranding => {
-    const result: ILocaleBranding = {
-      ...localeBranding,
-      locale: localeBranding.locale === '' ? undefined : localeBranding.locale,
-    }
-
-    return this.replaceNullWithUndefined(result)
-  }
-
-  private replaceNullWithUndefined(obj: any): any {
-    if (obj === null) {
-      return undefined
-    }
-
-    if (typeof obj !== 'object' || obj instanceof Date) {
-      return obj
-    }
-
-    if (Array.isArray(obj)) {
-      return obj.map((value: any) => this.replaceNullWithUndefined(value))
-    }
-
-    const result: any = {}
-    for (const key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        result[key] = this.replaceNullWithUndefined(obj[key])
-      }
-    }
-    return result
+    return localeBrandingFrom(updatedResult) as IIssuerLocaleBranding
   }
 
   private hasDuplicateLocales = async (localeBranding: Array<IBasicCredentialLocaleBranding | IBasicIssuerLocaleBranding>): Promise<boolean> => {

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, 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, "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"))`,
     )
     await queryRunner.query(
       `CREATE UNIQUE INDEX "IDX_CredentialLocaleBrandingEntity_credentialBranding_locale" ON "BaseLocaleBranding" ("credentialBrandingId", "locale")`,