Merge pull request #148 from UMNLibraries/restore-old-viewset-temporarily

[FIX] restore old deed search viewset for now

Author: Kat-Alo

apps/deed/views.py

@@ -7,9 +7,14 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
-from django.shortcuts import render
+from django import forms
 from django.db.models import Case, When
 
+from haystack.generic_views import SearchView
+from haystack.forms import SearchForm
+
+from apps.zoon.models import ZooniverseWorkflow
+
 from .documents import DeedPageDocument
 from .serializers import DeedPageSerializer
 from .models import DeedPage
@@ -184,3 +189,38 @@ def generate_search_query(self, search_terms_list: list[str], param_filters: dic
             return query
 
         return Q("match_all")
+
+
+# TODO: delete this once we have transitioned to elasticsearch
+class DeedSearchForm(SearchForm):
+    bool_match = forms.BooleanField(required=False)
+    workflow = forms.ModelChoiceField(
+        queryset=ZooniverseWorkflow.objects.all(),
+        to_field_name="workflow_name",
+        required=False,
+    )
+
+    def search(self):
+        sqs = super().search()
+
+        if not self.is_valid():
+            return self.no_query_found()
+
+        if self.cleaned_data["workflow"]:
+            sqs = sqs.filter(workflow=self.cleaned_data["workflow"])
+
+        if self.cleaned_data["bool_match"]:
+            sqs = sqs.filter(bool_match=self.cleaned_data["bool_match"])
+
+        return sqs
+
+
+class DeedSearchView(SearchView):
+    template_name = 'search/search.html'
+    # queryset = SearchQuerySet().all()
+    form_class = DeedSearchForm
+
+    def get_context_data(self, **kwargs):
+        data = super().get_context_data(**kwargs)
+        data['all_workflows'] = ZooniverseWorkflow.objects.all()
+        return data

racial_covenants_processor/urls.py

@@ -23,7 +23,7 @@
 from apps.zoon.serializers import SubjectNoGeoViewSet, SubjectGeoViewSet
 from apps.parcel.serializers import CovenantNoGeoViewSet, CovenantGeoViewSet, ShpExportViewSet, GeoJSONExportViewSet, CSVExportViewSet
 
-from apps.deed.views import DeedPageViewSet
+from apps.deed.views import DeedPageViewSet, DeedSearchView
 
 # Routers provide an easy way of automatically determining the URL conf.
 router = routers.DefaultRouter()
@@ -53,6 +53,8 @@
 
     path('api/', include(router.urls)),
     path('api-auth/', include('rest_framework.urls')),
+    # TODO: delete this once we have transitioned to elasticsearch
+    path('deed_search/', DeedSearchView.as_view(), name='deed_search_view'),
     # path('search/', include('haystack.urls')),
 
     # path('__debug__/', include('debug_toolbar.urls')),

requirements.txt

@@ -32,6 +32,7 @@ django-appconf==1.2.0; python_version >= '3.9'
 django-compressor==4.6.0; python_version >= '3.10'
 django-cotton==2.6.1; python_version >= '3.8' and python_version < '4'
 django-debug-toolbar==6.2.0; python_version >= '3.10'
+django-elasticsearch-dsl==8.2
 django-extensions==4.1; python_version >= '3.9'
 django-filter==25.2; python_version >= '3.10'
 django-haystack==3.3.0
@@ -42,6 +43,8 @@ django-storages==1.14.6; python_version >= '3.7'
 djangorestframework==3.16.1; python_version >= '3.9'
 djangorestframework-gis==1.2.0
 docutils==0.22.4; python_version >= '3.9'
+elasticsearch==8.19.3
+elasticsearch-dsl==8.18.0
 executing==2.2.1; python_version >= '3.8'
 fastjsonschema==2.21.2
 fiona==1.10.1; python_version >= '3.8'