Skip to content

A free open source IT asset/license management system

Add pipe separator to import more than one company for a user

snipecacd6f7e9ba7
diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index 1deab4c3bd..a2bedb5b48 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -35,6 +35,31 @@ class UserImporter extends ItemImporter
$this->createUserIfNotExists($row);
}
+ /**
+ * Parse a pipe-separated company column value into an array of company IDs,
+ * creating companies that do not yet exist. Returns an empty array when the
+ * raw value is blank (so callers can treat that as "don't change").
+ *
+ * @param string $raw Raw cell value, e.g. "Acme Corp|Widget Inc"
+ * @return int[]
+ */
+ private function resolveCompanyIds(string $raw): array
+ {
+ if ($raw === '') {
+ return [];
+ }
+
+ $ids = [];
+ foreach (array_filter(array_map('trim', explode('|', $raw))) as $name) {
+ $id = $this->createOrFetchCompany($name);
+ if ($id) {
+ $ids[] = (int) $id;
+ }
+ }
+
+ return $ids;
+ }
+
/**
* Create a user if a duplicate does not exist.
*
@@ -80,6 +105,16 @@ class UserImporter extends ItemImporter
$this->item['department_id'] = $this->createOrFetchDepartment($user_department);
}
+ // Resolve pipe-separated company names (e.g. "Acme Corp|Widget Inc") into IDs.
+ // parent::handle() already ran createOrFetchCompany() on the raw unsplit string, so
+ // we override company_id here with the correct first-company ID and keep all IDs for
+ // pivot sync after save.
+ $companyRaw = trim($this->findCsvMatch($row, 'company'));
+ $companyIds = $this->resolveCompanyIds($companyRaw);
+ if (! empty($companyIds)) {
+ $this->item['company_id'] = $companyIds[0];
+ }
+
if (is_null($this->item['username']) || $this->item['username'] == '') {
$user_full_name = $this->item['first_name'].' '.$this->item['last_name'];
$user_formatted_array = User::generateFormattedNameFromFullName($user_full_name, Setting::getSettings()->username_format);
@@ -116,6 +151,11 @@ class UserImporter extends ItemImporter
// Why do we have to do this twice? Update should
$user->save();
+ // Sync company pivot when companies were specified in this row.
+ if (! empty($companyIds)) {
+ $user->companies()->sync($companyIds);
+ }
+
// Update the location of any assets checked out to this user
Asset::where('assigned_type', User::class)
->where('assigned_to', $user->id)
@@ -140,6 +180,13 @@ class UserImporter extends ItemImporter
if ($user->save()) {
$this->log('User '.$this->item['name'].' was created');
+ // Sync all resolved companies to the pivot. For single-company rows the
+ // User::created event already added company_id; sync() here is idempotent
+ // for that case and adds any additional companies for multi-company rows.
+ if (! empty($companyIds)) {
+ $user->companies()->sync($companyIds);
+ }
+
if (($user->email) && ($user->activated == '1')) {
if ($this->send_welcome) {