elasticsearch variable naming improvement

src/elastic-search/providers/fields.enum.ts

@@ -12,7 +12,7 @@ export enum FilterFields {
   Mode = "mode",
 }
 
-export enum QueryFields {
+export enum MustFields {
   DatasetName = "datasetName",
   Description = "description",
 }

src/elastic-search/providers/query-builder.service.ts

@@ -10,7 +10,7 @@ import {
 } from "../interfaces/es-common.type";
 import {
   FilterFields,
-  QueryFields,
+  MustFields,
   FacetFields,
   ShouldFields,
 } from "./fields.enum";
@@ -22,7 +22,7 @@ import { convertToElasticSearchQuery } from "../helpers/utils";
 @Injectable()
 export class SearchQueryService {
   readonly filterFields = [...Object.values(FilterFields)];
-  readonly queryFields = [...Object.values(QueryFields)];
+  readonly mustFields = [...Object.values(MustFields)];
   readonly shouldFields = [...Object.values(ShouldFields)];
   readonly facetFields = [...Object.values(FacetFields)];
   readonly textQuerySplitMethod = /[ ,]+/;
@@ -33,9 +33,13 @@ export class SearchQueryService {
 
       const filter = this.buildFilterFields(fields);
       const should = this.buildShouldFields(fields);
-      const query = this.buildTextQuery(fields);
+      const must = this.buildTextQuery(fields);
 
-      return this.constructFinalQuery(filter, should, query);
+      // NOTE: The final query flow is as follows:
+      // step 1. Build filter fields conditions must match all filter fields
+      // step 2. Build should fields conditions must match at least one should field
+      // step 3. Build text query conditions must match all text query fields
+      return this.constructFinalQuery(filter, should, must);
     } catch (err) {
       Logger.error("Elastic search build search query failed");
       throw err;
@@ -100,7 +104,7 @@ export class SearchQueryService {
   private buildWildcardQueries(text: string): QueryDslQueryContainer[] {
     const terms = this.splitSearchText(text);
     return terms.flatMap((term) =>
-      this.queryFields.map((fieldName) => ({
+      this.mustFields.map((fieldName) => ({
         wildcard: { [fieldName]: { value: `*${term}*` } },
       })),
     );