From 4a76fcd13b42b2a6163c383313a45d3870a53903 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 30 Aug 2016 14:26:57 +0100 Subject: [PATCH] Change first param of `getMemberSubscriptions` to `user_or_id`, to match semantics of usage. This function works whether a user object, or an ObjectId is passed, but the `user_id` param name is confusing. --- .../Features/Subscription/SubscriptionLocator.coffee | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionLocator.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionLocator.coffee index d73a35a69d..beee4a3158 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionLocator.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionLocator.coffee @@ -14,7 +14,11 @@ module.exports = logger.log user_id:user_id, "got users subscription" callback(err, subscription) - getMemberSubscriptions: (user_id, callback) -> + getMemberSubscriptions: (user_or_id, callback) -> + if user_or_id? and user_or_id._id? + user_id = user_or_id._id + else if user_or_id? + user_id = user_or_id logger.log user_id: user_id, "getting users group subscriptions" Subscription.find(member_ids: user_id).populate("admin_id").exec callback @@ -25,4 +29,4 @@ module.exports = Subscription.findOne {member_ids: user_id, _id:subscription_id}, {_id:1}, callback getGroupSubscriptionMemberOf: (user_id, callback)-> - Subscription.findOne {member_ids: user_id}, {_id:1, planCode:1}, callback \ No newline at end of file + Subscription.findOne {member_ids: user_id}, {_id:1, planCode:1}, callback