mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 14:40:06 +01:00
Code Issues Projects Releases Wiki Activity

MDL-47389 forum: Return discussions count in get_forums_by_courses ws

Browse Source
This commit is contained in:
Juan Leyva 2014-09-29 13:19:07 +02:00
parent 6597413d41
commit 7ea6ada343
2 changed files with 26 additions and 1 deletions

9
mod/forum/externallib.php

@ -82,6 +82,8 @@ class mod_forum_external extends external_api {
if ($forums = $DB->get_records('forum', array('course' => $cid))) { if ($forums = $DB->get_records('forum', array('course' => $cid))) {
// Get the modinfo for the course. // Get the modinfo for the course.
$modinfo = get_fast_modinfo($cid); $modinfo = get_fast_modinfo($cid);
// Get the course object.
$course = $modinfo->get_course();
// Get the forum instances. // Get the forum instances.
$foruminstances = $modinfo->get_instances_of('forum'); $foruminstances = $modinfo->get_instances_of('forum');
// Loop through the forums returned by modinfo. // Loop through the forums returned by modinfo.
@ -101,6 +103,10 @@ class mod_forum_external extends external_api {
$context->id, 'mod_forum', 'intro', 0); $context->id, 'mod_forum', 'intro', 0);
// Add the course module id to the object, this information is useful. // Add the course module id to the object, this information is useful.
$forum->cmid = $cm->id; $forum->cmid = $cm->id;
// Discussions count. This function does static request cache.
$forum->numdiscussions = forum_count_discussions($forum, $cm, $course);
// Add the forum to the array to return. // Add the forum to the array to return.
$arrforums[$forum->id] = (array) $forum; $arrforums[$forum->id] = (array) $forum;
} }
@ -144,7 +150,8 @@ class mod_forum_external extends external_api {
'completiondiscussions' => new external_value(PARAM_INT, 'Student must create discussions'), 'completiondiscussions' => new external_value(PARAM_INT, 'Student must create discussions'),
'completionreplies' => new external_value(PARAM_INT, 'Student must post replies'), 'completionreplies' => new external_value(PARAM_INT, 'Student must post replies'),
'completionposts' => new external_value(PARAM_INT, 'Student must post discussions or replies'), 'completionposts' => new external_value(PARAM_INT, 'Student must post discussions or replies'),
'cmid' => new external_value(PARAM_INT, 'Course module id') 'cmid' => new external_value(PARAM_INT, 'Course module id'),
'numdiscussions' => new external_value(PARAM_INT, 'Number of discussions in the forum', VALUE_OPTIONAL)
), 'forum' ), 'forum'
) )
); );

18
mod/forum/tests/externallib_test.php

@ -81,6 +81,24 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
$record->course = $course2->id; $record->course = $course2->id;
$forum2 = self::getDataGenerator()->create_module('forum', $record); $forum2 = self::getDataGenerator()->create_module('forum', $record);
// Add discussions to the forums.
$record = new stdClass();
$record->course = $course1->id;
$record->userid = $user->id;
$record->forum = $forum1->id;
$discussion1 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
// Expect one discussion.
$forum1->numdiscussions = 1;
$record = new stdClass();
$record->course = $course2->id;
$record->userid = $user->id;
$record->forum = $forum2->id;
$discussion2 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
$discussion3 = self::getDataGenerator()->get_plugin_generator('mod_forum')->create_discussion($record);
// Expect two discussions.
$forum2->numdiscussions = 2;
// Check the forum was correctly created. // Check the forum was correctly created.
$this->assertEquals(2, $DB->count_records_select('forum', 'id = :forum1 OR id = :forum2', $this->assertEquals(2, $DB->count_records_select('forum', 'id = :forum1 OR id = :forum2',
array('forum1' => $forum1->id, 'forum2' => $forum2->id))); array('forum1' => $forum1->id, 'forum2' => $forum2->id)));