From 715c45aac916291aa791b768be70cfdad7497f2b Mon Sep 17 00:00:00 2001
From: Mark Nelson <markn@moodle.com>
Date: Tue, 20 Nov 2018 12:00:38 +0800
Subject: [PATCH] MDL-64018 core_message: added api::get_user_contacts

This is to replace api::get_contacts when that gets deprecated.
---
 message/classes/api.php    | 30 +++++++++++++++++++
 message/tests/api_test.php | 60 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/message/classes/api.php b/message/classes/api.php
index 86a22f81e67..017b81cd500 100644
--- a/message/classes/api.php
+++ b/message/classes/api.php
@@ -1029,6 +1029,36 @@ class api {
         return [];
     }
 
+    /**
+     * Get the contacts for a given user.
+     *
+     * @param int $userid
+     * @param int $limitfrom
+     * @param int $limitnum
+     * @return array An array of contacts
+     */
+    public static function get_user_contacts(int $userid, int $limitfrom = 0, int $limitnum = 0) {
+        global $DB;
+
+        $sql = "SELECT *
+                  FROM {message_contacts} mc
+                 WHERE mc.userid = ? OR mc.contactid = ?
+              ORDER BY timecreated DESC, id ASC";
+        if ($contacts = $DB->get_records_sql($sql, [$userid, $userid], $limitfrom, $limitnum)) {
+            $userids = [];
+            foreach ($contacts as $contact) {
+                if ($contact->userid == $userid) {
+                    $userids[] = $contact->contactid;
+                } else {
+                    $userids[] = $contact->userid;
+                }
+            }
+            return helper::get_member_info($userid, $userids);
+        }
+
+        return [];
+    }
+
     /**
      * Returns the contacts count.
      *
diff --git a/message/tests/api_test.php b/message/tests/api_test.php
index 9e29bd14c14..5793128183f 100644
--- a/message/tests/api_test.php
+++ b/message/tests/api_test.php
@@ -2108,6 +2108,66 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
         $this->assertNull($contact3->unreadcount);
     }
 
+    /**
+     * Tests retrieving user contacts.
+     */
+    public function test_get_user_contacts() {
+        // Create some users.
+        $user1 = self::getDataGenerator()->create_user();
+
+        // Set as the user.
+        $this->setUser($user1);
+
+        $user2 = new stdClass();
+        $user2->firstname = 'User';
+        $user2->lastname = 'A';
+        $user2 = self::getDataGenerator()->create_user($user2);
+
+        $user3 = new stdClass();
+        $user3->firstname = 'User';
+        $user3->lastname = 'B';
+        $user3 = self::getDataGenerator()->create_user($user3);
+
+        $user4 = new stdClass();
+        $user4->firstname = 'User';
+        $user4->lastname = 'C';
+        $user4 = self::getDataGenerator()->create_user($user4);
+
+        $user5 = new stdClass();
+        $user5->firstname = 'User';
+        $user5->lastname = 'D';
+        $user5 = self::getDataGenerator()->create_user($user5);
+
+        // Add some users as contacts.
+        \core_message\api::add_contact($user1->id, $user2->id);
+        \core_message\api::add_contact($user1->id, $user3->id);
+        \core_message\api::add_contact($user1->id, $user4->id);
+
+        // Retrieve the contacts.
+        $contacts = \core_message\api::get_user_contacts($user1->id);
+
+        // Confirm the data is correct.
+        $this->assertEquals(3, count($contacts));
+
+        ksort($contacts);
+
+        $contact1 = array_shift($contacts);
+        $contact2 = array_shift($contacts);
+        $contact3 = array_shift($contacts);
+
+        $this->assertEquals($user2->id, $contact1->id);
+        $this->assertEquals(fullname($user2), $contact1->fullname);
+        $this->assertTrue($contact1->iscontact);
+
+        $this->assertEquals($user3->id, $contact2->id);
+        $this->assertEquals(fullname($user3), $contact2->fullname);
+        $this->assertTrue($contact2->iscontact);
+
+        $this->assertEquals($user4->id, $contact3->id);
+        $this->assertEquals(fullname($user4), $contact3->fullname);
+        $this->assertTrue($contact3->iscontact);
+    }
+
     /**
      * Tests retrieving messages.
      */
-- 
2.17.1