Merge pull request #3 from anasabbal/NRA-04

Implementing CQRS in NestJS

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        app: [driver, notification, nuber-app, ride, user-service, auth]
+        app: [driver, notification, nuber-app, ride, user-service]
 
     steps:
     - name: Checkout code

apps/driver/src/driver.controller.ts

@@ -1,9 +1,9 @@
 import { Controller, Get } from '@nestjs/common';
 import { DriverService } from './driver.service';
 import { MessagePattern } from '@nestjs/microservices';
-import { DriverCreateCmd } from '@app/common/driver/cmd/driver.create.cmd';
-import { DriverDto } from '@app/common/driver/event/driver.dto';
+import { DriverDto } from '@app/shared/events/driver/driver.dto';
 import { mapDriversToDtos } from './utils/driver.mapper';
+import { DriverCreateCmd } from '@app/shared/commands/driver/driver.create.cmd';
 
 @Controller('drivers')
 export class DriverController {

apps/driver/src/driver.module.ts

@@ -1,18 +1,32 @@
 import { Module } from '@nestjs/common';
+import { DatabaseModule } from '@app/database';
+import { MongooseModule } from '@nestjs/mongoose';
 import { DriverController } from './driver.controller';
 import { DriverService } from './driver.service';
-import { MongooseModule } from '@nestjs/mongoose';
-import { DatabaseModule } from './database/database.module';
-import dabaConfig from './utils/daba.config';
-
+import { Driver, DriverSchema } from './models/driver.schema';
+import { LocationSchema, Location } from './models/location.schema';
+import { VehicleSchema, Vehicle } from './models/vehicle.schema';
+import * as dotenv from 'dotenv';
 
+dotenv.config();
 
 @Module({
   imports: [
-    MongooseModule.forFeature(dabaConfig),
-    DatabaseModule
+    MongooseModule.forFeature(
+      [
+        { name: Driver.name, schema: DriverSchema },
+        { name: Location.name, schema: LocationSchema },
+        { name: Vehicle.name, schema: VehicleSchema }
+      ]
+    ), 
+    DatabaseModule.forRoot(process.env.MONGODB_URI, 'drivers'),
   ],
   controllers: [DriverController],
   providers: [DriverService],
 })
-export class DriverModule {}
+export class DriverModule{
+  constructor() {
+    // call logConnection after database connection is established
+    DatabaseModule.logConnection('drivers');
+  }
+}

apps/driver/src/driver.service.ts

@@ -4,9 +4,7 @@ import { Model } from 'mongoose';
 import * as bcrypt from 'bcrypt';
 import { Driver } from './models/driver.schema';
 import { DriverStatus } from './enums/driver.status';
-import { mapDriverToDto, mapDriversToDtos } from './utils/driver.mapper';
-import { DriverCreateCmd } from '@app/common/driver/cmd/driver.create.cmd';
-import { DriverDto } from '@app/common/driver/event/driver.dto';
+import { DriverCreateCmd } from '@app/shared/commands/driver/driver.create.cmd';
 
 @Injectable()
 export class DriverService {

apps/driver/src/main.ts

@@ -1,8 +1,13 @@
 import { NestFactory } from '@nestjs/core';
 import { DriverModule } from './driver.module';
 import { MicroserviceOptions, Transport } from '@nestjs/microservices';
+import * as dotenv from 'dotenv';
+
+
+dotenv.config();
 
 async function bootstrap() {
+
   const app = await NestFactory.createMicroservice<MicroserviceOptions>(
     DriverModule,
     {

apps/driver/src/models/driver.schema.ts

@@ -1,6 +1,5 @@
 import { Prop, Schema, SchemaFactory } from "@nestjs/mongoose";
 import { DriverStatus, DriverStatusType } from "../enums/driver.status";
-import { Vehicle } from "./vehicle.schema";
 import { Types } from "mongoose";
 
 

apps/driver/src/utils/driver.mapper.ts

@@ -1,4 +1,4 @@
-import { DriverDto } from "@app/common/driver/event/driver.dto";
+import { DriverDto } from "@app/shared/events/driver/driver.dto";
 import { Driver } from "../models/driver.schema";
 
 

apps/nuber-app/src/rest/auth.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Get, Param, Post } from '@nestjs/common';
 import { UserService } from '../services/user-service';
-import { DriverCreateCmd } from "@app/common/driver/cmd/driver.create.cmd";
-import { UserCreateCommand } from "@app/common/user/cmd/user.create.cmd";
+import { UserCreateCommand } from '@app/shared/commands/auth/user.create.cmd';
+import { DriverCreateCmd } from '@app/shared/commands/driver/driver.create.cmd';
 
 
 

apps/nuber-app/src/rest/driver.controller.ts

@@ -1,6 +1,6 @@
 import { Controller, Get } from "@nestjs/common";
 import { DriverService } from "../services/driver-service";
-import { DriverDto } from "@app/common/driver/event/driver.dto";
+import { DriverDto } from "@app/shared/events/driver/driver.dto";