Merge pull request #492 from sgilrodriguez/vtt_missing_endpoints

Author: douglasmiller

src/main/java/com/ning/billing/recurly/model/Adjustment.java

@@ -172,6 +172,9 @@ public class Adjustment extends RecurlyObject {
     @XmlElement(name = "surcharge_in_cents")
     private Integer surchargeInCents;
 
+    @XmlElement(name = "vertex_transaction_type")
+    private String vertexTransactionType;
+
     @XmlElementWrapper(name = "custom_fields")
     @XmlElement(name = "custom_field")
     private CustomFields customFields;
@@ -559,6 +562,14 @@ public void setCustomFields(final CustomFields customFields) {
         this.customFields = customFields;
     }
 
+    public String getVertexTransactionType() {
+        return vertexTransactionType;
+    }
+
+    public void setVertexTransactionType(final Object vertexTransactionType) {
+        this.vertexTransactionType = stringOrNull(vertexTransactionType);
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
@@ -609,6 +620,7 @@ public String toString() {
         sb.append(", state=").append(state);
         sb.append(", prorationRate=").append(prorationRate);
         sb.append(", surchargeInCents=").append(surchargeInCents);
+        sb.append(", vertexTransactionType=").append(vertexTransactionType);
         sb.append(", customFields=").append(customFields);
         sb.append('}');
         return sb.toString();
@@ -756,6 +768,9 @@ public boolean equals(final Object o) {
         if (customFields != null ? !customFields.equals(that.customFields) : that.customFields != null) {
             return false;
         }
+        if (vertexTransactionType != null ? !vertexTransactionType.equals(that.vertexTransactionType) : that.vertexTransactionType != null) {
+            return false;
+        }
         return true;
     }
 
@@ -806,6 +821,7 @@ public int hashCode() {
                 state,
                 prorationRate,
                 surchargeInCents,
+                vertexTransactionType,
                 customFields
         );
     }

src/main/java/com/ning/billing/recurly/model/Invoice.java

@@ -169,6 +169,9 @@ public class Invoice extends RecurlyObject {
     @XmlElement(name = "transaction_type")
     private String transactionType;
 
+    @XmlElement(name = "vertex_transaction_type")
+    private String vertexTransactionType;
+
     @XmlElement(name = "dunning_campaign_id")
     private String dunningCampaignId;
 
@@ -561,6 +564,14 @@ public void setTransactionType(final Object transactionType) {
         this.transactionType = stringOrNull(transactionType);
     }
 
+    public String getVertexTransactionType() {
+        return vertexTransactionType;
+    }
+
+    public void setVertexTransactionType(final Object vertexTransactionType) {
+        this.vertexTransactionType = stringOrNull(vertexTransactionType);
+    }
+
     public String getDunningCampaignId() {
         return dunningCampaignId;
     }
@@ -624,6 +635,8 @@ public String toString() {
         sb.append(", address=").append(address);
         sb.append(", shippingAddress=").append(shippingAddress);
         sb.append(", surchargeInCents=").append(surchargeInCents);
+        sb.append(", transactionType=").append(transactionType);
+        sb.append(", vertexTransactionType=").append(vertexTransactionType);
         sb.append('}');
         return sb.toString();
     }
@@ -767,6 +780,9 @@ public boolean equals(final Object o) {
         if (transactionType != null ? !transactionType.equals(invoice.transactionType) : invoice.transactionType != null) {
             return false;
         }
+        if (vertexTransactionType != null ? !vertexTransactionType.equals(invoice.vertexTransactionType) : invoice.vertexTransactionType != null) {
+            return false;
+        }
 
         return true;
     }
@@ -817,7 +833,8 @@ public int hashCode() {
                 address,
                 shippingAddress,
                 surchargeInCents,
-                transactionType
+                transactionType,
+                vertexTransactionType
         );
     }
 

src/test/java/com/ning/billing/recurly/model/TestPurchase.java

@@ -23,6 +23,7 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNull;
 
 public class TestPurchase extends TestModelBase {
 
@@ -296,6 +297,129 @@ public void testVertexTransactionTypeAllValidValues() throws Exception {
         }
     }
 
+    @Test(groups = "fast")
+    public void testPurchaseWithAdjustmentLevelVertexTransactionType() throws Exception {
+        // Test purchase with adjustment-level vertex_transaction_type
+        final String purchaseData = "<purchase xmlns=\"\">" +
+                "<currency>USD</currency>" +
+                "  <collection_method>automatic</collection_method>" +
+                "  <vertex_transaction_type>sale</vertex_transaction_type>" +
+                "  <account>" +
+                "    <account_code>test-account</account_code>" +
+                "  </account>" +
+                "  <adjustments>" +
+                "    <adjustment>" +
+                "      <unit_amount_in_cents type=\"integer\">1000</unit_amount_in_cents>" +
+                "      <quantity type=\"integer\">1</quantity>" +
+                "      <currency>USD</currency>" +
+                "      <product_code>product-1</product_code>" +
+                "      <vertex_transaction_type>lease</vertex_transaction_type>" +
+                "    </adjustment>" +
+                "  </adjustments>" +
+                "</purchase>";
+
+        // Deserialize and verify
+        final Purchase purchase = xmlMapper.readValue(purchaseData, Purchase.class);
+        assertEquals(purchase.getVertexTransactionType(), "sale");
+        assertEquals(purchase.getAdjustments().size(), 1);
+        assertEquals(purchase.getAdjustments().get(0).getVertexTransactionType(), "lease");
+    }
+
+    @Test(groups = "fast")
+    public void testPurchaseWithMultipleAdjustmentsWithDifferentVertexTransactionTypes() throws Exception {
+        // Test purchase with multiple adjustments having different vertex_transaction_type values
+        final String purchaseData = "<purchase xmlns=\"\">" +
+                "<currency>USD</currency>" +
+                "  <vertex_transaction_type>sale</vertex_transaction_type>" +
+                "  <account>" +
+                "    <account_code>test-account</account_code>" +
+                "  </account>" +
+                "  <adjustments>" +
+                "    <adjustment>" +
+                "      <unit_amount_in_cents type=\"integer\">5000</unit_amount_in_cents>" +
+                "      <quantity type=\"integer\">1</quantity>" +
+                "      <currency>USD</currency>" +
+                "      <product_code>product-lease</product_code>" +
+                "      <vertex_transaction_type>lease</vertex_transaction_type>" +
+                "    </adjustment>" +
+                "    <adjustment>" +
+                "      <unit_amount_in_cents type=\"integer\">3000</unit_amount_in_cents>" +
+                "      <quantity type=\"integer\">1</quantity>" +
+                "      <currency>USD</currency>" +
+                "      <product_code>product-rental</product_code>" +
+                "      <vertex_transaction_type>rental</vertex_transaction_type>" +
+                "    </adjustment>" +
+                "    <adjustment>" +
+                "      <unit_amount_in_cents type=\"integer\">2000</unit_amount_in_cents>" +
+                "      <quantity type=\"integer\">1</quantity>" +
+                "      <currency>USD</currency>" +
+                "      <product_code>product-no-vtt</product_code>" +
+                "    </adjustment>" +
+                "  </adjustments>" +
+                "</purchase>";
+
+        // Deserialize and verify
+        final Purchase purchase = xmlMapper.readValue(purchaseData, Purchase.class);
+        assertEquals(purchase.getVertexTransactionType(), "sale");
+        assertEquals(purchase.getAdjustments().size(), 3);
+        assertEquals(purchase.getAdjustments().get(0).getVertexTransactionType(), "lease");
+        assertEquals(purchase.getAdjustments().get(1).getVertexTransactionType(), "rental");
+        assertNull(purchase.getAdjustments().get(2).getVertexTransactionType());
+    }
+
+    @Test(groups = "fast")
+    public void testSerializePurchaseWithAdjustmentLevelVertexTransactionType() throws Exception {
+        // Create purchase programmatically with adjustment-level vertex_transaction_type
+        final Purchase purchase = new Purchase();
+        purchase.setCurrency("USD");
+        purchase.setCollectionMethod("automatic");
+        purchase.setVertexTransactionType("sale");
+
+        final Account account = new Account();
+        account.setAccountCode("test-account");
+        purchase.setAccount(account);
+
+        // Create adjustments with different vertex_transaction_type values
+        final Adjustments adjustments = new Adjustments();
+        
+        final Adjustment adjustment1 = new Adjustment();
+        adjustment1.setUnitAmountInCents(5000);
+        adjustment1.setQuantity(1);
+        adjustment1.setCurrency("USD");
+        adjustment1.setProductCode("product-lease");
+        adjustment1.setVertexTransactionType("lease");
+        adjustments.add(adjustment1);
+
+        final Adjustment adjustment2 = new Adjustment();
+        adjustment2.setUnitAmountInCents(3000);
+        adjustment2.setQuantity(1);
+        adjustment2.setCurrency("USD");
+        adjustment2.setProductCode("product-rental");
+        adjustment2.setVertexTransactionType("rental");
+        adjustments.add(adjustment2);
+
+        purchase.setAdjustments(adjustments);
+
+        // Serialize to XML
+        final String xml = xmlMapper.writeValueAsString(purchase);
+
+        // Verify XML contains both purchase-level and adjustment-level vertex_transaction_type
+        assert xml.contains("<purchase") : "Should contain purchase root element";
+        assert xml.contains("<vertex_transaction_type>sale</vertex_transaction_type>") : 
+            "Should contain purchase-level vertex_transaction_type";
+        assert xml.contains("<vertex_transaction_type>lease</vertex_transaction_type>") : 
+            "Should contain adjustment-level vertex_transaction_type 'lease'";
+        assert xml.contains("<vertex_transaction_type>rental</vertex_transaction_type>") : 
+            "Should contain adjustment-level vertex_transaction_type 'rental'";
+
+        // Verify round-trip serialization/deserialization
+        final Purchase deserializedPurchase = xmlMapper.readValue(xml, Purchase.class);
+        assertEquals(deserializedPurchase.getVertexTransactionType(), "sale");
+        assertEquals(deserializedPurchase.getAdjustments().size(), 2);
+        assertEquals(deserializedPurchase.getAdjustments().get(0).getVertexTransactionType(), "lease");
+        assertEquals(deserializedPurchase.getAdjustments().get(1).getVertexTransactionType(), "rental");
+    }
+
     @Test(groups = "fast")
     public void testHashCodeAndEquality() throws Exception {
         // create purchase of the same value but difference references