New db fields and leniency (#10)

Added some missing fields and leniency for future

Author: fronugget

README.md

@@ -15,11 +15,12 @@ A native JAVA SDK for the Payment Rails API
 ### Maven
 
 Add this dependency to your project's POM:
+
 ```xml
 <dependency>
     <groupId>ca.paymentrails</groupId>
     <artifactId>paymentrails</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
 </dependency>
 ```
 
@@ -53,16 +54,13 @@ is the best source of information about the API.
 
 For more information please read the [Java API docs](https://github.com/PaymentRails/paymentrails_dotnet/tree/master/docs/) is available. The best starting point is:
 
-| Data Type | SDK Documentation |
-| ----- | ----- |
-| Batch | [API Docs for Batch](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/batchgateway.md) |
-| Payment | [API Docs for Payment](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/paymentgateway.md) |
-| Recipient | [API Docs for Recipient](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/recipientgateway.md) |
+| Data Type         | SDK Documentation                                                                                                              |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| Batch             | [API Docs for Batch](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/batchgateway.md)                        |
+| Payment           | [API Docs for Payment](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/paymentgateway.md)                    |
+| Recipient         | [API Docs for Recipient](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/recipientgateway.md)                |
 | Recipient Account | [API Docs for Recipient Account](https://github.com/PaymentRails/java-sdk/tree/master/docs/classes/recipientaccountgateway.md) |
 
-
-
-
 ### merchantKey
 
 - **Type**: Authorization

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ca.paymentrails</groupId>
     <artifactId>paymentrails</artifactId>
-    <version>1.0</version>
+    <version>1.0.1</version>
     <description>Java SDK for Payment Rails API</description>
     <packaging>jar</packaging>
     <name>Payment Rails Java SDK</name>

src/main/java/ca/paymentrails/paymentrails/BatchGateway.java

@@ -124,13 +124,15 @@ public BatchSummary summary(String batch_id) throws Exception {
     private Batch batchFactory(String data) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode node = mapper.readTree(data);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         Batch batch = mapper.readValue(node.get("batch").traverse(), Batch.class);
         return batch;
     }
 
     private List<Batch> batchListFactory(String data) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode node = mapper.readTree(data);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         Object batch = mapper.readValue(node.get("batches").traverse(), Object.class);
         @SuppressWarnings("unchecked")
         List<Batch> batchs = (List<Batch>) batch;

src/main/java/ca/paymentrails/paymentrails/Payment.java

@@ -9,6 +9,13 @@ public class Payment {
     private String status;
     private Boolean isSupplyPayment;
     private String returnedAmount;
+
+    private String amount;
+    private String currency;
+    private String category;
+    private RecipientAccount account;
+    private List<String> tags;
+
     private String sourceAmount;
     private String sourceCurrency;
     private String targetAmount;
@@ -53,6 +60,46 @@ public void setWithholdingCurrency(String withholdingCurrency) {
         this.withholdingCurrency = withholdingCurrency;
     }
 
+    public List<String> getTags() {
+        return this.tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags = tags;
+    }
+
+    public RecipientAccount getAccount() {
+        return account;
+    }
+
+    public void setAccount(RecipientAccount account) {
+        this.account = account;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
     public String getWithholdingCurrency() {
         return withholdingCurrency;
     }

src/main/java/ca/paymentrails/paymentrails/Recipient.java

@@ -25,6 +25,8 @@ public class Recipient {
     String governmentId;
     String ssn;
     String primaryCurrency;
+    String placeOfBirth;
+    List<String> tags;
     String merchantId;
     String payoutMethod;
     public Object payout;
@@ -47,6 +49,14 @@ public void setTaxFormStatus(String taxFormStatus) {
         this.taxFormStatus = taxForm;
     }
 
+    public List<String> getTags() {
+        return this.tags;
+    }
+
+    public void setTags(List<String> tags) {
+        this.tags = tags;
+    }
+
     public String getTaxWithholdingPercentage() {
         return this.taxWithholdingPercentage;
     }
@@ -259,6 +269,14 @@ public void setPrimaryCurrency(String primaryCurrency) {
         this.primaryCurrency = primaryCurrency;
     }
 
+    public String getPlaceOfBirth() {
+        return placeOfBirth;
+    }
+
+    public void setPlaceOfBirth(String placeOfBirth) {
+        this.placeOfBirth = placeOfBirth;
+    }
+
     public String getMerchantId() {
         return merchantId;
     }

src/main/java/ca/paymentrails/paymentrails/RecipientAccount.java

@@ -8,6 +8,7 @@ public class RecipientAccount {
     Boolean primary;
     String currency;
     String id;
+    String recipientId;
     String recipientAccountId;
     String routeType;
     String recipientFees;
@@ -49,6 +50,13 @@ public void setStatus(String status){
         this.status = status;
     }
 
+    public String getRecipientId(){
+        return recipientId;
+    }
+    public void setRecipientId(String recipientId){
+        this.recipientId = recipientId;
+    }
+
     public String getType() {
         return type;
     }

src/main/java/ca/paymentrails/paymentrails/RecipientAccountGateway.java

@@ -75,6 +75,7 @@ public boolean delete(String recipient_id, String recipient_account_id) throws E
     private RecipientAccount recipientAccountFactory(String data) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         JsonNode node = mapper.readTree(data);
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         RecipientAccount recipientAccount = mapper.readValue(node.get("account").traverse(), RecipientAccount.class);
         return recipientAccount;
     }

src/main/java/ca/paymentrails/paymentrails/RecipientGateway.java

@@ -101,13 +101,15 @@ public List<Recipient> search(int page, int pageSize, String term) throws Except
 
     private Recipient recipientFactory(String data) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         JsonNode node = mapper.readTree(data);
         Recipient recipient = mapper.readValue(node.get("recipient").traverse(), Recipient.class);
         return recipient;
     }
 
     private List<Recipient> recipientListFactory(String data) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         JsonNode node = mapper.readTree(data);
 
         Object recipient = mapper.readValue(node.get("recipients").traverse(), Object.class);

src/test/java/ca/paymentrails/paymentrails/integration/BatchTest.java

@@ -26,32 +26,34 @@ private Recipient createRecipient() throws Exception {
 
         String email = "\"create.recipient" + uuid.toString() + "@example.com\"";
         String body = "{\"type\": \"individual\",\"firstName\": \"John\",\"lastName\": \"Smith\",\"email\":" + email
-                + ",\"address\":{\"street1\": \"123 Main St\",\"city\": \"San Francisco\",\"region\": \"CA\",\"postalCode\": \"94131\",\"country\": \"US\",\"phone\" : \"18005551212\"}}";
+                + ",\"address\":{\"street1\": \"123 Main St\",\"city\": \"San Francisco\",\"region\": \"CA\",\"postalCode\": \"94131\",\"country\": \"DE\",\"phone\" : \"18005551212\"}}";
 
         Recipient recipient = client.recipient.create(body);
 
-        body = "{\"type\": \"bank-transfer\", \"primary\": \"true\", \"country\": \"CA\", \"currency\": \"CAD\",\"accountNum\": \"604622847\", \"bankId\": \"123\", \"branchId\": \"47261\",  \"accountHolderName\": \"John Smith\"}";
+        body = "{\"type\": \"bank-transfer\", \"primary\": true, \"country\": \"DE\", \"currency\": \"EUR\", \"iban\": \"DE89 3704 0044 0532 0130 00\", \"accountHolderName\": \"John Smith\"}";
+
         client.recipientAccount.create(recipient.getId(), body);
 
         return recipient;
     }
 
     @Test
     public void testCreate() throws Exception {
-        Gateway client = new Gateway(new Configuration("YOUR-API-KEY", "YOUR-API-SECRET", "production"));
+        Gateway client = new Gateway(new Configuration("Your-API-KEY", "YOUR-API-SECRET", "production"));
+
 
-        String body = "{\"sourceCurrency\": \"USD\", \"description\":\"Integration Test Create\"}";
+        String body = "{\"sourceCurrency\": \"GBP\", \"description\":\"Integration Test Create\"}";
         Batch batch = client.batch.create(body);
-        assertEquals(batch.getCurrency(), "USD");
+        assertEquals(batch.getCurrency(), "GBP");
     }
 
     @Test
     public void testUpdate() throws Exception {
-        Gateway client = new Gateway(new Configuration("YOUR-API-KEY", "YOUR-API-SECRET", "production"));
+        Gateway client = new Gateway(new Configuration("Your-API-KEY", "YOUR-API-SECRET", "production"));
 
-        String body = "{\"sourceCurrency\": \"USD\", \"description\":\"Integration Test Create\"}";
+        String body = "{\"sourceCurrency\": \"GBP\", \"description\":\"Integration Test Create\"}";
         Batch batch = client.batch.create(body);
-        assertEquals(batch.getCurrency(), "USD");
+        assertEquals(batch.getCurrency(), "GBP");
 
         body = "{\"description\" : \"Integration Update\"}";
         boolean response = client.batch.update(batch.getId(), body);
@@ -66,14 +68,13 @@ public void testUpdate() throws Exception {
 
     @Test
     public void testCreateWithPayments() throws Exception {
-        Gateway client = new Gateway(new Configuration("YOUR-API-KEY", "YOUR-API-SECRET", "production"));
+        Gateway client = new Gateway(new Configuration("Your-API-KEY", "YOUR-API-SECRET", "production"));
+
 
         Recipient recipientAlpha = createRecipient();
-        Recipient recipientBeta = createRecipient();
 
         String body = "{\"payments\": [{\"recipient\": {\"id\": " + "\"" + recipientAlpha.getId() + "\""
-                + "},\"targetAmount\": \"10.00\", \"targetCurrency\": \"CAD\"},{\"recipient\": {\"id\": " + "\""
-                + recipientBeta.getId() + "\"" + "},\"sourceAmount\": \"10\", \"sourceCurrency\": \"CAD\"}]}";
+                + "},\"amount\": \"10.00\", \"currency\": \"EUR\"}]}";
         Batch batch = client.batch.create(body);
 
         assertNotNull(batch);
@@ -82,16 +83,17 @@ public void testCreateWithPayments() throws Exception {
         Batch batch1 = client.batch.find(batch.getId());
         assertNotNull(batch1);
 
-        assertEquals(2, batch1.getPayments().getPayments().size());
+        assertEquals(1, batch1.getPayments().getPayments().size());
     }
 
     @Test
     public void testPayments() throws Exception {
-        Gateway client = new Gateway(new Configuration("YOUR-API-KEY", "YOUR-API-SECRET", "production"));
+        Gateway client = new Gateway(new Configuration("Your-API-KEY", "YOUR-API-SECRET", "production"));
 
-        String body = "{\"sourceCurrency\": \"CAD\", \"description\":\"Integration Test Create\"}";
+
+        String body = "{\"sourceCurrency\": \"GBP\", \"description\":\"Integration Test Create\"}";
         Batch batch = client.batch.create(body);
-        assertEquals(batch.getCurrency(), "CAD");
+        assertEquals(batch.getCurrency(), "GBP");
 
         Recipient recipient = createRecipient();
         body = "{\"sourceAmount\":\"10.00\", \"recipient\": {\"id\": " + "\"" + recipient.getId() + "\"" + "}}";
@@ -110,20 +112,18 @@ public void testPayments() throws Exception {
     public void testProcessing() throws Exception {
         Gateway client = new Gateway(new Configuration("Your-API-KEY", "YOUR-API-SECRET", "production"));
 
+
         Recipient recipientAlpha = createRecipient();
-        Recipient recipientBeta = createRecipient();
 
         String body = "{\"payments\": [{\"recipient\": {\"id\": " + "\"" + recipientAlpha.getId() + "\""
-                + "},\"targetAmount\": \"10.00\", \"targetCurrency\": \"CAD\"},{\"recipient\": {\"id\": " + "\""
-                + recipientBeta.getId() + "\"" + "},\"sourceAmount\": \"10\", \"sourceCurrency\": \"CAD\"}]}";
+                + "},\"amount\": \"10.00\", \"currency\": \"EUR\"}]}";
 
         Batch batch = client.batch.create(body);
         assertNotNull(batch);
         assertNotNull(batch.getId());
 
         BatchSummary batchSummary = client.batch.summary(batch.getId());
         assertNotNull(batchSummary);
-        assertEquals(2, batchSummary.detail.bankTransfer.count.intValue());
 
         String batch1 = client.batch.generateQuote(batch.getId());
         assertNotNull(batch1);

src/test/java/ca/paymentrails/paymentrails/integration/RecipientTest.java

@@ -76,13 +76,13 @@ public void testAccount() throws Exception {
         assertEquals(recipient.getEmail(), "account.create" + uuid.toString() + "@example.com");
         assertNotNull(recipient.getId());
 
-        body = "{\"type\": \"bank-transfer\", \"primary\": \"true\", \"country\": \"CA\", \"currency\": \"CAD\",\"accountNum\": \"604622847\", \"bankId\": \"123\", \"branchId\": \"47261\",  \"accountHolderName\": \"Tom Jones\"}";
+        body = "{\"type\": \"bank-transfer\", \"primary\": true, \"country\": \"DE\", \"currency\": \"EUR\", \"iban\": \"DE89 3704 0044 0532 0130 00\", \"accountHolderName\": \"Tom Jones\"}";
         RecipientAccount recipientAccount = client.recipientAccount.create(recipient.getId(), body);
         assertEquals("Tom Jones", recipientAccount.getAccountHolderName());
 
-        body = "{\"type\": \"bank-transfer\", \"primary\": \"true\", \"country\": \"CA\", \"currency\": \"CAD\",\"accountNum\": \"604622848\", \"bankId\": \"123\", \"branchId\": \"47261\",  \"accountHolderName\": \"Tom Jones\"}";
+        body = "{\"type\": \"bank-transfer\", \"primary\": true, \"country\": \"DE\", \"currency\": \"EUR\", \"iban\": \"DE89 3704 0044 0532 0130 00\", \"accountHolderName\": \"Tom Jones2\"}";
         RecipientAccount recipientAccount1 = client.recipientAccount.create(recipient.getId(), body);
-        assertEquals("Tom Jones", recipientAccount1.getAccountHolderName());
+        assertEquals("Tom Jones2", recipientAccount1.getAccountHolderName());
 
         RecipientAccount recipAccount = client.recipientAccount.find(recipient.getId(), recipientAccount.getId());
         assertEquals(recipAccount.getCountry(), recipientAccount.getCountry());