refactor: added temaplateId column in file_upload table

apps/issuance/interfaces/issuance.interfaces.ts

@@ -207,7 +207,8 @@ export interface FileUpload {
   orgId?: string,
   createDateTime?: Date | null,
   lastChangedDateTime?: Date | null,
-  credentialType?: string
+  credentialType?: string,
+  templateId?: string
 }
 
 export interface FileUploadData {

apps/issuance/src/issuance.repository.ts

@@ -311,7 +311,7 @@ export class IssuanceRepository {
 
   async saveFileUploadDetails(fileUploadPayload: FileUpload, userId: string): Promise<file_upload> {
     try {
-      const { name, status, upload_type, orgId, credentialType } = fileUploadPayload;
+      const { name, status, upload_type, orgId, credentialType, templateId } = fileUploadPayload;
       return this.prisma.file_upload.create({
         data: {
           name: String(name),
@@ -320,7 +320,8 @@ export class IssuanceRepository {
           upload_type,
           createdBy: userId,
           lastChangedBy: userId,
-          credential_type: credentialType
+          credential_type: credentialType,
+          templateId
         }
       });
     } catch (error) {
@@ -379,6 +380,7 @@ export class IssuanceRepository {
       deletedAt: Date;
       failedRecords: number;
       totalRecords: number;
+      templateId: string;
     }[];
   }> {
     try {

apps/issuance/src/issuance.service.ts

@@ -36,6 +36,7 @@ import { sendEmail } from '@credebl/common/send-grid-helper-file';
 import * as pLimit from 'p-limit';
 import { UserActivityRepository } from 'libs/user-activity/repositories';
 import { validateW3CSchemaAttributes } from '../libs/helpers/attributes.validator';
+import { ISchemaDetail } from '@credebl/common/interfaces/schema.interface';
 
 
 @Injectable()
@@ -1153,14 +1154,27 @@ async sendEmailForCredentialOffer(sendEmailCredentialOffer: SendEmailCredentialO
     try {
 
       const fileDetails = await this.issuanceRepository.getAllFileDetails(orgId, getAllfileDetails);
+
+      const templateIds = fileDetails?.fileList.map(file => file.templateId);
+
+      const getSchemaDetails = await this._getSchemaDetails(templateIds);
+
+      const fileListWithSchema = fileDetails?.fileList.map(file => {
+        const schemaDetail = getSchemaDetails?.find(schema => schema.schemaLedgerId === file.templateId);
+        return {
+          ...file,
+          schema: schemaDetail ? { name: schemaDetail.name, version: schemaDetail.version, schemaType: schemaDetail.type } : null
+        };
+      });
+
       const fileResponse = {
         totalItems: fileDetails.fileCount,
         hasNextPage: getAllfileDetails.pageSize * getAllfileDetails.pageNumber < fileDetails.fileCount,
         hasPreviousPage: 1 < getAllfileDetails.pageNumber,
         nextPage: Number(getAllfileDetails.pageNumber) + 1,
         previousPage: getAllfileDetails.pageNumber - 1,
         lastPage: Math.ceil(fileDetails.fileCount / getAllfileDetails.pageSize),
-        data: fileDetails.fileList
+        data: fileListWithSchema
       };
 
       if (0 !== fileDetails.fileCount) {
@@ -1175,6 +1189,29 @@ async sendEmailForCredentialOffer(sendEmailCredentialOffer: SendEmailCredentialO
     }
   }
 
+  async _getSchemaDetails(templateIds: string[]): Promise<ISchemaDetail[]> {
+    const pattern = { cmd: 'get-schemas-details' };
+
+    const payload = {
+      templateIds
+    };
+    const schemaDetails = await this.issuanceServiceProxy
+      .send(pattern, payload)
+      .toPromise()
+      .catch((error) => {
+        this.logger.error(`catch: ${JSON.stringify(error)}`);
+        throw new HttpException(
+          {
+            status: error.status,
+            error: error.message
+          },
+          error.status
+        );
+      });
+    return schemaDetails;
+  }
+
+
   async delay(ms): Promise<unknown> {
     return new Promise(resolve => setTimeout(resolve, ms));
   }
@@ -1298,7 +1335,6 @@ async sendEmailForCredentialOffer(sendEmailCredentialOffer: SendEmailCredentialO
         throw new BadRequestException(ResponseMessages.issuance.error.cachedData);
       }
       const parsedFileDetails = JSON.parse(cachedData as string);
-
       if (!parsedFileDetails) {
         throw new BadRequestException(ResponseMessages.issuance.error.cachedfileData);
       }
@@ -1309,7 +1345,7 @@ async sendEmailForCredentialOffer(sendEmailCredentialOffer: SendEmailCredentialO
       fileUpload.createDateTime = new Date();
       fileUpload.name = parsedFileDetails.fileName;
       fileUpload.credentialType = parsedFileDetails.credentialType;
-
+      fileUpload.templateId = parsedFileDetails?.schemaLedgerId;
       csvFileDetail = await this.issuanceRepository.saveFileUploadDetails(fileUpload, clientDetails.userId);
 
       const bulkPayloadObject: IBulkPayloadObject = {

apps/ledger/src/schema/repositories/schema.repository.ts

@@ -128,6 +128,22 @@ export class SchemaRepository {
     }
   }
 
+  async getSchemasDetailsBySchemaIds(templateIds: string[]): Promise<schema[]> {
+    try {
+      const schemasResult = await this.prisma.schema.findMany({
+        where: {
+          schemaLedgerId: {
+            in: templateIds
+          }
+        }
+      });
+      return schemasResult;
+    } catch (error) {
+      this.logger.error(`Error in getting agent DID: ${error}`);
+      throw error;
+    }
+  }
+
   async getAgentDetailsByOrgId(orgId: string): Promise<AgentDetails> {
     try {
       const schemasResult = await this.prisma.org_agents.findFirst({

apps/ledger/src/schema/schema.controller.ts

@@ -26,6 +26,11 @@ export class SchemaController {
     return this.schemaService.createSchema(schemaDetails, user, orgId);
   }
 
+  @MessagePattern({ cmd: 'get-schemas-details' })
+  async getSchemasDetails(payload: {templateIds: string[]}): Promise<schema[]> {
+    const { templateIds } = payload;
+    return this.schemaService.getSchemaDetails(templateIds);
+  }
 
   @MessagePattern({ cmd: 'get-schema-by-id' })
   async getSchemaById(payload: ISchema): Promise<schema> {

apps/ledger/src/schema/schema.service.ts

@@ -709,6 +709,15 @@ export class SchemaService extends BaseService {
     }
   }
 
+  async getSchemaDetails(templateIds: string[]): Promise<schema[]> {   
+    try {  
+     const getSchemaData = await this.schemaRepository.getSchemasDetailsBySchemaIds(templateIds);
+     return getSchemaData;
+    } catch (error) {
+        throw new RpcException(error.response ? error.response : error);
+    }
+  }
+
   async _getSchemaById(payload: GetSchemaAgentRedirection): Promise<{ response: string }> {
     try {
       const pattern = {

libs/common/src/interfaces/schema.interface.ts

@@ -40,6 +40,29 @@ export interface ISchemasWithPagination extends IPaginationDetails{
     issuerId: string;
   }
 
+  interface Attribute {
+    attributeName: string;
+    schemaDataType: string;
+    displayName: string;
+    isRequired: boolean;
+  }
+
+  export interface ISchemaDetail {
+    id: string;
+    createDateTime: string;
+    createdBy: string;
+    lastChangedDateTime: string;
+    lastChangedBy: string;
+    name: string;
+    version: string;
+    attributes: Attribute[];
+    schemaLedgerId: string;
+    publisherDid: string;
+    issuerId: string;
+    orgId: string;
+    ledgerId: string;
+    type: string;
+  }
 
   export interface IPlatformSchemas {
     schemasCount: number;

libs/prisma-service/prisma/migrations/20240712132737_added_template_id_file_upload/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "file_upload" ADD COLUMN     "templateId" VARCHAR;

libs/prisma-service/prisma/schema.prisma

@@ -482,6 +482,7 @@ model file_upload {
   organisation        organisation? @relation(fields: [orgId], references: [id])
   orgId               String?       @db.Uuid
   credential_type     String?
+  templateId          String?       @db.VarChar 
 }
 
 model file_data {