Refactor contexts folder structure

vilasmaciel · vilasmaciel · commit 36f44bf6ca89 · 2020-11-25T13:47:50.000+01:00
diff --git a/Makefile b/Makefile
@@ -42,6 +42,6 @@ start-backoffice-frontend: build
 clean:
 	docker-compose down --rmi local --volumes --remove-orphans
 
-# Start mongodb container in background
+# Start databases containers in background
 start_database:
-	docker-compose up -d mongo
+	docker-compose up -d mongo elasticsearch
diff --git a/src/Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator.ts b/src/Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator.ts
@@ -1,8 +1,8 @@
-import { BackofficeCourse } from '../domain/BackofficeCourse';
-import { BackofficeCourseDuration } from '../domain/BackofficeCourseDuration';
-import { BackofficeCourseId } from '../domain/BackofficeCourseId';
-import { BackofficeCourseName } from '../domain/BackofficeCourseName';
-import { BackofficeCourseRepository } from '../domain/BackofficeCourseRepository';
+import { BackofficeCourse } from '../../domain/BackofficeCourse';
+import { BackofficeCourseDuration } from '../../domain/BackofficeCourseDuration';
+import { BackofficeCourseId } from '../../domain/BackofficeCourseId';
+import { BackofficeCourseName } from '../../domain/BackofficeCourseName';
+import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
 
 export class BackofficeCourseCreator {
   constructor(private backofficeCourseRepository: BackofficeCourseRepository) {}
diff --git a/src/Contexts/Backoffice/Courses/application/Create/CreateBackofficeCourseOnCourseCreated.ts b/src/Contexts/Backoffice/Courses/application/Create/CreateBackofficeCourseOnCourseCreated.ts
@@ -1,6 +1,6 @@
-import { CourseCreatedDomainEvent } from '../../../Mooc/Courses/domain/CourseCreatedDomainEvent';
-import { DomainEventClass } from '../../../Shared/domain/DomainEvent';
-import { DomainEventSubscriber } from '../../../Shared/domain/DomainEventSubscriber';
+import { CourseCreatedDomainEvent } from '../../../../Mooc/Courses/domain/CourseCreatedDomainEvent';
+import { DomainEventClass } from '../../../../Shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../../Shared/domain/DomainEventSubscriber';
 import { BackofficeCourseCreator } from './BackofficeCourseCreator';
 
 export class CreateBackofficeCourseOnCourseCreated implements DomainEventSubscriber<CourseCreatedDomainEvent> {
diff --git a/src/Contexts/Backoffice/Courses/application/SearchAll/CoursesFinder.ts b/src/Contexts/Backoffice/Courses/application/SearchAll/CoursesFinder.ts
@@ -1,4 +1,4 @@
-import { BackofficeCourseRepository } from '../../Courses/domain/BackofficeCourseRepository';
+import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
 import { SearchAllCoursesResponse } from './SearchAllCoursesResponse';
 
 export class CoursesFinder {
diff --git a/src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQuery.ts b/src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQuery.ts
@@ -0,0 +1,3 @@
+import { Query } from '../../../../Shared/domain/Query';
+
+export class SearchAllCoursesQuery implements Query {}
diff --git a/src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQueryHandler.ts b/src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQueryHandler.ts
@@ -1,5 +1,5 @@
-import { Query } from '../../../Shared/domain/Query';
-import { QueryHandler } from '../../../Shared/domain/QueryHandler';
+import { Query } from '../../../../Shared/domain/Query';
+import { QueryHandler } from '../../../../Shared/domain/QueryHandler';
 import { CoursesFinder } from './CoursesFinder';
 import { SearchAllCoursesQuery } from './SearchAllCoursesQuery';
 import { SearchAllCoursesResponse } from './SearchAllCoursesResponse';
diff --git a/src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesResponse.ts b/src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesResponse.ts
@@ -1,4 +1,4 @@
-import { BackofficeCourse } from '../../Courses/domain/BackofficeCourse';
+import { BackofficeCourse } from '../../domain/BackofficeCourse';
 
 export class SearchAllCoursesResponse {
   readonly courses: Array<BackofficeCourse>;
diff --git a/src/Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeMongoConfigFactory.ts b/src/Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeMongoConfigFactory.ts
@@ -0,0 +1,11 @@
+import config from '../../../../../apps/mooc_backend/config/config';
+import MongoConfig from '../../../../Shared/infrastructure/persistence/mongo/MongoConfig';
+
+export class BackofficeMongoConfigFactory {
+  static createConfig(): MongoConfig {
+    console.log(config.get('mongo.url'));
+    return {
+      url: config.get('mongo.url')
+    };
+  }
+}
diff --git a/src/Contexts/Backoffice/Courses/infrastructure/persistence/ElasticBackofficeCourseRepository.ts b/src/Contexts/Backoffice/Courses/infrastructure/persistence/ElasticBackofficeCourseRepository.ts
@@ -1,6 +1,6 @@
-import { ElasticRepository } from '../../Shared/infrastructure/persistence/elasticsearch/ElasticRepository';
-import { BackofficeCourse } from '../domain/BackofficeCourse';
-import { BackofficeCourseRepository } from '../domain/BackofficeCourseRepository';
+import { ElasticRepository } from '../../../../Shared/infrastructure/persistence/elasticsearch/ElasticRepository';
+import { BackofficeCourse } from '../../domain/BackofficeCourse';
+import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
 
 type ElasticBackofficeCourseDocument = { _source: { id: string; duration: string; name: string } };
 
diff --git a/src/Contexts/Backoffice/Courses/infrastructure/persistence/MongoBackofficeCourseRepository.ts b/src/Contexts/Backoffice/Courses/infrastructure/persistence/MongoBackofficeCourseRepository.ts
@@ -1,6 +1,6 @@
-import { MongoRepository } from '../../../Shared/infrastructure/persistence/mongo/MongoRepository';
-import { BackofficeCourse } from '../../Courses/domain/BackofficeCourse';
-import { BackofficeCourseRepository } from '../../Courses/domain/BackofficeCourseRepository';
+import { MongoRepository } from '../../../../Shared/infrastructure/persistence/mongo/MongoRepository';
+import { BackofficeCourse } from '../../domain/BackofficeCourse';
+import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
 
 export class MongoBackofficeCourseRepository
   extends MongoRepository<BackofficeCourse>
diff --git a/src/Contexts/Backoffice/SearchAll/application/SearchAllCoursesQuery.ts b/src/Contexts/Backoffice/SearchAll/application/SearchAllCoursesQuery.ts
diff --git a/src/Contexts/Mooc/Courses/application/CourseCreator.ts b/src/Contexts/Mooc/Courses/application/CourseCreator.ts
@@ -1,10 +1,9 @@
-import { CourseRepository } from '../domain/CourseRepository';
-import { Course } from '../domain/Course';
-import { CreateCourseRequest } from './CreateCourseRequest';
+import { EventBus } from '../../../Shared/domain/EventBus';
 import { CourseId } from '../../Shared/domain/Courses/CourseId';
-import { CourseName } from '../domain/CourseName';
+import { Course } from '../domain/Course';
 import { CourseDuration } from '../domain/CourseDuration';
-import { EventBus } from '../../../Shared/domain/EventBus';
+import { CourseName } from '../domain/CourseName';
+import { CourseRepository } from '../domain/CourseRepository';
 
 type Params = {
   courseId: CourseId;
diff --git a/src/Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticRepository.ts b/src/Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticRepository.ts
@@ -1,5 +1,5 @@
 import { Client as ElasticClient } from '@elastic/elasticsearch';
-import { AggregateRoot } from '../../../../Mooc/Courses/domain/AggregateRoot';
+import { AggregateRoot } from '../../../domain/AggregateRoot';
 
 export abstract class ElasticRepository<T extends AggregateRoot> {
   constructor(private _client: Promise<ElasticClient>) {}
diff --git a/src/apps/backoffice/backend/config/dependency-injection/Courses/application.yaml b/src/apps/backoffice/backend/config/dependency-injection/Courses/application.yaml
@@ -1,28 +1,29 @@
 services:
-  Backoffice.Backend.courses.BackofficeCourseRepository:
-    class: ../../../../../../Contexts/Backoffice/Shared/infrastructure/MongoBackofficeCourseRepository
-    arguments: ['@Shared.ConnectionManager']
 
-  Backoffice.Backend.courses.BackofficeCourseRepositoryElastic:
-    class: ../../../../../../Contexts/Backoffice/infrastructure/ElasticBackofficeCourseRepository
-    arguments: ['@Shared.ConnectionManagerElastic']
+  Backoffice.courses.BackofficeCourseRepository:
+    class: ../../../../../../Contexts/Backoffice/Courses/infrastructure/persistence/MongoBackofficeCourseRepository
+    arguments: ['@Shared.MongoConnectionManager']
 
-  Backoffice.Backend.courses.CoursesFinder:
-    class: ../../../../../../Contexts/Backoffice/SearchAll/application//CoursesFinder
-    arguments: ['@Backoffice.Backend.courses.BackofficeCourseRepository']
+  Backoffice.courses.BackofficeCourseRepositoryElastic:
+    class: ../../../../../../Contexts/Backoffice/Courses/infrastructure/persistence/ElasticBackofficeCourseRepository
+    arguments: ['@Shared.ElasticConnectionManager']
 
-  Backoffice.Backend.courses.SearchAllCoursesQueryHandler:
-    class: ../../../../../../Contexts/Backoffice/SearchAll/application//SearchAllCoursesQueryHandler
-    arguments: ['@Backoffice.Backend.courses.CoursesFinder']
+  Backoffice.courses.CoursesFinder:
+    class: ../../../../../../Contexts/Backoffice/Courses/application/SearchAll/CoursesFinder
+    arguments: ['@Backoffice.courses.BackofficeCourseRepository']
+
+  Backoffice.courses.SearchAllCoursesQueryHandler:
+    class: ../../../../../../Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQueryHandler
+    arguments: ['@Backoffice.courses.CoursesFinder']
     tags:
       - { name: 'queryHandler' }
 
-  Backoffice.Backend.courses.BackofficeCourseCreator:
-    class: ../../../../../../Contexts/Backoffice/Courses/application/BackofficeCourseCreator
-    arguments: ['@Backoffice.Backend.courses.BackofficeCourseRepository']
+  Backoffice.courses.BackofficeCourseCreator:
+    class: ../../../../../../Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator
+    arguments: ['@Backoffice.courses.BackofficeCourseRepository']
 
-  Backoffice.Backend.courses.CreateBackofficeCourseOnCourseCreated:
-    class: ../../../../../../Contexts/Backoffice/Courses/application/CreateBackofficeCourseOnCourseCreated
-    arguments: ['@Backoffice.Backend.courses.BackofficeCourseCreator']
+  Backoffice.courses.CreateBackofficeCourseOnCourseCreated:
+    class: ../../../../../../Contexts/Backoffice/Courses/application/Create/CreateBackofficeCourseOnCourseCreated
+    arguments: ['@Backoffice.courses.BackofficeCourseCreator']
     tags:
       - { name: 'domainEventSubscriber' }
diff --git a/src/apps/backoffice/backend/config/dependency-injection/Shared/application.yaml b/src/apps/backoffice/backend/config/dependency-injection/Shared/application.yaml
@@ -3,13 +3,13 @@ services:
     class: ../../../../../../Contexts/Shared/infrastructure/WinstonLogger
     arguments: []
 
-  Shared.ConnectionManager:
+  Shared.MongoConnectionManager:
     factory:
       class: ../../../../../../Contexts/Shared/infrastructure/persistence/mongo/MongoClientFactory
       method: 'createClient'
-      arguments: ['mooc']
+    arguments: ['mooc', '@Apps.Backoffice.Backend.MongoConfig']
 
-  Shared.ConnectionManagerElastic:
+  Shared.ElasticConnectionManager:
     factory:
       class: ../../../../../../Contexts/Shared/infrastructure/persistence/elasticsearch/ElasticClientFactory
       method: 'createClient'
diff --git a/src/apps/backoffice/backend/config/dependency-injection/application.yaml b/src/apps/backoffice/backend/config/dependency-injection/application.yaml
@@ -1,4 +1,4 @@
 imports:
   - { resource: ./Shared/application.yaml }
   - { resource: ./apps/application.yaml }
-  - { resource: ./Courses/application.yaml }
+  - { resource: ./Courses/application.yaml }
diff --git a/src/apps/backoffice/backend/config/dependency-injection/application_test.yaml b/src/apps/backoffice/backend/config/dependency-injection/application_test.yaml
@@ -4,7 +4,8 @@ imports:
 services:
   Backoffice.Backend.EnvironmentArranger:
     class: ../../../../../../tests/Contexts/Shared/infrastructure/mongo/MongoEnvironmentArranger
-    arguments: ['@Shared.ConnectionManager']
+    arguments: ['@Shared.MongoConnectionManager']
+
   Backoffice.Backend.ElasticEnvironmentArranger:
     class: ../../../../../../tests/Contexts/Shared/infrastructure/elastic/ElasticEnvironmentArranger
-    arguments: ['@Shared.ConnectionManagerElastic']
+    arguments: ['@Shared.ElasticConnectionManager']
diff --git a/src/apps/backoffice/backend/config/dependency-injection/apps/application.yaml b/src/apps/backoffice/backend/config/dependency-injection/apps/application.yaml
@@ -1,8 +1,13 @@
 services:
+    Apps.Backoffice.Backend.MongoConfig:
+      factory:
+        class: ../../../../../../Contexts/Backoffice/Courses/infrastructure/persistence/BackofficeMongoConfigFactory
+        method: 'createConfig'
+
     Apps.Backoffice.Backend.controllers.StatusGetController:
-        class: ../../../controllers/StatusGetController
-        arguments: []
+      class: ../../../controllers/StatusGetController
+      arguments: []
 
     Apps.Backoffice.Backend.controllers.CoursesGetController:
-        class: ../../../controllers/CoursesGetController
-        arguments: ['@Shared.QueryBus']
+      class: ../../../controllers/CoursesGetController
+      arguments: ['@Shared.QueryBus']
diff --git a/src/apps/backoffice/backend/controllers/CoursesGetController.ts b/src/apps/backoffice/backend/controllers/CoursesGetController.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import httpStatus from 'http-status';
-import { SearchAllCoursesQuery } from '../../../../Contexts/Backoffice/SearchAll/application/SearchAllCoursesQuery';
-import { SearchAllCoursesResponse } from '../../../../Contexts/Backoffice/SearchAll/application/SearchAllCoursesResponse';
+import { SearchAllCoursesQuery } from '../../../../Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQuery';
+import { SearchAllCoursesResponse } from '../../../../Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesResponse';
 import { BackofficeCourse } from '../../../../Contexts/Backoffice/Courses/domain/BackofficeCourse';
 import { QueryBus } from '../../../../Contexts/Shared/domain/QueryBus';
 import { Controller } from './Controller';
diff --git a/tests/Contexts/Backoffice/Courses/__mocks__/BackofficeCourseRepositoryMock.ts b/tests/Contexts/Backoffice/Courses/__mocks__/BackofficeCourseRepositoryMock.ts
diff --git a/tests/Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator.test.ts b/tests/Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator.test.ts
@@ -1,6 +1,6 @@
-import { BackofficeCourseCreator } from '../../../../../src/Contexts/Backoffice/Courses/application/BackofficeCourseCreator';
-import { BackofficeCourseRepositoryMock } from '../../Shared/__mocks__/BackofficeCourseRepositoryMock';
-import { BackofficeCourseMother } from '../domain/BackofficeCourseMother';
+import { BackofficeCourseCreator } from '../../../../../../src/Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator';
+import { BackofficeCourseRepositoryMock } from '../../__mocks__/BackofficeCourseRepositoryMock';
+import { BackofficeCourseMother } from '../../domain/BackofficeCourseMother';
 
 describe('BackofficeCourseCreator', () => {
   it('creates a backoffice course', async () => {
diff --git a/tests/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQueryHandler.test.ts b/tests/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQueryHandler.test.ts
@@ -1,9 +1,9 @@
-import { SearchAllCoursesQueryHandler } from '../../../../../src/Contexts/Backoffice/SearchAll/application/SearchAllCoursesQueryHandler';
-import { CoursesFinder } from '../../../../../src/Contexts/Backoffice/SearchAll/application/CoursesFinder';
-import { SearchAllCoursesQuery } from '../../../../../src/Contexts/Backoffice/SearchAll/application/SearchAllCoursesQuery';
-import { BackofficeCourseRepositoryMock } from '../../Shared/__mocks__/BackofficeCourseRepositoryMock';
-import { BackofficeCourseMother } from '../../Courses/domain/BackofficeCourseMother';
-import { SearchAllCoursesResponseMother } from '../domain/SearchAllCoursesResponseMother';
+import { CoursesFinder } from '../../../../../../src/Contexts/Backoffice/Courses/application/SearchAll/CoursesFinder';
+import { SearchAllCoursesQuery } from '../../../../../../src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQuery';
+import { SearchAllCoursesQueryHandler } from '../../../../../../src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQueryHandler';
+import { BackofficeCourseMother } from '../../domain/BackofficeCourseMother';
+import { SearchAllCoursesResponseMother } from '../../domain/SearchAllCoursesResponseMother';
+import { BackofficeCourseRepositoryMock } from '../../__mocks__/BackofficeCourseRepositoryMock';
 
 describe('SearchAllCourses QueryHandler', () => {
   let repository: BackofficeCourseRepositoryMock;
diff --git a/tests/Contexts/Backoffice/Courses/domain/SearchAllCoursesResponseMother.ts b/tests/Contexts/Backoffice/Courses/domain/SearchAllCoursesResponseMother.ts
@@ -1,5 +1,5 @@
+import { SearchAllCoursesResponse } from '../../../../../src/Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesResponse';
 import { BackofficeCourse } from '../../../../../src/Contexts/Backoffice/Courses/domain/BackofficeCourse';
-import { SearchAllCoursesResponse } from '../../../../../src/Contexts/Backoffice/SearchAll/application/SearchAllCoursesResponse';
 
 export class SearchAllCoursesResponseMother {
   static create(courses: Array<BackofficeCourse>) {
diff --git a/tests/Contexts/Backoffice/Courses/infrastructure/ElasticBackofficeCourseRepository.test.ts b/tests/Contexts/Backoffice/Courses/infrastructure/ElasticBackofficeCourseRepository.test.ts
@@ -1,11 +1,11 @@
-import container from '../../../../src/apps/backoffice/backend/config/dependency-injection';
-import { BackofficeCourse } from '../../../../src/Contexts/Backoffice/domain/BackofficeCourse';
-import { ElasticBackofficeCourseRepository } from '../../../../src/Contexts/Backoffice/infrastructure/ElasticBackofficeCourseRepository';
-import { EnvironmentArranger } from '../../Shared/infrastructure/arranger/EnvironmentArranger';
-import { BackofficeCourseMother } from '../application/domain/BackofficeCourseMother';
+import container from '../../../../../src/apps/backoffice/backend/config/dependency-injection';
+import { BackofficeCourse } from '../../../../../src/Contexts/Backoffice/Courses/domain/BackofficeCourse';
+import { ElasticBackofficeCourseRepository } from '../../../../../src/Contexts/Backoffice/Courses/infrastructure/persistence/ElasticBackofficeCourseRepository';
+import { EnvironmentArranger } from '../../../Shared/infrastructure/arranger/EnvironmentArranger';
+import { BackofficeCourseMother } from '../domain/BackofficeCourseMother';
 
 const repository: ElasticBackofficeCourseRepository = container.get(
-  'Backoffice.Backend.courses.BackofficeCourseRepositoryElastic'
+  'Backoffice.courses.BackofficeCourseRepositoryElastic'
 );
 const environmentArranger: Promise<EnvironmentArranger> = container.get(
   'Backoffice.Backend.ElasticEnvironmentArranger'
diff --git a/tests/Contexts/Backoffice/Courses/infrastructure/MongoBackofficeCourseRepository.test.ts b/tests/Contexts/Backoffice/Courses/infrastructure/MongoBackofficeCourseRepository.test.ts
@@ -1,18 +1,12 @@
 import container from '../../../../../src/apps/backoffice/backend/config/dependency-injection';
 import { BackofficeCourse } from '../../../../../src/Contexts/Backoffice/Courses/domain/BackofficeCourse';
-import { MongoBackofficeCourseRepository } from '../../../../../src/Contexts/Backoffice/Shared/infrastructure/MongoBackofficeCourseRepository';
+import { MongoBackofficeCourseRepository } from '../../../../../src/Contexts/Backoffice/Courses/infrastructure/persistence/MongoBackofficeCourseRepository';
 import { EnvironmentArranger } from '../../../Shared/infrastructure/arranger/EnvironmentArranger';
-import { BackofficeCourseMother } from '../../Courses/domain/BackofficeCourseMother';
+import { BackofficeCourseMother } from '../domain/BackofficeCourseMother';
 
-const repository: MongoBackofficeCourseRepository = container.get(
-  'Backoffice.Backend.courses.BackofficeCourseRepository'
-);
+const repository: MongoBackofficeCourseRepository = container.get('Backoffice.courses.BackofficeCourseRepository');
 const environmentArranger: Promise<EnvironmentArranger> = container.get('Backoffice.Backend.EnvironmentArranger');
 
-function sort(backofficeCourse1: BackofficeCourse, backofficeCourse2: BackofficeCourse): number {
-  return backofficeCourse1?.id?.value.localeCompare(backofficeCourse2?.id?.value);
-}
-
 beforeEach(async () => {
   await (await environmentArranger).arrange();
 });
@@ -38,3 +32,7 @@ describe('Mongo BackofficeCourse Repository', () => {
     expect(await repository.searchAll()).toContainEqual(course);
   });
 });
+
+function sort(backofficeCourse1: BackofficeCourse, backofficeCourse2: BackofficeCourse): number {
+  return backofficeCourse1?.id?.value.localeCompare(backofficeCourse2?.id?.value);
+}
diff --git a/tests/Contexts/Mooc/Courses/domain/CourseMother.ts b/tests/Contexts/Mooc/Courses/domain/CourseMother.ts
@@ -1,12 +1,11 @@
-import { CourseId } from '../../../../../src/Contexts/Mooc/Shared/domain/Courses/CourseId';
-import { CourseName } from '../../../../../src/Contexts/Mooc/Courses/domain/CourseName';
-import { CourseDuration } from '../../../../../src/Contexts/Mooc/Courses/domain/CourseDuration';
+import { CreateCourseCommand } from '../../../../../src/Contexts/Mooc/Courses/application/CreateCourseCommand';
 import { Course } from '../../../../../src/Contexts/Mooc/Courses/domain/Course';
-import { CreateCourseRequest } from '../../../../../src/Contexts/Mooc/Courses/application/CreateCourseRequest';
+import { CourseDuration } from '../../../../../src/Contexts/Mooc/Courses/domain/CourseDuration';
+import { CourseName } from '../../../../../src/Contexts/Mooc/Courses/domain/CourseName';
+import { CourseId } from '../../../../../src/Contexts/Mooc/Shared/domain/Courses/CourseId';
 import { CourseIdMother } from '../../Shared/domain/Courses/CourseIdMother';
-import { CourseNameMother } from './CourseNameMother';
 import { CourseDurationMother } from './CourseDurationMother';
-import { CreateCourseCommand } from '../../../../../src/Contexts/Mooc/Courses/application/CreateCourseCommand';
+import { CourseNameMother } from './CourseNameMother';
 
 export class CourseMother {
   static create(id: CourseId, name: CourseName, duration: CourseDuration): Course {
diff --git a/tests/apps/backoffice/backend/features/step_definitions/repository.steps.ts b/tests/apps/backoffice/backend/features/step_definitions/repository.steps.ts
@@ -6,7 +6,7 @@ import { CourseName } from '../../../../../../src/Contexts/Mooc/Courses/domain/C
 import { CourseRepository } from '../../../../../../src/Contexts/Mooc/Courses/domain/CourseRepository';
 import { CourseId } from '../../../../../../src/Contexts/Mooc/Shared/domain/Courses/CourseId';
 
-const courseRepository: CourseRepository = container.get('Backoffice.Backend.courses.BackofficeCourseRepository');
+const courseRepository: CourseRepository = container.get('Backoffice.courses.BackofficeCourseRepository');
 
 Given('there is the course:', async (course: any) => {
   const { id, name, duration } = JSON.parse(course);
diff --git a/tests/apps/backoffice/frontend/features/courses/list_courses.cypress.ts b/tests/apps/backoffice/frontend/features/courses/list_courses.cypress.ts
@@ -1,5 +1,3 @@
-import faker from 'faker';
-
 describe('List courses', () => {
   before(() => {
     cy.task('reset:backoffice:db');
diff --git a/tests/utils/cypress/plugins/index.ts b/tests/utils/cypress/plugins/index.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { BackofficeCourseRepository } from '../../Courses/domain/BackofficeCourseRepository';`
	`1`	`+import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';`
`2`	`2`	`import { SearchAllCoursesResponse } from './SearchAllCoursesResponse';`
`3`	`3`
`4`	`4`	`export class CoursesFinder {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import { Query } from '../../../../Shared/domain/Query';`
	`2`	`+`
	`3`	`+export class SearchAllCoursesQuery implements Query {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { BackofficeCourse } from '../../Courses/domain/BackofficeCourse';`
	`1`	`+import { BackofficeCourse } from '../../domain/BackofficeCourse';`
`2`	`2`
`3`	`3`	`export class SearchAllCoursesResponse {`
`4`	`4`	`readonly courses: Array<BackofficeCourse>;`