From a5b175b2922fcdac659ab3de65c34bd78603d866 Mon Sep 17 00:00:00 2001 From: danny-mhlv Date: Wed, 12 Oct 2022 13:47:52 +0300 Subject: [PATCH 1/3] Fixed insufficient caching problem --- src/core/interceptors/page.interceptor.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/interceptors/page.interceptor.ts b/src/core/interceptors/page.interceptor.ts index 0551733..3a409b1 100644 --- a/src/core/interceptors/page.interceptor.ts +++ b/src/core/interceptors/page.interceptor.ts @@ -42,16 +42,17 @@ export class PageInterceptor implements NestInterceptor { async intercept(context: ExecutionContext, next: CallHandler): Promise> { const query = context.switchToHttp().getRequest().query; - // const offset = !query.offset ? 0 : query.offset; const offset = query.offset; - // const limit = !query.limit ? 10 : query.limit; const limit = query.limit; - // const order = !query.order ? Order.DESC : query.order; const order = query.order; + const query_string = query.query; const prev_page = await this.cacheManager.get('prev_page'); if (prev_page) { - if (offset == prev_page[1] && limit == prev_page[2] && order == prev_page[3]) return of(prev_page[0]); + if (offset == prev_page[1] && + limit == prev_page[2] && + order == prev_page[3] && + query_string === prev_page[4]) return of(prev_page[0]); } return next.handle().pipe( @@ -71,7 +72,7 @@ export class PageInterceptor implements NestInterceptor { // Cache and return the page const page: PageDto = new PageDto(data, meta); - await this.cacheManager.set('prev_page', [page, offset, limit, order]); + await this.cacheManager.set('prev_page', [page, offset, limit, order, query_string]); return page; }) ); -- 2.39.5 From f5ad2e0ff79fbf003e2363cfcd8630a1f9693a3c Mon Sep 17 00:00:00 2001 From: Danny Mikhaylov Date: Tue, 8 Nov 2022 05:18:17 +0300 Subject: [PATCH 2/3] Changed 'match' query to 'multi-match'. Allows to search for both 'content' and 'title' of the paper --- .../domain/dtos/elastic/es-multimatch.dto.ts | 68 +++++++++++++++++++ src/core/services/common/search.service.ts | 11 ++- 2 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 src/core/domain/dtos/elastic/es-multimatch.dto.ts diff --git a/src/core/domain/dtos/elastic/es-multimatch.dto.ts b/src/core/domain/dtos/elastic/es-multimatch.dto.ts new file mode 100644 index 0000000..6617fea --- /dev/null +++ b/src/core/domain/dtos/elastic/es-multimatch.dto.ts @@ -0,0 +1,68 @@ +import { ApiExtraModels, ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; +import { IsArray, IsDefined, IsInt, IsObject, IsOptional } from "class-validator"; +import { EsPit } from "../../interfaces/elastic/es-pit.interface"; +import { EsQuery } from "../../interfaces/elastic/es-query.interface" + +/** + * List of allowed properties in this DTO + */ + const allowedProperties = ['query']; + + /** + * Elasticsearch multi-match query DTO + */ + @ApiExtraModels() + export class EsMultimatchQueryDto { + /** + * Offset from the start of the list of hits + */ + @IsOptional() + @IsInt() + @ApiPropertyOptional({ + description: 'Offset from the start of the list of hits', + example: 5, + }) + public from?: number; + + /** + * Maximum number of elements returned by Elasticsearch + */ + @IsOptional() + @IsInt() + @ApiPropertyOptional({ + description: 'Maximum number of elements returned by Elasticsearch', + example: 30 + }) + public size?: number; + + /** + * The search query object passed to Elasticsearch + */ + @IsDefined() + @IsObject() + @ApiProperty({ + description: 'Search query object passed to Elasticsearch', + example: { + multi_match: { + query: 'Maths', + fields: [ + 'title', + 'content' + ] + } + }, + }) + private readonly query: Object; + + /** + * Constructs a multi-match + */ + constructor(query: string = '', fields: Array = ['content']) { + this.query = { + multi_match: { + query: query, + fields: fields + } + } + } + } \ No newline at end of file diff --git a/src/core/services/common/search.service.ts b/src/core/services/common/search.service.ts index b037ab5..7e5a47c 100644 --- a/src/core/services/common/search.service.ts +++ b/src/core/services/common/search.service.ts @@ -1,6 +1,7 @@ import { HttpService } from "@nestjs/axios"; import { GatewayTimeoutException, ImATeapotException, Injectable, NotFoundException } from "@nestjs/common"; import { map, take } from "rxjs"; +import { EsMultimatchQueryDto } from "src/core/domain/dtos/elastic/es-multimatch.dto"; import { EsResponseDto, SearchQueryDto} from "../../domain/dtos"; import { EsQueryDto } from "../../domain/dtos/elastic/es-query.dto"; @@ -69,13 +70,9 @@ export class SearchService { */ async findByContext(query: SearchQueryDto): Promise { // Contruct a body for querying Elasticsearch - const es_query: EsQueryDto = new EsQueryDto(); - es_query.query = { - query_string: { - query: query.query, - default_field: 'content', - } - }; + const es_query: EsMultimatchQueryDto = new EsMultimatchQueryDto(query.query, [ + 'title', 'content' + ]); es_query.from = query.offset; es_query.size = query.limit; -- 2.39.5 From cbf7938ed738cb441822751736dced3a18850995 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 9 Nov 2022 13:27:50 +0300 Subject: [PATCH 3/3] Fixed the test issue --- src/core/domain/dtos/elastic/es-multimatch.dto.ts | 4 +--- src/test/search.service.spec.ts | 13 ++++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/core/domain/dtos/elastic/es-multimatch.dto.ts b/src/core/domain/dtos/elastic/es-multimatch.dto.ts index 6617fea..81295d0 100644 --- a/src/core/domain/dtos/elastic/es-multimatch.dto.ts +++ b/src/core/domain/dtos/elastic/es-multimatch.dto.ts @@ -1,7 +1,5 @@ import { ApiExtraModels, ApiProperty, ApiPropertyOptional } from "@nestjs/swagger"; -import { IsArray, IsDefined, IsInt, IsObject, IsOptional } from "class-validator"; -import { EsPit } from "../../interfaces/elastic/es-pit.interface"; -import { EsQuery } from "../../interfaces/elastic/es-query.interface" +import { IsDefined, IsInt, IsObject, IsOptional } from "class-validator"; /** * List of allowed properties in this DTO diff --git a/src/test/search.service.spec.ts b/src/test/search.service.spec.ts index 2fa1197..76bc66a 100644 --- a/src/test/search.service.spec.ts +++ b/src/test/search.service.spec.ts @@ -107,13 +107,16 @@ describe('Unit tests for SearchService', () => { expect(httpGetSpy).toHaveBeenCalledWith<[string, object]>(expect.anything(), { data: { query: { - query_string: { - query: 'keyword', - default_field: 'content', + multi_match: { + query: query.query, + fields: [ + 'title', + 'content' + ] } }, - from: 32, - size: 1, + from: query.offset, + size: query.limit }, headers: { 'Content-Type': 'application/json' } }); -- 2.39.5