feat #4138 Upgrade and refactor contact system

Author: joemull

src/core/admin.py

@@ -131,6 +131,7 @@ class AccountAdmin(UserAdmin):
         admin_utils.RepositoryRoleInline,
         admin_utils.EditorialGroupMemberInline,
         admin_utils.StaffGroupMemberInline,
+        admin_utils.ContactPersonInline,
         admin_utils.PasswordResetInline,
     ]
 
@@ -558,35 +559,51 @@ def _journal(self, obj):
         return obj.group.journal if obj else ""
 
 
-class ContactsAdmin(admin.ModelAdmin):
-    list_display = ("name", "email", "role", "object", "sequence")
+class ContactPersonAdmin(admin.ModelAdmin):
+    list_display = ("_name", "_email", "role", "object", "sequence")
     list_filter = (
         admin_utils.GenericRelationJournalFilter,
         admin_utils.GenericRelationPressFilter,
     )
-    search_fields = ("name", "email", "role")
+    search_fields = (
+        "account__first_name",
+        "account__middle_name",
+        "account__last_name",
+        "account__email",
+        "role",
+    )
+    raw_id_fields = ("account",)
 
+    def _name(self, obj):
+        return obj.account.full_name() if obj and obj.account else ""
 
-class ContactAdmin(admin.ModelAdmin):
+    def _email(self, obj):
+        return obj.account.email if obj and obj.account else ""
+
+
+class ContactMessageAdmin(admin.ModelAdmin):
     list_display = (
         "subject",
         "sender",
-        "recipient",
-        "client_ip",
+        "account",
         "date_sent",
         "object",
     )
     list_filter = (
         admin_utils.GenericRelationJournalFilter,
         admin_utils.GenericRelationPressFilter,
         "date_sent",
-        "recipient",
+        "account",
     )
     search_fields = (
         "subject",
         "sender",
-        "recipient",
+        "account__first_name",
+        "account__middle_name",
+        "account__last_name",
+        "account__email",
     )
+    raw_id_fields = ("account",)
     date_hierarchy = "date_sent"
 
 
@@ -766,8 +783,8 @@ def _person(self, obj):
     (models.Workflow, WorkflowAdmin),
     (models.WorkflowLog, WorkflowLogAdmin),
     (models.LoginAttempt, LoginAttemptAdmin),
-    (models.Contacts, ContactsAdmin),
-    (models.Contact, ContactAdmin),
+    (models.ContactPerson, ContactPersonAdmin),
+    (models.ContactMessage, ContactMessageAdmin),
     (models.AccessRequest, AccessRequestAdmin),
     (models.Organization, OrganizationAdmin),
     (models.OrganizationName, OrganizationNameAdmin),

src/core/forms/__init__.py

@@ -20,7 +20,8 @@
     GetResetTokenForm,
     JournalArticleForm,
     JournalAttributeForm,
-    JournalContactForm,
+    ContactMessageForm,
+    ContactPersonForm,
     JournalImageForm,
     JournalStylingForm,
     JournalSubmissionForm,

src/core/forms/forms.py

@@ -84,18 +84,16 @@ def clean(self):
         return cleaned_data
 
 
-class JournalContactForm(JanewayTranslationModelForm):
+class ContactPersonForm(JanewayTranslationModelForm):
     def __init__(self, *args, **kwargs):
         next_sequence = kwargs.pop("next_sequence", None)
-        super(JournalContactForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         if next_sequence:
             self.fields["sequence"].initial = next_sequence
 
     class Meta:
-        model = models.Contacts
+        model = models.ContactPerson
         fields = (
-            "name",
-            "email",
             "role",
             "sequence",
         )
@@ -105,6 +103,34 @@ class Meta:
         )
 
 
+class ContactMessageForm(forms.ModelForm, CaptchaForm):
+    def __init__(self, *args, **kwargs):
+        subject = kwargs.pop("subject", None)
+        account = kwargs.pop("account", None)
+        contact_people = kwargs.pop("contact_people", None)
+        super().__init__(*args, **kwargs)
+        self.fields["account"].required = True
+        self.fields["account"].choices = [
+            (person.account.pk, person.account.full_name()) for person in contact_people
+        ]
+
+        if subject:
+            self.fields["subject"].initial = subject
+
+        if account:
+            self.fields["account"].initial = account.pk
+
+    class Meta:
+        model = models.ContactMessage
+        fields = ("account", "sender", "subject", "body")
+
+
+class JournalContactForm(ContactPersonForm):
+    def __init__(self, *args, **kwargs):
+        return DeprecationWarning("Use ContactPersonForm instead.")
+        super().__init__(*args, **kwargs)
+
+
 class EditorialGroupForm(JanewayTranslationModelForm):
     def __init__(self, *args, **kwargs):
         next_sequence = kwargs.pop("next_sequence", None)

src/core/include_urls.py

@@ -120,6 +120,11 @@
         press_views.IdentifierManager.as_view(),
         name="press_identifier_manager",
     ),
+    re_path(
+        r"^press/contact/$",
+        press_views.contact,
+        name="press_contact",
+    ),
     # Notes
     re_path(
         r"^article/(?P<article_id>\d+)/note/(?P<note_id>\d+)/delete/$",
@@ -256,22 +261,31 @@
         core_views.article_image_edit,
         name="core_article_image_edit",
     ),
-    # Journal Contacts
-    re_path(r"^manager/contacts/$", core_views.contacts, name="core_journal_contacts"),
+    # Contact People
     re_path(
-        r"^manager/contacts/add/$",
-        core_views.edit_contacts,
-        name="core_new_journal_contact",
+        r"^manager/contacts/$",
+        core_views.contact_people,
+        name="core_contact_people",
     ),
     re_path(
-        r"^manager/contacts/(?P<contact_id>\d+)/$",
-        core_views.edit_contacts,
-        name="core_journal_contact",
+        r"^manager/contacts/order/$",
+        core_views.contact_people_reorder,
+        name="core_contact_people_reorder",
     ),
     re_path(
-        r"^manager/contacts/order/$",
-        core_views.contacts_order,
-        name="core_journal_contacts_order",
+        r"^manager/contacts/search/$",
+        core_views.PotentialContactListView.as_view(),
+        name="core_contact_person_search",
+    ),
+    re_path(
+        r"^manager/contacts/add/(?P<account_id>\d+)/$",
+        core_views.contact_person_create,
+        name="core_contact_person_create",
+    ),
+    re_path(
+        r"^manager/contacts/(?P<contact_person_id>\d+)/$",
+        core_views.contact_person_update,
+        name="core_contact_person_update",
     ),
     # Editorial Team
     re_path(

src/core/logic.py

@@ -1221,3 +1221,59 @@ def create_organization_name(request):
             % {"organization": organization_name},
         )
         return organization_name
+
+
+def get_contact_form(request):
+    subject = request.GET.get("subject", "")
+    contact_people = request.site_type.contact_people
+    recipient_email = request.GET.get("recipient", "")
+    account = None
+    if recipient_email:
+        try:
+            account = models.Account.objects.get(
+                contactperson__pk__in=[cp.pk for cp in contact_people],
+                email__iexact=recipient_email,
+            )
+        except models.Account.DoesNotExist:
+            pass
+
+    if request.method == "POST":
+        contact_form = forms.ContactMessageForm(
+            request.POST,
+            contact_people=contact_people,
+        )
+    else:
+        contact_form = forms.ContactMessageForm(
+            subject=subject,
+            contact_people=contact_people,
+            account=account,
+        )
+    return contact_form, contact_people
+
+
+def send_contact_message(contact_form, request):
+    message = contact_form.save(commit=False)
+    message.content_type = request.model_content_type
+    message.object_id = request.site_type.pk
+    message.save()
+    body = message.body.replace("\n", "<br>")
+    notify_helpers.send_email_with_body_from_setting_template(
+        request=request,
+        template="contact_message",
+        subject=message.subject,
+        to=message.account.email,
+        context={
+            "site": request.journal or request.press,
+            "from": message.sender,
+            "to": message.account.email,
+            "subject": message.subject,
+            "body": body,
+            "custom_reply_to": message.sender,
+        },
+    )
+    messages.add_message(
+        request,
+        messages.SUCCESS,
+        _("Your message has been sent to %(recipient)s.")
+        % {"recipient": message.account.full_name()},
+    )

src/core/middleware.py

@@ -221,9 +221,11 @@ def process_request(request):
                 "cms_page",
                 "cms_nav",
                 "website_index",
-                "core_journal_contacts",
-                "core_journal_contact",
-                "core_journal_contacts_order",
+                "core_contact_people",
+                "core_contact_person_search",
+                "core_contact_person_create",
+                "core_contact_person_update",
+                "core_contact_people_reorder",
                 "contact",
                 "core_edit_settings_group",
             ]