Custom Asset Field Unicity

src/Glpi/Asset/Asset.php

@@ -363,6 +363,13 @@ public function rawSearchOptions()
         return $search_options;
     }
 
+    public function getUnallowedFieldsForUnicity()
+    {
+        $not_allowed = parent::getUnallowedFieldsForUnicity();
+        $not_allowed[] = AssetDefinition::getForeignKeyField();
+        return $not_allowed;
+    }
+
     public static function getSystemSQLCriteria(?string $tablename = null): array
     {
         $table_prefix = $tablename !== null

src/Glpi/Asset/AssetDefinitionManager.php

@@ -177,6 +177,7 @@ private function boostrapConcreteClass(AssetDefinition $definition): void
             'location_types',
             'state_types',
             'ticket_types',
+            'unicity_types'
         ];
         foreach ($config_keys as $config_key) {
             $CFG_GLPI[$config_key][] = $asset_class_name;

tests/functional/Glpi/Asset/Asset.php

@@ -52,6 +52,7 @@ protected function getByIdProvider(): iterable
         for ($i = 0; $i < 2; $i++) {
             $fields = [
                 'name' => 'Foo asset ' . $i,
+                'entities_id' => $this->getTestRootEntity(true),
             ];
             $asset = $this->createItem($foo_classname, $fields);
             yield [
@@ -62,6 +63,7 @@ protected function getByIdProvider(): iterable
 
             $fields = [
                 'name' => 'Bar asset ' . $i,
+                'entities_id' => $this->getTestRootEntity(true),
             ];
             $asset = $this->createItem($bar_classname, $fields);
             yield [
@@ -114,7 +116,10 @@ public function testUpdateWithWrongDefinition(): void
         $definition_2 = $this->initAssetDefinition();
         $classname_2  = $definition_2->getAssetClassName();
 
-        $asset = $this->createItem($classname_1, ['name' => 'new asset']);
+        $asset = $this->createItem($classname_1, [
+            'name' => 'new asset',
+            'entities_id' => $this->getTestRootEntity(true),
+        ]);
 
         $this->exception(
             function () use ($asset, $classname_2) {
@@ -131,7 +136,10 @@ public function testSearchOptionsUnicity(): void
             capacities: array_keys($capacities)
         );
 
-        $asset = $this->createItem($definition->getAssetClassName(), ['name' => 'test asset']);
+        $asset = $this->createItem($definition->getAssetClassName(), [
+            'name' => 'test asset',
+            'entities_id' => $this->getTestRootEntity(true),
+        ]);
 
         $this->when(
             function () use ($asset) {

tests/functional/Glpi/Asset/AssetDefinition.php

@@ -430,6 +430,7 @@ public function testDelete()
             $definition->getAssetClassName(),
             [
                 'name' => 'test',
+                'entities_id' => $this->getTestRootEntity(true),
             ]
         );
 

tests/functional/Glpi/Asset/AssetDefinitionManager.php

@@ -91,6 +91,7 @@ protected function testCommonITILTabRegistrationProvider(): iterable
         // Create a test subject without any linked ITIL items
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
         yield [
             $definition,
@@ -154,6 +155,7 @@ protected function testCommonITILTabRegistrationProvider(): iterable
         // Create a test subject without any linked ITIL items
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
         yield [
             $definition,

tests/functional/Glpi/Asset/Capacity/HasContractsCapacity.php

@@ -106,6 +106,7 @@ public function testContractItemTabRegistration(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Validate that the subject does not have the contract tab, as the
@@ -139,6 +140,7 @@ public function testContractItemDataDeletion(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Create some contracts that are ready to be assigned to our item
@@ -204,6 +206,7 @@ public function testHistoryDataDeletion(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Create a contract
@@ -281,6 +284,7 @@ public function testDisplayPreferencesDataDeletion(): void
         // Create our test subject and enable the capacity
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Set display preferences

tests/functional/Glpi/Asset/Capacity/HasHistoryCapacity.php

@@ -215,6 +215,7 @@ public function testIsUsed(): void
         // Create our test subject
         $asset = $this->createItem($definition->getAssetClassName(), [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Check that the capacity can't be safely disabled

tests/functional/Glpi/Asset/Capacity/HasOperatingSystemCapacity.php

@@ -101,6 +101,7 @@ public function testOperatingSystemTabRegistration(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Validate that the subject does not have the operating system tab,
@@ -143,6 +144,7 @@ public function testSearchOptionRegistration(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
         $base_search_options_count = count($subject->rawSearchOptions());
 
@@ -182,6 +184,7 @@ public function testItemOperatingSystemDataDeletion(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Create an Item_OperatingSystem linked to our asset
@@ -230,6 +233,7 @@ public function testHistoryDataDeletion(): void
         // Create our test subject
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Create and update the linked OS in order to generate history entries
@@ -291,6 +295,7 @@ public function testDisplayPreferencesDataDeletion(): void
         // Create our test subject and enable the capacity
         $subject = $this->createItem($class, [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Set display preferences

tests/functional/Glpi/Asset/Capacity/IsRackableCapacity.php

@@ -288,9 +288,11 @@ public function testGetCapacityUsageDescription(): void
         // Create assets
         $asset1 = $this->createItem($definition->getAssetClassName(), [
             'name' => 'Test asset',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
         $asset2 = $this->createItem($definition->getAssetClassName(), [
             'name' => 'Test asset 2',
+            'entities_id' => $this->getTestRootEntity(true),
         ]);
 
         // Check that the capacity usage description is correct