Merge pull request #21 from enhancv/descriptor

Add option for adding descriptor to subscription
enhancv · Mar 12, 2019 · 01cf7c9 · 01cf7c9
2 parents 09b988d + 8a7e149
commit 01cf7c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mongoose-subscriptions",
-    "version": "2.8.1",
+    "version": "2.8.2",
     "description": "Processor agnostic payment subscription backend",
     "main": "src/index.js",
     "repository": "git@github.com:enhancv/mongoose-subscriptions.git",

diff --git a/src/Schema/Customer.js b/src/Schema/Customer.js
@@ -244,7 +244,12 @@ Customer.method("addPaymentMethodNonce", function addPaymentMethodNonce(nonce, a
     return paymentMethod;
 });
 
-Customer.method("addSubscription", function addSubscription(plan, paymentMethod, activeDate) {
+Customer.method("addSubscription", function addSubscription(
+    plan,
+    paymentMethod,
+    descriptor,
+    activeDate
+) {
     const date = activeDate || new Date();
     const nonTrialSubs = this.validSubscriptions(date).filter(
         item => !(item.isTrial && item.processor.state === ProcessorItem.LOCAL)
@@ -260,7 +265,7 @@ Customer.method("addSubscription", function addSubscription(plan, paymentMethod,
         .filter(item => item.plan.level < plan.level)
         .filter(item => item.processor.state !== ProcessorItem.LOCAL);
 
-    let subscription = this.subscriptions.create({
+    const newSubscription = {
         plan,
         firstBillingDate: waitForSubs.length
             ? waitForSubs[0].isTrial
@@ -269,7 +274,13 @@ Customer.method("addSubscription", function addSubscription(plan, paymentMethod,
             : null,
         price: plan.price,
         createdAt: date,
-    });
+    };
+
+    if (descriptor) {
+        newSubscription.descriptor = descriptor;
+    }
+
+    let subscription = this.subscriptions.create(newSubscription);
 
     if (!waitForSubs.length) {
         subscription = subscription.addDiscounts(newSub => [

diff --git a/test/Schema/CustomerTest.js b/test/Schema/CustomerTest.js
@@ -1647,6 +1647,7 @@ describe(
                     const result = customer.addSubscription(
                         newPlan,
                         customer.defaultPaymentMethod(),
+                        null,
                         nowDate
                     );
                     const resultDiscount = result.discounts[0] ? result.discounts[0].amount : false;

diff --git a/test/integrationTest.js b/test/integrationTest.js
@@ -315,7 +315,7 @@ describe(
 
                     user.resetProcessor();
                     user.cancelSubscriptions();
-                    user.addSubscription(plan, user.defaultPaymentMethod(), now);
+                    user.addSubscription(plan, user.defaultPaymentMethod(), null, now);
 
                     return user.saveProcessor(processor);
                 })