Complete presenter tests

Author: vkrasnovyd

openslides_backend/presenter/get_forwarding_meetings.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import Any
 
 import fastjsonschema
@@ -76,8 +77,12 @@ def get_result(self) -> Any:
                         {
                             "id": meeting_id2,
                             "name": meeting2.get("name", ""),
-                            "start_time": meeting2.get("start_time"),
-                            "end_time": meeting2.get("end_time"),
+                            "start_time": self._get_formatted_datetime_value(
+                                meeting2, "start_time"
+                            ),
+                            "end_time": self._get_formatted_datetime_value(
+                                meeting2, "end_time"
+                            ),
                         }
                     )
             if meeting_result:
@@ -92,3 +97,14 @@ def get_result(self) -> Any:
                     }
                 )
         return result
+
+    @staticmethod
+    def _get_formatted_datetime_value(
+        meeting: dict[str, Any], field: str
+    ) -> str | None:
+        raw_value = meeting.get(field)
+        if not raw_value:
+            return None
+        if isinstance(raw_value, datetime):
+            return raw_value.isoformat()
+        return str(raw_value)

tests/system/presenter/base.py

@@ -1,8 +1,8 @@
-from collections import defaultdict
 from typing import Any
 
 from openslides_backend.http.application import OpenSlidesBackendWSGIApplication
 from openslides_backend.http.views.presenter_view import PresenterView
+from openslides_backend.services.database.interface import PartialModel
 from tests.system.base import BaseSystemTestCase
 from tests.system.util import create_presenter_test_application, get_route_path
 
@@ -29,71 +29,21 @@ def request(
         return (response.status_code, response.json)
 
     def create_meeting_for_two_users(
-        self, user1: int, user2: int, base: int = 1
+        self, base: int, user1: int, user2: int, meeting_data: PartialModel = {}
     ) -> None:
-        """
-        Creates meeting with id 1, committee 60 and groups with ids 1, 2, 3 by default.
-        With base you can setup other meetings, but be cautious because of group-ids
-        The groups have no permissions and no users by default.
-        Uses usernumber to create meeting users with the concatenation of base and usernumber.
-        """
-        committee_id = base + 59
+        self.create_meeting(base, meeting_data=meeting_data)
         self.set_models(
             {
-                f"meeting/{base}": {
-                    "group_ids": [base, base + 1, base + 2],
-                    "default_group_id": base,
-                    "admin_group_id": base + 1,
-                    "committee_id": committee_id,
-                    "is_active_in_organization_id": 1,
-                },
-                f"group/{base}": {
-                    "meeting_id": base,
-                    "default_group_for_meeting_id": base,
-                    "name": f"group{base}",
-                },
-                f"group/{base+1}": {
-                    "meeting_id": base,
-                    "admin_group_for_meeting_id": base,
-                    "name": f"group{base+1}",
-                },
-                f"group/{base+2}": {
-                    "meeting_id": base,
-                    "name": f"group{base+2}",
-                },
-                f"committee/{committee_id}": {
-                    "organization_id": 1,
-                    "name": f"Commitee{committee_id}",
-                    "meeting_ids": [base],
-                },
-                "organization/1": {
-                    "limit_of_meetings": 0,
-                    "active_meeting_ids": [base],
-                    "enable_electronic_voting": True,
-                },
                 f"meeting_user/{base}{user1}": {"user_id": user1, "meeting_id": base},
                 f"meeting_user/{base}{user2}": {"user_id": user2, "meeting_id": base},
             }
         )
 
-    def move_user_to_group(self, meeting_user_to_groups: dict[int, Any]) -> None:
+    def move_users_to_groups(self, user_to_groups: dict[int, list[int]]) -> None:
         """
         Sets the users groups, returns the meeting_user_ids
         Be careful as it does not reset previously set groups if the related meeting
         users are not in meeting_user_to_groups.
         """
-        groups_to_meeting_user = defaultdict(list)
-        for meeting_user_id, group_id in meeting_user_to_groups.items():
-            if group_id:
-                self.update_model(
-                    f"meeting_user/{meeting_user_id}", {"group_ids": [group_id]}
-                )
-                groups_to_meeting_user[group_id].append(meeting_user_id)
-            else:
-                self.update_model(
-                    f"meeting_user/{meeting_user_id}", {"group_ids": None}
-                )
-        for group_id, meeting_user_ids in groups_to_meeting_user.items():
-            self.update_model(
-                f"group/{group_id}", {"meeting_user_ids": meeting_user_ids}
-            )
+        for user_id, group_ids in user_to_groups.items():
+            self.set_user_groups(user_id, group_ids)