Improve delete instance.

bfh · Dec 5, 2024 · b5f81d4 · b5f81d4
1 parent 547dced
commit b5f81d4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/classes/repository/instance_repository.php b/classes/repository/instance_repository.php
@@ -204,6 +204,7 @@ private static function get_strings(string $type, int $subratingid, int $instanc
                 $dbobj->string = $dboheader->string;
                 $dbobj->typeid = $dboheader->typeid;
                 $dbobj->foreignkey = $dboheader->foreignkey;
+                $dbobj->instanceid = $dboheader->instanceid;
 
                 $sortedstrings[$cachekey][$dbobj->languageid] = $dbobj;
             }
@@ -471,19 +472,20 @@ public function delete(int $instanceid) {
 
         $dbocategories = $DB->get_records(tables::INSTANCE_CATEGORY_TABLE, ["instanceid" => $instanceid]);
         foreach ($dbocategories as $dbocategory) {
-            // Delete all strings.
-            $DB->delete_records(tables::LOCALIZED_STRING_TABLE, ["instanceid" => $instanceid]);
-
             // Delete category criteria.
             $dbocriteria = $DB->get_records(tables::INSTANCE_CRITERION_TABLE, ["categoryid" => $dbocategory->id]);
             foreach ($dbocriteria as $dbocriterion) {
                 // Delete subratings.
-                $dbosubratings = $DB->delete_records(tables::INSTANCE_SUBRATING_TABLE, ["criterionid" => $dbocriterion->id]);
+                $DB->delete_records(tables::INSTANCE_SUBRATING_TABLE, ["criterionid" => $dbocriterion->id]);
             }
             $DB->delete_records(tables::INSTANCE_CRITERION_TABLE, ["categoryid" => $dbocategory->id]);
         }
 
+        // Delete all strings.
+        $DB->delete_records(tables::LOCALIZED_STRING_TABLE, ["instanceid" => $instanceid]);
+        // Delete categories.
         $DB->delete_records(tables::INSTANCE_CATEGORY_TABLE, ["instanceid" => $instanceid]);
+        // Delete the instance itself.
         return $DB->delete_records(tables::INSTANCE_TABLE, ["id" => $instanceid]);
     }