From 110986951b5316a1e39eb7658f0df70bf672a3ff Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun, 27 Oct 2013 10:18:23 +0100
Subject: [PATCH 1/4] fix #1647

---
 migrations/20131027_add_streak_default.js | 4 ++++
 src/models/user.js                        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 migrations/20131027_add_streak_default.js

diff --git a/migrations/20131027_add_streak_default.js b/migrations/20131027_add_streak_default.js
new file mode 100644
index 0000000000..81eb0c5c05
--- /dev/null
+++ b/migrations/20131027_add_streak_default.js
@@ -0,0 +1,4 @@
+db.users.find().forEach(function(user){
+  if (!user.achievements) user.achievements = {streak: 0};
+  db.users.update({_id:user._id}, {$set:{'achievements': user.achievements}});
+});
\ No newline at end of file
diff --git a/src/models/user.js b/src/models/user.js
index 587bcf22d1..e5f14a7a1c 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -35,7 +35,7 @@ var UserSchema = new Schema({
     helpedHabit: Boolean,
     ultimateGear: Boolean,
     beastMaster: Boolean,
-    streak: Number
+    streak: {type: Number, 'default': 0}
   },
   auth: {
     facebook: Schema.Types.Mixed,

From c90b1e757c8d2c21aa2873b3138225d2c49e354e Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun, 27 Oct 2013 10:49:32 +0100
Subject: [PATCH 2/4] better fix for #1647

---
 migrations/20131027_add_streak_default.js | 4 ----
 src/models/user.js                        | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 migrations/20131027_add_streak_default.js

diff --git a/migrations/20131027_add_streak_default.js b/migrations/20131027_add_streak_default.js
deleted file mode 100644
index 81eb0c5c05..0000000000
--- a/migrations/20131027_add_streak_default.js
+++ /dev/null
@@ -1,4 +0,0 @@
-db.users.find().forEach(function(user){
-  if (!user.achievements) user.achievements = {streak: 0};
-  db.users.update({_id:user._id}, {$set:{'achievements': user.achievements}});
-});
\ No newline at end of file
diff --git a/src/models/user.js b/src/models/user.js
index e5f14a7a1c..d48dde5063 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -35,7 +35,7 @@ var UserSchema = new Schema({
     helpedHabit: Boolean,
     ultimateGear: Boolean,
     beastMaster: Boolean,
-    streak: {type: Number, 'default': 0}
+    streak: Number
   },
   auth: {
     facebook: Schema.Types.Mixed,
@@ -226,7 +226,8 @@ var UserSchema = new Schema({
   */
 
 }, {
-  strict: true
+  strict: true,
+  minimize: false
 });
 
 // Legacy Derby Function?

From e4b575dcb79c16af11a72c3cce26a38cc2e49ee2 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun, 27 Oct 2013 10:55:05 +0100
Subject: [PATCH 3/4] add minimize: false also to group schema

---
 src/models/group.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/models/group.js b/src/models/group.js
index aac86729d5..5651ec2bd2 100644
--- a/src/models/group.js
+++ b/src/models/group.js
@@ -52,7 +52,10 @@ var GroupSchema = new Schema({
   balance: Number,
   logo: String,
   leaderMessage: String
-}, {strict: 'throw'});
+}, {
+  strict: 'throw', 
+  minimize: false
+});
 
 
 /**

From 8cdcbcf685eb156599a6fe70b02a705abc47b398 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Sun, 27 Oct 2013 10:55:43 +0100
Subject: [PATCH 4/4] added comment for minimze: false

---
 src/models/group.js | 2 +-
 src/models/user.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/models/group.js b/src/models/group.js
index 5651ec2bd2..194d164a68 100644
--- a/src/models/group.js
+++ b/src/models/group.js
@@ -54,7 +54,7 @@ var GroupSchema = new Schema({
   leaderMessage: String
 }, {
   strict: 'throw', 
-  minimize: false
+  minimize: false // So empty objects are returned
 });
 
 
diff --git a/src/models/user.js b/src/models/user.js
index d48dde5063..769d1f0450 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -227,7 +227,7 @@ var UserSchema = new Schema({
 
 }, {
   strict: true,
-  minimize: false
+  minimize: false // So empty objects are returned
 });
 
 // Legacy Derby Function?