Merge pull request #197 from lukevs/master

Add coupon_code to SubscriptionUpdate
killbilling · Jun 1, 2017 · 85a3bc6 · 85a3bc6
2 parents ae85e07 + 1247171
commit 85a3bc6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/main/java/com/ning/billing/recurly/model/SubscriptionUpdate.java b/src/main/java/com/ning/billing/recurly/model/SubscriptionUpdate.java
@@ -54,6 +54,17 @@ public void setCollectionMethod(Object collectionMethod) {
         this.collectionMethod = stringOrNull(collectionMethod);
     }
 
+    @XmlElement(name = "coupon_code")
+    private String couponCode;
+
+    public String getCouponCode() {
+        return couponCode;
+    }
+
+    public void setCouponCode(String couponCode) {
+        this.couponCode = couponCode;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
@@ -67,6 +78,9 @@ public boolean equals(final Object o) {
         if (timeframe != that.timeframe) {
             return false;
         }
+        if (couponCode != null ? !couponCode.equals(that.couponCode) : that.couponCode != null) {
+            return false;
+        }
 
         return true;
     }
@@ -75,6 +89,7 @@ public boolean equals(final Object o) {
     public int hashCode() {
         return Objects.hashCode(
                 timeframe,
+                couponCode,
                 collectionMethod
         );
     }

diff --git a/src/test/java/com/ning/billing/recurly/model/TestSubscriptionUpdate.java b/src/test/java/com/ning/billing/recurly/model/TestSubscriptionUpdate.java
@@ -109,4 +109,23 @@ public void testSerializationWithAddOns() throws Exception {
                                  "<plan_code>gold</plan_code>" +
                                  "</subscription>");
     }
+
+    @Test(groups = "fast")
+    public void testSerializationWithCoupons() throws Exception {
+        final SubscriptionUpdate subscription = new SubscriptionUpdate();
+        subscription.setPlanCode("gold");
+        subscription.setTimeframe(SubscriptionUpdate.Timeframe.now);
+        subscription.setUnitAmountInCents(800);
+        subscription.setQuantity(1);
+        subscription.setCouponCode("my_coupon");
+
+        final String xml = xmlMapper.writeValueAsString(subscription);
+        Assert.assertEquals(xml, "<subscription xmlns=\"\">" +
+                                 "<timeframe>now</timeframe>" +
+                                 "<unit_amount_in_cents>800</unit_amount_in_cents>" +
+                                 "<quantity>1</quantity>" +
+                                 "<plan_code>gold</plan_code>" +
+                                 "<coupon_code>my_coupon</coupon_code>" +
+                                 "</subscription>");
+    }
 }