From 7ebffa85f7ba254fd7d05446d7563db079fff99a Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 21 Oct 2022 09:13:24 -0400
Subject: [PATCH] Flatten search registry to register by app_label.model_name

---
 netbox/extras/management/commands/reindex.py |  9 ++++-----
 netbox/extras/registry.py                    |  2 +-
 netbox/netbox/search/__init__.py             | 15 ++++++---------
 netbox/netbox/search/backends.py             |  8 +++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/netbox/extras/management/commands/reindex.py b/netbox/extras/management/commands/reindex.py
index 713d4acc7..6dc9bbb2d 100644
--- a/netbox/extras/management/commands/reindex.py
+++ b/netbox/extras/management/commands/reindex.py
@@ -21,9 +21,8 @@ class Command(BaseCommand):
 
         # No models specified; pull in all registered indexers
         if not model_names:
-            for app_label, models in registry['search'].items():
-                for _, idx in models.items():
-                    indexers[idx.model] = idx
+            for idx in registry['search'].values():
+                indexers[idx.model] = idx
 
         # Return only indexers for the specified models
         else:
@@ -35,10 +34,10 @@ class Command(BaseCommand):
                         f"Invalid model: {label}. Model names must be in the format <app_label>.<model_name>."
                     )
                 try:
-                    idx = registry['search'][app_label][model_name]
+                    idx = registry['search'][f'{app_label}.{model_name}']
                     indexers[idx.model] = idx
                 except KeyError:
-                    raise CommandError(f"No indexer found for {label}")
+                    raise CommandError(f"No indexer registered for {label}")
 
         return indexers
 
diff --git a/netbox/extras/registry.py b/netbox/extras/registry.py
index f89499842..76886e791 100644
--- a/netbox/extras/registry.py
+++ b/netbox/extras/registry.py
@@ -29,5 +29,5 @@ registry['model_features'] = {
     feature: collections.defaultdict(set) for feature in EXTRAS_FEATURES
 }
 registry['denormalized_fields'] = collections.defaultdict(list)
-registry['search'] = collections.defaultdict(dict)
+registry['search'] = dict()
 registry['views'] = collections.defaultdict(dict)
diff --git a/netbox/netbox/search/__init__.py b/netbox/netbox/search/__init__.py
index 5c090db8c..568bf8652 100644
--- a/netbox/netbox/search/__init__.py
+++ b/netbox/netbox/search/__init__.py
@@ -97,22 +97,19 @@ class SearchIndex:
 
 def get_indexer(model):
     """
-    Get the search indexer class for the given model.
+    Get the SearchIndex class for the given model.
     """
-    app_label = model._meta.app_label
-    model_name = model._meta.model_name
+    label = f'{model._meta.app_label}.{model._meta.model_name}'
 
-    return registry['search'][app_label][model_name]
+    return registry['search'][label]
 
 
 def register_search(cls):
     """
-    Decorator for registering a SearchIndex with a particular model.
+    Decorator for registering a SearchIndex class.
     """
     model = cls.model
-    app_label = model._meta.app_label
-    model_name = model._meta.model_name
-
-    registry['search'][app_label][model_name] = cls
+    label = f'{model._meta.app_label}.{model._meta.model_name}'
+    registry['search'][label] = cls
 
     return cls
diff --git a/netbox/netbox/search/backends.py b/netbox/netbox/search/backends.py
index 59136ae83..432f61eb8 100644
--- a/netbox/netbox/search/backends.py
+++ b/netbox/netbox/search/backends.py
@@ -35,11 +35,9 @@ class SearchBackend:
 
             # Organize choices by category
             categories = defaultdict(dict)
-            for app_label, models in registry['search'].items():
-                for name, cls in models.items():
-                    title = bettertitle(cls.model._meta.verbose_name)
-                    value = f'{app_label}.{name}'
-                    categories[cls.get_category()][value] = title
+            for label, idx in registry['search'].items():
+                title = bettertitle(idx.model._meta.verbose_name)
+                categories[idx.get_category()][label] = title
 
             # Compile a nested tuple of choices for form rendering
             results = (