Merge branch 'kylestratis-issue-6043' into develop

HabitRPG · Nov 28, 2015 · 42d1fd9 · 42d1fd9
2 parents 046e7bc + 7bf5300
commit 42d1fd9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/migrations/mystery_items.js b/migrations/mystery_items.js
@@ -24,9 +24,15 @@ var update = {
 
 if (_id) {
   // singular (missing items)
-  db.users.update({_id:_id}, update);
+  db.users.update({_id: _id}, update);
 } else {
   // multiple (once @ start of event)
-  db.users.update({'purchased.plan.customerId':{$ne:null}}, update, {multi:true});
+  db.users.update({
+      'purchased.plan.customerId': { $ne: null },
+      $or: [
+        { 'purchased.plan.dateTerminated': { $gte: new Date() } },
+        { 'purchased.plan.dateTerminated': { $exists: false } },
+        { 'purchased.plan.dateTerminated': { $eq: null } }
+      ]
+  }, update, { multi: true });
 }
-