MDL-65178 competencies: count_competencies fix
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2019 01:47:09 +0000 (09:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2019 01:47:09 +0000 (09:47 +0800)
Fix sql error in course_module_competency::count_competencies() function.

competency/classes/course_module_competency.php
competency/tests/course_module_competency_test.php [new file with mode: 0644]

index 405b495..026ac44 100644 (file)
@@ -192,8 +192,8 @@ class course_module_competency extends persistent {
         $sql = 'SELECT COUNT(comp.id)
                   FROM {' . self::TABLE . '} coursemodulecomp
                   JOIN {' . competency::TABLE . '} comp
-                    ON coursecomp.competencyid = comp.id
-                 WHERE coursecomp.cmid = ? ';
+                    ON coursemodulecomp.competencyid = comp.id
+                 WHERE coursemodulecomp.cmid = ? ';
         $params = array($cmid);
 
         $results = $DB->count_records_sql($sql, $params);
diff --git a/competency/tests/course_module_competency_test.php b/competency/tests/course_module_competency_test.php
new file mode 100644 (file)
index 0000000..8d951dc
--- /dev/null
@@ -0,0 +1,72 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Course module competency persistent class tests.
+ *
+ * @package    core_competency
+ * @copyright  2019 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+global $CFG;
+
+use core_competency\course_module_competency;
+
+/**
+ * Course module competency persistent testcase.
+ *
+ * @package    core_competency
+ * @copyright  2019 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_competency_course_module_competency_testcase extends advanced_testcase {
+
+    public function test_count_competencies() {
+        global $CFG, $DB;
+
+        $this->resetAfterTest(true);
+        $dg = $this->getDataGenerator();
+        $lpg = $dg->get_plugin_generator('core_competency');
+
+        $c1 = $dg->create_course();
+        $u1 = $dg->create_user();
+        $u2 = $dg->create_user();
+
+        $framework = $lpg->create_framework();
+        $comp1 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id')));   // In C1, and C2.
+        $comp2 = $lpg->create_competency(array('competencyframeworkid' => $framework->get('id')));   // In C2.
+        $lpg->create_course_competency(array('competencyid' => $comp1->get('id'), 'courseid' => $c1->id));
+        $lpg->create_course_competency(array('competencyid' => $comp2->get('id'), 'courseid' => $c1->id));
+
+        $assign1a = $dg->create_module('assign', ['course' => $c1]);
+        $assign1b = $dg->create_module('assign', ['course' => $c1]);
+        $cmc1a = $lpg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1a->cmid]);
+        $cmc1b = $lpg->create_course_module_competency(['competencyid' => $comp1->get('id'), 'cmid' => $assign1b->cmid]);
+        $cmc2b = $lpg->create_course_module_competency(['competencyid' => $comp2->get('id'), 'cmid' => $assign1b->cmid]);
+
+        // Enrol the user 1 in C1.
+        $dg->enrol_user($u1->id, $c1->id);
+
+        $all = course_module_competency::list_course_module_competencies($assign1a->cmid);
+        $this->assertEquals(course_module_competency::count_competencies($assign1a->cmid), count($all));
+
+        $all = course_module_competency::list_course_module_competencies($assign1b->cmid);
+        $this->assertEquals(course_module_competency::count_competencies($assign1b->cmid), count($all));
+    }
+
+}