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

MDL-63913 core_message: fix to ensure favourites is exclusive

Browse Source 
If a conversation is included in the favourites unread count, it
cannot be included in any other type-based counts.
This commit is contained in:
Jake Dallimore 2018-11-19 13:51:40 +08:00
parent 33022ee1d5
commit a54115355a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
message/classes/api.php
View File

@ -2968,10 +2968,11 @@ class api {
self::MESSAGE_CONVERSATION_TYPE_GROUP => 0
]];
foreach ($unreadcounts as $convid => $info) {
$counts['types'][$info->type]++;
if (isset($favouriteconvids[$convid])) {
$counts['favourites']++;
continue;
}
$counts['types'][$info->type]++;
}
return $counts;

15
message/tests/api_test.php
View File

@ -5873,22 +5873,27 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
$gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
// Without favourites.
$counts = \core_message\api::get_unread_conversation_counts($user1->id);
$this->assertEquals(0, $counts['favourites']);
$this->assertEquals(2, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
$this->assertEquals(2, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP]);
// Mark a couple as favourites.
\core_message\api::set_favourite_conversation($ic1->id, $user1->id);
\core_message\api::set_favourite_conversation($gc2->id, $user1->id);
$counts = \core_message\api::get_unread_conversation_counts($user1->id);
$this->assertEquals(2, $counts['favourites']);
$this->assertEquals(2, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
$this->assertEquals(2, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP]);
\core_message\api::mark_all_messages_as_read($user1->id, $ic1->id);
$this->assertEquals(1, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
$this->assertEquals(1, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP]);
// Mark a conversation as read and confirm it's not included in the unread counts for its respective type.
\core_message\api::mark_all_messages_as_read($user1->id, $ic1->id);
$counts = \core_message\api::get_unread_conversation_counts($user1->id);
$this->assertEquals(1, $counts['favourites']);
$this->assertEquals(1, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
$this->assertEquals(2, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP]);
$this->assertEquals(1, $counts['types'][\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP]);
}
/**