wip

Author: vkrasnovyd

openslides_backend/action/actions/assignment/create_update_delete.py

@@ -8,7 +8,6 @@
 from ...action_set import ActionSet
 from ...generics.update import UpdateAction
 from ...mixins.create_action_with_dependencies import CreateActionWithDependencies
-from ...mixins.sequential_numbers_mixin import SequentialNumbersMixin
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action_set
 from ..agenda_item.agenda_creation import (
@@ -26,7 +25,6 @@
 
 class AssignmentCreate(
     AttachmentMixin,
-    SequentialNumbersMixin,
     CreateActionWithDependencies,
     CreateActionWithAgendaItemMixin,
     CreateActionWithListOfSpeakersMixin,

openslides_backend/action/actions/motion_block/create_update_delete.py

@@ -2,7 +2,6 @@
 from ....permissions.permissions import Permissions
 from ...action_set import ActionSet
 from ...mixins.create_action_with_dependencies import CreateActionWithDependencies
-from ...mixins.sequential_numbers_mixin import SequentialNumbersMixin
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action_set
 from ..agenda_item.agenda_creation import (
@@ -17,7 +16,6 @@
 
 
 class MotionBlockCreate(
-    SequentialNumbersMixin,
     CreateActionWithDependencies,
     CreateActionWithAgendaItemMixin,
     CreateActionWithListOfSpeakersMixin,

openslides_backend/action/actions/motion_category/create_update_delete.py

@@ -3,13 +3,12 @@
 from ....models.models import MotionCategory
 from ....permissions.permissions import Permissions
 from ...action_set import ActionSet
-from ...mixins.sequential_numbers_mixin import SequentialNumbersMixin
 from ...mixins.weight_mixin import WeightMixin
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action_set
 
 
-class MotionCategoryCreate(SequentialNumbersMixin, WeightMixin):
+class MotionCategoryCreate(WeightMixin):
     def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
         instance["weight"] = self.get_weight(instance["meeting_id"])
         return super().update_instance(instance)

openslides_backend/action/actions/motion_comment_section/create.py

@@ -4,15 +4,12 @@
 from ....permissions.permissions import Permissions
 from ...generics.create import CreateAction
 from ...mixins.forbid_anonymous_group_mixin import ForbidAnonymousGroupMixin
-from ...mixins.sequential_numbers_mixin import SequentialNumbersMixin
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action
 
 
 @register_action("motion_comment_section.create")
-class MotionCommentSectionCreateAction(
-    SequentialNumbersMixin, CreateAction, ForbidAnonymousGroupMixin
-):
+class MotionCommentSectionCreateAction(CreateAction, ForbidAnonymousGroupMixin):
     """
     Create Action with default weight.
     """

openslides_backend/action/actions/motion_workflow/create.py

@@ -6,7 +6,6 @@
 from ...action import Action
 from ...generics.create import CreateAction
 from ...mixins.create_action_with_dependencies import CreateActionWithDependencies
-from ...mixins.sequential_numbers_mixin import SequentialNumbersMixin
 from ...util.action_type import ActionType
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action
@@ -17,7 +16,7 @@
 
 
 @register_action("motion_workflow.create")
-class MotionWorkflowCreateAction(SequentialNumbersMixin, CreateActionWithDependencies):
+class MotionWorkflowCreateAction(CreateActionWithDependencies):
     """
     Action to create a motion workflow.
     """
@@ -44,7 +43,7 @@ def get_dependent_action_data(
 @register_action(
     "motion_workflow.create_simple_workflow", action_type=ActionType.BACKEND_INTERNAL
 )
-class MotionWorkflowCreateSimpleWorkflowAction(SequentialNumbersMixin, CreateAction):
+class MotionWorkflowCreateSimpleWorkflowAction(CreateAction):
     """
     Action to create a simple motion workflow.
     """
@@ -114,7 +113,7 @@ def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
 @register_action(
     "motion_workflow.create_complex_workflow", action_type=ActionType.BACKEND_INTERNAL
 )
-class MotionWorkflowCreateComplexWorkflowAction(SequentialNumbersMixin, CreateAction):
+class MotionWorkflowCreateComplexWorkflowAction(CreateAction):
     """
     Action to create a complex motion workflow.
     """

openslides_backend/action/actions/motion_workflow/import_.py

@@ -5,15 +5,14 @@
 from ....permissions.permissions import Permissions
 from ....shared.exceptions import ActionException
 from ....shared.schema import str_list_schema
-from ...mixins.sequential_numbers_mixin import SequentialNumbersMixin
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action
 from ..motion_state.create import MotionStateCreateAction
 from ..motion_state.update import MotionStateUpdateAction
 
 
 @register_action("motion_workflow.import")
-class MotionWorkflowImport(SequentialNumbersMixin):
+class MotionWorkflowImport:
     """
     Action to import a motion workflow.
     """

openslides_backend/action/mixins/sequential_numbers_mixin.py

@@ -7,6 +7,7 @@
 from ..util.typing import ActionResultElement
 
 
+# Don't forget to delete this whole file :)
 class SequentialNumbersMixin(CreateAction):
     datastore: Database
     model: Model

tests/system/action/projector/test_create.py

@@ -81,6 +81,8 @@ def test_create_set_used_as_default_in_meeting_id(self) -> None:
             "projector/223",
             {"used_as_default_projector_for_topic_in_meeting_id": 222},
         )
+        # TODO: how did this work before and why do we have 2 projectors now?!
+        # self.assert_model_exists("meeting/222", {"default_projector_topic_ids": [222, 223]}) <-- this doesn't fail
         self.assert_model_exists("meeting/222", {"default_projector_topic_ids": [223]})
 
     def test_create_set_wrong_used_as_default__in_meeting_id(self) -> None: