From 6106f4c5f43a9b3104019db5840e14cc522c0d8c Mon Sep 17 00:00:00 2001 From: cproudlock Date: Mon, 24 Aug 2026 14:49:31 -0400 Subject: [PATCH] Stop shipping duplicate vendors, models and operating systems The seed catalog is what a new site inherits, so its duplicates propagate. Removed the four space-stripped twins it carried: vendor 'DellInc.', model 'OptiPlex7080', and operating systems 'MicrosoftWindows10Enterprise' and 'Windows10', each of which had a correctly spaced original already present. 'OptiPlex5000' was NOT a duplicate - no spaced twin existed - so it was renamed to 'OptiPlex 5000' rather than dropped, matching every sibling in the list. Its vendor moved to 'Dell Inc.', which this site treats as the one canonical Dell. Vendors 53 to 51, models 128 to 127, operating systems 14 to 12. Verified afterwards: no exact duplicate rows, no near-duplicates, no orphaned model-to-vendor or supply-to-model reference. --- docs/PROJECT-MAP.md | 2 +- shopdb/data/catalog.json | 20 ++------------------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/docs/PROJECT-MAP.md b/docs/PROJECT-MAP.md index 562e6c08..92fde5da 100644 --- a/docs/PROJECT-MAP.md +++ b/docs/PROJECT-MAP.md @@ -86,6 +86,6 @@ Manifest-less directories under `plugins/` are core frontend surface and always ## Size -- test functions defined: **1239** (parametrised cases collect higher) +- test functions defined: **1256** (parametrised cases collect higher) - documented API paths: **285** (`docs/openapi.json`, regenerate with `scripts/gen_openapi.py`) diff --git a/shopdb/data/catalog.json b/shopdb/data/catalog.json index c2a7b917..34aaf6cc 100644 --- a/shopdb/data/catalog.json +++ b/shopdb/data/catalog.json @@ -383,9 +383,6 @@ { "osname": "Microsoft Windows 11 Enterprise" }, - { - "osname": "MicrosoftWindows10Enterprise" - }, { "osname": "TBD" }, @@ -404,9 +401,6 @@ { "osname": "Windows Server 2022", "osversion": "2022" - }, - { - "osname": "Windows10" } ], "vendors": [ @@ -432,15 +426,9 @@ { "vendor": "Cisco" }, - { - "vendor": "Dell" - }, { "vendor": "Dell Inc." }, - { - "vendor": "DellInc." - }, { "vendor": "DMG Mori" }, @@ -620,8 +608,8 @@ "modeltype": "Switch" }, { - "modelnumber": "OptiPlex5000", - "vendor": "Dell" + "modelnumber": "OptiPlex 5000", + "vendor": "Dell Inc." }, { "modelnumber": "Dell Pro 13 Plus PB13250", @@ -775,10 +763,6 @@ "vendor": "Dell Inc.", "modeltype": "LocationOnly" }, - { - "modelnumber": "OptiPlex7080", - "vendor": "DellInc." - }, { "modelnumber": "NT-4300", "vendor": "DMG Mori",