Added Announcements field

Author: DerekTBrown

collections/README.md

@@ -28,7 +28,15 @@ The following document describes the MongoDB Schema used by the TuxLab app:
     'administrator': ['global'],
     'instructor' : ['574465a21109160b518a4291'], // Array of IDs to Courses
     'student': [['574465a21109160b518a4299','574467bc1109160b518a429d']] // Array of Tuples of {CourseID, CourseRecordID}
-  }
+  },
+  announcements: [
+    {
+      timeCreated: 1469648536858,
+      type: 'lab',
+      message: 'Git Lab is due in 2 Weeks',
+      link: 'course/1/lab/12'
+    }
+  ]
 },
 {
   _id : "23123454ab2d765eef993343",
@@ -48,8 +56,15 @@ The following document describes the MongoDB Schema used by the TuxLab app:
   },
   roles: {
     'student' : ['574465a21109160b518a4299','574467a21109160b518a4334']
-  }
-
+  },
+  announcements: [
+    {
+      timeCreated: 1469648536858,
+      type: 'lab',
+      message: 'Git Lab is due in 2 Weeks',
+      link: 'course/1/lab/12'
+    }
+  ]
 }
 ```
 
@@ -63,7 +78,7 @@ The following document describes the MongoDB Schema used by the TuxLab app:
     {
       name: "Derek Bro",
       id: "948fhp23irjer9823r3rwef"
-    }, 
+    },
     {
       name: "Tom Cortina",
       id: "573de804b17eca6c452d9ff7"

collections/users.ts

@@ -9,6 +9,8 @@ declare var nconf: any;
 
 if (Meteor.isServer){
   Meteor.startup(function(){
+
+    // Defines User Profile
     var profileSchema = new SimpleSchema({
       first_name: {
         type: String
@@ -32,6 +34,8 @@ if (Meteor.isServer){
         type: String
       }
     });
+
+    // Defines User Abilities
     var roleSchema = new SimpleSchema({
       administrator: {
         type: [String],
@@ -50,8 +54,45 @@ if (Meteor.isServer){
         defaultValue: []
       }
     });
+
+    // Defines Notifications presented to user
+    var announcementSchema = new SimpleSchema({
+      timeCreated: {
+        type:  Date,
+        autoValue: function(){
+          return Date.now();
+        }
+      },
+      type: {
+        type: String,
+        allowedValues: ['lab','instructor','tuxlab']
+      },
+      message: {
+        type: String
+      },
+      link: {
+        type: String,
+        optional: true
+      }
+    })
+
+    // Overall User Schema
     var userSchema = new SimpleSchema({
-      //TODO @sander
+      services: {
+        type: Object,
+        optional: true,
+        blackbox: true
+      },
+      profile: {
+        type: profileSchema
+      },
+      roles: {
+        type: roleSchema
+      },
+      announcements:{
+        type: [announcementSchema],
+        defaultValue: []
+      }
     });
     (<any> Meteor.users).attachSchema(userSchema);
   });