Merge branch 'master' into backoffice-frontend

Author: Fortiz2305

.github/workflows/nodejs.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [12.x, 14.x]
         mongodb-version: [4.0, 4.2]
 
     steps:

cucumber.js

@@ -1,5 +1,5 @@
 let common = [
-  'tests/**/features/*.feature', // Specify our feature files
+  'tests/**/features/**/*.feature', // Specify our feature files
   '--require-module ts-node/register', // Load TypeScript module
   '--require tests/**/features/step_definitions/*.steps.ts' // Load step definitions
 ].join(' ');

package-lock.json

@@ -2,6 +2,10 @@
   "name": "typescript-ddd-skeleton",
   "version": "1.0.0",
   "description": "",
+  "repository": {
+    "url": "https://github.com/CodelyTV/typescript-ddd-skeleton"
+  },
+  "license": "",
   "engines": {
     "node": ">=10.15.0",
     "npm": ">=6.7.0"
@@ -20,54 +24,54 @@
     "build:clean": "rm -r dist; exit 0"
   },
   "dependencies": {
-    "@types/bson": "^4.0.0",
-    "@types/compression": "^1.0.1",
-    "@types/convict": "^4.2.1",
-    "@types/errorhandler": "0.0.32",
-    "@types/express": "^4.17.2",
+    "@types/bson": "^4.0.2",
+    "@types/compression": "^1.7.0",
+    "@types/convict": "^5.2.1",
+    "@types/errorhandler": "1.5.0",
+    "@types/express": "^4.17.6",
     "@types/glob": "^7.1.1",
-    "@types/helmet": "0.0.44",
-    "@types/mongodb": "^3.3.15",
-    "@types/node": "~13.1.1",
-    "@types/uuid": "^3.4.6",
+    "@types/helmet": "0.0.47",
+    "@types/mongodb": "^3.5.18",
+    "@types/node": "^14.0.3",
+    "@types/uuid": "^8.0.0",
     "@types/uuid-validate": "0.0.1",
     "body-parser": "^1.19.0",
-    "bson": "^4.0.2",
+    "bson": "^4.0.4",
     "compression": "^1.7.4",
-    "convict": "^5.1.0",
+    "convict": "^6.0.0",
     "copy": "^0.3.2",
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
     "glob": "^7.1.6",
-    "helmet": "^3.21.2",
+    "helmet": "^3.22.0",
     "http-status": "^1.4.2",
     "mandrill-api": "^1.0.45",
-    "mongodb": "^3.5.2",
-    "node-dependency-injection": "^2.4.2",
+    "mongodb": "^3.5.7",
+    "node-dependency-injection": "^2.6.3",
     "nunjucks": "^3.2.1",
-    "ts-node": "^8.3.0",
-    "typescript": "^3.7.2",
-    "uuid": "^3.3.3",
+    "ts-node": "^8.10.1",
+    "typescript": "^3.9.2",
+    "uuid": "^8.0.0",
     "uuid-validate": "0.0.3",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.31",
-    "@types/cucumber": "^4.0.7",
-    "@types/faker": "^4.1.5",
-    "@types/jest": "^24.0.18",
     "@types/nunjucks": "^3.1.3",
-    "@types/supertest": "^2.0.8",
+    "@types/aws-lambda": "^8.10.51",
+    "@types/cucumber": "^6.0.1",
+    "@types/faker": "^4.1.12",
+    "@types/jest": "^25.2.3",
+    "@types/supertest": "^2.0.9",
     "cucumber": "^6.0.5",
     "faker": "^4.1.0",
-    "husky": "^1.3.1",
-    "jest": "^24.9.0",
-    "lint-staged": "8.2.1",
-    "prettier": "^1.16.4",
+    "husky": "^4.2.5",
+    "jest": "^26.0.1",
+    "lint-staged": "10.2.4",
+    "prettier": "^2.0.5",
     "supertest": "^4.0.2",
-    "ts-jest": "^24.1.0",
-    "ts-node-dev": "^1.0.0-pre.43",
-    "tslint": "^5.20.1",
+    "ts-jest": "^26.0.0",
+    "ts-node-dev": "^1.0.0-pre.44",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "~1.18.0",
     "tslint-eslint-rules": "^5.4.0"
   },

package.json

@@ -16,14 +16,13 @@ export class CourseCreator {
   }
 
   async run(request: CreateCourseRequest): Promise<void> {
-    const course = new Course(
+    const course = Course.create(
       new CourseId(request.id),
       new CourseName(request.name),
       new CourseDuration(request.duration)
     );
 
     await this.repository.save(course);
-
     this.eventBus.publish(course.pullDomainEvents());
   }
 }

src/Contexts/Mooc/Courses/application/CourseCreator.ts

@@ -30,15 +30,15 @@ export class Course extends AggregateRoot {
     return course;
   }
 
-  static fromPrimitives(plainData: any): Course {
+  static fromPrimitives(plainData: { id: string; name: string; duration: string }): Course {
     return new Course(
       new CourseId(plainData.id),
       new CourseName(plainData.name),
       new CourseDuration(plainData.duration)
     );
   }
 
-  toPrimitives(): any {
+  toPrimitives() {
     return {
       id: this.id.value,
       name: this.name.value,

src/Contexts/Mooc/Courses/domain/Course.ts

@@ -13,9 +13,9 @@ export class CourseCreatedDomainEvent extends DomainEvent {
 
   constructor({
     id,
-    eventId,
-    duration,
     name,
+    duration,
+    eventId,
     occurredOn
   }: {
     id: string;
@@ -37,12 +37,12 @@ export class CourseCreatedDomainEvent extends DomainEvent {
     };
   }
 
-  static fromPrimitive(
+  static fromPrimitives(
     aggregateId: string,
     body: CreateCourseDomainEventBody,
     eventId: string,
     occurredOn: Date
-  ): CourseCreatedDomainEvent {
+  ): DomainEvent {
     return new CourseCreatedDomainEvent({
       id: aggregateId,
       duration: body.duration,

src/Contexts/Mooc/Courses/domain/CourseCreatedDomainEvent.ts

@@ -0,0 +1,16 @@
+import { CoursesCounterRepository } from '../../domain/CoursesCounterRepository';
+import { CoursesCounterNotExist } from '../../domain/CoursesCounterNotExist';
+import { CoursesCounterResponse } from './CoursesCounterResponse';
+
+export class CoursesCounterFinder {
+  constructor(private repository: CoursesCounterRepository) {}
+
+  async run() {
+    const counter = await this.repository.search();
+    if (!counter) {
+      throw new CoursesCounterNotExist();
+    }
+
+    return new CoursesCounterResponse(counter.total.value);
+  }
+}

src/Contexts/Mooc/Courses/infrastructure/courses.id.repo

@@ -0,0 +1,7 @@
+export class CoursesCounterResponse {
+  readonly total: number;
+
+  constructor(total: number) {
+    this.total = total;
+  }
+}