From ef3507f0587dbf813c5388c51571aaf77649188f Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 19 Aug 2022 10:47:59 +0200 Subject: [PATCH] Resubmission class view * adds AbstractResubmissionView to konova app * implemented for all major data types * replaces function based views --- compensation/urls/compensation.py | 4 +- compensation/urls/eco_account.py | 4 +- .../views/compensation/resubmission.py | 36 ++++-------- .../views/eco_account/resubmission.py | 36 ++++-------- ema/urls.py | 4 +- ema/views/resubmission.py | 36 ++++-------- intervention/urls.py | 4 +- intervention/views/resubmission.py | 36 ++++-------- konova/views/resubmission.py | 55 +++++++++++++++++++ 9 files changed, 107 insertions(+), 108 deletions(-) create mode 100644 konova/views/resubmission.py diff --git a/compensation/urls/compensation.py b/compensation/urls/compensation.py index 5b27906..f2ff579 100644 --- a/compensation/urls/compensation.py +++ b/compensation/urls/compensation.py @@ -9,7 +9,7 @@ from django.urls import path from compensation.views.compensation.document import edit_document_view, new_document_view, remove_document_view, \ get_document_view -from compensation.views.compensation.resubmission import create_resubmission_view +from compensation.views.compensation.resubmission import CompensationResubmissionView from compensation.views.compensation.report import report_view from compensation.views.compensation.deadline import deadline_new_view, deadline_edit_view, deadline_remove_view from compensation.views.compensation.action import action_edit_view, action_new_view, action_remove_view @@ -41,7 +41,7 @@ urlpatterns = [ path('/deadline//edit', deadline_edit_view, name='deadline-edit'), path('/deadline//remove', deadline_remove_view, name='deadline-remove'), path('/report', report_view, name='report'), - path('/resub', create_resubmission_view, name='resubmission-create'), + path('/resub', CompensationResubmissionView.as_view(), name='resubmission-create'), # Documents path('/document/new/', new_document_view, name='new-doc'), diff --git a/compensation/urls/eco_account.py b/compensation/urls/eco_account.py index e15dd58..8f9c3b1 100644 --- a/compensation/urls/eco_account.py +++ b/compensation/urls/eco_account.py @@ -13,7 +13,7 @@ from compensation.views.eco_account.eco_account import index_view, new_view, new from compensation.views.eco_account.log import EcoAccountLogView from compensation.views.eco_account.record import record_view from compensation.views.eco_account.report import report_view -from compensation.views.eco_account.resubmission import create_resubmission_view +from compensation.views.eco_account.resubmission import EcoAccountResubmissionView from compensation.views.eco_account.state import state_new_view, state_remove_view, state_edit_view from compensation.views.eco_account.action import action_edit_view, action_new_view, action_remove_view from compensation.views.eco_account.deadline import deadline_new_view, deadline_edit_view, deadline_remove_view @@ -33,7 +33,7 @@ urlpatterns = [ path('/report', report_view, name='report'), path('/edit', edit_view, name='edit'), path('/remove', remove_view, name='remove'), - path('/resub', create_resubmission_view, name='resubmission-create'), + path('/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'), path('/state/new', state_new_view, name='new-state'), path('/state//edit', state_edit_view, name='state-edit'), diff --git a/compensation/views/compensation/resubmission.py b/compensation/views/compensation/resubmission.py index d90a91c..dfcbad2 100644 --- a/compensation/views/compensation/resubmission.py +++ b/compensation/views/compensation/resubmission.py @@ -6,34 +6,20 @@ Created on: 19.08.22 """ from django.contrib.auth.decorators import login_required -from django.http import HttpRequest -from django.shortcuts import get_object_or_404 -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ +from django.utils.decorators import method_decorator from compensation.models import Compensation from konova.decorators import shared_access_required, default_group_required -from konova.forms.modals import ResubmissionModalForm +from konova.views.resubmission import AbstractResubmissionView -@login_required -@default_group_required -@shared_access_required(Compensation, "id") -def create_resubmission_view(request: HttpRequest, id: str): - """ Renders resubmission form for a compensation +class CompensationResubmissionView(AbstractResubmissionView): + model = Compensation + redirect_url_base = "compensation:detail" + form_action_url_base = "compensation:resubmission-create" - Args: - request (HttpRequest): The incoming request - id (str): Compensation's id - - Returns: - - """ - com = get_object_or_404(Compensation, id=id) - form = ResubmissionModalForm(request.POST or None, instance=com, request=request) - form.action_url = reverse("compensation:resubmission-create", args=(id,)) - return form.process_request( - request, - msg_success=_("Resubmission set"), - redirect_url=reverse("compensation:detail", args=(id,)) - ) + @method_decorator(login_required) + @method_decorator(default_group_required) + @method_decorator(shared_access_required(Compensation, "id")) + def dispatch(self, request, *args, **kwargs): + return super().dispatch(request, *args, **kwargs) diff --git a/compensation/views/eco_account/resubmission.py b/compensation/views/eco_account/resubmission.py index 43c5222..afe8c71 100644 --- a/compensation/views/eco_account/resubmission.py +++ b/compensation/views/eco_account/resubmission.py @@ -6,34 +6,20 @@ Created on: 19.08.22 """ from django.contrib.auth.decorators import login_required -from django.http import HttpRequest -from django.shortcuts import get_object_or_404 -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ +from django.utils.decorators import method_decorator from compensation.models import EcoAccount from konova.decorators import shared_access_required, default_group_required -from konova.forms.modals import ResubmissionModalForm +from konova.views.resubmission import AbstractResubmissionView -@login_required -@default_group_required -@shared_access_required(EcoAccount, "id") -def create_resubmission_view(request: HttpRequest, id: str): - """ Renders resubmission form for an eco account +class EcoAccountResubmissionView(AbstractResubmissionView): + model = EcoAccount + redirect_url_base = "compensation:acc:detail" + form_action_url_base = "compensation:acc:resubmission-create" - Args: - request (HttpRequest): The incoming request - id (str): EcoAccount's id - - Returns: - - """ - acc = get_object_or_404(EcoAccount, id=id) - form = ResubmissionModalForm(request.POST or None, instance=acc, request=request) - form.action_url = reverse("compensation:acc:resubmission-create", args=(id,)) - return form.process_request( - request, - msg_success=_("Resubmission set"), - redirect_url=reverse("compensation:acc:detail", args=(id,)) - ) + @method_decorator(login_required) + @method_decorator(default_group_required) + @method_decorator(shared_access_required(EcoAccount, "id")) + def dispatch(self, request, *args, **kwargs): + return super().dispatch(request, *args, **kwargs) diff --git a/ema/urls.py b/ema/urls.py index d497255..726ec65 100644 --- a/ema/urls.py +++ b/ema/urls.py @@ -14,7 +14,7 @@ from ema.views.ema import index_view, new_view, new_id_view, detail_view, edit_v from ema.views.log import EmaLogView from ema.views.record import record_view from ema.views.report import report_view -from ema.views.resubmission import create_resubmission_view +from ema.views.resubmission import EmaResubmissionView from ema.views.share import share_view, create_share_view from ema.views.state import state_new_view, state_remove_view, state_edit_view @@ -29,7 +29,7 @@ urlpatterns = [ path('/remove', remove_view, name='remove'), path('/record', record_view, name='record'), path('/report', report_view, name='report'), - path('/resub', create_resubmission_view, name='resubmission-create'), + path('/resub', EmaResubmissionView.as_view(), name='resubmission-create'), path('/state/new', state_new_view, name='new-state'), path('/state//remove', state_remove_view, name='state-remove'), diff --git a/ema/views/resubmission.py b/ema/views/resubmission.py index 838cab3..384c3cd 100644 --- a/ema/views/resubmission.py +++ b/ema/views/resubmission.py @@ -6,34 +6,20 @@ Created on: 19.08.22 """ from django.contrib.auth.decorators import login_required -from django.http import HttpRequest -from django.shortcuts import get_object_or_404 -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ +from django.utils.decorators import method_decorator from ema.models import Ema from konova.decorators import shared_access_required, conservation_office_group_required -from konova.forms.modals import ResubmissionModalForm +from konova.views.resubmission import AbstractResubmissionView -@login_required -@conservation_office_group_required -@shared_access_required(Ema, "id") -def create_resubmission_view(request: HttpRequest, id: str): - """ Renders resubmission form for an EMA +class EmaResubmissionView(AbstractResubmissionView): + model = Ema + redirect_url_base = "ema:detail" + form_action_url_base = "ema:resubmission-create" - Args: - request (HttpRequest): The incoming request - id (str): EMA's id - - Returns: - - """ - ema = get_object_or_404(Ema, id=id) - form = ResubmissionModalForm(request.POST or None, instance=ema, request=request) - form.action_url = reverse("ema:resubmission-create", args=(id,)) - return form.process_request( - request, - msg_success=_("Resubmission set"), - redirect_url=reverse("ema:detail", args=(id,)) - ) + @method_decorator(login_required) + @method_decorator(conservation_office_group_required) + @method_decorator(shared_access_required(Ema, "id")) + def dispatch(self, request, *args, **kwargs): + return super().dispatch(request, *args, **kwargs) diff --git a/intervention/urls.py b/intervention/urls.py index ed9dbaa..31148d3 100644 --- a/intervention/urls.py +++ b/intervention/urls.py @@ -16,7 +16,7 @@ from intervention.views.intervention import index_view, new_view, new_id_view, d from intervention.views.log import InterventionLogView from intervention.views.record import record_view from intervention.views.report import report_view -from intervention.views.resubmission import create_resubmission_view +from intervention.views.resubmission import InterventionResubmissionView from intervention.views.revocation import new_revocation_view, edit_revocation_view, remove_revocation_view, \ get_revocation_view from intervention.views.share import share_view, create_share_view @@ -35,7 +35,7 @@ urlpatterns = [ path('/check', check_view, name='check'), path('/record', record_view, name='record'), path('/report', report_view, name='report'), - path('/resub', create_resubmission_view, name='resubmission-create'), + path('/resub', InterventionResubmissionView.as_view(), name='resubmission-create'), # Compensations path('/compensation//remove', remove_compensation_view, name='remove-compensation'), diff --git a/intervention/views/resubmission.py b/intervention/views/resubmission.py index 34a618c..452a3e3 100644 --- a/intervention/views/resubmission.py +++ b/intervention/views/resubmission.py @@ -6,34 +6,20 @@ Created on: 19.08.22 """ from django.contrib.auth.decorators import login_required -from django.http import HttpRequest -from django.shortcuts import get_object_or_404 -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ +from django.utils.decorators import method_decorator from intervention.models import Intervention from konova.decorators import default_group_required, shared_access_required -from konova.forms.modals import ResubmissionModalForm +from konova.views.resubmission import AbstractResubmissionView -@login_required -@default_group_required -@shared_access_required(Intervention, "id") -def create_resubmission_view(request: HttpRequest, id: str): - """ Renders resubmission form for an intervention +class InterventionResubmissionView(AbstractResubmissionView): + model = Intervention + redirect_url_base = "intervention:detail" + form_action_url_base = "intervention:resubmission-create" - Args: - request (HttpRequest): The incoming request - id (str): Intervention's id - - Returns: - - """ - intervention = get_object_or_404(Intervention, id=id) - form = ResubmissionModalForm(request.POST or None, instance=intervention, request=request) - form.action_url = reverse("intervention:resubmission-create", args=(id,)) - return form.process_request( - request, - msg_success=_("Resubmission set"), - redirect_url=reverse("intervention:detail", args=(id,)) - ) + @method_decorator(login_required) + @method_decorator(default_group_required) + @method_decorator(shared_access_required(Intervention, "id")) + def dispatch(self, request, *args, **kwargs): + return super().dispatch(request, *args, **kwargs) diff --git a/konova/views/resubmission.py b/konova/views/resubmission.py new file mode 100644 index 0000000..92ad056 --- /dev/null +++ b/konova/views/resubmission.py @@ -0,0 +1,55 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: ksp-servicestelle@sgdnord.rlp.de +Created on: 19.08.22 + +""" +from django.shortcuts import get_object_or_404 +from django.urls import reverse +from django.views import View +from django.utils.translation import gettext_lazy as _ + +from konova.forms.modals import ResubmissionModalForm + + +class AbstractResubmissionView(View): + model = None + form_action_url_base = None + redirect_url_base = None + + class Meta: + abstract = True + + def get(self, request, id: str): + """ Renders resubmission form for an intervention + + Args: + request (HttpRequest): The incoming request + id (str): Intervention's id + + Returns: + + """ + obj = get_object_or_404(self.model, id=id) + form = ResubmissionModalForm(request.POST or None, instance=obj, request=request) + form.action_url = reverse(self.form_action_url_base, args=(id,)) + return form.process_request( + request, + msg_success=_("Resubmission set"), + redirect_url=reverse(self.redirect_url_base, args=(id,)) + ) + + def post(self, request, id: str): + """ + + BaseModalForm provides the method process_request() which handles GET as well as POST requests. It was written + for easier handling of function based views. To support process_request() on class based views, the post() + call needs to be treated the same way as the get() call. + + Args: + request (HttpRequest): The incoming request + id (str): Intervention's id + + """ + return self.get(request, id)