fix(import): cannot factorize deleteObsoleteItems

If the parent object is in itemtype_2 and items_id_2, it is not obvious to use this pair as FK Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jun 4, 2020 · b13c01a · b13c01a
1 parent dd36614
commit b13c01a
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 20 deletions.
diff --git a/inc/condition.class.php b/inc/condition.class.php
@@ -392,4 +392,16 @@ function ($item) {
 
       return $html;
    }
+
+   public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
+   {
+      $keepCriteria = [
+         'itemtype' => $container->getType(),
+         'items_id' => $container->getID(),
+      ];
+      if (count($exclude) > 0) {
+         $keepCriteria[] = ['NOT' => ['id' => $exclude]];
+      }
+      return $this->deleteByCriteria($keepCriteria);
+   }
 }
diff --git a/inc/exportable.class.php b/inc/exportable.class.php
@@ -128,24 +128,4 @@ public function importChildrenObjects($item, $linker, $subItems, $input) {
             }
         }
     }
-
-    public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
-    {
-        if ($this instanceof CommonDBRelation) {
-            $keepCriteria = [
-                'itemtype' => $container->getType(),
-                'items_id' => $container->getID(),
-            ];
-        } else if ($this instanceof CommonDBChild) {
-            $keepCriteria = [
-                $container::getForeignKeyField() => $container->getID(),
-            ];
-        } else {
-            return true;
-        }
-        if (count($exclude) > 0) {
-            $keepCriteria[] = ['NOT' => ['id' => $exclude]];
-        }
-        return $this->deleteByCriteria($keepCriteria);
-    }
 }
diff --git a/inc/form_profile.class.php b/inc/form_profile.class.php
@@ -247,4 +247,15 @@ public function export($remove_uuid = false) {
 
       return $form_profile;
    }
+
+   public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
+   {
+      $keepCriteria = [
+         self::$items_id_1 => $container->getID(),
+      ];
+      if (count($exclude) > 0) {
+         $keepCriteria[] = ['NOT' => ['id' => $exclude]];
+      }
+      return $this->deleteByCriteria($keepCriteria);
+   }
 }
diff --git a/inc/form_validator.class.php b/inc/form_validator.class.php
@@ -203,4 +203,15 @@ public function getValidatorsForForm(PluginFormcreatorForm $form, $itemtype) {
 
       return $result;
    }
+
+   public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
+   {
+      $keepCriteria = [
+         self::$items_id_1 => $container->getID(),
+      ];
+      if (count($exclude) > 0) {
+         $keepCriteria[] = ['NOT' => ['id' => $exclude]];
+      }
+      return $this->deleteByCriteria($keepCriteria);
+   }
 }
diff --git a/inc/item_targetticket.class.php b/inc/item_targetticket.class.php
@@ -171,4 +171,16 @@ public function prepareInputForAdd($input) {
    //    }
    //    return false;
    // }
+
+   public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
+   {
+      $keepCriteria = [
+         self::$itemtype_2 => $container->getType(),
+         self::$items_id_2 => $container->getID(),
+      ];
+      if (count($exclude) > 0) {
+         $keepCriteria[] = ['NOT' => ['id' => $exclude]];
+      }
+      return $this->deleteByCriteria($keepCriteria);
+   }
 }
diff --git a/inc/question.class.php b/inc/question.class.php
@@ -1226,4 +1226,15 @@ public function post_getFromDB() {
          $this->fields += self::getFullData(null, $this->fields['id']);
       }
    }
+
+   public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
+   {
+      $keepCriteria = [
+         self::$items_id => $container->getID(),
+      ];
+      if (count($exclude) > 0) {
+         $keepCriteria[] = ['NOT' => ['id' => $exclude]];
+      }
+      return $this->deleteByCriteria($keepCriteria);
+   }
 }
diff --git a/inc/section.class.php b/inc/section.class.php
@@ -430,4 +430,15 @@ public function post_addItem() {
    public function post_updateItem($history = 1) {
       $this->updateConditions($this->input);
    }
+
+   public function deleteObsoleteItems(CommonDBTM $container, array $exclude)
+   {
+      $keepCriteria = [
+         self::$items_id => $container->getID(),
+      ];
+      if (count($exclude) > 0) {
+         $keepCriteria[] = ['NOT' => ['id' => $exclude]];
+      }
+      return $this->deleteByCriteria($keepCriteria);
+   }
 }