pacnpal/thrillwiki_django_no_react
1
1
Fork 0
mirror of https://github.com/pacnpal/thrillwiki_django_no_react.git synced 2025-12-20 19:31:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve code readability in moderation models using walrus operator

Browse Source
This commit is contained in:
pacnpal
2024-11-13 15:51:54 +00:00
parent be07a17460
commit 537ea0fc07
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
moderation/models.py
View File

@@ -79,26 +79,23 @@ class EditSubmission(models.Model):
def __str__(self) -> str: def __str__(self) -> str:
action = "creation" if self.submission_type == "CREATE" else "edit" action = "creation" if self.submission_type == "CREATE" else "edit"
model_class = self.content_type.model_class() if model_class := self.content_type.model_class():
target = self.content_object or ( target = self.content_object or model_class.__name__
model_class.__name__ if model_class else "Unknown" else:
) target = "Unknown"
return f"{action} by {self.user.username} on {target}" return f"{action} by {self.user.username} on {target}"
def _resolve_foreign_keys(self, data: Dict[str, Any]) -> Dict[str, Any]: def _resolve_foreign_keys(self, data: Dict[str, Any]) -> Dict[str, Any]:
"""Convert foreign key IDs to model instances""" """Convert foreign key IDs to model instances"""
model_class = self.content_type.model_class() if not (model_class := self.content_type.model_class()):
if not model_class:
raise ValueError("Could not resolve model class") raise ValueError("Could not resolve model class")
resolved_data = data.copy() resolved_data = data.copy()
for field_name, value in data.items(): for field_name, value in data.items():
try: try:
field = model_class._meta.get_field(field_name) if (field := model_class._meta.get_field(field_name)) and isinstance(field, models.ForeignKey) and value is not None:
if isinstance(field, models.ForeignKey) and value is not None: if related_model := field.related_model:
related_model = field.related_model
if related_model:
resolved_data[field_name] = related_model.objects.get(id=value) resolved_data[field_name] = related_model.objects.get(id=value)
except (FieldDoesNotExist, ObjectDoesNotExist): except (FieldDoesNotExist, ObjectDoesNotExist):
continue continue
@@ -111,8 +108,7 @@ class EditSubmission(models.Model):
self.handled_by = user # type: ignore self.handled_by = user # type: ignore
self.handled_at = timezone.now() self.handled_at = timezone.now()
model_class = self.content_type.model_class() if not (model_class := self.content_type.model_class()):
if not model_class:
raise ValueError("Could not resolve model class") raise ValueError("Could not resolve model class")
try: try:
@@ -126,8 +122,7 @@ class EditSubmission(models.Model):
self.object_id = getattr(obj, "id", None) self.object_id = getattr(obj, "id", None)
else: else:
# Apply changes to existing object # Apply changes to existing object
obj = self.content_object if not (obj := self.content_object):
if not obj:
raise ValueError("Content object not found") raise ValueError("Content object not found")
for field, value in resolved_data.items(): for field, value in resolved_data.items():
setattr(obj, field, value) setattr(obj, field, value)