nofusscomputing/centurion_erp
1
0
Fork 0
Code Issues Wiki Activity

fix(itam): only remove device software when not found during inventory upload

Browse Source 
!38 #75
This commit is contained in:
Jon Lockwood
2024-07-06 15:29:43 +09:30
parent 3bceb66600
commit 67f20ecb66
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/api/views/itam/inventory.py
View File

@ -210,7 +210,7 @@ this setting populated, no device will be created and the endpoint will return H
software_category_organization = device.organization
inventoried_software: list = []
for inventory in list(data.software):
@ -308,14 +308,7 @@ this setting populated, no device will be created and the endpoint will return H
if device_software: # Update the Inventoried software
clear_installed_software = DeviceSoftware.objects.filter(
device = device,
software = software
)
# Clear installed version of all installed software
# any found later with no version to be removed
clear_installed_software.update(installedversion=None)
inventoried_software += [ device_software.id ]
if not device_software.installed: # Only update install date if blank
@ -332,13 +325,17 @@ this setting populated, no device will be created and the endpoint will return H
device_software.save()
for not_installed in DeviceSoftware.objects.filter( device=device ):
if not_installed.id not in inventoried_software:
not_installed.delete()
print(f"Remove Device Software: {not_installed.software.name}")
if device and operating_system and operating_system_version and device_operating_system:
# Remove software no longer installed
DeviceSoftware.objects.filter(
device = device,
software = software,
).delete()
device.inventorydate = timezone.now()