From 5ff2cbb47184736c7bd665f056adf0dc565699b8 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Thu, 14 Jun 2018 17:17:57 -0500
Subject: [PATCH] Bugfix for superevent date ID regex
Changing \d+ to \d{6} in superevent date ID regex. This prevents
ValueErrors from occurring when people try to go to URLs like
/superevents/view/S0001.
---
gracedb/superevents/api/view_templates.py | 2 +-
gracedb/superevents/models.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gracedb/superevents/api/view_templates.py b/gracedb/superevents/api/view_templates.py
index dab31ff06..7aba61e66 100644
--- a/gracedb/superevents/api/view_templates.py
+++ b/gracedb/superevents/api/view_templates.py
@@ -7,7 +7,7 @@ from .views import SupereventViewSet, SupereventEventViewSet, \
# Placeholder parameters for getting URLs with reverse
PH = {
- SupereventViewSet.lookup_field: 'S1234', # superevent_id
+ SupereventViewSet.lookup_field: 'S800106', # superevent_id
SupereventEventViewSet.lookup_field: 'G1234', # graceid
SupereventLabelViewSet.lookup_field: 'LABEL_NAME', # label name
SupereventLogViewSet.lookup_field: '3333', # log number (N)
diff --git a/gracedb/superevents/models.py b/gracedb/superevents/models.py
index 37cbdc70e..1d814f8e4 100644
--- a/gracedb/superevents/models.py
+++ b/gracedb/superevents/models.py
@@ -42,7 +42,7 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel):
"""
DEFAULT_ID_PREFIX = 'S'
GW_ID_PREFIX = 'GW'
- ID_REGEX = r'(({0})(\d+)([a-z]*)|({1})(\d+)([A-Z]*))'.format(
+ ID_REGEX = r'(({0})(\d{{6}})([a-z]*)|({1})(\d{{6}})([A-Z]*))'.format(
DEFAULT_ID_PREFIX, GW_ID_PREFIX)
DATE_STR_FMT = '%y%m%d'
AUTO_FIELD = 'base_date_number'
--
GitLab