From 7918a0ea4cafacf9000592db2c3529913ad4926c Mon Sep 17 00:00:00 2001
From: Jake Dallimore <jake@moodle.com>
Date: Wed, 15 May 2019 18:28:15 +0800
Subject: [PATCH] MDL-65566 core_message: let get_self_conversation use lazy
 init too

---
 message/classes/api.php    | 1 +
 message/tests/api_test.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/message/classes/api.php b/message/classes/api.php
index 1af93dc3168..a47abea3856 100644
--- a/message/classes/api.php
+++ b/message/classes/api.php
@@ -2454,6 +2454,7 @@ class api {
      */
     public static function get_self_conversation(int $userid) {
         global $DB;
+        self::lazy_create_self_conversation($userid);
 
         $conditions = [
             'type' => self::MESSAGE_CONVERSATION_TYPE_SELF,
diff --git a/message/tests/api_test.php b/message/tests/api_test.php
index 235ad5fa14c..bc63342c896 100644
--- a/message/tests/api_test.php
+++ b/message/tests/api_test.php
@@ -827,8 +827,9 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
         $this->assertEquals($user2->id, $member->id);
 
         \core_message\api::delete_all_conversation_data($rsc3->id);
-        $rsc3 = \core_message\api::get_self_conversation($user3->id);
-        $this->assertFalse($rsc3);
+        $selfconversation = \core_message\api::get_self_conversation($user3->id);
+        $members = \core_message\api::get_conversation_members($user1->id, $selfconversation->id);
+        $this->assertCount(1, $members);
     }
 
     /**