Add datafile lookup by dataset id. Change key/value lookup url to be more descriptive

README.md

@@ -3,7 +3,7 @@
 IRIC Data Portal development effort
 
 ## Clients:
-R: https://gitlab.iric.ca/bioinfo_iric/riricdata  
+R: https://gitlab.iric.ca/bioinfo_iric/riricdata
 Python: https://gitlab.iric.ca/bioinfo_iric/pyiricdata
 
 ## Dependencies
@@ -147,25 +147,26 @@ Specify a migration_name to apply migrations **up to that one and no further**.
 This can be used to un-apply a migration.
 
 
-## Endpoints
+## API Endpoints
 
-Datafiles endpoints based based on key and value of metadata:
+Returns list of datafiles based on dataset id, key and/or values present in annotation :
  - api/v1/datafiles/list/json/lookup-key/str:key/
  - api/v1/datafiles/list/json/lookup-key/str:key/str:dataset/
  - api/v1/datafiles/list/json/lookup-value/str:value/
  - api/v1/datafiles/list/json/lookup-value/str:value/str:dataset/
- - api/v1/datafiles/list/json/lookup/str:key/str:value/
- - api/v1/datafiles/list/json/lookup/str:key/str:value/str:dataset
+ - api/v1/datafiles/list/json/lookup-key-value/str:key/str:value/
+ - api/v1/datafiles/list/json/lookup-key-value/str:key/str:value/str:dataset
+ - api/v1/datafiles/list/json/lookup-dataset/str:dataset
 
-Annotation endpoints :
+Returns annotation for given datafile :
  - api/v1/datafiles/json/annotation/int:pk
  - api/v1/datafiles/json/annotation/slug:iric_data_id
 
-Metadata endpoints :
+Returns metadata for given datafile :
  - api/v1/datafiles/json/metadata/int:pk
  - api/v1/datafiles/json/metadata/slug:iric_data_id
 
-Datasets endpoints:
+Returns list of datasets :
  - api/v1/admin/str:sim/datasets/list/json/
  - api/v1/my-datasets/list/json/
 

portal/urls.py

@@ -75,8 +75,9 @@ urlpatterns = [
     path('api/v1/datafiles/list/json/lookup-key/<str:key>/<str:dataset>/', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
     path('api/v1/datafiles/list/json/lookup-value/<str:value>/', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
     path('api/v1/datafiles/list/json/lookup-value/<str:value>/<str:dataset>/', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
-    path('api/v1/datafiles/list/json/lookup/<str:key>/<str:value>/', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
-    path('api/v1/datafiles/list/json/lookup/<str:key>/<str:value>/<str:dataset>', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
+    path('api/v1/datafiles/list/json/lookup-key-value/<str:key>/<str:value>/', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
+    path('api/v1/datafiles/list/json/lookup-key-value/<str:key>/<str:value>/<str:dataset>', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
+    path('api/v1/datafiles/list/json/lookup-dataset/<str:dataset>', DataFileLookupJSONListView.as_view(), name='user.datafiles-json-list'),
     path('api/v1/datafiles/json/annotation/<int:pk>', DataFileAnnotationJSONView.as_view(), name='user.datafile-annotation-json'),
     path('api/v1/datafiles/json/annotation/<slug:iric_data_id>', DataFileAnnotationJSONView.as_view(), name='user.datafile-annotation-json-iric-data-id'),
     path('api/v1/datafiles/json/metadata/<int:pk>', DataFileMetadataJSONView.as_view(), name='user.datafile-metadata-json'),