Merge pull request #88 from CodelyTV/part_five_elastic

Part five elastic

Author: vilasmaciel

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

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

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

@@ -2,8 +2,6 @@ import { ElasticRepository } from '../../../../Shared/infrastructure/persistence
 import { BackofficeCourse } from '../../domain/BackofficeCourse';
 import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
 
-type ElasticBackofficeCourseDocument = { _source: { id: string; duration: string; name: string } };
-
 export class ElasticBackofficeCourseRepository
   extends ElasticRepository<BackofficeCourse>
   implements BackofficeCourseRepository {
@@ -12,23 +10,10 @@ export class ElasticBackofficeCourseRepository
   }
 
   async searchAll(): Promise<BackofficeCourse[]> {
-    const client = await this.client();
-
-    const response = await client.search({
-      index: this.moduleName(),
-      body: {
-        query: {
-          match_all: {}
-        }
-      }
-    });
-
-    return response.body.hits.hits.map((hit: ElasticBackofficeCourseDocument) =>
-      BackofficeCourse.fromPrimitives({ ...hit._source })
-    );
+    return this.searchAllInElastic(BackofficeCourse.fromPrimitives);
   }
 
   async save(course: BackofficeCourse): Promise<void> {
-    return this.persist(this.moduleName(), course);
+    return this.persist(course);
   }
 }

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

@@ -1,15 +1,15 @@
 import { Client as ElasticClient } from '@elastic/elasticsearch';
-import config from '../../../../../apps/backoffice/backend/config/config';
 import { Nullable } from '../../../domain/Nullable';
+import ElasticConfig from './ElasticConfig';
 
 export class ElasticClientFactory {
   private static clients: { [key: string]: ElasticClient } = {};
 
-  static async createClient(contextName: string): Promise<ElasticClient> {
+  static async createClient(contextName: string, config: ElasticConfig): Promise<ElasticClient> {
     let client = ElasticClientFactory.getClient(contextName);
 
     if (!client) {
-      client = await ElasticClientFactory.createAndConnectClient();
+      client = await ElasticClientFactory.createAndConnectClient(config);
 
       ElasticClientFactory.registerClient(client, contextName);
     }
@@ -21,8 +21,8 @@ export class ElasticClientFactory {
     return ElasticClientFactory.clients[contextName];
   }
 
-  private static async createAndConnectClient(): Promise<ElasticClient> {
-    const client = new ElasticClient({ node: config.get('elastic.url') });
+  private static async createAndConnectClient(config: ElasticConfig): Promise<ElasticClient> {
+    const client = new ElasticClient({ node: config.url });
 
     return client;
   }

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

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

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

@@ -1,6 +1,8 @@
 import { Client as ElasticClient } from '@elastic/elasticsearch';
 import { AggregateRoot } from '../../../domain/AggregateRoot';
 
+type Hit = { _source: any };
+
 export abstract class ElasticRepository<T extends AggregateRoot> {
   constructor(private _client: Promise<ElasticClient>) {}
 
@@ -10,10 +12,25 @@ export abstract class ElasticRepository<T extends AggregateRoot> {
     return this._client;
   }
 
-  protected async persist(index: string, aggregateRoot: T): Promise<void> {
-    const document = { ...aggregateRoot.toPrimitives() };
+  protected async searchAllInElastic(unserializer: (data: any) => T): Promise<T[]> {
+    const client = await this.client();
+
+    const response = await client.search({
+      index: this.moduleName(),
+      body: {
+        query: {
+          match_all: {}
+        }
+      }
+    });
+
+    return response.body.hits.hits.map((hit: Hit) => unserializer({ ...hit._source }));
+  }
+
+  protected async persist(aggregateRoot: T): Promise<void> {
     const client = await this.client();
+    const document = { ...aggregateRoot.toPrimitives() };
 
-    await client.index({ index: index, body: document, refresh: 'wait_for' }); // wait_for wait for a refresh to make this operation visible to search
+    await client.index({ index: this.moduleName(), body: document, refresh: 'wait_for' }); // wait_for wait for a refresh to make this operation visible to search
   }
 }

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

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

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

@@ -1,13 +1,18 @@
 services:
-    Apps.Backoffice.Backend.MongoConfig:
-      factory:
-        class: ../../../../../../Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeMongoConfigFactory
-        method: 'createConfig'
+  Apps.Backoffice.Backend.MongoConfig:
+    factory:
+      class: ../../../../../../Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeMongoConfigFactory
+      method: 'createConfig'
 
-    Apps.Backoffice.Backend.controllers.StatusGetController:
-      class: ../../../controllers/StatusGetController
-      arguments: []
+  Apps.Backoffice.Backend.ElasticConfig:
+    factory:
+      class: ../../../../../../Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeElasticConfigFactory
+      method: 'createConfig'
 
-    Apps.Backoffice.Backend.controllers.CoursesGetController:
-      class: ../../../controllers/CoursesGetController
-      arguments: ['@Shared.QueryBus']
+  Apps.Backoffice.Backend.controllers.StatusGetController:
+    class: ../../../controllers/StatusGetController
+    arguments: []
+
+  Apps.Backoffice.Backend.controllers.CoursesGetController:
+    class: ../../../controllers/CoursesGetController
+    arguments: ['@Shared.QueryBus']