sample(): simplify classic express and fastify samples

nestjs · Feb 19, 2020 · f48a0c9 · f48a0c9
1 parent 9c1d0d6
commit f48a0c9
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 38 deletions.
diff --git a/sample/01-cats-app/src/app.module.ts b/sample/01-cats-app/src/app.module.ts
@@ -1,7 +1,8 @@
 import { Module } from '@nestjs/common';
 import { CatsModule } from './cats/cats.module';
+import { CoreModule } from './core/core.module';
 
 @Module({
-  imports: [CatsModule],
+  imports: [CoreModule, CatsModule],
 })
 export class AppModule {}
diff --git a/sample/01-cats-app/src/cats/cats.controller.ts b/sample/01-cats-app/src/cats/cats.controller.ts
@@ -1,24 +1,13 @@
-import {
-  Body,
-  Controller,
-  Get,
-  Param,
-  Post,
-  UseGuards,
-  UseInterceptors,
-} from '@nestjs/common';
+import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common';
 import { Roles } from '../common/decorators/roles.decorator';
 import { RolesGuard } from '../common/guards/roles.guard';
-import { LoggingInterceptor } from '../common/interceptors/logging.interceptor';
-import { TransformInterceptor } from '../common/interceptors/transform.interceptor';
 import { ParseIntPipe } from '../common/pipes/parse-int.pipe';
 import { CatsService } from './cats.service';
 import { CreateCatDto } from './dto/create-cat.dto';
 import { Cat } from './interfaces/cat.interface';
 
-@Controller('cats')
 @UseGuards(RolesGuard)
-@UseInterceptors(LoggingInterceptor, TransformInterceptor)
+@Controller('cats')
 export class CatsController {
   constructor(private readonly catsService: CatsService) {}
 
@@ -36,8 +25,8 @@ export class CatsController {
   @Get(':id')
   findOne(
     @Param('id', new ParseIntPipe())
-    id,
+    id: number,
   ) {
-    // logic
+    // get by ID logic
   }
 }
diff --git a/sample/01-cats-app/src/core/core.module.ts b/sample/01-cats-app/src/core/core.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { APP_INTERCEPTOR } from '@nestjs/core';
+import { LoggingInterceptor } from './interceptors/logging.interceptor';
+import { TransformInterceptor } from './interceptors/transform.interceptor';
+
+@Module({
+  providers: [
+    { provide: APP_INTERCEPTOR, useClass: TransformInterceptor },
+    { provide: APP_INTERCEPTOR, useClass: LoggingInterceptor },
+  ],
+})
+export class CoreModule {}
diff --git a/...ommon/interceptors/logging.interceptor.ts → .../core/interceptors/logging.interceptor.ts b/...ommon/interceptors/logging.interceptor.ts → .../core/interceptors/logging.interceptor.ts
diff --git a/...mon/interceptors/transform.interceptor.ts → ...ore/interceptors/transform.interceptor.ts b/...mon/interceptors/transform.interceptor.ts → ...ore/interceptors/transform.interceptor.ts
diff --git a/sample/10-fastify/src/app.module.ts b/sample/10-fastify/src/app.module.ts
@@ -1,7 +1,8 @@
 import { Module } from '@nestjs/common';
 import { CatsModule } from './cats/cats.module';
+import { CoreModule } from './core/core.module';
 
 @Module({
-  imports: [CatsModule],
+  imports: [CatsModule, CoreModule],
 })
 export class AppModule {}
diff --git a/sample/10-fastify/src/cats/cats.controller.ts b/sample/10-fastify/src/cats/cats.controller.ts
@@ -1,24 +1,13 @@
-import {
-  Controller,
-  Get,
-  Post,
-  Body,
-  UseGuards,
-  UseInterceptors,
-  Param,
-} from '@nestjs/common';
-import { CreateCatDto } from './dto/create-cat.dto';
-import { CatsService } from './cats.service';
-import { Cat } from './interfaces/cat.interface';
-import { RolesGuard } from '../common/guards/roles.guard';
+import { Body, Controller, Get, Param, Post, UseGuards } from '@nestjs/common';
 import { Roles } from '../common/decorators/roles.decorator';
-import { LoggingInterceptor } from '../common/interceptors/logging.interceptor';
-import { TransformInterceptor } from '../common/interceptors/transform.interceptor';
+import { RolesGuard } from '../common/guards/roles.guard';
 import { ParseIntPipe } from '../common/pipes/parse-int.pipe';
+import { CatsService } from './cats.service';
+import { CreateCatDto } from './dto/create-cat.dto';
+import { Cat } from './interfaces/cat.interface';
 
-@Controller('cats')
 @UseGuards(RolesGuard)
-@UseInterceptors(LoggingInterceptor, TransformInterceptor)
+@Controller('cats')
 export class CatsController {
   constructor(private readonly catsService: CatsService) {}
 
@@ -36,8 +25,8 @@ export class CatsController {
   @Get(':id')
   findOne(
     @Param('id', new ParseIntPipe())
-    id,
+    id: number,
   ) {
-    // logic
+    // get by ID logic
   }
 }
diff --git a/sample/10-fastify/src/core/core.module.ts b/sample/10-fastify/src/core/core.module.ts
@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+import { APP_INTERCEPTOR } from '@nestjs/core';
+import { LoggingInterceptor } from './interceptors/logging.interceptor';
+import { TransformInterceptor } from './interceptors/transform.interceptor';
+
+@Module({
+  providers: [
+    { provide: APP_INTERCEPTOR, useClass: TransformInterceptor },
+    { provide: APP_INTERCEPTOR, useClass: LoggingInterceptor },
+  ],
+})
+export class CoreModule {}
diff --git a/...ommon/interceptors/logging.interceptor.ts → .../core/interceptors/logging.interceptor.ts b/...ommon/interceptors/logging.interceptor.ts → .../core/interceptors/logging.interceptor.ts
diff --git a/...mon/interceptors/transform.interceptor.ts → ...ore/interceptors/transform.interceptor.ts b/...mon/interceptors/transform.interceptor.ts → ...ore/interceptors/transform.interceptor.ts
@@ -7,9 +7,17 @@ import {
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+export interface Response<T> {
+  data: T;
+}
+
 @Injectable()
-export class TransformInterceptor implements NestInterceptor {
-  intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
+export class TransformInterceptor<T>
+  implements NestInterceptor<T, Response<T>> {
+  intercept(
+    context: ExecutionContext,
+    next: CallHandler<T>,
+  ): Observable<Response<T>> {
     return next.handle().pipe(map(data => ({ data })));
   }
 }