mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 00:42:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-63549-master' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2018-11-02 10:17:54 +08:00
commit fb3ab37a67
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
message/classes/api.php
View File

@ -543,11 +543,12 @@ class api {
// Now, create the final return structure.
$arrconversations = [];
foreach ($conversations as $conversation) {
// It's possible other users have been deleted.
// In cases like this, we still want to include the conversation if it's of type 'group'.
// Individual conversations are skipped if the other member has been deleted.
if (isset($deletedmembers[$conversation->id]) &&
$conversation->conversationtype == self::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL) {
// Do not include any individual conversation which:
// a) Contains a deleted member or
// b) Does not contain a recent message for the user (this happens if the user has deleted all messages).
// Group conversations with deleted users or no messages are always returned.
if ($conversation->conversationtype == self::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
&& (isset($deletedmembers[$conversation->id]) || empty($conversation->messageid))) {
continue;
}

34
message/tests/api_test.php
View File

@ -927,6 +927,40 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$this->assertEquals($gc4->id, $conversations[3]->id);
}
/**
* Test confirming the behaviour of get_conversations() when users delete all messages.
*/
public function test_get_conversations_deleted_messages() {
// Get a bunch of conversations, some group, some individual and in different states.
list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
$gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
$conversations = \core_message\api::get_conversations($user1->id);
$this->assertCount(6, $conversations);
// Delete all messages from a group conversation the user is in - it should be returned.
$this->assertTrue(\core_message\api::is_user_in_conversation($user1->id, $gc2->id));
$convmessages = \core_message\api::get_conversation_messages($user1->id, $gc2->id);
$messages = $convmessages['messages'];
foreach ($messages as $message) {
\core_message\api::delete_message($user1->id, $message->id);
}
$conversations = \core_message\api::get_conversations($user1->id);
$this->assertCount(6, $conversations);
$this->assertContains($gc2->id, array_column($conversations, 'id'));
// Delete all messages from an individual conversation the user is in - it should not be returned.
$this->assertTrue(\core_message\api::is_user_in_conversation($user1->id, $ic1->id));
$convmessages = \core_message\api::get_conversation_messages($user1->id, $ic1->id);
$messages = $convmessages['messages'];
foreach ($messages as $message) {
\core_message\api::delete_message($user1->id, $message->id);
}
$conversations = \core_message\api::get_conversations($user1->id);
$this->assertCount(5, $conversations);
$this->assertNotContains($ic1->id, array_column($conversations, 'id'));
}
/**
* Test verifying the behaviour of get_conversations() when fetching favourite conversations.
*/