fix: purchase_date wire format; skip Configurator order info

Two fixes for syncing order info to Snipe-IT's native purchase_date and
order_number fields (introduced in v1.7.0):

1. purchase_date serialization

Upstream go-snipeit's SnipeTime.MarshalJSON unconditionally emits
"YYYY-MM-DD HH:MM:SS" (datetime), but Snipe-IT's purchase_date validator
only accepts "YYYY-MM-DD" (date-only). Every PATCH was rejected with
"The purchase date must be a valid date in YYYY-MM-DD format".

Routed purchase_date through asset.CustomFields["purchase_date"] as a
plain "YYYY-MM-DD" string. Upstream Asset.MarshalJSON flattens
CustomFields to top-level keys *after* the native PurchaseDate line, so
the plain string overrides the bad SnipeTime serialization. Snipe-IT
still routes the "purchase_date" key to its native column.

Will be removed once upstream serializes date-only fields correctly.

2. Configurator-enrolled devices overwrite real purchase data

Devices added to ABM via Apple Configurator have
purchaseSourceType=MANUALLY_ADDED. ABM returns a synthetic order number
like "CE-2024-12-13-04-11-12-826" and the enrollment date as
orderDateTime — NOT the real purchase data. Syncing these overwrote
real reseller order numbers and purchase dates that were already
correct in Snipe-IT.

Skip order_date and order_number for MANUALLY_ADDED devices by default.
New opt-in flag sync.sync_configurator_order_info bypasses the skip
if you actually want the Configurator metadata synced.

Bonus: new flag sync.preserve_order_info_on_update never overwrites
existing purchase_date / order_number on update (first-time syncs still
write them), so manual corrections in Snipe-IT survive future re-runs.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: robbiet480

README.md

@@ -180,6 +180,8 @@ axm2snipe request https://mdmenrollment.apple.com/server/devices
 | `sync.model_images` | Fetch device images from appledb.dev for newly created models (default: false) |
 | `sync.supplier_mapping` | Map ABM/ASM purchase source IDs/types to Snipe-IT supplier IDs |
 | `sync.field_mapping` | Map Snipe-IT fields to ABM/AppleCare source values |
+| `sync.preserve_order_info_on_update` | Never overwrite existing `purchase_date` / `order_number` on update. First-time syncs still populate them. (default: false) |
+| `sync.sync_configurator_order_info` | Sync ABM's `order_date` / `order_number` for devices added via Apple Configurator (`purchaseSourceType=MANUALLY_ADDED`). Off by default because ABM emits a synthetic `CE-YYYY-MM-DD-...` enrollment ID, not the real purchase info. (default: false) |
 | `snipe_it.computer_category_id` | Category ID for Mac models (overrides `category_id` for Macs) |
 | `snipe_it.mobile_category_id` | Category ID for iPhone/iPad/Watch/Vision models |
 | `snipe_it.custom_fieldset_id` | Fieldset ID to attach to auto-created models |

config/config.go

@@ -65,6 +65,8 @@ type SyncConfig struct {
 	MDMOnlyCache     bool              `yaml:"mdm_only_cache"`    // also exclude non-MDM devices from cache (requires mdm_only)
 	SupplierMapping  map[string]int    `yaml:"supplier_mapping"`  // ABM purchaseSourceId or purchaseSourceType -> snipe supplier ID
 	ModelImages        bool              `yaml:"model_images"`         // fetch device images from appledb.dev for newly created models
+	PreserveOrderInfoOnUpdate bool       `yaml:"preserve_order_info_on_update"`  // never overwrite existing purchase_date / order_number on update
+	SyncConfiguratorOrderInfo bool       `yaml:"sync_configurator_order_info"`   // sync order_date / order_number even for MANUALLY_ADDED devices (default: skip, since ABM's values for these are Configurator enrollment metadata, not real purchase data)
 }
 
 // Load reads configuration from a YAML file and applies environment variable overrides.

settings.example.yaml

@@ -78,6 +78,18 @@ sync:
   #   APPLE: 1       # Apple (by purchaseSourceType)
   #   MANUALLY_ADDED: 2
 
+  # Never overwrite existing purchase_date / order_number on update.
+  # First-time syncs still populate them. Useful if you manually correct
+  # order info in Snipe-IT after a sync and want it preserved on re-runs.
+  # preserve_order_info_on_update: false
+
+  # Sync ABM's order_date / order_number even for devices added via
+  # Apple Configurator (purchaseSourceType=MANUALLY_ADDED). By default
+  # we skip these because ABM emits a synthetic enrollment ID like
+  # "CE-2024-12-13-04-11-12-826" and the enrollment date — not the real
+  # purchase data — which would overwrite better data already in Snipe-IT.
+  # sync_configurator_order_info: false
+
   # Custom field mappings: Snipe-IT field name -> ABM attribute
   # Left side: Snipe-IT DB column name (e.g. _snipeit_fieldname_1)
   #            or standard Snipe-IT field (purchase_date, order_number)

sync/sync.go

@@ -821,6 +821,7 @@ func (e *Engine) updateAsset(ctx context.Context, logger *logrus.Entry, device a
 
 	e.applyFieldMapping(&desired, device, coverage)
 	applyWarrantyNotes(&desired, coverage)
+	stripOrderInfoOnUpdate(&desired, existing, e.cfg.Sync.PreserveOrderInfoOnUpdate)
 
 	// Unless force mode, compare desired values against current Snipe-IT values
 	// and only send fields that are missing or different.
@@ -883,9 +884,18 @@ func (e *Engine) diffAsset(desired *snipeit.Asset, existing *snipeit.Asset) *sni
 	}
 
 	// Compare native order info fields.
-	if desired.PurchaseDate != nil && !desired.PurchaseDate.IsZero() {
-		if existing.PurchaseDate == nil || !desired.PurchaseDate.Equal(existing.PurchaseDate.Time) {
-			diff.PurchaseDate = desired.PurchaseDate
+	// purchase_date is held in CustomFields as a workaround for upstream
+	// SnipeTime.MarshalJSON (see applyFieldMapping). Compare the desired
+	// date string against the existing asset's native PurchaseDate field
+	// returned by GET, since Snipe-IT echoes purchase_date natively, not
+	// in CustomFields.
+	if desiredDate, ok := desired.CustomFields["purchase_date"]; ok {
+		existingDate := ""
+		if existing.PurchaseDate != nil && !existing.PurchaseDate.IsZero() {
+			existingDate = existing.PurchaseDate.Format("2006-01-02")
+		}
+		if desiredDate != existingDate {
+			diff.CustomFields["purchase_date"] = desiredDate
 			hasChanges = true
 		}
 	}
@@ -908,6 +918,12 @@ func (e *Engine) diffAsset(desired *snipeit.Asset, existing *snipeit.Asset) *sni
 	// (htmlspecialchars) in its API transformer, and BOOLEAN fields are stored
 	// as "0"/"1" while we write "false"/"true". Normalize both before comparing.
 	for key, desiredVal := range desired.CustomFields {
+		// purchase_date is compared explicitly above against the native
+		// existing.PurchaseDate field, not against existing.CustomFields
+		// (which is always empty for this key on GET responses).
+		if key == "purchase_date" {
+			continue
+		}
 		currentVal := html.UnescapeString(existing.CustomFields[key])
 		if normalizeBoolStr(currentVal) != normalizeBoolStr(desiredVal) {
 			diff.CustomFields[key] = desiredVal
@@ -956,10 +972,22 @@ func (e *Engine) applyFieldMapping(asset *snipeit.Asset, device abmclient.Device
 		case "producttype", "product_type":
 			value = attrs.ProductType
 		case "ordernumber", "order_number":
+			// Skip Configurator-enrolled devices: ABM emits a synthetic
+			// "CE-YYYY-MM-DD-HH-MM-SS-XXX" enrollment ID, not the real
+			// order number. The sync.sync_configurator_order_info flag
+			// is an opt-in escape hatch.
+			if skipConfiguratorOrderInfo(e.cfg, attrs) {
+				break
+			}
 			if attrs.OrderNumber != "" {
 				value = cleanOrderNumber(attrs.OrderNumber)
 			}
 		case "orderdate", "order_date":
+			// Same reasoning as order_number above — ABM emits the
+			// Configurator enrollment date, not the actual purchase date.
+			if skipConfiguratorOrderInfo(e.cfg, attrs) {
+				break
+			}
 			if !attrs.OrderDateTime.IsZero() {
 				value = attrs.OrderDateTime.Format("2006-01-02")
 			}
@@ -1047,9 +1075,15 @@ func (e *Engine) applyFieldMapping(asset *snipeit.Asset, device abmclient.Device
 			case "order_number":
 				asset.OrderNumber = value
 			case "purchase_date":
-				if t, err := time.Parse("2006-01-02", value); err == nil {
-					asset.PurchaseDate = &snipeit.SnipeTime{Time: t}
-				}
+				// Snipe-IT's purchase_date validator requires YYYY-MM-DD, but
+				// upstream go-snipeit's SnipeTime.MarshalJSON unconditionally
+				// emits "YYYY-MM-DD HH:MM:SS" (datetime). Bypass by writing the
+				// date-only string to CustomFields: Asset.MarshalJSON flattens
+				// CustomFields to top-level keys *after* the native PurchaseDate
+				// line, so the plain string overrides the bad serialization.
+				// Snipe-IT routes the "purchase_date" key to its native column
+				// regardless. TODO: remove once upstream serializes date-only.
+				asset.CustomFields[snipeField] = value
 			default:
 				asset.CustomFields[snipeField] = value
 			}
@@ -1183,6 +1217,36 @@ func normalizeBoolStr(s string) string {
 
 // cleanOrderNumber extracts the middle segment from CDW-style order numbers
 // like "CDW/1CJ6QLW/002" → "1CJ6QLW". Other formats are returned as-is.
+// skipConfiguratorOrderInfo reports whether order_date / order_number should
+// be skipped for a device because ABM's values for it aren't real purchase
+// data. A device added to ABM via Apple Configurator
+// (purchaseSourceType=MANUALLY_ADDED) gets a synthetic order number like
+// "CE-2024-12-13-04-11-12-826" and an order date equal to the enrollment
+// time. Syncing those would overwrite better data already in Snipe-IT.
+// The sync.sync_configurator_order_info flag is an opt-in escape hatch.
+func skipConfiguratorOrderInfo(cfg *config.Config, attrs *abm.OrgDeviceAttributes) bool {
+	if cfg.Sync.SyncConfiguratorOrderInfo {
+		return false
+	}
+	return string(attrs.PurchaseSourceType) == "MANUALLY_ADDED"
+}
+
+// stripOrderInfoOnUpdate drops the order info from the desired asset when
+// the sync.preserve_order_info_on_update flag is on and the existing asset
+// already has values, so axm2snipe never overwrites order info on update.
+// First-time syncs (existing has no value) still go through.
+func stripOrderInfoOnUpdate(desired, existing *snipeit.Asset, preserve bool) {
+	if !preserve {
+		return
+	}
+	if existing.OrderNumber != "" {
+		desired.OrderNumber = ""
+	}
+	if existing.PurchaseDate != nil && !existing.PurchaseDate.IsZero() {
+		delete(desired.CustomFields, "purchase_date")
+	}
+}
+
 func cleanOrderNumber(order string) string {
 	parts := strings.Split(order, "/")
 	if len(parts) == 3 {
@@ -1329,9 +1393,6 @@ func formatAssetDiff(a *snipeit.Asset) map[string]any {
 	if a.OrderNumber != "" {
 		m["order_number"] = a.OrderNumber
 	}
-	if a.PurchaseDate != nil && !a.PurchaseDate.IsZero() {
-		m["purchase_date"] = a.PurchaseDate.Format("2006-01-02")
-	}
 	for k, v := range a.CustomFields {
 		m[k] = v
 	}