Skip to content

Commit 5894a46

Browse files
Fix error loading failed emails
1 parent 22206b6 commit 5894a46

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

src/schemas/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MessageGroup(BaseModel):
2424

2525
class Message(BaseModel):
2626
id: PositiveInt
27-
external_id: str
27+
external_id: Optional[str] = ''
2828
group_id: Optional[PositiveInt]
2929
company_id: Optional[PositiveInt]
3030

tests/test_user_display.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,34 @@ def test_user_list(cli, settings, send_email, sync_db: SyncDb):
5454
}
5555

5656

57+
def test_user_list_no_ext(cli, settings, send_email, sync_db: SyncDb):
58+
send_email(
59+
uid=str(uuid.uuid4()),
60+
company_code='testing',
61+
recipients=[{'address': '[email protected]'}],
62+
subject_template='test message',
63+
)
64+
sync_db.execute_b('update messages set external_id=null')
65+
r = cli.get(modify_url('/messages/email-test/', settings, 'testing'))
66+
assert r.status_code == 200, r.text
67+
data = r.json()
68+
assert data['count'] == 1
69+
first_item = data['items'][0]
70+
assert first_item == {
71+
'id': sync_db.fetchrow_b('select * from messages')['id'],
72+
'external_id': None,
73+
'to_ext_link': None,
74+
'to_address': '[email protected]',
75+
'to_dst': '<[email protected]>',
76+
'to_name': ' ',
77+
'send_ts': RegexStr(r'\d{4}-\d{2}-\d{2}.*'),
78+
'update_ts': RegexStr(r'\d{4}-\d{2}-\d{2}.*'),
79+
'status': 'Sent',
80+
'method': 'email-test',
81+
'subject': 'test message',
82+
}
83+
84+
5785
def test_user_search(cli, settings, send_email):
5886
msgs = {}
5987
for i, subject in enumerate(['apple', 'banana', 'cherry', 'durian']):

0 commit comments

Comments
 (0)