A free open source IT asset/license management system
Fixed #19953 - add additional Snipe-IT native fields to mapping
snipebea0bc917a51
diff --git a/app/SyncAdapters/AppleBusinessManager/AppleBusinessManagerAdapter.php b/app/SyncAdapters/AppleBusinessManager/AppleBusinessManagerAdapter.phpindex 013138311e..0fef4424ce 100644--- a/app/SyncAdapters/AppleBusinessManager/AppleBusinessManagerAdapter.php+++ b/app/SyncAdapters/AppleBusinessManager/AppleBusinessManagerAdapter.php@@ -231,15 +231,15 @@ class AppleBusinessManagerAdapter extends SyncAdapter'abm_part_number' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_part_number'],'abm_color' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_color'],'abm_order_number' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_order_number'],- 'abm_order_date' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_order_date'],+ 'abm_order_date' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_order_date', 'type' => 'date'],'abm_purchase_source_type' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_purchase_source_type'],'abm_purchase_source_id' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_purchase_source_id'],'abm_mdm_server' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_mdm_server'],'abm_applecare_agreement_number' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_agreement_number'],'abm_applecare_status' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_status'],'abm_applecare_payment_type' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_payment_type'],- 'abm_applecare_start_date' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_start_date'],- 'abm_applecare_end_date' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_end_date'],+ 'abm_applecare_start_date' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_start_date', 'type' => 'date'],+ 'abm_applecare_end_date' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_end_date', 'type' => 'date'],'abm_applecare_description' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_description'],'abm_applecare_is_canceled' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_is_canceled', 'type' => 'boolean'],'abm_applecare_is_renewable' => ['label_key' => 'admin/settings/sync_adapters.extra_applecare_is_renewable', 'type' => 'boolean'],@@ -254,8 +254,8 @@ class AppleBusinessManagerAdapter extends SyncAdapter'abm_imei_2' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_imei_2'],'abm_meid' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_meid'],'abm_eid' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_eid'],- 'abm_added_to_org' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_added_to_org'],- 'abm_released_from_org' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_released_from_org'],+ 'abm_added_to_org' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_added_to_org', 'type' => 'date'],+ 'abm_released_from_org' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_released_from_org', 'type' => 'date'],'abm_org_status' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_org_status'],'abm_activation_lock_enabled' => ['label_key' => 'admin/settings/sync_adapters.abm_extra_activation_lock_enabled', 'type' => 'boolean'],// Apple Business Manager's built-in MDM (formerly Applediff --git a/app/SyncAdapters/GoogleWorkspace/GoogleWorkspaceAdapter.php b/app/SyncAdapters/GoogleWorkspace/GoogleWorkspaceAdapter.phpindex ce35a26f3a..af8ccaa7ac 100644--- a/app/SyncAdapters/GoogleWorkspace/GoogleWorkspaceAdapter.php+++ b/app/SyncAdapters/GoogleWorkspace/GoogleWorkspaceAdapter.php@@ -105,7 +105,7 @@ class GoogleWorkspaceAdapter extends SyncAdapter implements PushableAdapter'google_workspace_firmware_version' => ['label_key' => 'admin/settings/sync_adapters.google_workspace_extra_firmware_version'],'google_workspace_ethernet_mac' => ['label_key' => 'admin/settings/sync_adapters.google_workspace_extra_ethernet_mac'],'google_workspace_wifi_mac' => ['label_key' => 'admin/settings/sync_adapters.google_workspace_extra_wifi_mac'],- 'google_workspace_enrollment_time' => ['label_key' => 'admin/settings/sync_adapters.google_workspace_extra_enrollment_time'],+ 'google_workspace_enrollment_time' => ['label_key' => 'admin/settings/sync_adapters.google_workspace_extra_enrollment_time', 'type' => 'date'],'google_workspace_org_unit_path' => ['label_key' => 'admin/settings/sync_adapters.google_workspace_extra_org_unit_path'],];}diff --git a/app/SyncAdapters/Intune/IntuneAdapter.php b/app/SyncAdapters/Intune/IntuneAdapter.phpindex 0aa66d2e1f..49e61eab8c 100644--- a/app/SyncAdapters/Intune/IntuneAdapter.php+++ b/app/SyncAdapters/Intune/IntuneAdapter.php@@ -96,7 +96,7 @@ class IntuneAdapter extends SyncAdapter implements PushableAdapter{return ['intune_compliance_state' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_compliance_state'],- 'intune_enrolled_at' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_enrolled_at'],+ 'intune_enrolled_at' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_enrolled_at', 'type' => 'date'],'intune_management_agent' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_management_agent'],'intune_ownership' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_ownership'],'intune_wifi_mac' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_wifi_mac'],@@ -121,8 +121,8 @@ class IntuneAdapter extends SyncAdapter implements PushableAdapter'intune_android_security_patch_level' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_android_security_patch_level'],'intune_enrollment_profile_name' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_enrollment_profile_name'],'intune_device_enrollment_type' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_device_enrollment_type'],- 'intune_management_certificate_expiration' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_management_certificate_expiration'],- 'intune_compliance_grace_period_expiration' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_compliance_grace_period_expiration'],+ 'intune_management_certificate_expiration' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_management_certificate_expiration', 'type' => 'date'],+ 'intune_compliance_grace_period_expiration' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_compliance_grace_period_expiration', 'type' => 'date'],'intune_device_registration_state' => ['label_key' => 'admin/settings/sync_adapters.intune_extra_device_registration_state'],// Comma-joined roleScopeTagIds the device belongs to in// Intune. Admins who use scope tags for RBAC separationdiff --git a/app/SyncAdapters/Jamf/JamfAdapter.php b/app/SyncAdapters/Jamf/JamfAdapter.phpindex 7c700ab604..dff124162b 100644--- a/app/SyncAdapters/Jamf/JamfAdapter.php+++ b/app/SyncAdapters/Jamf/JamfAdapter.php@@ -69,7 +69,7 @@ class JamfAdapter extends SyncAdapter implements PushableAdapter{return ['jamf_udid' => ['label_key' => 'admin/settings/sync_adapters.extra_udid'],- 'jamf_last_enrolled' => ['label_key' => 'admin/settings/sync_adapters.extra_last_enrolled'],+ 'jamf_last_enrolled' => ['label_key' => 'admin/settings/sync_adapters.extra_last_enrolled', 'type' => 'date'],'jamf_model_identifier' => ['label_key' => 'admin/settings/sync_adapters.extra_model_identifier'],// Mobile-only fields. Blank on computer records so admins// can still map them without worrying about overwriting adiff --git a/app/SyncAdapters/MappingTargets.php b/app/SyncAdapters/MappingTargets.phpindex dd75e65937..9082e764d4 100644--- a/app/SyncAdapters/MappingTargets.php+++ b/app/SyncAdapters/MappingTargets.php@@ -102,6 +102,8 @@ class MappingTargetsreturn match ($type) {'native' => match ($id) {'purchase_date', 'order_number' => trans('general.' . $id),+ 'model_number' => trans('general.model_no'),+ 'eol_date' => trans('admin/hardware/form.eol_date'),default => trans('admin/settings/sync_adapters.target_native_' . $id),},'external' => trans('admin/settings/sync_adapters.target_external_'.$id),@@ -133,40 +135,44 @@ class MappingTargets{$options = [];- // Adapter-declared text-type extras can also route into native- // asset columns that hold arbitrary strings. Admins whose- // vendor stores per-device metadata in a labels / blueprint /- // team field may want that landing in asset_tag or notes- // rather than a custom field. asset_tag is uniqueness-- // constrained so the sync path relies on the vendor value- // being unique per host when this target is picked. native:- // model is here so admins can route a vendor's friendlier- // "marketing name" field (Fleet's hardware_marketing_name,- // ABM's deviceModel) to the standard AssetModel column when- // the vendor's default `hardwareModel` value would be the- // less-friendly SMBIOS identifier or SKU. Not appropriate- // for list-typed extras like fleet_labels which stringify to- // comma-joined sets. Boolean-typed extras stay custom-only- // because no native asset column carries a boolean semantic.- // Admin-defined extras stay custom-only for the same reason- // (arbitrary tenant-labeled data doesn't belong in native- // slots).- if ($type !== 'boolean' && ! $adminDefined) {- foreach (['asset_tag', 'model', 'notes', 'purchase_date', 'order_number'] as $nativeColumn) {- $options['native:' . $nativeColumn] = self::labelFor('native:' . $nativeColumn);+ // Target pool is scoped by extra type so a non-date vendor+ // value can't be routed into a Snipe-IT date column.+ // text natives:+ // asset_tag, model, model_number, notes, order_number.+ // model_number updates the resolved AssetModel. model lands+ // on AssetModel.name via resolveModelIdByName.+ //+ // date natives:+ // purchase_date, eol_date. eol_date sets eol_explicit so+ // the derived "purchase_date + model.eol" default yields+ // to the sync-sourced value.+ //+ // boolean native: byod.+ //+ // Admin-defined extras stay custom-only across every type+ // because arbitrary tenant-labeled data doesn't carry a+ // semantic that maps to native asset columns.+ if (!$adminDefined) {+ if ($type === 'boolean') {+ $options['native:byod'] = self::labelFor('native:byod');+ } else {+ if ($type === 'date') {+ foreach (['purchase_date', 'eol_date'] as $nativeColumn) {+ $options['native:' . $nativeColumn] = self::labelFor('native:' . $nativeColumn);+ }+ }+ foreach (['asset_tag', 'model', 'model_number', 'notes', 'order_number'] as $nativeColumn) {+ $options['native:' . $nativeColumn] = self::labelFor('native:' . $nativeColumn);+ }}}- // Boolean-typed extras only have one native column that matches- // (assets.byod). Admin-defined boolean extras stay custom-only- // because arbitrary tenant-labeled toggles don't have a- // universal semantic mapping to native columns.- if ($type === 'boolean' && ! $adminDefined) {- $options['native:byod'] = trans('admin/settings/sync_adapters.target_native_byod');- }-+ // Date extras can also land in text custom fields (ISO date+ // strings are text-shaped), so merge the two pools for the+ // date type. Boolean stays checkbox-only.$customFields = match ($type) {'boolean' => self::checkboxCustomFields(),+ 'date' => self::dateLikeCustomFields()->concat(self::textLikeCustomFields())->unique('id')->sortBy('name')->values(),default => self::textLikeCustomFields(),};@@ -229,4 +235,19 @@ class MappingTargets->orderBy('name')->get();}++ /**+ * Date-shaped custom fields, used as the target pool for date-+ * typed extras (AppleCare end date, enrollment time, management-+ * certificate expiration, etc).+ *+ * @return \Illuminate\Support\Collection<int, CustomField>+ */+ private static function dateLikeCustomFields(): \Illuminate\Support\Collection+ {+ return CustomField::query()+ ->whereIn('element', ['date_picker', 'datetime_picker'])+ ->orderBy('name')+ ->get();+ }}diff --git a/app/SyncAdapters/Mosyle/MosyleAdapter.php b/app/SyncAdapters/Mosyle/MosyleAdapter.phpindex 99d46cd1ee..9d72a4a31e 100644--- a/app/SyncAdapters/Mosyle/MosyleAdapter.php+++ b/app/SyncAdapters/Mosyle/MosyleAdapter.php@@ -222,7 +222,7 @@ class MosyleAdapter extends SyncAdapter implements PushableAdapter'mosyle_activation_lock_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_activation_lock_enabled', 'type' => 'boolean'],'mosyle_device_locator_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_device_locator_enabled', 'type' => 'boolean'],'mosyle_cloud_backup_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_cloud_backup_enabled', 'type' => 'boolean'],- 'mosyle_last_cloud_backup_date' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_last_cloud_backup_date'],+ 'mosyle_last_cloud_backup_date' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_last_cloud_backup_date', 'type' => 'date'],'mosyle_sip_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_sip_enabled', 'type' => 'boolean'],'mosyle_device_attestation_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_device_attestation_status'],// MDM / lifecycle@@ -230,8 +230,8 @@ class MosyleAdapter extends SyncAdapter implements PushableAdapter'mosyle_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_status'],'mosyle_management_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_management_status'],'mosyle_os_update_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_os_update_status'],- 'mosyle_date_last_beat' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_beat'],- 'mosyle_date_last_push' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_push'],+ 'mosyle_date_last_beat' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_beat', 'type' => 'date'],+ 'mosyle_date_last_push' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_push', 'type' => 'date'],'mosyle_user_id' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_user_id'],'mosyle_supervised' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_supervised', 'type' => 'boolean'],// User / scopingdiff --git a/app/SyncAdapters/MosyleBusiness/MosyleBusinessAdapter.php b/app/SyncAdapters/MosyleBusiness/MosyleBusinessAdapter.phpindex eef3689ca6..0893a2342a 100644--- a/app/SyncAdapters/MosyleBusiness/MosyleBusinessAdapter.php+++ b/app/SyncAdapters/MosyleBusiness/MosyleBusinessAdapter.php@@ -97,7 +97,7 @@ class MosyleBusinessAdapter extends SyncAdapter implements PushableAdapter'mosyle_activation_lock_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_activation_lock_enabled', 'type' => 'boolean'],'mosyle_device_locator_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_device_locator_enabled', 'type' => 'boolean'],'mosyle_cloud_backup_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_cloud_backup_enabled', 'type' => 'boolean'],- 'mosyle_last_cloud_backup_date' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_last_cloud_backup_date'],+ 'mosyle_last_cloud_backup_date' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_last_cloud_backup_date', 'type' => 'date'],'mosyle_sip_enabled' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_sip_enabled', 'type' => 'boolean'],'mosyle_device_attestation_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_device_attestation_status'],// MDM / lifecycle@@ -105,8 +105,8 @@ class MosyleBusinessAdapter extends SyncAdapter implements PushableAdapter'mosyle_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_status'],'mosyle_management_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_management_status'],'mosyle_os_update_status' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_os_update_status'],- 'mosyle_date_last_beat' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_beat'],- 'mosyle_date_last_push' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_push'],+ 'mosyle_date_last_beat' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_beat', 'type' => 'date'],+ 'mosyle_date_last_push' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_date_last_push', 'type' => 'date'],'mosyle_user_id' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_user_id'],'mosyle_supervised' => ['label_key' => 'admin/settings/sync_adapters.mosyle_extra_supervised', 'type' => 'boolean'],// User / scopingdiff --git a/app/SyncAdapters/SyncsHostFromRecord.php b/app/SyncAdapters/SyncsHostFromRecord.phpindex f46e192b02..6b1a31bd97 100644--- a/app/SyncAdapters/SyncsHostFromRecord.php+++ b/app/SyncAdapters/SyncsHostFromRecord.php@@ -615,7 +615,7 @@ trait SyncsHostFromRecord$asset->company_id = self::resolveCompanyId($record, $instance);// Set serial before save because Asset::save() adds a `required`// rule to the serial field when the resolved model has- // require_serial = 1.+ // require_serial = 1.$asset->serial = $record->hardwareSerial;// Asset uses ValidatingTrait, so save() returns false on// validation failure without throwing. Without this guard the@@ -917,6 +917,39 @@ trait SyncsHostFromRecord$asset->order_number = (string) $value;}break;+ case 'eol_date':+ // Vendor-sourced EOL. Set eol_explicit so the Asset+ // eolDate accessor honors this value over the derived+ // "purchase_date + model.eol months" default.+ if ($value !== null && $value !== '') {+ try {+ $asset->asset_eol_date = \Carbon\Carbon::parse((string) $value)->timezone(config('app.timezone'))->format('Y-m-d');+ $asset->eol_explicit = true;+ } catch (\Exception $e) {+ Log::channel('sync-adapters')->warning("Skipping unparseable eol_date \"{$value}\" for asset {$asset->id}: ".$e->getMessage());+ }+ }+ break;+ case 'model_number':+ // Writes to the resolved AssetModel row, not the asset.+ $modelNumber = is_string($value) ? trim($value) : $value;+ if ($modelNumber === null || $modelNumber === '' || $asset->model_id === null) {+ break;+ }+ $assetModel = AssetModel::find($asset->model_id);+ if ($assetModel === null) {+ break;+ }+ if ($assetModel->model_number === $modelNumber) {+ break;+ }+ $assetModel->model_number = $modelNumber;+ try {+ $assetModel->save();+ } catch (\Exception $e) {+ Log::channel('sync-adapters')->warning("Skipping model_number update \"{$modelNumber}\" for AssetModel {$assetModel->id}: ".$e->getMessage());+ }+ break;}}diff --git a/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php b/tests/Feature/SyncAdapters/ExtraFieldMappingTest.phpindex aecfbc128d..f9ac523c03 100644--- a/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php+++ b/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php@@ -108,9 +108,11 @@ class ExtraFieldMappingTest extends TestCase]);}- public function test_extra_field_options_include_native_and_custom_targets_for_text_type()+ public function test_text_extra_field_options_include_text_natives_but_not_date_or_boolean_targets(){CustomField::factory()->create(['element' => 'text', 'name' => 'Team Assignment']);+ CustomField::factory()->create(['element' => 'date_picker', 'name' => 'Warranty Expires']);+ CustomField::factory()->create(['element' => 'checkbox', 'name' => 'Flagged']);$options = MappingTargets::optionsForExtra('text');@@ -119,38 +121,85 @@ class ExtraFieldMappingTest extends TestCase// available list, not as a committed row with target='skip'.$this->assertArrayNotHasKey('skip', $options);- // Text-type extras can route to native asset_tag / model /- // notes so admins whose vendor stores per-device metadata in- // labels / blueprints / teams / marketing names can land it- // in a native column instead of forcing a custom field.- // Everything else must be custom:{id}.+ // Text-type extras route to text-shaped native asset columns+ // only. Date and boolean targets are excluded (#19953): an+ // ABM Product Family (text) must not be mappable to EOL Date.$this->assertArrayHasKey('native:asset_tag', $options);$this->assertArrayHasKey('native:model', $options);+ $this->assertArrayHasKey('native:model_number', $options);$this->assertArrayHasKey('native:notes', $options);- $this->assertArrayHasKey('native:purchase_date', $options);$this->assertArrayHasKey('native:order_number', $options);- $nativeTargets = ['native:asset_tag', 'native:model', 'native:notes', 'native:purchase_date', 'native:order_number'];- foreach (array_keys($options) as $target) {- if (in_array($target, $nativeTargets, true)) {- continue;+ $this->assertArrayNotHasKey('native:purchase_date', $options);+ $this->assertArrayNotHasKey('native:eol_date', $options);+ $this->assertArrayNotHasKey('native:byod', $options);++ // Date and checkbox custom fields must not appear in the text+ // pool either.+ foreach ($options as $target => $label) {+ if (str_starts_with($target, 'custom:')) {+ $this->assertStringNotContainsString('Warranty Expires', $label);+ $this->assertStringNotContainsString('Flagged', $label);+ }+ }+ }++ public function test_date_extra_field_options_include_date_natives_text_natives_and_both_text_and_date_custom_fields()+ {+ // Date extras route to date-shaped targets AND fall through+ // to text ones so admins can keep landing an ISO date string+ // in notes or a text custom field for display reasons. Only+ // non-date extras are blocked from date targets.+ CustomField::factory()->create(['element' => 'text', 'name' => 'Team Assignment']);+ CustomField::factory()->create(['element' => 'date_picker', 'name' => 'Warranty Expires']);+ CustomField::factory()->create(['element' => 'datetime_picker', 'name' => 'Last Audit']);+ CustomField::factory()->create(['element' => 'checkbox', 'name' => 'Flagged']);++ $options = MappingTargets::optionsForExtra('date');++ $this->assertArrayHasKey('native:purchase_date', $options);+ $this->assertArrayHasKey('native:eol_date', $options);+ $this->assertArrayHasKey('native:asset_tag', $options);+ $this->assertArrayHasKey('native:model', $options);+ $this->assertArrayHasKey('native:notes', $options);++ $customLabels = [];+ foreach ($options as $target => $label) {+ if (str_starts_with($target, 'custom:')) {+ $customLabels[] = $label;}- $this->assertStringStartsWith('custom:', $target);+ }+ $this->assertStringContainsString('Team Assignment', implode(' ', $customLabels));+ $this->assertStringContainsString('Warranty Expires', implode(' ', $customLabels));+ $this->assertStringContainsString('Last Audit', implode(' ', $customLabels));+ foreach ($customLabels as $label) {+ $this->assertStringNotContainsString('Flagged', $label);}}public function test_boolean_extra_field_options_stay_custom_only(){CustomField::factory()->create(['element' => 'checkbox', 'name' => 'Flagged']);+ CustomField::factory()->create(['element' => 'text', 'name' => 'Team Assignment']);+ CustomField::factory()->create(['element' => 'date_picker', 'name' => 'Warranty Expires']);$options = MappingTargets::optionsForExtra('boolean');- // Boolean-typed extras stay custom-fields-only because no- // native asset column carries a boolean semantic. Also no+ // Boolean-typed extras route to byod only on the native side,+ // and checkbox custom fields only on the custom side. Also no// 'skip' entry: unmap via ×, not via a stored 'skip' target.$this->assertArrayNotHasKey('skip', $options);+ $this->assertArrayHasKey('native:byod', $options);$this->assertArrayNotHasKey('native:asset_tag', $options);$this->assertArrayNotHasKey('native:model', $options);$this->assertArrayNotHasKey('native:notes', $options);+ $this->assertArrayNotHasKey('native:purchase_date', $options);+ $this->assertArrayNotHasKey('native:eol_date', $options);++ foreach ($options as $target => $label) {+ if (str_starts_with($target, 'custom:')) {+ $this->assertSame('Target: Flagged', $label);+ }+ }}public function test_extra_can_route_to_native_purchase_date()@@ -245,6 +294,137 @@ class ExtraFieldMappingTest extends TestCase]);}+ public function test_extra_can_route_to_native_eol_date()+ {+ // Repro of issue #19953: AppleCare End Date (text-shaped extra+ // from the ABM adapter, delivered as YYYY-MM-DD after Carbon+ // normalization) now lands in Snipe-IT's asset_eol_date column+ // with eol_explicit set so the eolDate accessor returns the+ // vendor-sourced value.+ $fleet = $this->configuredFleetInstance();+ SyncAdapterConfig::put($fleet->id, 'mapping.fleet_team', 'native:eol_date');++ $record = new \App\SyncAdapters\HostInventoryRecord(+ sourceKey: 'fleet',+ sourceId: 'eol-1',+ hostname: 'host-eol',+ hardwareSerial: 'SN-EOL',+ hardwareModel: 'MacBook Pro',+ extra: ['fleet_team' => '2027-09-30'],+ );++ SyncAdapter::syncFromRecord($record);++ $this->assertDatabaseHas('assets', [+ 'name' => 'host-eol',+ 'asset_eol_date' => '2027-09-30',+ 'eol_explicit' => 1,+ ]);+ }++ public function test_eol_date_accepts_iso_8601_datetime()+ {+ // ABM's AppleCare endDateTime arrives as ISO 8601 with a time+ // component. Mirrors the purchase_date normalization: we strip+ // to YYYY-MM-DD after an app-timezone rotation.+ $fleet = $this->configuredFleetInstance();+ SyncAdapterConfig::put($fleet->id, 'mapping.fleet_team', 'native:eol_date');++ $record = new \App\SyncAdapters\HostInventoryRecord(+ sourceKey: 'fleet',+ sourceId: 'eol-2',+ hostname: 'host-eol-iso',+ hardwareSerial: 'SN-EOL-ISO',+ hardwareModel: 'MacBook Pro',+ extra: ['fleet_team' => '2027-09-30T00:00:00Z'],+ );++ SyncAdapter::syncFromRecord($record);++ $this->assertDatabaseHas('assets', [+ 'name' => 'host-eol-iso',+ 'asset_eol_date' => '2027-09-30',+ ]);+ }++ public function test_unparseable_eol_date_is_skipped_not_crashed()+ {+ $fleet = $this->configuredFleetInstance();+ SyncAdapterConfig::put($fleet->id, 'mapping.fleet_team', 'native:eol_date');++ $record = new \App\SyncAdapters\HostInventoryRecord(+ sourceKey: 'fleet',+ sourceId: 'eol-bad',+ hostname: 'host-eol-bad',+ hardwareSerial: 'SN-EOL-BAD',+ hardwareModel: 'MacBook Pro',+ extra: ['fleet_team' => 'not-a-date'],+ );++ SyncAdapter::syncFromRecord($record);++ $this->assertDatabaseHas('assets', ['name' => 'host-eol-bad']);+ $this->assertDatabaseMissing('assets', ['name' => 'host-eol-bad', 'asset_eol_date' => 'not-a-date']);+ }++ public function test_extra_can_route_to_native_model_number()+ {+ // Repro of issue #19953: ABM Part Number lands on the resolved+ // AssetModel row's model_number column. The normalized `model`+ // field writes first (resolveModelIdByName creates or matches+ // the AssetModel), then the extras pass updates its+ // model_number.+ $fleet = $this->configuredFleetInstance();+ SyncAdapterConfig::put($fleet->id, 'mapping.fleet_team', 'native:model_number');++ $record = new \App\SyncAdapters\HostInventoryRecord(+ sourceKey: 'fleet',+ sourceId: 'mn-1',+ hostname: 'host-mn',+ hardwareSerial: 'SN-MN',+ hardwareModel: 'MacBook Pro',+ extra: ['fleet_team' => 'MXTM3LL/A'],+ );++ SyncAdapter::syncFromRecord($record);++ $this->assertDatabaseHas('models', [+ 'name' => 'MacBook Pro',+ 'model_number' => 'MXTM3LL/A',+ ]);+ }++ public function test_model_number_write_reuses_existing_asset_model_when_value_matches()+ {+ // Second sync of the same device must not touch the AssetModel+ // row when the model_number already matches. Skipping the save+ // keeps every sync pass idempotent against the Watson+ // name+model_number uniqueness rule, which otherwise fires+ // against the row itself.+ $fleet = $this->configuredFleetInstance();+ SyncAdapterConfig::put($fleet->id, 'mapping.fleet_team', 'native:model_number');++ $record = new \App\SyncAdapters\HostInventoryRecord(+ sourceKey: 'fleet',+ sourceId: 'mn-idempotent',+ hostname: 'host-mn-idem',+ hardwareSerial: 'SN-MN-IDEM',+ hardwareModel: 'MacBook Air',+ extra: ['fleet_team' => 'MLY33LL/A'],+ );++ SyncAdapter::syncFromRecord($record);+ SyncAdapter::syncFromRecord($record);++ $this->assertSame(+ 1,+ \App\Models\AssetModel::where('name', 'MacBook Air')+ ->where('model_number', 'MLY33LL/A')+ ->count(),+ 'Second sync pass must not create a duplicate AssetModel row.',+ );+ }+public function test_asset_tag_native_target_overwrites_the_asset_tag_column(){$fleet = $this->configuredFleetInstance();