Allow more constellations for live voting (#3425)

---------

Co-authored-by: Hannes Janott <hannes.janott@openslides.com>

Author: MoonCubes

docs/actions/poll.create.md

@@ -70,7 +70,10 @@ The `entitled_group_ids` may not contain the meetings `anonymous_group_id`.
 
 The `max_votes_per_option` and `min_votes_amount` must be smaller or equal to `max_votes_amount`.
 
-The `live_voting_enabled` could be set for named motion and certain named assignment polls. Assignment polls also need pollmethod `Y` and not `global_yes` and `max_votes_amount` of 1 to set the option.
+The `live_voting_enabled` could be set for named motion and following named assignment polls:
+- polls with pollmethod `Y` and not `global_yes` and `max_votes_amount` of 1
+- polls with pollmethod `YNA` or `YN` and only one option
+- list polls
 
 ## Permissions
 The request user needs:

docs/actions/poll.update.md

@@ -45,7 +45,10 @@ The `entitled_group_ids` may not contain the meetings `anonymous_group_id`.
 
 The `max_votes_per_option` and `min_votes_amount` must be smaller or equal to `max_votes_amount` after the model has been updated.
 
-The `live_voting_enabled` could be set for named motion and certain named assignment polls. Assignment polls also need pollmethod `Y` and not `global_yes` and `max_votes_amount` of 1 to set the option.
+The `live_voting_enabled` could be set for named motion and following named assignment polls:
+- polls with pollmethod `Y` and not `global_yes` and `max_votes_amount` of 1
+- polls with pollmethod `YNA` or `YN` and only one option
+- list polls
 
 ## Permissions
 The request user needs:

openslides_backend/action/actions/poll/create.py

@@ -86,6 +86,7 @@ def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
         is_assignment_poll = (
             collection_from_fqid(instance["content_object_id"]) == "assignment"
         )
+        is_list_poll = "poll_candidate_user_ids" in instance.get("options", [{}])[0]
 
         # check enabled_electronic_voting
         if instance["type"] in (Poll.TYPE_NAMED, Poll.TYPE_PSEUDOANONYMOUS):
@@ -103,14 +104,26 @@ def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
                 is_motion_poll
                 or (
                     is_assignment_poll
-                    and not instance.get("global_yes")
-                    and instance["pollmethod"] == "Y"
-                    and instance.get("max_votes_amount") == 1
+                    and (
+                        (
+                            not instance.get("global_yes")
+                            and instance["pollmethod"] == "Y"
+                            and instance.get("max_votes_amount") == 1
+                        )
+                        or is_list_poll
+                        or (
+                            (
+                                instance["pollmethod"] == "YNA"
+                                or instance["pollmethod"] == "YN"
+                            )
+                            and len(instance.get("options", [])) == 1
+                        )
+                    )
                 )
             )
         ):
             raise ActionException(
-                "live_voting_enabled only allowed for named motion polls and named Yes assignment polls."
+                "live_voting_enabled only allowed for named motion polls and some named assignment polls."
             )
 
         # check entitled_group_ids and analog

openslides_backend/action/actions/poll/update.py

@@ -80,6 +80,7 @@ def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
                 "pollmethod",
                 "max_votes_amount",
                 "global_yes",
+                "option_ids",
             ],
         )
 
@@ -133,20 +134,42 @@ def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
         max_votes_amount_for_check = instance.get("max_votes_amount") or poll.get(
             "max_votes_amount"
         )
+        option_ids: list[int] = poll.get("option_ids", [])
+        length_for_check = len(option_ids)
+        content_object_id = (
+            self.datastore.get(
+                fqid_from_collection_and_id("option", option_ids[0]),
+                ["content_object_id"],
+            ).get("content_object_id")
+            if length_for_check
+            else None
+        )
+        is_list_poll = (
+            collection_from_fqid(content_object_id) == "poll_candidate_list"
+            if content_object_id
+            else False
+        )
         if instance.get("live_voting_enabled") and not (
             poll["type"] == Poll.TYPE_NAMED
             and (
                 collection_from_fqid(poll["content_object_id"]) == "motion"
                 or (
                     collection_from_fqid(poll["content_object_id"]) == "assignment"
-                    and not global_yes_for_check
-                    and pollmethod_for_check == "Y"
-                    and max_votes_amount_for_check == 1
+                    and (
+                        not global_yes_for_check
+                        and pollmethod_for_check == "Y"
+                        and max_votes_amount_for_check == 1
+                    )
+                    or is_list_poll
+                    or (
+                        (pollmethod_for_check == "YNA" or pollmethod_for_check == "YN")
+                        and length_for_check == 1
+                    )
                 )
             )
         ):
             raise ActionException(
-                "live_voting_enabled only allowed for named motion polls and named Yes assignment polls."
+                "live_voting_enabled only allowed for named motion polls and some named assignment polls."
             )
 
         if poll["type"] == Poll.TYPE_ANALOG and (

tests/system/action/poll/test_create.py

@@ -1132,19 +1132,57 @@ def test_live_voting_named_motion_poll(self) -> None:
         )
 
     def test_live_voting_named_assignment_poll(self) -> None:
-        self.base_live_voting_assigment()
+        self.base_test_live_voting_assignment()
 
-    def test_live_votng_named_assignment_poll_wrong_pollmethod(self) -> None:
-        self.base_live_voting_assigment({"pollmethod": "YN"})
+    def test_live_voting_list_poll(self) -> None:
+        self.set_models({"user/3": {"username": "User3"}})
+        self.base_test_live_voting_assignment(
+            {
+                "pollmethod": "YNA",
+                "options": [
+                    {"poll_candidate_user_ids": [1, 3]},
+                ],
+            }
+        )
+
+    def test_live_voting_named_assignment_poll_pollmethod_yna(self) -> None:
+        self.base_test_live_voting_assignment({"pollmethod": "YNA"})
+
+    def test_live_voting_named_assignment_poll_pollmethod_yn(self) -> None:
+        self.base_test_live_voting_assignment({"pollmethod": "YN"})
+
+    def test_live_voting_named_assignment_poll_wrong_globalyes(self) -> None:
+        self.base_test_live_voting_assignment(error_dict={"global_yes": True})
+
+    def test_live_voting_named_assignment_poll_wrong_max_votes(self) -> None:
+        self.base_test_live_voting_assignment(error_dict={"max_votes_amount": 2})
 
-    def test_live_votng_named_assignment_poll_wrong_globalyes(self) -> None:
-        self.base_live_voting_assigment({"global_yes": True})
+    def test_live_voting_named_assignment_poll_wrong_option_amount_yna(self) -> None:
+        self.base_test_live_voting_assignment(
+            error_dict={
+                "pollmethod": "YNA",
+                "options": [
+                    {"text": "option1"},
+                    {"text": "option2"},
+                ],
+            }
+        )
 
-    def test_live_votng_named_assignment_poll_wrong_max_votes(self) -> None:
-        self.base_live_voting_assigment({"max_votes_amount": 2})
+    def test_live_voting_named_assignment_poll_wrong_option_amount_yn(self) -> None:
+        self.base_test_live_voting_assignment(
+            error_dict={
+                "pollmethod": "YN",
+                "options": [
+                    {"text": "option1"},
+                    {"text": "option2"},
+                ],
+            }
+        )
 
-    def base_live_voting_assigment(
-        self, error_dict: dict[str, typing.Any] | None = None
+    def base_test_live_voting_assignment(
+        self,
+        override_dict: dict[str, typing.Any] | None = None,
+        error_dict: dict[str, typing.Any] | None = None,
     ) -> None:
         self.create_assignment(3, 1)
 
@@ -1159,6 +1197,7 @@ def base_live_voting_assigment(
                 "meeting_id": 1,
                 "options": [{"text": "test"}],
                 "live_voting_enabled": True,
+                **(override_dict if override_dict else {}),
                 **(error_dict if error_dict else {}),
             },
         )
@@ -1171,7 +1210,7 @@ def base_live_voting_assigment(
             self.assert_status_code(response, 400)
             self.assert_model_not_exists("poll/1")
             assert (
-                "live_voting_enabled only allowed for named motion polls and named Yes assignment polls."
+                "live_voting_enabled only allowed for named motion polls and some named assignment polls."
             ) in response.json["message"]
 
     def test_live_voting_not_allowed_type_analog(self) -> None:
@@ -1180,9 +1219,6 @@ def test_live_voting_not_allowed_type_analog(self) -> None:
     def test_live_voting_not_allowed_type_pseudoanonymous(self) -> None:
         self.base_live_voting_not_allowed(Poll.TYPE_PSEUDOANONYMOUS, True)
 
-    def test_live_voting_not_allowed_is_motion_poll_false(self) -> None:
-        self.base_live_voting_not_allowed(Poll.TYPE_NAMED, False)
-
     def base_live_voting_not_allowed(
         self, poll_type: str, is_motion_poll: bool
     ) -> None:
@@ -1205,6 +1241,6 @@ def base_live_voting_not_allowed(
         self.assert_status_code(response, 400)
         self.assert_model_not_exists("poll/1")
         self.assertEqual(
-            "live_voting_enabled only allowed for named motion polls and named Yes assignment polls.",
+            "live_voting_enabled only allowed for named motion polls and some named assignment polls.",
             response.json["message"],
         )