Убраны дублирующиеся функции

Author: Toksi86

mailing/rendering.py

@@ -0,0 +1,18 @@
+from partner_programs.models import PartnerProgram
+from users.models import CustomUser
+
+
+def render_subject(subject: str, program: PartnerProgram) -> str:
+    return subject.replace("{program_name}", program.name)
+
+
+def render_template_value(
+    value: str,
+    program: PartnerProgram,
+    user: CustomUser,
+) -> str:
+    return (
+        value.replace("{program_name}", program.name)
+        .replace("{program_id}", str(program.id))
+        .replace("{user_id}", str(user.id))
+    )

mailing/scenarios.py

@@ -3,6 +3,7 @@
 from enum import Enum
 from typing import Callable
 
+from mailing.rendering import render_template_value
 from partner_programs.models import PartnerProgram
 from users.models import CustomUser
 
@@ -40,14 +41,6 @@ class Scenario:
     context_builder: ContextBuilder
 
 
-def _render_context_value(value: str, program: PartnerProgram, user: CustomUser) -> str:
-    return (
-        value.replace("{program_name}", program.name)
-        .replace("{program_id}", str(program.id))
-        .replace("{user_id}", str(user.id))
-    )
-
-
 def _build_context(
     *,
     preview_text: str,
@@ -58,14 +51,14 @@ def _build_context(
 ) -> ContextBuilder:
     def _builder(program: PartnerProgram, user: CustomUser, _ref_date: date) -> dict:
         context = {
-            "preview_text": _render_context_value(preview_text, program, user),
-            "title": _render_context_value(title, program, user),
-            "text": _render_context_value(text, program, user),
+            "preview_text": render_template_value(preview_text, program, user),
+            "title": render_template_value(title, program, user),
+            "text": render_template_value(text, program, user),
         }
         if button_text is not None:
-            context["button_text"] = _render_context_value(button_text, program, user)
+            context["button_text"] = render_template_value(button_text, program, user)
         if button_link is not None:
-            context["button_link"] = _render_context_value(button_link, program, user)
+            context["button_link"] = render_template_value(button_link, program, user)
         return context
 
     return _builder

mailing/tasks.py

@@ -5,6 +5,7 @@
 
 from mailing.constants import FAILED_ANYMAIL_STATUSES
 from mailing.models import MailingScenarioLog
+from mailing.rendering import render_subject
 from mailing.scenarios import RecipientRule, SCENARIOS, TriggerType
 from mailing.utils import send_mass_mail_from_template
 from partner_programs.selectors import (
@@ -23,10 +24,6 @@
 logger = logging.getLogger(__name__)
 
 
-def _build_subject(scenario, program) -> str:
-    return scenario.subject.replace("{program_name}", program.name)
-
-
 def _get_programs_for_scenario(scenario, target_date):
     match scenario.trigger:
         case TriggerType.PROGRAM_SUBMISSION_DEADLINE:
@@ -216,7 +213,7 @@ def status_callback(user, msg):
     try:
         num_sent = send_mass_mail_from_template(
             recipients_to_send,
-            _build_subject(scenario, program),
+            render_subject(scenario.subject, program),
             scenario.template_name,
             context_builder=context_builder,
             status_callback=status_callback,