From 4ff963d1e280f85e11e5d4a3f9d2803d75a1e232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <bjoern.fromme@ep-reisen.de>
Date: Thu, 5 Nov 2026 17:18:26 +0100
Subject: [PATCH] feat: let managers edit the staffing matrix

---
 .../System/StaffingRule/CreateController.php  | 10 ++---
 .../System/StaffingRule/DeleteController.php  | 10 ++---
 .../System/StaffingRule/EditController.php    | 10 ++---
 .../System/StaffingRule/ExportController.php  | 10 ++---
 .../System/StaffingRule/IndexController.php   |  8 ++--
 .../System/StaffingRule/PreviewController.php | 10 ++---
 src/Menu/AdminMenuBuilder.php                 |  4 +-
 src/Menu/ManagerMenuBuilder.php               | 11 +++++
 .../system/staffing_rule/_form.html.twig      |  0
 .../system/staffing_rule/index.html.twig      | 10 ++---
 .../staffing_rule/modal_create.html.twig      |  2 +-
 .../staffing_rule/modal_delete.html.twig      |  0
 .../system/staffing_rule/modal_edit.html.twig |  2 +-
 .../system/staffing_rule/preview.html.twig    |  6 +--
 .../StaffingRuleControllerTest.php            | 43 ++++++++++++++-----
 15 files changed, 84 insertions(+), 52 deletions(-)
 rename src/Controller/{Admin => Administrative}/System/StaffingRule/CreateController.php (79%)
 rename src/Controller/{Admin => Administrative}/System/StaffingRule/DeleteController.php (77%)
 rename src/Controller/{Admin => Administrative}/System/StaffingRule/EditController.php (79%)
 rename src/Controller/{Admin => Administrative}/System/StaffingRule/ExportController.php (82%)
 rename src/Controller/{Admin => Administrative}/System/StaffingRule/IndexController.php (65%)
 rename src/Controller/{Admin => Administrative}/System/StaffingRule/PreviewController.php (77%)
 rename templates/{admin => administrative}/system/staffing_rule/_form.html.twig (100%)
 rename templates/{admin => administrative}/system/staffing_rule/index.html.twig (91%)
 rename templates/{admin => administrative}/system/staffing_rule/modal_create.html.twig (63%)
 rename templates/{admin => administrative}/system/staffing_rule/modal_delete.html.twig (100%)
 rename templates/{admin => administrative}/system/staffing_rule/modal_edit.html.twig (62%)
 rename templates/{admin => administrative}/system/staffing_rule/preview.html.twig (92%)
 rename tests/Controller/{Admin => Administrative}/System/StaffingRule/StaffingRuleControllerTest.php (78%)

diff --git a/src/Controller/Admin/System/StaffingRule/CreateController.php b/src/Controller/Administrative/System/StaffingRule/CreateController.php
similarity index 79%
rename from src/Controller/Admin/System/StaffingRule/CreateController.php
rename to src/Controller/Administrative/System/StaffingRule/CreateController.php
index 910863a..af367c6 100644
--- a/src/Controller/Admin/System/StaffingRule/CreateController.php
+++ b/src/Controller/Administrative/System/StaffingRule/CreateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin\System\StaffingRule;
+namespace App\Controller\Administrative\System\StaffingRule;
 
 use App\Entity\StaffingRule;
 use App\Form\StaffingRuleType;
@@ -21,8 +21,8 @@ class CreateController extends AbstractController
     ) {
     }
 
-    #[Route('/admin/system/staffing-rule/create', name: 'app_admin_system_staffing_rule_create')]
-    #[IsGranted('ROLE_TEAM_ADMIN')]
+    #[Route('/administrative/system/staffing-rule/create', name: 'app_administrative_system_staffing_rule_create')]
+    #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(Request $request): Response
     {
         $rule = new StaffingRule();
@@ -39,10 +39,10 @@ class CreateController extends AbstractController
                 'product_code' => $rule->getProductCode(),
             ]);
 
-            return new HxRedirectResponse($this->generateUrl('app_admin_system_staffing_rule_index'));
+            return new HxRedirectResponse($this->generateUrl('app_administrative_system_staffing_rule_index'));
         }
 
-        return $this->render('admin/system/staffing_rule/modal_create.html.twig', [
+        return $this->render('administrative/system/staffing_rule/modal_create.html.twig', [
             'form' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/Admin/System/StaffingRule/DeleteController.php b/src/Controller/Administrative/System/StaffingRule/DeleteController.php
similarity index 77%
rename from src/Controller/Admin/System/StaffingRule/DeleteController.php
rename to src/Controller/Administrative/System/StaffingRule/DeleteController.php
index cf3cfda..a6b24fa 100644
--- a/src/Controller/Admin/System/StaffingRule/DeleteController.php
+++ b/src/Controller/Administrative/System/StaffingRule/DeleteController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin\System\StaffingRule;
+namespace App\Controller\Administrative\System\StaffingRule;
 
 use App\Entity\StaffingRule;
 use App\Htmx\HxRedirectResponse;
@@ -20,8 +20,8 @@ class DeleteController extends AbstractController
     ) {
     }
 
-    #[Route('/admin/system/staffing-rule/delete/{uuid}', name: 'app_admin_system_staffing_rule_delete')]
-    #[IsGranted('ROLE_TEAM_ADMIN')]
+    #[Route('/administrative/system/staffing-rule/delete/{uuid}', name: 'app_administrative_system_staffing_rule_delete')]
+    #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(StaffingRule $rule, Request $request): Response
     {
         if (true === $request->isMethod('POST')) {
@@ -34,10 +34,10 @@ class DeleteController extends AbstractController
                 'product_code' => $rule->getProductCode(),
             ]);
 
-            return new HxRedirectResponse($this->generateUrl('app_admin_system_staffing_rule_index'));
+            return new HxRedirectResponse($this->generateUrl('app_administrative_system_staffing_rule_index'));
         }
 
-        return $this->render('admin/system/staffing_rule/modal_delete.html.twig', [
+        return $this->render('administrative/system/staffing_rule/modal_delete.html.twig', [
             'rule' => $rule,
         ]);
     }
diff --git a/src/Controller/Admin/System/StaffingRule/EditController.php b/src/Controller/Administrative/System/StaffingRule/EditController.php
similarity index 79%
rename from src/Controller/Admin/System/StaffingRule/EditController.php
rename to src/Controller/Administrative/System/StaffingRule/EditController.php
index 7432b18..67e0ed7 100644
--- a/src/Controller/Admin/System/StaffingRule/EditController.php
+++ b/src/Controller/Administrative/System/StaffingRule/EditController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin\System\StaffingRule;
+namespace App\Controller\Administrative\System\StaffingRule;
 
 use App\Entity\StaffingRule;
 use App\Form\StaffingRuleType;
@@ -21,8 +21,8 @@ class EditController extends AbstractController
     ) {
     }
 
-    #[Route('/admin/system/staffing-rule/edit/{uuid}', name: 'app_admin_system_staffing_rule_edit')]
-    #[IsGranted('ROLE_TEAM_ADMIN')]
+    #[Route('/administrative/system/staffing-rule/edit/{uuid}', name: 'app_administrative_system_staffing_rule_edit')]
+    #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(StaffingRule $rule, Request $request): Response
     {
         $form = $this->createForm(StaffingRuleType::class, $rule);
@@ -37,10 +37,10 @@ class EditController extends AbstractController
                 'product_code' => $rule->getProductCode(),
             ]);
 
-            return new HxRedirectResponse($this->generateUrl('app_admin_system_staffing_rule_index'));
+            return new HxRedirectResponse($this->generateUrl('app_administrative_system_staffing_rule_index'));
         }
 
-        return $this->render('admin/system/staffing_rule/modal_edit.html.twig', [
+        return $this->render('administrative/system/staffing_rule/modal_edit.html.twig', [
             'form' => $form->createView(),
         ]);
     }
diff --git a/src/Controller/Admin/System/StaffingRule/ExportController.php b/src/Controller/Administrative/System/StaffingRule/ExportController.php
similarity index 82%
rename from src/Controller/Admin/System/StaffingRule/ExportController.php
rename to src/Controller/Administrative/System/StaffingRule/ExportController.php
index e55de06..5cf9f78 100644
--- a/src/Controller/Admin/System/StaffingRule/ExportController.php
+++ b/src/Controller/Administrative/System/StaffingRule/ExportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin\System\StaffingRule;
+namespace App\Controller\Administrative\System\StaffingRule;
 
 use App\Service\Assignment\StaffingConfigurationException;
 use App\Service\Export\StaffingPreviewExporter;
@@ -21,8 +21,8 @@ class ExportController extends AbstractController
     ) {
     }
 
-    #[Route('/admin/system/staffing-rule/export', name: 'app_admin_system_staffing_rule_export')]
-    #[IsGranted('ROLE_TEAM_ADMIN')]
+    #[Route('/administrative/system/staffing-rule/export', name: 'app_administrative_system_staffing_rule_export')]
+    #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(): Response
     {
         try {
@@ -30,13 +30,13 @@ class ExportController extends AbstractController
         } catch (StaffingConfigurationException $e) {
             $this->addFlash('error', 'Ein Jobprofil oder Honorar der Besetzungsmatrix ist nicht (mehr) vorhanden: '.$e->getMessage());
 
-            return $this->redirectToRoute('app_admin_system_staffing_rule_index');
+            return $this->redirectToRoute('app_administrative_system_staffing_rule_index');
         }
 
         if ([] === $rows) {
             $this->addFlash('error', 'Keine Daten für den Export vorhanden');
 
-            return $this->redirectToRoute('app_admin_system_staffing_rule_preview');
+            return $this->redirectToRoute('app_administrative_system_staffing_rule_preview');
         }
 
         $spreadsheet = $this->previewExporter->export($rows);
diff --git a/src/Controller/Admin/System/StaffingRule/IndexController.php b/src/Controller/Administrative/System/StaffingRule/IndexController.php
similarity index 65%
rename from src/Controller/Admin/System/StaffingRule/IndexController.php
rename to src/Controller/Administrative/System/StaffingRule/IndexController.php
index d8644c9..2c8e47f 100644
--- a/src/Controller/Admin/System/StaffingRule/IndexController.php
+++ b/src/Controller/Administrative/System/StaffingRule/IndexController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin\System\StaffingRule;
+namespace App\Controller\Administrative\System\StaffingRule;
 
 use App\Repository\StaffingRuleRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -14,11 +14,11 @@ class IndexController extends AbstractController
     {
     }
 
-    #[Route('/admin/system/staffing-rule', name: 'app_admin_system_staffing_rule_index')]
-    #[IsGranted('ROLE_TEAM_ADMIN')]
+    #[Route('/administrative/system/staffing-rule', name: 'app_administrative_system_staffing_rule_index')]
+    #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(): Response
     {
-        return $this->render('admin/system/staffing_rule/index.html.twig', [
+        return $this->render('administrative/system/staffing_rule/index.html.twig', [
             'rules' => $this->staffingRuleRepository->getList(),
         ]);
     }
diff --git a/src/Controller/Admin/System/StaffingRule/PreviewController.php b/src/Controller/Administrative/System/StaffingRule/PreviewController.php
similarity index 77%
rename from src/Controller/Admin/System/StaffingRule/PreviewController.php
rename to src/Controller/Administrative/System/StaffingRule/PreviewController.php
index 0cd17f7..913e81f 100644
--- a/src/Controller/Admin/System/StaffingRule/PreviewController.php
+++ b/src/Controller/Administrative/System/StaffingRule/PreviewController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Controller\Admin\System\StaffingRule;
+namespace App\Controller\Administrative\System\StaffingRule;
 
 use App\Service\Assignment\StaffingConfigurationException;
 use App\Service\Export\StaffingPreviewExporter;
@@ -19,8 +19,8 @@ class PreviewController extends AbstractController
     ) {
     }
 
-    #[Route('/admin/system/staffing-rule/preview', name: 'app_admin_system_staffing_rule_preview')]
-    #[IsGranted('ROLE_TEAM_ADMIN')]
+    #[Route('/administrative/system/staffing-rule/preview', name: 'app_administrative_system_staffing_rule_preview')]
+    #[IsGranted('ROLE_ADMINISTRATIVE')]
     public function index(Request $request): Response
     {
         try {
@@ -28,7 +28,7 @@ class PreviewController extends AbstractController
         } catch (StaffingConfigurationException $e) {
             $this->addFlash('error', 'Ein Jobprofil oder Honorar der Besetzungsmatrix ist nicht (mehr) vorhanden: '.$e->getMessage());
 
-            return $this->redirectToRoute('app_admin_system_staffing_rule_index');
+            return $this->redirectToRoute('app_administrative_system_staffing_rule_index');
         }
 
         // The candidates are a computed list, not a query: page the finished rows. The Excel
@@ -39,7 +39,7 @@ class PreviewController extends AbstractController
             $request->query->getInt('limit', 50),
         );
 
-        return $this->render('admin/system/staffing_rule/preview.html.twig', [
+        return $this->render('administrative/system/staffing_rule/preview.html.twig', [
             'pagination' => $pagination,
         ]);
     }
diff --git a/src/Menu/AdminMenuBuilder.php b/src/Menu/AdminMenuBuilder.php
index 3842e02..65fa164 100644
--- a/src/Menu/AdminMenuBuilder.php
+++ b/src/Menu/AdminMenuBuilder.php
@@ -279,13 +279,13 @@ class AdminMenuBuilder extends AbstractMenuBuilder
             ],
         ]);
         $settingsMenu->addChild('Besetzungsmatrix', [
-            'route' => 'app_admin_system_staffing_rule_index',
+            'route' => 'app_administrative_system_staffing_rule_index',
             'linkAttributes' => [
                 'title' => 'Besetzungsmatrix',
             ],
             'extras' => [
                 'routes' => [
-                    ['pattern' => '/^app_admin_system_staffing_rule_/'],
+                    ['pattern' => '/^app_administrative_system_staffing_rule_/'],
                 ],
             ],
         ]);
diff --git a/src/Menu/ManagerMenuBuilder.php b/src/Menu/ManagerMenuBuilder.php
index f81668a..ea966d0 100644
--- a/src/Menu/ManagerMenuBuilder.php
+++ b/src/Menu/ManagerMenuBuilder.php
@@ -167,6 +167,17 @@ class ManagerMenuBuilder extends AbstractMenuBuilder
                 'icon' => 'settings',
             ],
         ]);
+        $settingsMenu->addChild('Besetzungsmatrix', [
+            'route' => 'app_administrative_system_staffing_rule_index',
+            'linkAttributes' => [
+                'title' => 'Besetzungsmatrix',
+            ],
+            'extras' => [
+                'routes' => [
+                    ['pattern' => '/^app_administrative_system_staffing_rule_/'],
+                ],
+            ],
+        ]);
         $settingsMenu->addChild('Reisen', [
             'route' => 'app_administrative_system_destination_index',
             'linkAttributes' => [
diff --git a/templates/admin/system/staffing_rule/_form.html.twig b/templates/administrative/system/staffing_rule/_form.html.twig
similarity index 100%
rename from templates/admin/system/staffing_rule/_form.html.twig
rename to templates/administrative/system/staffing_rule/_form.html.twig
diff --git a/templates/admin/system/staffing_rule/index.html.twig b/templates/administrative/system/staffing_rule/index.html.twig
similarity index 91%
rename from templates/admin/system/staffing_rule/index.html.twig
rename to templates/administrative/system/staffing_rule/index.html.twig
index 8c03730..9467e14 100644
--- a/templates/admin/system/staffing_rule/index.html.twig
+++ b/templates/administrative/system/staffing_rule/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/layout.html.twig' %}
+{% extends 'administrative/layout.html.twig' %}
 
 {% block title %}Einstellungen - Besetzungsmatrix{% endblock %}
 
@@ -9,7 +9,7 @@
         <h1 class="text-2xl font-bold">
             Besetzungsmatrix
         </h1>
-        <a href="{{ path('app_admin_system_staffing_rule_preview') }}" class="btn">
+        <a href="{{ path('app_administrative_system_staffing_rule_preview') }}" class="btn">
             Vorschau
         </a>
     </div>
@@ -53,14 +53,14 @@
                                 <button type="button"
                                         class="text-red-500"
                                         title="Zeile löschen"
-                                        hx-get="{{ path('app_admin_system_staffing_rule_delete', { 'uuid': rule.uuid }) }}"
+                                        hx-get="{{ path('app_administrative_system_staffing_rule_delete', { 'uuid': rule.uuid }) }}"
                                         hx-target="body"
                                         hx-swap="beforeend">
                                     {{ icon('delete') }}
                                 </button>
                                 <button type="button"
                                         title="Zeile bearbeiten"
-                                        hx-get="{{ path('app_admin_system_staffing_rule_edit', { 'uuid': rule.uuid }) }}"
+                                        hx-get="{{ path('app_administrative_system_staffing_rule_edit', { 'uuid': rule.uuid }) }}"
                                         hx-target="body"
                                         hx-swap="beforeend">
                                     {{ icon('edit') }}
@@ -82,7 +82,7 @@
     <button type="button"
             class="btn"
             title="Zeile hinzufügen"
-            hx-get="{{ path('app_admin_system_staffing_rule_create') }}"
+            hx-get="{{ path('app_administrative_system_staffing_rule_create') }}"
             hx-target="body"
             hx-swap="beforeend">
         Zeile hinzufügen
diff --git a/templates/admin/system/staffing_rule/modal_create.html.twig b/templates/administrative/system/staffing_rule/modal_create.html.twig
similarity index 63%
rename from templates/admin/system/staffing_rule/modal_create.html.twig
rename to templates/administrative/system/staffing_rule/modal_create.html.twig
index e42ccd5..ed61889 100644
--- a/templates/admin/system/staffing_rule/modal_create.html.twig
+++ b/templates/administrative/system/staffing_rule/modal_create.html.twig
@@ -3,5 +3,5 @@
 {% block title %}Zeile hinzufügen{% endblock %}
 
 {% block content %}
-    {% include 'admin/system/staffing_rule/_form.html.twig' %}
+    {% include 'administrative/system/staffing_rule/_form.html.twig' %}
 {% endblock %}
diff --git a/templates/admin/system/staffing_rule/modal_delete.html.twig b/templates/administrative/system/staffing_rule/modal_delete.html.twig
similarity index 100%
rename from templates/admin/system/staffing_rule/modal_delete.html.twig
rename to templates/administrative/system/staffing_rule/modal_delete.html.twig
diff --git a/templates/admin/system/staffing_rule/modal_edit.html.twig b/templates/administrative/system/staffing_rule/modal_edit.html.twig
similarity index 62%
rename from templates/admin/system/staffing_rule/modal_edit.html.twig
rename to templates/administrative/system/staffing_rule/modal_edit.html.twig
index 1eae1fb..10cb8b6 100644
--- a/templates/admin/system/staffing_rule/modal_edit.html.twig
+++ b/templates/administrative/system/staffing_rule/modal_edit.html.twig
@@ -3,5 +3,5 @@
 {% block title %}Zeile bearbeiten{% endblock %}
 
 {% block content %}
-    {% include 'admin/system/staffing_rule/_form.html.twig' %}
+    {% include 'administrative/system/staffing_rule/_form.html.twig' %}
 {% endblock %}
diff --git a/templates/admin/system/staffing_rule/preview.html.twig b/templates/administrative/system/staffing_rule/preview.html.twig
similarity index 92%
rename from templates/admin/system/staffing_rule/preview.html.twig
rename to templates/administrative/system/staffing_rule/preview.html.twig
index 9e7987c..c75c6f7 100644
--- a/templates/admin/system/staffing_rule/preview.html.twig
+++ b/templates/administrative/system/staffing_rule/preview.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/layout.html.twig' %}
+{% extends 'administrative/layout.html.twig' %}
 
 {% block title %}Einstellungen - Besetzungsmatrix - Vorschau{% endblock %}
 
@@ -8,10 +8,10 @@
             Besetzungsmatrix – Vorschau
         </h1>
         <div class="flex items-center space-x-2">
-            <a href="{{ path('app_admin_system_staffing_rule_index') }}" class="btn">
+            <a href="{{ path('app_administrative_system_staffing_rule_index') }}" class="btn">
                 Zurück zur Matrix
             </a>
-            <a href="{{ path('app_admin_system_staffing_rule_export') }}" class="btn">
+            <a href="{{ path('app_administrative_system_staffing_rule_export') }}" class="btn">
                 Excel-Export
             </a>
         </div>
diff --git a/tests/Controller/Admin/System/StaffingRule/StaffingRuleControllerTest.php b/tests/Controller/Administrative/System/StaffingRule/StaffingRuleControllerTest.php
similarity index 78%
rename from tests/Controller/Admin/System/StaffingRule/StaffingRuleControllerTest.php
rename to tests/Controller/Administrative/System/StaffingRule/StaffingRuleControllerTest.php
index 43af45a..9a159b0 100644
--- a/tests/Controller/Admin/System/StaffingRule/StaffingRuleControllerTest.php
+++ b/tests/Controller/Administrative/System/StaffingRule/StaffingRuleControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Tests\Controller\Admin\System\StaffingRule;
+namespace App\Tests\Controller\Administrative\System\StaffingRule;
 
 use App\Entity\User;
 use App\Repository\StaffingRuleRepository;
@@ -29,7 +29,7 @@ class StaffingRuleControllerTest extends WebTestCase
         $this->resetStaffingTables(self::getContainer()->get(Connection::class));
         $this->entityManager->createQuery(sprintf('DELETE FROM %s', User::class))->execute();
 
-        $this->client->loginUser($this->admin());
+        $this->client->loginUser($this->user('ROLE_TEAM_ADMIN'));
     }
 
     public function testARuleIsCreatedWithItsCodeNormalized(): void
@@ -44,12 +44,33 @@ class StaffingRuleControllerTest extends WebTestCase
         $this->assertTrue($rules[0]->isSkiBeginner());
         $this->assertFalse($rules[0]->isEnabled());
 
-        $this->client->request('GET', '/admin/system/staffing-rule');
+        $this->client->request('GET', '/administrative/system/staffing-rule');
 
         $this->assertSame(Response::HTTP_OK, $this->client->getResponse()->getStatusCode());
         $this->assertStringContainsString('DKIMP', (string) $this->client->getResponse()->getContent());
     }
 
+    public function testAManagerEditsTheMatrixToo(): void
+    {
+        $this->client->loginUser($this->user('ROLE_MANAGER'));
+
+        $this->submitCreate('DKIMP');
+        $this->assertCount(1, $this->repository()->getList());
+
+        $this->client->request('GET', '/administrative/system/staffing-rule/preview');
+        $this->assertResponseIsSuccessful();
+    }
+
+    public function testATeamerIsRefused(): void
+    {
+        $this->client->loginUser($this->user('ROLE_TEAMER'));
+
+        $this->client->request('GET', '/administrative/system/staffing-rule');
+
+        // the access-denied handler sends a teamer home instead of answering 403
+        $this->assertResponseRedirects('/teamer');
+    }
+
     public function testASecondRowForTheSameProductIsRefused(): void
     {
         $this->submitCreate('DKIMP');
@@ -74,7 +95,7 @@ class StaffingRuleControllerTest extends WebTestCase
     {
         $this->submitCreate('DKIMP');
 
-        $this->client->request('GET', '/admin/system/staffing-rule/preview');
+        $this->client->request('GET', '/administrative/system/staffing-rule/preview');
 
         $this->assertSame(Response::HTTP_OK, $this->client->getResponse()->getStatusCode());
         $this->assertStringContainsString('Keine Termine', (string) $this->client->getResponse()->getContent());
@@ -86,7 +107,7 @@ class StaffingRuleControllerTest extends WebTestCase
         $this->staffingDestination($this->entityManager, 'DKIMP110127', 'DKIMP');
         $this->entityManager->flush();
 
-        $this->client->request('GET', '/admin/system/staffing-rule/preview');
+        $this->client->request('GET', '/administrative/system/staffing-rule/preview');
 
         $content = (string) $this->client->getResponse()->getContent();
 
@@ -109,7 +130,7 @@ class StaffingRuleControllerTest extends WebTestCase
         $this->entityManager->flush();
 
         // same date: ordered by product code
-        $this->client->request('GET', '/admin/system/staffing-rule/preview?limit=1&page=2');
+        $this->client->request('GET', '/administrative/system/staffing-rule/preview?limit=1&page=2');
 
         $content = (string) $this->client->getResponse()->getContent();
 
@@ -124,7 +145,7 @@ class StaffingRuleControllerTest extends WebTestCase
         $this->staffingDestination($this->entityManager, 'DKIMP110127', 'DKIMP');
         $this->entityManager->flush();
 
-        $this->client->request('GET', '/admin/system/staffing-rule/export');
+        $this->client->request('GET', '/administrative/system/staffing-rule/export');
 
         $this->assertSame(Response::HTTP_OK, $this->client->getResponse()->getStatusCode());
         $this->assertSame(
@@ -135,7 +156,7 @@ class StaffingRuleControllerTest extends WebTestCase
 
     private function submitCreate(string $productCode): void
     {
-        $crawler = $this->client->request('GET', '/admin/system/staffing-rule/create');
+        $crawler = $this->client->request('GET', '/administrative/system/staffing-rule/create');
         $form = $crawler->filter('form')->form([
             'staffing_rule[productCode]' => $productCode,
             'staffing_rule[guides]' => '2',
@@ -152,13 +173,13 @@ class StaffingRuleControllerTest extends WebTestCase
         return self::getContainer()->get(StaffingRuleRepository::class);
     }
 
-    private function admin(): User
+    private function user(string $role): User
     {
         $user = (new User())
             ->setFirstName('Anna')
             ->setLastName('Admin')
-            ->setEmail('anna.admin@example.com')
-            ->setRoles(['ROLE_TEAM_ADMIN'])
+            ->setEmail(sprintf('%s@example.com', strtolower($role)))
+            ->setRoles([$role])
             ->setBusProAddressId(1)
             ->setBusProPersonId(1)
         ;