BUG: refs #953. changed group.list.users to return names rather than …

…emails.

modules/api/controllers/components/ApiComponent.php

@@ -3048,7 +3048,8 @@ function groupRemove($args)
    * list the users for a group, requires admin privileges on the community
    * assiated with the group
    * @param group_id id of group
-   * @return array users => a list of user ids mapped to user emails
+   * @return array users => a list of user ids mapped to a two element list of
+   * user firstname and lastname
    */
   function groupListUsers($args)
     {
@@ -3078,7 +3079,7 @@ function groupListUsers($args)
     $userIdsToEmail = array();
     foreach($users as $user)
       {
-      $userIdsToEmail[$user->getUserId()] = $user->getEmail();
+      $userIdsToEmail[$user->getUserId()] = array('firstname' => $user->getFirstname(), 'lastname' => $user->getLastname());
       }
     return array('users' => $userIdsToEmail);
     }

modules/api/tests/controllers/ApiCallGroupMethodsTest.php

@@ -183,6 +183,9 @@ public function testGroupListUsers()
     $commMember = $userModel->load($commMemberId);
     $commModerator = $userModel->load($commModeratorId);
     $commAdmin = $userModel->load($commAdminId);
+    $commUsers =
+      array($commMemberId => $commMember, $commModeratorId =>  $commModerator, $commAdminId =>  $commAdmin);
+
 
     // add in an anonymous user to non admins
     $invalidUsers = array($commMember, $commModerator, false);
@@ -205,9 +208,11 @@ public function testGroupListUsers()
     $users = $resp->data->users;
     $users = (array)$users;
     $this->assertEquals(1, sizeof($users), 'users should only have one entry');
-    foreach($users as $id => $email)
+    foreach($users as $id => $names)
       {
       $this->assertEquals($id, $commAdminId, 'users should have commAdminId as an entry');
+      $this->assertEquals($commUsers[$commAdminId]->getFirstname(), $names->firstname);
+      $this->assertEquals($commUsers[$commAdminId]->getLastname(), $names->lastname);
       }
 
     // add some users, test again
@@ -227,9 +232,11 @@ public function testGroupListUsers()
     $users = (array)$users;
     $this->assertEquals(3, sizeof($users), 'users should have 3 entries');
     $members = array($commAdminId, $commMemberId, $commModeratorId);
-    foreach($users as $id => $email)
+    foreach($users as $id => $names)
       {
       $this->assertTrue(in_array($id, $members), 'users should have '.$id.' as an entry');
+      $this->assertEquals($commUsers[$id]->getFirstname(), $names->firstname);
+      $this->assertEquals($commUsers[$id]->getLastname(), $names->lastname);
       }
 
     // remove some users, test again
@@ -246,11 +253,12 @@ public function testGroupListUsers()
     $users = $resp->data->users;
     $users = (array)$users;
     $this->assertEquals(1, sizeof($users), 'users should only have one entry');
-    foreach($users as $id => $email)
+    foreach($users as $id => $names)
       {
       $this->assertEquals($id, $commAdminId, 'users should have commAdminId as an entry');
+      $this->assertEquals($commUsers[$id]->getFirstname(), $names->firstname);
+      $this->assertEquals($commUsers[$id]->getLastname(), $names->lastname);
       }
-
     }
 
   }