fix installment

Author: jonasborges-stark

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

@@ -94,6 +94,7 @@ public MerchantPurchase(Map<String, Object> data) throws Exception {
         this.billingZipCode = (String) dataCopy.remove("billingZipCode");
         this.metadata = (Map<String, Object>) dataCopy.remove("metadata");
         this.challengeMode = (String) dataCopy.remove("challengeMode");
+        this.tags = (String[]) dataCopy.remove("tags");
         this.cardEnding = null;
         this.challengeUrl = null;
         this.currencyCode = null;
@@ -102,7 +103,6 @@ public MerchantPurchase(Map<String, Object> data) throws Exception {
         this.network = null;
         this.source = null;
         this.status = null;
-        this.tags = null;
         this.updated = null;
         this.created = null;
 

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

@@ -5,7 +5,6 @@
 import com.starkbank.utils.Rest;
 import com.starkbank.utils.SubResource;
 
-import java.io.InputStream;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,7 +21,7 @@ public class MerchantSession extends Resource {
     static ClassData data = new ClassData(MerchantSession.class, "MerchantSession");
 
     public List<String> allowedFundingTypes;
-    public List<MerchantSession.AllowedInstallments> allowedInstallments;
+    public List<AllowedInstallment> allowedInstallments;
     public List<String> allowedIps;
     public String challengeMode;
     public String created;
@@ -32,7 +31,7 @@ public class MerchantSession extends Resource {
     public String updated;
     public String uuid;
 
-    public MerchantSession(String id, List<String> allowedFundingTypes, List<MerchantSession.AllowedInstallments> 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 created, Number expiration, String status, String[] tags, String updated, String uuid)  {
         super(id);
         this.allowedFundingTypes = allowedFundingTypes;
         this.allowedInstallments = allowedInstallments;
@@ -69,21 +68,21 @@ public MerchantSession(Map<String, Object> data) throws Exception {
     }
 
 
-    private List<MerchantSession.AllowedInstallments> parseAllowedInstallments(List<Object> allowedInstallments) {
+    private List<AllowedInstallment> parseAllowedInstallments(List<Object> allowedInstallments) {
         if (allowedInstallments == null)
             return null;
 
-        List<MerchantSession.AllowedInstallments> parsed = new ArrayList<>();
-        if (allowedInstallments.isEmpty() || allowedInstallments.get(0) instanceof MerchantSession.AllowedInstallments) {
+        List<AllowedInstallment> parsed = new ArrayList<>();
+        if (allowedInstallments.isEmpty() || allowedInstallments.get(0) instanceof AllowedInstallment) {
             for (Object allowedInstallment : allowedInstallments) {
-                parsed.add((MerchantSession.AllowedInstallments) allowedInstallment);
+                parsed.add((AllowedInstallment) allowedInstallment);
             }
 
             return parsed;
         }
 
         for (Object allowedInstallment : allowedInstallments) {
-            MerchantSession.AllowedInstallments allowedInstallmentObject = new MerchantSession.AllowedInstallments(
+            AllowedInstallment allowedInstallmentObject = new AllowedInstallment(
                     (Long) ((Map<String, Object>) allowedInstallment).get("totalAmount"),
                     (Integer) ((Map<String, Object>) allowedInstallment).get("count")
             );
@@ -161,14 +160,14 @@ public Page(List<MerchantSession> merchantSessions, String cursor) {
         }
     }
 
-    public static class AllowedInstallments  extends SubResource {
+    public static class AllowedInstallment extends SubResource {
 
-        static SubResource.ClassData data = new SubResource.ClassData(AllowedInstallments.class, "AllowedInstallments");
+        static SubResource.ClassData data = new SubResource.ClassData(AllowedInstallment.class, "AllowedInstallments");
 
         public long totalAmount;
         public int count;
 
-        public AllowedInstallments(long totalAmount, int count){
+        public AllowedInstallment(long totalAmount, int count){
             this.totalAmount = totalAmount;
             this.count = count;
         }
@@ -246,11 +245,11 @@ public Purchase(Map<String, Object> data) throws Exception  {
             this.billingStreetLine2 = (String) dataCopy.remove("billingStreetLine2");
             this.billingZipCode = (String) dataCopy.remove("billingZipCode");
             this.metadata =  (Map<String, Object>) dataCopy.remove("metadata");
+            this.tags = (String[]) dataCopy.remove("tags");
             this.challengeMode = null;
             this.network = null;
             this.source = null;
             this.status = null;
-            this.tags = null;
             this.update = null;
 
             if (!dataCopy.isEmpty()) {

src/test/java/TestMerchantSession.java

@@ -130,7 +130,7 @@ public void testMerchantSessionPurchaseChallengeModeDisabled() throws Exception
 
         MerchantSession.Purchase purchaseResponse = MerchantSession.purchase(
                 merchantSession.uuid, examplePurchaseChallengeModeDisable());
-
+        System.out.println(purchaseResponse);
         Assert.assertNotNull(purchaseResponse.id);
     }
 

src/test/java/utils/MerchantSession.java

@@ -14,12 +14,12 @@ public static com.starkbank.MerchantSession exampleMerchantSession(String challe
         allowedFundingTypes.add("credit");
         data.put("allowedFundingTypes", allowedFundingTypes);
 
-        List<com.starkbank.MerchantSession.AllowedInstallments> allowedInstallments = new ArrayList<>();
+        List<com.starkbank.MerchantSession.AllowedInstallment> allowedInstallments = new ArrayList<>();
 
-        com.starkbank.MerchantSession.AllowedInstallments allowedInstallments1 = new com.starkbank.MerchantSession.AllowedInstallments(5000L, 1);
-        com.starkbank.MerchantSession.AllowedInstallments allowedInstallments2 = new com.starkbank.MerchantSession.AllowedInstallments(5500L, 2);
+        com.starkbank.MerchantSession.AllowedInstallment allowedInstallment1 = new com.starkbank.MerchantSession.AllowedInstallment(5000L, 1);
+        com.starkbank.MerchantSession.AllowedInstallment allowedInstallments2 = new com.starkbank.MerchantSession.AllowedInstallment(5500L, 2);
 
-        allowedInstallments.add(allowedInstallments1);
+        allowedInstallments.add(allowedInstallment1);
         allowedInstallments.add(allowedInstallments2);
 
 
@@ -58,6 +58,7 @@ public static com.starkbank.MerchantSession.Purchase examplePurchaseChallengeMod
         metadata.put("extraData", "extraData");
 
         purchaseData.put("metadata", metadata);
+        purchaseData.put("tags", new String[]{"Stark", "Suit"});
 
         return new com.starkbank.MerchantSession.Purchase(purchaseData);
     }
@@ -69,8 +70,8 @@ public static com.starkbank.MerchantSession.Purchase examplePurchaseChallengeMod
         purchaseData.put("cardExpiration", "2035-01");
         purchaseData.put("cardNumber", "36490101441625");
         purchaseData.put("cardSecurityCode", "123");
-        purchaseData.put("holderName", "Margaery Tyrell");
         purchaseData.put("fundingType", "credit");
+        purchaseData.put("holderName", "Margaery Tyrell");
 
 
         return new com.starkbank.MerchantSession.Purchase(purchaseData);