ge-aerospace/shopdb-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix numeric natural keys resolving to the wrong asset on import

Browse Source
This commit is contained in:
Cameron Proudlock
2026-08-31 15:55:31 -04:00
parent f087a7a5b0
commit 7081ea5d41
3 changed files with 74 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shopdb/core/api/settings.py
View File

@@ -334,23 +334,32 @@ def download_import_template(tablename):
def _existing_hostname_map():
"""Case-insensitive hostname -> assetnumber map for existing computers.
"""Case-insensitive hostname -> assetid map for existing computers.
Azure device-group exports align on hostname (their displayName), while the
import engine keys assets on assetnumber. This lets the Azure adapter route
a matched device to its real asset so the import updates in place.
Azure and Thor exports align on hostname (their displayName), while the
import engine keys assets on assetnumber. This lets those adapters route a
matched device to its real asset so the import updates in place.
THE ID, NOT THE ASSETNUMBER, and that is not a style choice. The resolver
takes any all-digit value at face value as a literal id rather than looking
it up, so an assetnumber like `0600` resolved to asset 600 - a different
asset entirely, or none. This site numbers operations 0NNN, so those
assetnumbers are real and common: one of them pointed a PC at a printer's
record, and another at an id that does not exist, which is the foreign-key
error an Azure import died on. Handing over the id the resolver is going to
treat it as makes the passthrough correct by construction.
"""
assets = db.metadata.tables['assets']
computers = db.metadata.tables['computers']
query = sa_select(
computers.c.hostname, assets.c.assetnumber
computers.c.hostname, assets.c.assetid
).select_from(
computers.join(assets, computers.c.assetid == assets.c.assetid)
).where(computers.c.hostname.isnot(None))
mapping = {}
for hostname, assetnumber in db.session.execute(query):
for hostname, assetid in db.session.execute(query):
if hostname:
mapping[hostname.strip().lower()] = assetnumber
mapping[hostname.strip().lower()] = assetid
return mapping