Added required attributes for company level webhook setup (#82)

Author: shubhamk67

force-app/main/default/classes/WebhookSetupRequest.cls

@@ -22,6 +22,12 @@ public with sharing class WebhookSetupRequest {
     @NamespaceAccessible
     public String encryptionProtocol { get; set; }
 
+    @NamespaceAccessible
+    public String filterMerchantAccountType { get; set; }
+    
+    @NamespaceAccessible
+    public List<String> filterMerchantAccounts { get; set; }
+    
     @NamespaceAccessible
     public Boolean equals(Object obj) {
         if (obj == null || !(obj instanceof WebhookSetupRequest)) return false;
@@ -33,7 +39,9 @@ public with sharing class WebhookSetupRequest {
             && this.communicationFormat == other.communicationFormat
             && this.type == other.type
             && this.encryptionProtocol == other.encryptionProtocol
-            && this.additionalSettings.equals(other.additionalSettings);
+            && this.filterMerchantAccountType == other.filterMerchantAccountType
+            && (this.filterMerchantAccounts != null ? this.filterMerchantAccounts.equals(other.filterMerchantAccounts) : other.filterMerchantAccounts == null)
+            && (this.additionalSettings != null ? this.additionalSettings.equals(other.additionalSettings) : other.additionalSettings == null);
     }
 
     @NamespaceAccessible
@@ -45,6 +53,8 @@ public with sharing class WebhookSetupRequest {
             communicationFormat,
             type,
             encryptionProtocol,
+            filterMerchantAccountType,
+            filterMerchantAccounts,
             additionalSettings
         };
         return ApiLibUtils.computeHashCode(requestFields);
@@ -60,6 +70,8 @@ public with sharing class WebhookSetupRequest {
         example.type = 'standard';
         example.encryptionProtocol = 'TLSv1.3';
         example.description = 'Webhook for payment notifications';
+        example.filterMerchantAccountType = 'includeAccounts';
+        example.filterMerchantAccounts = new List<String>{'TestMerchantAccount'};
         example.additionalSettings  = new AdditionalSettings();
         example.additionalSettings.includeEventCodes = new List<String>{
             AdyenConstants.NOTIFICATION_REQUEST_TYPE_AUTHORISE,
@@ -76,12 +88,14 @@ public with sharing class WebhookSetupRequest {
         public Boolean equals(Object obj) {
             if (obj == null || !(obj instanceof AdditionalSettings)) return false;
             AdditionalSettings other = (AdditionalSettings) obj;
-            return this.includeEventCodes == other.includeEventCodes;
+            return (this.includeEventCodes != null
+                ? this.includeEventCodes.equals(other.includeEventCodes)
+                : other.includeEventCodes == null);
         }
 
         public Integer hashCode() {
             return ApiLibUtils.computeHashCode(new List<Object>{ includeEventCodes });
         }
     }
 
-} 
+}

force-app/main/default/classes/WebhookSetupRequestTest.cls

@@ -8,6 +8,8 @@ private class WebhookSetupRequestTest {
         Assert.isNotNull(request.communicationFormat);
         Assert.isNotNull(request.type);
         Assert.isNotNull(request.encryptionProtocol);
+        Assert.isNotNull(request.filterMerchantAccountType);
+        Assert.isNotNull(request.filterMerchantAccounts);
     }
 
     @IsTest
@@ -37,6 +39,20 @@ private class WebhookSetupRequestTest {
         Assert.isFalse(result, 'Expected WebhookSetupRequest objects to be different');
     }
 
+    @IsTest
+    static void testEqualsFalseWithFilterMerchantAccounts() {
+        // Given
+        WebhookSetupRequest req1 = WebhookSetupRequest.getExample();
+        WebhookSetupRequest req2 = WebhookSetupRequest.getExample();
+        req2.filterMerchantAccounts = new List<String>{'AnotherAccount'};
+
+        // When
+        Boolean result = req1.equals(req2);
+
+        // Then
+        Assert.isFalse(result, 'Expected WebhookSetupRequest objects to be different due to filterMerchantAccounts');
+    }
+
     @IsTest
     static void testHashCodeSame() {
         // Given
@@ -65,4 +81,19 @@ private class WebhookSetupRequestTest {
         // Then
         Assert.areNotEqual(hashCode1, hashCode2, 'Expected different objects to have different hash codes');
     }
-}
+
+    @IsTest
+    static void testHashCodeDifferentWithFilterMerchantAccounts() {
+        // Given
+        WebhookSetupRequest req1 = WebhookSetupRequest.getExample();
+        WebhookSetupRequest req2 = WebhookSetupRequest.getExample();
+        req2.filterMerchantAccounts = new List<String>{'AnotherAccount'};
+
+        // When
+        Integer hashCode1 = req1.hashCode();
+        Integer hashCode2 = req2.hashCode();
+
+        // Then
+        Assert.areNotEqual(hashCode1, hashCode2, 'Expected different objects to have different hash codes due to filterMerchantAccounts');
+    }
+}

force-app/main/default/classes/WebhookSetupResponse.cls

@@ -28,6 +28,12 @@ public with sharing class WebhookSetupResponse {
     @NamespaceAccessible
     public AdditionalSettings additionalSettings { get; set; }
 
+    @NamespaceAccessible
+    public String filterMerchantAccountType { get; set; }
+    
+    @NamespaceAccessible
+    public List<String> filterMerchantAccounts { get; set; }
+    
     @NamespaceAccessible
     public Boolean equals(Object obj) {
         if (obj == null || !(obj instanceof WebhookSetupResponse)) return false;
@@ -41,7 +47,9 @@ public with sharing class WebhookSetupResponse {
             && this.type == other.type
             && this.encryptionProtocol == other.encryptionProtocol
             && this.hasError == other.hasError
-            && this.additionalSettings.equals(other.additionalSettings);
+            && this.filterMerchantAccountType == other.filterMerchantAccountType
+            && (this.filterMerchantAccounts != null ? this.filterMerchantAccounts.equals(other.filterMerchantAccounts) : other.filterMerchantAccounts == null)
+            && (this.additionalSettings != null ? this.additionalSettings.equals(other.additionalSettings) : other.additionalSettings == null);
     }
 
 
@@ -56,8 +64,9 @@ public with sharing class WebhookSetupResponse {
             type,
             encryptionProtocol,
             hasError,
-            additionalSettings != null ? additionalSettings.includeEventCodes : null,
-            additionalSettings != null ? additionalSettings.excludeEventCodes : null
+            additionalSettings,
+            filterMerchantAccountType,
+            filterMerchantAccounts
         };
         return ApiLibUtils.computeHashCode(responseFields);
     }
@@ -73,6 +82,8 @@ public with sharing class WebhookSetupResponse {
         example.type = 'standard';
         example.encryptionProtocol = 'TLSv1.3';
         example.hasError = false;
+        example.filterMerchantAccountType = 'includeAccounts';
+        example.filterMerchantAccounts = new List<String>{'TestMerchantAccount'};
 
         example.additionalSettings = new AdditionalSettings();
         example.additionalSettings.includeEventCodes = new List<String>{
@@ -94,8 +105,10 @@ public with sharing class WebhookSetupResponse {
         public Boolean equals(Object obj) {
             if (obj == null || !(obj instanceof AdditionalSettings)) return false;
             AdditionalSettings other = (AdditionalSettings) obj;
-            return this.includeEventCodes == other.includeEventCodes
-                && this.excludeEventCodes == other.excludeEventCodes;
+            Boolean includeCodesEqual = (this.includeEventCodes != null ? this.includeEventCodes.equals(other.includeEventCodes) : other.includeEventCodes == null);
+            Boolean excludeCodesEqual = (this.excludeEventCodes != null ? this.excludeEventCodes.equals(other.excludeEventCodes) : other.excludeEventCodes == null);
+
+            return includeCodesEqual && excludeCodesEqual;
         }
 
         public Integer hashCode() {
@@ -104,4 +117,4 @@ public with sharing class WebhookSetupResponse {
 
     }
 
-} 
+}

force-app/main/default/classes/WebhookSetupResponseTest.cls

@@ -1,6 +1,19 @@
 @IsTest
 private class WebhookSetupResponseTest {
 
+    @IsTest
+    static void getExampleTest() {
+        // When
+        WebhookSetupResponse response = WebhookSetupResponse.getExample();
+
+        // Then
+        Assert.isNotNull(response);
+        Assert.isNotNull(response.id);
+        Assert.isNotNull(response.url);
+        Assert.isNotNull(response.filterMerchantAccountType);
+        Assert.isNotNull(response.filterMerchantAccounts);
+    }
+    
     @IsTest
     static void testEqualsTrue() {
         // Given
@@ -33,7 +46,7 @@ private class WebhookSetupResponseTest {
         // Given
         WebhookSetupResponse res1 = WebhookSetupResponse.getExample();
         WebhookSetupResponse res2 = WebhookSetupResponse.getExample();
-        
+
         res1.additionalSettings = new WebhookSetupResponse.AdditionalSettings();
         res1.additionalSettings.includeEventCodes = new List<String>{
             AdyenConstants.NOTIFICATION_REQUEST_TYPE_AUTHORISE,
@@ -59,7 +72,7 @@ private class WebhookSetupResponseTest {
         // Then
         Assert.areEqual(hashCode1, hashCode2, 'Expected identical objects to have the same hash code');
     }
-    
+
     @IsTest
     static void testHashCodeDifferent() {
         // Given