Resilience
/
wp6_plorabunt_be
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix email content

This commit is contained in:
YYE7321 2025-09-11 16:27:02 +02:00
parent 14ac0061e4
commit 6a03d07b5e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database_utils/tasks.py
View File

@ -427,7 +427,7 @@ def process_request_flow(requestId: int):
if request.user_email:
send_email(
content=f"A new resource request has been approved at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}.",
content=f"Your resource {request.content_request['event']} has been approved at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}.",
subject=f"Your request has been approved",
recipient=request.user_email,
recipient=request.user_email
)

8
routers/workflow.py
View File

@ -204,21 +204,21 @@ def update_request(request_id: int, state: models.ContentRequestState, entry_dat
if state == models.ContentRequestState.REJECTED:
send_email(
content=f"A resource request has been rejected at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}.",
content=f"Your resource {request.content_request['event']} has been rejected by {user.given_name} {user.family_name} at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}.",
subject=f"Your request has been rejected. Please review it.",
recipient=request.user_email
)
elif state == models.ContentRequestState.ARCHIVED:
if user.email != request.user_email:
send_email(
content=f"Your request has been archived at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}.",
content=f"Your resource {request.content_request['event']} has been archived by {user.given_name} {user.family_name} at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}.",
subject=f"Your request has been archived.",
recipient=request.user_email
)
elif state == models.ContentRequestState.SUBMITTED:
send_email(
content=f"A new resource request has been submitted at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}. Please review it.",
subject=f"New resource request submitted",
content=f"A new resource request for Terroristic attack of {request.content_request['event']} has been submitted by {request.user_firstname} {request.user_lastname} at {request.updated_at.strftime('%Y-%m-%d %H:%M:%S')}. Please review it.",
subject=f"New terroristic attack request submitted",
recipient=config.configs['WPLEAD_MAILING_LIST']
)

1
utils/smtp.py
View File

@ -5,7 +5,6 @@ import logging
from utils.config import configs
# from smtplib import SMTP_SSL as SMTP # this invokes the secure SMTP protocol (port 465, uses SSL)
from smtplib import SMTP # use this for standard SMTP protocol (port 25, no encryption)
import ssl