Merge branch 'main' into wdn/scramble

src/meshapi/admin.py

@@ -395,6 +395,21 @@ class InstallAdmin(admin.ModelAdmin):
         ),
     ]
 
+    def get_search_results(self, request, queryset, search_term):
+        queryset, may_have_duplicates = super().get_search_results(
+            request,
+            queryset,
+            search_term,
+        )
+        try:
+            upper_search = search_term.upper()
+            if len(upper_search) > 2 and upper_search[:2] == "NN":
+                search_term_as_int = int(upper_search[2:])
+                queryset |= self.model.objects.filter(node_id=search_term_as_int)
+        except ValueError:
+            pass
+        return queryset, may_have_duplicates
+
 
 class LinkAdminForm(forms.ModelForm):
     class Meta:

src/meshapi/tests/test_admin_search_view.py

@@ -80,3 +80,12 @@ def test_search_device(self):
 
     def test_search_node(self):
         self._call("/admin/meshapi/node/?q=1", 200)
+
+    def test_search_install_by_nn(self):
+        self._call("/admin/meshapi/install/?q=nN1", 200)
+
+    def test_search_install_just_nn(self):
+        self._call("/admin/meshapi/install/?q=nN", 200)
+
+    def test_search_install_empty(self):
+        self._call("/admin/meshapi/install/?q=", 200)

src/meshapi/views/query_api.py

@@ -1,6 +1,8 @@
 from django.db.models import Q
 from django_filters import rest_framework as filters
+from drf_spectacular.utils import extend_schema, extend_schema_view
 
+from meshapi.docs import query_form_password_param
 from meshapi.models import Install
 from meshapi.permissions import LegacyMeshQueryPassword
 from meshapi.serializers.query_api import QueryFormSerializer
@@ -32,6 +34,15 @@ class Meta:
         fields = []
 
 
+@extend_schema_view(
+    get=extend_schema(
+        tags=["Legacy Query Form"],
+        parameters=[query_form_password_param],
+        summary="Query & filter based on Member attributes. "
+        "Results are returned as flattened spreadsheet row style output",
+        auth=[],
+    ),
+)
 class QueryMember(FilterRequiredListAPIView):
     queryset = (
         Install.objects.all()
@@ -53,6 +64,15 @@ class Meta:
         fields = ["install_number", "member", "building", "status"]
 
 
+@extend_schema_view(
+    get=extend_schema(
+        tags=["Legacy Query Form"],
+        parameters=[query_form_password_param],
+        summary="Query & filter based on Install attributes. "
+        "Results are returned as flattened spreadsheet row style output",
+        auth=[],
+    ),
+)
 class QueryInstall(FilterRequiredListAPIView):
     queryset = (
         Install.objects.all()
@@ -78,6 +98,15 @@ class Meta:
         fields = ["bin", "zip_code"]
 
 
+@extend_schema_view(
+    get=extend_schema(
+        tags=["Legacy Query Form"],
+        parameters=[query_form_password_param],
+        summary="Query & filter based on Building attributes. "
+        "Results are returned as flattened spreadsheet row style output",
+        auth=[],
+    ),
+)
 class QueryBuilding(FilterRequiredListAPIView):
     queryset = (
         Install.objects.all()