feat: Enhance authoritative field handling with new locking mechanisms and update tests

server/models/device_instance.py

@@ -9,7 +9,13 @@ from logger import mylog
 from models.plugin_object_instance import PluginObjectInstance
 from database import get_temp_db_connection
 from db.db_helper import get_table_json, get_device_condition_by_status, row_to_json, get_date_from_period
-from db.authoritative_handler import enforce_source_on_user_update, lock_field, unlock_field, FIELD_SOURCE_MAP
+from db.authoritative_handler import (
+    enforce_source_on_user_update,
+    get_locked_field_overrides,
+    lock_field,
+    unlock_field,
+    FIELD_SOURCE_MAP,
+)
 from helper import is_random_mac, get_setting_value
 from utils.datetime_utils import timeNowDB, format_date
 
@@ -504,6 +510,67 @@ class DeviceInstance:
         normalized_mac = normalize_mac(mac)
         normalized_parent_mac = normalize_mac(data.get("devParentMAC") or "")
 
+        fields_updated_by_set_device_data = {
+            "devName",
+            "devOwner",
+            "devType",
+            "devVendor",
+            "devIcon",
+            "devFavorite",
+            "devGroup",
+            "devLocation",
+            "devComments",
+            "devParentMAC",
+            "devParentPort",
+            "devSSID",
+            "devSite",
+            "devStaticIP",
+            "devScan",
+            "devAlertEvents",
+            "devAlertDown",
+            "devParentRelType",
+            "devReqNicsOnline",
+            "devSkipRepeated",
+            "devIsNew",
+            "devIsArchived",
+            "devCustomProps",
+        }
+
+        # Only mark USER for tracked fields that this method actually updates.
+        tracked_update_fields = set(FIELD_SOURCE_MAP.keys()) & fields_updated_by_set_device_data
+        tracked_update_fields.discard("devMac")
+
+        locked_fields = set()
+        pre_update_tracked_values = {}
+        if not data.get("createNew", False):
+            conn_preview = get_temp_db_connection()
+            try:
+                locked_fields, overrides = get_locked_field_overrides(
+                    normalized_mac,
+                    data,
+                    conn_preview,
+                )
+                if overrides:
+                    data.update(overrides)
+
+                # Capture pre-update values for tracked fields so we can mark USER only
+                # when the user actually changes the value.
+                tracked_fields_in_payload = [
+                    k for k in data.keys() if k in tracked_update_fields
+                ]
+                if tracked_fields_in_payload:
+                    select_clause = ", ".join(tracked_fields_in_payload)
+                    cur_preview = conn_preview.cursor()
+                    cur_preview.execute(
+                        f"SELECT {select_clause} FROM Devices WHERE devMac=?",
+                        (normalized_mac,),
+                    )
+                    row = cur_preview.fetchone()
+                    if row:
+                        pre_update_tracked_values = row_to_json(list(row.keys()), row)
+            finally:
+                conn_preview.close()
+
         conn = None
         try:
             if data.get("createNew", False):
@@ -619,7 +686,30 @@ class DeviceInstance:
 
             # Enforce source tracking on user updates
             # User-updated fields should have their *Source set to "USER"
-            user_updated_fields = {k: v for k, v in data.items() if k in FIELD_SOURCE_MAP}
+            def _normalize_tracked_value(value):
+                if value is None:
+                    return ""
+                if isinstance(value, str):
+                    return value.strip()
+                return str(value)
+
+            user_updated_fields = {}
+            if not data.get("createNew", False):
+                for field_name in tracked_update_fields:
+                    if field_name in locked_fields:
+                        continue
+                    if field_name not in data:
+                        continue
+
+                    if field_name == "devParentMAC":
+                        new_value = normalized_parent_mac
+                    else:
+                        new_value = data.get(field_name)
+
+                    old_value = pre_update_tracked_values.get(field_name)
+                    if _normalize_tracked_value(old_value) != _normalize_tracked_value(new_value):
+                        user_updated_fields[field_name] = new_value
+
             if user_updated_fields and not data.get("createNew", False):
                 try:
                     enforce_source_on_user_update(normalized_mac, user_updated_fields, conn)