Skip to content

Invalidate usage_impact if lifespan changes #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
btry wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Invalidate usage_impact if lifespan changes #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion src/UsageInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
use DateInterval;
use DateTime;
use Glpi\Application\View\TemplateRenderer;
use Glpi\DBAL\QueryExpression;
use GlpiPlugin\Carbon\Dashboard\Provider;
use GlpiPlugin\Carbon\Dashboard\Widget;
use GlpiPlugin\Carbon\Impact\Type;
Expand Down Expand Up @@ -134,9 +135,40 @@ public function post_updateItem($history = true)
{
parent::post_updateItem($history);

if (!$history) {
if (!in_array('planned_lifespan', $this->updates)) {
return;
}

// Planned lifespan has been updated
$infocom_table = getTableForItemType(Infocom::class);
$usage_impact_table = getTableForItemType(UsageImpact::class);
$usage_impact = new UsageImpact();
$found = $usage_impact->getFromDBByRequest([
'INNER JOIN' => [
$infocom_table => [
'ON' => [
$infocom_table => 'items_id',
$usage_impact_table => 'items_id',
[
'AND' => [
new QueryExpression(Infocom::getTableField('itemtype') . ' = ' . UsageImpact::getTableField('itemtype')),
],
],
],
],
],
'WHERE' => [
UsageImpact::getTableField('itemtype') => $this->fields['itemtype'],
UsageImpact::getTableField('items_id') => $this->fields['items_id'],
[
'NOT' => ['decommission_date' => null],
],
],
]);
if (!$found) {
return;
}
$usage_impact->update(['recalculate' => 1] + $usage_impact->fields);
}

public function showForItem($ID, $withtemplate = '')
Expand Down
2 changes: 2 additions & 0 deletions tests/src/AbstractTypeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
namespace GlpiPlugin\Carbon\Tests;

use GlpiPlugin\Carbon\AbstractType;
use PHPUnit\Framework\Attributes\CoversClass;
use Session;
use Symfony\Component\DomCrawler\Crawler;

#[CoversClass(AbstractType::class)]
abstract class AbstractTypeTest extends DbTestCase
{
protected static string $glpi_type_itemtype;
Expand Down
46 changes: 46 additions & 0 deletions tests/units/UsageInfoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use Contact;
use DBmysql;
use GlpiPlugin\Carbon\EmbodiedImpact;
use GlpiPlugin\Carbon\UsageImpact;
use GlpiPlugin\Carbon\UsageInfo;
use Infocom;
use Monitor as GlpiMonitor;
Expand Down Expand Up @@ -361,4 +362,49 @@ public function test_getLifespanInHours_returns_hours_when_no_decommission_date_
$result = $usage_info->getLifespanInHours($glpi_computer);
$this->assertSame(43824, $result);
}


public function test_post_updateItem_invalidates_usage_impact_when_decommission_date_is_set_and_planned_lifespan_changes()
{
$glpi_asset = $this->createItem(GlpiComputer::class);
$usage_impact = $this->createItem(UsageImpact::class, [
'itemtype' => get_class($glpi_asset),
'items_id' => $glpi_asset->getID(),
'recalculate' => 0,
]);
$infocom = $this->createItem(Infocom::class, [
'itemtype' => get_class($glpi_asset),
'items_id' => $glpi_asset->getID(),
'decommission_date' => '2026-06-06',
]);
$usage_info = $this->createItem(UsageInfo::class, [
'itemtype' => get_class($glpi_asset),
'items_id' => $glpi_asset->getID(),
]);
$usage_info->update(['planned_lifespan' => 60] + $usage_info->fields);
$usage_impact->getFromDB($usage_impact->getID());
$this->assertSame(1, $usage_impact->fields['recalculate']);
}

public function test_post_updateItem_does_not_invalidate_usage_impact_when_decommission_date_is_not_set()
{
$glpi_asset = $this->createItem(GlpiComputer::class);
$usage_impact = $this->createItem(UsageImpact::class, [
'itemtype' => get_class($glpi_asset),
'items_id' => $glpi_asset->getID(),
'recalculate' => 0,
]);
$infocom = $this->createItem(Infocom::class, [
'itemtype' => get_class($glpi_asset),
'items_id' => $glpi_asset->getID(),
'decommission_date' => null,
]);
$usage_info = $this->createItem(UsageInfo::class, [
'itemtype' => get_class($glpi_asset),
'items_id' => $glpi_asset->getID(),
]);
$usage_info->update(['planned_lifespan' => 60] + $usage_info->fields);
$usage_impact->getFromDB($usage_impact->getID());
$this->assertSame(0, $usage_impact->fields['recalculate']);
}
}