Merge pull request #348 from credebl/339-ecosystem-ledger-restrictions

refactor: ecosystem ledger restrictions
credebl · Dec 14, 2023 · ad17250 · ad17250
2 parents abcda45 + 425cd9a
commit ad17250
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/apps/ecosystem/src/ecosystem.service.ts b/apps/ecosystem/src/ecosystem.service.ts
@@ -120,7 +120,7 @@ export class EcosystemService {
 
     if (tags) { updateData.tags = tags; }
 
-    if (logo) { updateData.logo = tags; }
+    if (logo) { updateData.logo = logo; }
 
     if ('' !== autoEndorsement.toString()) { updateData.autoEndorsement = autoEndorsement; }
 
@@ -301,6 +301,24 @@ export class EcosystemService {
     }
   }
 
+  async checkLedgerMatches(orgDetails: OrganizationData, ecosystemId: string): Promise<boolean> {
+    const orgLedgers = orgDetails.org_agents.map((agent) => agent.ledgers.id);
+
+    const ecosystemDetails = await this.ecosystemRepository.getEcosystemDetails(ecosystemId);
+
+    let isLedgerFound = false;
+
+    for (const ledger of orgLedgers) {
+      // Check if the ledger is present in the ecosystem
+      if (Array.isArray(ecosystemDetails.ledgers) && ecosystemDetails.ledgers.includes(ledger)) {
+        // If a ledger is found, return true
+        isLedgerFound = true;
+      }
+    }
+
+    return isLedgerFound; 
+  }
+
   /**
    *
    * @param acceptRejectEcosystemInvitation
@@ -336,21 +354,9 @@ export class EcosystemService {
         throw new NotFoundException(ResponseMessages.ecosystem.error.orgDidNotExist);
       }
 
-      const orgLedgers = orgDetails.org_agents.map((agent) => agent.ledgers.id);
-
-      const ecosystemDetails = await this.ecosystemRepository.getEcosystemDetails(invitation.ecosystemId);
-
-      let isLedgerFound = false;
-
-      for (const ledger of orgLedgers) {
-        // Check if the ledger is present in the ecosystem
-        if (Array.isArray(ecosystemDetails.ledgers) && ecosystemDetails.ledgers.includes(ledger)) {
-          // If a ledger is found, return true
-          isLedgerFound = true;
-        }
-      }
+      const isLedgerFound = await this.checkLedgerMatches(orgDetails, invitation.ecosystemId); 
 
-      if (!isLedgerFound) {
+      if (!isLedgerFound && Invitation.REJECTED !== status) {
         throw new NotFoundException(ResponseMessages.ecosystem.error.ledgerNotMatch);
       }