Merge pull request #2123 from overleaf/ta-subscription-restore

Restore Deleted Subscriptions

GitOrigin-RevId: 4df1d2116e5502235e06f47d7317d97ad458b75b

services/web/app/src/Features/Subscription/SubscriptionLocator.js

@@ -14,6 +14,7 @@
  */
 const { promisify } = require('util')
 const { Subscription } = require('../../models/Subscription')
+const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('logger-sharelatex')
 const { ObjectId } = require('mongoose').Types
 
@@ -84,6 +85,20 @@ const SubscriptionLocator = {
     return Subscription.findOne({ 'overleaf.id': v1TeamId }, callback)
   },
 
+  getUserDeletedSubscriptions(userId, callback) {
+    logger.log({ userId }, 'getting users deleted subscriptions')
+    DeletedSubscription.find({ 'subscription.admin_id': userId }, callback)
+  },
+
+  getDeletedSubscription(subscriptionId, callback) {
+    DeletedSubscription.findOne(
+      {
+        'subscription._id': subscriptionId
+      },
+      callback
+    )
+  },
+
   _getUserId(user_or_id) {
     if (user_or_id != null && user_or_id._id != null) {
       return user_or_id._id
@@ -112,6 +127,10 @@ SubscriptionLocator.promises = {
   getGroupsWithEmailInvite: promisify(
     SubscriptionLocator.getGroupsWithEmailInvite
   ),
-  getGroupWithV1Id: promisify(SubscriptionLocator.getGroupWithV1Id)
+  getGroupWithV1Id: promisify(SubscriptionLocator.getGroupWithV1Id),
+  getUserDeletedSubscriptions: promisify(
+    SubscriptionLocator.getUserDeletedSubscriptions
+  ),
+  getDeletedSubscription: promisify(SubscriptionLocator.getDeletedSubscription)
 }
 module.exports = SubscriptionLocator

services/web/app/src/Features/Subscription/SubscriptionUpdater.js

@@ -1,3 +1,4 @@
+const { db } = require('../../infrastructure/mongojs')
 const async = require('async')
 const _ = require('underscore')
 const { promisifyAll } = require('../../util/promises')
@@ -219,6 +220,47 @@ const SubscriptionUpdater = {
     })
   },
 
+  restoreSubscription(subscriptionId, callback) {
+    SubscriptionLocator.getDeletedSubscription(subscriptionId, function(
+      err,
+      deletedSubscription
+    ) {
+      if (err) {
+        return callback(err)
+      }
+      let subscription = deletedSubscription.subscription
+      async.series(
+        [
+          cb =>
+            // 1. upsert subscription
+            db.subscriptions.update(
+              { _id: subscription._id },
+              subscription,
+              { upsert: true },
+              cb
+            ),
+          cb =>
+            // 2. remove deleted subscription
+            DeletedSubscription.deleteOne(
+              { 'subscription._id': subscription._id },
+              callback
+            ),
+          cb =>
+            // 3. refresh users features
+            SubscriptionUpdater._refreshUsersFeature(subscription, cb)
+        ],
+        callback
+      )
+    })
+  },
+
+  _refreshUsersFeature(subscription, callback) {
+    const userIds = [subscription.admin_id].concat(
+      subscription.member_ids || []
+    )
+    async.mapSeries(userIds, FeaturesUpdater.refreshFeatures, callback)
+  },
+
   _createDeletedSubscription(subscription, deleterData, callback) {
     subscription.teamInvites = []
     subscription.invited_emails = []

services/web/test/acceptance/src/helpers/DeletedSubscription.js

@@ -0,0 +1,49 @@
+const { expect } = require('chai')
+const MockSubscription = require('./Subscription')
+const SubscriptionUpdater = require('../../../../app/src/Features/Subscription/SubscriptionUpdater')
+const SubscriptionModel = require('../../../../app/src/models/Subscription')
+  .Subscription
+const DeletedSubscriptionModel = require(`../../../../app/src/models/DeletedSubscription`)
+  .DeletedSubscription
+
+class DeletedSubscription {
+  constructor(options = {}) {
+    this.subscription = new MockSubscription(options)
+  }
+
+  ensureExists(callback) {
+    this.subscription.ensureExists(error => {
+      if (error) {
+        return callback(error)
+      }
+      SubscriptionUpdater.deleteSubscription(this.subscription, {}, callback)
+    })
+  }
+
+  expectRestored(callback) {
+    DeletedSubscriptionModel.findOne(
+      { 'subscription._id': this.subscription._id },
+      (error, deletedSubscription) => {
+        if (error) {
+          return callback(error)
+        }
+        expect(deletedSubscription).to.be.null
+        SubscriptionModel.findById(
+          this.subscription._id,
+          (error, subscription) => {
+            expect(subscription).to.exists
+            expect(subscription._id.toString()).to.equal(
+              this.subscription._id.toString()
+            )
+            expect(subscription.admin_id.toString()).to.equal(
+              this.subscription.admin_id.toString()
+            )
+            callback(error)
+          }
+        )
+      }
+    )
+  }
+}
+
+module.exports = DeletedSubscription

services/web/test/acceptance/src/helpers/Subscription.js

@@ -22,7 +22,7 @@ class Subscription {
     }
     const options = { upsert: true, new: true, setDefaultsOnInsert: true }
     SubscriptionModel.findOneAndUpdate(
-      {},
+      { admin_id: this.admin_id },
       this,
       options,
       (error, subscription) => {

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

@@ -27,6 +27,10 @@ describe('Subscription Locator Tests', function() {
       findOne: sinon.stub(),
       find: sinon.stub()
     }
+    this.DeletedSubscription = {
+      findOne: sinon.stub().yields(),
+      find: sinon.stub().yields()
+    }
     return (this.SubscriptionLocator = SandboxedModule.require(modulePath, {
       globals: {
         console: console
@@ -35,6 +39,9 @@ describe('Subscription Locator Tests', function() {
         '../../models/Subscription': {
           Subscription: this.Subscription
         },
+        '../../models/DeletedSubscription': {
+          DeletedSubscription: this.DeletedSubscription
+        },
         'logger-sharelatex': {
           log() {}
         }