From cec58bb53a04703ddb4844615fece888b2d6ba63 Mon Sep 17 00:00:00 2001 From: Saiyan Abhishek <74703491+geeky-abhishek@users.noreply.github.com> Date: Thu, 12 Oct 2023 11:46:55 +0530 Subject: [PATCH 1/3] chore: last 4 digits added to bulk submission api --- packages/bff/src/common/generate-citizenid.ts | 3 +++ packages/bff/src/main.ts | 2 +- packages/bff/src/submission/submission.service.ts | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 packages/bff/src/common/generate-citizenid.ts diff --git a/packages/bff/src/common/generate-citizenid.ts b/packages/bff/src/common/generate-citizenid.ts new file mode 100644 index 00000000..0b187ee8 --- /dev/null +++ b/packages/bff/src/common/generate-citizenid.ts @@ -0,0 +1,3 @@ +export const getCitizenId = (village: any): string => { + return `${village.stateCode}${village.districtCode}${village.blockCode}`; +}; diff --git a/packages/bff/src/main.ts b/packages/bff/src/main.ts index 854e27ad..57b65d99 100644 --- a/packages/bff/src/main.ts +++ b/packages/bff/src/main.ts @@ -24,6 +24,6 @@ async function bootstrap() { SwaggerModule.setup('api', app, document); app.enableCors(); - await app.listen(3000); + await app.listen(3001); } bootstrap(); diff --git a/packages/bff/src/submission/submission.service.ts b/packages/bff/src/submission/submission.service.ts index e0790c60..83b0e73e 100644 --- a/packages/bff/src/submission/submission.service.ts +++ b/packages/bff/src/submission/submission.service.ts @@ -68,6 +68,8 @@ export class SubmissionService { record?.submissionData?.aadharNumber, saltRounds, ); + const lastDigits = record.submissionData.aadharNumber.slice(-4); + record.submissionData.lastDigits = lastDigits; record.submissionData.aadharNumber = hashedAadhar; return record; }), From e5cceabdfb81a3bc310825193e2c6e7befb2dd16 Mon Sep 17 00:00:00 2001 From: Saiyan Abhishek <74703491+geeky-abhishek@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:06:09 +0530 Subject: [PATCH 2/3] feat: delete all submission api added --- packages/bff/src/submission/submission.controller.ts | 9 +++++---- packages/bff/src/submission/submission.service.ts | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/bff/src/submission/submission.controller.ts b/packages/bff/src/submission/submission.controller.ts index b93b97c7..dc0b0bcf 100644 --- a/packages/bff/src/submission/submission.controller.ts +++ b/packages/bff/src/submission/submission.controller.ts @@ -10,6 +10,7 @@ import { UseFilters, BadRequestException, InternalServerErrorException, + Delete, // UseGuards, // Headers, } from '@nestjs/common'; @@ -165,8 +166,8 @@ export class SubmissionController { return await this.submissionService.updateSubmission(id, data); } - // @Delete(':id') - // async deleteSubmission(@Param('id') id: number): Promise { - // return this.submissionService.deleteSubmission(id); - // } + @Delete('deleteAll') + async deleteSubmission(): Promise { + return this.submissionService.deleteAllSubmission(); + } } diff --git a/packages/bff/src/submission/submission.service.ts b/packages/bff/src/submission/submission.service.ts index 83b0e73e..0f69b10b 100644 --- a/packages/bff/src/submission/submission.service.ts +++ b/packages/bff/src/submission/submission.service.ts @@ -279,6 +279,9 @@ export class SubmissionService { } } + async deleteAllSubmission(): Promise { + return this.prisma.submission.deleteMany({}); + } // async deleteSubmission(id: number): Promise { // return this.prisma.submission.delete({ // where: { id }, From 7906b0ab3c42bd6f2097371044c1ed82038373ba Mon Sep 17 00:00:00 2001 From: Saiyan Abhishek <74703491+geeky-abhishek@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:46:54 +0530 Subject: [PATCH 3/3] feat: auth setup --- packages/bff/src/app.module.ts | 8 ++++---- packages/bff/src/common/auth-gaurd.ts | 3 ++- packages/bff/src/submission/submission.controller.ts | 10 ++++++++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/bff/src/app.module.ts b/packages/bff/src/app.module.ts index f52218a2..263b4eae 100644 --- a/packages/bff/src/app.module.ts +++ b/packages/bff/src/app.module.ts @@ -6,9 +6,9 @@ import { PrismaService } from './prisma/prisma.service'; import { PrismaModule } from './prisma/prisma.module'; //import { EnumeratorModule } from './enumerator/enumerator.module'; import { SubmissionService } from './submission/submission.service'; -import { ScheduleModule } from './schedule/schedule.module'; +// import { ScheduleModule } from './schedule/schedule.module'; import { UtilsModule } from './utils/utils.module'; -import { ScheduleService } from './schedule/schedule.service'; +//import { ScheduleService } from './schedule/schedule.service'; import { PassportModule } from '@nestjs/passport'; import { JwtModule } from '@nestjs/jwt'; import { CustomLogger } from './common/logger'; @@ -18,7 +18,7 @@ import { EventEmitterModule } from '@nestjs/event-emitter'; imports: [ PrismaModule, // EnumeratorModule, - ScheduleModule, + //ScheduleModule, UtilsModule, EventEmitterModule.forRoot({ maxListeners: 50, @@ -36,7 +36,7 @@ import { EventEmitterModule } from '@nestjs/event-emitter'; AppService, PrismaService, SubmissionService, - ScheduleService, + // ScheduleService, CustomLogger, ], }) diff --git a/packages/bff/src/common/auth-gaurd.ts b/packages/bff/src/common/auth-gaurd.ts index 77d46c72..e05403dc 100644 --- a/packages/bff/src/common/auth-gaurd.ts +++ b/packages/bff/src/common/auth-gaurd.ts @@ -40,8 +40,9 @@ export class AuthGuard implements CanActivate { context: ExecutionContext, ): boolean | Promise | Observable { const request = context.switchToHttp().getRequest(); + console.log({ headers: request.headers }); const bearerToken = request.headers.authorization?.split(' ')[1]; - + console.log({ bearerToken }); if (!bearerToken) { return false; } diff --git a/packages/bff/src/submission/submission.controller.ts b/packages/bff/src/submission/submission.controller.ts index dc0b0bcf..2ae38494 100644 --- a/packages/bff/src/submission/submission.controller.ts +++ b/packages/bff/src/submission/submission.controller.ts @@ -24,9 +24,14 @@ import { } from './dto/submission.dto'; import { PrismaExceptionFilter } from 'src/exceptions/exception-filter'; import { CustomLogger } from 'src/common/logger'; -//import { AuthGuard } from 'src/common/auth-gaurd'; +// import { AuthGuard } from 'src/common/auth-gaurd'; +// import { ApiHeader } from '@nestjs/swagger'; @Controller('submissions') +// @ApiHeader({ +// name: 'Authorization', +// description: 'Bearer Token', +// }) // @UseGuards(AuthGuard) @UseFilters(PrismaExceptionFilter) export class SubmissionController { @@ -52,9 +57,10 @@ export class SubmissionController { @Get() async getAllSubmissions( @Query() query: GetAllSubmissionsDto, - //@Headers('authorization') authorization: string, + // @Headers('Authorization') authorization: string, ): Promise { try { + // console.log({ authorization }); const page = Number(query.page) || 1; const limit = Number(query.limit) || 10;