Created|Deleted refactoring

* refactors base attributes created and deleted into UserActionLogEntry foreign keys
* refactors all related queries and process logic
* fixes binding_on into binding_date in intervention/detail/view.html
* adds basic __str__ for some models
*

konova/admin.py

@@ -13,8 +13,7 @@ from konova.models import Geometry, Document, Deadline
 class GeometryAdmin(admin.ModelAdmin):
     list_display = [
         "id",
-        "created_on",
-        "created_by",
+        "created",
     ]
 
 
@@ -23,8 +22,7 @@ class DocumentAdmin(admin.ModelAdmin):
         "id",
         "title",
         "comment",
-        "created_on",
-        "created_by",
+        "created",
     ]
 
 

konova/enums.py

@@ -55,6 +55,8 @@ class UserActionLogEntryEnum(BaseEnum):
     """
     CHECKED = "Checked"
     RECORDED = "Recorded"
+    CREATED = "Created"
+    DELETED = "Deleted"
 
 
 class DeadlineTypeEnum(BaseEnum):

konova/forms.py

@@ -21,8 +21,10 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 
 from konova.contexts import BaseContext
+from konova.enums import UserActionLogEntryEnum
 from konova.models import Document
 from konova.utils.message_templates import FORM_INVALID
+from user.models import UserActionLogEntry
 
 
 class BaseForm(forms.Form):
@@ -101,11 +103,26 @@ class RemoveForm(BaseForm):
         return self.cleaned_data.get("check", False)
 
     def save(self, user: User):
+        """ Perform generic removing by running the form typical 'save()' method
+
+        Args:
+            user (User): The performing user
+
+        Returns:
+
+        """
         if self.object_to_remove is not None and self.is_checked():
-            self.object_to_remove.is_active = False
-            self.object_to_remove.deleted_on = timezone.now()
-            self.object_to_remove.deleted_by = user
-            self.object_to_remove.save()
+            with transaction.atomic():
+                self.object_to_remove.is_active = False
+                action = UserActionLogEntry.objects.create(
+                    user=user,
+                    timestamp=timezone.now(),
+                    action=UserActionLogEntryEnum.DELETED.value
+                )
+                self.object_to_remove.deleted = action
+                #self.object_to_remove.deleted_on = timezone.now()
+                #self.object_to_remove.deleted_by = user
+                self.object_to_remove.save()
         return self.object_to_remove
 
 
@@ -169,9 +186,15 @@ class RemoveModalForm(BaseModalForm):
         self.form_caption = _("Are you sure?")
 
     def save(self):
-        if hasattr(self.instance, "deleted_on"):
-            self.instance.deleted_on = timezone.now()
-            self.instance.deleted_by = self.user
+        if hasattr(self.instance, "deleted"):
+            action = UserActionLogEntry.objects.create(
+                user=self.user,
+                timestamp=timezone.now(),
+                action=UserActionLogEntryEnum.DELETED.value,
+            )
+            self.instance.deleted = action
+            #self.instance.deleted_on = timezone.now()
+            #self.instance.deleted_by = self.user
             self.instance.save()
         else:
             # If the class does not provide restorable delete functionality, we must delete the entry finally
@@ -270,8 +293,12 @@ class NewDocumentForm(BaseModalForm):
 
     def save(self):
         with transaction.atomic():
+            action = UserActionLogEntry.objects.create(
+                user=self.user,
+                action=UserActionLogEntryEnum.CREATED.value,
+            )
             doc = Document.objects.create(
-                created_by=self.user,
+                created=action,
                 title=self.cleaned_data["title"],
                 comment=self.cleaned_data["comment"],
                 document=self.cleaned_data["file"],

konova/models.py

@@ -14,6 +14,7 @@ from django.db import models
 
 from konova.enums import DeadlineTypeEnum
 from konova.settings import DEFAULT_SRID
+from user.models import UserActionLogEntry
 
 
 class UuidModel(models.Model):
@@ -33,8 +34,9 @@ class BaseResource(UuidModel):
     """
     A basic resource model, which defines attributes for every derived model
     """
-    created_on = models.DateTimeField(auto_now_add=True, null=True)
-    created_by = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, related_name="+")
+    created = models.ForeignKey(UserActionLogEntry, on_delete=models.SET_NULL, null=True, blank=True, related_name='+')
+    #created_on = models.DateTimeField(auto_now_add=True, null=True)
+    #created_by = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, related_name="+")
 
     class Meta:
         abstract = True
@@ -48,8 +50,9 @@ class BaseObject(BaseResource):
     """
     identifier = models.CharField(max_length=1000, null=True, blank=True)
     title = models.CharField(max_length=1000, null=True, blank=True)
-    deleted_on = models.DateTimeField(null=True, blank=True)
-    deleted_by = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL, related_name="+")
+    deleted = models.ForeignKey(UserActionLogEntry, on_delete=models.SET_NULL, null=True, blank=True, related_name='+')
+    #deleted_on = models.DateTimeField(null=True, blank=True)
+    #deleted_by = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL, related_name="+")
     comment = models.TextField(null=True, blank=True)
 
     class Meta:

konova/views.py

@@ -62,8 +62,7 @@ def home_view(request: HttpRequest):
 
     # First fetch all valid objects (undeleted, only newest versions)
     interventions = Intervention.objects.filter(
-        deleted_on=None,
-        deleted_by=None,
+        deleted=None,
         next_version=None,
     )
     # Then fetch only user related ones
@@ -73,16 +72,14 @@ def home_view(request: HttpRequest):
 
     # Repeat for other objects
     comps = Compensation.objects.filter(
-        deleted_on=None,
-        deleted_by=None,
+        deleted=None,
         next_version=None,
     )
     user_comps = comps.filter(
         intervention__users__in=[user]
     )
     eco_accs = EcoAccount.objects.filter(
-        deleted_on=None,
-        deleted_by=None,
+        deleted=None,
         next_version=None,
     )
     user_ecco_accs = eco_accs.filter(