#19 Tests

* adds EMA tests
* extends compensation tests
* fixes bugs detected by testing
* restructured tests for performance boost

compensation/views/compensation_views.py

@@ -110,6 +110,7 @@ def new_id_view(request: HttpRequest):
 
 @login_required
 @default_group_required
+@shared_access_required(Compensation, "id")
 def edit_view(request: HttpRequest, id: str):
     """
     Renders a view for editing compensations
@@ -377,17 +378,19 @@ def deadline_new_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
-def state_remove_view(request: HttpRequest, id: str):
+@shared_access_required(Compensation, "id")
+def state_remove_view(request: HttpRequest, id: str, state_id: str):
     """ Renders a form for removing a compensation state
 
     Args:
         request (HttpRequest): The incoming request
-        id (str): The state's id
+        id (str): The compensation's id
+        state_id (str): The state's id
 
     Returns:
 
     """
-    state = get_object_or_404(CompensationState, id=id)
+    state = get_object_or_404(CompensationState, id=state_id)
     form = RemoveModalForm(request.POST or None, instance=state, user=request.user)
     return form.process_request(
         request,
@@ -397,17 +400,19 @@ def state_remove_view(request: HttpRequest, id: str):
 
 @login_required
 @default_group_required
-def action_remove_view(request: HttpRequest, id: str):
+@shared_access_required(Compensation, "id")
+def action_remove_view(request: HttpRequest, id: str, action_id: str):
     """ Renders a form for removing a compensation action
 
     Args:
         request (HttpRequest): The incoming request
+        id (str): The compensation's id
         id (str): The action's id
 
     Returns:
 
     """
-    action = get_object_or_404(CompensationAction, id=id)
+    action = get_object_or_404(CompensationAction, id=action_id)
     form = RemoveModalForm(request.POST or None, instance=action, user=request.user)
     return form.process_request(
         request,
@@ -415,7 +420,7 @@ def action_remove_view(request: HttpRequest, id: str):
     )
 
 
-def report_view(request:HttpRequest, id: str):
+def report_view(request: HttpRequest, id: str):
     """ Renders the public report view
 
     Args:

compensation/views/eco_account_views.py

@@ -16,11 +16,12 @@ from django.shortcuts import render, get_object_or_404, redirect
 
 from compensation.forms.forms import NewEcoAccountForm, EditEcoAccountForm
 from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
-from compensation.models import EcoAccount, EcoAccountDocument
+from compensation.models import EcoAccount, EcoAccountDocument, CompensationState, CompensationAction
 from compensation.tables import EcoAccountTable
 from intervention.forms.modalForms import NewDeductionModalForm, ShareInterventionModalForm
 from konova.contexts import BaseContext
-from konova.decorators import any_group_check, default_group_required, conservation_office_group_required
+from konova.decorators import any_group_check, default_group_required, conservation_office_group_required, \
+    shared_access_required
 from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, RecordModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.utils.documents import get_document, remove_document
@@ -99,6 +100,7 @@ def new_view(request: HttpRequest):
 
 
 @login_required
+@default_group_required
 def new_id_view(request: HttpRequest):
     """ JSON endpoint
 
@@ -353,6 +355,50 @@ def action_new_view(request: HttpRequest, id: str):
     )
 
 
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def state_remove_view(request: HttpRequest, id: str, state_id: str):
+    """ Renders a form for removing a compensation state
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        state_id (str): The state's id
+
+    Returns:
+
+    """
+    state = get_object_or_404(CompensationState, id=state_id)
+    form = RemoveModalForm(request.POST or None, instance=state, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("State removed")
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def action_remove_view(request: HttpRequest, id: str, action_id: str):
+    """ Renders a form for removing a compensation action
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        id (str): The action's id
+
+    Returns:
+
+    """
+    action = get_object_or_404(CompensationAction, id=action_id)
+    form = RemoveModalForm(request.POST or None, instance=action, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("Action removed")
+    )
+
+
 @login_required
 def deadline_new_view(request: HttpRequest, id: str):
     """ Renders a form for adding new states for an eco account