added faves to obs detail response

lib/models/fave.js

@@ -0,0 +1,17 @@
+var _ = require( "underscore" ),
+    Fave = { };
+
+Fave = function( attrs ) {
+  var that = this;
+  _.each( attrs, function( value, attr ) {
+    that[ attr ] = value;
+  });
+};
+
+Fave.modelName = "fave";
+Fave.modelNamePlural = "faves";
+Fave.tableName = "votes";
+Fave.returnFields = [
+  "id", "voter_id user_id", "votable_id", "created_at" ];
+
+module.exports = Fave;

lib/models/model.js

@@ -22,14 +22,18 @@ Model.belongsToIDs = function( objects, model ) {
 };
 
 Model.injectHasMany = function( objects, model, resultsHash ) {
+  var assoc = model.modelNamePlural || model.tableName;
   // Example: for each obs (where results are identifications)
   _.each( objects, function( o ) {
     // obs has an ID and we have identifications for that obs
     if( o.id && !_.isEmpty( resultsHash[ o.id ] ) ) {
       // add the identifications to obs as an array
-      o[ model.tableName ] = _.map( _.values( resultsHash[ o.id ] ), function( v ) {
+      o[ assoc ] = _.map( _.values( resultsHash[ o.id ] ), function( v ) {
         return new model( v );
       });
+    } else {
+      // there were no identifications for the obs, set to empty array
+      o[ assoc ] = [ ];
     }
   });
 };

lib/models/observation.js

@@ -1,7 +1,8 @@
 var _ = require( "underscore" ),
-    Identification = require( "./identification" ),
     DBModel = require( "./db_model" ),
     ESModel = require( "./es_model" ),
+    Fave = require( "./fave" ),
+    Identification = require( "./identification" ),
     Taxon = require( "./taxon" ),
     User = require( "./user" ),
     Observation = { };
@@ -31,10 +32,17 @@ Observation.preloadIdentifications = function( obs, callback ) {
   DBModel.fetchHasMany( obs, Identification, "observation_id", callback );
 };
 
+Observation.preloadFaves = function( obs, callback ) {
+  DBModel.fetchHasMany( obs, Fave, "votable_id", callback );
+};
+
 Observation.preloadAllAssociations = function( obs, localeOpts, callback ) {
   Observation.preloadIdentifications( obs, function( err ) {
     if( err ) { return callback( err ); }
-    Observation.preloadTaxaAndUsers( obs, localeOpts, callback );
+    Observation.preloadFaves( obs, function( err ) {
+      if( err ) { return callback( err ); }
+      Observation.preloadTaxaAndUsers( obs, localeOpts, callback );
+    });
   });
 };
 
@@ -43,10 +51,14 @@ Observation.preloadTaxaAndUsers = function( obs, localeOpts, callback ) {
     t.prepareForResponse( localeOpts );
   }
   var obsAndIDs = _.filter(
-    _.flatten( [ obs, _.pluck( obs, "identifications" ) ] ), _.identity );
+    _.flatten( [ obs, _.pluck( obs, "identifications" ) ] ), _.identity
+  );
+  var obsFavesAndIDs = _.filter(
+    _.flatten( [ obsAndIDs, _.pluck( obs, "faves" ) ] ), _.identity
+  );
   ESModel.fetchBelongsTo( obsAndIDs, Taxon, prepareTaxon, function( err ) {
     if( err ) { return callback( err ); }
-    DBModel.fetchBelongsTo( obsAndIDs, User, callback );
+    DBModel.fetchBelongsTo( obsFavesAndIDs, User, callback );
   });
 };