From be6950292dbe6bf6c1a9ec602689d861e937be33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Wed, 28 Nov 2018 11:56:52 +0200 Subject: [PATCH] Merge pull request #1190 from sharelatex/ta-team-importer-timeout-fix Team Importer Timeout Fix GitOrigin-RevId: 4951262e3eb980b45e3ba5785c1d17c58aa5009e --- .../Subscription/SubscriptionUpdater.coffee | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionUpdater.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionUpdater.coffee index f4cdfcf86d..22e2c00987 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionUpdater.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionUpdater.coffee @@ -29,13 +29,7 @@ module.exports = SubscriptionUpdater = @addUsersToGroup(subscriptionId, [userId], callback) addUsersToGroup: (subscriptionId, memberIds, callback)-> - logger.log subscriptionId: subscriptionId, memberIds: memberIds, "adding members into mongo subscription" - searchOps = - _id: subscriptionId - insertOperation = - { $addToSet: { member_ids: { $each: memberIds } } } - - Subscription.findAndModify searchOps, insertOperation, (err, subscription) -> + @addUsersToGroupWithoutFeaturesRefresh subscriptionId, memberIds, (err) -> return callback(err) if err? # Only apply features updates to users, not user stubs @@ -45,6 +39,14 @@ module.exports = SubscriptionUpdater = userIds = users.map (u) -> u._id.toString() async.map userIds, FeaturesUpdater.refreshFeatures, callback + addUsersToGroupWithoutFeaturesRefresh: (subscriptionId, memberIds, callback)-> + logger.log subscriptionId: subscriptionId, memberIds: memberIds, "adding members into mongo subscription" + searchOps = + _id: subscriptionId + insertOperation = + { $addToSet: { member_ids: { $each: memberIds } } } + + Subscription.findAndModify searchOps, insertOperation, callback removeUserFromGroup: (subscriptionId, user_id, callback)-> searchOps =