Merge branch 'master' into fix/get-cloudpaymentid-from-compose-payment-api

Author: quangtuanitmo18

src/resolvers/workspace.js

@@ -436,7 +436,8 @@ module.exports = {
 
       const defaultPlan = await factories.plansFactory.getDefaultPlan();
 
-      if (workspaceModel.tariffPlanId === defaultPlan.id) {
+      // Prevent re-applying the free plan if workspace is already on it.
+      if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) {
         throw new UserInputError('You already use default plan');
       }