From ad61ddbd47b4dcd0ae9ef1ff799eabc323140292 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Mon, 2 Apr 2018 14:12:11 -0500
Subject: [PATCH] remove unused filemeta resource from events API
---
docs/user_docs/source/lvalert.rst | 1 -
gracedb/events/api/urls.py | 17 +++++++----------
gracedb/events/api/views.py | 12 ------------
gracedb/events/view_utils.py | 1 -
4 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/docs/user_docs/source/lvalert.rst b/docs/user_docs/source/lvalert.rst
index 4e497f691..6ece97bc2 100644
--- a/docs/user_docs/source/lvalert.rst
+++ b/docs/user_docs/source/lvalert.rst
@@ -92,7 +92,6 @@ New event::
"likelihood": 8.33784842725385e+44,
"links": {
"embb": "https://gracedb.ligo.org/api/events/T129911/embb/",
- "filemeta": "https://gracedb.ligo.org/api/events/T129911/filemeta/",
"files": "https://gracedb.ligo.org/api/events/T129911/files/",
"labels": "https://gracedb.ligo.org/api/events/T129911/labels/",
"log": "https://gracedb.ligo.org/api/events/T129911/log/",
diff --git a/gracedb/events/api/urls.py b/gracedb/events/api/urls.py
index 6a46cdb6d..db77afd3b 100644
--- a/gracedb/events/api/urls.py
+++ b/gracedb/events/api/urls.py
@@ -46,30 +46,27 @@ urlpatterns = [
url(r'^tag/$', TagList.as_view(), name='tag-list'),
# XXX unclear what the tag detail resource should be.
#url(r'^tag/(?P<tagname>.+)$', TagDetail.as_view(), name='tag-detail'),
- url(r'events/(?P<graceid>[GEHMT]\d+)/tag/$', EventTagList.as_view(),
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/tag/$', EventTagList.as_view(),
name='eventtag-list'),
- url(r'events/(?P<graceid>[GEHMT]\d+)/tag/(?P<tagname>.+)$',
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/tag/(?P<tagname>.+)$',
EventTagDetail.as_view(), name='eventtag-detail'),
- url(r'events/(?P<graceid>[GEHMT]\d+)/log/(?P<n>\d+)/tag/$',
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/log/(?P<n>\d+)/tag/$',
EventLogTagList.as_view(), name='eventlogtag-list'),
- url(r'events/(?P<graceid>[GEHMT]\d+)/log/(?P<n>\d+)/tag/(?P<tagname>.+)$',
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/log/(?P<n>\d+)/tag/(?P<tagname>.+)$',
EventLogTagDetail.as_view(), name='eventlogtag-detail'),
# Permission Resources
- url(r'events/(?P<graceid>[GEHMT]\d+)/perms/$',
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/perms/$',
EventPermissionList.as_view(), name='eventpermission-list'),
- url(r'events/(?P<graceid>[GEHMT]\d+)/perms/(?P<group_name>.+)/$',
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/perms/(?P<group_name>.+)/$',
GroupEventPermissionList.as_view(), name='groupeventpermission-list'),
- url(r'events/(?P<graceid>[GEHMT]\d+)/perms/(?P<group_name>.+)/(?P<perm_shortname>\w+)$',
+ url(r'^events/(?P<graceid>[GEHMT]\d+)/perms/(?P<group_name>.+)/(?P<perm_shortname>\w+)$',
GroupEventPermissionDetail.as_view(), name='groupeventpermission-detail'),
# Event File Resources
# events/{graceid}/files/[{filename}[/{version}]]
url(r'^events/(?P<graceid>\w[\d]+)/files/(?P<filename>.+)?$',
Files.as_view(), name="files"),
- # events/{graceid}/filemeta/[{filename}]
- url(r'^events/(?P<graceid>\w[\d]+)/filemeta/(?P<filename>.+)?$',
- FileMeta.as_view(), name="filemeta"),
# Event Labels
# events/{graceid}/labels/[{label}]
diff --git a/gracedb/events/api/views.py b/gracedb/events/api/views.py
index 915833395..4a657461c 100644
--- a/gracedb/events/api/views.py
+++ b/gracedb/events/api/views.py
@@ -243,7 +243,6 @@ def event_perm_object_required(view):
# "neighbors" : reverse("neighbors", args=[graceid], request=request),
# "log" : reverse("eventlog-list", args=[graceid], request=request),
# "files" : reverse("files", args=[graceid], request=request),
-# "filemeta" : reverse("filemeta", args=[graceid], request=request),
# "labels" : reverse("labels", args=[graceid], request=request),
# "self" : reverse("event-detail", args=[graceid], request=request),
# "tags" : reverse("eventtag-list", args=[graceid], request=request),
@@ -1517,10 +1516,6 @@ class GracedbRoot(APIView):
files = files.replace("G1200", "{graceid}")
files = files.replace("filename", "{filename}")
- filemeta = reverse('filemeta', args=["G1200", "filename"], request=request)
- filemeta = filemeta.replace("G1200", "{graceid}")
- filemeta = filemeta.replace("filename", "{filename}")
-
labels = reverse('labels', args=["G1200", "thelabel"], request=request)
labels = labels.replace("G1200", "{graceid}")
labels = labels.replace("thelabel", "{label}")
@@ -1547,7 +1542,6 @@ class GracedbRoot(APIView):
"embb-event-log-template" : embb,
"event-label-template" : labels,
"files-template" : files,
- "filemeta-template" : filemeta,
"tag-template" : tag,
"taglist-template" : taglist,
"signoff-list-template": signofflist,
@@ -1702,12 +1696,6 @@ class Files(APIView):
return response
-class FileMeta(APIView):
- """File Metadata Resource"""
- authentication_classes = (LigoAuthentication,)
- permission_classes = (IsAuthenticated,)
- pass
-
class PerformanceInfo(APIView):
"""
Serialized performance information
diff --git a/gracedb/events/view_utils.py b/gracedb/events/view_utils.py
index 8a6240658..9e560d645 100644
--- a/gracedb/events/view_utils.py
+++ b/gracedb/events/view_utils.py
@@ -336,7 +336,6 @@ def eventToDict(event, columns=None, request=None):
"log" : reverse("eventlog-list", args=[graceid], request=request),
"emobservations" : reverse("emobservation-list", args=[graceid], request=request),
"files" : reverse("files", args=[graceid], request=request),
- "filemeta" : reverse("filemeta", args=[graceid], request=request),
"labels" : reverse("labels", args=[graceid], request=request),
"self" : reverse("event-detail", args=[graceid], request=request),
"tags" : reverse("eventtag-list", args=[graceid], request=request),
--
GitLab