DONT MERGE fix(ZMSKVR-1142): reject appointments-per-mail value 1

zmsadmin/templates/block/scope/form.twig

@@ -238,7 +238,9 @@
 
                     {{ formgroup(
                         {
-                            "label": "Maximale Anzahl an Terminen pro E-Mail-Adresse:", "description": "Wird 1 eingestellt, können Bürger*innen ihre Termine nicht selbständig umbuchen."
+                            "label": "Maximale Anzahl an Terminen pro E-Mail-Adresse:",
+                            "description": "Bitte geben Sie eine Zahl größer oder gleich \"zwei\" ein, damit ein Verschieben des Termins für Bürger*innen möglich bleibt",
+                            "errors": (exception and exception.data['preferences/client/appointmentsPerMail'].messages is defined) ? exception.data['preferences/client/appointmentsPerMail'].messages : []
                         },
                         [{
                             "type":"input",

zmsbackend/migrations/91785021142-bump-appointments-per-mail-min-two.sql

@@ -0,0 +1,9 @@
+-- 1 blocks citizen reschedule (needs room for the temporary second booking).
+-- 0 is treated as unlimited already; normalize to NULL.
+UPDATE `standort`
+SET `appointments_per_mail` = 2
+WHERE `appointments_per_mail` = 1;
+
+UPDATE `standort`
+SET `appointments_per_mail` = NULL
+WHERE `appointments_per_mail` = 0;

zmsbackend/tests/Zmsbackend/Scope/Api/ScopeUpdateTest.php

@@ -67,6 +67,26 @@ public function testNoRights()
         ], []);
     }
 
+    public function testUnvalidAppointmentsPerMailOne()
+    {
+        $this->setWorkstation();
+        $this->expectException('\BO\Zmsentities\Exception\SchemaValidation');
+        $this->expectExceptionCode(400);
+        $body = json_decode($this->readFixture('GetScope_lessData.json'), true);
+        $body['preferences']['client']['appointmentsPerMail'] = '1';
+        try {
+            $this->render(['id' => 141], [
+                '__body' => json_encode($body)
+            ], []);
+        } catch (\BO\Zmsentities\Exception\SchemaValidation $exception) {
+            $this->assertSame(
+                ['oneOf' => 'Die Zahl "1" für die maximale Anzahl an Terminen pro E-Mail-Adresse ist nicht erlaubt. Bitte geben Sie eine größere Zahl ein.'],
+                $exception->data['/preferences/client/appointmentsPerMail']['messages']
+            );
+            throw $exception;
+        }
+    }
+
     public function testRouteIdNotOverriddenByBody()
     {
         $department = (new \BO\Zmsentities\Department());

zmsbackend/tests/Zmsbackend/Service/fixtures/ProcessTest/testAppointmentIsAllowedBecauseEMailDomainIsWhitelisted/setup.sql

@@ -1,3 +1,3 @@
-UPDATE standort SET appointments_per_mail = 1, whitelisted_mails = "test@gmail.com,@mail.com" WHERE StandortID = 140;
+UPDATE standort SET appointments_per_mail = 2, whitelisted_mails = "test@gmail.com,@mail.com" WHERE StandortID = 140;
 UPDATE buerger SET EMail = "testmail@mail.com" WHERE absagecode = "a156";
 UPDATE buerger SET EMail = "testmail@mail.com" WHERE absagecode = "c01b";

zmsbackend/tests/Zmsbackend/Service/fixtures/ProcessTest/testAppointmentIsAllowedBecauseEMailIsWhitelisted/setup.sql

@@ -1,3 +1,3 @@
-UPDATE standort SET appointments_per_mail = 1, whitelisted_mails = "testmail@mail.com" WHERE StandortID = 140;
+UPDATE standort SET appointments_per_mail = 2, whitelisted_mails = "testmail@mail.com" WHERE StandortID = 140;
 UPDATE buerger SET EMail = "testmail@mail.com" WHERE absagecode = "a156";
 UPDATE buerger SET EMail = "testmail@mail.com" WHERE absagecode = "c01b";

zmsbackend/tests/Zmsbackend/Service/fixtures/ProcessTest/testAppointmentIsNotAllowedBecauseEMailLimitationIsReached/setup.sql

@@ -1,3 +1,3 @@
-UPDATE standort SET appointments_per_mail = 1, whitelisted_mails = "somemail@mail.com" WHERE StandortID = 140;
+UPDATE standort SET appointments_per_mail = 2, whitelisted_mails = "somemail@mail.com" WHERE StandortID = 140;
 UPDATE buerger SET EMail = "testmail@mail.com" WHERE absagecode = "a156";
 UPDATE buerger SET EMail = "testmail@mail.com" WHERE absagecode = "c01b";

zmsentities/schema/dereferenced/scope.json

@@ -419,9 +419,29 @@
                     "additionalProperties": false,
                     "properties": {
                         "appointmentsPerMail": {
-                            "type": ["string", "null", "integer"],
-                            "description": "allowed appointments per e-mail address",
-                            "default": ""
+                            "oneOf": [
+                                {
+                                    "type": "null"
+                                },
+                                {
+                                    "type": "integer",
+                                    "minimum": 2
+                                },
+                                {
+                                    "type": "string",
+                                    "pattern": "^(|[2-9]|[1-9][0-9]+)$"
+                                }
+                            ],
+                            "description": "allowed appointments per e-mail address; empty/null = unlimited, otherwise must be >= 2 so citizens can reschedule",
+                            "default": "",
+                            "x-locale": {
+                                "de_DE": {
+                                    "pointer": "Maximale Anzahl an Terminen pro E-Mail-Adresse",
+                                    "messages": {
+                                        "oneOf": "Die Zahl \"1\" für die maximale Anzahl an Terminen pro E-Mail-Adresse ist nicht erlaubt. Bitte geben Sie eine größere Zahl ein."
+                                    }
+                                }
+                            }
                         },
                         "slotsPerAppointment": {
                             "type": ["string", "null", "integer"],

zmsentities/schema/scope.json

@@ -283,9 +283,29 @@
                     "additionalProperties": false,
                     "properties": {
                         "appointmentsPerMail": {
-                            "type": ["string", "null", "integer"],
-                            "description": "allowed appointments per e-mail address",
-                            "default": ""
+                            "oneOf": [
+                                {
+                                    "type": "null"
+                                },
+                                {
+                                    "type": "integer",
+                                    "minimum": 2
+                                },
+                                {
+                                    "type": "string",
+                                    "pattern": "^(|[2-9]|[1-9][0-9]+)$"
+                                }
+                            ],
+                            "description": "allowed appointments per e-mail address; empty/null = unlimited, otherwise must be >= 2 so citizens can reschedule",
+                            "default": "",
+                            "x-locale": {
+                                "de_DE": {
+                                    "pointer": "Maximale Anzahl an Terminen pro E-Mail-Adresse",
+                                    "messages": {
+                                        "oneOf": "Die Zahl \"1\" für die maximale Anzahl an Terminen pro E-Mail-Adresse ist nicht erlaubt. Bitte geben Sie eine größere Zahl ein."
+                                    }
+                                }
+                            }
                         },
                         "slotsPerAppointment": {
                             "type": ["string", "null", "integer"],

zmsentities/src/Zmsentities/Schema/Validator.php

@@ -83,16 +83,23 @@ public function getErrors()
     private function extractErrors(OpisValidationError $error)
     {
         $errors = [];
+        $message = $this->getCustomMessage($error);
 
         $errors[] = new OpisValidationError(
             $error->keyword(),
             $error->schema(),
             $error->data(),
-            $this->getCustomMessage($error),
+            $message,
             $error->args(),
             []
         );
 
+        // Custom x-locale messages already describe the full constraint (e.g. oneOf).
+        // Do not also surface Opis branch/sub-errors in admin forms.
+        if ($message !== $error->message()) {
+            return $errors;
+        }
+
         foreach ($error->subErrors() as $subError) {
             if ($subError instanceof OpisValidationError) {
                 $errors = array_merge($errors, $this->extractErrors($subError));

zmsentities/tests/Zmsentities/ScopeTest.php

@@ -190,4 +190,30 @@ public function testRequestList()
         $requestList = $entity->getRequestList();
         $this->assertTrue($requestList->hasRequests(1234), "Missing request in provider from scope");
     }
+
+    public function testAppointmentsPerMailRejectsInvalidValues()
+    {
+        $expectedMessage = 'Die Zahl "1" für die maximale Anzahl an Terminen pro E-Mail-Adresse ist nicht erlaubt. Bitte geben Sie eine größere Zahl ein.';
+        foreach ([0, '0', 1, '1', -1, 'abc'] as $value) {
+            $entity = $this->getExample();
+            $entity->preferences['client']['appointmentsPerMail'] = $value;
+            try {
+                $entity->testValid('de_DE', 1);
+                $this->fail('Expected SchemaValidation for value ' . var_export($value, true));
+            } catch (\BO\Zmsentities\Exception\SchemaValidation $exception) {
+                $this->assertSame(400, $exception->getCode());
+                $messages = $exception->data['/preferences/client/appointmentsPerMail']['messages'];
+                $this->assertSame(['oneOf' => $expectedMessage], $messages);
+            }
+        }
+    }
+
+    public function testAppointmentsPerMailAllowsTwoOrEmpty()
+    {
+        foreach (['', null, '2', 2, '10', 10] as $value) {
+            $entity = $this->getExample();
+            $entity->preferences['client']['appointmentsPerMail'] = $value;
+            $this->assertTrue($entity->testValid('de_DE', 1));
+        }
+    }
 }