Skip to content

Fix Gmail multi-label filtering #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bbbstin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Gmail multi-label filtering #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/environments/mock-gmail/mock_gmail/api/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,9 @@ def list_messages(
elif lid == "SENT":
query = query.filter(Message.is_sent == True)
else:
query = query.join(MessageLabel).filter(MessageLabel.label_id == lid)
query = query.filter(
Message.labels.any(MessageLabel.label_id == lid)
)

if q:
filters = _parse_search_query(q)
Expand Down
33 changes: 33 additions & 0 deletions packages/environments/mock-gmail/tests/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,39 @@ def test_list_messages(self, client):
assert "id" in data["messages"][0]
assert "threadId" in data["messages"][0]

def test_list_messages_with_multiple_labels(self, client):
first_label_id = client.post(
"/gmail/v1/users/me/labels", json={"name": "First filter label"}
).json()["id"]
second_label_id = client.post(
"/gmail/v1/users/me/labels", json={"name": "Second filter label"}
).json()["id"]

matching_message = client.post(
"/gmail/v1/users/me/messages",
json={
"raw": _raw(subject="Matches both labels"),
"labelIds": [first_label_id, second_label_id],
},
).json()
client.post(
"/gmail/v1/users/me/messages",
json={
"raw": _raw(subject="Matches only one label"),
"labelIds": [first_label_id],
},
)

resp = client.get(
"/gmail/v1/users/me/messages",
params=[("labelIds", first_label_id), ("labelIds", second_label_id)],
)

assert resp.status_code == 200
assert [message["id"] for message in resp.json()["messages"]] == [
matching_message["id"]
]

def test_get_message(self, client):
# First list to get an ID
resp = client.get("/gmail/v1/users/me/messages")
Expand Down