some renaming and refactor

Author: alemarcha

src/Contexts/Backoffice/Courses/application/BackofficeCourseResponse.ts

@@ -1,9 +1,9 @@
-import { BackofficeCourseResponse } from './BackofficeCourseResponse';
+import { BackofficeCourse } from '../domain/BackofficeCourse';
 
 export class BackofficeCoursesResponse {
- readonly courses: Array<BackofficeCourseResponse>;
+ readonly courses: Array<BackofficeCourse>;
 
- constructor(courses: Array<BackofficeCourseResponse>) {
+ constructor(courses: Array<BackofficeCourse>) {
  this.courses = courses;
  }
 }

src/Contexts/Backoffice/Courses/application/BackofficeCoursesResponse.ts

@@ -1,5 +1,4 @@
 import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
-import { BackofficeCourseResponse } from '../BackofficeCourseResponse';
 import { BackofficeCoursesResponse } from '../BackofficeCoursesResponse';
 
 export class CoursesFinder {
@@ -8,8 +7,6 @@ export class CoursesFinder {
  async run() {
  const courses = await this.coursesRepository.searchAll();
 
- const backofficeCourseResponses = courses.map(BackofficeCourseResponse.fromAggregate);
-
- return new BackofficeCoursesResponse(backofficeCourseResponses);
+ return new BackofficeCoursesResponse(courses);
  }
 }

src/Contexts/Backoffice/Courses/application/SearchAll/CoursesFinder.ts

@@ -2,7 +2,6 @@ import { Criteria } from '../../../../Shared/domain/criteria/Criteria';
 import { Filters } from '../../../../Shared/domain/criteria/Filters';
 import { Order } from '../../../../Shared/domain/criteria/Order';
 import { BackofficeCourseRepository } from '../../domain/BackofficeCourseRepository';
-import { BackofficeCourseResponse } from '../BackofficeCourseResponse';
 import { BackofficeCoursesResponse } from '../BackofficeCoursesResponse';
 
 export class CoursesByCriteriaSearcher {
@@ -13,8 +12,6 @@ export class CoursesByCriteriaSearcher {
 
  const courses = await this.repository.matching(criteria);
 
- const backofficeCourseResponses = courses.map(BackofficeCourseResponse.fromAggregate);
-
- return new BackofficeCoursesResponse(backofficeCourseResponses);
+ return new BackofficeCoursesResponse(courses);
  }
 }

src/Contexts/Backoffice/Courses/application/SearchByCriteria/CoursesByCriteriaSearcher.ts

@@ -16,7 +16,6 @@ export class SearchCoursesByCriteriaQueryHandler
 
  handle(query: SearchCoursesByCriteriaQuery): Promise<BackofficeCoursesResponse> {
  const filters = Filters.fromValues(query.filters);
-
  const order = Order.fromValues(query.orderBy, query.orderType);
 
  return this.searcher.run(filters, order, query.offset, query.limit);

src/Contexts/Backoffice/Courses/application/SearchByCriteria/SearchCoursesByCriteriaQueryHandler.ts

@@ -1,7 +1,7 @@
 import { EnumValueObject } from '../value-object/EnumValueObject';
 import { InvalidArgumentError } from '../value-object/InvalidArgumentError';
 
-export enum FilterOperators {
+export enum Operator {
  EQUAL = '=',
  NOT_EQUAL = '!=',
  GT = '>',
@@ -10,35 +10,35 @@ export enum FilterOperators {
  NOT_CONTAINS = 'NOT_CONTAINS'
 }
 
-export class FilterOperator extends EnumValueObject<FilterOperators> {
- constructor(value: FilterOperators) {
- super(value, Object.values(FilterOperators));
+export class FilterOperator extends EnumValueObject<Operator> {
+ constructor(value: Operator) {
+ super(value, Object.values(Operator));
  }
 
  static fromValue(value: string): FilterOperator {
  switch (value) {
- case FilterOperators.EQUAL:
- return new FilterOperator(FilterOperators.EQUAL);
- case FilterOperators.NOT_EQUAL:
- return new FilterOperator(FilterOperators.NOT_EQUAL);
- case FilterOperators.GT:
- return new FilterOperator(FilterOperators.GT);
- case FilterOperators.LT:
- return new FilterOperator(FilterOperators.LT);
- case FilterOperators.CONTAINS:
- return new FilterOperator(FilterOperators.CONTAINS);
- case FilterOperators.NOT_CONTAINS:
- return new FilterOperator(FilterOperators.NOT_CONTAINS);
+ case Operator.EQUAL:
+ return new FilterOperator(Operator.EQUAL);
+ case Operator.NOT_EQUAL:
+ return new FilterOperator(Operator.NOT_EQUAL);
+ case Operator.GT:
+ return new FilterOperator(Operator.GT);
+ case Operator.LT:
+ return new FilterOperator(Operator.LT);
+ case Operator.CONTAINS:
+ return new FilterOperator(Operator.CONTAINS);
+ case Operator.NOT_CONTAINS:
+ return new FilterOperator(Operator.NOT_CONTAINS);
  default:
  throw new InvalidArgumentError(`The filter operator ${value} is invalid`);
  }
  }
 
  public isPositive(): boolean {
- return this.value !== FilterOperators.NOT_EQUAL && this.value !== FilterOperators.NOT_CONTAINS;
+ return this.value !== Operator.NOT_EQUAL && this.value !== Operator.NOT_CONTAINS;
  }
 
- protected throwErrorForInvalidValue(value: FilterOperators): void {
+ protected throwErrorForInvalidValue(value: Operator): void {
  throw new InvalidArgumentError(`The filter operator ${value} is invalid`);
  }
 }

src/Contexts/Shared/domain/criteria/FilterOperator.ts

@@ -1,7 +1,7 @@
 import bodybuilder, { Bodybuilder } from 'bodybuilder';
 import { Criteria } from '../../../domain/criteria/Criteria';
 import { Filter } from '../../../domain/criteria/Filter';
-import { FilterOperators } from '../../../domain/criteria/FilterOperator';
+import { Operator } from '../../../domain/criteria/FilterOperator';
 import { Filters } from '../../../domain/criteria/Filters';
 
 export enum TypeQueryEnum {
@@ -13,21 +13,21 @@ export enum TypeQueryEnum {
 
 type QueryObject = { type: TypeQueryEnum; field: string; value: string | object };
 
-interface FunctionTransformer<T, K> {
+interface TransformerFunction<T, K> {
  (value: T): K;
 }
 
 export class ElasticCriteriaConverter {
- private queryTransformers: Map<FilterOperators, FunctionTransformer<Filter, QueryObject>>;
+ private queryTransformers: Map<Operator, TransformerFunction<Filter, QueryObject>>;
 
  constructor() {
- this.queryTransformers = new Map<FilterOperators, FunctionTransformer<Filter, QueryObject>>([
- [FilterOperators.EQUAL, this.termsQuery],
- [FilterOperators.NOT_EQUAL, this.termsQuery],
- [FilterOperators.GT, this.greaterThanQuery],
- [FilterOperators.LT, this.lowerThanQuery],
- [FilterOperators.CONTAINS, this.matchQuery],
- [FilterOperators.NOT_CONTAINS, this.matchQuery]
+ this.queryTransformers = new Map<Operator, TransformerFunction<Filter, QueryObject>>([
+ [Operator.EQUAL, this.termsQuery],
+ [Operator.NOT_EQUAL, this.termsQuery],
+ [Operator.GT, this.greaterThanQuery],
+ [Operator.LT, this.lowerThanQuery],
+ [Operator.CONTAINS, this.matchQuery],
+ [Operator.NOT_CONTAINS, this.matchQuery]
  ]);
  }
 

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

@@ -1,8 +1,8 @@
 import { Request, Response } from 'express';
 import httpStatus from 'http-status';
-import { BackofficeCourseResponse } from '../../../../Contexts/Backoffice/Courses/application/BackofficeCourseResponse';
 import { BackofficeCoursesResponse } from '../../../../Contexts/Backoffice/Courses/application/BackofficeCoursesResponse';
 import { SearchAllCoursesQuery } from '../../../../Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQuery';
+import { BackofficeCourse } from '../../../../Contexts/Backoffice/Courses/domain/BackofficeCourse';
 import { QueryBus } from '../../../../Contexts/Shared/domain/QueryBus';
 import { Controller } from './Controller';
 
@@ -17,7 +17,7 @@ export class CoursesGetController implements Controller {
  res.status(httpStatus.OK).send(this.toResponse(queryResponse.courses));
  }
 
- private toResponse(courses: Array<BackofficeCourseResponse>) {
+ private toResponse(courses: Array<BackofficeCourse>) {
  return courses.map(course => ({
  id: course.id.toString(),
  duration: course.duration.toString(),

src/apps/backoffice/backend/controllers/CoursesGetController.ts

@@ -1,16 +1,16 @@
 import { Criteria } from '../../../../../src/Contexts/Shared/domain/criteria/Criteria';
 import { Filter } from '../../../../../src/Contexts/Shared/domain/criteria/Filter';
 import { FilterField } from '../../../../../src/Contexts/Shared/domain/criteria/FilterField';
-import { FilterOperator, FilterOperators } from '../../../../../src/Contexts/Shared/domain/criteria/FilterOperator';
+import { FilterOperator, Operator } from '../../../../../src/Contexts/Shared/domain/criteria/FilterOperator';
 import { Filters } from '../../../../../src/Contexts/Shared/domain/criteria/Filters';
 import { FilterValue } from '../../../../../src/Contexts/Shared/domain/criteria/FilterValue';
 import { Order } from '../../../../../src/Contexts/Shared/domain/criteria/Order';
 
 export class BackofficeCourseCriteriaMother {
- static nameAndDurationContains(name: string, duration: string): Criteria {
+ static nameAndDurationContainsSortAscById(name: string, duration: string): Criteria {
  const filterFieldName = new FilterField('name');
  const filterFieldDuration = new FilterField('duration');
- const filterOperator = new FilterOperator(FilterOperators.CONTAINS);
+ const filterOperator = new FilterOperator(Operator.CONTAINS);
  const valueName = new FilterValue(name);
  const valueDuration = new FilterValue(duration);
 

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

@@ -1,9 +1,8 @@
-import { BackofficeCourseResponse } from '../../../../../src/Contexts/Backoffice/Courses/application/BackofficeCourseResponse';
 import { BackofficeCoursesResponse } from '../../../../../src/Contexts/Backoffice/Courses/application/BackofficeCoursesResponse';
 import { BackofficeCourse } from '../../../../../src/Contexts/Backoffice/Courses/domain/BackofficeCourse';
 
 export class SearchAllCoursesResponseMother {
  static create(courses: Array<BackofficeCourse>) {
- return new BackofficeCoursesResponse(courses.map(BackofficeCourseResponse.fromAggregate));
+ return new BackofficeCoursesResponse(courses);
  }
 }