Merge branch 'staging-t1/4.3.1' into dep/update-meta-staging-t1/4.3.1

Author: luisa-beerboom

cli/generate_models.py

@@ -183,7 +183,6 @@ class Attribute(Node):
     constant: bool = False
     default: Any = None
     on_delete: OnDelete | None = None
-    equal_fields: str | list[str] | None = None
     constraints: dict[str, Any]
     is_view_field: bool = False
     is_primary: bool = False
@@ -224,7 +223,6 @@ def __init__(
             self.read_only = value.pop("read_only", False)
             self.constant = value.pop("constant", False)
             self.default = value.pop("default", None)
-            self.equal_fields = value.pop("equal_fields", None)
             for k, v in value.items():
                 if k not in (
                     "items",
@@ -234,6 +232,7 @@ def __init__(
                     "sql",
                     "deferred",
                     "unique",
+                    "equal_fields",
                 ):
                     if k == "enum" and isinstance(v, str):
                         enum_name = HelperGetNames.get_enum_name(v)
@@ -278,8 +277,6 @@ def get_code(self, field_name: str) -> str:
             properties += "constant=True, "
         if self.default is not None:
             properties += f"default={repr(self.default)}, "
-        if self.equal_fields is not None:
-            properties += f"equal_fields={repr(self.equal_fields)}, "
         if self.constraints:
             properties += f"constraints={repr(self.constraints)}, "
         if self.write_fields is not None:

openslides_backend/action/action.py

@@ -48,7 +48,6 @@
 from .relations.relation_manager import RelationManager, RelationUpdates
 from .relations.typing import FieldUpdateElement, ListUpdateElement
 from .util.action_type import ActionType
-from .util.assert_belongs_to_meeting import assert_belongs_to_meeting
 from .util.typing import ActionData, ActionResultElement, ActionResults
 
 HISTORY_MODELS = list(
@@ -697,54 +696,6 @@ def validate_fields(self, instance: dict[str, Any]) -> dict[str, Any]:
             raise ActionException(str(e))
         return instance
 
-    def validate_relation_fields(self, instance: dict[str, Any]) -> None:
-        """
-        Validates all relation fields according to the model definition.
-        """
-        for field in self.model.get_relation_fields():
-            if not field.equal_fields or field.own_field_name not in instance:
-                continue
-
-            fields = [field.own_field_name]
-            for equal_field in field.equal_fields:
-                if not (own_equal_field_value := instance.get(equal_field)):
-                    fqid = fqid_from_collection_and_id(
-                        self.model.collection, instance["id"]
-                    )
-                    db_instance = self.datastore.get(
-                        fqid,
-                        [equal_field],
-                    )
-                    if not (own_equal_field_value := db_instance.get(equal_field)):
-                        raise ActionException(
-                            f"{fqid} has no value for the field {equal_field}"
-                        )
-                for instance_field in fields:
-                    fqids = transform_to_fqids(
-                        instance[instance_field], field.get_target_collection()
-                    )
-                    if equal_field == "meeting_id":
-                        assert_belongs_to_meeting(
-                            self.datastore, fqids, own_equal_field_value
-                        )
-                    else:
-                        for fqid in fqids:
-                            related_instance = self.datastore.get(
-                                fqid,
-                                [equal_field],
-                            )
-                            if str(related_instance.get(equal_field)) != str(
-                                own_equal_field_value
-                            ):
-                                raise ActionException(
-                                    f"The relation {field.own_field_name} requires the following "
-                                    f"fields to be equal:\n"
-                                    f"{field.own_collection}/{instance['id']}/{equal_field}: "
-                                    f"{own_equal_field_value}\n"
-                                    f"{fqid}/{equal_field}: "
-                                    f"{related_instance.get(equal_field)}"
-                                )
-
     def apply_instance(
         self, instance: dict[str, Any], fqid: FullQualifiedId | None = None
     ) -> None:

openslides_backend/action/action_handler.py

@@ -178,9 +178,15 @@ def transform_to_list(
                         )
                 except RaiseException as e:
                     # This is raised at the end of transaction as the constraint trigger has to be initially deferred.
-                    raise RelationException(
-                        f"Relation violates required constraint: {e}"
-                    )
+                    if len(msg_lis := str(e).split(": ")) > 1 and msg_lis[1].startswith(
+                        "NOT NULL CONSTRAINT VIOLATED"
+                    ):
+                        raise RelationException(
+                            f"Relation violates required constraint: {e}"
+                        )
+                    else:
+                        # Assume equal_fields error
+                        raise RelationException(str(e).split("\nCONTEXT:")[0])
                 except ForeignKeyViolation as e:
                     # This is raised at the end of transaction as the constraint trigger has to be initially deferred.
                     pattern = r'Key\s*\(\w+_id\)=\((\d+)\).*?"(\w+)_t"'

openslides_backend/action/actions/projector/project.py

@@ -11,7 +11,6 @@
 )
 from ...mixins.singular_action_mixin import SingularActionMixin
 from ...mixins.weight_mixin import WeightMixin
-from ...util.assert_belongs_to_meeting import assert_belongs_to_meeting
 from ...util.default_schema import DefaultSchema
 from ...util.register import register_action
 from ...util.typing import ActionData
@@ -51,8 +50,7 @@ def get_updated_instances(self, action_data: ActionData) -> ActionData:
             content_object_collection, content_object_id = collection_and_id_from_fqid(
                 fqid_content_object
             )
-            meeting_member_check_necessary = True
-            if content_object_collection == "mediafile":
+            if content_object_collection == "mediafile":  # TODO: Not possible I think
                 meeting_mediafile = get_meeting_mediafile_id_or_create_payload(
                     self.datastore, meeting_id, content_object_id, lock_result=False
                 )
@@ -63,24 +61,13 @@ def get_updated_instances(self, action_data: ActionData) -> ActionData:
                     meeting_mediafile_id: int = cast(
                         list[dict[str, Any]], create_result
                     )[0]["id"]
-                    meeting_member_check_necessary = False
                 else:
                     meeting_mediafile_id = meeting_mediafile
                 fqid_content_object = instance["content_object_id"] = (
                     fqid_from_collection_and_id(
                         "meeting_mediafile", meeting_mediafile_id
                     )
                 )
-            if meeting_member_check_necessary:
-                assert_belongs_to_meeting(
-                    self.datastore,
-                    [fqid_content_object]
-                    + [
-                        fqid_from_collection_and_id("projector", id)
-                        for id in instance["ids"]
-                    ],
-                    meeting_id,
-                )
 
             self.move_equal_projections_to_history_or_unset(instance, meeting_id)
             if not instance.get("stable"):

openslides_backend/action/generics/create.py

@@ -29,7 +29,6 @@ def base_update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
         instance["meta_new"] = True  # mark as a new model
         instance = self.update_instance(instance)
         self.apply_instance(instance)
-        self.validate_relation_fields(instance)
 
         return instance
 

openslides_backend/action/generics/update.py

@@ -16,8 +16,6 @@ def base_update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
         instance = self.update_instance(instance)
         self.apply_instance(instance)
 
-        self.validate_relation_fields(instance)
-
         return instance
 
     def create_events(self, instance: dict[str, Any]) -> Iterable[Event]:

openslides_backend/migrations/migration_handler.py

@@ -199,6 +199,7 @@ def replace_suffix(m: re.Match) -> str:
             create_trigger_1_n_relation_not_null_code,
             create_trigger_n_m_relation_not_null_code,
             create_trigger_unique_ids_pair_code,
+            create_trigger_equal_fields_code,
             create_trigger_notify_code,
             errors,
         ) = GenerateCodeBlocks.generate_the_code()
@@ -207,6 +208,7 @@ def replace_suffix(m: re.Match) -> str:
             + create_trigger_1_n_relation_not_null_code
             + create_trigger_n_m_relation_not_null_code
             + create_trigger_unique_ids_pair_code
+            + create_trigger_equal_fields_code
         )
         # replace with the migration names before execute
         replaced_blocks = []
@@ -497,6 +499,7 @@ def finalize(self) -> None:
             create_trigger_1_n_relation_not_null_code,
             create_trigger_n_m_relation_not_null_code,
             create_trigger_unique_ids_pair_code,
+            create_trigger_equal_fields_code,
             create_trigger_notify_code,
             errors,
         ) = GenerateCodeBlocks.generate_the_code()
@@ -509,6 +512,7 @@ def finalize(self) -> None:
             + create_trigger_n_m_relation_not_null_code
             + create_trigger_unique_ids_pair_code
             + create_trigger_notify_code
+            + create_trigger_equal_fields_code
         )
         for collection_or_imt in im_tables | set(unified_replace_tables):
             to_drop_triggers = self.cursor.execute(

openslides_backend/models/fields.py

@@ -370,16 +370,11 @@ def __init__(
         self,
         to: dict[Collection, str],
         on_delete: OnDelete = OnDelete.SET_NULL,
-        equal_fields: str | list[str] = [],
         **kwargs: Any,
     ) -> None:
         super().__init__(**kwargs)
         self.to = to
         self.on_delete = on_delete
-        if isinstance(equal_fields, list):
-            self.equal_fields = equal_fields
-        else:
-            self.equal_fields = [equal_fields]
 
     def get_target_collection(self) -> Collection:
         """
@@ -392,7 +387,7 @@ def __str__(self) -> str:
         return (
             f"{self.__class__.__name__}(to={self.to}, is_list_field={self.is_list_field}, "
             f"on_delete={self.on_delete}, required={self.required}, "
-            f"constraints={self.constraints}, equal_fields={self.equal_fields})"
+            f"constraints={self.constraints})"
         )