update

Author: alainabbas

.gitignore

@@ -2,7 +2,7 @@
 /dist
 /node_modules
 .env
-docker-compose.ym
+docker-compose.yml
 # Logs
 logs
 *.log
@@ -34,3 +34,5 @@ lerna-debug.log*
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+docker/docker-compose.yml
+docker/docker-compose.yml

docker/Dockerfile

@@ -22,7 +22,7 @@ RUN apt clean -y \
     && export LC_ALL=${LC_ALL} \
     && locale-gen ${LANG} \
     && dpkg-reconfigure --frontend ${DEBIAN_FRONTEND} locales \
-    && apt install --no-install-recommends -yq  supervisor 
+    && apt install --no-install-recommends -yq  procps supervisor
 
 WORKDIR /data
 #RUN npm i -g @nestjs/cli

docker/docker-compose.yml

@@ -14,13 +14,14 @@ services:
       - "9229:9229"
     networks:
       - dev
-  redis:
+  sesame-redis:
     image: redis
+    container_name: sesame-redis
     restart: always
     networks:
       - dev
     ports:
-      - "6380:6379"
+      - "6379:6379"
     command: redis-server --appendonly yes
 networks:
   dev: 

src/app.module.ts

@@ -4,10 +4,16 @@ import { AppService } from './app.service';
 import { PasswdModule } from './passwd/passwd.module';
 import { BullModule } from '@nestjs/bullmq';
 import { AuthModule } from './auth/auth.module';
+import {ConfigModule, ConfigService} from '@nestjs/config';
+
+import config from './config'
 
 @Module({
-  imports: [PasswdModule,
-    BullModule.forRoot({connection: {host:'redis',port:6379}}),
+  imports: [
+    ConfigModule.forRoot({
+      load: [config]
+    }),
+    PasswdModule,
     AuthModule]
 })
 export class AppModule {}

src/passwd/passwd.controller.ts

@@ -24,6 +24,7 @@ export class PasswdController {
   @ApiBearerAuth()
   @UseGuards(AuthGuard("api-key"))
   async change(@Body() cpwd: ChangePasswordDto,@Res() res: Response): Promise<Response>{
+       this.logger.log('call passwd')
        const data= await this.passwdService.change(cpwd)
        console.log(data)
        data.data.uid=cpwd.uid

src/passwd/passwd.module.ts

@@ -1,15 +1,10 @@
 import { Module } from '@nestjs/common';
 import { PasswdService } from './passwd.service';
 import { PasswdController } from './passwd.controller';
-import {BullModule} from "@nestjs/bullmq";
+import {ConfigModule} from "@nestjs/config";
 
 @Module({
-  imports: [PasswdModule,
-    BullModule.registerQueue(
-        {
-          name: 'backend',
-          connection: {host:'redis',port:6379}}
-    )
+  imports: [PasswdModule,ConfigModule
   ],
   controllers: [PasswdController],
   providers: [PasswdService],

src/passwd/passwd.service.ts

@@ -1,20 +1,21 @@
 import { Injectable } from '@nestjs/common';
 import {ChangePasswordDto} from "./dto/change-password.dto";
 import {InjectQueue} from "@nestjs/bullmq";
-import {Job, Queue,QueueEvents} from 'bullmq'
+import { Queue,QueueEvents} from 'bullmq'
+import { ConfigService } from '@nestjs/config';
 @Injectable()
 export class PasswdService {
-    constructor(@InjectQueue('backend') private backendQueue: Queue){}
 
+  constructor(private readonly configService:ConfigService){}
   async change(passwd:ChangePasswordDto) {
-      const queueEvents = new QueueEvents('backend',{connection: {host:'redis',port:6379}})
-        const job=await this.backendQueue.add('CHANGEPWD',passwd)
+     const redisConfig={host:this.configService.get('redis.host'),port:this.configService.get('redis.port')}
+      const queue=new Queue(this.configService.get('nameQueue'),{connection:redisConfig})
+      const queueEvents = new QueueEvents(this.configService.get('nameQueue'),{connection: redisConfig})
+        const job=await queue.add('CHANGEPWD',passwd)
       queueEvents.on('failed',(errors)=>{
           console.log(errors)
       })
-        return await job.waitUntilFinished(queueEvents)
-
-
+        return await job.waitUntilFinished(queueEvents,30000)
   }
 }