added testing for search by criteria with order

Author: alemarcha

src/Contexts/Backoffice/Courses/infrastructure/config/index.ts

@@ -13,6 +13,32 @@ const backofficeConfig = convict({
       format: String,
       env: 'ELASTIC_URL',
       default: 'http://localhost:9200'
+    },
+    indexName: 'backofficecourses',
+    config: {
+      settings: {
+        index: {
+          number_of_replicas: 0 // for local development
+        }
+      },
+      mappings: {
+        properties: {
+          id: {
+            type: 'keyword',
+            index: true
+          },
+          name: {
+            type: 'text',
+            index: true,
+            fielddata: true
+          },
+          duration: {
+            type: 'text',
+            index: true,
+            fielddata: true
+          }
+        }
+      }
     }
   }
 });

src/Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeElasticConfigFactory.ts

@@ -1,10 +1,12 @@
-import config from '../config';
 import ElasticConfig from '../../../../Shared/infrastructure/persistence/elasticsearch/ElasticConfig';
+import config from '../config';
 
 export class BackofficeElasticConfigFactory {
   static createConfig(): ElasticConfig {
     return {
-      url: config.get('elastic.url')
+      url: config.get('elastic.url'),
+      indexName: config.get('elastic.indexName'),
+      indexConfig: config.get('elastic.config')
     };
   }
 }

src/Contexts/Backoffice/Courses/infrastructure/persistence/ElasticBackofficeCourseRepository.ts

@@ -2,12 +2,13 @@ import { Criteria } from '../../../../Shared/domain/criteria/Criteria';
 import { ElasticRepository } from '../../../../Shared/infrastructure/persistence/elasticsearch/ElasticRepository';
 import { BackofficeCourse } from '../../domain/BackofficeCourse';
 import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
+import config from '../config';
 
 export class ElasticBackofficeCourseRepository
   extends ElasticRepository<BackofficeCourse>
   implements BackofficeCourseRepository {
   protected moduleName(): string {
-    return 'backofficecourses';
+    return config.get('elastic.indexName');
   }
 
   async searchAll(): Promise<BackofficeCourse[]> {

src/Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticClientFactory.ts

@@ -11,6 +11,8 @@ export class ElasticClientFactory {
     if (!client) {
       client = await ElasticClientFactory.createAndConnectClient(config);
 
+      await ElasticClientFactory.createIndexWithSettingsIfNotExists(client, config);
+
       ElasticClientFactory.registerClient(client, contextName);
     }
 
@@ -30,4 +32,15 @@ export class ElasticClientFactory {
   private static registerClient(client: ElasticClient, contextName: string): void {
     ElasticClientFactory.clients[contextName] = client;
   }
+
+  private static async createIndexWithSettingsIfNotExists(client: ElasticClient, config: ElasticConfig): Promise<void> {
+    const { body: exist } = await client.indices.exists({ index: config.indexName });
+
+    if (!exist) {
+      await client.indices.create({
+        index: config.indexName,
+        body: config.indexConfig
+      });
+    }
+  }
 }

src/Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticConfig.ts

@@ -1,3 +1,3 @@
-type ElasticConfig = { url: string };
+type ElasticConfig = { url: string; indexName: string; indexConfig: any };
 
 export default ElasticConfig;

src/Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticCriteriaConverter.ts

@@ -73,7 +73,7 @@ export class ElasticCriteriaConverter {
   }
 
   private termsQuery(filter: Filter): QueryObject {
-    return { type: TypeQueryEnum.TERMS, field: filter.field.value, value: filter.value.value };
+    return { type: TypeQueryEnum.TERMS, field: filter.field.value, value: [filter.value.value] };
   }
 
   private greaterThanQuery(filter: Filter): QueryObject {

src/Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticRepository.ts

@@ -24,16 +24,16 @@ export abstract class ElasticRepository<T extends AggregateRoot> {
   protected async searchAllInElastic(unserializer: (data: any) => T): Promise<T[]> {
     const body = bodybuilder().query(TypeQueryEnum.MATCH_ALL);
 
-    return this.searchInElasticWithSourceBuilder(unserializer, body);
+    return this.searchInElasticWithBuilder(unserializer, body);
   }
 
   protected async searchByCriteria(criteria: Criteria, unserializer: (data: any) => T): Promise<T[]> {
     const body = this.criteriaConverter.convert(criteria);
 
-    return this.searchInElasticWithSourceBuilder(unserializer, body);
+    return this.searchInElasticWithBuilder(unserializer, body);
   }
 
-  private async searchInElasticWithSourceBuilder(unserializer: (data: any) => T, body: Bodybuilder): Promise<T[]> {
+  private async searchInElasticWithBuilder(unserializer: (data: any) => T, body: Bodybuilder): Promise<T[]> {
     const client = await this.client();
 
     try {
@@ -47,7 +47,6 @@ export abstract class ElasticRepository<T extends AggregateRoot> {
       if (this.isNotFoundError(e)) {
         return [];
       }
-
       throw e;
     }
   }

src/apps/backoffice/backend/dependency-injection/Shared/application.yaml

@@ -7,7 +7,7 @@ services:
     factory:
       class: ../../../../../Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticClientFactory
       method: 'createClient'
-    arguments: ['mooc', '@Backoffice.courses.ElasticConfig']
+    arguments: ['backoffice', '@Backoffice.courses.ElasticConfig']
 
   Shared.QueryHandlersInformation:
     class: ../../../../../Contexts/Shared/infrastructure/QueryBus/QueryHandlersInformation

tests/Contexts/Backoffice/Courses/domain/BackofficeCourseCriteriaMother.ts

@@ -17,6 +17,6 @@ export class BackofficeCourseCriteriaMother {
     const nameFilter = new Filter(filterFieldName, filterOperator, valueName);
     const durationFilter = new Filter(filterFieldDuration, filterOperator, valueDuration);
 
-    return new Criteria(new Filters([nameFilter, durationFilter]), Order.asc('name'));
+    return new Criteria(new Filters([nameFilter, durationFilter]), Order.asc('id'));
   }
 }

tests/Contexts/Backoffice/Courses/infrastructure/BackofficeCourseRepository.test.ts

@@ -31,20 +31,18 @@ describe('BackofficeCourseRepository', () => {
   });
 
   describe('#searchByCriteria', () => {
-    it('should return courses using a criteria', async () => {
+    it('should return courses using a criteria sorting by id', async () => {
       const courses = [
         BackofficeCourseMother.withNameAndDuration('DDD in Typescript', '8 days'),
         BackofficeCourseMother.withNameAndDuration('DDD in Golang', '3 days'),
         BackofficeCourseMother.random()
       ];
-
       await Promise.all(courses.map(async course => repository.save(course)));
+      const result = await repository.matching(BackofficeCourseCriteriaMother.nameAndDurationContains('DDD', 'days'));
 
-      const expectedCourses = await repository.matching(
-        BackofficeCourseCriteriaMother.nameAndDurationContains('DDD', 'days')
-      );
-
-      expect(expectedCourses).toHaveLength(2);
+      const expectedCourses = courses.slice(0, 2);
+      expect(result).toHaveLength(2);
+      expect(expectedCourses.sort(sort)).toEqual(result);
     });
   });
 });