chore(): resolve merge conflicts

Author: kamilmysliwiec

content/discover/who-uses.json

@@ -242,6 +242,7 @@
     "https://padfever.com/",
     "https://datenlotse.org",
     "https://bemum.co",
-    "https://weoptimeye.ai"
+    "https://weoptimeye.ai",
+    "https://nemovote.com"
   ]
 }

content/graphql/scalars.md

@@ -98,7 +98,7 @@ import GraphQLJSON from 'graphql-type-json';
     }),
   ],
 })
-export class ApplicationModule {}
+export class AppModule {}
 ```
 
 Now we can use the `JSON` scalar in our type definitions:

content/microservices/redis.md

@@ -60,7 +60,7 @@ All the properties supported by the official [redis](https://www.npmjs.com/packa
 
 Like other microservice transporters, you have <a href="https://docs.nestjs.com/microservices/basics#client">several options</a> for creating a Redis `ClientProxy` instance.
 
-One method for creating an instance is to use use the `ClientsModule`. To create a client instance with the `ClientsModule`, import it and use the `register()` method to pass an options object with the same properties shown above in the `createMicroservice()` method, as well as a `name` property to be used as the injection token. Read more about `ClientsModule` <a href="https://docs.nestjs.com/microservices/basics#client">here</a>.
+One method for creating an instance is to use the `ClientsModule`. To create a client instance with the `ClientsModule`, import it and use the `register()` method to pass an options object with the same properties shown above in the `createMicroservice()` method, as well as a `name` property to be used as the injection token. Read more about `ClientsModule` <a href="https://docs.nestjs.com/microservices/basics#client">here</a>.
 
 ```typescript
 @Module({

content/middlewares.md

@@ -241,3 +241,5 @@ const app = await NestFactory.create(AppModule);
 app.use(logger);
 await app.listen(3000);
 ```
+
+> info **Hint** Accessing the DI container in a global middleware is not possible. You can use a [functional middleware](middleware#functional-middleware) instead when using `app.use()`. Alternatively, you can use a class middleware and consume it with `.forRoutes('*')` within the `AppModule` (or any other module).

content/recipes/crud-generator.md

@@ -51,7 +51,7 @@ export class UsersController {
     return this.usersService.findOne(+id);
   }
 
-  @Put(':id')
+  @Patch(':id')
   update(@Param('id') id: string, @Body() updateUserDto: UpdateUserDto) {
     return this.usersService.update(+id, updateUserDto);
   }

content/recipes/mongodb.md

@@ -180,4 +180,4 @@ import { DatabaseModule } from '../database/database.module';
 export class CatsModule {}
 ```
 
-> info **Hint** Do not forget to import the `CatsModule` into the root `ApplicationModule`.
+> info **Hint** Do not forget to import the `CatsModule` into the root `AppModule`.

content/recipes/sql-sequelize.md

@@ -140,4 +140,4 @@ import { DatabaseModule } from '../database/database.module';
 export class CatsModule {}
 ```
 
-> info **Hint** Do not forget to import the `CatsModule` into the root `ApplicationModule`.
+> info **Hint** Do not forget to import the `CatsModule` into the root `AppModule`.

content/recipes/sql-typeorm.md

@@ -151,4 +151,4 @@ import { PhotoService } from './photo.service';
 export class PhotoModule {}
 ```
 
-> info **Hint** Do not forget to import the `PhotoModule` into the root `ApplicationModule`.
+> info **Hint** Do not forget to import the `PhotoModule` into the root `AppModule`.

content/security/rate-limiting.md

@@ -75,8 +75,8 @@ The `ThrottlerGuard` can also be used to work with GraphQL requests. Again, the
 export class GqlThrottlerGuard extends ThrottlerGuard {
   getRequestResponse(context: ExecutionContext) {
     const gqlCtx = GqlExecutionContext.create(context);
-    const ctx = gql.getContext();
-    return { req, ctx.req, res: ctx.res }
+    const ctx = gqlCtx.getContext();
+    return { req: ctx.req, res: ctx.res }
   }
 }
 ```

content/techniques/caching.md

@@ -25,7 +25,7 @@ import { AppController } from './app.controller';
   imports: [CacheModule.register()],
   controllers: [AppController],
 })
-export class ApplicationModule {}
+export class AppModule {}
 ```
 
 #### Interacting with the Cache store
@@ -113,7 +113,7 @@ import { APP_INTERCEPTOR } from '@nestjs/core';
     },
   ],
 })
-export class ApplicationModule {}
+export class AppModule {}
 ```
 
 #### Customize caching
@@ -224,7 +224,7 @@ import { AppController } from './app.controller';
   ],
   controllers: [AppController],
 })
-export class ApplicationModule {}
+export class AppModule {}
 ```
 
 #### Async configuration