Added user name to observers response.

inaturalist · Feb 23, 2016 · bcf4787 · bcf4787
1 parent 60f0bb5
commit bcf4787
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/models/user.js b/lib/models/user.js
@@ -26,7 +26,7 @@ User.findByLogin = function( login, callback ) {
 User.assignToObject = function( object, callback ) {
   var ids = _.keys( object );
   if( ids.length == 0 ) { return callback( null, object ); }
-  pgClient.connection.query("SELECT id, login, icon_content_type, icon_file_name FROM users WHERE id IN (" + ids.join(",") + ")",
+  pgClient.connection.query("SELECT id, login, name, icon_content_type, icon_file_name FROM users WHERE id IN (" + ids.join(",") + ")",
     function( err, result ) {
       if( err ) { return callback( err ); }
       _.each( result.rows, function( r ) {

diff --git a/test/routes.js b/test/routes.js
@@ -36,8 +36,8 @@ describe( "routes", function( ) {
   before( function( done ) {
     pgClient.connection.query( "TRUNCATE TABLE users", function( err, result ) {
     pgClient.connection.query( "TRUNCATE TABLE projects", function( err, result ) {
-    pgClient.connection.query( "INSERT INTO users (id, login, icon_content_type) VALUES ($1, $2, $3)",
-      [ 123, "a-user", "jpeg" ], function( err, result ) {
+    pgClient.connection.query( "INSERT INTO users (id, login, name, icon_content_type) VALUES ($1, $2, $3, $4)",
+      [ 123, "a-user", "A User", "jpeg" ], function( err, result ) {
     pgClient.connection.query( "INSERT INTO projects (id, slug, title) VALUES ($1, $2, $3)",
       [ 543, "a-project", "A Project" ], function( err, result ) {
         done( );
@@ -129,6 +129,7 @@ describe( "routes", function( ) {
         expect( res.body.results[ 1 ].user.id ).to.eq( 123 );
         // login comes from the DB
         expect( res.body.results[ 1 ].user.login ).to.eq( "a-user" );
+        expect( res.body.results[ 1 ].user.name ).to.eq( "A User" );
       }).expect( 200, done );
     });
 
@@ -201,6 +202,12 @@ describe( "routes", function( ) {
       request( app ).get( "/observations/observers?order_by=species_count" ).
         expect( "Content-Type", /json/ ).expect( 200, done );
     });
+
+    it( "includes user name field", function( ) {
+      request( app ).get( "/observations/observers" ).expect( function( res ) {
+        expect( res.results[0].user.name ).to.eq( "A User" );
+      });
+    });
   });
 
   describe( "observationsSpeciesCounts", function( ) {