adds new fields to requests (#49)

iyzico · Jul 12, 2017 · ea4b16e · ea4b16e
1 parent 822b3b4
commit ea4b16e
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 82 deletions.
diff --git a/src/main/java/com/iyzipay/Constants.java b/src/main/java/com/iyzipay/Constants.java
@@ -0,0 +1,9 @@
+package com.iyzipay;
+
+public final class Constants {
+
+    public static final int SINGLE_INSTALLMENT = 1;
+
+    private Constants() {
+    }
+}
diff --git a/src/main/java/com/iyzipay/request/CreateApmInitializeRequest.java b/src/main/java/com/iyzipay/request/CreateApmInitializeRequest.java
@@ -17,14 +17,14 @@ public class CreateApmInitializeRequest extends Request {
     private String paymentGroup;
     private String paymentSource;
     private String currency;
-    private String basketId;
     private String merchantOrderId;
     private String countryCode;
     private String accountHolderName;
     private String merchantCallbackUrl;
     private String merchantErrorUrl;
     private String merchantNotificationUrl;
     private String apmType;
+    private String basketId;
     private Buyer buyer;
     private Address shippingAddress;
     private Address billingAddress;
@@ -134,6 +134,14 @@ public void setApmType(String apmType) {
         this.apmType = apmType;
     }
 
+    public String getBasketId() {
+        return basketId;
+    }
+
+    public void setBasketId(String basketId) {
+        this.basketId = basketId;
+    }
+
     public Buyer getBuyer() {
         return buyer;
     }
@@ -166,14 +174,6 @@ public void setBasketItems(List<BasketItem> basketItems) {
         this.basketItems = basketItems;
     }
 
-    public String getBasketId() {
-        return basketId;
-    }
-
-    public void setBasketId(String basketId) {
-        this.basketId = basketId;
-    }
-
     @Override
     public String toString() {
         return new ToStringRequestBuilder(this)

diff --git a/src/main/java/com/iyzipay/request/CreateBasicPaymentRequest.java b/src/main/java/com/iyzipay/request/CreateBasicPaymentRequest.java
@@ -1,5 +1,6 @@
 package com.iyzipay.request;
 
+import com.iyzipay.Constants;
 import com.iyzipay.Request;
 import com.iyzipay.ToStringRequestBuilder;
 import com.iyzipay.model.PaymentCard;
@@ -8,8 +9,6 @@
 
 public class CreateBasicPaymentRequest extends Request {
 
-    public static final int SINGLE_INSTALLMENT = 1;
-
     private BigDecimal price;
     private BigDecimal paidPrice;
     private Integer installment;
@@ -23,7 +22,7 @@ public class CreateBasicPaymentRequest extends Request {
     private String callbackUrl;
 
     public CreateBasicPaymentRequest() {
-        setInstallment(SINGLE_INSTALLMENT);
+        setInstallment(Constants.SINGLE_INSTALLMENT);
     }
 
     public BigDecimal getPrice() {

diff --git a/src/main/java/com/iyzipay/request/CreateBkmInitializeRequest.java b/src/main/java/com/iyzipay/request/CreateBkmInitializeRequest.java
@@ -14,12 +14,13 @@ public class CreateBkmInitializeRequest extends Request {
     private BigDecimal price;
     private String basketId;
     private String paymentGroup;
-    private String paymentSource;
     private Buyer buyer;
     private Address shippingAddress;
     private Address billingAddress;
     private List<BasketItem> basketItems;
     private String callbackUrl;
+    private String paymentSource;
+    private String currency;
     private List<Integer> enabledInstallments;
 
     public BigDecimal getPrice() {
@@ -46,14 +47,6 @@ public void setPaymentGroup(String paymentGroup) {
         this.paymentGroup = paymentGroup;
     }
 
-    public String getPaymentSource() {
-        return paymentSource;
-    }
-
-    public void setPaymentSource(String paymentSource) {
-        this.paymentSource = paymentSource;
-    }
-
     public Buyer getBuyer() {
         return buyer;
     }
@@ -94,6 +87,22 @@ public void setCallbackUrl(String callbackUrl) {
         this.callbackUrl = callbackUrl;
     }
 
+    public String getPaymentSource() {
+        return paymentSource;
+    }
+
+    public void setPaymentSource(String paymentSource) {
+        this.paymentSource = paymentSource;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
     public List<Integer> getEnabledInstallments() {
         return enabledInstallments;
     }
@@ -115,6 +124,7 @@ public String toString() {
                 .append("basketItems", basketItems)
                 .append("callbackUrl", callbackUrl)
                 .append("paymentSource", paymentSource)
+                .append("currency", currency)
                 .append("enabledInstallments", enabledInstallments)
                 .toString();
     }

diff --git a/src/main/java/com/iyzipay/request/CreatePaymentRequest.java b/src/main/java/com/iyzipay/request/CreatePaymentRequest.java
@@ -1,5 +1,6 @@
 package com.iyzipay.request;
 
+import com.iyzipay.Constants;
 import com.iyzipay.Request;
 import com.iyzipay.ToStringRequestBuilder;
 import com.iyzipay.model.Address;
@@ -24,10 +25,14 @@ public class CreatePaymentRequest extends Request {
     private Address billingAddress;
     private List<BasketItem> basketItems;
     private String paymentSource;
-    private String callbackUrl;
+    private String currency;
     private String posOrderId;
     private String connectorName;
-    private String currency;
+    private String callbackUrl;
+
+    public CreatePaymentRequest() {
+        setInstallment(Constants.SINGLE_INSTALLMENT);
+    }
 
     public BigDecimal getPrice() {
         return price;
@@ -125,12 +130,12 @@ public void setPaymentSource(String paymentSource) {
         this.paymentSource = paymentSource;
     }
 
-    public String getCallbackUrl() {
-        return callbackUrl;
+    public String getCurrency() {
+        return currency;
     }
 
-    public void setCallbackUrl(String callbackUrl) {
-        this.callbackUrl = callbackUrl;
+    public void setCurrency(String currency) {
+        this.currency = currency;
     }
 
     public String getPosOrderId() {
@@ -149,12 +154,12 @@ public void setConnectorName(String connectorName) {
         this.connectorName = connectorName;
     }
 
-    public String getCurrency() {
-        return currency;
+    public String getCallbackUrl() {
+        return callbackUrl;
     }
 
-    public void setCurrency(String currency) {
-        this.currency = currency;
+    public void setCallbackUrl(String callbackUrl) {
+        this.callbackUrl = callbackUrl;
     }
 
     @Override

diff --git a/src/main/java/com/iyzipay/request/CreatePeccoInitializeRequest.java b/src/main/java/com/iyzipay/request/CreatePeccoInitializeRequest.java
@@ -13,10 +13,10 @@ public class CreatePeccoInitializeRequest extends Request {
 
     private BigDecimal price;
     private BigDecimal paidPrice;
-    private String currency;
     private String basketId;
     private String paymentGroup;
     private String paymentSource;
+    private String currency;
     private Buyer buyer;
     private Address shippingAddress;
     private Address billingAddress;
@@ -39,14 +39,6 @@ public void setPaidPrice(BigDecimal paidPrice) {
         this.paidPrice = paidPrice;
     }
 
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
     public String getBasketId() {
         return basketId;
     }
@@ -71,6 +63,14 @@ public void setPaymentSource(String paymentSource) {
         this.paymentSource = paymentSource;
     }
 
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
     public Buyer getBuyer() {
         return buyer;
     }

diff --git a/src/main/java/com/iyzipay/request/CreateSubMerchantRequest.java b/src/main/java/com/iyzipay/request/CreateSubMerchantRequest.java
@@ -14,12 +14,12 @@ public class CreateSubMerchantRequest extends Request {
     private String contactName;
     private String contactSurname;
     private String legalCompanyTitle;
-    private String subMerchantExternalId;
+    private String swiftCode;
+    private String currency;
     private String identityNumber;
     private String taxNumber;
+    private String subMerchantExternalId;
     private String subMerchantType;
-    private String currency;
-    private String swiftCode;
 
     public String getName() {
         return name;
@@ -93,12 +93,20 @@ public void setLegalCompanyTitle(String legalCompanyTitle) {
         this.legalCompanyTitle = legalCompanyTitle;
     }
 
-    public String getSubMerchantExternalId() {
-        return subMerchantExternalId;
+    public String getSwiftCode() {
+        return swiftCode;
     }
 
-    public void setSubMerchantExternalId(String subMerchantExternalId) {
-        this.subMerchantExternalId = subMerchantExternalId;
+    public void setSwiftCode(String swiftCode) {
+        this.swiftCode = swiftCode;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
     }
 
     public String getIdentityNumber() {
@@ -117,28 +125,20 @@ public void setTaxNumber(String taxNumber) {
         this.taxNumber = taxNumber;
     }
 
-    public String getSubMerchantType() {
-        return subMerchantType;
-    }
-
-    public void setSubMerchantType(String subMerchantType) {
-        this.subMerchantType = subMerchantType;
-    }
-
-    public String getCurrency() {
-        return currency;
+    public String getSubMerchantExternalId() {
+        return subMerchantExternalId;
     }
 
-    public void setCurrency(String currency) {
-        this.currency = currency;
+    public void setSubMerchantExternalId(String subMerchantExternalId) {
+        this.subMerchantExternalId = subMerchantExternalId;
     }
 
-    public String getSwiftCode() {
-        return swiftCode;
+    public String getSubMerchantType() {
+        return subMerchantType;
     }
 
-    public void setSwiftCode(String swiftCode) {
-        this.swiftCode = swiftCode;
+    public void setSubMerchantType(String subMerchantType) {
+        this.subMerchantType = subMerchantType;
     }
 
     @Override

diff --git a/src/main/java/com/iyzipay/request/RetrieveInstallmentInfoRequest.java b/src/main/java/com/iyzipay/request/RetrieveInstallmentInfoRequest.java
@@ -9,6 +9,7 @@ public class RetrieveInstallmentInfoRequest extends Request {
 
     private String binNumber;
     private BigDecimal price;
+    private String currency;
 
     public String getBinNumber() {
         return binNumber;
@@ -26,12 +27,21 @@ public void setPrice(BigDecimal price) {
         this.price = price;
     }
 
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
     @Override
     public String toString() {
         return new ToStringRequestBuilder(this)
                 .appendSuper(super.toString())
                 .append("binNumber", binNumber)
                 .append("price", price)
+                .append("currency", currency)
                 .toString();
     }
 }