IT-Naturschutz/konova
7
0
Fork 0
Code Issues 5 Pull Requests Actions Projects Releases 47 Wiki Activity

# 63 Refactoring

Browse Source 
* refactors django User model to custom User model to provide further attributes and methods directly on the user model
This commit is contained in:
mpeltriaux
2022-01-12 12:56:22 +01:00
parent 37fffd639f
commit 02970b19b4
32 changed files with 174 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
user/models/user_action.py
View File

@@ -7,7 +7,6 @@ Created on: 15.11.21
"""
import uuid
from django.contrib.auth.models import User
from django.db import models
from django.utils.translation import gettext_lazy as _
@@ -34,7 +33,7 @@ class UserActionLogEntry(models.Model):
primary_key=True,
default=uuid.uuid4,
)
user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, help_text="Performing user")
user = models.ForeignKey("user.User", related_name='+', on_delete=models.CASCADE, help_text="Performing user")
timestamp = models.DateTimeField(auto_now_add=True, help_text="Timestamp of performed action")
action = models.CharField(
max_length=255,
@@ -69,7 +68,7 @@ class UserActionLogEntry(models.Model):
return None
@classmethod
def get_created_action(cls, user: User, comment: str = None):
def get_created_action(cls, user, comment: str = None):
action = UserActionLogEntry.objects.create(
user=user,
action=UserAction.CREATED,
@@ -78,7 +77,7 @@ class UserActionLogEntry(models.Model):
return action
@classmethod
def get_edited_action(cls, user: User, comment: str = None):
def get_edited_action(cls, user, comment: str = None):
action = UserActionLogEntry.objects.create(
user=user,
action=UserAction.EDITED,
@@ -87,7 +86,7 @@ class UserActionLogEntry(models.Model):
return action
@classmethod
def get_deleted_action(cls, user: User, comment: str = None):
def get_deleted_action(cls, user, comment: str = None):
action = UserActionLogEntry.objects.create(
user=user,
action=UserAction.DELETED,
@@ -96,7 +95,7 @@ class UserActionLogEntry(models.Model):
return action
@classmethod
def get_checked_action(cls, user: User, comment: str = None):
def get_checked_action(cls, user, comment: str = None):
action = UserActionLogEntry.objects.create(
user=user,
action=UserAction.CHECKED,
@@ -105,7 +104,7 @@ class UserActionLogEntry(models.Model):
return action
@classmethod
def get_recorded_action(cls, user: User, comment: str = None):
def get_recorded_action(cls, user, comment: str = None):
action = UserActionLogEntry.objects.create(
user=user,
action=UserAction.RECORDED,
@@ -114,7 +113,7 @@ class UserActionLogEntry(models.Model):
return action
@classmethod
def get_unrecorded_action(cls, user: User, comment: str = None):
def get_unrecorded_action(cls, user, comment: str = None):
action = UserActionLogEntry.objects.create(
user=user,
action=UserAction.UNRECORDED,