Removed partner role, migrated all existing partners to coapplicants with comment priveledges

Author: wes-otf

.test_durations

@@ -38,7 +38,6 @@ class ActivityAdapter(AdapterBase):
         MESSAGES.INVITED_TO_PROPOSAL: _("Invited to submit a proposal"),
         MESSAGES.REVIEWERS_UPDATED: "reviewers_updated",
         MESSAGES.BATCH_REVIEWERS_UPDATED: "batch_reviewers_updated",
-        MESSAGES.PARTNERS_UPDATED: "partners_updated",
         MESSAGES.NEW_REVIEW: _("Submitted a review"),
         MESSAGES.OPENED_SEALED: _("Opened the submission while still sealed"),
         MESSAGES.SCREENING: "handle_screening_statuses",
@@ -89,7 +88,6 @@ def extra_kwargs(self, message_type, source, sources, **kwargs):
             MESSAGES.REVIEW_OPINION,
             MESSAGES.DELETE_REVIEW_OPINION,
             MESSAGES.BATCH_REVIEWERS_UPDATED,
-            MESSAGES.PARTNERS_UPDATED,
             MESSAGES.APPROVE_PROJECT,
             MESSAGES.REQUEST_PROJECT_CHANGE,
             MESSAGES.SEND_FOR_APPROVAL,
@@ -287,18 +285,6 @@ def handle_batch_transition(self, transitions, sources, **kwargs):
                 old_phase=old_phase, source=submission, **kwargs
             )
 
-    def partners_updated(self, added, removed, **kwargs):
-        message = [_("Partners updated.")]
-        if added:
-            message.append(_("Added:"))
-            message.append(", ".join([str(user) for user in added]) + ".")
-
-        if removed:
-            message.append(_("Removed:"))
-            message.append(", ".join([str(user) for user in removed]) + ".")
-
-        return " ".join(message)
-
     def handle_report_frequency(self, config, **kwargs):
         new_schedule = config.get_frequency_display()
         return _(

hypha/apply/activity/adapters/activity_feed.py

@@ -9,7 +9,6 @@
 from django.utils.translation import gettext as _
 
 from hypha.apply.activity import tasks
-from hypha.apply.activity.models import ALL, APPLICANT_PARTNERS, PARTNER
 from hypha.apply.funds.models.co_applicants import (
     CoApplicantProjectPermission,
     CoApplicantRole,
@@ -65,8 +64,6 @@ class EmailAdapter(AdapterBase):
         MESSAGES.READY_FOR_REVIEW: "handle_ready_for_review",
         MESSAGES.REVIEWERS_UPDATED: "handle_ready_for_review",
         MESSAGES.BATCH_REVIEWERS_UPDATED: "handle_batch_ready_for_review",
-        MESSAGES.PARTNERS_UPDATED: "partners_updated_applicant",
-        MESSAGES.PARTNERS_UPDATED_PARTNER: "partners_updated_partner",
         MESSAGES.UPLOAD_CONTRACT: "messages/email/contract_uploaded.html",
         MESSAGES.SUBMIT_CONTRACT_DOCUMENTS: "messages/email/submit_contract_documents.html",
         MESSAGES.CREATED_PROJECT: "messages/email/project_created.html",
@@ -328,10 +325,6 @@ def recipients(self, message_type, source, user, **kwargs):
             related = kwargs.get("related", None)
             return [related.invited_user_email]
 
-        if message_type == MESSAGES.PARTNERS_UPDATED_PARTNER:
-            partners = kwargs["added"]
-            return [partner.email for partner in partners]
-
         if message_type == MESSAGES.APPROVE_PAF:
             from hypha.apply.projects.models.project import ProjectSettings
 
@@ -488,12 +481,6 @@ def recipients(self, message_type, source, user, **kwargs):
                 ).values_list("user__email", flat=True)
                 recipients: List[str] = [source.user.email, *co_applicants]
 
-                if partners := list(source.partners.values_list("email", flat=True)):
-                    if comment.visibility == PARTNER:
-                        recipients = partners
-                    elif comment.visibility in [APPLICANT_PARTNERS, ALL]:
-                        recipients += partners
-
             # Comment handling for Projects
             elif isinstance(source, Project):
                 # co_applciants with Comment permission
@@ -557,23 +544,6 @@ def reviewers(self, source):
             and not reviewer.is_apply_staff
         ]
 
-    def partners_updated_applicant(self, added, removed, **kwargs):
-        if added:
-            return self.render_message(
-                "messages/email/partners_update_applicant.html", added=added, **kwargs
-            )
-
-    def partners_updated_partner(self, added, removed, **kwargs):
-        if added:
-            recipient = kwargs["recipient"]
-            # Pass the user object to render_message rather than the email string
-            recipient_obj = User.objects.get(email__exact=recipient)
-            kwargs["recipient"] = recipient_obj
-
-            return self.render_message(
-                "messages/email/partners_update_partner.html", **kwargs
-            )
-
     def render_message(self, template, **kwargs):
         with language(settings.LANGUAGE_CODE):
             text = render_to_string(template, kwargs, kwargs["request"])

hypha/apply/activity/adapters/emails.py

@@ -45,9 +45,6 @@ class SlackAdapter(AdapterBase):
         ),
         MESSAGES.REVIEWERS_UPDATED: "reviewers_updated",
         MESSAGES.BATCH_REVIEWERS_UPDATED: "handle_batch_reviewers",
-        MESSAGES.PARTNERS_UPDATED: _(
-            "{user} has updated the partners on <{link}|{source.title_text_display}>"
-        ),
         MESSAGES.TRANSITION: _(
             "{user} has updated the status of <{link}|{source.title_text_display}>: {old_phase.display_name} → {source.phase.display_name}"
         ),

hypha/apply/activity/adapters/slack.py

@@ -42,15 +42,8 @@ class Meta:
         }
 
     def __init__(self, *args, user=None, **kwargs):
-        # Get `submission_partner_list` kwarg and remove it before initializing parent.
-        submission_partner_list = None
-        if "submission_partner_list" in kwargs:
-            submission_partner_list = kwargs.pop("submission_partner_list")
-
         super().__init__(*args, **kwargs)
-        self.visibility_choices = self._meta.model.visibility_choices_for(
-            user, submission_partner_list
-        )
+        self.visibility_choices = self._meta.model.visibility_choices_for(user)
         visibility = self.fields["visibility"]
         # Set default visibility to "Applicant" for staff and staff can view everything.
         visibility.initial = self.visibility_choices[0]

hypha/apply/activity/forms.py

@@ -26,7 +26,6 @@ class Migration(migrations.Migration):
                     ("INVITED_TO_PROPOSAL", "Invited To Proposal"),
                     ("REVIEWERS_UPDATED", "Reviewers Updated"),
                     ("BATCH_REVIEWERS_UPDATED", "Batch Reviewers Updated"),
-                    ("PARTNERS_UPDATED", "Partners Updated"),
                     ("READY_FOR_REVIEW", "Ready For Review"),
                     ("BATCH_READY_FOR_REVIEW", "Batch Ready For Review"),
                     ("NEW_REVIEW", "New Review"),

hypha/apply/activity/migrations/0019_partner_field_event.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.2.12 on 2026-03-25 18:29
+
+from django.db import migrations
+
+from hypha.apply.activity.models import APPLICANT
+
+
+def convert_partner_perms_to_applicant(apps, schema_editor):
+    Activity = apps.get_model("activity", "Activity")
+
+    # Encompasses both "partner" & "applicant partner" visibilities
+    Activity.objects.filter(visibility__contains="partner").update(visibility=APPLICANT)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("activity", "0088_activity_deleted"),
+    ]
+
+    operations = [migrations.RunPython(convert_partner_perms_to_applicant)]

hypha/apply/activity/migrations/0089_remove_partner_perms.py

@@ -7,7 +7,7 @@
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.db.models import Case, Q, QuerySet, Value, When
+from django.db.models import Case, Q, Value, When
 from django.db.models.functions import Concat
 from django.urls import reverse
 from django.utils import timezone
@@ -32,18 +32,14 @@
 APPLICANT = _("applicant")
 TEAM = _("team")
 REVIEWER = _("reviewers")
-PARTNER = _("partners")
 ALL = _("all")
-APPLICANT_PARTNERS = f"{APPLICANT} {PARTNER}"
 
 # Visibility choice strings
 VISIBILITY = {
     APPLICANT: _("Applicants"),
     TEAM: _("Staff only"),
     REVIEWER: _("Reviewers"),
-    PARTNER: _("Partners"),
     ALL: _("All"),
-    APPLICANT_PARTNERS: _("Applicants & Partners"),
 }
 
 
@@ -67,16 +63,12 @@ def visible_to(self, user) -> models.QuerySet:
 
         user_qs = Q(user=user)
 
-        # There are scenarios where users will have activities in which they
-        # wouldn't have visibility just using Activity.visibility_for. Thus,
-        # the queryset should include activity in which they author via
-        # `user_qs` (ie. A comment made only to staff from a partner).
         if user.is_applicant:
-            # Handle the edge case where a partner or reviewer is also an
+            # Handle the edge case where a xreviewer is also an
             # applicant. Ensures that any applications/projects the user
             # authored will have comment visibility of applicant while others
             # will get the appropriate role.
-            if user.is_partner or user.is_reviewer:
+            if user.is_reviewer:
                 ApplicationSubmission = apps.get_model("funds", "ApplicationSubmission")
                 Project = apps.get_model("application_projects", "Project")
 
@@ -253,7 +245,7 @@ def get_absolute_url(self):
     @property
     def privileged(self):
         # Not visible to applicant
-        return self.visibility not in [APPLICANT, PARTNER, APPLICANT_PARTNERS, ALL]
+        return self.visibility not in [APPLICANT, ALL]
 
     @property
     def private(self):
@@ -270,11 +262,7 @@ def visibility_for(
         """Gets activity visibility for a specified user
 
         Takes an optional boolean that is used to determine the visibility of
-        an application comment. This was mainly implemented to allow partners
-        also holding the role of applicant to have a proper visibility.
-
-        ie. Prevent someone with the role of partner & applicant looking at
-        comments on their own application and seeing partner visibility
+        an application comment.
 
         Args:
             user:
@@ -285,72 +273,33 @@ def visibility_for(
         Returns:
             A list of visibility strings
         """
-        if user.is_apply_staff:
-            return [TEAM, APPLICANT, REVIEWER, APPLICANT_PARTNERS, PARTNER, ALL]
+        if user.is_apply_staff or user.is_finance or user.is_contracting:
+            return [TEAM, APPLICANT, REVIEWER, ALL]
         if user.is_reviewer and not is_submission_author:
             return [REVIEWER, ALL]
-        if user.is_finance or user.is_contracting:
-            # for project part
-            return [TEAM, APPLICANT, REVIEWER, PARTNER, ALL]
-        if user.is_partner and not is_submission_author:
-            return [PARTNER, ALL, APPLICANT_PARTNERS]
         if user.is_applicant:
-            return [APPLICANT, ALL, APPLICANT_PARTNERS]
+            return [APPLICANT, ALL]
 
         return [ALL]
 
     @classmethod
-    def visibility_choices_for(
-        cls, user, submission_partner_list: Optional[QuerySet] = None
-    ) -> List[Tuple[str, str]]:
+    def visibility_choices_for(cls, user) -> List[Tuple[str, str]]:
         """Gets activity visibility choices for the specified user
 
-        Uses the given user (and partner query set if provided) to give
-        the specified user activity visibility choices.
-
         Args:
-            user:
-                The [`User`][hypha.apply.users.models.User] being given
-                visibility choices
-            submission_has_partner:
-                An optional QuerySet of partners
-                ([`Users`][hypha.apply.users.models.User])
+            user: The [`User`][hypha.apply.users.models.User] being given visibility choices
+
         Returns:
             A list of tuples in the format of:
             [(<visibility string>, <visibility display string>), ...]
         """
-        has_partner = submission_partner_list and len(submission_partner_list) > 0
 
         if user.is_apply_staff:
-            if not has_partner:
-                choices = [
-                    (TEAM, VISIBILITY[TEAM]),
-                    (APPLICANT, VISIBILITY[APPLICANT]),
-                    (REVIEWER, VISIBILITY[REVIEWER]),
-                    (ALL, VISIBILITY[ALL]),
-                ]
-            else:
-                choices = [
-                    (TEAM, VISIBILITY[TEAM]),
-                    (APPLICANT, VISIBILITY[APPLICANT]),
-                    (PARTNER, VISIBILITY[PARTNER]),
-                    (APPLICANT_PARTNERS, VISIBILITY[APPLICANT_PARTNERS]),
-                    (REVIEWER, VISIBILITY[REVIEWER]),
-                    (ALL, VISIBILITY[ALL]),
-                ]
-            return choices
-
-        if user.is_partner and has_partner and submission_partner_list.contains(user):
             return [
-                (APPLICANT_PARTNERS, VISIBILITY[APPLICANT_PARTNERS]),
-                (PARTNER, VISIBILITY[PARTNER]),
                 (TEAM, VISIBILITY[TEAM]),
-            ]
-
-        if user.is_applicant and has_partner:
-            return [
-                (APPLICANT_PARTNERS, VISIBILITY[PARTNER]),
-                (APPLICANT, VISIBILITY[TEAM]),
+                (APPLICANT, VISIBILITY[APPLICANT]),
+                (REVIEWER, VISIBILITY[REVIEWER]),
+                (ALL, VISIBILITY[ALL]),
             ]
 
         if user.is_applicant:

hypha/apply/activity/models.py

@@ -21,8 +21,6 @@ class MESSAGES(TextChoices):
     INVITED_TO_PROPOSAL = "INVITED_TO_PROPOSAL", _("invited to proposal")
     REVIEWERS_UPDATED = "REVIEWERS_UPDATED", _("updated reviewers")
     BATCH_REVIEWERS_UPDATED = "BATCH_REVIEWERS_UPDATED", _("batch updated reviewers")
-    PARTNERS_UPDATED = "PARTNERS_UPDATED", _("updated partners")
-    PARTNERS_UPDATED_PARTNER = "PARTNERS_UPDATED_PARTNER", _("partners updated partner")
     READY_FOR_REVIEW = "READY_FOR_REVIEW", _("marked ready for review")
     BATCH_READY_FOR_REVIEW = (
         "BATCH_READY_FOR_REVIEW",