Refactoring

* adds simple getter methods for UserActionLogEntry
* replaces manual creation of UserActionLogEntry with new methods

konova/forms.py

@@ -25,7 +25,7 @@ from konova.contexts import BaseContext
 from konova.models import BaseObject, Geometry, RecordableObjectMixin
 from konova.settings import DEFAULT_SRID
 from konova.utils.message_templates import FORM_INVALID
-from user.models import UserActionLogEntry, UserAction
+from user.models import UserActionLogEntry
 
 
 class BaseForm(forms.Form):
@@ -168,11 +168,7 @@ class RemoveForm(BaseForm):
         if self.object_to_remove is not None and self.is_checked():
             with transaction.atomic():
                 self.object_to_remove.is_active = False
-                action = UserActionLogEntry.objects.create(
-                    user=user,
-                    timestamp=timezone.now(),
-                    action=UserAction.DELETED
-                )
+                action = UserActionLogEntry.get_deleted_action(user)
                 self.object_to_remove.deleted = action
                 self.object_to_remove.save()
         return self.object_to_remove
@@ -397,10 +393,9 @@ class NewDocumentForm(BaseModalForm):
 
     def save(self):
         with transaction.atomic():
-            action = UserActionLogEntry.objects.create(
-                user=self.user,
-                action=UserAction.CREATED,
-            )
+            action = UserActionLogEntry.get_created_action(self.user)
+            edited_action = UserActionLogEntry.get_edited_action(self.user, _("Added document"))
+
             doc = self.document_model.objects.create(
                 created=action,
                 title=self.cleaned_data["title"],
@@ -410,11 +405,6 @@ class NewDocumentForm(BaseModalForm):
                 instance=self.instance,
             )
 
-            edited_action = UserActionLogEntry.objects.create(
-                user=self.user,
-                action=UserAction.EDITED,
-                comment=_("Added document"),
-            )
             self.instance.log.add(edited_action)
             self.instance.modified = edited_action
             self.instance.save()

konova/models/object.py

@@ -108,11 +108,7 @@ class BaseObject(BaseResource):
             return
 
         with transaction.atomic():
-            action = UserActionLogEntry.objects.create(
-                user=user,
-                action=UserAction.DELETED,
-                timestamp=timezone.now()
-            )
+            action = UserActionLogEntry.get_deleted_action(user)
             self.deleted = action
             self.log.add(action)
             self.save()
@@ -207,10 +203,7 @@ class RecordableObjectMixin(models.Model):
         Returns:
 
         """
-        action = UserActionLogEntry.objects.create(
-            user=user,
-            action=UserAction.UNRECORDED
-        )
+        action = UserActionLogEntry.get_unrecorded_action(user)
         self.recorded = None
         self.save()
         self.log.add(action)
@@ -225,10 +218,7 @@ class RecordableObjectMixin(models.Model):
         Returns:
 
         """
-        action = UserActionLogEntry.objects.create(
-            user=user,
-            action=UserAction.RECORDED
-        )
+        action = UserActionLogEntry.get_recorded_action(user)
         self.recorded = action
         self.save()
         self.log.add(action)
@@ -287,10 +277,7 @@ class CheckableObjectMixin(models.Model):
         Returns:
 
         """
-        action = UserActionLogEntry.objects.create(
-            user=user,
-            action=UserAction.CHECKED
-        )
+        action = UserActionLogEntry.get_checked_action(user)
         self.checked = action
         self.save()
         self.log.add(action)

konova/tests/test_views.py

@@ -20,7 +20,7 @@ from konova.management.commands.setup_data import GROUPS_DATA
 from konova.models import Geometry
 from konova.settings import DEFAULT_GROUP
 from konova.utils.generators import generate_random_string
-from user.models import UserActionLogEntry, UserAction
+from user.models import UserActionLogEntry
 
 
 class BaseTestCase(TestCase):
@@ -98,10 +98,7 @@ class BaseTestCase(TestCase):
         """
         # Create dummy data
         # Create log entry
-        action = UserActionLogEntry.objects.create(
-            user=cls.superuser,
-            action=UserAction.CREATED,
-        )
+        action = UserActionLogEntry.get_created_action(cls.superuser)
         # Create legal data object (without M2M laws first)
         legal_data = Legal.objects.create()
         # Create responsible data object
@@ -131,10 +128,7 @@ class BaseTestCase(TestCase):
             cls.intervention = cls.create_dummy_intervention()
         # Create dummy data
         # Create log entry
-        action = UserActionLogEntry.objects.create(
-            user=cls.superuser,
-            action=UserAction.CREATED,
-        )
+        action = UserActionLogEntry.get_created_action(cls.superuser)
         geometry = Geometry.objects.create()
         # Finally create main object, holding the other objects
         compensation = Compensation.objects.create(
@@ -156,10 +150,7 @@ class BaseTestCase(TestCase):
         """
         # Create dummy data
         # Create log entry
-        action = UserActionLogEntry.objects.create(
-            user=cls.superuser,
-            action=UserAction.CREATED,
-        )
+        action = UserActionLogEntry.get_created_action(cls.superuser)
         geometry = Geometry.objects.create()
         # Create responsible data object
         lega_data = Legal.objects.create()