diff --git a/app/api/views/alias.py b/app/api/views/alias.py index ce3bbe6d..960c306e 100644 --- a/app/api/views/alias.py +++ b/app/api/views/alias.py @@ -200,6 +200,7 @@ def get_alias_activities(alias_id): activity = { "timestamp": alias_log.when.timestamp, "reverse_alias": alias_log.reverse_alias, + "reverse_alias_address": alias_log.contact.reply_email, } if alias_log.is_reply: activity["from"] = alias_log.alias diff --git a/app/dashboard/views/alias_log.py b/app/dashboard/views/alias_log.py index 56be2cb4..4afab504 100644 --- a/app/dashboard/views/alias_log.py +++ b/app/dashboard/views/alias_log.py @@ -17,6 +17,7 @@ class AliasLog: blocked: bool bounced: bool email_log: EmailLog + contact: Contact def __init__(self, **kwargs): for k, v in kwargs.items(): @@ -83,6 +84,7 @@ def get_alias_log(alias: Alias, page_id=0) -> [AliasLog]: blocked=email_log.blocked, bounced=email_log.bounced, email_log=email_log, + contact=contact ) logs.append(al) logs = sorted(logs, key=lambda l: l.when, reverse=True) diff --git a/docs/api.md b/docs/api.md index d1a80753..2db34520 100644 --- a/docs/api.md +++ b/docs/api.md @@ -449,14 +449,8 @@ If success, 200 with the list of activities, for example: "from": "yes_meo_chat@sl.local", "timestamp": 1580903760, "to": "marketing@example.com", - "reverse_alias": "\"marketing at example.com\" " - }, - { - "action": "reply", - "from": "yes_meo_chat@sl.local", - "timestamp": 1580903760, - "to": "marketing@example.com", - "reverse_alias": "\"marketing at example.com\" " + "reverse_alias": "\"marketing at example.com\" ", + "reverse_alias_address": "reply@a.b" } ] } diff --git a/tests/api/test_alias.py b/tests/api/test_alias.py index d7077cd2..dc9c58af 100644 --- a/tests/api/test_alias.py +++ b/tests/api/test_alias.py @@ -272,6 +272,7 @@ def test_alias_activities(flask_client): assert ac["timestamp"] assert ac["action"] assert ac["reverse_alias"] + assert ac["reverse_alias_address"] # second page, should return 1 or 2 results only r = flask_client.get(