tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BasketSnapshot: remove obsolete flag

This commit is contained in:
Thomas Gelf 2023-03-11 09:42:09 +01:00
parent 25bca75e9b
commit c3936f63bb
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
library/Director/DirectorObject/Automation/BasketSnapshot.php
View File

@ -220,16 +220,11 @@ class BasketSnapshot extends DbObject
/**
* @param Db $connection
* @param bool $replace
* @throws \Icinga\Exception\NotFoundError
*/
public function restoreTo(Db $connection, $replace = true)
public function restoreTo(Db $connection)
{
static::restoreJson(
$this->getJsonDump(),
$connection,
$replace
);
static::restoreJson($this->getJsonDump(), $connection);
}
/**
@ -250,14 +245,9 @@ class BasketSnapshot extends DbObject
return $snapshot;
}
public static function restoreJson($string, Db $connection, $replace = true)
public static function restoreJson($string, Db $connection)
{
$snapshot = new static();
$snapshot->restoreObjects(
JsonString::decode($string),
$connection,
$replace
);
(new static())->restoreObjects(JsonString::decode($string), $connection);
}
/**
@ -266,16 +256,16 @@ class BasketSnapshot extends DbObject
* @throws \Icinga\Exception\NotFoundError
* @throws JsonDecodeException
*/
protected function restoreObjects(stdClass $all, Db $connection, $replace = true)
protected function restoreObjects(stdClass $all, Db $connection)
{
$db = $connection->getDbAdapter();
$db->beginTransaction();
$fieldResolver = new BasketSnapshotFieldResolver($all, $connection);
$this->restoreType($all, 'DataList', $fieldResolver, $connection, $replace);
$this->restoreType($all, 'DatafieldCategory', $fieldResolver, $connection, $replace);
$this->restoreType($all, 'DataList', $fieldResolver, $connection);
$this->restoreType($all, 'DatafieldCategory', $fieldResolver, $connection);
$fieldResolver->storeNewFields();
foreach ($this->restoreOrder as $typeName) {
$this->restoreType($all, $typeName, $fieldResolver, $connection, $replace);
$this->restoreType($all, $typeName, $fieldResolver, $connection);
}
$db->commit();
}
@ -290,13 +280,8 @@ class BasketSnapshot extends DbObject
stdClass $all,
string $typeName,
BasketSnapshotFieldResolver $fieldResolver,
Db $connection,
bool $replace
Db $connection
) {
if ($replace === false) {
throw new RuntimeException('Replace flag should no longer be in use');
}
if (isset($all->$typeName)) {
$objects = (array) $all->$typeName;
} else {