Merge pull request #195 from maykinmedia/task-468-contact-to-message-…

…link

[#468] Fix/different emails in admin contact add

src/open_inwoner/accounts/models.py

@@ -275,7 +275,7 @@ def is_not_active(self) -> bool:
         return not self.is_active()
 
     def get_message_url(self) -> str:
-        url = furl(reverse("accounts:inbox")).add({"with": self.email}).url
+        url = furl(reverse("accounts:inbox")).add({"with": self.other_user_email}).url
         return f"{url}#messages-last"
 
     def get_created_by_name(self):

src/open_inwoner/accounts/query.py

@@ -134,7 +134,7 @@ def get_extended_contacts_for_user(self, me):
             )
             .annotate(
                 other_user_email=Case(
-                    When(created_by=me, then=F("email")),
+                    When(created_by=me, then=F("contact_user__email")),
                     default=F("created_by__email"),
                 )
             )

src/open_inwoner/accounts/tests/test_contact_views.py

@@ -97,8 +97,14 @@ def test_contact_filter_without_any_contacts(self):
         )
 
     def test_contact_list_show_link_to_messages(self):
+        other_user = UserFactory()
+        contact = ContactFactory.create(created_by=self.user, contact_user=other_user)
+        contacts = Contact.objects.get_extended_contacts_for_user(self.user)
+        extended_contact = contacts.get(id=contact.id)
         message_link = (
-            furl(reverse("accounts:inbox")).add({"with": self.contact.email}).url
+            furl(reverse("accounts:inbox"))
+            .add({"with": extended_contact.other_user_email})
+            .url
         )
         response = self.app.get(self.list_url, user=self.user)
         self.assertContains(response, message_link)

src/open_inwoner/templates/pages/plans/detail.html

@@ -49,7 +49,7 @@ <h1 class="h1" id="title">
                         <p class="plan-contact__info">{{ contact.get_name }}</p>
                         <p class="plan-contact__info">{{ contact.function }}</p>
                         <p class="plan-contact__info">{{ contact.phonenumber }}</p>
-                        <p class="plan-contact__info">{{ contact.email }}</p>
+                        <p class="plan-contact__info">{{ contact.contact_user.email }}</p>
                     {% else %}
                         <p class="plan-contact__info">{{ contact.get_created_by_name }}</p>
                         <p class="plan-contact__info">{{ contact.function }}</p>