EcoAccount views

* splits compensation/views/eco_account.py (+700 lines) into separate files in new module
    * view files can now be found in /compensation/views/eco_account/...

compensation/urls/eco_account.py

@@ -23,7 +23,8 @@ from compensation.views.eco_account.deadline import NewEcoAccountDeadlineView, E
 from compensation.views.eco_account.share import share_view, create_share_view
 from compensation.views.eco_account.document import GetEcoAccountDocumentView, NewEcoAccountDocumentView, \
     EditEcoAccountDocumentView, RemoveEcoAccountDocumentView
-from compensation.views.eco_account.deduction import deduction_edit_view, deduction_remove_view, new_deduction_view
+from compensation.views.eco_account.deduction import NewEcoAccountDeductionView, EditEcoAccountDeductionView, \
+    RemoveEcoAccountDeductionView
 
 app_name = "acc"
 urlpatterns = [
@@ -60,9 +61,9 @@ urlpatterns = [
     path('<id>/document/<doc_id>/remove/', RemoveEcoAccountDocumentView.as_view(), name='remove-doc'),
 
     # Eco-account deductions
-    path('<id>/deduction/<deduction_id>/remove', deduction_remove_view, name='remove-deduction'),
-    path('<id>/deduction/<deduction_id>/edit', deduction_edit_view, name='edit-deduction'),
-    path('<id>/deduct/new', new_deduction_view, name='new-deduction'),
+    path('<id>/deduction/<deduction_id>/remove', RemoveEcoAccountDeductionView.as_view(), name='remove-deduction'),
+    path('<id>/deduction/<deduction_id>/edit', EditEcoAccountDeductionView.as_view(), name='edit-deduction'),
+    path('<id>/deduct/new', NewEcoAccountDeductionView.as_view(), name='new-deduction'),
 
     # Autocomplete
     path("atcmplt/eco-accounts", EcoAccountAutocomplete.as_view(), name="autocomplete"),

compensation/views/eco_account/deduction.py

@@ -6,96 +6,50 @@ Created on: 19.08.22
 
 """
 from django.contrib.auth.decorators import login_required
-from django.core.exceptions import ObjectDoesNotExist
-from django.http import HttpRequest, Http404
-from django.shortcuts import get_object_or_404
-from django.urls import reverse
+from django.http import Http404
+from django.utils.decorators import method_decorator
 
 from compensation.models import EcoAccount
-from intervention.forms.modals.deduction import EditEcoAccountDeductionModalForm, RemoveEcoAccountDeductionModalForm, \
-    NewEcoAccountDeductionModalForm
 from konova.decorators import default_group_required
-from konova.utils.message_templates import DEDUCTION_EDITED, DEDUCTION_REMOVED, DEDUCTION_ADDED
+from konova.views.deduction import AbstractNewDeductionView, AbstractEditDeductionView, AbstractRemoveDeductionView
 
 
-@login_required
-@default_group_required
-def new_deduction_view(request: HttpRequest, id: str):
-    """ Renders a modal form view for creating deductions
+class NewEcoAccountDeductionView(AbstractNewDeductionView):
+    model = EcoAccount
+    redirect_url = "compensation:acc:detail"
 
-    Args:
-        request (HttpRequest): THe incoming request
-        id (str): The eco account's id
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
-    Returns:
-
-    """
-    acc = get_object_or_404(EcoAccount, id=id)
-    if not acc.recorded:
-        raise Http404()
-    form = NewEcoAccountDeductionModalForm(request.POST or None, instance=acc, request=request)
-    return form.process_request(
-        request,
-        msg_success=DEDUCTION_ADDED,
-        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
-    )
+    def _custom_check(self, obj):
+        if not obj.recorded:
+            raise Http404()
 
 
-@login_required
-@default_group_required
-def deduction_remove_view(request: HttpRequest, id: str, deduction_id: str):
-    """ Renders a modal view for removing deductions
+class EditEcoAccountDeductionView(AbstractEditDeductionView):
+    def _custom_check(self, obj):
+        pass
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The eco account's id
-        deduction_id (str): The deduction's id
+    model = EcoAccount
+    redirect_url = "compensation:acc:detail"
 
-    Returns:
-
-    """
-    acc = get_object_or_404(EcoAccount, id=id)
-    try:
-        eco_deduction = acc.deductions.get(id=deduction_id)
-        if not eco_deduction.intervention.is_shared_with(request.user):
-            raise ObjectDoesNotExist()
-    except ObjectDoesNotExist:
-        raise Http404("Unknown deduction")
-
-    form = RemoveEcoAccountDeductionModalForm(request.POST or None, instance=acc, deduction=eco_deduction, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=DEDUCTION_REMOVED,
-        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
-    )
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
-@login_required
-@default_group_required
-def deduction_edit_view(request: HttpRequest, id: str, deduction_id: str):
-    """ Renders a modal view for editing deductions
+class RemoveEcoAccountDeductionView(AbstractRemoveDeductionView):
+    def _custom_check(self, obj):
+        pass
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The eco account's id
-        deduction_id (str): The deduction's id
-
-    Returns:
-
-    """
-    acc = get_object_or_404(EcoAccount, id=id)
-    try:
-        eco_deduction = acc.deductions.get(id=deduction_id)
-        if not eco_deduction.intervention.is_shared_with(request.user):
-            raise ObjectDoesNotExist
-    except ObjectDoesNotExist:
-        raise Http404("Unknown deduction")
-
-    form = EditEcoAccountDeductionModalForm(request.POST or None, instance=acc, deduction=eco_deduction, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=DEDUCTION_EDITED,
-        redirect_url=reverse("compensation:acc:detail", args=(id,)) + "#related_data"
-    )
+    model = EcoAccount
+    redirect_url = "compensation:acc:detail"
 
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)