Merge pull request #10 from SoftwareBrothers/feat/custom-loader

Custom loader & fix for #7

Author: SimonB407

example-app/package.json

@@ -15,17 +15,18 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "NODE_ENV=test jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@admin-bro/express": "^3.0.0-beta.3",
-    "@admin-bro/mongoose": "^1.0.0-beta.3",
-    "@admin-bro/nestjs": "^1.0.0-beta.2",
-    "@nestjs/common": "^6.7.2",
-    "@nestjs/core": "^6.7.2",
+    "@admin-bro/express": "^3.0.1",
+    "@admin-bro/mongoose": "^1.1.0",
+    "@nestjs/common": "^7.4.2",
+    "@nestjs/core": "7.4.2",
     "@nestjs/mongoose": "^7.0.2",
     "@nestjs/platform-express": "^6.7.2",
-    "admin-bro": "^3.0.0-beta.12",
+    "admin-bro": "^3.3.1",
+    "class-transformer": "^0.3.1",
+    "class-validator": "^0.12.2",
     "express": "^4.17.1",
     "express-formidable": "^1.2.0",
     "express-session": "^1.17.1",

example-app/src/app.controller.ts

@@ -1,8 +1,15 @@
-import { Controller, Get } from '@nestjs/common';
-import mongoose from 'mongoose';
+import { Body, Controller, Get, Post } from '@nestjs/common';
+import { IsString } from 'class-validator';
+import { Expose } from 'class-transformer';
 
 import { AppService } from './app.service';
 
+export class Hello {
+  @Expose()
+  @IsString()
+  public hello!: string
+}
+
 @Controller()
 export class AppController {
   constructor(private readonly appService: AppService) {}
@@ -11,4 +18,9 @@ export class AppController {
   public getHello(): string {
     return this.appService.getHello();
   }
+
+  @Post()
+  public postHello(@Body() testBody: Hello): string {
+    return testBody.hello;
+  }
 }

example-app/src/app.module.ts

@@ -1,14 +1,19 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule, getModelToken } from '@nestjs/mongoose';
+import AdminBro from 'admin-bro';
+import AdminBroMongoose from '@admin-bro/mongoose';
 import { Model } from 'mongoose';
 
 import { AdminModule } from '../../src'; // lib
 
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
+import { ExpressCustomLoader } from './express-custom.loader';
 import { Admin } from './mongoose/admin-model';
 import { MongooseSchemasModule } from './mongoose/mongoose.module';
 
+AdminBro.registerAdapter(AdminBroMongoose);
+
 @Module({
   imports: [
     MongooseModule.forRoot('mongodb://localhost:27017/nest'),
@@ -32,6 +37,7 @@ import { MongooseSchemasModule } from './mongoose/mongoose.module';
           cookiePassword: 'testPass',
         },
       }),
+      customLoader: ExpressCustomLoader,
     }),
     MongooseSchemasModule,
   ],

example-app/src/express-custom.loader.ts

@@ -0,0 +1,21 @@
+/* eslint-disable no-underscore-dangle */
+import AdminBro from 'admin-bro';
+import { Injectable } from '@nestjs/common';
+import { AbstractHttpAdapter } from '@nestjs/core';
+
+import { AbstractLoader } from '../../src/loaders/abstract.loader';
+import { AdminModuleOptions } from '../../src/interfaces/admin-module-options.interface';
+import { ExpressLoader } from '../../src/loaders/express.loader';
+
+@Injectable()
+export class ExpressCustomLoader extends AbstractLoader {
+  public register(
+    admin: AdminBro,
+    httpAdapter: AbstractHttpAdapter,
+    options: AdminModuleOptions,
+  ) {
+    // eslint-disable-next-line no-console
+    console.log('Custom loader')
+    new ExpressLoader().register(admin, httpAdapter, options);
+  }
+}

example-app/src/main.ts

@@ -1,13 +1,15 @@
-import AdminBro from 'admin-bro';
-import AdminBroMongoose from '@admin-bro/mongoose';
+
 import { NestFactory } from '@nestjs/core';
+import { ValidationPipe } from '@nestjs/common';
 
 import { AppModule } from './app.module';
 
-AdminBro.registerAdapter(AdminBroMongoose);
-
 const bootstrap = async () => {
   const app = await NestFactory.create(AppModule);
+  app.useGlobalPipes(new ValidationPipe({
+    transform: true,
+    whitelist: true,
+  }))
   await app.listen(3000);
 }
 bootstrap();

example-app/test/app.e2e-spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import * as request from 'supertest';
+import request from 'supertest';
 
 import { AppModule } from './../src/app.module';
 
@@ -19,4 +19,10 @@ describe('AppController (e2e)', () => {
     .get('/')
     .expect(200)
     .expect('Hello World!'));
+
+  it('/ (POST)', () => request(app.getHttpServer())
+    .post('/')
+    .send({ hello: 'hello' })
+    .expect(201)
+    .expect('hello'));
 });