Merge branch 'part_five' into rabbitmq-eventbus

Author: Fortiz2305

src/apps/backoffice/backend/config/default.json renamed to src/Contexts/Backoffice/Courses/infrastructure/config/default.json

@@ -1,20 +1,12 @@
 import convict from 'convict';
 
-const convictConfig = convict({
+const backofficeConfig = convict({
   env: {
     doc: 'The application environment.',
     format: ['production', 'development', 'staging', 'test'],
     default: 'default',
     env: 'NODE_ENV'
   },
-  mongo: {
-    url: {
-      doc: 'The Mongo connection URL',
-      format: String,
-      env: 'MONGO_URL',
-      default: 'mongodb://localhost:27017/backoffice-backend-dev'
-    }
-  },
   elastic: {
     url: {
       doc: 'The Elastic connection URL',
@@ -25,6 +17,6 @@ const convictConfig = convict({
   }
 });
 
-convictConfig.loadFile([__dirname + '/default.json', __dirname + '/' + convictConfig.get('env') + '.json']);
+backofficeConfig.loadFile([__dirname + '/default.json', __dirname + '/' + backofficeConfig.get('env') + '.json']);
 
-export default convictConfig;
+export default backofficeConfig;

src/apps/backoffice/backend/config/config.ts renamed to src/Contexts/Backoffice/Courses/infrastructure/config/index.ts

@@ -0,0 +1,5 @@
+{
+  "elastic": {
+    "url": "http://elasticsearch:9200"
+  }
+}

src/Contexts/Backoffice/Courses/infrastructure/config/production.json

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

src/apps/backoffice/backend/config/staging.json renamed to src/Contexts/Backoffice/Courses/infrastructure/config/staging.json

@@ -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/apps/backoffice/backend/config/test.json renamed to src/Contexts/Backoffice/Courses/infrastructure/config/test.json

@@ -11,7 +11,6 @@ export class MongoCourseRepository extends MongoRepository<Course> implements Co
 
   public async search(id: CourseId): Promise<Nullable<Course>> {
     const collection = await this.collection();
-
     const document = await collection.findOne({ _id: id.value });
 
     return document ? Course.fromPrimitives({ ...document, id: id.value }) : null;