diff --git a/eav/models/__init__.py b/eav/models/__init__.py index 6f0efb4..952d586 100644 --- a/eav/models/__init__.py +++ b/eav/models/__init__.py @@ -17,9 +17,9 @@ from .value import Value __all__ = [ "Attribute", + "EAVModelMeta", + "Entity", "EnumGroup", "EnumValue", "Value", - "Entity", - "EAVModelMeta", ] diff --git a/eav/models/value.py b/eav/models/value.py index d392ee1..2b5cf65 100644 --- a/eav/models/value.py +++ b/eav/models/value.py @@ -178,16 +178,16 @@ class Value(models.Model): entity = self.entity_pk_uuid if self.entity_uuid else self.entity_pk_int return f'{self.attribute.name}: "{self.value}" ({entity})' - def save(self, *args, **kwargs): - """Validate and save this value.""" - self.full_clean() - super().save(*args, **kwargs) - def __repr__(self) -> str: """Representation of Value object.""" entity = self.entity_pk_uuid if self.entity_uuid else self.entity_pk_int return f'{self.attribute.name}: "{self.value}" ({entity})' + def save(self, *args, **kwargs): + """Validate and save this value.""" + self.full_clean() + super().save(*args, **kwargs) + def natural_key(self) -> tuple[tuple[str, str], int, str]: """ Retrieve the natural key for the Value instance. diff --git a/test_project/models.py b/test_project/models.py index 338a3ec..7bd7720 100644 --- a/test_project/models.py +++ b/test_project/models.py @@ -101,7 +101,7 @@ class Encounter(TestBase): patient = models.ForeignKey(Patient, on_delete=models.PROTECT) def __str__(self): - return "%s: encounter num %d" % (self.patient, self.num) + return f"{self.patient}: encounter num {self.num}" def __repr__(self): return self.name