L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jun Pataleta
2019-05-07 16:26:46 +08:00
committed by Adrian Greeve
parent 3e35a573e0 a0523b826e
commit c5354a4012
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
favourites/classes/local/service/component_favourite_service.php
+6 -4
View File
@@ -61,15 +61,17 @@ class component_favourite_service {
/**
* Delete a collection of favourites by type, and optionally for a given context.
* Delete a collection of favourites by type and item, and optionally for a given context.
*
* E.g. delete all favourites of type 'message_conversations' and for a specific CONTEXT_COURSE context.
* E.g. delete all favourites of type 'message_conversations' for the conversation '11' and in the CONTEXT_COURSE context.
*
* @param string $itemtype the type of the favourited items.
* @param int $itemid the id of the item to which the favourites relate
* @param \context $context the context of the items which were favourited.
*/
public function delete_favourites_by_type(string $itemtype, \context $context = null) {
$criteria = ['component' => $this->component, 'itemtype' => $itemtype] + ($context ? ['contextid' => $context->id] : []);
public function delete_favourites_by_type_and_item(string $itemtype, int $itemid, \context $context = null) {
$criteria = ['component' => $this->component, 'itemtype' => $itemtype, 'itemid' => $itemid] +
($context ? ['contextid' => $context->id] : []);
$this->repo->delete_by($criteria);
}
}
favourites/tests/component_favourite_service_test.php
+24 -9
View File
@@ -180,9 +180,9 @@ class component_favourite_service_testcase extends advanced_testcase {
}
/**
* Test confirming the deletion of favourites by type, but with no optional context filter provided.
* Test confirming the deletion of favourites by type and item, but with no optional context filter provided.
*/
public function test_delete_favourites_by_type() {
public function test_delete_favourites_by_type_and_item() {
list($user1context, $user2context, $course1context, $course2context) = $this->setup_users_and_courses();
// Get a user_favourite_service for each user.
@@ -207,8 +207,11 @@ class component_favourite_service_testcase extends advanced_testcase {
// Get a component_favourite_service to perform the type based deletion.
$service = new \core_favourites\local\service\component_favourite_service('core_course', $repo);
// Delete all 'course' type favourites (for all users at ANY context).
$service->delete_favourites_by_type('course');
// Delete all 'course' type favourites (for all users who have favourited course1).
$service->delete_favourites_by_type_and_item('course', $course1context->instanceid);
// Delete all 'course' type favourites (for all users who have favourited course2).
$service->delete_favourites_by_type_and_item('course', $course2context->instanceid);
// Verify the favourites don't exist.
$this->assertFalse($repo->exists($fav1->id));
@@ -221,13 +224,13 @@ class component_favourite_service_testcase extends advanced_testcase {
$this->assertTrue($repo->exists($fav6->id));
// Try to delete favourites for a type which we know doesn't exist. Verify no exception.
$this->assertNull($service->delete_favourites_by_type('course'));
$this->assertNull($service->delete_favourites_by_type_and_item('course', $course1context->instanceid));
}
/**
* Test confirming the deletion of favourites by type and with the optional context filter provided.
* Test confirming the deletion of favourites by type and item and with the optional context filter provided.
*/
public function test_delete_favourites_by_type_with_context() {
public function test_delete_favourites_by_type_and_item_with_context() {
list($user1context, $user2context, $course1context, $course2context) = $this->setup_users_and_courses();
// Get a user_favourite_service for each user.
@@ -249,11 +252,17 @@ class component_favourite_service_testcase extends advanced_testcase {
$fav5 = $user2service->create_favourite('core_user', 'course', $course1context->instanceid, $course1context);
$fav6 = $user2service->create_favourite('core_course', 'whatnow', $course1context->instanceid, $course1context);
// Favourite the courses again, but this time in another context.
$fav7 = $user1service->create_favourite('core_course', 'course', $course1context->instanceid, context_system::instance());
$fav8 = $user2service->create_favourite('core_course', 'course', $course1context->instanceid, context_system::instance());
$fav9 = $user1service->create_favourite('core_course', 'course', $course2context->instanceid, context_system::instance());
$fav10 = $user2service->create_favourite('core_course', 'course', $course2context->instanceid, context_system::instance());
// Get a component_favourite_service to perform the type based deletion.
$service = new \core_favourites\local\service\component_favourite_service('core_course', $repo);
// Delete all 'course' type favourites (for all users at ONLY the course 1 context).
$service->delete_favourites_by_type('course', $course1context);
$service->delete_favourites_by_type_and_item('course', $course1context->instanceid, $course1context);
// Verify the favourites for course 1 context don't exist.
$this->assertFalse($repo->exists($fav1->id));
@@ -267,7 +276,13 @@ class component_favourite_service_testcase extends advanced_testcase {
$this->assertTrue($repo->exists($fav5->id));
$this->assertTrue($repo->exists($fav6->id));
// Verify the course favourite at the system context are unaffected.
$this->assertTrue($repo->exists($fav7->id));
$this->assertTrue($repo->exists($fav8->id));
$this->assertTrue($repo->exists($fav9->id));
$this->assertTrue($repo->exists($fav10->id));
// Try to delete favourites for a type which we know doesn't exist. Verify no exception.
$this->assertNull($service->delete_favourites_by_type('course', $course1context));
$this->assertNull($service->delete_favourites_by_type_and_item('course', $course1context->instanceid, $course1context));
}
}
message/classes/api.php
+1 -1
View File
@@ -3338,7 +3338,7 @@ class api {
// Delete all favourite records for all users relating to this conversation.
$service = \core_favourites\service_factory::get_service_for_component('core_message');
$service->delete_favourites_by_type('message_conversations', $convcontext);
$service->delete_favourites_by_type_and_item('message_conversations', $conversationid, $convcontext);
}
/**