From a119a293fea39d6fb2b307556278ce38eaf9238b Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Thu, 17 Jan 2019 09:37:57 -0600
Subject: [PATCH] Reorganizing alerts app
---
gracedb/alerts/events/__init__.py | 0
gracedb/alerts/issuers/__init__.py | 1 +
gracedb/alerts/{utils.py => issuers/base.py} | 0
gracedb/alerts/{events/utils.py => issuers/events.py} | 2 +-
.../alerts/{superevents/utils.py => issuers/superevents.py} | 2 +-
gracedb/alerts/superevents/__init__.py | 0
gracedb/api/v1/events/views.py | 2 +-
gracedb/events/view_logic.py | 2 +-
gracedb/events/views.py | 2 +-
gracedb/superevents/utils.py | 4 ++--
10 files changed, 8 insertions(+), 7 deletions(-)
delete mode 100644 gracedb/alerts/events/__init__.py
create mode 100644 gracedb/alerts/issuers/__init__.py
rename gracedb/alerts/{utils.py => issuers/base.py} (100%)
rename gracedb/alerts/{events/utils.py => issuers/events.py} (98%)
rename gracedb/alerts/{superevents/utils.py => issuers/superevents.py} (98%)
delete mode 100644 gracedb/alerts/superevents/__init__.py
diff --git a/gracedb/alerts/events/__init__.py b/gracedb/alerts/events/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/gracedb/alerts/issuers/__init__.py b/gracedb/alerts/issuers/__init__.py
new file mode 100644
index 000000000..1edd95264
--- /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 4bc9824fb..87e5610df 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 10e92a8e1..861390be1 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 e69de29bb..000000000
diff --git a/gracedb/api/v1/events/views.py b/gracedb/api/v1/events/views.py
index b5e77ee30..178ef7f09 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 3822d9c5e..c55216164 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 7c7f59d00..a377f2c13 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 f4f051a78..b7aeec51b 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
--
GitLab