[IMP] event: mailing amdi updates

The slot scheduled dates are in utc, not in the event tz.
Archive slot mailing when the slot is archived to prevent them being send.

Task-4307566

Author: amdi-odoo

addons/event/models/event_mail.py

@@ -305,14 +305,14 @@ def _refresh_mail_count_done(self, mail_slot=False):
             elif mail_slot and mail_slot.last_registration_id:
                 total_sent = self.env["event.registration"].search_count([
                     ("id", "<=", mail_slot.last_registration_id.id),
-                    ("event_id", "=", self.event_id.id),
+                    ("event_id", "=", scheduler.event_id.id),
                     ("event_slot_id", "=", mail_slot.event_slot_id.id),
                     ("state", "not in", ["draft", "cancel"]),
                 ])
                 mail_slot.mail_count_done = total_sent
                 mail_slot.mail_done = total_sent >= mail_slot.event_slot_id.seats_taken
-                self.mail_count_done = sum(self.mail_slot_ids.mapped('mail_count_done'))
-                self.mail_done = total_sent >= self.event_id.seats_taken
+                scheduler.mail_count_done = sum(scheduler.mail_slot_ids.mapped('mail_count_done'))
+                scheduler.mail_done = total_sent >= scheduler.event_id.seats_taken
             elif scheduler.last_registration_id:
                 total_sent = self.env["event.registration"].search_count([
                     ("id", "<=", self.last_registration_id.id),

addons/event/models/event_mail_slot.py

@@ -12,6 +12,7 @@ class EventMailRegistration(models.Model):
     _rec_name = 'scheduler_id'
     _order = 'scheduled_date DESC, id ASC'
 
+    active = fields.Boolean("Active", default=True)
     event_slot_id = fields.Many2one('event.slot', 'Slot', ondelete='cascade', required=True)
     error_datetime = fields.Datetime('Last Error')
     scheduled_date = fields.Datetime('Schedule Date', compute='_compute_scheduled_date', store=True)

addons/event/models/event_slot.py

@@ -28,6 +28,7 @@ class EventSlot(models.Model):
     end_hour = fields.Float("Ending Hour", required=True, default=12.0, help="Expressed in the event timezone.")
     start_datetime = fields.Datetime("Start Datetime", compute="_compute_datetimes", store=True)
     end_datetime = fields.Datetime("End Datetime", compute="_compute_datetimes", store=True)
+    slot_mail_ids = fields.One2many("event.mail.slot", "event_slot_id", string="Mail Schedule", copy=True)
 
     # Registrations
     is_sold_out = fields.Boolean(
@@ -140,14 +141,15 @@ def _compute_seats(self):
             slot.seats_taken = slot.seats_reserved + slot.seats_used
 
     def unlink(self):
-        """ Archive the slot instead of deleting it if it's linked to existing registrations.
-        This allows an easier slots management from the calendar view (can unlink a slot without validation errors).
-        The slot cannot be registered to anymore and its related registrations are also archived as
-        they're now considered unrelevant.
+        """ Archive the slot instead of deleting it if it's linked to existing
+        registrations from a direct relation or from its related slot tickets.
+        Archive the related slot tickets to prevent any further registrations.
+        Also archive the existing registrations and scheduled mailings as they're not relevant anymore.
         """
         slots_w_registrations = self.filtered(lambda slot: slot.registration_ids)
-        slots_w_registrations.action_archive()
         slots_w_registrations.registration_ids.action_archive()
+        slots_w_registrations.slot_mail_ids.action_archive()
+        slots_w_registrations.action_archive()
         return super(EventSlot, self - slots_w_registrations).unlink()
 
     @staticmethod

addons/event/tests/test_event_mail_schedule.py

@@ -9,6 +9,7 @@
 from odoo import exceptions
 from odoo.addons.base.tests.test_ir_cron import CronMixinCase
 from odoo.addons.event.tests.common import EventCase
+from odoo.addons.event.models.event_mail import EventMail
 from odoo.addons.mail.tests.common import MailCase
 from odoo.tests import tagged, users, warmup
 from odoo.tools import formataddr, mute_logger
@@ -47,7 +48,7 @@ def setUpClass(cls):
         cls._setup_test_reports()
         with cls.mock_datetime_and_now(cls, cls.reference_now):
             # create with admin to force create_date
-            cls.test_event = cls.env['event.event'].create({
+            cls.test_event = cls.env['event.event'].with_user(cls.user_eventmanager).create({
                 'name': 'TestEventMail',
                 'user_id': cls.user_eventmanager.id,
                 'date_begin': cls.event_date_begin,
@@ -635,6 +636,8 @@ def test_event_mail_schedule_on_slot(self):
             test_event = self.test_event.with_env(self.env)
             test_event.write({
                 'is_multi_slots': True,
+                # Start and end hours expressed in event tz
+                # The slots datetimes will be saved in utc
                 'event_slot_ids': [
                     (0, 0, {
                         'date': self.event_date_end.date() - relativedelta(days=1),
@@ -648,12 +651,14 @@ def test_event_mail_schedule_on_slot(self):
                     }),
                 ],
             })
+        # Verify datetimes in UTC
+        self.assertEqual(test_event.date_tz, 'Europe/Brussels')
         self.assertEqual(
             test_event.event_slot_ids.mapped('start_datetime'),
-            [datetime(2021, 3, 23, 8, 0, 0), datetime(2021, 3, 24, 8, 0, 0)])
+            [datetime(2021, 3, 23, 7, 0, 0), datetime(2021, 3, 24, 7, 0, 0)])
         self.assertEqual(
             test_event.event_slot_ids.mapped('end_datetime'),
-            [datetime(2021, 3, 23, 18, 0, 0), datetime(2021, 3, 24, 18, 0, 0)])
+            [datetime(2021, 3, 23, 17, 0, 0), datetime(2021, 3, 24, 17, 0, 0)])
 
         # create some registrations (even wrong registrations without slot)
         with self.mock_datetime_and_now(self.reference_now):
@@ -686,13 +691,12 @@ def test_event_mail_schedule_on_slot(self):
             self.assertFalse(mail_slot.mail_count_done)
             self.assertFalse(mail_slot.mail_done)
         mail_slot_1 = event_prev_scheduler.mail_slot_ids.filtered(lambda s: s.event_slot_id.date == self.event_date_end.date() - relativedelta(days=1))
-        self.assertEqual(mail_slot_1.scheduled_date, datetime(2021, 3, 22, 8, 0, 0))
+        self.assertEqual(mail_slot_1.scheduled_date, datetime(2021, 3, 22, 7, 0, 0))
         mail_slot_2 = event_prev_scheduler.mail_slot_ids.filtered(lambda s: s.event_slot_id.date == self.event_date_end.date())
-        self.assertEqual(mail_slot_2.scheduled_date, datetime(2021, 3, 23, 8, 0, 0))
+        self.assertEqual(mail_slot_2.scheduled_date, datetime(2021, 3, 23, 7, 0, 0))
 
         # execute cron to run scheduler on first slot
-        slot1_before_oneday = datetime(2021, 3, 23, 8, 0, 0) - relativedelta(days=1)
-        EventMail = type(self.env['event.mail'])
+        slot1_before_oneday = datetime(2021, 3, 23, 7, 0, 0) - relativedelta(days=1)
         exec_origin = EventMail._execute_event_based_for_registrations
         with patch.object(
             EventMail, '_execute_event_based_for_registrations', autospec=True, wraps=EventMail, side_effect=exec_origin,
@@ -716,6 +720,27 @@ def test_event_mail_schedule_on_slot(self):
         self.assertFalse(event_prev_scheduler.mail_done)
         self.assertSchedulerCronTriggers(capture, [slot1_before_oneday])
 
+        # deleting a slot with registrations archives it and prevents its mailings to be send
+        first_slot = test_event.event_slot_ids[0]
+        first_slot.unlink()
+        self.assertFalse(first_slot.active)
+        for mail_slot in first_slot.slot_mail_ids:
+            self.assertFalse(mail_slot.active)
+
+        slot1_before_oneday_archived = datetime(2021, 3, 23, 7, 0, 0) - relativedelta(days=1)
+        exec_origin = EventMail._execute_event_based_for_registrations
+        with patch.object(
+            EventMail, '_execute_event_based_for_registrations', autospec=True, wraps=EventMail, side_effect=exec_origin,
+        ) as mock_exec:
+            capture = self.execute_event_cron(freeze_date=slot1_before_oneday_archived)
+
+        # mailing hasn't been sent, info should stay the same
+        self.assertEqual(mail_slot_1.mail_count_done, 4)
+        self.assertFalse(mail_slot_1.mail_done)
+        self.assertEqual(event_prev_scheduler.mail_count_done, 4)
+        self.assertFalse(event_prev_scheduler.mail_done)
+        self.assertSchedulerCronTriggers(capture, [])
+
     @mute_logger('odoo.addons.base.models.ir_model', 'odoo.models')
     @users('user_eventmanager')
     @warmup