Refactoring
* splits compensation/models.py into subpackage * renames base objects by adding suffix Mixin
This commit is contained in:
@@ -71,7 +71,7 @@ class BaseResource(UuidModel):
|
||||
"""
|
||||
try:
|
||||
self.created.delete()
|
||||
except (ObjectDoesNotExist, AttributeError) as e:
|
||||
except (ObjectDoesNotExist, AttributeError):
|
||||
# Object does not exist anymore - we can skip this
|
||||
pass
|
||||
super().delete()
|
||||
@@ -146,7 +146,7 @@ class BaseObject(BaseResource):
|
||||
Returns:
|
||||
|
||||
"""
|
||||
if isinstance(self, ShareableObject):
|
||||
if isinstance(self, ShareableObjectMixin):
|
||||
return self.users.filter(id=user.id)
|
||||
else:
|
||||
return User.objects.none()
|
||||
@@ -220,7 +220,7 @@ class BaseObject(BaseResource):
|
||||
return definitions[self.__class__]["template"].format(_str)
|
||||
|
||||
|
||||
class RecordableObject(models.Model):
|
||||
class RecordableObjectMixin(models.Model):
|
||||
""" Wraps record related fields and functionality
|
||||
|
||||
"""
|
||||
@@ -289,7 +289,7 @@ class RecordableObject(models.Model):
|
||||
return ret_log_entry
|
||||
|
||||
|
||||
class CheckableObject(models.Model):
|
||||
class CheckableObjectMixin(models.Model):
|
||||
# Checks - Refers to "Genehmigen" but optional
|
||||
checked = models.OneToOneField(
|
||||
UserActionLogEntry,
|
||||
@@ -351,7 +351,7 @@ class CheckableObject(models.Model):
|
||||
return ret_log_entry
|
||||
|
||||
|
||||
class ShareableObject(models.Model):
|
||||
class ShareableObjectMixin(models.Model):
|
||||
# Users having access on this object
|
||||
users = models.ManyToManyField(User, help_text="Users having access (data shared with)")
|
||||
access_token = models.CharField(
|
||||
|
||||
Reference in New Issue
Block a user