MDL-53451 tool_lpmigrate: Fixing broken logic found in tests

Thanks to MSSQL, the only one with failures.
NoelDeMartin · Apr 20, 2016 · d789158 · d789158
1 parent 4fd183d
commit d789158
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 4 deletions.
diff --git a/admin/tool/lpmigrate/classes/framework_processor.php b/admin/tool/lpmigrate/classes/framework_processor.php
@@ -574,6 +574,11 @@ protected function process_courses() {
             // Finally, we remove the course competencies, but only for the 100% successful ones.
             foreach ($competenciestoremovefromcourse as $competencyid => $unused) {
 
+                // Skip competencies with issues.
+                if (isset($competencieswithissues[$competencyid])) {
+                    continue;
+                }
+
                 try {
                     // Process the course competency.
                     api::remove_competency_from_course($courseid, $competencyid);

diff --git a/admin/tool/lpmigrate/tests/processor_test.php b/admin/tool/lpmigrate/tests/processor_test.php
@@ -332,7 +332,7 @@ public function test_destination_competency_exists() {
         $this->assertEquals(2, $processor->get_courses_found_count());
         $this->assertEquals(5, $processor->get_expected_course_competency_migrations());
         $this->assertEquals(3, $processor->get_course_competency_migrations());
-        $this->assertEquals(3, $processor->get_course_competency_removals());
+        $this->assertEquals(2, $processor->get_course_competency_removals());
 
         $this->assertEquals(3, $processor->get_cms_found_count());
         $this->assertEquals(5, $processor->get_expected_module_competency_migrations());

diff --git a/competency/classes/api.php b/competency/classes/api.php
@@ -1606,12 +1606,11 @@ public static function remove_competency_from_course($courseid, $competencyid) {
         $record->courseid = $courseid;
         $record->competencyid = $competencyid;
 
-        $competency = new competency($competencyid);
         $coursecompetency = new course_competency();
-        $exists = $coursecompetency->get_record(array('courseid' => $courseid, 'competencyid' => $competencyid));
+        $exists = course_competency::get_record(array('courseid' => $courseid, 'competencyid' => $competencyid));
         if ($exists) {
             // Delete all course_module_competencies for this competency in this course.
-            $cmcs = course_module_competency::list_course_module_competencies($competencyid, $courseid);
+            $cmcs = course_module_competency::get_records_by_competencyid_in_course($competencyid, $courseid);
             foreach ($cmcs as $cmc) {
                 $cmc->delete();
             }

diff --git a/competency/classes/course_module_competency.php b/competency/classes/course_module_competency.php
@@ -298,4 +298,33 @@ public static function list_course_module_competencies($cmid) {
         return $instances;
     }
 
+    /**
+     * List the relationship objects for a competency in a course.
+     *
+     * @param int $competencyid The competency ID.
+     * @param int $courseid The course ID.
+     * @return course_module_competency[]
+     */
+    public static function get_records_by_competencyid_in_course($competencyid, $courseid) {
+        global $DB;
+
+        $sql = 'SELECT cmc.*
+                  FROM {' . self::TABLE . '} cmc
+                  JOIN {course_modules} cm
+                    ON cm.course = ?
+                   AND cmc.cmid = cm.id
+                 WHERE cmc.competencyid = ?
+              ORDER BY cmc.sortorder ASC';
+        $params = array($courseid, $competencyid);
+
+        $results = $DB->get_recordset_sql($sql, $params);
+        $instances = array();
+        foreach ($results as $result) {
+            $instances[$result->id] = new course_module_competency(0, $result);
+        }
+        $results->close();
+
+        return $instances;
+    }
+
 }