# 86 Proper log detail

* adds support for payment adding/deleting to intervention log
* adds support for deduction adding/deleting to intervention/ecoaccount log
* improves code snippets
* drops add_deduction() methods for ecoaccount and intervention in favor of simpler creation in NewDeductionModalForm
* adds messages
* adds/updates translations

compensation/forms/modalForms.py

@@ -21,7 +21,7 @@ from konova.contexts import BaseContext
 from konova.forms import BaseModalForm, NewDocumentForm
 from konova.models import DeadlineType
 from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, ADDED_DEADLINE, \
-    ADDED_COMPENSATION_ACTION
+    ADDED_COMPENSATION_ACTION, PAYMENT_ADDED
 
 
 class NewPaymentForm(BaseModalForm):
@@ -100,7 +100,7 @@ class NewPaymentForm(BaseModalForm):
 
     def save(self):
         pay = self.instance.add_payment(self)
-        self.instance.mark_as_edited(self.user, self.request)
+        self.instance.mark_as_edited(self.user, self.request, edit_comment=PAYMENT_ADDED)
         return pay
 
 

compensation/models/compensation.py

@@ -326,7 +326,7 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin):
         Returns:
 
         """
-        self.intervention.mark_as_edited(user, request, edit_comment, reset_recorded)
+        return self.intervention.mark_as_edited(user, request, edit_comment, reset_recorded)
 
     def is_ready_for_publish(self) -> bool:
         """ Not inherited by RecordableObjectMixin

compensation/models/eco_account.py

@@ -9,10 +9,10 @@ import shutil
 
 from django.urls import reverse
 
-from user.models import User
+from konova.utils.message_templates import DEDUCTION_REMOVED
 from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
-from django.db import models, transaction
+from django.db import models
 from django.db.models import Sum, QuerySet
 from django.utils.translation import gettext_lazy as _
 
@@ -22,7 +22,6 @@ from compensation.utils.quality import EcoAccountQualityChecker
 from konova.models import ShareableObjectMixin, RecordableObjectMixin, AbstractDocument, BaseResource, \
     generate_document_file_upload_path
 from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
-from user.models import UserActionLogEntry
 
 
 class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
@@ -167,34 +166,6 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         )
         return docs
 
-    def add_deduction(self, form):
-        """ Adds a new deduction to the intervention
-
-        Args:
-            form (NewDeductionModalForm): The form holding the data
-
-        Returns:
-
-        """
-        form_data = form.cleaned_data
-        user = form.user
-
-        with transaction.atomic():
-            # Create log entry
-            user_action_create = UserActionLogEntry.get_created_action(user)
-            user_action_edit = UserActionLogEntry.get_edited_action(user)
-            self.log.add(user_action_edit)
-            self.modified = user_action_edit
-            self.save()
-
-            deduction = EcoAccountDeduction.objects.create(
-                intervention=form_data["intervention"],
-                account=self,
-                surface=form_data["surface"],
-                created=user_action_create,
-            )
-        return deduction
-
     def is_ready_for_publish(self) -> bool:
         """ Checks whether the data passes all constraints for being publishable
 
@@ -295,3 +266,9 @@ class EcoAccountDeduction(BaseResource):
 
     def __str__(self):
         return "{} of {}".format(self.surface, self.account)
+
+    def delete(self, user=None, *args, **kwargs):
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED)
+            self.account.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED, reset_recorded=False)
+        super().delete(*args, **kwargs)

compensation/models/payment.py

@@ -10,6 +10,8 @@ from django.db import models
 
 from intervention.models import Intervention
 from konova.models import BaseResource
+from konova.utils.message_templates import PAYMENT_REMOVED
+from user.models import UserActionLogEntry
 
 
 class Payment(BaseResource):
@@ -35,3 +37,8 @@ class Payment(BaseResource):
         ordering = [
             "-amount",
         ]
+
+    def delete(self, user=None, *args, **kwargs):
+        if user is not None:
+            self.intervention.mark_as_edited(user, edit_comment=PAYMENT_REMOVED)
+        super().delete(*args, **kwargs)

compensation/views/eco_account.py

@@ -30,7 +30,7 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID, DATA_UNSHARED, DATA_UNSHARED_EXPLANATION, \
-    CANCEL_ACC_RECORDED_OR_DEDUCTED
+    CANCEL_ACC_RECORDED_OR_DEDUCTED, DEDUCTION_REMOVED, DEDUCTION_ADDED
 from konova.utils.user_checks import in_group
 
 
@@ -288,7 +288,7 @@ def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str):
     form = RemoveModalForm(request.POST or None, instance=eco_deduction, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Deduction removed"),
+        msg_success=DEDUCTION_REMOVED,
         redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 
@@ -564,7 +564,7 @@ def new_deduction_view(request: HttpRequest, id: str):
     form = NewDeductionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deduction added"),
+        msg_success=DEDUCTION_ADDED,
         redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
     )
 

compensation/views/payment.py

@@ -16,6 +16,7 @@ from compensation.models import Payment
 from intervention.models import Intervention
 from konova.decorators import default_group_required
 from konova.forms import RemoveModalForm
+from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED
 
 
 @login_required
@@ -34,7 +35,7 @@ def new_payment_view(request: HttpRequest, intervention_id: str):
     form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
     return form.process_request(
         request,
-        msg_success=_("Payment added"),
+        msg_success=PAYMENT_ADDED,
         redirect_url=reverse("intervention:detail", args=(intervention_id,)) + "#related_data"
     )
 
@@ -55,7 +56,7 @@ def payment_remove_view(request: HttpRequest, id: str):
     form = RemoveModalForm(request.POST or None, instance=payment, request=request)
     return form.process_request(
         request=request,
-        msg_success=_("Payment removed"),
+        msg_success=PAYMENT_REMOVED,
         redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
     )