Merge pull request #1493 from maykinmedia/swr/fixes-demo-2024-11-12

Fixes prompted by prep for demo 2024 11 12
maykinmedia · Nov 13, 2024 · 5e660ba · 5e660ba
2 parents 3433e33 + 1fe0edf
commit 5e660ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/open_inwoner/accounts/signals.py b/src/open_inwoner/accounts/signals.py
@@ -53,7 +53,7 @@ def update_user_from_klant_on_login(sender, user, request, *args, **kwargs):
             fetch_params=fetch_params, user=user
         )
         if partij and not created:
-            service.update_user_from_partij(partij_uuid=partij.uuid, user=user)
+            service.update_user_from_partij(partij_uuid=partij["uuid"], user=user)
 
     # eSuite
     try:

diff --git a/src/open_inwoner/accounts/views/contactmoments.py b/src/open_inwoner/accounts/views/contactmoments.py
@@ -65,7 +65,7 @@ class VragenService(Protocol):
     def list_questions(
         self,
         fetch_params: FetchParameters,
-        user: User | None = None,
+        user: User,
     ) -> Iterable[Question]:  # noqa: E704
         ...
 
@@ -89,7 +89,7 @@ def get_fetch_parameters(
 class KlantContactMomentBaseView(
     CommonPageMixin, BaseBreadcrumbMixin, KlantContactMomentAccessMixin, TemplateView
 ):
-    def get_service(self, service_type: str) -> VragenService:
+    def get_service(self, service_type: KlantenServiceType) -> VragenService:
         if service_type == KlantenServiceType.ESUITE:
             return eSuiteVragenService()
         elif service_type == KlantenServiceType.OPENKLANT2:

diff --git a/src/open_inwoner/accounts/views/signals.py b/src/open_inwoner/accounts/views/signals.py
@@ -24,7 +24,7 @@ def get_or_create_klant_for_new_user(
 
     # OpenKlant2
     # TODO: replace with proper config and refactor branching
-    use_ok2 = getattr(settings, "OPENKLANT2_ACTIVE", None)
+    use_ok2 = getattr(settings, "OPENKLANT2_CONFIG", None)
     if use_ok2 and (openklant2_config := OpenKlant2Config.from_django_settings()):
         try:
             service = OpenKlant2Service(config=openklant2_config)

diff --git a/src/open_inwoner/openklant/services.py b/src/open_inwoner/openklant/services.py
@@ -854,7 +854,7 @@ def find_organisatie_for_vestigingsnummer(
 
     def get_or_create_partij_for_user(
         self, fetch_params: FetchParameters, user: User
-    ) -> (Partij | None, bool):
+    ) -> tuple[Partij | None, bool]:
         partij = None
         created = False
 
@@ -1247,10 +1247,10 @@ def questions_for_partij(self, partij_uuid: str) -> list[OpenKlant2Question]:
     def list_questions(
         self, fetch_params: FetchParameters, user: User
     ) -> list[Question]:
-        if bsn := fetch_params.get("user_bsn"):
-            partij = self.find_persoon_for_bsn(bsn)
-        elif kvk_or_rsin := fetch_params.get("user_kvk_or_rsin"):
-            partij = self.find_organisatie_for_kvk(kvk_or_rsin)
+        partij, created = self.get_or_create_partij_for_user(fetch_params, user)
+        if not partij:
+            # Will be logged by get_or_create_partij_for_user
+            return []
 
         questions = self.questions_for_partij(partij_uuid=partij["uuid"])
         return self._reformat_questions(questions, user)
@@ -1265,7 +1265,7 @@ def _reformat_questions(
     ) -> list[Question]:
         questions = []
         for q in questions_ok2:
-            answer_metadata = KlantContactMomentAnswer.objects.get_or_create(
+            answer_metadata, _ = KlantContactMomentAnswer.objects.get_or_create(
                 user=user, contactmoment_url=q.url
             )
             question = {
@@ -1274,7 +1274,7 @@ def _reformat_questions(
                 "subject": q.onderwerp,
                 "registered_date": q.plaatsgevonden_op,
                 "question_text": q.question,
-                "answer_text": q.answer.answer,
+                "answer_text": getattr(q.answer, "answer", None),
                 "status": "",
                 "channel": q.kanaal,
                 "case_detail_url": "",
@@ -1287,7 +1287,7 @@ def _reformat_questions(
         return [QuestionValidator.validate_python(q) for q in questions]
 
     def _has_new_answer_available(
-        self, question: Question, answer: KlantContactMomentAnswer
+        self, question: OpenKlant2Question, answer: KlantContactMomentAnswer
     ) -> bool:
         answer_is_recent = instance_is_new(
             question.answer,

diff --git a/src/open_inwoner/templates/pages/contactmoment/list.html b/src/open_inwoner/templates/pages/contactmoment/list.html
@@ -26,7 +26,7 @@ <h2 class="utrecht-heading-2">{% trans "Stel een vraag" %}</h2>
 
     {# grid with questions #}
     <div class="contactmomenten">
-        {% if vragen %}
+        {% if contactmomenten %}
             <h2 class="contactmomenten__title">{% trans "Eerder gestelde vragen" %}</h2>
         {% else %}
             <h2>{% trans "U heeft op dit moment nog geen vragen." %}</h2>