From 0530a8aab5071e7cfacf058fa48a3ed26d001a5c Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Sun, 31 May 2020 11:49:53 +0200 Subject: [PATCH] return creation_timestamp in GET /mailboxes --- README.md | 8 +++++--- app/api/views/mailbox.py | 2 ++ tests/api/test_mailbox.py | 15 ++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8c7bde63..533b852e 100644 --- a/README.md +++ b/README.md @@ -1138,7 +1138,7 @@ Input: - `Authentication` header that contains the api key Output: -List of mailboxes. Each mailbox has id, email, default field +List of mailboxes. Each mailbox has id, email, default, creation_timestamp field ```json { @@ -1146,12 +1146,14 @@ List of mailboxes. Each mailbox has id, email, default field { "email": "a@b.c", "id": 1, - "default": true + "default": true, + "creation_timestamp": 1590918512 }, { "email": "m1@example.com", "id": 2, - "default": false + "default": false, + "creation_timestamp": 1590918512 } ] } diff --git a/app/api/views/mailbox.py b/app/api/views/mailbox.py index 4bdbaa6d..53035f5f 100644 --- a/app/api/views/mailbox.py +++ b/app/api/views/mailbox.py @@ -162,6 +162,7 @@ def get_mailboxes(): - id - email - default: boolean - whether the mailbox is the default one + - creation_timestamp """ user = g.user @@ -172,6 +173,7 @@ def get_mailboxes(): "id": mb.id, "email": mb.email, "default": user.default_mailbox_id == mb.id, + "creation_timestamp": mb.created_at.timestamp, } for mb in user.mailboxes() ] diff --git a/tests/api/test_mailbox.py b/tests/api/test_mailbox.py index 512f6a77..a9523c5a 100644 --- a/tests/api/test_mailbox.py +++ b/tests/api/test_mailbox.py @@ -181,10 +181,11 @@ def test_get_mailboxes(flask_client): ) assert r.status_code == 200 # m2@example.com is not returned as it's not verified - assert r.json == { - "mailboxes": [ - {"email": "a@b.c", "id": 1, "default": True}, - {"email": "m1@example.com", "id": 2, "default": False}, - ] - } - print(json.dumps(r.json, indent=2)) + assert len(r.json["mailboxes"]) == 2 + for mb in r.json["mailboxes"]: + assert "email" in mb + assert "id" in mb + assert "default" in mb + assert "creation_timestamp" in mb + + print(r.json)