Merge pull request #2119 from overleaf/ta-subscription-deletion

Store Deleted Subscriptions

GitOrigin-RevId: c7004f1807dee6b6ec82eeb2a8fe939801ce3e8b

services/web/test/unit/src/Subscription/SubscriptionControllerTests.js

@@ -60,7 +60,7 @@ describe('SubscriptionController', function() {
       updateSubscription: sinon.stub().callsArgWith(3),
       reactivateSubscription: sinon.stub().callsArgWith(1),
       cancelSubscription: sinon.stub().callsArgWith(1),
-      recurlyCallback: sinon.stub().callsArgWith(1),
+      recurlyCallback: sinon.stub().yields(),
       startFreeTrial: sinon.stub()
     }
 

services/web/test/unit/src/Subscription/SubscriptionHandlerTests.js

@@ -76,7 +76,7 @@ describe('SubscriptionHandler', function() {
     this.DropboxHandler = { unlinkAccount: sinon.stub().callsArgWith(1) }
 
     this.SubscriptionUpdater = {
-      syncSubscription: sinon.stub().callsArgWith(2),
+      syncSubscription: sinon.stub().yields(),
       startFreeTrial: sinon.stub().callsArgWith(1)
     }
 
@@ -391,6 +391,7 @@ describe('SubscriptionHandler', function() {
         }
         return this.SubscriptionHandler.recurlyCallback(
           this.activeRecurlySubscription,
+          {},
           done
         )
       })

services/web/test/unit/src/Subscription/SubscriptionUpdaterTests.js

@@ -94,6 +94,9 @@ describe('SubscriptionUpdater', function() {
     this.FeaturesUpdater = {
       refreshFeatures: sinon.stub().yields()
     }
+    this.DeletedSubscription = {
+      findOneAndUpdate: sinon.stub().yields()
+    }
     this.SubscriptionUpdater = SandboxedModule.require(modulePath, {
       globals: {
         console: console
@@ -111,7 +114,10 @@ describe('SubscriptionUpdater', function() {
           warn() {}
         },
         'settings-sharelatex': this.Settings,
-        './FeaturesUpdater': this.FeaturesUpdater
+        './FeaturesUpdater': this.FeaturesUpdater,
+        '../../models/DeletedSubscription': {
+          DeletedSubscription: this.DeletedSubscription
+        }
       }
     })
   })
@@ -153,7 +159,7 @@ describe('SubscriptionUpdater', function() {
       )
       this.SubscriptionUpdater._updateSubscriptionFromRecurly = sinon
         .stub()
-        .callsArgWith(2)
+        .yields()
     })
 
     it('should update the subscription if the user already is admin of one', function(done) {
@@ -214,6 +220,7 @@ describe('SubscriptionUpdater', function() {
       this.SubscriptionUpdater._updateSubscriptionFromRecurly(
         this.recurlySubscription,
         this.subscription,
+        {},
         err => {
           if (err != null) {
             return done(err)
@@ -238,12 +245,13 @@ describe('SubscriptionUpdater', function() {
       this.SubscriptionUpdater._updateSubscriptionFromRecurly(
         this.recurlySubscription,
         this.subscription,
+        {},
         err => {
           if (err != null) {
             return done(err)
           }
           this.SubscriptionUpdater.deleteSubscription
-            .calledWith(this.subscription._id)
+            .calledWithMatch(this.subscription)
             .should.equal(true)
           done()
         }
@@ -254,6 +262,7 @@ describe('SubscriptionUpdater', function() {
       this.SubscriptionUpdater._updateSubscriptionFromRecurly(
         this.recurlySubscription,
         this.subscription,
+        {},
         err => {
           if (err != null) {
             return done(err)
@@ -282,6 +291,7 @@ describe('SubscriptionUpdater', function() {
       this.SubscriptionUpdater._updateSubscriptionFromRecurly(
         this.recurlySubscription,
         this.subscription,
+        {},
         err => {
           if (err != null) {
             return done(err)
@@ -297,6 +307,7 @@ describe('SubscriptionUpdater', function() {
       this.SubscriptionUpdater._updateSubscriptionFromRecurly(
         this.recurlySubscription,
         this.subscription,
+        {},
         err => {
           if (err != null) {
             return done(err)
@@ -441,8 +452,8 @@ describe('SubscriptionUpdater', function() {
 
   describe('deleteSubscription', function() {
     beforeEach(function(done) {
-      this.subscription_id = ObjectId().toString()
       this.subscription = {
+        _id: ObjectId().toString(),
         mock: 'subscription',
         admin_id: ObjectId(),
         member_ids: [ObjectId(), ObjectId(), ObjectId()]
@@ -451,18 +462,18 @@ describe('SubscriptionUpdater', function() {
         .stub()
         .yields(null, this.subscription)
       this.FeaturesUpdater.refreshFeatures = sinon.stub().yields()
-      this.SubscriptionUpdater.deleteSubscription(this.subscription_id, done)
+      this.SubscriptionUpdater.deleteSubscription(this.subscription, {}, done)
     })
 
     it('should look up the subscription', function() {
       this.SubscriptionLocator.getSubscription
-        .calledWith(this.subscription_id)
+        .calledWith(this.subscription._id)
         .should.equal(true)
     })
 
     it('should remove the subscription', function() {
       this.SubscriptionModel.remove
-        .calledWith({ _id: ObjectId(this.subscription_id) })
+        .calledWith({ _id: this.subscription._id })
         .should.equal(true)
     })