Расширены тесты, убран личшний N+1 запрос в БД

Author: Toksi86

mailing/tasks.py

@@ -35,23 +35,27 @@ def _get_programs_for_scenario(scenario, target_date):
             raise ValueError(f"Unsupported trigger: {scenario.trigger}")
 
 
-def _get_recipients(scenario, program_id: int, target_date):
+def _get_recipients(scenario, program, target_date):
     match scenario.recipient_rule:
         case RecipientRule.ALL_PARTICIPANTS:
-            return program_participants(program_id)
+            return program_participants(program.id)
         case RecipientRule.NO_PROJECT_IN_PROGRAM:
-            return program_participants_without_project(program_id)
+            return program_participants_without_project(program.id)
         case RecipientRule.NO_PROJECT_IN_PROGRAM_REGISTERED_ON_DATE:
             return program_participants_without_project_registered_on(
-                program_id, target_date
+                program.id, target_date
             )
         case RecipientRule.PROJECT_NOT_SUBMITTED:
-            return program_participants_with_unsubmitted_project(program_id)
+            return program_participants_with_unsubmitted_project(program.id)
         case RecipientRule.INACTIVE_ACCOUNT_IN_PROGRAM:
-            return program_participants_with_inactive_account(program_id)
+            return program_participants_with_inactive_account(
+                program.id, program.datetime_started
+            )
         case RecipientRule.INACTIVE_ACCOUNT_IN_PROGRAM_REGISTERED_ON_DATE:
             return program_participants_with_inactive_account_registered_on(
-                program_id, target_date
+                program.id,
+                target_date,
+                program.datetime_started,
             )
         case _:
             raise ValueError(f"Unsupported recipient rule: {scenario.recipient_rule}")
@@ -63,7 +67,7 @@ def _deadline_date(program):
 
 
 def _send_scenario_for_program(scenario, program, scheduled_for, target_date):
-    recipients = _get_recipients(scenario, program.id, target_date)
+    recipients = _get_recipients(scenario, program, target_date)
     if not recipients.exists():
         return 0
 

mailing/tests.py

@@ -96,7 +96,9 @@ def test_participants_with_inactive_account(self):
             last_activity=self._dt(self.today - timedelta(days=1))
         )
 
-        recipients = program_participants_with_inactive_account(program.id)
+        recipients = program_participants_with_inactive_account(
+            program.id, program.datetime_started
+        )
         recipient_ids = set(recipients.values_list("id", flat=True))
 
         self.assertIn(inactive_no_activity.id, recipient_ids)
@@ -114,7 +116,7 @@ def test_participants_with_inactive_account_registered_on_date(self):
         self._register_user(registered_other_day, program, self.today - timedelta(days=2))
 
         recipients = program_participants_with_inactive_account_registered_on(
-            program.id, target_date
+            program.id, target_date, program.datetime_started
         )
         recipient_ids = set(recipients.values_list("id", flat=True))
 
@@ -152,8 +154,11 @@ def _register_user(self, user: CustomUser, program: PartnerProgram, registered_o
             datetime_created=self._dt(registered_on)
         )
 
-    @patch("mailing.tasks.send_mass_mail_from_template", _fake_send_mass_mail_from_template)
-    def test_registration_plus_3_inactive_account_scenario(self):
+    @patch(
+        "mailing.tasks.send_mass_mail_from_template",
+        side_effect=_fake_send_mass_mail_from_template,
+    )
+    def test_registration_plus_3_inactive_account_scenario(self, send_mail_mock):
         target_registration_date = self.today - timedelta(days=3)
 
         program = PartnerProgram.objects.create(
@@ -192,9 +197,28 @@ def test_registration_plus_3_inactive_account_scenario(self):
         )
         self.assertEqual(sent_logs.count(), 1)
         self.assertEqual(sent_logs.first().user_id, inactive_user.id)
+        self.assertEqual(send_mail_mock.call_count, 1)
+
+        second_run_sent_count = run_program_mailings()
+        self.assertEqual(second_run_sent_count, 0)
+        self.assertEqual(send_mail_mock.call_count, 1)
+
+        all_logs = MailingScenarioLog.objects.filter(
+            scenario_code="program_registration_plus_3_inactive_account",
+            program=program,
+            scheduled_for=self.today,
+        )
+        self.assertEqual(all_logs.count(), 1)
+        self.assertEqual(
+            all_logs.first().status,
+            MailingScenarioLog.Status.SENT,
+        )
 
-    @patch("mailing.tasks.send_mass_mail_from_template", _fake_send_mass_mail_from_template)
-    def test_registration_end_plus_3_inactive_account_scenario(self):
+    @patch(
+        "mailing.tasks.send_mass_mail_from_template",
+        side_effect=_fake_send_mass_mail_from_template,
+    )
+    def test_registration_end_plus_3_inactive_account_scenario(self, send_mail_mock):
         target_registration_end_date = self.today - timedelta(days=3)
 
         program = PartnerProgram.objects.create(
@@ -227,3 +251,19 @@ def test_registration_end_plus_3_inactive_account_scenario(self):
         )
         self.assertEqual(sent_logs.count(), 1)
         self.assertEqual(sent_logs.first().user_id, inactive_user.id)
+        self.assertEqual(send_mail_mock.call_count, 1)
+
+        second_run_sent_count = run_program_mailings()
+        self.assertEqual(second_run_sent_count, 0)
+        self.assertEqual(send_mail_mock.call_count, 1)
+
+        all_logs = MailingScenarioLog.objects.filter(
+            scenario_code="program_registration_end_plus_3_inactive_account",
+            program=program,
+            scheduled_for=self.today,
+        )
+        self.assertEqual(all_logs.count(), 1)
+        self.assertEqual(
+            all_logs.first().status,
+            MailingScenarioLog.Status.SENT,
+        )

partner_programs/selectors.py

@@ -41,12 +41,6 @@ def _participant_profiles(program_id: int):
     )
 
 
-def _program_start_datetime(program_id: int):
-    return PartnerProgram.objects.only("datetime_started").get(
-        id=program_id
-    ).datetime_started
-
-
 def _inactive_program_users(user_ids, program_started_at):
     effective_last_seen = Greatest(
         Coalesce(
@@ -133,17 +127,15 @@ def program_participants_with_unsubmitted_project(program_id: int):
     ).distinct()
 
 
-def program_participants_with_inactive_account(program_id: int):
+def program_participants_with_inactive_account(program_id: int, program_started_at):
     participant_ids = _participant_profiles(program_id).values_list("user_id", flat=True)
-    program_started_at = _program_start_datetime(program_id)
     return _inactive_program_users(participant_ids, program_started_at)
 
 
 def program_participants_with_inactive_account_registered_on(
-    program_id: int, target_date
+    program_id: int, target_date, program_started_at
 ):
     participant_ids = _participant_profiles(program_id).filter(
         datetime_created__date=target_date
     ).values_list("user_id", flat=True)
-    program_started_at = _program_start_datetime(program_id)
     return _inactive_program_users(participant_ids, program_started_at)