From 30db654eead8d635e021709038b79ce6f396de76 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 31 Jan 2013 18:43:54 -0500 Subject: [PATCH 1/6] clean up user cron and set back down to 10 days --- src/server/cron.coffee | 9 ++++++--- src/server/index.coffee | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/server/cron.coffee b/src/server/cron.coffee index 931ba3e3c7..d0f2ed5b24 100644 --- a/src/server/cron.coffee +++ b/src/server/cron.coffee @@ -10,7 +10,7 @@ _ = require('underscore') module.exports.deleteStaleAccounts = -> un_registered = { "auth.local": {$exists: false} , "auth.facebook": {$exists: false} } - registered = registered = { $or: [ + registered = { $or: [ { 'auth.local': { $exists: true } }, { 'auth.facebook': { $exists: true} } ]}; @@ -34,5 +34,8 @@ module.exports.deleteStaleAccounts = -> if !!user.lastCron # for now ignore missing crons, still looking into why this is happening lastCron = new Date(user.lastCron) diff = Math.abs(moment(today).sod().diff(moment(lastCron).sod(), "days")) - if diff > 30 - removeAccount(collection, user._id) \ No newline at end of file + if diff > 10 + removeAccount(collection, user._id) + else + # cron was missing for some reason + collection.update {_id: user._id}, {$set:{lastCron: today}}, (err, res) -> throw err if err \ No newline at end of file diff --git a/src/server/index.coffee b/src/server/index.coffee index 1ac2071144..b9bf2bcc11 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -10,7 +10,7 @@ auth = require 'derby-auth' priv = require './private' ## Run server cron ## -#require('./cron').deleteStaleAccounts() +require('./cron').deleteStaleAccounts() ## RACER CONFIGURATION ## From 38a3c2fa9ad07379b78bb716b97b8168e3e23443 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 31 Jan 2013 18:56:54 -0500 Subject: [PATCH 2/6] remove cron --- src/server/index.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/index.coffee b/src/server/index.coffee index b9bf2bcc11..1ac2071144 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -10,7 +10,7 @@ auth = require 'derby-auth' priv = require './private' ## Run server cron ## -require('./cron').deleteStaleAccounts() +#require('./cron').deleteStaleAccounts() ## RACER CONFIGURATION ## From 8fa318f9005bb2b1861dbc9a46a705288fa7d4e6 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 30 Jan 2013 21:22:49 -0500 Subject: [PATCH 3/6] add migration for adding missing preferences (to be run) --- migrations/20130129_add_missing_preferences.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 migrations/20130129_add_missing_preferences.js diff --git a/migrations/20130129_add_missing_preferences.js b/migrations/20130129_add_missing_preferences.js new file mode 100644 index 0000000000..6b0dd92210 --- /dev/null +++ b/migrations/20130129_add_missing_preferences.js @@ -0,0 +1,5 @@ +db.users.update( + {'preferences':{$exists:false}}, + {$set:{preferences:{gender:'m'}}}, + {multi:true} +) \ No newline at end of file From 910e67684ee4068026a4f84c2294ca3fc5d0a1b5 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 31 Jan 2013 07:39:20 -0500 Subject: [PATCH 4/6] add armorSet to prefs migration --- migrations/20130129_add_missing_preferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migrations/20130129_add_missing_preferences.js b/migrations/20130129_add_missing_preferences.js index 6b0dd92210..745a365bd0 100644 --- a/migrations/20130129_add_missing_preferences.js +++ b/migrations/20130129_add_missing_preferences.js @@ -1,5 +1,5 @@ db.users.update( {'preferences':{$exists:false}}, - {$set:{preferences:{gender:'m'}}}, + {$set:{preferences:{gender: 'm', armorSet: 'v1'}}}, {multi:true} -) \ No newline at end of file +) From 995e699130524a7b9669235151db75a02a6ef881 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 31 Jan 2013 21:28:55 -0500 Subject: [PATCH 5/6] fix to prefs migration --- migrations/20130129_add_missing_preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/20130129_add_missing_preferences.js b/migrations/20130129_add_missing_preferences.js index 745a365bd0..f4e7b55762 100644 --- a/migrations/20130129_add_missing_preferences.js +++ b/migrations/20130129_add_missing_preferences.js @@ -1,5 +1,5 @@ db.users.update( - {'preferences':{$exists:false}}, + {preferences:{$exists:false}}, {$set:{preferences:{gender: 'm', armorSet: 'v1'}}}, {multi:true} ) From 0a59d6e43d88cf6399d13e22ba19ff86fc27e9bb Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 31 Jan 2013 21:50:36 -0500 Subject: [PATCH 6/6] another fix on duplicates --- src/app/schema.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/schema.coffee b/src/app/schema.coffee index f591bfee85..5e19490b0b 100644 --- a/src/app/schema.coffee +++ b/src/app/schema.coffee @@ -52,4 +52,5 @@ module.exports.updateUser = (user, userObj) -> preened = _.filter(union, (val) -> _.contains(taskIds, val)) # There were indeed issues found, set the new list - user.set(path, preened) if _.size(preened) != _.size(userObj[path]) \ No newline at end of file + # TODO _.difference might still be empty for duplicates in one list? + user.set(path, preened) if _.difference(preened, userObj[path]).length != 0 \ No newline at end of file