feat: bulk issuance retry

apps/api-gateway/src/app.module.ts

@@ -52,12 +52,6 @@ import * as redisStore from 'cache-manager-redis-store';
         host: process.env.REDIS_HOST,
         port: parseInt(process.env.REDIS_PORT)
       }
-    }),
-    BullModule.registerQueue({
-      name: 'bulk-issuance',
-      redis: {
-        port: parseInt(process.env.REDIS_PORT)
-      }
     })
   ],
   controllers: [AppController],

apps/api-gateway/src/authz/socket.gateway.ts

@@ -102,4 +102,12 @@ export class SocketGateway implements OnGatewayConnection {
       .to(payload.clientId)
       .emit('error-in-wallet-creation-process', payload.error);
   }
+
+  @SubscribeMessage('bulk-issuance-process-completed')
+  async handleBulkIssuance(payload: ISocketInterface): Promise<void> {
+    this.logger.log(`bulk-issuance-process-completed ${payload.clientId}`);
+    this.server
+      .to(payload.clientId)
+      .emit('bulk-issuance-process-completed', payload.error);
+  }
 }

apps/api-gateway/src/enum.ts

@@ -124,5 +124,6 @@ export enum FileUploadType {
 export enum FileUploadStatus {
     started = 'PROCESS_STARTED',
     completed = 'PROCESS_COMPLETED',
-    interrupted= 'PROCESS INTERRUPTED'
+    interrupted= 'PROCESS_INTERRUPTED',
+    retry= 'PROCESS_REINITIATED'
 }

apps/api-gateway/src/issuance/dtos/issuance.dto.ts

@@ -205,4 +205,12 @@ export class FileParameter {
     @Type(() => String)
     sortValue = '';
 
+}
+
+export class ClientDetails {
+    @ApiProperty({ required: false, example: '68y647ayAv79879' })
+    @IsOptional()
+    @Type(() => String)
+    clientId = '';
+
 }

apps/api-gateway/src/issuance/interfaces/index.ts

@@ -59,11 +59,11 @@ export class IUserOrg {
 export interface FileExportResponse {
     response: unknown;
     fileContent: string;
-    fileName : string
+    fileName: string
 }
 
 export interface RequestPayload {
     credDefId: string;
     fileKey: string;
     fileName: string;
-  }
+}

apps/api-gateway/src/issuance/issuance.controller.ts

@@ -38,7 +38,7 @@ import { CommonService } from '@credebl/common/common.service';
 import { Response } from 'express';
 import IResponseType from '@credebl/common/interfaces/response.interface';
 import { IssuanceService } from './issuance.service';
-import { FileParameter, IssuanceDto, IssueCredentialDto, OutOfBandCredentialDto, PreviewFileDetails } from './dtos/issuance.dto';
+import { ClientDetails, FileParameter, IssuanceDto, IssueCredentialDto, OutOfBandCredentialDto, PreviewFileDetails } from './dtos/issuance.dto';
 import { IUserRequest } from '@credebl/user-request/user-request.interface';
 import { User } from '../authz/decorators/user.decorator';
 import { ResponseMessages } from '@credebl/common/response-messages';
@@ -245,7 +245,7 @@ export class IssuanceController {
         const reqPayload: RequestPayload = {
           credDefId: credentialDefinitionId,
           fileKey,
-          fileName:file?.filename
+          fileName: file?.originalname
         };
         this.logger.log(`reqPayload::::::${JSON.stringify(reqPayload)}`);
         const importCsvDetails = await this.issueCredentialService.importCsv(
@@ -328,6 +328,35 @@ export class IssuanceController {
     return res.status(HttpStatus.OK).json(finalResponse);
   }
 
+  @Post('/orgs/:orgId/:requestId/bulk')
+  @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER)
+  @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
+  @ApiBearerAuth()
+  @ApiResponse({ status: 200, description: 'Success', type: ApiResponseDto })
+  @ApiUnauthorizedResponse({
+    status: 401,
+    description: 'Unauthorized',
+    type: UnauthorizedErrorDto
+  })
+  @ApiForbiddenResponse({
+    status: 403,
+    description: 'Forbidden',
+    type: ForbiddenErrorDto
+  })
+  @ApiOperation({
+    summary: 'bulk issue credential',
+    description: 'bulk issue credential'
+  })
+  async issueBulkCredentials(@Param('requestId') requestId: string, @Param('orgId') orgId: number, @Res() res: Response, @Body() clientDetails: ClientDetails): Promise<Response> {
+    const bulkIssunaceDetails = await this.issueCredentialService.issueBulkCredential(requestId, orgId, clientDetails.clientId);
+    const finalResponse: IResponseType = {
+      statusCode: HttpStatus.CREATED,
+      message: ResponseMessages.issuance.success.bulkIssuance,
+      data: bulkIssunaceDetails.response
+    };
+    return res.status(HttpStatus.CREATED).json(finalResponse);
+  }
+
   @Get('/orgs/:orgId/bulk/files')
   @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER)
   @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
@@ -389,7 +418,7 @@ export class IssuanceController {
     };
     return res.status(HttpStatus.OK).json(finalResponse);
   }
-  
+
   @Get('/orgs/:orgId/:fileId/bulk/file-data')
   @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER)
   @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
@@ -454,7 +483,7 @@ export class IssuanceController {
     return res.status(HttpStatus.OK).json(finalResponse);
   }
 
-  @Post('/orgs/:orgId/:requestId/bulk')
+  @Post('/orgs/:orgId/:fileId/retry/bulk')
   @Roles(OrgRoles.OWNER, OrgRoles.ADMIN, OrgRoles.ISSUER, OrgRoles.VERIFIER)
   @UseGuards(AuthGuard('jwt'), OrgRolesGuard)
   @ApiBearerAuth()
@@ -470,11 +499,11 @@ export class IssuanceController {
     type: ForbiddenErrorDto
   })
   @ApiOperation({
-    summary: 'bulk issue credential',
-    description: 'bulk issue credential'
+    summary: 'Retry bulk issue credential',
+    description: 'Retry bulk issue credential'
   })
-  async issueBulkCredentials(@Param('requestId') requestId: string, @Param('orgId') orgId: number, @Res() res: Response): Promise<Response> {
-    const bulkIssunaceDetails = await this.issueCredentialService.issueBulkCredential(requestId, orgId);
+  async retryBulkCredentials(@Param('fileId') fileId: string, @Param('orgId') orgId: number, @Res() res: Response, @Body() clientDetails: ClientDetails): Promise<Response> {
+    const bulkIssunaceDetails = await this.issueCredentialService.retryBulkCredential(fileId, orgId, clientDetails.clientId);
     const finalResponse: IResponseType = {
       statusCode: HttpStatus.CREATED,
       message: ResponseMessages.issuance.success.bulkIssuance,
@@ -483,6 +512,7 @@ export class IssuanceController {
     return res.status(HttpStatus.CREATED).json(finalResponse);
   }
 
+
   /**
    * Description: Issuer send credential to create offer
    * @param user

apps/api-gateway/src/issuance/issuance.service.ts

@@ -107,8 +107,13 @@ export class IssuanceService extends BaseService {
         return this.sendNats(this.issuanceProxy, 'issued-file-data', payload);
     }
 
-    async issueBulkCredential(requestId: string, orgId: number): Promise<{ response: object }> {
-        const payload = { requestId, orgId };
+    async issueBulkCredential(requestId: string, orgId: number, clientId: string): Promise<{ response: object }> {
+        const payload = { requestId, orgId, clientId };
         return this.sendNats(this.issuanceProxy, 'issue-bulk-credentials', payload);
     }
+
+    async retryBulkCredential(fileId: string, orgId: number, clientId: string): Promise<{ response: object }> {
+        const payload = { fileId, orgId, clientId };
+        return this.sendNats(this.issuanceProxy, 'retry-bulk-credentials', payload);
+    }
 }

apps/issuance/interfaces/issuance.interfaces.ts

@@ -87,7 +87,7 @@ export interface FileUpload {
     name?: string;
     upload_type?: string;
     status?: string;
-    orgId?: number | string;
+    orgId?:  string;
     createDateTime?: Date;
     lastChangedDateTime?: Date;
   }
@@ -100,4 +100,6 @@ export interface FileUploadData {
     createDateTime: Date;
     error?: string;
     detailError?: string;
+    jobId: string;
+    clientId: string;
 }

apps/issuance/src/issuance.controller.ts

@@ -84,7 +84,12 @@ export class IssuanceController {
 
 
   @MessagePattern({ cmd: 'issue-bulk-credentials' })
-  async issueBulkCredentials(payload: { requestId: string, orgId: number }): Promise<string> {
-    return this.issuanceService.issueBulkCredential(payload.requestId, payload.orgId);
+  async issueBulkCredentials(payload: { requestId: string, orgId: number, clientId: string }): Promise<string> {
+    return this.issuanceService.issueBulkCredential(payload.requestId, payload.orgId, payload.clientId);
+  }
+
+  @MessagePattern({ cmd: 'retry-bulk-credentials' })
+  async retryeBulkCredentials(payload: { fileId: string, orgId: number, clientId: string }): Promise<string> {
+    return this.issuanceService.retryBulkCredential(payload.fileId, payload.orgId, payload.clientId);
   }
 }

apps/issuance/src/issuance.module.ts

@@ -28,17 +28,8 @@ import { AwsService } from '@credebl/aws';
     ]),
     CommonModule,
     CacheModule.register({ store: redisStore, host: process.env.REDIS_HOST, port: process.env.REDIS_PORT }),
-    BullModule.forRoot({
-      redis: {
-        host: process.env.REDIS_HOST,
-        port: parseInt(process.env.REDIS_PORT)
-      }
-    }),
     BullModule.registerQueue({
-      name: 'bulk-issuance',
-      redis: {
-        port: parseInt(process.env.REDIS_PORT)
-      }
+      name: 'bulk-issuance'
     })
   ],
   controllers: [IssuanceController],

apps/issuance/src/issuance.processor.ts

@@ -21,6 +21,6 @@ export class BulkIssuanceProcessor {
       `Processing job ${job.id} of type ${job.name} with data ${JSON.stringify(job.data)}...`
     );
 
-    this.issuanceService.processIssuanceData(job.data);
+    await this.issuanceService.processIssuanceData(job.data);
   }
 }