@dhyasama/totem-models 1.19.0 → 1.19.1

package/lib/Organization.js

@@ -608,7 +608,6 @@ module.exports = function(mongoose, config) {
       .find({ '_id': { $in : ids }})
       .populate('people.person', 'name avatarUrl title calendarEventSummaries sources')
       .populate('related', 'name logoUrl')
-      .populate('notes')
       .populate('chairs.first', 'name avatarUrl title')
       .populate('chairs.second', 'name avatarUrl title')
       .populate('funds', 'name hexColorCode')
@@ -616,15 +615,13 @@ module.exports = function(mongoose, config) {
         'people.person.sources.person',
         'people.person.calendarEventSummaries.attendees.internal',
         'people.person.calendarEventSummaries.attendees.external',
-        'people.person.calendarEventSummaries.notes.createdBy',
-        'notes.createdBy'
+        'people.person.calendarEventSummaries.notes.createdBy'
       ], {
         populate: {
           'people.person.sources.person': { select: 'name avatarUrl title' },
           'people.person.calendarEventSummaries.attendees.internal': { select: 'name avatarUrl title' },
           'people.person.calendarEventSummaries.attendees.external': { select: 'name avatarUrl title' },
-          'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title' },
-          'notes.createdBy': { select: 'name avatarUrl title' }
+          'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title' }
         }
       })
       .exec(cb);
@@ -750,7 +747,6 @@ module.exports = function(mongoose, config) {
       .findById(id)
       .populate('people.person', 'name avatarUrl title calendarEventSummaries sources')
       .populate('related', 'name logoUrl')
-      .populate('notes')
       .populate('chairs.first', 'name avatarUrl title')
       .populate('chairs.second', 'name avatarUrl title')
       .populate('funds', 'name hexColorCode closeDate')
@@ -761,15 +757,13 @@ module.exports = function(mongoose, config) {
         'people.person.sources.person',
         'people.person.calendarEventSummaries.attendees.internal',
         'people.person.calendarEventSummaries.attendees.external',
-        'people.person.calendarEventSummaries.notes.createdBy',
-        'notes.createdBy'
+        'people.person.calendarEventSummaries.notes.createdBy'
       ], {
         populate: {
           'people.person.sources.person': { select: 'name avatarUrl title' },
           'people.person.calendarEventSummaries.attendees.internal': { select: 'name avatarUrl title' },
           'people.person.calendarEventSummaries.attendees.external': { select: 'name avatarUrl title' },
-          'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title' },
-          'notes.createdBy': { select: 'name avatarUrl title' }
+          'people.person.calendarEventSummaries.notes.createdBy': { select: 'name avatarUrl title' }
         }
       })
       .exec(cb);

package/lib/Person.js

@@ -703,15 +703,12 @@ module.exports = function(mongoose, config) {
       .populate('calendarEventSummaries.attendees.external', 'avatarUrl name title')
       .populate('calendarEventSummaries.attendees.internal', 'avatarUrl name title')
       .populate('calendarEventSummaries.notes')
-      .populate('notes')
       .populate('related')
       .populate('sources.person', 'avatarUrl name title')
       .deepPopulate([
-        'notes.createdBy',
         'calendarEventSummaries.notes.createdBy'
       ], {
         populate: {
-          'notes.createdBy': {select: 'avatarUrl name'},
           'calendarEventSummaries.notes.createdBy': { select: 'avatarUrl name' }
         }
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",

package/test/Organization.js

@@ -717,26 +717,6 @@ describe('Organization', function() {
 
   });
 
-  it('gets an org by id with a populated note', function(done) {
-
-    Organization.getById(org4.id, function(err, result) {
-
-      should.not.exist(err);
-      should.exist(result);
-      result.notes.length.should.equal(1);
-      should.exist(result.notes[0].createdBy);
-      should.exist(result.notes[0].createdBy.avatarUrl);
-      result.notes[0].createdBy.avatarUrl.length.should.be.above(0);
-      should.exist(result.notes[0].createdBy.name);
-      should.exist(result.notes[0].createdBy.name.first);
-      result.notes[0].createdBy.name.first.length.should.be.above(0);
-
-      return done();
-
-    });
-
-  });
-
   it('deletes a simple note', function(done) {
 
     Organization.deleteNote(noteId, function(err, result) {