Compare commits

..
2 changed files with 8 additions and 1 deletions
+2
View File
@@ -347,6 +347,7 @@ def error_callback(
uid=message_uid, uid=message_uid,
uid_validity=uid_validity, uid_validity=uid_validity,
defaults={ defaults={
"owner": rule.owner,
"subject": message_subject[:256], "subject": message_subject[:256],
"received": received, "received": received,
"status": "FAILED", "status": "FAILED",
@@ -947,6 +948,7 @@ class MailAccountHandler(LoggingMixin):
folder=rule.folder, folder=rule.folder,
uid_validity=self._current_uid_validity, uid_validity=self._current_uid_validity,
defaults={ defaults={
"owner": rule.owner,
"subject": message.subject[:256], "subject": message.subject[:256],
"received": make_aware(message.date) "received": make_aware(message.date)
if is_naive(message.date) if is_naive(message.date)
+6 -1
View File
@@ -384,8 +384,10 @@ class TestMail(
) )
account = MailAccount.objects.create() account = MailAccount.objects.create()
owner = UserFactory()
rule = MailRule.objects.create( rule = MailRule.objects.create(
account=account, account=account,
owner=owner,
consumption_scope=MailRule.ConsumptionScope.ATTACHMENTS_ONLY, consumption_scope=MailRule.ConsumptionScope.ATTACHMENTS_ONLY,
) )
@@ -400,6 +402,7 @@ class TestMail(
folder=rule.folder, folder=rule.folder,
) )
self.assertEqual(processed.status, "PROCESSED_WO_CONSUMPTION") self.assertEqual(processed.status, "PROCESSED_WO_CONSUMPTION")
self.assertEqual(processed.owner, owner)
# Calling it again must not create a second row # Calling it again must not create a second row
self.mail_account_handler._handle_message(message, rule) self.mail_account_handler._handle_message(message, rule)
@@ -1843,7 +1846,8 @@ class TestErrorCallback:
THEN: THEN:
- Only one ProcessedMail row is created for that mail - Only one ProcessedMail row is created for that mail
""" """
rule = MailRuleFactory() owner = UserFactory()
rule = MailRuleFactory(owner=owner)
message_uid = "12345" message_uid = "12345"
for _ in range(2): for _ in range(2):
@@ -1866,6 +1870,7 @@ class TestErrorCallback:
) )
assert processed_mails.count() == 1 assert processed_mails.count() == 1
assert processed_mails.get().status == "FAILED" assert processed_mails.get().status == "FAILED"
assert processed_mails.get().owner == owner
class TestManagementCommand(TestCase): class TestManagementCommand(TestCase):