added list courses and filter

Author: alemarcha

Makefile

@@ -38,6 +38,10 @@ start-mooc-backend: build
 start-backoffice-frontend: build
 	docker-compose up $(BACKOFFICE_APP_NAME)-frontend && docker-compose down
 
+# Start backoffice backend app
+start-backoffice-backend: build
+	docker-compose up $(BACKOFFICE_APP_NAME)-backend && docker-compose down
+
 # Clean containers
 clean:
 	docker-compose down --rmi local --volumes --remove-orphans

docker-compose.yml

@@ -29,6 +29,12 @@ services:
     ports:
       - 8032:8032
 
+  backoffice-backend:
+    <<: *default-app
+    command: bash -c "npm run build && npm run start:backoffice:backend"
+    ports:
+      - 3001:3000
+
   mongo:
     image: mongo:3.4.6
     volumes:

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

@@ -6,9 +6,9 @@ import { Filters } from '../../../domain/criteria/Filters';
 
 export enum TypeQueryEnum {
   TERMS = 'terms',
-  MATCH = 'match',
   MATCH_ALL = 'match_all',
-  RANGE = 'range'
+  RANGE = 'range',
+  WILDCARD = 'wildcard'
 }
 
 type QueryObject = { type: TypeQueryEnum; field: string; value: string | object };
@@ -26,8 +26,8 @@ export class ElasticCriteriaConverter {
       [Operator.NOT_EQUAL, this.termsQuery],
       [Operator.GT, this.greaterThanQuery],
       [Operator.LT, this.lowerThanQuery],
-      [Operator.CONTAINS, this.matchQuery],
-      [Operator.NOT_CONTAINS, this.matchQuery]
+      [Operator.CONTAINS, this.wildcardQuery],
+      [Operator.NOT_CONTAINS, this.wildcardQuery]
     ]);
   }
 
@@ -84,7 +84,7 @@ export class ElasticCriteriaConverter {
     return { type: TypeQueryEnum.RANGE, field: filter.field.value, value: { lt: filter.value.value } };
   }
 
-  private matchQuery(filter: Filter): QueryObject {
-    return { type: TypeQueryEnum.MATCH, field: filter.field.value, value: filter.value.value };
+  private wildcardQuery(filter: Filter): QueryObject {
+    return { type: TypeQueryEnum.WILDCARD, field: filter.field.value, value: `*${filter.value.value}*` };
   }
 }

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

@@ -1,22 +1,51 @@
 import { Request, Response } from 'express';
 import httpStatus from 'http-status';
 import { BackofficeCoursesResponse } from '../../../../Contexts/Backoffice/Courses/application/BackofficeCoursesResponse';
-import { SearchAllCoursesQuery } from '../../../../Contexts/Backoffice/Courses/application/SearchAll/SearchAllCoursesQuery';
+import { SearchCoursesByCriteriaQuery } from '../../../../Contexts/Backoffice/Courses/application/SearchByCriteria/SearchCoursesByCriteriaQuery';
 import { BackofficeCourse } from '../../../../Contexts/Backoffice/Courses/domain/BackofficeCourse';
 import { QueryBus } from '../../../../Contexts/Shared/domain/QueryBus';
 import { Controller } from './Controller';
 
+type FilterType = { value: string; operator: string; field: string };
 export class CoursesGetController implements Controller {
   constructor(private queryBus: QueryBus) {}
 
   async run(_req: Request, res: Response) {
-    const query = new SearchAllCoursesQuery();
+    const { query: queryParams } = _req;
+    const { filters, orderBy, order, limit, offset } = queryParams;
+
+    const query = new SearchCoursesByCriteriaQuery(
+      this.parseFilters(filters as Array<FilterType>),
+      orderBy as string,
+      order as string,
+      limit ? Number(limit) : undefined,
+      offset ? Number(offset) : undefined
+    );
+
     const queryResponse: BackofficeCoursesResponse = await this.queryBus.ask(query);
 
     res.header('Access-Control-Allow-Origin', '*');
     res.status(httpStatus.OK).send(this.toResponse(queryResponse.courses));
   }
 
+  private parseFilters(params: Array<FilterType>): Array<Map<string, string>> {
+    if (!params) {
+      return new Array<Map<string, string>>();
+    }
+
+    return params.map(filter => {
+      const field = filter.field;
+      const value = filter.value;
+      const operator = filter.operator;
+
+      return new Map([
+        ['field', field],
+        ['operator', operator],
+        ['value', value]
+      ]);
+    });
+  }
+
   private toResponse(courses: Array<BackofficeCourse>) {
     return courses.map(course => ({
       id: course.id.toString(),

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

@@ -23,6 +23,16 @@ services:
     tags:
       - { name: 'queryHandler' }
 
+  Backoffice.courses.CoursesByCriteriaSearcher:
+    class: ../../../../../Contexts/Backoffice/Courses/application/SearchByCriteria/CoursesByCriteriaSearcher
+    arguments: ['@Backoffice.courses.BackofficeCourseRepository']
+
+  Backoffice.courses.SearchCoursesByCriteriaQueryHandler:
+    class: ../../../../../Contexts/Backoffice/Courses/application/SearchByCriteria/SearchCoursesByCriteriaQueryHandler
+    arguments: ['@Backoffice.courses.CoursesByCriteriaSearcher']
+    tags:
+      - { name: 'queryHandler' }
+
   Backoffice.courses.BackofficeCourseCreator:
     class: ../../../../../Contexts/Backoffice/Courses/application/Create/BackofficeCourseCreator
     arguments: ['@Backoffice.courses.BackofficeCourseRepository']

src/apps/backoffice/frontend/templates/pages/courses/partials/list_courses.html

@@ -1,6 +1,6 @@
 <h3 class="font-sans text-gray-800 text-center text-3xl mb-10">Cursos existentes</h3>
 
-<!-- <form action="" method="get" id="courses-filters" name="filter-courses">
+<form action="" method="get" id="courses-filters" name="filter-courses">
   <div id="filter-rows">
 
   </div>
@@ -18,7 +18,7 @@ <h3 class="font-sans text-gray-800 text-center text-3xl mb-10">Cursos existentes
           👉 Filtrar 👈
       </button>
   </div>
-</form> -->
+</form> 
 
 <table class="text-left w-full border-collapse">
   <thead>
@@ -139,7 +139,7 @@ <h3 class="font-sans text-gray-800 text-center text-3xl mb-10">Cursos existentes
 
       const urlParts = inputs.map(input => input.name + "=" + input.value);
 
-      const url = "http://localhost:8040/courses?" + urlParts.join("&");
+      const url = "http://localhost:3000/courses?" + urlParts.join("&");
 
       addCoursesList(url);
   }