From 0e9ce6d158975cb6fac065b72b11b152f28d10f6 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Fri, 26 Jan 2024 13:17:47 -0600 Subject: [PATCH 1/5] INVD-3804 added Subscription remove addon possibilities --- .../com/invoiced/entity/Subscription.java | 2 +- .../com/invoiced/entity/SubscriptionTest.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/invoiced/entity/Subscription.java b/src/main/java/com/invoiced/entity/Subscription.java index 3b756a7..d9061b1 100644 --- a/src/main/java/com/invoiced/entity/Subscription.java +++ b/src/main/java/com/invoiced/entity/Subscription.java @@ -104,7 +104,7 @@ public final class Subscription extends AbstractEntity { @JsonProperty(value = "mrr", access = JsonProperty.Access.WRITE_ONLY) public Long mrr; - @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonInclude(JsonInclude.Include.NON_ABSENT) @JsonProperty("addons") public SubscriptionAddon[] addons; diff --git a/src/test/java/com/invoiced/entity/SubscriptionTest.java b/src/test/java/com/invoiced/entity/SubscriptionTest.java index c587753..3afbe3c 100644 --- a/src/test/java/com/invoiced/entity/SubscriptionTest.java +++ b/src/test/java/com/invoiced/entity/SubscriptionTest.java @@ -96,6 +96,34 @@ public void testSave() { } } + public void testRemoveAddons() { + Connection conn = new Connection("api_key", "http://localhost:8080"); + + try { + subscription = subscription.retrieve(595); + subscription.quantity = 2; + + subscription.save(); + + assertTrue("Subscription should have been updated", subscription.addons.equals([])); + + } catch (Exception e) { + fail(e.getMessage()); + } + + try { + subscription = subscription.retrieve(595); + subscription.addons = new SubscriptionAddon[] {}; + + subscription.save(); + + assertTrue("Subscription should have been updated", subscription.addons.equals([])); + + } catch (Exception e) { + fail(e.getMessage()); + } + } + @Test public void testCancel() { From 584e9fc70cd4f1e97802b63f1426e6e38b31aeb1 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Fri, 26 Jan 2024 13:22:59 -0600 Subject: [PATCH 2/5] UT --- src/test/java/com/invoiced/entity/SubscriptionTest.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/invoiced/entity/SubscriptionTest.java b/src/test/java/com/invoiced/entity/SubscriptionTest.java index 3afbe3c..8ae1e37 100644 --- a/src/test/java/com/invoiced/entity/SubscriptionTest.java +++ b/src/test/java/com/invoiced/entity/SubscriptionTest.java @@ -105,19 +105,14 @@ public void testRemoveAddons() { subscription.save(); - assertTrue("Subscription should have been updated", subscription.addons.equals([])); + assertTrue("Subscription should have been updated", subscription.addons.size().equals(1)); - } catch (Exception e) { - fail(e.getMessage()); - } - - try { subscription = subscription.retrieve(595); subscription.addons = new SubscriptionAddon[] {}; subscription.save(); - assertTrue("Subscription should have been updated", subscription.addons.equals([])); + assertTrue("Subscription should have been updated", subscription.addons.equals.size(0)); } catch (Exception e) { fail(e.getMessage()); From edc0b7748af62f5461792d1dcab717780221b651 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Fri, 26 Jan 2024 13:28:01 -0600 Subject: [PATCH 3/5] UT --- src/test/java/com/invoiced/entity/SubscriptionTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/invoiced/entity/SubscriptionTest.java b/src/test/java/com/invoiced/entity/SubscriptionTest.java index 8ae1e37..a5955d7 100644 --- a/src/test/java/com/invoiced/entity/SubscriptionTest.java +++ b/src/test/java/com/invoiced/entity/SubscriptionTest.java @@ -100,19 +100,19 @@ public void testRemoveAddons() { Connection conn = new Connection("api_key", "http://localhost:8080"); try { - subscription = subscription.retrieve(595); + Subscription subscription = subscription.retrieve(595); subscription.quantity = 2; subscription.save(); - assertTrue("Subscription should have been updated", subscription.addons.size().equals(1)); + assertTrue("Subscription addon should not be deleted", subscription.addons.size() == 1); subscription = subscription.retrieve(595); subscription.addons = new SubscriptionAddon[] {}; subscription.save(); - assertTrue("Subscription should have been updated", subscription.addons.equals.size(0)); + assertTrue("Subscription addon should be deleted", subscription.addons.size() == 0); } catch (Exception e) { fail(e.getMessage()); From 1989094e978da8d4e6e20d7134090e0f7ef3a835 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Fri, 26 Jan 2024 13:33:00 -0600 Subject: [PATCH 4/5] UT --- src/test/java/com/invoiced/entity/SubscriptionTest.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/invoiced/entity/SubscriptionTest.java b/src/test/java/com/invoiced/entity/SubscriptionTest.java index a5955d7..df04357 100644 --- a/src/test/java/com/invoiced/entity/SubscriptionTest.java +++ b/src/test/java/com/invoiced/entity/SubscriptionTest.java @@ -101,18 +101,15 @@ public void testRemoveAddons() { try { Subscription subscription = subscription.retrieve(595); - subscription.quantity = 2; - + subscription.quantity = 2L; subscription.save(); - assertTrue("Subscription addon should not be deleted", subscription.addons.size() == 1); + assertTrue("Subscription addon should not be deleted", subscription.addons.length == 1); - subscription = subscription.retrieve(595); subscription.addons = new SubscriptionAddon[] {}; - subscription.save(); - assertTrue("Subscription addon should be deleted", subscription.addons.size() == 0); + assertTrue("Subscription addon should be deleted", subscription.addons.length == 0); } catch (Exception e) { fail(e.getMessage()); From cd7ecc44a879bd65425ce4c119696f2ea0523f48 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Fri, 26 Jan 2024 13:35:14 -0600 Subject: [PATCH 5/5] UT --- src/test/java/com/invoiced/entity/SubscriptionTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/invoiced/entity/SubscriptionTest.java b/src/test/java/com/invoiced/entity/SubscriptionTest.java index df04357..bf0cdfd 100644 --- a/src/test/java/com/invoiced/entity/SubscriptionTest.java +++ b/src/test/java/com/invoiced/entity/SubscriptionTest.java @@ -99,8 +99,10 @@ public void testSave() { public void testRemoveAddons() { Connection conn = new Connection("api_key", "http://localhost:8080"); + Subscription subscription = conn.newSubscription(); + try { - Subscription subscription = subscription.retrieve(595); + subscription = subscription.retrieve(595); subscription.quantity = 2L; subscription.save();