Merge branch 'develop' into api-v3

2016-03-10 18:30:09 +01:00
parent ec13a34228 a9c9d6d1cc
commit fbdbd8e006
157 changed files with 8200 additions and 7329 deletions
@@ -439,6 +439,14 @@ export let schema = new Schema({
      raisePet: {type: Boolean, default: false},
      streak: {type: Boolean, default: false},
    },
+    improvementCategories: {
+      type: Array,
+      validate: (categories) => {
+        const validCategories = ['work', 'exercise', 'healthWellness', 'school', 'teams', 'chores', 'creativity'];
+        let isValidCategory = categories.every(category => validCategories.indexOf(category) !== -1);
+        return isValidCategory;
+      },
+    },
  },
  profile: {
    blurb: String,