diff --git a/gracedb/alerts/events/__init__.py b/gracedb/alerts/events/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/gracedb/alerts/issuers/__init__.py b/gracedb/alerts/issuers/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..1edd95264b9d2520363ef1ad66b81eac0d7aa17d --- /dev/null +++ b/gracedb/alerts/issuers/__init__.py @@ -0,0 +1 @@ +# Submodule for alert issuer classes diff --git a/gracedb/alerts/utils.py b/gracedb/alerts/issuers/base.py similarity index 100% rename from gracedb/alerts/utils.py rename to gracedb/alerts/issuers/base.py diff --git a/gracedb/alerts/events/utils.py b/gracedb/alerts/issuers/events.py similarity index 98% rename from gracedb/alerts/events/utils.py rename to gracedb/alerts/issuers/events.py index 4bc9824fbd9f96adee250aed43ef7010da1cd81a..87e5610dfc2350c1442655174665e23ddbe19c4a 100644 --- a/gracedb/alerts/events/utils.py +++ b/gracedb/alerts/issuers/events.py @@ -11,7 +11,7 @@ from events.view_utils import eventToDict, eventLogToDict, signoffToDict, \ emObservationToDict, embbEventLogToDict, groupeventpermissionToDict, \ labelToDict, voeventToDict from ..main import issue_alerts -from ..utils import AlertIssuerWithParentObject +from .base import AlertIssuerWithParentObject # Set up logger logger = logging.getLogger(__name__) diff --git a/gracedb/alerts/superevents/utils.py b/gracedb/alerts/issuers/superevents.py similarity index 98% rename from gracedb/alerts/superevents/utils.py rename to gracedb/alerts/issuers/superevents.py index 10e92a8e109a5cb223b1b4a563bd802d3517014e..861390be125a669bb5820590955af6745cb1a5ef 100644 --- a/gracedb/alerts/superevents/utils.py +++ b/gracedb/alerts/issuers/superevents.py @@ -3,7 +3,7 @@ from api.v1.superevents.serializers import SupereventSerializer, \ SupereventVOEventSerializer, SupereventEMObservationSerializer, \ SupereventSignoffSerializer, SupereventGroupObjectPermissionSerializer from ..main import issue_alerts -from ..utils import AlertIssuerWithParentObject +from .base import AlertIssuerWithParentObject class AlertIssuerWithParentSuperevent(AlertIssuerWithParentObject): diff --git a/gracedb/alerts/superevents/__init__.py b/gracedb/alerts/superevents/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/gracedb/api/v1/events/views.py b/gracedb/api/v1/events/views.py index b5e77ee302fc6703d8c1cb991cc225c1b67343eb..178ef7f09a318865cb833fe4bf08ca53ac7caa33 100644 --- a/gracedb/api/v1/events/views.py +++ b/gracedb/api/v1/events/views.py @@ -32,7 +32,7 @@ from rest_framework.renderers import BaseRenderer, JSONRenderer, \ from rest_framework.response import Response from rest_framework.views import APIView -from alerts.events.utils import EventAlertIssuer, EventLogAlertIssuer, \ +from alerts.issuers.events import EventAlertIssuer, EventLogAlertIssuer, \ EventVOEventAlertIssuer, EventPermissionsAlertIssuer from api.throttling import BurstAnonRateThrottle from core.http import check_and_serve_file diff --git a/gracedb/events/view_logic.py b/gracedb/events/view_logic.py index 3822d9c5ee3c30c5cc782982c35412e4bdecc749..c55216164e616d924438c2db66d6c2f5e0a64ad8 100644 --- a/gracedb/events/view_logic.py +++ b/gracedb/events/view_logic.py @@ -16,7 +16,7 @@ from .view_utils import eventToDict, eventLogToDict, emObservationToDict, \ labelToDict from .permission_utils import assign_default_event_perms -from alerts.events.utils import EventAlertIssuer, EventLabelAlertIssuer, \ +from alerts.issuers.events import EventAlertIssuer, EventLabelAlertIssuer, \ EventEMObservationAlertIssuer, EventEMBBEventLogAlertIssuer from core.vfile import VersionedFile diff --git a/gracedb/events/views.py b/gracedb/events/views.py index 7c7f59d00a3d050005d0eeb5f3c7fbee601f7abd..a377f2c13e63683ecdd817b710965a1b0a66caa1 100644 --- a/gracedb/events/views.py +++ b/gracedb/events/views.py @@ -31,7 +31,7 @@ from .view_utils import get_file from .view_utils import get_recent_events_string from .view_utils import eventLogToDict from .view_utils import signoffToDict -from alerts.events.utils import EventAlertIssuer, EventLogAlertIssuer, \ +from alerts.issuers.events import EventAlertIssuer, EventLogAlertIssuer, \ EventSignoffAlertIssuer, EventPermissionsAlertIssuer from superevents.models import Superevent diff --git a/gracedb/superevents/utils.py b/gracedb/superevents/utils.py index f4f051a782999a3c830d3fbd381c88f2d261c2fa..b7aeec51bdf55eb1db88317fe9322139164f3be7 100644 --- a/gracedb/superevents/utils.py +++ b/gracedb/superevents/utils.py @@ -10,8 +10,8 @@ from .buildVOEvent import construct_voevent_file from .models import Superevent, Log, Labelling, EMObservation, EMFootprint, \ VOEvent, Signoff from .shortcuts import is_superevent -from alerts.events.utils import EventAlertIssuer, EventLogAlertIssuer -from alerts.superevents.utils import SupereventAlertIssuer, \ +from alerts.issuers.events import EventAlertIssuer, EventLogAlertIssuer +from alerts.issuers.superevents import SupereventAlertIssuer, \ SupereventLogAlertIssuer, SupereventLabelAlertIssuer, \ SupereventVOEventAlertIssuer, SupereventEMObservationAlertIssuer, \ SupereventSignoffAlertIssuer, SupereventPermissionsAlertIssuer