Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions alert_system/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ class EventAdmin(admin.ModelAdmin):
"stac_id",
"created_at",
"collection",
"guid",
)
list_filter = ("connector", "collection")
readonly_fields = ("connector",)
search_fields = (
"stac_id",
"correlation_id",
)
search_fields = ("stac_id",)


@admin.register(LoadItem)
Expand All @@ -31,7 +27,7 @@ class LoadItemAdmin(admin.ModelAdmin):
"id",
"event_title",
"created_at",
"guid",
"event_id",
"item_eligible",
"is_past_event",
)
Expand All @@ -46,21 +42,18 @@ class LoadItemAdmin(admin.ModelAdmin):
"related_montandon_events",
"related_go_events",
)
search_fields = (
"id",
"correlation_id",
)
search_fields = ("id",)


@admin.register(AlertEmailThread)
class AlertEmailThreadAdmin(admin.ModelAdmin):
list_display = (
"user",
"parent_guid",
"parent_event_id",
"root_email_message_id",
)
search_fields = (
"parent_guid",
"parent_event_id",
"root_email_message_id",
"user__username",
)
Expand Down
7 changes: 4 additions & 3 deletions alert_system/email_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,15 @@ def send_alert_email_notification(
if not is_reply:
thread = AlertEmailThread.objects.create(
user=user,
parent_guid=load_item.parent_guid,
parent_event_id=load_item.parent_event_id,
root_email_message_id=message_id,
root_message_sent_at=timezone.now(),
)
email_log.thread = thread
email_log.save(update_fields=["thread"])
logger.info(
f"Alert Email thread created for user [{user.get_full_name()}] " f"with parent_guid [{load_item.parent_guid}]"
f"Alert Email thread created for user [{user.get_full_name()}] "
f"with parent event [{load_item.parent_event_id}]"
)

logger.info(f"Alert email sent to [{user.get_full_name()}] for LoadItem ID [{load_item.id}]")
Expand Down Expand Up @@ -127,7 +128,7 @@ def process_email_alert(load_item_id: int) -> None:
existing_threads = {
thread.user_id: thread
for thread in AlertEmailThread.objects.filter(
parent_guid=load_item.parent_guid,
parent_event_id=load_item.parent_event_id,
user_id__in=user_ids,
)
}
Expand Down
Loading
Loading