Add new required constraints (#3501)

Author: vkrasnovyd

meta

@@ -1880,8 +1880,8 @@ class MotionChangeRecommendation(Model):
         constraints={"enum": ["replacement", "insertion", "deletion", "other"]},
     )
     other_description = fields.CharField()
-    line_from = fields.IntegerField(constraints={"minimum": 0})
-    line_to = fields.IntegerField(constraints={"minimum": 0})
+    line_from = fields.IntegerField(required=True, constraints={"minimum": 0})
+    line_to = fields.IntegerField(required=True, constraints={"minimum": 0})
     text = fields.HTMLStrictField()
     creation_time = fields.TimestampField(read_only=True)
     motion_id = fields.RelationField(
@@ -1897,7 +1897,7 @@ class MotionComment(Model):
     verbose_name = "motion comment"
 
     id = fields.IntegerField(required=True, constant=True)
-    comment = fields.HTMLStrictField()
+    comment = fields.HTMLStrictField(required=True)
     motion_id = fields.RelationField(
         to={"motion": "comment_ids"}, required=True, constant=True
     )
@@ -2290,7 +2290,7 @@ class PersonalNote(Model):
         to={"meeting_user": "personal_note_ids"}, required=True, constant=True
     )
     content_object_id = fields.GenericRelationField(
-        to={"motion": "personal_note_ids"}, constant=True
+        to={"motion": "personal_note_ids"}, required=True, constant=True
     )
     meeting_id = fields.RelationField(
         to={"meeting": "personal_note_ids"}, required=True, constant=True
@@ -2495,7 +2495,7 @@ class Projector(Model):
     verbose_name = "projector"
 
     id = fields.IntegerField(required=True, constant=True)
-    name = fields.CharField()
+    name = fields.CharField(required=True)
     is_internal = fields.BooleanField(default=False)
     scale = fields.IntegerField(default=0)
     scroll = fields.IntegerField(default=0, constraints={"minimum": 0})
@@ -2622,7 +2622,7 @@ class ProjectorMessage(Model):
     verbose_name = "projector message"
 
     id = fields.IntegerField(required=True, constant=True)
-    message = fields.HTMLStrictField()
+    message = fields.HTMLStrictField(required=True)
     projection_ids = fields.RelationListField(
         to={"projection": "content_object_id"},
         on_delete=fields.OnDelete.CASCADE,
@@ -2779,7 +2779,7 @@ class Theme(Model):
     accent_300 = fields.ColorField()
     accent_400 = fields.ColorField()
     accent_50 = fields.ColorField()
-    accent_500 = fields.ColorField(default="#2196f3")
+    accent_500 = fields.ColorField(required=True, default="#2196f3")
     accent_600 = fields.ColorField()
     accent_700 = fields.ColorField()
     accent_800 = fields.ColorField()
@@ -2793,7 +2793,7 @@ class Theme(Model):
     primary_300 = fields.ColorField()
     primary_400 = fields.ColorField()
     primary_50 = fields.ColorField()
-    primary_500 = fields.ColorField(default="#317796")
+    primary_500 = fields.ColorField(required=True, default="#317796")
     primary_600 = fields.ColorField()
     primary_700 = fields.ColorField()
     primary_800 = fields.ColorField()
@@ -2807,7 +2807,7 @@ class Theme(Model):
     warn_300 = fields.ColorField()
     warn_400 = fields.ColorField()
     warn_50 = fields.ColorField()
-    warn_500 = fields.ColorField(default="#f06400")
+    warn_500 = fields.ColorField(required=True, default="#f06400")
     warn_600 = fields.ColorField()
     warn_700 = fields.ColorField()
     warn_800 = fields.ColorField()
@@ -2991,8 +2991,8 @@ class Vote(Model):
     verbose_name = "vote"
 
     id = fields.IntegerField(required=True, constant=True)
-    weight = fields.DecimalField(constant=True)
-    value = fields.CharField(constant=True)
+    weight = fields.DecimalField(required=True, constant=True)
+    value = fields.CharField(required=True, constant=True)
     user_token = fields.CharField(required=True, constant=True)
     option_id = fields.RelationField(
         to={"option": "vote_ids"}, required=True, constant=True

openslides_backend/models/models.py

@@ -87,23 +87,16 @@ def test_delete_with_projection(self) -> None:
         self.create_motion(20, 34)
         self.set_models(
             {
-                "meeting/20": {
-                    "all_projection_ids": [1],
-                },
                 "agenda_item/111": {
                     "content_object_id": "motion/34",
-                    "projection_ids": [1],
                     "meeting_id": 20,
                 },
                 "projection/1": {
                     "content_object_id": "agenda_item/111",
                     "current_projector_id": 1,
                     "meeting_id": 20,
                 },
-                "projector/1": {
-                    "current_projection_ids": [1],
-                    "meeting_id": 20,
-                },
+                "projector/1": {"meeting_id": 20, "name": "Projector 1"},
             }
         )
         response = self.request("agenda_item.delete", {"id": 111})

tests/system/action/agenda_item/test_delete.py

@@ -60,9 +60,7 @@ def test_delete_correct_cascading(self) -> None:
                     "current_projector_id": 1,
                     "meeting_id": 110,
                 },
-                "projector/1": {
-                    "meeting_id": 110,
-                },
+                "projector/1": {"meeting_id": 110, "name": "Projector 1"},
                 "assignment_candidate/1111": {"assignment_id": 111, "meeting_id": 110},
             }
         )

tests/system/action/assignment/test_delete.py

@@ -29,9 +29,7 @@ def setUp(self) -> None:
                     "current_projector_id": 1,
                     "meeting_id": 78,
                 },
-                "projector/1": {
-                    "meeting_id": 78,
-                },
+                "projector/1": {"meeting_id": 78, "name": "main"},
             }
         )
 

tests/system/action/list_of_speakers/test_delete.py

@@ -164,7 +164,7 @@ def test_delete_check_relations(self) -> None:
                     "current_projector_id": 1,
                     "meeting_id": 111,
                 },
-                "projector/1": {"meeting_id": 111},
+                "projector/1": {"meeting_id": 111, "name": "Projector 1"},
             }
         )
         response = self.request("mediafile.delete", {"id": 222})

tests/system/action/mediafile/test_delete.py

@@ -632,12 +632,14 @@ def test_clone_missing_user_id_in_additional_users(self) -> None:
 
     def test_clone_with_personal_note(self) -> None:
         self.set_test_data_with_admin()
+        self.create_motion(1, 1)
         self.set_models(
             {
                 "personal_note/1": {
                     "note": "test note",
                     "meeting_user_id": 1,
                     "meeting_id": 1,
+                    "content_object_id": "motion/1",
                 }
             }
         )
@@ -1679,13 +1681,17 @@ def test_clone_vote_delegated_vote(self) -> None:
                     "meeting_id": 1,
                     "option_id": 1,
                     "user_token": "asdfgh",
+                    "weight": Decimal("1.000000"),
+                    "value": "Y",
                 },
                 "vote/2": {
                     "user_id": 1,
                     "delegated_user_id": 1,
                     "meeting_id": 4,
                     "option_id": 2,
                     "user_token": "hjkl",
+                    "weight": Decimal("1.000000"),
+                    "value": "Y",
                 },
                 "option/1": {"meeting_id": 1},
                 "option/2": {"meeting_id": 4},

tests/system/action/meeting/test_clone.py

@@ -1,6 +1,7 @@
 import base64
 import time
 from copy import deepcopy
+from decimal import Decimal
 from typing import Any
 
 from psycopg.types.json import Jsonb
@@ -2052,6 +2053,7 @@ def test_without_default_password(self) -> None:
         assert "last_login" not in user
 
     def test_merge_meeting_users_fields(self) -> None:
+        self.create_motion(1, 1)
         self.set_models(
             {
                 "user/14": {
@@ -2082,7 +2084,7 @@ def test_merge_meeting_users_fields(self) -> None:
                 "group/1": {"meeting_user_ids": [1, 14]},
                 "personal_note/1": {
                     "meeting_id": 1,
-                    "content_object_id": None,
+                    "content_object_id": "motion/1",
                     "note": "<p>Some content..</p>",
                     "star": False,
                     "meeting_user_id": 14,
@@ -2119,15 +2121,15 @@ def test_merge_meeting_users_fields(self) -> None:
                     "1": {
                         "id": 1,
                         "meeting_id": 1,
-                        "content_object_id": None,
+                        "content_object_id": "motion/2",
                         "note": "<p>Some content..</p>",
                         "star": False,
                         "meeting_user_id": 12,
                     },
                     "2": {
                         "id": 2,
                         "meeting_id": 1,
-                        "content_object_id": None,
+                        "content_object_id": "motion/2",
                         "note": "blablabla",
                         "star": False,
                         "meeting_user_id": 13,
@@ -2153,10 +2155,30 @@ def test_merge_meeting_users_fields(self) -> None:
                         "group_ids": [2],
                     },
                 },
+                "motion": {
+                    "2": {
+                        "id": 2,
+                        "personal_note_ids": [1, 2],
+                        "title": "New motion",
+                        "meeting_id": 1,
+                        "state_id": 1,
+                        "list_of_speakers_id": 2,
+                    }
+                },
+                "list_of_speakers": {
+                    "2": {
+                        "id": 2,
+                        "content_object_id": "motion/2",
+                        "meeting_id": 1,
+                    }
+                },
             }
         )
         request_data["meeting"]["meeting"]["1"]["personal_note_ids"] = [1, 2]
         request_data["meeting"]["meeting"]["1"]["meeting_user_ids"] = [11, 12, 13]
+        request_data["meeting"]["meeting"]["1"]["motion_ids"] = [2]
+        request_data["meeting"]["meeting"]["1"]["list_of_speakers_ids"] = [2]
+        request_data["meeting"]["motion_state"]["1"]["motion_ids"] = [2]
         request_data["meeting"]["group"]["2"]["meeting_user_ids"] = [12, 13]
         response = self.request("meeting.import", request_data)
         self.assert_status_code(response, 200)
@@ -2305,6 +2327,8 @@ def test_import_new_user_with_vote(self) -> None:
                     "meeting_id": 1,
                     "option_id": 10,
                     "user_token": "asdfgh",
+                    "weight": Decimal("1.000000"),
+                    "value": "Y",
                 },
                 "option/10": {
                     "vote_ids": [1],
@@ -2326,6 +2350,8 @@ def test_import_new_user_with_vote(self) -> None:
                         "meeting_id": 1,
                         "option_id": 1,
                         "user_token": "asdfgh",
+                        "weight": "1.000000",
+                        "value": "Y",
                     },
                 },
                 "option": {
@@ -2508,6 +2534,8 @@ def test_import_existing_user_with_vote(self) -> None:
                     "meeting_id": 1,
                     "option_id": 10,
                     "user_token": "asdfgh",
+                    "weight": Decimal("1.000000"),
+                    "value": "Y",
                 },
                 "option/10": {
                     "vote_ids": [1],
@@ -2529,6 +2557,8 @@ def test_import_existing_user_with_vote(self) -> None:
                         "meeting_id": 1,
                         "option_id": 1,
                         "user_token": "asdfgh",
+                        "weight": "1.000000",
+                        "value": "Y",
                     },
                 },
                 "option": {

tests/system/action/meeting/test_import.py

@@ -11,7 +11,7 @@ def setUp(self) -> None:
                 "projector/1": {
                     "used_as_default_projector_for_motion_in_meeting_id": 1
                 },
-                "projector/20": {"meeting_id": 1},
+                "projector/20": {"meeting_id": 1, "name": "Projector 20"},
             }
         )
 

tests/system/action/meeting/test_replace_projector_id.py

@@ -166,7 +166,12 @@ def test_delete_with_submodels(self) -> None:
                     "motion_id": 111,
                     "meeting_user_id": 1,
                 },
-                "motion_change_recommendation/1": {"meeting_id": 1, "motion_id": 111},
+                "motion_change_recommendation/1": {
+                    "meeting_id": 1,
+                    "motion_id": 111,
+                    "line_from": 14,
+                    "line_to": 15,
+                },
             }
         )
         response = self.request("motion.delete", {"id": 111})