fix: check paused on asset compliance result

PolymeshAssociation · Oct 15, 2020 · fb53f5c · fb53f5c
1 parent 86306ed
commit fb53f5c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/src/utils/__tests__/index.ts b/src/utils/__tests__/index.ts
@@ -2302,8 +2302,8 @@ describe('assetComplianceResultToRequirementCompliance', () => {
       Identity: dsMockUtils.createMockIdentityId(tokenDid),
     });
     const issuers = issuerDids.map(dsMockUtils.createMockIdentityId);
+    /* eslint-disable @typescript-eslint/camelcase */
     const rawConditions = [
-      /* eslint-disable @typescript-eslint/camelcase */
       dsMockUtils.createMockCondition({
         condition_type: dsMockUtils.createMockConditionType({
           IsPresent: dsMockUtils.createMockClaim({ KnowYourCustomer: scope }),
@@ -2337,24 +2337,35 @@ describe('assetComplianceResultToRequirementCompliance', () => {
         issuers,
       }),
     ];
-    const assetComplianceResult = dsMockUtils.createMockAssetComplianceResult({
-      paused: dsMockUtils.createMockBool(false),
-      requirements: [
-        dsMockUtils.createMockComplianceRequirementResult({
-          sender_conditions: [rawConditions[0], rawConditions[2], rawConditions[3]],
-          receiver_conditions: [rawConditions[0], rawConditions[1], rawConditions[3]],
-          id: dsMockUtils.createMockU32(1),
-          result: dsMockUtils.createMockBool(false),
-        }),
-      ],
+
+    const rawRequirements = dsMockUtils.createMockComplianceRequirementResult({
+      sender_conditions: [rawConditions[0], rawConditions[2], rawConditions[3]],
+      receiver_conditions: [rawConditions[0], rawConditions[1], rawConditions[3]],
+      id: dsMockUtils.createMockU32(1),
       result: dsMockUtils.createMockBool(false),
     });
     /* eslint-enable @typescript-eslint/camelcase */
 
-    const result = assetComplianceResultToRequirementCompliance(assetComplianceResult);
+    let assetComplianceResult = dsMockUtils.createMockAssetComplianceResult({
+      paused: dsMockUtils.createMockBool(true),
+      requirements: [rawRequirements],
+      result: dsMockUtils.createMockBool(true),
+    });
+
+    let result = assetComplianceResultToRequirementCompliance(assetComplianceResult);
     expect(result.requirements[0].conditions).toEqual(
       expect.arrayContaining(fakeResult.conditions)
     );
+    expect(result.complies).toBeTruthy();
+
+    assetComplianceResult = dsMockUtils.createMockAssetComplianceResult({
+      paused: dsMockUtils.createMockBool(false),
+      requirements: [rawRequirements],
+      result: dsMockUtils.createMockBool(true),
+    });
+
+    result = assetComplianceResultToRequirementCompliance(assetComplianceResult);
+    expect(result.complies).toBeTruthy();
   });
 });
 

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1407,15 +1407,15 @@ export function portfolioIdToMeshPortfolioId(
 export function assetComplianceResultToRequirementCompliance(
   assetComplianceResult: AssetComplianceResult
 ): RequirementCompliance {
-  const { requirements: rawRequirements, result } = assetComplianceResult;
+  const { requirements: rawRequirements, result, paused } = assetComplianceResult;
   const requirements = rawRequirements.map(requirement => ({
     ...complianceRequirementToRequirement(requirement),
     complies: boolToBoolean(requirement.result),
   }));
 
   return {
     requirements,
-    complies: boolToBoolean(result),
+    complies: boolToBoolean(paused) || boolToBoolean(result),
   };
 }