From 9e7d4130906167902d3bc68aa679d5b174857a01 Mon Sep 17 00:00:00 2001
From: SanttuA <santtualatalo@gmail.com>
Date: Wed, 4 Sep 2024 08:27:30 +0300
Subject: [PATCH] Allowed spaces for phone number in reservation form (#345)

Spaces for phone number are now allowed. The number is later formatted to not include spaces when it's sent to Respa.
---
 app/actions/reservationActions.js               |  4 +++-
 app/utils/__tests__/phoneValidationUtil.spec.js |  7 +++++++
 app/utils/__tests__/reservationUtils.spec.js    |  8 ++++++++
 app/utils/phoneValidationUtil.js                |  4 ++--
 app/utils/reservationUtils.js                   | 11 +++++++++++
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/actions/reservationActions.js b/app/actions/reservationActions.js
index f275c1073..536d6641d 100644
--- a/app/actions/reservationActions.js
+++ b/app/actions/reservationActions.js
@@ -13,7 +13,7 @@ import {
   getRequestTypeDescriptor,
   getSuccessTypeDescriptor,
 } from 'utils/apiUtils';
-import { getMissingValues, isStaffEvent } from 'utils/reservationUtils';
+import { getMissingValues, isStaffEvent, formatPhone } from 'utils/reservationUtils';
 
 function commentReservation(reservation, resource, comments) {
   const missingValues = getMissingValues(reservation);
@@ -98,6 +98,8 @@ function parseReservationData(reservation) {
     return value;
   });
 
+  trimmedValues.reserverPhoneNumber = formatPhone(trimmedValues.reserverPhoneNumber);
+
   const parsed = pickBy(trimmedValues, value => value || value === 0 || typeof (value) === 'boolean');
   return JSON.stringify(decamelizeKeys(parsed));
 }
diff --git a/app/utils/__tests__/phoneValidationUtil.spec.js b/app/utils/__tests__/phoneValidationUtil.spec.js
index e529cd163..09820cb30 100644
--- a/app/utils/__tests__/phoneValidationUtil.spec.js
+++ b/app/utils/__tests__/phoneValidationUtil.spec.js
@@ -16,6 +16,13 @@ describe('Utils: phoneValidationUtil', () => {
           expect(isValidPhoneNumber('+123-123123')).toBe(false);
         });
       });
+      describe('returns true', () => {
+        test('when valid number has spaces', () => {
+          expect(isValidPhoneNumber('55 555555')).toBe(true);
+          expect(isValidPhoneNumber('32 123123')).toBe(true);
+          expect(isValidPhoneNumber('32 123 123')).toBe(true);
+        });
+      });
     });
 
     describe('when number does not contains non numbers excluding first + char', () => {
diff --git a/app/utils/__tests__/reservationUtils.spec.js b/app/utils/__tests__/reservationUtils.spec.js
index 67dcabf27..0b2063470 100644
--- a/app/utils/__tests__/reservationUtils.spec.js
+++ b/app/utils/__tests__/reservationUtils.spec.js
@@ -31,6 +31,7 @@ import {
   isManuallyConfirmedWithOrderAllowed,
   normalizeUniversalFieldOptions,
   mapReservationErrors,
+  formatPhone
 } from 'utils/reservationUtils';
 import { buildAPIUrl, getHeadersCreator } from '../apiUtils';
 import Product from '../fixtures/Product';
@@ -797,4 +798,11 @@ describe('Utils: reservationUtils', () => {
       });
     });
   });
+
+  describe('formatPhone', () => {
+    test('removes all whitespace characters from phone number', () => {
+      const phone = '  040 1234567  ';
+      expect(formatPhone(phone)).toBe('0401234567');
+    });
+  });
 });
diff --git a/app/utils/phoneValidationUtil.js b/app/utils/phoneValidationUtil.js
index 85be757d4..bf33416c6 100644
--- a/app/utils/phoneValidationUtil.js
+++ b/app/utils/phoneValidationUtil.js
@@ -1,8 +1,8 @@
 import { PhoneNumberUtil } from 'google-libphonenumber';
 
 export function isValidPhoneNumber(number) {
-  // only allow numbers and + if its the first char
-  const regex = /^([+]\d*|\d*)$/;
+  // only allow numbers, spaces and + if it's the first char
+  const regex = /^(\+?\d[\d\s]*)$/;
   if (regex.test(number) === false) {
     return false;
   }
diff --git a/app/utils/reservationUtils.js b/app/utils/reservationUtils.js
index 8a6d171de..99ae8e391 100644
--- a/app/utils/reservationUtils.js
+++ b/app/utils/reservationUtils.js
@@ -418,6 +418,16 @@ function mapReservationErrors(errors, universalFields) {
   return mappedErrors.sort((a, b) => a.order - b.order);
 }
 
+/**
+ * Formats given phone number by removing all whitespace characters
+ * @param {string} phoneNum
+ * @returns {string} formatted phone number
+ */
+function formatPhone(phoneNum) {
+  if (!phoneNum) return phoneNum;
+  return phoneNum.replace(/\s/g, '');
+}
+
 export {
   combine,
   isStaffEvent,
@@ -443,4 +453,5 @@ export {
   isManuallyConfirmedWithOrderAllowed,
   normalizeUniversalFieldOptions,
   mapReservationErrors,
+  formatPhone,
 };