@sphereon/ssi-sdk.data-store 0.37.2-next.14 → 0.37.2-next.21

package/src/credentialDesign/CredentialDesignStore.ts

@@ -1,11 +1,13 @@
 import {
   AbstractCredentialDesignStore,
   AddCredentialDesignArgs,
+  CountCredentialDesignsArgs,
   CredentialDesign,
+  FormStepGetOrCreateArgs,
   GetCredentialDesignArgs,
   GetCredentialDesignsArgs,
   NonPersistedCredentialDesignBranding,
-  NonPersistedMetaDataKey,
+  NonPersistedMetadataKey,
   NonPersistedSchemaDefinition,
   RemoveCredentialDesignArgs,
   UpdateCredentialDesignArgs,
@@ -13,13 +15,13 @@ import {
 import { OrPromise } from '@sphereon/ssi-types'
 import Debug from 'debug'
 import { DataSource, EntityManager, Repository } from 'typeorm'
-import { MetaDataSetEntity, MetaDataKeyEntity, MetaDataValueEntity, SchemaDefinitionEntity, CredentialDesignBrandingEntity } from '../entities/credentialDesign'
+import { MetadataSetEntity, MetadataKeyEntity, MetadataValueEntity, SchemaDefinitionEntity, CredentialDesignBrandingEntity, FormStepEntity } from '../entities/credentialDesign'
 import { ImageAttributesEntity } from '../entities/issuanceBranding/ImageAttributesEntity'
 import { ImageDimensionsEntity } from '../entities/issuanceBranding/ImageDimensionsEntity'
 import {
   credentialDesignBrandingEntityFrom,
   credentialDesignFrom,
-  metaDataKeyEntityFrom,
+  metadataKeyEntityFrom,
   schemaDefinitionEntityFrom,
 } from '../utils/credentialDesign/MappingUtils'
 
@@ -36,7 +38,7 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
   getCredentialDesign = async (args: GetCredentialDesignArgs): Promise<CredentialDesign> => {
     const { credentialDesignId } = args
     debug('getCredentialDesign', credentialDesignId)
-    const repo: Repository<MetaDataSetEntity> = (await this.dbConnection).getRepository(MetaDataSetEntity)
+    const repo: Repository<MetadataSetEntity> = (await this.dbConnection).getRepository(MetadataSetEntity)
     const result = await repo.findOne({
       where: { id: credentialDesignId },
     })
@@ -50,39 +52,62 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
 
   getCredentialDesigns = async (args?: GetCredentialDesignsArgs): Promise<Array<CredentialDesign>> => {
     debug('getCredentialDesigns', args)
-    const repo: Repository<MetaDataSetEntity> = (await this.dbConnection).getRepository(MetaDataSetEntity)
+    const repo: Repository<MetadataSetEntity> = (await this.dbConnection).getRepository(MetadataSetEntity)
     const where = args?.filter?.tenantId ? { tenantId: args.filter.tenantId } : undefined
-    const results = await repo.find({ where })
+    const results = await repo.find({
+      where,
+      order: { name: 'ASC' },
+      take: args?.limit,
+      skip: args?.offset,
+    })
     return results.map(credentialDesignFrom)
   }
 
+  countCredentialDesigns = async (args?: CountCredentialDesignsArgs): Promise<number> => {
+    debug('countCredentialDesigns', args)
+    const repo: Repository<MetadataSetEntity> = (await this.dbConnection).getRepository(MetadataSetEntity)
+    const where = args?.filter?.tenantId ? { tenantId: args.filter.tenantId } : undefined
+    return repo.count({ where })
+  }
+
   addCredentialDesign = async (args: AddCredentialDesignArgs): Promise<CredentialDesign> => {
     debug('addCredentialDesign', args)
     const dataSource = await this.dbConnection
 
     return dataSource.transaction(async (transactionalEntityManager) => {
-      const metaDataSet = new MetaDataSetEntity()
-      metaDataSet.name = args.name
-      metaDataSet.tenantId = args.tenantId
-      metaDataSet.metaDataKeys = []
-      metaDataSet.schemaDefinitions = []
+      const metadataSet = new MetadataSetEntity()
+      metadataSet.name = args.identifier
+      metadataSet.tenantId = args.tenantId
+      metadataSet.metadataKeys = []
+      metadataSet.schemaDefinitions = []
 
       const { design } = args
       if (design) {
-        if (design.metaDataKeys) {
-          metaDataSet.metaDataKeys = design.metaDataKeys.map(metaDataKeyEntityFrom)
+        if (design.metadataKeys) {
+          metadataSet.metadataKeys = design.metadataKeys.map(metadataKeyEntityFrom)
         }
 
         if (design.schemaDefinitions) {
-          metaDataSet.schemaDefinitions = design.schemaDefinitions.map(schemaDefinitionEntityFrom)
+          metadataSet.schemaDefinitions = design.schemaDefinitions.map(schemaDefinitionEntityFrom)
         }
 
         if (design.branding) {
-          metaDataSet.credentialDesignBranding = credentialDesignBrandingEntityFrom(design.branding)
+          metadataSet.credentialDesignBranding = credentialDesignBrandingEntityFrom(design.branding)
+        }
+      }
+
+      const saved = await transactionalEntityManager.save(MetadataSetEntity, metadataSet)
+
+      if (args.formStepId && saved.schemaDefinitions?.length) {
+        const formStep = await transactionalEntityManager.findOne(FormStepEntity, {
+          where: { id: args.formStepId },
+        })
+        if (formStep) {
+          formStep.schemaDefinitions = [...(formStep.schemaDefinitions ?? []), ...saved.schemaDefinitions]
+          await transactionalEntityManager.save(FormStepEntity, formStep)
         }
       }
 
-      const saved = await transactionalEntityManager.save(MetaDataSetEntity, metaDataSet)
       return credentialDesignFrom(saved)
     })
   }
@@ -92,7 +117,7 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
     const dataSource = await this.dbConnection
 
     return dataSource.transaction(async (transactionalEntityManager) => {
-      const existing = await transactionalEntityManager.findOne(MetaDataSetEntity, {
+      const existing = await transactionalEntityManager.findOne(MetadataSetEntity, {
         where: { id: args.credentialDesignId },
       })
 
@@ -100,8 +125,8 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
         return Promise.reject(Error(`No credential design found for id: ${args.credentialDesignId}`))
       }
 
-      if (args.name !== undefined) {
-        existing.name = args.name
+      if (args.identifier !== undefined) {
+        existing.name = args.identifier
       }
       if (args.tenantId !== undefined) {
         existing.tenantId = args.tenantId
@@ -109,8 +134,8 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
 
       const { design } = args
       if (design) {
-        if (design.metaDataKeys !== undefined) {
-          await this.replaceMetaDataKeys(transactionalEntityManager, existing, design.metaDataKeys)
+        if (design.metadataKeys !== undefined) {
+          await this.replaceMetadataKeys(transactionalEntityManager, existing, design.metadataKeys)
         }
 
         if (design.schemaDefinitions !== undefined) {
@@ -122,14 +147,29 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
         }
       }
 
-      const saved = await transactionalEntityManager.save(MetaDataSetEntity, existing)
+      const saved = await transactionalEntityManager.save(MetadataSetEntity, existing)
       return credentialDesignFrom(saved)
     })
   }
 
+  formStepGetOrCreate = async (args: FormStepGetOrCreateArgs): Promise<string> => {
+    debug('formStepGetOrCreate', args)
+    const repo: Repository<FormStepEntity> = (await this.dbConnection).getRepository(FormStepEntity)
+    const existing = await repo.findOne({ where: { formId: args.formStepId } })
+    if (existing) {
+      return existing.id
+    }
+    const formStep = new FormStepEntity()
+    formStep.formId = args.formStepId
+    formStep.stepNr = 1
+    formStep.order = 1
+    const saved = await repo.save(formStep)
+    return saved.id
+  }
+
   removeCredentialDesign = async (args: RemoveCredentialDesignArgs): Promise<void> => {
     debug('removeCredentialDesign', args)
-    const repo: Repository<MetaDataSetEntity> = (await this.dbConnection).getRepository(MetaDataSetEntity)
+    const repo: Repository<MetadataSetEntity> = (await this.dbConnection).getRepository(MetadataSetEntity)
     const existing = await repo.findOne({
       where: { id: args.credentialDesignId },
     })
@@ -141,25 +181,25 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
     await repo.remove(existing)
   }
 
-  private async replaceMetaDataKeys(
+  private async replaceMetadataKeys(
     entityManager: EntityManager,
-    existing: MetaDataSetEntity,
-    newKeys: Array<NonPersistedMetaDataKey>,
+    existing: MetadataSetEntity,
+    newKeys: Array<NonPersistedMetadataKey>,
   ): Promise<void> {
-    if (existing.metaDataKeys?.length) {
-      for (const key of existing.metaDataKeys) {
-        if (key.metaDataValues?.length) {
-          await entityManager.remove(MetaDataValueEntity, key.metaDataValues)
+    if (existing.metadataKeys?.length) {
+      for (const key of existing.metadataKeys) {
+        if (key.metadataValues?.length) {
+          await entityManager.remove(MetadataValueEntity, key.metadataValues)
         }
       }
-      await entityManager.remove(MetaDataKeyEntity, existing.metaDataKeys)
+      await entityManager.remove(MetadataKeyEntity, existing.metadataKeys)
     }
-    existing.metaDataKeys = newKeys.map(metaDataKeyEntityFrom)
+    existing.metadataKeys = newKeys.map(metadataKeyEntityFrom)
   }
 
   private async replaceSchemaDefinitions(
     entityManager: EntityManager,
-    existing: MetaDataSetEntity,
+    existing: MetadataSetEntity,
     newSchemas: Array<NonPersistedSchemaDefinition>,
   ): Promise<void> {
     if (existing.schemaDefinitions?.length) {
@@ -170,7 +210,7 @@ export class CredentialDesignStore extends AbstractCredentialDesignStore {
 
   private async replaceBranding(
     entityManager: EntityManager,
-    existing: MetaDataSetEntity,
+    existing: MetadataSetEntity,
     newBranding: NonPersistedCredentialDesignBranding | undefined,
   ): Promise<void> {
     if (existing.credentialDesignBranding) {

package/src/entities/credentialDesign/CredentialDesignBrandingEntity.ts

@@ -1,6 +1,6 @@
 import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { ImageAttributesEntity } from '../issuanceBranding/ImageAttributesEntity'
-import { MetaDataSetEntity } from './MetaDataSetEntity'
+import { MetadataSetEntity } from './MetadataSetEntity'
 
 @Entity('credential_design_branding')
 export class CredentialDesignBrandingEntity extends BaseEntity {
@@ -31,9 +31,9 @@ export class CredentialDesignBrandingEntity extends BaseEntity {
   @JoinColumn({ name: 'background_image' })
   backgroundImage?: ImageAttributesEntity
 
-  @OneToOne(() => MetaDataSetEntity, (set: MetaDataSetEntity) => set.credentialDesignBranding, {
+  @OneToOne(() => MetadataSetEntity, (set: MetadataSetEntity) => set.credentialDesignBranding, {
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'meta_data_set_id' })
-  metaDataSet!: MetaDataSetEntity
+  metadataSet!: MetadataSetEntity
 }

package/src/entities/credentialDesign/{MetaDataKeyEntity.ts → MetadataKeyEntity.ts}

@@ -1,11 +1,11 @@
 export { ValueType } from '@sphereon/ssi-sdk.data-store-types'
 import { ValueType } from '@sphereon/ssi-sdk.data-store-types'
 import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryGeneratedColumn } from 'typeorm'
-import { MetaDataSetEntity } from './MetaDataSetEntity'
-import { MetaDataValueEntity } from './MetaDataValueEntity'
+import { MetadataSetEntity } from './MetadataSetEntity'
+import { MetadataValueEntity } from './MetadataValueEntity'
 
 @Entity('meta_data_keys')
-export class MetaDataKeyEntity extends BaseEntity {
+export class MetadataKeyEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
@@ -15,16 +15,16 @@ export class MetaDataKeyEntity extends BaseEntity {
   @Column('text', { name: 'key', nullable: false })
   key!: string
 
-  @ManyToOne(() => MetaDataSetEntity, (set: MetaDataSetEntity) => set.metaDataKeys, {
+  @ManyToOne(() => MetadataSetEntity, (set: MetadataSetEntity) => set.metadataKeys, {
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'set_id' })
-  set!: MetaDataSetEntity
+  set!: MetadataSetEntity
 
-  @OneToMany(() => MetaDataValueEntity, (value: MetaDataValueEntity) => value.metaDataKey, {
+  @OneToMany(() => MetadataValueEntity, (value: MetadataValueEntity) => value.metadataKey, {
     cascade: true,
     onDelete: 'CASCADE',
     eager: true,
   })
-  metaDataValues!: Array<MetaDataValueEntity>
+  metadataValues!: Array<MetadataValueEntity>
 }

package/src/entities/credentialDesign/{MetaDataSetEntity.ts → MetadataSetEntity.ts}

@@ -1,11 +1,11 @@
 import { BaseEntity, Column, Entity, Index, OneToMany, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { MetaDataKeyEntity } from './MetaDataKeyEntity'
+import { MetadataKeyEntity } from './MetadataKeyEntity'
 import { SchemaDefinitionEntity } from './SchemaDefinitionEntity'
 import { CredentialDesignBrandingEntity } from './CredentialDesignBrandingEntity'
 
 @Entity('meta_data_set')
 @Index('meta_data_set_unique_tenant', ['name', 'tenantId'], { unique: true })
-export class MetaDataSetEntity extends BaseEntity {
+export class MetadataSetEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
@@ -15,21 +15,21 @@ export class MetaDataSetEntity extends BaseEntity {
   @Column('text', { name: 'name', nullable: false })
   name!: string
 
-  @OneToMany(() => MetaDataKeyEntity, (key: MetaDataKeyEntity) => key.set, {
+  @OneToMany(() => MetadataKeyEntity, (key: MetadataKeyEntity) => key.set, {
     cascade: true,
     onDelete: 'CASCADE',
     eager: true,
   })
-  metaDataKeys!: Array<MetaDataKeyEntity>
+  metadataKeys!: Array<MetadataKeyEntity>
 
-  @OneToMany(() => SchemaDefinitionEntity, (schema: SchemaDefinitionEntity) => schema.metaDataSet, {
+  @OneToMany(() => SchemaDefinitionEntity, (schema: SchemaDefinitionEntity) => schema.metadataSet, {
     cascade: true,
     onDelete: 'CASCADE',
     eager: true,
   })
   schemaDefinitions!: Array<SchemaDefinitionEntity>
 
-  @OneToOne(() => CredentialDesignBrandingEntity, (branding: CredentialDesignBrandingEntity) => branding.metaDataSet, {
+  @OneToOne(() => CredentialDesignBrandingEntity, (branding: CredentialDesignBrandingEntity) => branding.metadataSet, {
     cascade: true,
     onDelete: 'CASCADE',
     eager: true,

package/src/entities/credentialDesign/{MetaDataValueEntity.ts → MetadataValueEntity.ts}

@@ -1,9 +1,9 @@
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { MetaDataKeyEntity } from './MetaDataKeyEntity'
+import { MetadataKeyEntity } from './MetadataKeyEntity'
 
 @Entity('meta_data_values')
-export class MetaDataValueEntity extends BaseEntity {
+export class MetadataValueEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
@@ -22,9 +22,9 @@ export class MetaDataValueEntity extends BaseEntity {
   @Column({ name: 'timestamp_value', nullable: true, type: typeOrmDateTime() })
   timestampValue?: Date
 
-  @ManyToOne(() => MetaDataKeyEntity, (key: MetaDataKeyEntity) => key.metaDataValues, {
+  @ManyToOne(() => MetadataKeyEntity, (key: MetadataKeyEntity) => key.metadataValues, {
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'key_id' })
-  metaDataKey!: MetaDataKeyEntity
+  metadataKey!: MetadataKeyEntity
 }

package/src/entities/credentialDesign/SchemaDefinitionEntity.ts

@@ -1,5 +1,5 @@
 import { BaseEntity, Column, Entity, JoinColumn, ManyToMany, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { MetaDataSetEntity } from './MetaDataSetEntity'
+import { MetadataSetEntity } from './MetadataSetEntity'
 import { FormStepEntity } from './FormStepEntity'
 
 @Entity('schema_definition')
@@ -25,11 +25,11 @@ export class SchemaDefinitionEntity extends BaseEntity {
   @Column('text', { name: 'schema', nullable: false })
   schema!: string
 
-  @ManyToOne(() => MetaDataSetEntity, (set: MetaDataSetEntity) => set.schemaDefinitions, {
+  @ManyToOne(() => MetadataSetEntity, (set: MetadataSetEntity) => set.schemaDefinitions, {
     onDelete: 'CASCADE',
   })
   @JoinColumn({ name: 'meta_data_set_id' })
-  metaDataSet!: MetaDataSetEntity
+  metadataSet!: MetadataSetEntity
 
   @ManyToMany(() => FormStepEntity, (formStep: FormStepEntity) => formStep.schemaDefinitions)
   formSteps!: Array<FormStepEntity>

package/src/entities/credentialDesign/index.ts

@@ -1,6 +1,6 @@
-export { MetaDataSetEntity } from './MetaDataSetEntity'
-export { MetaDataKeyEntity, ValueType } from './MetaDataKeyEntity'
-export { MetaDataValueEntity } from './MetaDataValueEntity'
+export { MetadataSetEntity } from './MetadataSetEntity'
+export { MetadataKeyEntity, ValueType } from './MetadataKeyEntity'
+export { MetadataValueEntity } from './MetadataValueEntity'
 export { FormStepEntity } from './FormStepEntity'
 export { SchemaDefinitionEntity } from './SchemaDefinitionEntity'
 export { CredentialDesignBrandingEntity } from './CredentialDesignBrandingEntity'

package/src/index.ts

@@ -29,9 +29,9 @@ import { IssuerBrandingEntity } from './entities/issuanceBranding/IssuerBranding
 import { IssuerLocaleBrandingEntity } from './entities/issuanceBranding/IssuerLocaleBrandingEntity'
 import { TextAttributesEntity } from './entities/issuanceBranding/TextAttributesEntity'
 import { MachineStateInfoEntity } from './entities/machineState/MachineStateInfoEntity'
-import { MetaDataSetEntity } from './entities/credentialDesign/MetaDataSetEntity'
-import { MetaDataKeyEntity } from './entities/credentialDesign/MetaDataKeyEntity'
-import { MetaDataValueEntity } from './entities/credentialDesign/MetaDataValueEntity'
+import { MetadataSetEntity } from './entities/credentialDesign/MetadataSetEntity'
+import { MetadataKeyEntity } from './entities/credentialDesign/MetadataKeyEntity'
+import { MetadataValueEntity } from './entities/credentialDesign/MetadataValueEntity'
 import { FormStepEntity } from './entities/credentialDesign/FormStepEntity'
 import { SchemaDefinitionEntity } from './entities/credentialDesign/SchemaDefinitionEntity'
 import { CredentialDesignBrandingEntity } from './entities/credentialDesign/CredentialDesignBrandingEntity'
@@ -125,9 +125,9 @@ export const DataStoreDigitalCredentialEntities = [DigitalCredentialEntity]
 export const DataStoreMachineStateEntities = [MachineStateInfoEntity]
 
 export const DataStoreCredentialDesignEntities = [
-  MetaDataSetEntity,
-  MetaDataKeyEntity,
-  MetaDataValueEntity,
+  MetadataSetEntity,
+  MetadataKeyEntity,
+  MetadataValueEntity,
   FormStepEntity,
   SchemaDefinitionEntity,
   CredentialDesignBrandingEntity,
@@ -187,12 +187,12 @@ export {
   ContactMetadataItemEntity,
   CredentialClaimsEntity,
   Oid4vcStateEntity,
-  MetaDataSetEntity,
-  MetaDataKeyEntity,
-  MetaDataValueEntity,
+  MetadataSetEntity,
+  MetadataKeyEntity,
+  MetadataValueEntity,
   FormStepEntity,
   SchemaDefinitionEntity,
   CredentialDesignBrandingEntity,
 }
 
-export { ValueType } from './entities/credentialDesign/MetaDataKeyEntity'
+export { ValueType } from './entities/credentialDesign/MetadataKeyEntity'

package/src/migrations/postgres/1773657426000-AddCredentialDesigns.ts

@@ -6,7 +6,11 @@ export class AddCredentialDesignsPostgres1773657426000 implements MigrationInter
   public async up(queryRunner: QueryRunner): Promise<void> {
 
     await queryRunner.query(`
-      CREATE TYPE IF NOT EXISTS "value_type" AS ENUM ('Text', 'Number', 'Boolean', 'Date');
+      DO $$ BEGIN
+        CREATE TYPE "value_type" AS ENUM ('Text', 'Number', 'Boolean', 'Date');
+      EXCEPTION
+        WHEN duplicate_object THEN NULL;
+      END $$;
     `)
 
     await queryRunner.query(`

package/src/utils/credentialDesign/MappingUtils.ts

@@ -2,29 +2,29 @@ import type {
   CredentialDesign,
   CredentialDesignBranding,
   IImageAttributes,
-  MetaDataKey,
-  MetaDataValue,
+  MetadataKey,
+  MetadataValue,
   NonPersistedCredentialDesignBranding,
-  NonPersistedMetaDataKey,
-  NonPersistedMetaDataValue,
+  NonPersistedMetadataKey,
+  NonPersistedMetadataValue,
   NonPersistedSchemaDefinition,
   SchemaDefinition,
 } from '@sphereon/ssi-sdk.data-store-types'
 import { CredentialDesignBrandingEntity } from '../../entities/credentialDesign'
-import { MetaDataKeyEntity, ValueType } from '../../entities/credentialDesign'
-import { MetaDataSetEntity } from '../../entities/credentialDesign'
-import { MetaDataValueEntity } from '../../entities/credentialDesign'
+import { MetadataKeyEntity, ValueType } from '../../entities/credentialDesign'
+import { MetadataSetEntity } from '../../entities/credentialDesign'
+import { MetadataValueEntity } from '../../entities/credentialDesign'
 import { SchemaDefinitionEntity } from '../../entities/credentialDesign'
 import { ImageAttributesEntity } from '../../entities/issuanceBranding/ImageAttributesEntity'
 import { replaceNullWithUndefined } from '../FormattingUtils'
 import { imageAttributesEntityFrom } from '../issuanceBranding/MappingUtils'
 
-export const credentialDesignFrom = (entity: MetaDataSetEntity): CredentialDesign => {
+export const credentialDesignFrom = (entity: MetadataSetEntity): CredentialDesign => {
   const result: CredentialDesign = {
     id: entity.id,
-    label: entity.name,
+    identifier: entity.name,
     tenantId: entity.tenantId,
-    metaDataKeys: entity.metaDataKeys?.map((key) => metaDataKeyFrom(key)) ?? [],
+    metadataKeys: entity.metadataKeys?.map((key) => metadataKeyFrom(key)) ?? [],
     schemaDefinitions: entity.schemaDefinitions?.map((schema) => schemaDefinitionFrom(schema)) ?? [],
     branding: entity.credentialDesignBranding ? credentialDesignBrandingFrom(entity.credentialDesignBranding) : undefined,
   }
@@ -32,19 +32,19 @@ export const credentialDesignFrom = (entity: MetaDataSetEntity): CredentialDesig
   return replaceNullWithUndefined(result)
 }
 
-export const metaDataKeyFrom = (entity: MetaDataKeyEntity): MetaDataKey => {
-  const result: MetaDataKey = {
+export const metadataKeyFrom = (entity: MetadataKeyEntity): MetadataKey => {
+  const result: MetadataKey = {
     id: entity.id,
     key: entity.key,
     valueType: entity.valueType,
-    metaDataValues: entity.metaDataValues?.map((value) => metaDataValueFrom(value)) ?? [],
+    metadataValues: entity.metadataValues?.map((value) => metadataValueFrom(value)) ?? [],
   }
 
   return replaceNullWithUndefined(result)
 }
 
-export const metaDataValueFrom = (entity: MetaDataValueEntity): MetaDataValue => {
-  const result: MetaDataValue = {
+export const metadataValueFrom = (entity: MetadataValueEntity): MetadataValue => {
+  const result: MetadataValue = {
     id: entity.id,
     index: entity.index,
     textValue: entity.textValue,
@@ -101,16 +101,16 @@ export const imageAttributesFrom = (entity: ImageAttributesEntity): IImageAttrib
   return replaceNullWithUndefined(result)
 }
 
-export const metaDataKeyEntityFrom = (input: NonPersistedMetaDataKey): MetaDataKeyEntity => {
-  const keyEntity = new MetaDataKeyEntity()
+export const metadataKeyEntityFrom = (input: NonPersistedMetadataKey): MetadataKeyEntity => {
+  const keyEntity = new MetadataKeyEntity()
   keyEntity.key = input.key
   keyEntity.valueType = input.valueType as ValueType
-  keyEntity.metaDataValues = input.metaDataValues.map((valInput) => metaDataValueEntityFrom(valInput))
+  keyEntity.metadataValues = input.metadataValues.map((valInput) => metadataValueEntityFrom(valInput))
   return keyEntity
 }
 
-export const metaDataValueEntityFrom = (input: NonPersistedMetaDataValue): MetaDataValueEntity => {
-  const valEntity = new MetaDataValueEntity()
+export const metadataValueEntityFrom = (input: NonPersistedMetadataValue): MetadataValueEntity => {
+  const valEntity = new MetadataValueEntity()
   valEntity.index = input.index
   valEntity.textValue = input.textValue
   valEntity.numberValue = input.numberValue