Merge branch '118-add-possibility-of-querying-annotations-of-datafiles' into 'master'

Resolve "Add possibility of querying annotations of datafiles"

Closes #118

See merge request !65

portal/urls.py

@@ -17,6 +17,7 @@ from .views.secure.datafile import (DataFileAnnotateView,
                                     DataFileDeleteView, DataFileDetailsView,
                                     DataFileDownloadView,
                                     DataFileHasKeyJSONListView,
+                                    DataFileHasAnnotJSONListView,
                                     DataFileMetadataJSONView,
                                     DataFilesJSONListView, DataFilesView,
                                     DataFileUpdateView,
@@ -72,8 +73,10 @@ 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/<str:key>/', DataFileHasKeyJSONListView.as_view(), name='user.datafiles-json-list'),
-    path('secure/datafiles/list/json/<str:key>/<str:dataset>/', DataFileHasKeyJSONListView.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'),
+    path('secure/datafiles/list/json/lookup-value/<str:value>/<str:dataset>/', DataFileHasAnnotJSONListView.as_view(),name='user.datafiles-json-list'),
     path('secure/shared-datafiles/', SharedWithMeDataFilesView.as_view(), name='user.shared-datafiles'),
     path('secure/shared-datafiles/list/json/', SharedWithMeDataFilesJSONListView.as_view(), name='user.shared-datafiles-json-list'),
     path('secure/datafiles/annotate', DataFileAnnotateView.as_view(), name='user.datafile-annotate'),

portal/views/secure/datafile.py

@@ -490,24 +490,9 @@ class DataFileDeleteView(LoginRequiredMixin, DeleteViewMixin, DeleteView):
         return HttpResponseRedirect(self.get_success_url())
 
 
-class DataFileHasKeyJSONListView(LoginRequiredMixin, JSONListView):
+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)
-        qs = qs.filter(annotations__has_key=key)
-
-        dataset = self.kwargs.get('dataset', None)
-        logger.debug(dataset)
-        if dataset and re.match('DS[A-F0-9]{8}', dataset):
-            qs = qs.filter(
-                datasets__iric_data_id=dataset
-            )
-
-        return qs.distinct()
-
     def get_rows(self):
         rows = []
 
@@ -527,3 +512,40 @@ class DataFileHasKeyJSONListView(LoginRequiredMixin, JSONListView):
             rows.append(row)
 
         return rows
+
+
+class DataFileHasKeyJSONListView(DataFileLookupJSONListView):
+
+    def get_queryset(self):
+        qs = DataFile.objects.accessible_to_profile(self.request.user.profile)
+
+        key = self.kwargs.get('key', None)
+        qs = qs.filter(annotations__has_key=key)
+
+        dataset = self.kwargs.get('dataset', None)
+        logger.debug(dataset)
+        if dataset:
+            qs = qs.filter(
+                datasets__iric_data_id=dataset
+            )
+
+        return qs.distinct()
+
+
+class DataFileHasAnnotJSONListView(DataFileLookupJSONListView):
+
+    def get_queryset(self):
+        qs = DataFile.objects.accessible_to_profile(self.request.user.profile)
+
+        value = self.kwargs.get('value', None)
+        qs = qs.filter(annotations__values__icontains=value)
+
+        dataset = self.kwargs.get('dataset', None)
+        logger.debug(dataset)
+        if dataset:
+            qs = qs.filter(
+                datasets__iric_data_id=dataset
+            )
+
+
+        return qs.distinct()
\ No newline at end of file