Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions app/apps/users/migrations/0014_alter_permission_options.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Generated by Django 5.2.18 on 2026-11-18 09:45

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("users", "0013_alter_permission_options"),
]

operations = [
migrations.AlterModelOptions(
name="permission",
options={
"default_permissions": (),
"managed": False,
"permissions": [
("create_case", "Create a new Case"),
(
"create_digital_surveilance_case",
"Create a new 'Digitaal toezicht' Case",
),
("close_case", "Close a Case (by performing the last task)"),
("perform_task", "Can perform a tasks"),
("perform_bulk_import", "Can execute a bulk import"),
(
"edit_task_week_number",
"Can (un)assign a week number to a task.",
),
(
"assign_task_to_others",
"Can (un)assign a task to other users than themselves.",
),
(
"access_personal_data_register",
"Can access 'BRP' (persoonsgegevens / ingeschreven personen)",
),
(
"access_business_register",
"Can access 'Handelsregister' (bedrijfseigenaren van panden, bedrijfsinformatie)",
),
("access_recovery_check", "Can access 'invorderingscheck'"),
("access_sensitive_dossiers", "Can read gevoelige dossiers"),
("access_sigital_surveillance", "Can read 'Digitaal toezicht'"),
(
"access_document_management_system",
"Can access 'DMS' (Alfresco / Decos)",
),
],
},
),
]
11 changes: 10 additions & 1 deletion app/apps/users/permissions.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from apps.cases.models import Case
from apps.users.auth_apps import TonKeyAuth, TopKeyAuth
from django.conf import settings
from rest_framework.permissions import BasePermission, IsAuthenticated
from rest_framework.permissions import SAFE_METHODS, BasePermission, IsAuthenticated


class InAuthGroup(BasePermission):
Expand All @@ -23,6 +23,8 @@ class IsInAuthorizedRealm(InAuthGroup):
("close_case", "Close a Case (by performing the last task)"),
("perform_task", "Can perform a tasks"),
("perform_bulk_import", "Can execute a bulk import"),
("edit_task_week_number", "Can (un)assign a week number to a task."),
("assign_task_to_others", "Can (un)assign a task to other users than themselves."),
# Permissions to access remote API's
(
"access_personal_data_register",
Expand Down Expand Up @@ -78,6 +80,13 @@ def has_permission(self, request, view):
return request.user.has_perm("users.perform_task")


class CanEditTaskWeekNumber(BasePermission):
def has_permission(self, request, view):
if request.method not in SAFE_METHODS and "week_number" in request.data:
return request.user.has_perm("users.edit_task_week_number")
return True


class CanPerformBulkImport(BasePermission):
"""
Custom permission to only allow users with perform_bulk_import permissions
Expand Down
18 changes: 18 additions & 0 deletions app/apps/workflow/migrations/0014_caseusertask_week.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 5.2.18 on 2026-11-17 13:04

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("workflow", "0013_added_omzettingsvergunning_workflow"),
]

operations = [
migrations.AddField(
model_name="caseusertask",
name="week_number",
field=models.IntegerField(blank=True, null=True),
),
]
1 change: 1 addition & 0 deletions app/apps/workflow/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1453,6 +1453,7 @@ class CaseUserTask(models.Model):
blank=True,
)
due_date = models.DateTimeField()
week_number = models.IntegerField(null=True, blank=True)
owner = models.ForeignKey(
to=settings.AUTH_USER_MODEL,
on_delete=models.PROTECT,
Expand Down
51 changes: 51 additions & 0 deletions app/apps/workflow/tests/test_filters.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
from apps.workflow.models import CaseUserTask
from apps.workflow.views import CaseUserTaskFilter
from django.http import QueryDict
from django.test import SimpleTestCase
from rest_framework.exceptions import ValidationError


class CaseUserTaskFilterTest(SimpleTestCase):
def get_queryset(self, data):
task_filter = CaseUserTaskFilter(
data=QueryDict(data), queryset=CaseUserTask.objects.all()
)
self.assertTrue(task_filter.is_valid(), task_filter.errors)
return task_filter.qs

def test_week_filters_by_one_or_more_values(self):
for value, expected in (
("week_number=12", [12]),
("week_number=12&week_number=13", [12, 13]),
):
with self.subTest(value=value):
lookup = self.get_queryset(value).query.where.children[0]
self.assertEqual(lookup.lhs.target.name, "week_number")
self.assertEqual(lookup.lookup_name, "in")
self.assertEqual(lookup.rhs, expected)

def test_week_preserves_other_filters(self):
queryset = self.get_queryset("week_number=12&completed=false")
lookups = {
lookup.lhs.target.name: lookup.rhs
for lookup in queryset.query.where.children
}
self.assertEqual(lookups, {"week_number": [12], "completed": False})

def test_week_omitted_or_empty_does_not_filter(self):
for data in ("", "week_number="):
with self.subTest(data=data):
self.assertEqual(self.get_queryset(data).query.where.children, [])

def test_invalid_week_is_rejected(self):
for value in (
"week_number=invalid",
"week_number=12&week_number=invalid",
"week_number=12.5",
"week_number=12,13",
"week_number=None",
"week_number=12&week_number=None",
):
with self.subTest(value=value):
with self.assertRaises(ValidationError):
self.get_queryset(value)
99 changes: 99 additions & 0 deletions app/apps/workflow/tests/test_permissions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
from unittest.mock import Mock, patch

from apps.users.auth_apps import TopKeyAuth
from apps.users.permissions import CanEditTaskWeekNumber
from apps.workflow.views import CaseUserTaskViewSet
from django.contrib.auth.models import AnonymousUser
from django.test import SimpleTestCase
from rest_framework import status
from rest_framework.response import Response
from rest_framework.test import APIRequestFactory, force_authenticate


class CaseUserTaskWeekNumberPermissionTest(SimpleTestCase):
def setUp(self):
self.factory = APIRequestFactory()
self.user = Mock(is_authenticated=True)
self.user.has_perm.return_value = False

def patch_task(self, data):
request = self.factory.patch("/tasks/1/", data, format="json")
force_authenticate(request, user=self.user)
view = CaseUserTaskViewSet.as_view({"patch": "partial_update"})
with patch.object(
CaseUserTaskViewSet,
"partial_update",
return_value=Response(status=status.HTTP_200_OK),
) as update:
response = view(request, pk=1)
return response, update

def test_week_number_requires_permission(self):
for value in (12, None):
with self.subTest(value=value):
response, update = self.patch_task({"week_number": value})

self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
self.user.has_perm.assert_called_with("users.edit_task_week_number")
update.assert_not_called()

def test_week_number_allowed_with_permission(self):
self.user.has_perm.return_value = True
for value in (12, None):
with self.subTest(value=value):
response, update = self.patch_task({"week_number": value})

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.user.has_perm.assert_called_with("users.edit_task_week_number")
update.assert_called_once()

def test_other_fields_do_not_require_week_number_permission(self):
response, update = self.patch_task({"name": "Updated task"})

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.user.has_perm.assert_not_called()
update.assert_called_once()

def test_top_key_does_not_bypass_week_number_permission(self):
self.user = AnonymousUser()
with patch.object(TopKeyAuth, "has_permission", return_value=True):
response, update = self.patch_task({"week_number": 12})

self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
update.assert_not_called()

def test_get_does_not_require_week_number_permission(self):
request = self.factory.get("/tasks/", {"week_number": 12})
request.user = self.user

self.assertTrue(CanEditTaskWeekNumber().has_permission(request, None))
self.user.has_perm.assert_not_called()

def test_write_methods_check_week_number_permission(self):
for method in ("POST", "PUT", "PATCH", "DELETE"):
for value in (12, None):
for allowed in (False, True):
with self.subTest(method=method, value=value, allowed=allowed):
self.user.has_perm.reset_mock()
self.user.has_perm.return_value = allowed
request = Mock(
method=method,
data={"week_number": value},
user=self.user,
)

self.assertEqual(
CanEditTaskWeekNumber().has_permission(request, None),
allowed,
)
self.user.has_perm.assert_called_once_with(
"users.edit_task_week_number"
)

def test_safe_methods_do_not_require_week_number_permission(self):
for method in ("GET", "HEAD", "OPTIONS"):
with self.subTest(method=method):
request = Mock(method=method, data={"week_number": 12}, user=self.user)

self.assertTrue(CanEditTaskWeekNumber().has_permission(request, None))
self.user.has_perm.assert_not_called()
35 changes: 33 additions & 2 deletions app/apps/workflow/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
from apps.summons.serializers import SummonTypeSerializer
from apps.users.auth_apps import TopKeyAuth
from apps.users.models import User
from apps.users.permissions import CanAccessSensitiveCases, IsInAuthorizedRealm
from apps.users.permissions import (
CanAccessSensitiveCases,
CanEditTaskWeekNumber,
IsInAuthorizedRealm,
)
from apps.users.serializers import UserSerializer
from apps.workflow.serializers import (
BpmnModelListSerializer,
Expand All @@ -29,6 +33,7 @@
get_bpmn_models,
map_variables_on_task_spec_form,
)
from django import forms
from django.db.models import Q
from django.http import Http404, HttpResponse
from django_filters import rest_framework as filters
Expand Down Expand Up @@ -150,6 +155,20 @@ class CaseUserTaskFilter(filters.FilterSet):
to_field_name="name",
)
ton_ids = CharArrayFilter(method="get_ton_ids")
week_number = filters.Filter(
field_name="week_number",
method="get_week_number",
widget=forms.SelectMultiple,
help_text="Repeat this parameter for multiple weeks.",
)

def get_week_number(self, queryset, name, value):
if not value or value == [""]:
return queryset
weeks = serializers.ListField(child=serializers.IntegerField()).run_validation(
value
)
return queryset.filter(week_number__in=weeks)

def get_role(self, queryset, name, value):
return queryset.filter(roles__contains=[value])
Expand Down Expand Up @@ -260,6 +279,7 @@ class Meta:
"suffix",
"theme",
"ton_ids",
"week_number",
]


Expand Down Expand Up @@ -304,14 +324,25 @@ class StandardResultsSetPagination(EmptyPagination):
OpenApiParameter("theme", OpenApiTypes.NUMBER, OpenApiParameter.QUERY),
OpenApiParameter("theme_name", OpenApiTypes.STR, OpenApiParameter.QUERY),
OpenApiParameter("ton_ids", OpenApiTypes.NUMBER, OpenApiParameter.QUERY),
OpenApiParameter(
"week_number",
OpenApiTypes.STR,
OpenApiParameter.QUERY,
many=True,
style="form",
explode=True,
),
]
)
class CaseUserTaskViewSet(
mixins.UpdateModelMixin,
mixins.ListModelMixin,
viewsets.GenericViewSet,
):
permission_classes = [(IsInAuthorizedRealm & CanAccessSensitiveCases) | TopKeyAuth]
permission_classes = [
(IsInAuthorizedRealm & CanAccessSensitiveCases) | TopKeyAuth,
CanEditTaskWeekNumber,
]
serializer_class = CaseUserTaskSerializer
queryset = CaseUserTask.objects.all()
http_method_names = ["patch", "get"]
Expand Down
6 changes: 6 additions & 0 deletions bin/setup_user_groups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ group.permissions.add(Permission.objects.get(codename="access_business_register"
group.permissions.add(Permission.objects.get(codename="access_recovery_check"))
group.permissions.add(Permission.objects.get(codename="close_case"))
group.permissions.add(Permission.objects.get(codename="perform_task"))
group.permissions.add(Permission.objects.get(codename="edit_task_week_number"))
group.permissions.add(Permission.objects.get(codename="assign_task_to_others"))

(group, _) = UserGroup.objects.get_or_create(name='MEDEWERKER_GEVOELIGE_ZAKEN', display_name='Medewerker Gevoelige Zaken')
group.permissions.add(Permission.objects.get(codename="access_sensitive_dossiers"))
Expand All @@ -46,4 +48,8 @@ group.permissions.add(Permission.objects.get(codename="create_digital_surveilanc
(group, _) = UserGroup.objects.get_or_create(name='ZAKEN_IMPORTEREN', display_name='Zaken importeren')
group.permissions.add(Permission.objects.get(codename="perform_bulk_import"))

(group, _) = UserGroup.objects.get_or_create(name='TEAMLEIDER', display_name='Teamleider')
group.permissions.add(Permission.objects.get(codename="edit_task_week_number"))
group.permissions.add(Permission.objects.get(codename="assign_task_to_others"))

PY
Loading