update last_updated on send_bulk (#496)

Author: marsha97

post_office/mail.py

@@ -388,7 +388,7 @@ def send(email):
 
     # Update statuses of sent emails
     email_ids = [email.id for email in sent_emails]
-    Email.objects.filter(id__in=email_ids).update(status=STATUS.sent)
+    Email.objects.filter(id__in=email_ids).update(status=STATUS.sent, last_updated=timezone.now())
 
     # Update statuses and conditionally requeue failed emails
     num_failed, num_requeued = 0, 0
@@ -407,8 +407,9 @@ def send(email):
         else:
             email.status = STATUS.failed
             num_failed += 1
+        email.last_updated = timezone.now()
 
-    Email.objects.bulk_update(emails_failed, ['status', 'scheduled_time', 'number_of_retries'])
+    Email.objects.bulk_update(emails_failed, ['status', 'scheduled_time', 'number_of_retries', 'last_updated'])
 
     # If log level is 0, log nothing, 1 logs only sending failures
     # and 2 means log both successes and failures

post_office/tests/test_mail.py

@@ -96,8 +96,32 @@ def test_send_bulk(self):
             status=STATUS.queued,
             backend_alias='locmem',
         )
+        original_last_updated = email.last_updated
+
         _send_bulk([email], uses_multiprocessing=False)
-        self.assertEqual(Email.objects.get(id=email.id).status, STATUS.sent)
+        email.refresh_from_db()
+        self.assertEqual(email.status, STATUS.sent)
+        self.assertGreater(email.last_updated, original_last_updated)
+        self.assertEqual(len(mail.outbox), 1)
+        self.assertEqual(mail.outbox[0].subject, 'send bulk')
+
+        # test fail
+        email = Email.objects.create(
+            to=['[email protected]'],
+            from_email='[email protected]',
+            subject='send bulk',
+            message='Message',
+            status=STATUS.queued,
+            backend_alias='locmem',
+        )
+        original_last_updated = email.last_updated
+        with patch.object(Email, 'dispatch', side_effect=ValueError('test')):
+            _send_bulk([email], uses_multiprocessing=False)
+
+        email.refresh_from_db()
+        self.assertEqual(email.status, STATUS.requeued)
+        self.assertEqual(email.number_of_retries, 1)
+        self.assertGreater(email.last_updated, original_last_updated)
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].subject, 'send bulk')