code cleanup

CentreForDigitalHumanities · Nov 2, 2023 · 09b909a · 09b909a
1 parent 736930b
commit 09b909a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 33 deletions.
diff --git a/frontend/src/app/models/page-results.ts b/frontend/src/app/models/page-results.ts
@@ -6,7 +6,7 @@ import { SearchResults } from './search-results';
 import { Results } from './results';
 import { DocumentPage } from './document-page';
 
-const RESULTS_PER_PAGE = 20;
+export const RESULTS_PER_PAGE = 20;
 
 export interface PageResultsParameters {
     from: number;

diff --git a/frontend/src/app/services/elastic-search.service.spec.ts b/frontend/src/app/services/elastic-search.service.spec.ts
@@ -76,7 +76,7 @@ describe('ElasticSearchService', () => {
     it('should make a search request', async () => {
         const queryModel = new QueryModel(mockCorpus);
         const size = 2;
-        const response = service.search(queryModel, size);
+        const response = service.loadResults(queryModel, 0, size);
 
         const searchUrl = `/api/es/${mockCorpus.name}/_search?size=${size}`;
         httpTestingController.expectOne(searchUrl).flush(mockResponse);

diff --git a/frontend/src/app/services/elastic-search.service.ts b/frontend/src/app/services/elastic-search.service.ts
@@ -8,13 +8,12 @@ import {
 } from '../models/index';
 import * as _ from 'lodash';
 import { QueryParameters } from '../models/search-requests';
+import { RESULTS_PER_PAGE } from '../models/page-results';
 
 
 @Injectable()
 export class ElasticSearchService {
 
-    private resultsPerPage = 20;
-
     constructor(private http: HttpClient) {
     }
 
@@ -78,29 +77,17 @@ export class ElasticSearchService {
         };
     }
 
-
-
-    public async search(
-        queryModel: QueryModel,
-        size?: number,
-    ): Promise<SearchResults> {
-        const esQuery = queryModel.toEsQuery();
-
-        // Perform the search
-        const response = await this.execute(queryModel.corpus, esQuery, size || this.resultsPerPage);
-        return this.parseResponse(queryModel.corpus, response);
-    }
-
-
     /**
      * Load results for requested page
      */
     public async loadResults(
-        queryModel: QueryModel, from: number,
-        size: number): Promise<SearchResults> {
+        queryModel: QueryModel,
+        from: number,
+        size: number = RESULTS_PER_PAGE
+    ): Promise<SearchResults> {
         const esQuery = queryModel.toEsQuery();
         // Perform the search
-        const response = await this.execute(queryModel.corpus, esQuery, size || this.resultsPerPage, from);
+        const response = await this.execute(queryModel.corpus, esQuery, size, from);
         return this.parseResponse(queryModel.corpus, response);
     }
 

diff --git a/frontend/src/app/services/search.service.spec.ts b/frontend/src/app/services/search.service.spec.ts
@@ -45,7 +45,7 @@ describe('SearchService', () => {
 
     it('should search', inject([SearchService], async (service: SearchService) => {
         const queryModel = new QueryModel(mockCorpus);
-        const results = await service.search(queryModel);
+        const results = await service.loadResults(queryModel, 0, 20);
         expect(results).toBeTruthy();
         expect(results.total.value).toBeGreaterThan(0);
     }));

diff --git a/frontend/src/app/services/search.service.ts b/frontend/src/app/services/search.service.ts
@@ -30,16 +30,7 @@ export class SearchService {
             from,
             size
         );
-        results.fields = queryModel.corpus.fields.filter((field) => field.resultsOverview);
-        return results;
-    }
-
-    public async search(queryModel: QueryModel
-    ): Promise<SearchResults> {
-        const request = this.elasticSearchService.search(queryModel);
-        return request.then(results =>
-            this.filterResultsFields(results, queryModel)
-        );
+        return this.filterResultsFields(results, queryModel);
     }
 
     public async aggregateSearch(

diff --git a/frontend/src/mock-data/elastic-search.ts b/frontend/src/mock-data/elastic-search.ts
@@ -12,7 +12,7 @@ export class ElasticSearchServiceMock {
         return Promise.resolve(makeDocument({content: 'Hello world!'}));
     }
 
-    search(): Promise<SearchResults> {
+    loadResults(): Promise<SearchResults> {
         return Promise.resolve({
             total: {
                 relation: 'eq',