deleted unused service

fromJson should be used instead

Author: Shayan1375

src/app/service/CriteriaProfileData/CriteriaProfileData.service.ts

@@ -1,19 +1,19 @@
 import { AttributeDefinitions } from 'src/app/model/Utilities/AttributeDefinition.ts/AttributeDefinitions';
 import { AttributeDefinitionsResultMapper } from './Mapper/AttributeDefinitionsResultMapper';
-import { CriteriaListEntry } from 'src/app/shared/models/ListEntries/CriteriaListListEntry';
+import { CriteriaListEntry } from 'src/app/model/Search/ListEntries/CriteriaListListEntry';
 import { CriteriaProfile } from 'src/app/model/FeasibilityQuery/CriteriaProfileData';
 import { CriteriaProfileData } from 'src/app/model/Interface/CriteriaProfileData';
-import { DisplayDataFactoryService } from '../Factory/DisplayDataFactory.service';
 import { finalize, mergeMap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { SelectedTableItemsService } from '../ElasticSearch/SearchTermListItemService.service';
+import { SelectedTableItemsService } from '../SearchTermListItemService.service';
 import { TerminologyApiService } from '../Backend/Api/TerminologyApi.service';
 import { TerminologyCode } from 'src/app/model/Terminology/TerminologyCode';
 import { TerminologyCodeData } from 'src/app/model/Interface/TerminologyCodeData';
 import { UiProfileData } from 'src/app/model/Interface/UiProfileData';
 import { ValueDefinition } from '../../model/Utilities/AttributeDefinition.ts/ValueDefnition';
 import { ValueDefinitionsResultMapper } from './Mapper/ValueDefinitionsResultMapper';
+import { Display } from 'src/app/model/DataSelection/Profile/Display';
 
 @Injectable({
   providedIn: 'root',
@@ -23,8 +23,7 @@ export class CriteriaProfileDataService {
 
   constructor(
     private terminologyApiService: TerminologyApiService,
-    private listItemService: SelectedTableItemsService<CriteriaListEntry>,
-    private displayDataFactoryService: DisplayDataFactoryService
+    private listItemService: SelectedTableItemsService<CriteriaListEntry>
   ) {}
 
   /**
@@ -59,14 +58,14 @@ export class CriteriaProfileDataService {
   private createCriteriaProfileData(response: CriteriaProfileData): CriteriaProfile | undefined {
     try {
       if (response.uiProfile) {
-        const context = this.mapTerminologyCode(response.context);
-        const termCodes = response.termCodes.map(this.mapTerminologyCode);
+        const context = TerminologyCode.fromJson(response.context);
+        const termCodes = this.mapTerminologyCodes(response.termCodes);
         const id = response.id;
         const display = response.display;
 
         return new CriteriaProfile(
           id,
-          this.displayDataFactoryService.createDisplayData(display),
+          Display.fromJson(display),
           response.uiProfile.timeRestrictionAllowed,
           this.mapAttributeDefinitions(response.uiProfile),
           context,
@@ -93,7 +92,7 @@ export class CriteriaProfileDataService {
     return valueDefinitionsResultMapper.mapValueDefinition(uiProfile);
   }
 
-  private mapTerminologyCode(termCode: any): TerminologyCode {
-    return new TerminologyCode(termCode.code, termCode.display, termCode.system, termCode.version);
+  private mapTerminologyCodes(termCodes: TerminologyCodeData[]): TerminologyCode[] {
+    return termCodes.map((termCode) => TerminologyCode.fromJson(termCode));
   }
 }

src/app/service/Criterion/Builder/AttributeDefinitionFactory/AttributeDefinitionToAttributeFilterBuilderHelper.service.ts

@@ -1,7 +1,7 @@
 import { AbstractAttributeDefinition } from 'src/app/model/Utilities/AttributeDefinition.ts/AbstractAttributeDefinition';
 import { AttributeFiltersBuilder } from 'src/app/model/FeasibilityQuery/Criterion/AttributeFilter/AttributeFiltersBuilder';
+import { CloneDisplayData } from 'src/app/model/Utilities/DisplayData/CloneDisplayData';
 import { ConceptFilter } from 'src/app/model/FeasibilityQuery/Criterion/AttributeFilter/Concept/ConceptFilter';
-import { DisplayDataFactoryService } from 'src/app/service/Factory/DisplayDataFactory.service';
 import { FilterTypes } from 'src/app/model/Utilities/FilterTypes';
 import { Injectable } from '@angular/core';
 import { QuantityNotSet } from 'src/app/model/FeasibilityQuery/Criterion/AttributeFilter/Quantity/QuantityNotSet';
@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
   providedIn: 'root',
 })
 export class AttributeDefinitionToAttributeFilterBuilderHelperService {
-  constructor(private displayDataFactoryService: DisplayDataFactoryService) {}
+  constructor() {}
   /**
    * Initializes the AttributeFiltersBuilder with common properties from the value definition.
    *
@@ -22,7 +22,7 @@ export class AttributeDefinitionToAttributeFilterBuilderHelperService {
     abstractAttributeDefinition: AbstractAttributeDefinition
   ): AttributeFiltersBuilder {
     const builder = new AttributeFiltersBuilder(
-      this.displayDataFactoryService.createDisplayData(abstractAttributeDefinition.getDisplay()),
+      CloneDisplayData.deepCopyDisplayData(abstractAttributeDefinition.getDisplay()),
       abstractAttributeDefinition.getOptional(),
       abstractAttributeDefinition.getType()
     );

src/app/service/DataSelection/CreateDataSelectionProfile.service.ts

@@ -6,10 +6,8 @@ import { DataSelectionApiService } from '../Backend/Api/DataSelectionApi.service
 import { DataSelectionProfile } from 'src/app/model/DataSelection/Profile/DataSelectionProfile';
 import { DataSelectionUIType } from 'src/app/model/Utilities/DataSelectionUIType';
 import { Display } from 'src/app/model/DataSelection/Profile/Display';
-import { DisplayDataFactoryService } from '../Factory/DisplayDataFactory.service';
 import { Injectable } from '@angular/core';
 import { ProfileFields } from 'src/app/model/DataSelection/Profile/Fields/ProfileFields';
-import { ProfileFieldTypes } from 'src/app/model/Utilities/ProfileFieldTypes';
 import { ProfileProviderService } from 'src/app/modules/data-selection/services/ProfileProvider.service';
 import { ProfileReference } from 'src/app/model/DataSelection/Profile/Reference/ProfileReference';
 import { ProfileTimeRestrictionFilter } from 'src/app/model/DataSelection/Profile/Filter/ProfileDateFilter';