Fix importExternal for tree dropdowns (#11062)

* Fix importExternal for tree dropdowns

* Merge all extra fields

* Update src/CommonDropdown.php

Co-authored-by: Cédric Anne <cedric.anne@gmail.com>

Co-authored-by: Cédric Anne <cedric.anne@gmail.com>

Author: cconard96

src/CommonDropdown.php

@@ -777,6 +777,9 @@ public function importExternal(
                 $input["name"] = $res_rule["name"];
             }
         }
+        // Merge extra input fields into $input
+        $input += $external_params;
+
         return ($add ? $this->import($input) : $this->findID($input));
     }
 

tests/functionnal/Location.php

@@ -73,4 +73,109 @@ public function testInheritGeolocation()
         $this->string($location3->fields['longitude'])->isEqualTo('2.1734');
         $this->string($location3->fields['altitude'])->isEqualTo('39');
     }
+
+    public function testImportExternal()
+    {
+        $locations_id = \Dropdown::importExternal('Location', 'testImportExternal_1', getItemByTypeName('Entity', '_test_root_entity', true));
+        $this->integer((int) $locations_id)->isGreaterThan(0);
+        // Verify that the location was created
+        $location = new \Location();
+        $location->getFromDB($locations_id);
+        $this->string($location->fields['name'])->isEqualTo('testImportExternal_1');
+
+        // Try importing a location as a child of the location we just created
+        $locations_id_2 = \Dropdown::importExternal('Location', 'testImportExternal_2', getItemByTypeName('Entity', '_test_root_entity', true), [
+            'locations_id' => $locations_id
+        ]);
+        $this->integer((int) $locations_id_2)->isGreaterThan(0);
+        // Verify that the location was created
+        $location = new \Location();
+        $location->getFromDB($locations_id_2);
+        $this->string($location->fields['name'])->isEqualTo('testImportExternal_2');
+        // Verify that the location is a child of the location we just created
+        $this->integer($location->fields['locations_id'])->isEqualTo($locations_id);
+    }
+
+    public function testFindIDByName()
+    {
+        $entities_id = getItemByTypeName('Entity', '_test_root_entity', true);
+
+        // Create a location
+        $location = new \Location();
+        $location_id = $location->add([
+            'name'         => 'testFindIDByName_1',
+            'entities_id'  => $entities_id,
+        ]);
+        $this->integer((int) $location_id)->isGreaterThan(0);
+
+        // Find the location by name
+        $params = [
+            'name' => 'testFindIDByName_1',
+            'entities_id'  => $entities_id,
+        ];
+        $found_location_id = $location->findID($params);
+        $this->integer((int) $found_location_id)->isEqualTo($location_id);
+
+        // Add child location
+        $location_id_2 = $location->add([
+            'locations_id' => $location_id,
+            'name'         => 'testFindIDByName_2',
+            'entities_id'  => $entities_id,
+        ]);
+        $this->integer((int) $location_id_2)->isGreaterThan(0);
+
+        // Find the location by name (and locations_id)
+        $params = [
+            'name' => 'testFindIDByName_2',
+            'locations_id' => $location_id,
+            'entities_id'  => $entities_id,
+        ];
+        $found_location_id = $location->findID($params);
+        $this->integer((int) $found_location_id)->isEqualTo($location_id_2);
+
+        // Verify finding ID with just name won't work for child location
+        $params = [
+            'name' => 'testFindIDByName_2',
+            'entities_id'  => $entities_id,
+        ];
+        $found_location_id = $location->findID($params);
+        $this->integer((int) $found_location_id)->isEqualTo(-1);
+    }
+
+    public function testFindIDByCompleteName()
+    {
+        $entities_id = getItemByTypeName('Entity', '_test_root_entity', true);
+
+        // Create a location
+        $location = new \Location();
+        $location_id = $location->add([
+            'name'         => 'testFindIDByCompleteName_1',
+            'entities_id'  => $entities_id,
+        ]);
+        $this->integer((int) $location_id)->isGreaterThan(0);
+
+        // Find the location by completename
+        $params = [
+            'completename' => 'testFindIDByCompleteName_1',
+            'entities_id'  => $entities_id,
+        ];
+        $found_location_id = $location->findID($params);
+        $this->integer((int) $found_location_id)->isEqualTo($location_id);
+
+        // Create a child location
+        $location_id_2 = $location->add([
+            'locations_id' => $location_id,
+            'name'         => 'testFindIDByCompleteName_2',
+            'entities_id'  => $entities_id,
+        ]);
+        $this->integer((int) $location_id_2)->isGreaterThan(0);
+
+        // Find the location by completename
+        $params = [
+            'completename' => 'testFindIDByCompleteName_1 > testFindIDByCompleteName_2',
+            'entities_id'  => $entities_id,
+        ];
+        $found_location_id = $location->findID($params);
+        $this->integer((int) $found_location_id)->isEqualTo($location_id_2);
+    }
 }