Abstract body_file/body check pattern with properties

Add html_body_content and text_body_content properties to SentEmail model
to centralize the logic for checking body_file vs body fallback. This
eliminates code duplication across tasks.py, admin/views.py, and tests.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>
Co-Authored-By: Marco Acierno <[email protected]>

Author: 3 people

backend/notifications/admin/views.py

@@ -15,8 +15,4 @@ def view_email_template(request, object_id):
 
 def view_sent_email(request, object_id):
     sent_email = cast(SentEmail, SentEmail.objects.get(id=object_id))
-    return HttpResponse(
-        sent_email.body_file.read().decode("utf-8")
-        if sent_email.body_file
-        else sent_email.body
-    )
+    return HttpResponse(sent_email.html_body_content)

backend/notifications/models.py

@@ -384,6 +384,18 @@ def is_delivered(self):
     def is_opened(self):
         return self.events.filter(event=SentEmailEvent.Event.opened).exists()
 
+    @property
+    def html_body_content(self):
+        if self.body_file:
+            return self.body_file.read().decode("utf-8")
+        return self.body
+
+    @property
+    def text_body_content(self):
+        if self.text_body_file:
+            return self.text_body_file.read().decode("utf-8")
+        return self.text_body
+
     def mark_as_sent(self, message_id: str):
         self.status = self.Status.sent
         self.sent_at = timezone.now()

backend/notifications/tasks.py

@@ -63,15 +63,8 @@ def send_pending_email(self, sent_email_id: int):
 def send_email(sent_email, email_backend_connection):
     logger.info(f"Sending sent_email_id={sent_email.id}")
 
-    if sent_email.body_file:
-        html_body = sent_email.body_file.read().decode("utf-8")
-    else:
-        html_body = sent_email.body
-
-    if sent_email.text_body_file:
-        text_body = sent_email.text_body_file.read().decode("utf-8")
-    else:
-        text_body = sent_email.text_body
+    html_body = sent_email.html_body_content
+    text_body = sent_email.text_body_content
 
     email_message = EmailMultiAlternatives(
         subject=sent_email.subject,

backend/notifications/tests/test_models.py

@@ -74,7 +74,7 @@ def test_send_email_template_to_recipient_email(
     assert sent_email.recipient_email == "[email protected]"
 
     assert sent_email.subject == "Subject abc"
-    assert "Body abc" in sent_email.body_file.read().decode("utf-8")
+    assert "Body abc" in sent_email.html_body_content
     assert sent_email.preview_text == "Preview abc"
     assert sent_email.reply_to == "[email protected]"
 
@@ -102,8 +102,8 @@ def test_send_email_template_to_recipient_user():
     assert sent_email.recipient_email == user.email
 
     assert sent_email.subject == "Subject abc"
-    assert "Body abc" in sent_email.body_file.read().decode("utf-8")
-    assert "Body abc" in sent_email.text_body_file.read().decode("utf-8")
+    assert "Body abc" in sent_email.html_body_content
+    assert "Body abc" in sent_email.text_body_content
     assert sent_email.preview_text == "Preview abc"
     assert sent_email.reply_to == "[email protected]"
 
@@ -138,7 +138,7 @@ def test_send_system_template_email(settings):
     assert sent_email.from_email == "[email protected]"
 
     assert sent_email.subject == "Subject abc"
-    assert "Body abc" in sent_email.body_file.read().decode("utf-8")
+    assert "Body abc" in sent_email.html_body_content
     assert sent_email.preview_text == "Preview abc"
     assert sent_email.reply_to == "[email protected]"