# EcoAccount New and Edit

* refactors new and edit method views into classes

compensation/urls/compensation.py

@@ -19,19 +19,19 @@ from compensation.views.compensation.action import NewCompensationActionView, Ed
     RemoveCompensationActionView
 from compensation.views.compensation.state import NewCompensationStateView, EditCompensationStateView, \
     RemoveCompensationStateView
-from compensation.views.compensation.compensation import new_view, edit_view, \
-    IndexCompensationView, CompensationIdentifierGeneratorView
+from compensation.views.compensation.compensation import IndexCompensationView, CompensationIdentifierGeneratorView, \
+    EditCompensationView, NewCompensationView
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
     path("", IndexCompensationView.as_view(), name="index"),
     path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
-    path('new/<intervention_id>', new_view, name='new'),
-    path('new', new_view, name='new'),
+    path('new/<intervention_id>', NewCompensationView.as_view(), name='new'),
+    path('new', NewCompensationView.as_view(), name='new'),
     path('<id>', DetailCompensationView.as_view(), name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditCompensationView.as_view(), name='edit'),
     path('<id>/remove', RemoveCompensationView.as_view(), name='remove'),
 
     path('<id>/state/new', NewCompensationStateView.as_view(), name='new-state'),

compensation/urls/eco_account.py

@@ -9,8 +9,8 @@ from django.urls import path
 
 from compensation.autocomplete.eco_account import EcoAccountAutocomplete
 from compensation.views.eco_account.detail import DetailEcoAccountView
-from compensation.views.eco_account.eco_account import new_view, edit_view, \
-    IndexEcoAccountView, EcoAccountIdentifierGeneratorView
+from compensation.views.eco_account.eco_account import IndexEcoAccountView, EcoAccountIdentifierGeneratorView, \
+    NewEcoAccountView, EditEcoAccountView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
 from compensation.views.eco_account.remove import RemoveEcoAccountView
@@ -31,13 +31,13 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 app_name = "acc"
 urlpatterns = [
     path("", IndexEcoAccountView.as_view(), name="index"),
-    path('new/', new_view, name='new'),
+    path('new/', NewEcoAccountView.as_view(), name='new'),
     path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
     path('<id>', DetailEcoAccountView.as_view(), name='detail'),
     path('<id>/log', EcoAccountLogView.as_view(), name='log'),
     path('<id>/record', EcoAccountRecordView.as_view(), name='record'),
     path('<id>/report', EcoAccountPublicReportView.as_view(), name='report'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditEcoAccountView.as_view(), name='edit'),
     path('<id>/remove', RemoveEcoAccountView.as_view(), name='remove'),
     path('<id>/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'),
 

compensation/views/compensation/compensation.py

@@ -6,11 +6,12 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
-from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render, redirect
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from compensation.forms.compensation import EditCompensationForm, NewCompensationForm
 from compensation.models import Compensation
@@ -54,36 +55,78 @@ class IndexCompensationView(AbstractIndexView):
         context = BaseContext(request, context).context
         return render(request, self._TEMPLATE, context)
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "intervention_id")
-def new_view(request: HttpRequest, intervention_id: str = None):
-    """
-    Renders a view for a new compensation creation
 
-    Args:
-        request (HttpRequest): The incoming request
+class NewCompensationView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Returns:
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+    def get(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for new compensation
 
-    """
-    template = "compensation/form/view.html"
-    if intervention_id is not None:
-        try:
-            intervention = Intervention.objects.get(id=intervention_id)
-        except ObjectDoesNotExist:
-            messages.error(request, PARAMS_INVALID)
-            return redirect("home")
-        if intervention.is_recorded:
-            messages.info(
-                request,
-                RECORDED_BLOCKS_EDIT
-            )
-            return redirect("intervention:detail", id=intervention_id)
+        A compensation creation may be called directly from the parent-intervention object. If so - we may take
+        the intervention's id and directly link the compensation to it.
+
+        Args:
+            request (HttpRequest): The incoming request
+            intervention_id (str): The intervention identifier
+
+        Returns:
+
+        """
+        if intervention_id:
+            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
+            # Not even adding new child elements like compensations!
+            intervention = get_object_or_404(Intervention, id=intervention_id)
+            recording_state_blocks_actions = intervention.is_recorded
+            if recording_state_blocks_actions:
+                messages.info(
+                    request,
+                    RECORDED_BLOCKS_EDIT
+                )
+                return redirect("intervention:detail", id=intervention_id)
+
+        data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New compensation"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+    def post(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for a new compensation creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        if intervention_id:
+            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
+            # Not even adding new child elements like compensations!
+            intervention = get_object_or_404(Intervention, id=intervention_id)
+            recording_state_blocks_actions = intervention.is_recorded
+            if recording_state_blocks_actions:
+                messages.info(
+                    request,
+                    RECORDED_BLOCKS_EDIT
+                )
+                return redirect("intervention:detail", id=intervention_id)
+
+        data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
 
-    data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             comp = data_form.save(request.user, geom_form)
@@ -101,65 +144,97 @@ def new_view(request: HttpRequest, intervention_id: str = None):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:detail", id=comp.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
-        # For clarification: nothing in this case
-        pass
-    context = {
-        "form": data_form,
-        "geom_form": geom_form,
-        TAB_TITLE_IDENTIFIER: _("New compensation"),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New compensation"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
 
 
 class CompensationIdentifierGeneratorView(AbstractIdentifierGeneratorView):
     _MODEL = Compensation
 
 
-@login_required
-@default_group_required
-@shared_access_required(Compensation, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
+class EditCompensationView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    Returns:
+        """
+        Renders a view for editing compensations
 
-    """
-    template = "compensation/form/view.html"
-    # Get object from db
-    comp = get_object_or_404(Compensation, id=id)
-    if comp.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("compensation:detail", id=id)
+        Args:
+            request (HttpRequest): The incoming request
 
-    # Create forms, initialize with values from db/from POST request
-    data_form = EditCompensationForm(request.POST or None, instance=comp)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
-    if request.method == "POST":
+        Returns:
+
+        """
+        # Get object from db
+        comp = get_object_or_404(Compensation, id=id)
+        if comp.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditCompensationForm(request.POST or None, instance=comp)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        comp = get_object_or_404(Compensation, id=id)
+        if comp.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditCompensationForm(request.POST or None, instance=comp)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
         if data_form.is_valid() and geom_form.is_valid():
             # Preserve state of intervention checked to determine whether the user must be informed or not
             # about a change of the check state
             intervention_is_checked = comp.intervention.checked is not None
-
             # The data form takes the geom form for processing, as well as the performing user
             comp = data_form.save(request.user, geom_form)
             if intervention_is_checked:
@@ -170,24 +245,21 @@ def edit_view(request: HttpRequest, id: str):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:detail", id=comp.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
-        # For clarification: nothing in this case
-        pass
-    context = {
-        "form": data_form,
-        "geom_form": geom_form,
-        TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)

compensation/views/eco_account/eco_account.py

@@ -6,10 +6,12 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm
 from compensation.models import EcoAccount
@@ -52,22 +54,46 @@ class IndexEcoAccountView(AbstractIndexView):
         return render(request, self._TEMPLATE, context)
 
 
-@login_required
-@default_group_required
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new eco account creation
+class NewEcoAccountView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for a new eco account creation
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
 
-    """
-    template = "compensation/form/view.html"
-    data_form = NewEcoAccountForm(request.POST or None)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
+        Returns:
+
+        """
+        data_form = NewEcoAccountForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for a new eco account creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewEcoAccountForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             acc = data_form.save(request.user, geom_form)
@@ -85,58 +111,92 @@ def new_view(request: HttpRequest):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:acc:detail", id=acc.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
-        # For clarification: nothing in this case
-        pass
-    context = {
-        "form": data_form,
-        "geom_form": geom_form,
-        TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
 
 class EcoAccountIdentifierGeneratorView(AbstractIdentifierGeneratorView):
     _MODEL = EcoAccount
 
-@login_required
-@default_group_required
-@shared_access_required(EcoAccount, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
 
-    Args:
-        request (HttpRequest): The incoming request
+class EditEcoAccountView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Returns:
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    """
-    template = "compensation/form/view.html"
-    # Get object from db
-    acc = get_object_or_404(EcoAccount, id=id)
-    if acc.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("compensation:acc:detail", id=id)
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        acc = get_object_or_404(EcoAccount, id=id)
+        if acc.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:acc:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEcoAccountForm(request.POST or None, instance=acc)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        acc = get_object_or_404(EcoAccount, id=id)
+        if acc.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:acc:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEcoAccountForm(request.POST or None, instance=acc)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
 
-    # Create forms, initialize with values from db/from POST request
-    data_form = EditEcoAccountForm(request.POST or None, instance=acc)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
-    if request.method == "POST":
         data_form_valid = data_form.is_valid()
         geom_form_valid = geom_form.is_valid()
         if data_form_valid and geom_form_valid:
@@ -148,24 +208,21 @@ def edit_view(request: HttpRequest, id: str):
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
             num_ignored_geometries = geom_form.get_num_geometries_ignored()
             if num_ignored_geometries > 0:
                 messages.info(
                     request,
                     GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
                 )
-
             return redirect("compensation:acc:detail", id=acc.id)
         else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
-        # For clarification: nothing in this case
-        pass
-    context = {
-        "form": data_form,
-        "geom_form": geom_form,
-        TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)