ReservationForm: Align reservations to a 5-minute grid (#333)

...instead of a 30-minute one. The backend should do the rest of the validation.
City-of-Helsinki · Apr 28, 2022 · fc60035 · fc60035
1 parent f331a61
commit fc60035
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/shared/reservation-form/ReservationForm.js b/app/shared/reservation-form/ReservationForm.js
@@ -47,13 +47,13 @@ export function validate(values) {
       if (!begin.isBefore(end)) {
         errors.time = 'Alkamisajan on oltava ennen loppumisaikaa';
       } else {
-        const pattern = /^\d\d:[03]0$/;
+        const pattern = /^\d\d:\d[05]$/;
         const areTimesValid = (
           pattern.exec(values.time.begin.time) &&
           pattern.exec(values.time.end.time)
         );
         if (!areTimesValid) {
-          errors.time = 'Ajan on päätyttävä :00 tai :30';
+          errors.time = 'Minuutin on oltava jaollinen viidellä, esim. 00, 05, 10, 15 jne.';
         }
       }
     } else {

diff --git a/app/shared/reservation-form/ReservationForm.spec.js b/app/shared/reservation-form/ReservationForm.spec.js
@@ -107,23 +107,24 @@ describe('shared/reservation-form/ReservationForm', () => {
         expect(error).to.equal('Alkamisajan on oltava ennen loppumisaikaa');
       });
 
+      const invalidMinutesMessage = 'Minuutin on oltava jaollinen viidellä, esim. 00, 05, 10, 15 jne.';
       it('has error when begin time has invalid minutes', () => {
-        const minutes = ['01', '05', '10', '20', '29', '31', '45', '50', '55', '59'];
+        const minutes = ['01', '06', '11', '24', '29', '31', '44', '51', '56', '59'];
         minutes.forEach((minute) => {
           const error = getError({
             begin: { date: '2016-01-01', time: `10:${minute}` },
           });
-          expect(error).to.equal('Ajan on päätyttävä :00 tai :30');
+          expect(error).to.equal(invalidMinutesMessage);
         });
       });
 
       it('has error when end time has invalid minutes', () => {
-        const minutes = ['01', '05', '10', '20', '29', '31', '45', '50', '55', '59'];
+        const minutes = ['01', '06', '11', '24', '29', '31', '44', '51', '56', '59'];
         minutes.forEach((minute) => {
           const error = getError({
             end: { date: '2016-01-01', time: `10:${minute}` },
           });
-          expect(error).to.equal('Ajan on päätyttävä :00 tai :30');
+          expect(error).to.equal(invalidMinutesMessage);
         });
       });
     });