Merge branch 'idc-test' of https://github.com/ImagingDataCommons/IDC-Common into idc-prod-sp

Author: s-paquette

accounts/urls.py

@@ -22,7 +22,7 @@
 
 
 urlpatterns = [
-    re_path(r'^', include(google_urls)),
-    re_path(r'^', include(allauth_urls)),
+    # re_path(r'^', include(google_urls)),
+    # re_path(r'^', include(allauth_urls)),
     re_path(r'^logout', views.extended_logout_view, name='account_logout'),
 ]

cohorts/urls.py

@@ -20,49 +20,48 @@
 
 
 urlpatterns = [
-    re_path(r'^$', views.cohorts_list, name='cohort_list'),
+    # re_path(r'^$', views.cohorts_list, name='cohort_list'),
     re_path(r'^manifests/fetch/(?P<file_name>[A-Za-z\-0-9]+\/manifest_(cohort_)?[0-9_]+(aws|gcs|gcp)?\.(s5cmd|json|csv|tsv))', views.fetch_user_manifest, name='fetch_user_manifest'),
     re_path(r'^manifests/check/(?P<file_name>[A-Za-z\-0-9]+\/manifest_(cohort_)?[0-9_]+(aws|gcs|gcp)?\.(s5cmd|json|csv|tsv))', views.check_manifest_ready, name='check_user_manifest'),
     re_path(r'^manifests/fetch/$', views.fetch_user_manifest, name='fetch_user_manifest_base'),
     re_path(r'^manifests/check/$', views.check_manifest_ready, name='check_user_manifest_base'),
-    re_path(r'^api/$', views.views_api_v1.cohort_list_api, name='cohort_list_api'),
-    re_path(r'^api/v1/$', views.views_api_v1.cohort_list_api, name='cohort_list_api'),
-    re_path(r'^api/v2/$', views.views_api_v2.cohort_list_api, name='cohort_list_api'),
-    #    re_path(r'^api/preview/$', views.cohort_preview_api, name='cohort_preview_api'),
+    # re_path(r'^api/$', views.views_api_v1.cohort_list_api, name='cohort_list_api'),
+    # re_path(r'^api/v1/$', views.views_api_v1.cohort_list_api, name='cohort_list_api'),
+    # re_path(r'^api/v2/$', views.views_api_v2.cohort_list_api, name='cohort_list_api'),
+    # re_path(r'^api/preview/$', views.cohort_preview_api, name='cohort_preview_api'),
     re_path(r'^api/preview/manifest/$', views.views_api_v1.cohort_preview_manifest_api, name='cohort_preview_manifest_api'),
     re_path(r'^api/v1/preview/manifest/$', views.views_api_v1.cohort_preview_manifest_api, name='cohort_preview_manifest_api'),
     # re_path(r'^api/v2/preview/manifest/$', views.views_api_v2.cohort_preview_manifest_api, name='cohort_preview_manifest_api'),
     re_path(r'^api/preview/query/$', views.views_api_v1.cohort_preview_query_api, name='cohort_preview_query_api'),
     re_path(r'^api/v1/preview/query/$', views.views_api_v1.cohort_preview_query_api, name='cohort_preview_query_api'),
     re_path(r'^api/v2/preview/query/$', views.views_api_v2.cohort_preview_query_api, name='cohort_preview_query_api'),
-    re_path(r'^(?P<cohort_id>\d+)/$', views.cohort_detail, name='cohort_details'),
-#    re_path(r'^api/(?P<cohort_id>\d+)/$', views.cohort_detail_api, name='cohort_detail_api'),
-    re_path(r'^(?P<cohort_id>\d+)/stats/$', views.get_cohort_stats, name='cohort_stats'),
+    # re_path(r'^(?P<cohort_id>\d+)/$', views.cohort_detail, name='cohort_details'),
+    # re_path(r'^api/(?P<cohort_id>\d+)/$', views.cohort_detail_api, name='cohort_detail_api'),
+    # re_path(r'^(?P<cohort_id>\d+)/stats/$', views.get_cohort_stats, name='cohort_stats'),
 
-#    re_path(r'^api/(?P<cohort_id>\d+)/$', views.cohort_detail_api, name='cohort_detail_api'),
-    re_path(r'^api/(?P<cohort_id>\d+)/manifest/$', views.views_api_v1.cohort_manifest_api, name='cohort_manifest_api'),
-    re_path(r'^api/v1/(?P<cohort_id>\d+)/manifest/$', views.views_api_v1.cohort_manifest_api, name='cohort_manifest_api'),
+    # re_path(r'^api/(?P<cohort_id>\d+)/$', views.cohort_detail_api, name='cohort_detail_api'),
+    # re_path(r'^api/(?P<cohort_id>\d+)/manifest/$', views.views_api_v1.cohort_manifest_api, name='cohort_manifest_api'),
+    # re_path(r'^api/v1/(?P<cohort_id>\d+)/manifest/$', views.views_api_v1.cohort_manifest_api, name='cohort_manifest_api'),
     # re_path(r'^api/v2/(?P<cohort_id>\d+)/manifest/$', views.views_api_v2.cohort_manifest_api, name='cohort_manifest_api'),
-    re_path(r'^api/(?P<cohort_id>\d+)/query/$', views.views_api_v1.cohort_query_api, name='cohort_query_api'),
-    re_path(r'^api/v1/(?P<cohort_id>\d+)/query/$', views.views_api_v1.cohort_query_api, name='cohort_query_api'),
-    re_path(r'^api/v2/(?P<cohort_id>\d+)/query/$', views.views_api_v2.cohort_query_api, name='cohort_query_api'),
-    re_path(r'^save_cohort/', views.save_cohort, name='save_cohort'),
-    re_path(r'^api/save_cohort/', views.views_api_v1.save_cohort_api, name='save_cohort_api'),
-    re_path(r'^api/v1/save_cohort/', views.views_api_v1.save_cohort_api, name='save_cohort_api'),
-    re_path(r'^api/v2/save_cohort/', views.views_api_v2.save_cohort_api, name='save_cohort_api'),
-    re_path(r'^delete_cohort/', views.delete_cohort, name='delete_cohort'),
-    re_path(r'^api/delete_cohort/', views.views_api_v1.delete_cohort_api, name='delete_cohort_api'),
-    re_path(r'^api/v1/delete_cohort/', views.views_api_v1.delete_cohort_api, name='delete_cohort_api'),
-    re_path(r'^api/v2/delete_cohort/', views.views_api_v2.delete_cohort_api, name='delete_cohort_api'),
-    #re_path(r'^clone_cohort/(?P<cohort_id>\d+)/', views.clone_cohort, name='clone_cohort'),
-    #re_path(r'^share_cohort/$', views.share_cohort, name='share_cohorts'),
-    #re_path(r'^share_cohort/(?P<cohort_id>\d+)/', views.share_cohort, name='share_cohort'),
-    #re_path(r'^unshare_cohort/$', views.unshare_cohort, name='unshare_cohorts'),
-    #re_path(r'^unshare_cohort/(?P<cohort_id>\d+)/', views.unshare_cohort, name='unshare_cohort'),
-    #re_path(r'^set_operation/', views.set_operation, name='set_operation'),
-    #re_path(r'^save_cohort_comment/', views.save_comment, name='save_cohort_comment'),
-    re_path(r'^download_manifest/(?P<cohort_id>\d+)/', views.download_cohort_manifest, name='cohort_manifest'),
-    re_path(r'bq_string/(?P<cohort_id>\d+)/', views.get_query_str_response, name='bq_string'),
-    re_path(r'^download_manifest/', views.download_cohort_manifest, name='cohort_manifest_base'),
-    re_path(r'^get_metadata_ajax/$', views.get_metadata, name='metadata_count_ajax')
+    # re_path(r'^api/(?P<cohort_id>\d+)/query/$', views.views_api_v1.cohort_query_api, name='cohort_query_api'),
+    # re_path(r'^api/v1/(?P<cohort_id>\d+)/query/$', views.views_api_v1.cohort_query_api, name='cohort_query_api'),
+    # re_path(r'^api/v2/(?P<cohort_id>\d+)/query/$', views.views_api_v2.cohort_query_api, name='cohort_query_api'),
+    # re_path(r'^save_cohort/', views.save_cohort, name='save_cohort'),
+    # re_path(r'^api/save_cohort/', views.views_api_v1.save_cohort_api, name='save_cohort_api'),
+    # re_path(r'^api/v1/save_cohort/', views.views_api_v1.save_cohort_api, name='save_cohort_api'),
+    # re_path(r'^api/v2/save_cohort/', views.views_api_v2.save_cohort_api, name='save_cohort_api'),
+    # re_path(r'^delete_cohort/', views.delete_cohort, name='delete_cohort'),
+    # re_path(r'^api/delete_cohort/', views.views_api_v1.delete_cohort_api, name='delete_cohort_api'),
+    # re_path(r'^api/v1/delete_cohort/', views.views_api_v1.delete_cohort_api, name='delete_cohort_api'),
+    # re_path(r'^api/v2/delete_cohort/', views.views_api_v2.delete_cohort_api, name='delete_cohort_api'),
+    # re_path(r'^clone_cohort/(?P<cohort_id>\d+)/', views.clone_cohort, name='clone_cohort'),
+    # re_path(r'^share_cohort/$', views.share_cohort, name='share_cohorts'),
+    # re_path(r'^share_cohort/(?P<cohort_id>\d+)/', views.share_cohort, name='share_cohort'),
+    # re_path(r'^unshare_cohort/$', views.unshare_cohort, name='unshare_cohorts'),
+    # re_path(r'^unshare_cohort/(?P<cohort_id>\d+)/', views.unshare_cohort, name='unshare_cohort'),
+    # re_path(r'^set_operation/', views.set_operation, name='set_operation'),
+    # re_path(r'^save_cohort_comment/', views.save_comment, name='save_cohort_comment'),
+    # re_path(r'^download_manifest/(?P<cohort_id>\d+)/', views.download_cohort_manifest, name='cohort_manifest'),
+    # re_path(r'bq_string/(?P<cohort_id>\d+)/', views.get_query_str_response, name='bq_string'),
+    # re_path(r'^download_manifest/', views.download_cohort_manifest, name='cohort_manifest_base'),
 ]

cohorts/views/views.py

@@ -662,46 +662,3 @@ def get_query_string(request, cohort_id=0):
         logger.exception(e)
 
     return query
-
-
-@login_required
-@cache_page(60 * 15)
-def get_metadata(request):
-    filters = json.loads(request.GET.get('filters', '{}'))
-    comb_mut_filters = request.GET.get('mut_filter_combine', 'OR')
-    cohort = request.GET.get('cohort_id', None)
-    limit = request.GET.get('limit', None)
-    program_id = request.GET.get('program_id', None)
-
-    program_id = int(program_id) if program_id is not None else None
-
-    user = Django_User.objects.get(id=request.user.id)
-
-    if program_id is not None and program_id > 0:
-        results = public_metadata_counts(filters[str(program_id)], cohort, user, program_id, limit, comb_mut_filters=comb_mut_filters)
-
-        # If there is an extent cohort, to get the cohort's new totals per applied filters
-        # we have to check the unfiltered programs for their numbers and tally them in
-        # This includes user data!
-        if cohort:
-            results['cohort-total'] = results['total']
-            results['cohort-cases'] = results['cases']
-            cohort_pub_progs = Program.objects.filter(id__in=Collection.objects.filter(id__in=Samples.objects.filter(cohort_id=cohort).values_list('project_id',flat=True).distinct()).values_list('program_id',flat=True).distinct(), is_public=True)
-            for prog in cohort_pub_progs:
-                if prog.id != program_id:
-                    prog_res = public_metadata_counts(filters[str(prog.id)], cohort, user, prog.id, limit)
-                    results['cohort-total'] += prog_res['total']
-                    results['cohort-cases'] += prog_res['cases']
-
-            cohort_user_progs = Program.objects.filter(id__in=Collection.objects.filter(id__in=Samples.objects.filter(cohort_id=cohort).values_list('project_id',flat=True).distinct()).values_list('program_id', flat=True).distinct(), is_public=False)
-            for prog in cohort_user_progs:
-                user_prog_res = user_metadata_counts(user, {'0': {'user_program', [prog.id]}}, cohort)
-                results['cohort-total'] += user_prog_res['total']
-                results['cohort-cases'] += user_prog_res['cases']
-    else:
-        results = user_metadata_counts(user, filters, cohort)
-
-    if not results:
-        results = {}
-
-    return JsonResponse(results)