[#2234] Determine subject for questions with + without e-suite code r…

…eplacement

src/open_inwoner/accounts/views/contactmoments.py

@@ -99,10 +99,7 @@ def get_kcm_data(
             ),
         }
 
-        # replace e_suite_subject_code with OIP configured subject, if applicable
-        e_suite_subject_code = getattr(kcm.contactmoment, "onderwerp", None)
-
-        data["onderwerp"] = self.get_kcm_subject(kcm, e_suite_subject_code)
+        data["onderwerp"] = self.get_kcm_subject(kcm)
 
         return data
 
@@ -114,11 +111,14 @@ def get_context_data(self, **kwargs):
     def get_kcm_subject(
         self,
         kcm: KlantContactMoment,
-        e_suite_subject_code: str | None,
     ) -> str | None:
         """
-        Try to determine the subject ('onderwerp') of a contactmoment
+        Determine the subject (`onderwerp`) of a `KlantContactMoment.contactmoment`:
+            1. by replacing e-suite subject code with OIP configured subject or
+            2. by returning e-suite subject code, if it exists
         """
+        e_suite_subject_code = getattr(kcm.contactmoment, "onderwerp", None)
+
         if not e_suite_subject_code:
             return None
 
@@ -133,7 +133,7 @@ def get_kcm_subject(
                 kcm.contactmoment.url,
                 exc_info=exc,
             )
-            return None
+            return e_suite_subject_code
 
         return subject.subject