refactor:Conditions to get issued credential list for OOB issuance (#1125)

Signed-off-by: pranalidhanavade <[email protected]>

Author: pranalidhanavade

apps/issuance/src/issuance.repository.ts

@@ -121,15 +121,12 @@ export class IssuanceRepository {
       orgId: string;
     }[];
   }> {
-    try {
-       
+    try {   
       const issuedCredentialsList = await this.prisma.credentials.findMany({
         where: {
           orgId,
-          OR: [
-            { schemaId: { in: schemaIds } }, 
-            { connectionId: { contains: issuedCredentialsSearchCriteria.search, mode: 'insensitive' } }
-          ]
+          ...(schemaIds?.length ? { schemaId: { in: schemaIds } } : {}),
+          ...(!schemaIds?.length && issuedCredentialsSearchCriteria.search ? { OR: [{ connectionId: { contains: issuedCredentialsSearchCriteria.search, mode: 'insensitive' } }, { schemaId: { contains: issuedCredentialsSearchCriteria.search, mode: 'insensitive' } }] } : {})
         },
         select: {
           credentialExchangeId: true,
@@ -147,14 +144,11 @@ export class IssuanceRepository {
         take: Number(issuedCredentialsSearchCriteria.pageSize),
         skip: (issuedCredentialsSearchCriteria.pageNumber - 1) * issuedCredentialsSearchCriteria.pageSize
       });
-
       const issuedCredentialsCount = await this.prisma.credentials.count({
         where: {
           orgId,
-          OR: [
-            { schemaId: { in: schemaIds } },
-            { connectionId: { contains: issuedCredentialsSearchCriteria.search, mode: 'insensitive' } }
-          ]
+          ...(schemaIds?.length ? { schemaId: { in: schemaIds } } : {}),
+          ...(!schemaIds?.length && issuedCredentialsSearchCriteria.search ? { OR: [{ connectionId: { contains: issuedCredentialsSearchCriteria.search, mode: 'insensitive' } }, { schemaId: { contains: issuedCredentialsSearchCriteria.search, mode: 'insensitive' } }] } : {})
         }
       });
 

apps/issuance/src/issuance.service.ts

@@ -460,7 +460,8 @@ export class IssuanceService {
 
       let schemaIds;
       if (issuedCredentialsSearchCriteria?.search) {
-        const schemaDetails = await this._getSchemaDetailsByName(issuedCredentialsSearchCriteria?.search);
+   
+        const schemaDetails = await this._getSchemaDetailsByName(issuedCredentialsSearchCriteria?.search, orgId);
 
         if (schemaDetails && 0 < schemaDetails?.length) {
             schemaIds = schemaDetails.map(item => item?.schemaLedgerId);
@@ -519,11 +520,11 @@ export class IssuanceService {
     }
   }
 
-  async _getSchemaDetailsByName(schemaName: string): Promise<ISchemaId[]> {
+  async _getSchemaDetailsByName(schemaName: string, orgId: string): Promise<ISchemaId[]> {
     const pattern = { cmd: 'get-schemas-details-by-name' };
-
+    const payload = {schemaName, orgId};
     const schemaDetails = await this.natsClient
-      .send<ISchemaId[]>(this.issuanceServiceProxy, pattern, schemaName)
+      .send<ISchemaId[]>(this.issuanceServiceProxy, pattern, payload)
 
       .catch((error) => {
         this.logger.error(`catch: ${JSON.stringify(error)}`);

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

@@ -157,9 +157,10 @@ export class SchemaRepository {
     }
   }
 
-  async getSchemasDetailsBySchemaName(schemaName: string): Promise<ISchemaId[]> {
+  async getSchemasDetailsBySchemaName(schemaName: string, orgId: string): Promise<ISchemaId[]> {
     const schemaDetails = await this.prisma.schema.findMany({
       where: {
+        orgId,
         name: { contains: schemaName, mode: 'insensitive' }
       },
 

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

@@ -35,8 +35,9 @@ export class SchemaController {
   }
 
   @MessagePattern({ cmd: 'get-schemas-details-by-name' })
-  async getSchemasDetailsBySchemaName(schemaName: string): Promise<ISchemaId[]> {
-    return this.schemaService.getSchemaDetailsBySchemaName(schemaName);
+  async getSchemasDetailsBySchemaName(payload:{schemaName:string, orgId:string}): Promise<ISchemaId[]> {
+    const {orgId, schemaName} = payload;
+    return this.schemaService.getSchemaDetailsBySchemaName(schemaName, orgId);
   }
 
   @MessagePattern({ cmd: 'get-schema-by-id' })

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

@@ -716,9 +716,9 @@ export class SchemaService extends BaseService {
     }
   }
 
-  async getSchemaDetailsBySchemaName(schemaName: string): Promise<ISchemaId[]> {   
+  async getSchemaDetailsBySchemaName(schemaName: string, orgId:string): Promise<ISchemaId[]> {   
     try {  
-     const getSchemaDetails = await this.schemaRepository.getSchemasDetailsBySchemaName(schemaName);
+     const getSchemaDetails = await this.schemaRepository.getSchemasDetailsBySchemaName(schemaName, orgId);
      return getSchemaDetails;
     } catch (error) {
       throw new RpcException(error.response ? error.response : error);