revert(change_request): drop head-of-household replacement on Add Member (#871)

The explicit head-of-household replacement feature (commits 908cedc,
1612822, a8c9b05) is deferred to #1006 ("make it configurable to
prevent groups without head of household"), which is on hold. Removing
it here per QA so #871 ships the Add Member review-page fix without it.

Author: emjay0921

spp_change_request_v2/details/add_member.py

@@ -136,25 +136,6 @@ class SPPCRDetailAddMember(models.Model):
         help="True when the urn:openspp:vocab:group-membership-type vocabulary has any active code.",
     )
 
-    # ──────────────────────────────────────────────────────────────────────
-    # Head-of-household replacement (OP#871 QA round 1)
-    # When the target group already has a head and this new member is given the
-    # Head role, an info banner warns that applying will replace the current
-    # head. The replacement then happens automatically on apply.
-    # ──────────────────────────────────────────────────────────────────────
-    group_has_head = fields.Boolean(
-        compute="_compute_current_head",
-        string="Group Already Has a Head",
-    )
-    current_head_name = fields.Char(
-        compute="_compute_current_head",
-        string="Current Head of Household",
-    )
-    selected_role_is_head = fields.Boolean(
-        compute="_compute_selected_role_is_head",
-        string="Selected Role Is Head",
-    )
-
     # ──────────────────────────────────────────────────────────────────────
     # Read-only context: existing members of the group (for the spec's
     # "display a table with all members" requirement). Computed, not stored.
@@ -221,33 +202,3 @@ def _compute_existing_memberships(self):
                 rec.existing_membership_ids = Membership.search([("group", "=", group.id), ("status", "=", "active")])
             else:
                 rec.existing_membership_ids = Membership.browse([])
-
-    @api.depends("change_request_id", "change_request_id.registrant_id")
-    def _compute_current_head(self):
-        Membership = self.env["spp.group.membership"]
-        head_code = self.env["spp.vocabulary.code"].search(
-            [
-                ("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:group-membership-type"),
-                ("code", "=", "head"),
-            ],
-            limit=1,
-        )
-        for rec in self:
-            head = Membership.browse()
-            group = rec.change_request_id.registrant_id
-            if group and group.is_group and head_code:
-                head = Membership.search(
-                    [
-                        ("group", "=", group.id),
-                        ("status", "=", "active"),
-                        ("membership_type_ids", "=", head_code.id),
-                    ],
-                    limit=1,
-                )
-            rec.group_has_head = bool(head)
-            rec.current_head_name = head.individual.name if head else False
-
-    @api.depends("membership_type_id")
-    def _compute_selected_role_is_head(self):
-        for rec in self:
-            rec.selected_role_is_head = bool(rec.membership_type_id and rec.membership_type_id.code == "head")

spp_change_request_v2/strategies/add_member.py

@@ -180,31 +180,20 @@ def _attach_id_docs(self, detail, individual):
     def _is_head_role(self, code):
         return bool(code and code.code == HEAD_ROLE_CODE)
 
-    def _head_code(self):
-        return self.env["spp.vocabulary.code"].search(
-            [
-                ("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:group-membership-type"),
-                ("code", "=", HEAD_ROLE_CODE),
-            ],
-            limit=1,
-        )
-
     def _demote_existing_head_if_needed(self, detail, group):
-        """Demote the group's current head when the user confirmed replacement.
-
-        Only runs when ``replace_existing_head`` is set on the CR — making the
-        new member the head is an explicit action, not a silent side effect of
-        picking the Head role. "Demote" unlinks the ``head`` code from the
-        existing membership's ``membership_type_ids``; other roles are kept.
+        """When the new member is being added as head, demote any existing
+        head on the group first so the at-most-one-head invariant holds.
+
+        "Demote" means unlinking the ``head`` code from the existing
+        membership's ``membership_type_ids``. Other roles on the membership
+        are preserved; if the membership had only the head role, it ends up
+        with no roles (which is acceptable — the spec doesn't define a
+        downgrade target).
         """
-        # Only when the new member is being made head. Demotion is automatic on
-        # apply; the form warns the user beforehand via the info banner.
         if not self._is_head_role(detail.membership_type_id):
             return
 
-        head_code = self._head_code()
-        if not head_code:
-            return
+        head_code = detail.membership_type_id  # already resolved to "head"
         Membership = self.env["spp.group.membership"]
         existing_head_memberships = Membership.search(
             [
@@ -229,8 +218,6 @@ def _create_membership(self, detail, group, individual):
             "individual": individual.id,
             "start_date": fields.Datetime.now(),
         }
-        # The picked Role determines the new member's role; the replace toggle
-        # is only a confirmation that gates demoting the current head.
         if detail.membership_type_id:
             vals["membership_type_ids"] = [Command.link(detail.membership_type_id.id)]
         self.env["spp.group.membership"].create(vals)

spp_change_request_v2/tests/test_add_member_strategy.py

@@ -161,7 +161,7 @@ def test_adding_head_demotes_existing_head(self):
         )
         self.assertIn(self.head_kind, old_membership.membership_type_ids)
 
-        # Add new member as head — replacement happens automatically on apply.
+        # Add new member as head.
         cr = self._make_cr(
             given_name="New",
             family_name="Head",
@@ -178,34 +178,6 @@ def test_adding_head_demotes_existing_head(self):
         # Old head's membership had `head` removed.
         self.assertNotIn(self.head_kind, old_membership.membership_type_ids)
 
-    def test_non_head_role_leaves_existing_head(self):
-        """Adding a non-head member must not touch the group's existing head."""
-        if not self.head_kind or not self.member_kind:
-            self.skipTest("head/member membership-type codes not present")
-        old_head = self.partner_model.create({"name": "Keep Head", "is_registrant": True, "is_group": False})
-        old_membership = self.membership_model.create(
-            {
-                "group": self.group.id,
-                "individual": old_head.id,
-                "start_date": "2020-01-01",
-                "membership_type_ids": [Command.link(self.head_kind.id)],
-            }
-        )
-        cr = self._make_cr(given_name="Plain", family_name="Member", membership_type_id=self.member_kind.id)
-        detail = cr.get_detail()
-        self.assertTrue(detail.group_has_head)
-        self.assertFalse(detail.selected_role_is_head)  # drives the info banner visibility
-        cr.approval_state = "approved"
-        cr.action_apply()
-        new_member = detail.created_individual_id
-        new_membership = self.membership_model.search(
-            [("group", "=", self.group.id), ("individual", "=", new_member.id)]
-        )
-        self.assertIn(self.member_kind, new_membership.membership_type_ids)
-        self.assertNotIn(self.head_kind, new_membership.membership_type_ids)
-        # Existing head is untouched.
-        self.assertIn(self.head_kind, old_membership.membership_type_ids)
-
     # ──────────────────────────────────────────────────────────────────
     # Sub-record attachers
     # ──────────────────────────────────────────────────────────────────

spp_change_request_v2/views/detail_add_member_views.xml

@@ -171,29 +171,9 @@
                                 invisible="not type_requires_head"
                             >
                                 This Change Request type requires a Head of Household.
-                                Set the new member's <strong>Role</strong> to <em
-                            >Head</em> before applying.
-                            </div>
-
-                            <!-- Head-of-household replacement notice (OP#871 QA round 1):
-                                 shown only when Role is Head and the group already has one. -->
-                            <field name="group_has_head" invisible="1" />
-                            <field name="selected_role_is_head" invisible="1" />
-                            <div
-                                class="alert alert-warning"
-                                role="alert"
-                                invisible="not group_has_head or not selected_role_is_head"
-                            >
-                                <i class="fa fa-exclamation-triangle me-2" />
-                                This group already has a Head of Household
-                                (<field
-                                name="current_head_name"
-                                readonly="1"
-                                nolabel="1"
-                                class="d-inline"
-                            />).
-                                Applying this change request will make this new member the Head and
-                                remove the Head role from the current head.
+                                If you set the new member's <strong>Role</strong> to <em
+                            >Head</em>, the existing head of the group will be demoted
+                                automatically when the CR is applied.
                             </div>
 
                             <separator string="Existing members (read-only)" />