Add diff_version field (#3126)

Author: bastianjoel

data/example-data.json

@@ -1293,6 +1293,7 @@
             "number": "1 - 1",
             "number_value": 1,
                         "title": "\u00c4nderungsantrag zu 1",
+            "diff_version": "0.1.2",
             "text": "<p>l&ouml;mk</p>",
             "text_hash": "0339e76557663e3a6f03b9e347409f97",
             "category_weight": 10000,
@@ -1323,6 +1324,7 @@
             "number": "2",
             "number_value": 2,
                         "title": "ohne",
+            "diff_version": "0.1.2",
             "text": "<p>sf</p>",
             "text_hash": "60d31eb37595dd44584be5ef363283e3",
             "category_weight": 100,

meta

@@ -78,6 +78,7 @@ def prefetch(self, action_data: ActionData) -> None:
                         "all_derived_motion_ids",
                         "amendment_ids",
                         "attachment_meeting_mediafile_ids",
+                        "diff_version",
                     ],
                 ),
             ],
@@ -229,6 +230,7 @@ def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
 
         self.handle_number(instance)
         self.set_origin_ids(instance)
+        self.set_diff_version(instance)
         self.set_text_hash(instance)
         instance["forwarded"] = datetime.now(ZoneInfo("UTC"))
         with_change_recommendations = instance.pop("with_change_recommendations", False)
@@ -441,6 +443,14 @@ def set_origin_ids(self, instance: dict[str, Any]) -> None:
             instance["all_origin_ids"] = origin.get("all_origin_ids", [])
             instance["all_origin_ids"].append(instance["origin_id"])
 
+    def set_diff_version(self, instance: dict[str, Any]) -> None:
+        if diff_version := self.datastore.get(
+            fqid_from_collection_and_id("motion", instance["origin_id"]),
+            ["diff_version"],
+            lock_result=False,
+        ).get("diff_version"):
+            instance["diff_version"] = diff_version
+
     def duplicate_mediafiles(
         self,
         action_data: ActionData,

openslides_backend/action/actions/motion/base_create_forwarded.py

@@ -42,6 +42,7 @@ class MotionCreate(
     schema = DefaultSchema(Motion()).get_create_schema(
         optional_properties=[
             "number",
+            "diff_version",
             "additional_submitter",
             "sort_parent_id",
             "category_id",

openslides_backend/action/actions/motion/create.py

@@ -21,6 +21,7 @@ class MotionErrorType(StrEnum):
     REASON = "reason"
     WORKFLOW = "workflow"
     TITLE = "title"
+    DIFF_VERSION = "diff_version"
 
 
 class MotionActionErrorData(TypedDict):
@@ -86,6 +87,18 @@ def _check_recommendation_and_state(
                         )
         return errors
 
+    def _check_diff_version(
+        self, instance: dict[str, Any], datastore_instance: dict[str, Any] = {}
+    ) -> list[MotionActionErrorData]:
+        if instance.get("lead_motion_id") or datastore_instance.get("lead_motion_id"):
+            return [
+                {
+                    "type": (MotionErrorType.DIFF_VERSION),
+                    "message": "You can define a diff_version only for the lead motion",
+                }
+            ]
+        return []
+
 
 class MotionCreatePayloadValidationMixin(MotionBasePayloadValidationMixin):
     """
@@ -137,6 +150,8 @@ def _create_conduct_before_checks(
                         "message": "You can't give amendment_paragraphs in this context",
                     }
                 )
+        if instance.get("diff_version"):
+            errors += self._check_diff_version(instance)
         if (not instance.get("reason")) and self.check_reason_required(meeting_id):
             errors.append(
                 {"type": MotionErrorType.REASON, "message": "Reason is required"}
@@ -196,10 +211,14 @@ def _update_conduct_before_checks(
         self, instance: dict[str, Any], meeting_id: int
     ) -> list[MotionActionErrorData]:
         errors: list[MotionActionErrorData] = []
-        if instance.get("text") or instance.get("amendment_paragraphs"):
+        if (
+            instance.get("text")
+            or instance.get("amendment_paragraphs")
+            or instance.get("diff_version")
+        ):
             motion = self.datastore.get(
                 fqid_from_collection_and_id("motion", instance["id"]),
-                ["text", "amendment_paragraphs"],
+                ["text", "amendment_paragraphs", "lead_motion_id"],
             )
         if instance.get("text"):
             if not motion.get("text"):
@@ -224,4 +243,6 @@ def _update_conduct_before_checks(
                     "message": "Reason is required to update.",
                 }
             )
+        if instance.get("diff_version"):
+            errors += self._check_diff_version(instance, motion)
         return errors

openslides_backend/action/actions/motion/payload_validation_mixin.py

@@ -55,6 +55,7 @@ class MotionUpdate(
         optional_properties=[
             "title",
             "number",
+            "diff_version",
             "additional_submitter",
             "text",
             "reason",

openslides_backend/action/actions/motion/update.py

@@ -1642,6 +1642,7 @@ class Motion(Model):
         },
     )
     title = fields.CharField(required=True)
+    diff_version = fields.CharField()
     text = fields.HTMLStrictField()
     text_hash = fields.CharField()
     amendment_paragraphs = fields.JSONField()

openslides_backend/models/models.py

@@ -1038,3 +1038,26 @@ def test_create_with_irrelevant_delegator_setting(self) -> None:
                 "submitter_ids": None,
             },
         )
+
+    def test_create_motion_with_diff_version(self) -> None:
+        response = self.request(
+            "motion.create",
+            {
+                "title": "test_Xcdfgee",
+                "meeting_id": 1,
+                "workflow_id": 1,
+                "text": "test",
+                "diff_version": "0.1.2",
+            },
+        )
+        self.assert_status_code(response, 200)
+        self.assert_model_exists(
+            "motion/1",
+            {
+                "title": "test_Xcdfgee",
+                "meeting_id": 1,
+                "text": "test",
+                "submitter_ids": None,
+                "diff_version": "0.1.2",
+            },
+        )

tests/system/action/motion/test_create.py

@@ -316,3 +316,17 @@ def test_create_amendment_no_permissions_extra_fields(self) -> None:
                 f"You are not allowed to perform action motion.create. Forbidden fields: {field} with possibly needed permission(s): motion.can_manage",
                 response.json["message"],
             )
+
+    def test_create_amendment_with_diff_version_not_allowed(self) -> None:
+        response = self.request(
+            "motion.create",
+            {
+                **self.default_action_data,
+                "diff_version": "0.1.2",
+            },
+        )
+        self.assert_status_code(response, 400)
+        self.assertEqual(
+            "You can define a diff_version only for the lead motion",
+            response.json["message"],
+        )

tests/system/action/motion/test_create_amendment.py

@@ -2538,6 +2538,28 @@ def test_forward_multiple_motions_with_mediafiles_and_amendments_in_1_transactio
             },
         )
 
+    def test_forward_with_diff_version(self) -> None:
+        self.create_meeting()
+        self.create_meeting(4)
+        self.create_motion(1, 1, motion_data={"diff_version": "0.1.2"})
+        self.set_models(
+            {
+                "motion_state/1": {"allow_motion_forwarding": True},
+                "committee/60": {"forward_to_committee_ids": [63]},
+            }
+        )
+        response = self.request(
+            "motion.create_forwarded",
+            {
+                "title": "Motion 2",
+                "text": "text",
+                "meeting_id": 4,
+                "origin_id": 1,
+            },
+        )
+        self.assert_status_code(response, 200)
+        self.assert_model_exists("motion/2", {"diff_version": "0.1.2"})
+
     def test_forward_with_deleted_submitters(self) -> None:
         self.create_meeting(1)
         self.create_meeting(4)