fix search SQL issues with custom assets

Author: cconard96

phpunit/functional/Glpi/Api/HL/Controller/AssetControllerTest.php

@@ -34,6 +34,7 @@
 
 namespace tests\units\Glpi\Api\HL\Controller;
 
+use Glpi\Asset\Asset;
 use Glpi\Http\Request;
 use PHPUnit\Framework\Attributes\DataProvider;
 
@@ -44,6 +45,9 @@ public function testIndex()
         global $CFG_GLPI;
         $types = $CFG_GLPI['asset_types'];
 
+        // Ignore custom assets
+        $types = array_filter($types, static fn($t) => !is_subclass_of($t, Asset::class));
+
         $this->login();
         $this->api->call(new Request('GET', '/Assets'), function ($call) use ($types) {
             /** @var \HLAPICallAsserter $call */

phpunit/functional/Glpi/Migration/GenericobjectPluginMigrationTest.php

@@ -50,6 +50,7 @@
 use Glpi\Asset\Capacity\HasNotepadCapacity;
 use Glpi\Asset\Capacity\IsProjectAssetCapacity;
 use Glpi\Asset\Capacity\IsReservableCapacity;
+use Glpi\DBAL\QueryExpression;
 use Glpi\Dropdown\DropdownDefinition;
 use Glpi\Migration\GenericobjectPluginMigration;
 use Glpi\Migration\PluginMigrationResult;
@@ -94,6 +95,8 @@ public function setUp(): void
 
         parent::setUp();
 
+        $DB->delete(AssetDefinition::getTable(), [new QueryExpression('true')]);
+
         // Load it inside the test DB transaction to not have to clean it manually
         $queries = $DB->getQueriesFromFile(sprintf('%s/tests/fixtures/genericobject-migration/glpi-data.sql', GLPI_ROOT));
         foreach ($queries as $query) {
@@ -859,6 +862,7 @@ private function checkItems(string $class, array $expected_items): void
                 }
             }
         }
+
         $this->assertEquals(
             \count($expected_items),
             \countElementsInTable($class::getTable(), $class::getSystemSqlCriteria())

phpunit/functional/HtmlTest.php

@@ -275,6 +275,7 @@ public function testGetMenuInfos()
             'PassiveDCEquipment',
             'Unmanaged',
             'Cable',
+            'Glpi\CustomAsset\Test01',
             'Item_DeviceSimcard',
         ];
         $this->assertSame('Assets', $menu['assets']['title']);

src/Glpi/Asset/Asset.php

@@ -267,15 +267,14 @@ public function rawSearchOptions()
             'id'                 => '49',
             'table'              => Group::getTable(),
             'field'              => 'completename',
-            'linkfield'          => 'groups_id_tech',
             'name'               => __('Group in charge of the hardware'),
             'condition'          => ['is_assign' => 1],
             'joinparams'         => [
                 'beforejoin'         => [
                     'table'              => 'glpi_groups_items',
                     'joinparams'         => [
                         'jointype'           => 'itemtype_item',
-                        'condition'          => ['NEWTABLE.type' => Group_Item::GROUP_TYPE_NORMAL],
+                        'condition'          => ['NEWTABLE.type' => Group_Item::GROUP_TYPE_TECH],
                     ],
                 ],
             ],

src/Glpi/Search/Provider/SQLProvider.php

@@ -4571,9 +4571,10 @@ public static function constructAdditionalSqlForMetacriteria(
                 $sopt["joinparams"]
             );
 
+            $ref_table = $m_itemtype::getTable() . self::getMetaTableUniqueSuffix($m_itemtype::getTable(), $m_itemtype);
             $FROM .= \Search::addLeftJoin(
                 $m_itemtype,
-                $m_itemtype::getTable(),
+                $ref_table,
                 $already_link_tables,
                 $sopt["table"],
                 $sopt["linkfield"],

tests/src/autoload/functions.php

@@ -683,6 +683,36 @@ function loadDataset()
                 'entities_id' => '_test_root_entity',
             ],
         ],
+        'Glpi\\Asset\\AssetDefinition' => [
+            [
+                'system_name' => 'Test01',
+                'icon' => 'ti ti-test-pipe',
+                'label' => 'Test01',
+                'is_active' => 1,
+                'profiles' => ['4' => ALLSTANDARDRIGHT | READ_ASSIGNED | UPDATE_ASSIGNED | READ_OWNED | UPDATE_OWNED],
+            ],
+        ],
+        'Glpi\\Asset\\CustomFieldDefinition' => [
+            [
+                'system_name' => 'teststring',
+                'assets_assetdefinitions_id' => 'Test01',
+                'label' => 'Test String',
+                'type' => 'Glpi\\Asset\\CustomFieldType\\StringType',
+                'field_options' => '{"full_width":"0","readonly":"0","required":"0"}',
+            ],
+        ],
+        'Glpi\\CustomAsset\\Test01' => [
+            [
+                'name' => 'TestA',
+                'entities_id' => '_test_root_entity',
+                'custom_teststring' => 'Test String A',
+            ],
+            [
+                'name' => 'TestB',
+                'entities_id' => '_test_root_entity',
+                'custom_teststring' => 'Test String B',
+            ],
+        ],
     ];
 
     // To bypass various right checks