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

some uuid and revertable actions stuff in operations

Browse source
This commit is contained in:
Laura Klünder 2024-09-04 12:14:30 +02:00
parent f689dd6eee
commit c6a97815d7
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ import datetime
import json import json
from dataclasses import dataclass from dataclasses import dataclass
from typing import TypeAlias, Any, Annotated, Literal, Union from typing import TypeAlias, Any, Annotated, Literal, Union
from uuid import UUID, uuid4
from django.apps import apps from django.apps import apps
from django.core import serializers from django.core import serializers
@ -31,6 +32,7 @@ class ObjectReference(BaseSchema):
class BaseOperation(BaseSchema): class BaseOperation(BaseSchema):
obj: ObjectReference obj: ObjectReference
uuid: UUID = Field(default_factory=uuid4)
datetime: Annotated[datetime.datetime, Field(default_factory=timezone.now)] datetime: Annotated[datetime.datetime, Field(default_factory=timezone.now)]
def apply(self, values: FieldValuesDict, instance: Model) -> Model: def apply(self, values: FieldValuesDict, instance: Model) -> Model:
@ -132,6 +134,11 @@ class ClearManyToManyOperation(BaseOperation):
return instance return instance
class RevertOperation(BaseOperation):
type: Literal["revert"] = "revert"
reverts: UUID
DatabaseOperation = Annotated[ DatabaseOperation = Annotated[
Union[ Union[
CreateObjectOperation, CreateObjectOperation,
@ -160,6 +167,7 @@ class ChangedObject(BaseSchema):
class CollectedChanges(BaseSchema): class CollectedChanges(BaseSchema):
uuid: UUID = Field(default_factory=uuid4)
prev_titles: dict[str, dict[int, dict[str, str] | None]] = {} prev_titles: dict[str, dict[int, dict[str, str] | None]] = {}
prev_values: dict[str, dict[int, FieldValuesDict]] = {} prev_values: dict[str, dict[int, FieldValuesDict]] = {}
operations: list[DatabaseOperation] = [] operations: list[DatabaseOperation] = []
@ -179,7 +187,11 @@ class CollectedChanges(BaseSchema):
@property @property
def changed_objects(self) -> list[ChangedObject]: def changed_objects(self) -> list[ChangedObject]:
objects = {} objects = {}
reverted_uuids = frozenset(operation.reverts for operation in self.operationsy
if isinstance(operation, RevertOperation))
for operation in self.operations: for operation in self.operations:
if operation.uuid in reverted_uuids:
continue
changed_object = objects.get(operation.obj, None) changed_object = objects.get(operation.obj, None)
if changed_object is None: if changed_object is None:
changed_object = ChangedObject(obj=operation.obj, changed_object = ChangedObject(obj=operation.obj,