make sure hasCancelled and hasNotCancelled return a boolean result

HabitRPG · Oct 18, 2018 · c06cce2 · c06cce2
1 parent 9cb63a7
commit c06cce2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/website/server/models/group.js b/website/server/models/group.js
@@ -1421,12 +1421,12 @@ schema.methods.isSubscribed = function isSubscribed () {
 
 schema.methods.hasNotCancelled = function hasNotCancelled () {
   let plan = this.purchased.plan;
-  return this.isSubscribed() && !plan.dateTerminated;
+  return Boolean(this.isSubscribed() && !plan.dateTerminated);
 };
 
 schema.methods.hasCancelled = function hasNotCancelled () {
   let plan = this.purchased.plan;
-  return this.isSubscribed() && plan.dateTerminated;
+  return Boolean(this.isSubscribed() && plan.dateTerminated);
 };
 
 schema.methods.updateGroupPlan = async function updateGroupPlan (removingMember) {

diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
@@ -31,12 +31,12 @@ schema.methods.isSubscribed = function isSubscribed () {
 
 schema.methods.hasNotCancelled = function hasNotCancelled () {
   let plan = this.purchased.plan;
-  return this.isSubscribed() && !plan.dateTerminated;
+  return Boolean(this.isSubscribed() && !plan.dateTerminated);
 };
 
 schema.methods.hasCancelled = function hasCancelled () {
   let plan = this.purchased.plan;
-  return this.isSubscribed() && plan.dateTerminated;
+  return Boolean(this.isSubscribed() && plan.dateTerminated);
 };
 
 // Get an array of groups ids the user is member of