fix(Impact\Embodied\Boavizta): service version not saved in DB

Author: btry

setup.php

@@ -31,7 +31,6 @@
  */
 
 use Config as GlpiConfig;
-use CommonDBTM;
 use GlpiPlugin\Carbon\Dashboard\Widget;
 use Glpi\Plugin\Hooks;
 use GlpiPlugin\Carbon\Config;

src/Impact/Embodied/AbstractEmbodiedImpact.php

@@ -69,6 +69,8 @@ public function __construct()
         }
     }
 
+    abstract protected function getVersion(): string;
+
     /**
      * Get the unit of an impact
      *
@@ -200,7 +202,7 @@ public function evaluateItem(int $id): bool
         $impact_types = Type::getImpactTypes();
 
         $input['engine'] = $this->engine;
-        $input['engine_version'] = $this->engine_version;
+        $input['engine_version'] = $this->getVersion();
 
         // Prepare inputs for add or update
         foreach ($impacts as $type => $value) {
@@ -245,7 +247,10 @@ public function getEvaluableQuery(array $crit = [], bool $entity_restrict = true
         // }
 
         $crit[] = [
-            $item_type_table . '.is_ignore' => false,
+            'OR' => [
+                $item_type_table . '.is_ignore' => 0,
+                $item_type_table . '.id' => null,
+            ]
         ];
 
         $request = [

src/Impact/Embodied/Boavizta/AbstractAsset.php

@@ -80,6 +80,10 @@ public function setClient(Boaviztapi $client)
 
     protected function getVersion(): string
     {
+        if ($this->engine_version !== 'unknown') {
+            return $this->engine_version;
+        }
+
         try {
             $response = $this->client->get('utils/version');
         } catch (\RuntimeException $e) {
@@ -93,8 +97,8 @@ protected function getVersion(): string
             ), E_USER_WARNING);
             throw new \RuntimeException('Invalid response from Boavizta API');
         }
-
-        return $response[0];
+        $this->engine_version = $response[0];
+        return $this->engine_version;
     }
 
     protected function query($description): array

src/Impact/Embodied/Internal/AbstractAsset.php

@@ -41,4 +41,9 @@ abstract class AbstractAsset extends AbstractEmbodiedImpact
 
     /** @var string $engine_version Version of the calculation engine */
     protected string $engine_version = '1';
+
+    protected function getVersion(): string
+    {
+        return $this->engine_version;
+    }
 }

tests/units/CronTaskTest.php

@@ -100,13 +100,15 @@ public function testFillIncompleteLocations()
     {
         $cron_task = new CronTask();
         $glpi_cron_task = new GlpiCronTask();
-        $glpi_cron_task->getFromDBByCrit([
-            'itemtype' => get_class($cron_task),
-            'name'     => 'LocationCountryCode',
+        $glpi_cron_task = $this->getItem(GlpiCronTask::class, [
+            'WHERE' => [
+                'itemtype' => CronTask::class,
+                'name'     => 'LocationCountryCode',
+            ]
         ]);
 
         // Mock the getGeocoder method to return a callable that simulates geocoding
-        $geocoder_collection = new AddressCollection([
+        $address_collection = new AddressCollection([
             new NominatimAddress(
                 '',
                 new AdminLevelCollection([
@@ -127,7 +129,7 @@ public function testFillIncompleteLocations()
             ),
         ]);
         $geocoder = $this->createStub(Geocoder::class);
-        $geocoder->method('geocodeQuery')->willReturn($geocoder_collection);
+        $geocoder->method('geocodeQuery')->willReturn($address_collection);
         $cron_task->setGeocoder(function () use ($geocoder) {
             return $geocoder;
         });