add lookup by key/value

portal/urls.py

@@ -16,6 +16,7 @@ from .views.secure.datafile import (DataFileAnnotateView,
                                     DataFileBatchRemoveAnnotation,
                                     DataFileDeleteView, DataFileDetailsView,
                                     DataFileDownloadView,
+                                    DataFileLookupJSONListView,
                                     DataFileHasKeyJSONListView,
                                     DataFileHasAnnotJSONListView,
                                     DataFileMetadataJSONView,
@@ -73,6 +74,8 @@ urlpatterns = [
     # Files
     path('secure/datafiles/', DataFilesView.as_view(), name='user.datafiles'),
     path('secure/datafiles/list/json/', DataFilesJSONListView.as_view(), name='user.datafiles-json-list'),
+    path('secure/datafiles/list/json/lookup/<str:key>/<str:value>/', DataFileLookupJSONListView.as_view(),name='user.datafiles-json-list'),
+    path('secure/datafiles/list/json/lookup/<str:key>/<str:value>/<str:dataset>', DataFileLookupJSONListView.as_view(),name='user.datafiles-json-list'),
     path('secure/datafiles/list/json/lookup-key/<str:key>/', DataFileHasKeyJSONListView.as_view(), name='user.datafiles-json-list'),
     path('secure/datafiles/list/json/lookup-key/<str:key>/<str:dataset>/', DataFileHasKeyJSONListView.as_view(), name='user.datafiles-json-list'),
     path('secure/datafiles/list/json/lookup-value/<str:value>/', DataFileHasAnnotJSONListView.as_view(), name='user.datafiles-json-list'),

portal/views/secure/datafile.py

@@ -493,6 +493,20 @@ class DataFileDeleteView(LoginRequiredMixin, DeleteViewMixin, DeleteView):
 class DataFileLookupJSONListView(LoginRequiredMixin, JSONListView):
     model = DataFile
 
+    def get_queryset(self):
+        qs = DataFile.objects.accessible_to_profile(self.request.user.profile)
+
+        key = self.kwargs.get('key', None)
+        value = self.kwargs.get('value', None)
+        qs = qs.filter(annotations__contains={key: value})
+
+        dataset = self.kwargs.get('dataset', None)
+        logger.debug(dataset)
+        if dataset:
+            qs = qs.filter(annotations__contains={key: value})
+
+        return qs.distinct()
+
     def get_rows(self):
         rows = []
 
@@ -548,4 +562,4 @@ class DataFileHasAnnotJSONListView(DataFileLookupJSONListView):
             )
 
 
-        return qs.distinct()
+        return qs.distinct()
\ No newline at end of file