usage of new service for criteria by id

Author: Shayan1375

src/app/shared/components/list-item-details/list-item-details-sections/list-item-details-sections.component.ts

@@ -1,10 +1,9 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { CriteriaByIdSearchService } from 'src/app/service/Search/SearchTypes/CriteriaById/CriteriaByIdSearch.service';
+import { CriteriaListEntry } from 'src/app/model/Search/ListEntries/CriteriaListListEntry';
 import { ListItemDetailService } from 'src/app/shared/service/Menu/ListItemDetails/ListItemDetails.service';
 import { MenuItemInterface } from 'src/app/shared/models/Menu/MenuItemInterface';
-import { SearchService } from 'src/app/service/Search/Search.service';
-import { SearchTermDetailsService } from 'src/app/service/Search/SearchTemDetails/SearchTermDetails.service';
 import { SearchTermRelatives } from 'src/app/model/Search/SearchDetails/SearchTermRelatives';
-import { CriteriaListEntry } from 'src/app/model/Search/ListEntries/CriteriaListListEntry';
 
 @Component({
   selector: 'num-list-item-details-sections',
@@ -22,22 +21,19 @@ export class ListItemDetailsSectionsComponent implements OnInit {
 
   constructor(
     private menuService: ListItemDetailService,
-    private elasticSearchService: SearchService,
-    private searchService: SearchService,
-    private test: SearchTermDetailsService
+    private criteriaByIdSearchService: CriteriaByIdSearchService
   ) {}
 
   public ngOnInit() {
     this.getMenuItems();
   }
 
   public getSelectedRelative(item: SearchTermRelatives) {
-    this.elasticSearchService.searchCriteriaById(item.getTermCodeHash()).subscribe((resultList) => {
-      this.selectedRelative.emit(resultList.getResults()[0]);
-    });
-
-    this.searchService.searchCriteriaById(item.getTermCodeHash()).subscribe();
-    this.test.getDetailsForListItem(item.getTermCodeHash()).subscribe();
+    this.criteriaByIdSearchService
+      .search(item.getContextualizedTermcodeHash())
+      .subscribe((resultList) => {
+        this.selectedRelative.emit(resultList.getResults()[0]);
+      });
   }
 
   private getMenuItems() {

src/app/shared/service/Menu/ListItemDetails/ListItemDetailsMenuItemsFunctions.service.ts

@@ -5,23 +5,23 @@ import { Criterion } from 'src/app/model/FeasibilityQuery/Criterion/Criterion';
 import { FeasibilityQueryProviderHub } from 'src/app/service/Provider/FeasibilityQueryProviderHub';
 import { Injectable } from '@angular/core';
 import { map, switchMap, take } from 'rxjs';
-import { SearchService } from 'src/app/service/Search/Search.service';
 import { SearchTermDetailsService } from 'src/app/service/Search/SearchTemDetails/SearchTermDetails.service';
+import { CriteriaByIdSearchService } from 'src/app/service/Search/SearchTypes/CriteriaById/CriteriaByIdSearch.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class ListItemDetailsMenuItemsFunctionsService {
   constructor(
-    private searchService: SearchService,
+    private searchService: CriteriaByIdSearchService,
     private criteriaSearchService: CriteriaSearchService,
     private criterionService: CreateCriterionService,
     private searchTermDetailsService: SearchTermDetailsService,
     private feasibilityQueryProviderHub: FeasibilityQueryProviderHub
   ) {}
 
   public showCriteriaInResultList(id: string) {
-    this.searchService.searchCriteriaById(id).pipe(take(1)).subscribe();
+    this.searchService.search(id).pipe(take(1)).subscribe();
     this.searchTermDetailsService.getDetailsForListItem(id).pipe(take(1)).subscribe();
   }
 
@@ -39,7 +39,7 @@ export class ListItemDetailsMenuItemsFunctionsService {
 
   public searchCriteria(id: string) {
     this.searchService
-      .searchCriteriaById(id)
+      .search(id)
       .pipe(
         take(1),
         switchMap((searchTermResultList: CriteriaResultList) =>