Merge pull request #762 from konker/mode-taxi-phone-loosen

Mode taxi phone loosen
maasglobal · Sep 28, 2023 · 0bf24be · 0bf24be
2 parents db7eeb8 + 480c987
commit 0bf24be
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/maas-schemas/package.json b/maas-schemas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "maas-schemas",
-  "version": "20.3.0",
+  "version": "20.4.0",
   "description": "Schemas for MaaS infrastructure",
   "main": "index.js",
   "engine": {

diff --git a/maas-schemas/schemas/core/components/common.json b/maas-schemas/schemas/core/components/common.json
@@ -91,6 +91,11 @@
       "type": "string",
       "pattern": "^\\+?(?:\\d){6,14}\\d$"
     },
+    "loosePhone": {
+      "description": "Loose definition of phone number",
+      "type": "string",
+      "pattern": "^\\+?[\\d\\s.-]+$"
+    },
     "email": {
       "description": "Rough validation of a valid e-mail address, see https://davidcel.is/posts/stop-validating-email-addresses-with-regex/",
       "type": "string",

diff --git a/maas-schemas/schemas/core/modes/MODE_TAXI.json b/maas-schemas/schemas/core/modes/MODE_TAXI.json
@@ -84,7 +84,7 @@
           "maxLength": 64
         },
         "phone": {
-          "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/phone"
+          "$ref": "https://schemas.maas.global/core/components/common.json#/definitions/loosePhone"
         },
         "supportUrl": {
           "description": "The taxi center support link. It can be for example: chat URL, FAQ url, etc...",

diff --git a/maas-schemas/src/io-ts/_types/core/components/common.ts b/maas-schemas/src/io-ts/_types/core/components/common.ts
@@ -227,6 +227,20 @@ export type RawPhoneBrand = {
   readonly RawPhone: unique symbol;
 };
 
+// LoosePhone
+// Loose definition of phone number
+export type LoosePhone = t.Branded<string, LoosePhoneBrand>;
+export type LoosePhoneC = t.BrandC<t.StringC, LoosePhoneBrand>;
+export const LoosePhone: LoosePhoneC = t.brand(
+  t.string,
+  (x): x is t.Branded<string, LoosePhoneBrand> =>
+    typeof x !== 'string' || x.match(RegExp('^\\+?[\\d\\s.-]+$', 'u')) !== null,
+  'LoosePhone',
+);
+export type LoosePhoneBrand = {
+  readonly LoosePhone: unique symbol;
+};
+
 // Email
 // Rough validation of a valid e-mail address, see https://davidcel.is/posts/stop-validating-email-addresses-with-regex/
 export type Email = t.Branded<string, EmailBrand>;

diff --git a/maas-schemas/src/io-ts/_types/core/modes/MODE_TAXI.ts b/maas-schemas/src/io-ts/_types/core/modes/MODE_TAXI.ts
@@ -44,7 +44,7 @@ export type MODE_TAXI = t.Branded<
     taxiCenter?: {
       image?: Units_c404_.Url;
       name?: string;
-      phone?: Common_ffba_.Phone;
+      phone?: Common_ffba_.LoosePhone;
       supportUrl?: Units_c404_.Url;
     } & Record<string, unknown>;
     messageToDriver?: string;
@@ -82,7 +82,7 @@ export type MODE_TAXIC = t.BrandC<
         t.PartialC<{
           image: typeof Units_c404_.Url;
           name: t.StringC;
-          phone: typeof Common_ffba_.Phone;
+          phone: typeof Common_ffba_.LoosePhone;
           supportUrl: typeof Units_c404_.Url;
         }>,
         t.RecordC<t.StringC, t.UnknownC>,
@@ -120,7 +120,7 @@ export const MODE_TAXI: MODE_TAXIC = t.brand(
       t.partial({
         image: Units_c404_.Url,
         name: t.string,
-        phone: Common_ffba_.Phone,
+        phone: Common_ffba_.LoosePhone,
         supportUrl: Units_c404_.Url,
       }),
       t.record(t.string, t.unknown),
@@ -153,7 +153,7 @@ export const MODE_TAXI: MODE_TAXIC = t.brand(
       taxiCenter?: {
         image?: Units_c404_.Url;
         name?: string;
-        phone?: Common_ffba_.Phone;
+        phone?: Common_ffba_.LoosePhone;
         supportUrl?: Units_c404_.Url;
       } & Record<string, unknown>;
       messageToDriver?: string;