2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

some first fixes for as_operations

Browse source
This commit is contained in:
Laura Klünder 2024-11-21 21:03:30 +01:00
parent 820ccb134e
commit 29e73ba55c
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/c3nav/editor/changes.py
View file

@ -39,7 +39,6 @@ class OperationDependencyObjectExists(BaseSchema):
model_config = ConfigDict(frozen=True) model_config = ConfigDict(frozen=True)
obj: ObjectReference obj: ObjectReference
nullable: bool
class OperationDependencyUniqueValue(BaseSchema): class OperationDependencyUniqueValue(BaseSchema):
@ -48,7 +47,6 @@ class OperationDependencyUniqueValue(BaseSchema):
model: str model: str
field: FieldName field: FieldName
value: Any value: Any
nullable: bool
class OperationDependencyNoProtectedReference(BaseSchema): class OperationDependencyNoProtectedReference(BaseSchema):
@ -87,7 +85,7 @@ class MergableOperationsWithDependencies(BaseSchema):
@property @property
def dependencies(self) -> set[OperationDependency]: def dependencies(self) -> set[OperationDependency]:
return reduce(operator.or_, (c.dependencies for c in self.children), set()) return self.main_op.dependencies | reduce(operator.or_, (op.dependencies for op in self.sub_ops), set())
OperationWithDependencies = Union[ OperationWithDependencies = Union[
@ -282,8 +280,8 @@ class ChangedObjectCollection(BaseSchema):
)) ))
obj_main_operation = SingleOperationWithDependencies( obj_main_operation = SingleOperationWithDependencies(
uid=(changed_obj.obj, f"main"),
operation=(CreateObjectOperation if changed_obj.created else UpdateObjectOperation)( operation=(CreateObjectOperation if changed_obj.created else UpdateObjectOperation)(
uid=(changed_obj.obj, f"main"),
obj=changed_obj.obj, obj=changed_obj.obj,
fields=initial_fields, fields=initial_fields,
), ),
@ -402,11 +400,15 @@ class ChangedObjectCollection(BaseSchema):
dummy_unique_value_avoid: dict[ModelName, dict[FieldName, frozenset]] = {} dummy_unique_value_avoid: dict[ModelName, dict[FieldName, frozenset]] = {}
available_model_ids: dict[ModelName, frozenset] = {} available_model_ids: dict[ModelName, frozenset] = {}
if not start_situation.remaining_operations_with_dependencies:
# nothing to do? then we're done
done_situation = start_situation
while open_situations and not done_situation: while open_situations and not done_situation:
situation = open_situations.pop(0) situation = open_situations.pop(0)
continued = False continued = False
for i, remaining_operation in enumerate(situation.remaining_operation_with_dependencies): for i, remaining_operation in enumerate(situation.remaining_operations_with_dependencies):
# check if the main operation can be ran # check if the main operation can be ran
if not situation.fulfils_dependencies(remaining_operation.main_op.dependencies): if not situation.fulfils_dependencies(remaining_operation.main_op.dependencies):
continue continue