diff --git a/gracedb/superevents/migrations/0006_remove_superevent_alert_sent.py b/gracedb/superevents/migrations/0006_remove_superevent_alert_sent.py new file mode 100644 index 0000000000000000000000000000000000000000..46a2f07c8ca95e13e63ea943d87e171d5a2b4209 --- /dev/null +++ b/gracedb/superevents/migrations/0006_remove_superevent_alert_sent.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2018-05-25 19:32 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('superevents', '0005_preferred_event_required'), + ] + + operations = [ + migrations.RemoveField( + model_name='superevent', + name='alert_sent', + ), + ] diff --git a/gracedb/superevents/models.py b/gracedb/superevents/models.py index 435843eb72c2e15543008030f578101d46dad772..50ed0b9cf06e89d5349473df4d6d4986940458a3 100644 --- a/gracedb/superevents/models.py +++ b/gracedb/superevents/models.py @@ -35,17 +35,14 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel): If there are multiple superevents on the same date, a letter prefix is added: S180101a, S180101b, etc., based on how many other superevents exist for the given date. - Once an alert is sent out about a superevent, its prefix is changed to - 'GWA': GWA180101a. Once a superevent is confirmed as a GW, its prefix is changed to 'GW' and its suffix is recalculated in terms of how many confirmed GWs - exist for the given date. Ex: S180101b -> GWA180101b -> GW180101A + exist for the given date. Ex: S180101b -> GW180101A """ DEFAULT_ID_PREFIX = 'S' - ALERT_ID_PREFIX = 'GWA' GW_ID_PREFIX = 'GW' - ID_REGEX = r'(({0}|{1})(\d+)([a-z]*)|({2})(\d+)([A-Z]*))'.format( - DEFAULT_ID_PREFIX, ALERT_ID_PREFIX, GW_ID_PREFIX) + ID_REGEX = r'(({0})(\d+)([a-z]*)|({1})(\d+)([A-Z]*))'.format( + DEFAULT_ID_PREFIX, GW_ID_PREFIX) DATE_STR_FMT = '%y%m%d' AUTO_FIELD = 'base_date_number' AUTO_CONSTRAINT = 't_0_date' @@ -81,7 +78,6 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel): editable=False) # Booleans - alert_sent = models.BooleanField(default=False) is_gw = models.BooleanField(default=False) # Meta class -------------------------------------------------------------- @@ -148,14 +144,6 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel): self.preferred_event not in self.events.all()): self.events.add(self.preferred_event) - def mark_as_alert_sent(self): - """ - Sets alert_sent to True. May add functionality to calculate an - 'alert_date_number' if that becomes necessary - """ - self.alert_sent = True - self.save(update_fields=['alert_sent']) - def confirm_as_gw(self): """ Sets is_gw to True, calculates the gw_date_number in the database, and @@ -255,9 +243,6 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel): date_number_key = 'gw_date_number' else: date_number_key = 'base_date_number' - if prefix == cls.ALERT_ID_PREFIX: - # Require that alert_sent is True if using the ALERT_ID_PREFIX - q_kwargs['alert_sent'] = True q_kwargs[date_number_key] = date_number return q_kwargs @@ -289,13 +274,12 @@ class Superevent(CleanSaveModel, ModelToDictMixin, AutoIncrementModel): @property def superevent_id(self): - id_prefix = self.DEFAULT_ID_PREFIX - letter_suffix = self.base_letter_suffix if self.is_gw: id_prefix = self.GW_ID_PREFIX - letter_suffix = self.gw_letter_suffix if self.gw_letter_suffix else "" - elif self.alert_sent: - id_prefix = self.ALERT_ID_PREFIX + letter_suffix = self.gw_letter_suffix + else: + id_prefix = self.DEFAULT_ID_PREFIX + letter_suffix = self.base_letter_suffix return id_prefix + self.t_0_date.strftime(self.DATE_STR_FMT) + \ letter_suffix diff --git a/gracedb/superevents/query.py b/gracedb/superevents/query.py index 8df4092fa00dbc278db1ea720a8b439abcd3b32f..1e971c121a2916cf46ef38e2c6380a9c6018cd46 100644 --- a/gracedb/superevents/query.py +++ b/gracedb/superevents/query.py @@ -38,8 +38,6 @@ def parse_superevent_id(name, toks, filter_prefix=None): else: fullQ &= Q(**{fp("gw_date_number"): letters_to_int(suffix)}) else: - if prefix and prefix == Superevent.ALERT_ID_PREFIX: - fullQ &= Q(**{fp("alert_sent"): True}) if not suffix: if not prefix: @@ -59,8 +57,8 @@ def parse_superevent_id(name, toks, filter_prefix=None): # Construct an expression for date-based superevent ids superevent_prefix = Optional(Or([CaselessLiteral(pref) for pref in - Superevent.DEFAULT_ID_PREFIX, Superevent.ALERT_ID_PREFIX, - Superevent.GW_ID_PREFIX])).setResultsName('prefix') + Superevent.DEFAULT_ID_PREFIX, Superevent.GW_ID_PREFIX]) + ).setResultsName('prefix') superevent_date = Word(nums, exact=6).setResultsName('date') superevent_suffix = Optional(Word(alphas)).setResultsName('suffix') superevent_expr = Combine(superevent_prefix + superevent_date +