Add holderId and softDescriptor to MerchantSession and MerchantPurchase

Author: nicolasalmeida-stark

src/main/java/com/starkbank/MerchantPurchase.java

@@ -24,6 +24,8 @@ public class MerchantPurchase extends Resource {
     public String holderName;
     public String holderEmail;
     public String holderPhone;
+    public String holderId;
+    public String softDescriptor;
     public String fundingType;
     public String challengeMode;
     public String billingCountryCode;
@@ -45,13 +47,15 @@ public class MerchantPurchase extends Resource {
     public String[] tags;
     public String updated;
 
-    public MerchantPurchase(String id, long amount, int installmentCount, String holderName, String holderEmail, String holderPhone, String fundingType, String billingCountryCode, String billingCity, String billingStateCode, String billingStreetLine1, String billingStreetLine2, String billingZipCode, Map<String, Object> metadata, String cardEnding, String cardId, String challengeMode, String challengeUrl, String created, String currencyCode, String endToEndId, int fee, String network, String source, String status, String[] tags, String updated) {
+    public MerchantPurchase(String id, long amount, int installmentCount, String holderName, String holderEmail, String holderPhone, String holderId, String softDescriptor, String fundingType, String billingCountryCode, String billingCity, String billingStateCode, String billingStreetLine1, String billingStreetLine2, String billingZipCode, Map<String, Object> metadata, String cardEnding, String cardId, String challengeMode, String challengeUrl, String created, String currencyCode, String endToEndId, int fee, String network, String source, String status, String[] tags, String updated) {
         super(id);
         this.amount = amount;
         this.installmentCount = installmentCount;
         this.holderName = holderName;
         this.holderEmail = holderEmail;
         this.holderPhone = holderPhone;
+        this.holderId = holderId;
+        this.softDescriptor = softDescriptor;
         this.fundingType = fundingType;
         this.billingCountryCode = billingCountryCode;
         this.billingCity = billingCity;
@@ -85,6 +89,8 @@ public MerchantPurchase(Map<String, Object> data) throws Exception {
         this.holderName = (String) dataCopy.remove("holderName");
         this.holderEmail = (String) dataCopy.remove("holderEmail");
         this.holderPhone = (String) dataCopy.remove("holderPhone");
+        this.holderId = (String) dataCopy.remove("holderId");
+        this.softDescriptor = (String) dataCopy.remove("softDescriptor");
         this.fundingType = (String) dataCopy.remove("fundingType");
         this.billingCountryCode = (String) dataCopy.remove("billingCountryCode");
         this.billingCity = (String) dataCopy.remove("billingCity");

src/main/java/com/starkbank/MerchantSession.java

@@ -24,19 +24,23 @@ public class MerchantSession extends Resource {
     public List<AllowedInstallment> allowedInstallments;
     public List<String> allowedIps;
     public String challengeMode;
+    public String holderId;
+    public String softDescriptor;
     public String created;
     public Number expiration;
     public String status;
     public String[] tags;
     public String updated;
     public String uuid;
 
-    public MerchantSession(String id, List<String> allowedFundingTypes, List<AllowedInstallment> allowedInstallments, List<String> allowedIps, String challengeMode, String created, Number expiration, String status, String[] tags, String updated, String uuid)  {
+    public MerchantSession(String id, List<String> allowedFundingTypes, List<AllowedInstallment> allowedInstallments, List<String> allowedIps, String challengeMode, String holderId, String softDescriptor, String created, Number expiration, String status, String[] tags, String updated, String uuid)  {
         super(id);
         this.allowedFundingTypes = allowedFundingTypes;
         this.allowedInstallments = allowedInstallments;
         this.allowedIps = allowedIps;
         this.challengeMode = challengeMode;
+        this.holderId = holderId;
+        this.softDescriptor = softDescriptor;
         this.created = created;
         this.expiration = expiration;
         this.status = status;
@@ -53,6 +57,8 @@ public MerchantSession(Map<String, Object> data) throws Exception {
         this.allowedFundingTypes = (List<String>) dataCopy.remove("allowedFundingTypes");
         this.allowedInstallments = parseAllowedInstallments((List<Object>) dataCopy.remove("allowedInstallments"));
         this.challengeMode = (String) dataCopy.remove("challengeMode");
+        this.holderId = (String) dataCopy.remove("holderId");
+        this.softDescriptor = (String) dataCopy.remove("softDescriptor");
         this.expiration = (Number) dataCopy.remove("expiration");
         this.tags = (String[]) dataCopy.remove("tags");
         this.uuid = null;
@@ -186,6 +192,8 @@ public final static class Purchase extends Resource {
         public String holderName;
         public String holderEmail;
         public String holderPhone;
+        public String holderId;
+        public String softDescriptor;
         public String fundingType;
         public String billingCountryCode;
         public String billingCity;
@@ -201,7 +209,7 @@ public final static class Purchase extends Resource {
         public String[] tags;
         public String update;
 
-        public Purchase(String id, Long amount, Integer installmentCount, String cardId, String cardExpiration, String cardNumber, String cardSecurityCode, String holderName, String holderEmail, String holderPhone, String fundingType, String billingCountryCode, String billingCity, String billingStateCode, String billingStreetLine1, String billingStreetLine2, String billingZipCode, String challengeMode, Map<String, Object> metadata) {
+        public Purchase(String id, Long amount, Integer installmentCount, String cardId, String cardExpiration, String cardNumber, String cardSecurityCode, String holderName, String holderEmail, String holderPhone, String holderId, String softDescriptor, String fundingType, String billingCountryCode, String billingCity, String billingStateCode, String billingStreetLine1, String billingStreetLine2, String billingZipCode, String challengeMode, Map<String, Object> metadata) {
             super(id);
             this.amount = amount;
             this.installmentCount = installmentCount;
@@ -212,6 +220,8 @@ public Purchase(String id, Long amount, Integer installmentCount, String cardId,
             this.holderName = holderName;
             this.holderEmail = holderEmail;
             this.holderPhone = holderPhone;
+            this.holderId = holderId;
+            this.softDescriptor = softDescriptor;
             this.fundingType = fundingType;
             this.billingCountryCode = billingCountryCode;
             this.billingCity = billingCity;
@@ -246,6 +256,8 @@ public Purchase(Map<String, Object> data) throws Exception  {
             this.billingZipCode = (String) dataCopy.remove("billingZipCode");
             this.metadata =  (Map<String, Object>) dataCopy.remove("metadata");
             this.tags = (String[]) dataCopy.remove("tags");
+            this.holderId = (String) dataCopy.remove("holderId");
+            this.softDescriptor = (String) dataCopy.remove("softDescriptor");
             this.challengeMode = null;
             this.network = null;
             this.source = null;

src/test/java/TestMerchantPurchase.java

@@ -16,10 +16,11 @@ public class TestMerchantPurchase {
     @Test
     public void testCreate() throws Exception {
         Settings.user = utils.User.defaultProject();
+        Settings.timeout = 20;
+
         MerchantSession merchantSession = MerchantSession.create(exampleMerchantSession("disabled"));
         MerchantSession.Purchase purchase = MerchantSession.purchase(merchantSession.uuid, examplePurchaseChallengeModeDisable());
 
-        System.out.println(exampleMerchantPurchase(purchase.cardId));
         MerchantPurchase merchantPurchase = MerchantPurchase.create(exampleMerchantPurchase(purchase.cardId));
         System.out.println(merchantPurchase);
         Assert.assertNotNull(merchantPurchase.id);

src/test/java/TestMerchantSession.java

@@ -125,6 +125,7 @@ public void testLogs() throws Exception {
     @Test
     public void testMerchantSessionPurchaseChallengeModeDisabled() throws Exception {
         Settings.user = utils.User.defaultProject();
+        Settings.timeout = 20;
 
         MerchantSession merchantSession = MerchantSession.create(exampleMerchantSession("disabled"));
 

src/test/java/utils/MerchantSession.java

@@ -26,6 +26,8 @@ public static com.starkbank.MerchantSession exampleMerchantSession(String challe
         data.put("allowedInstallments", allowedInstallments);
         data.put("expiration", 3600);
         data.put("challengeMode", challengeMode);
+        data.put("holderId", "5656565656565656");
+        data.put("softDescriptor", "Stark Bank");
 
         data.put("tags", new String[]{"Stark", "Suit"});
 
@@ -42,6 +44,9 @@ public static com.starkbank.MerchantSession.Purchase examplePurchaseChallengeMod
         purchaseData.put("holderName", "Margaery Tyrell");
         purchaseData.put("holderEmail", "margaery.tyrell@starkbank.com");
         purchaseData.put("holderPhone", "11998663456");
+        purchaseData.put("holderId", "5656565656565656");
+        purchaseData.put("softDescriptor", "Stark Bank");
+
         purchaseData.put("fundingType", "credit");
         purchaseData.put("billingCountryCode", "BRA");
         purchaseData.put("billingCity", "Sao Paulo");