Relaxing route query request

maasglobal · May 25, 2020 · f3113c1 · f3113c1
1 parent fde4c37
commit f3113c1
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 68 deletions.
diff --git a/maas-schemas-ts/src/maas-backend/routes/routes-query/request.ts b/maas-schemas-ts/src/maas-backend/routes/routes-query/request.ts
@@ -37,7 +37,7 @@ export const schemaId =
 // Payload
 // The purpose of this remains a mystery
 export type Payload = t.Branded<
-  ({
+  {
     from?: UnitsGeo_.ShortLocationString;
     fromName?: Address_.PlaceName;
     fromAddress?: Address_.ComponentAddress;
@@ -75,30 +75,56 @@ export type Payload = t.Branded<
     | Units_.Uuid
     | Common_.RequestId
     | (string | number | boolean)
-  >) & {
-    from: Defined;
-    to: Defined;
-  },
+  >,
   PayloadBrand
 >;
 export const Payload = t.brand(
   t.intersection([
-    t.intersection([
-      t.partial({
-        from: UnitsGeo_.ShortLocationString,
-        fromName: Address_.PlaceName,
-        fromAddress: Address_.ComponentAddress,
-        fromStationId: Station_.Id,
-        to: UnitsGeo_.ShortLocationString,
-        toName: Address_.PlaceName,
-        toAddress: Address_.ComponentAddress,
-        toStationId: Station_.Id,
-        leaveAt: Units_.Time,
-        arriveBy: Units_.Time,
-        leaveAtReturn: Units_.Time,
-        arriveByReturn: Units_.Time,
-        modes: t.string,
-        transitMode: t.intersection([
+    t.partial({
+      from: UnitsGeo_.ShortLocationString,
+      fromName: Address_.PlaceName,
+      fromAddress: Address_.ComponentAddress,
+      fromStationId: Station_.Id,
+      to: UnitsGeo_.ShortLocationString,
+      toName: Address_.PlaceName,
+      toAddress: Address_.ComponentAddress,
+      toStationId: Station_.Id,
+      leaveAt: Units_.Time,
+      arriveBy: Units_.Time,
+      leaveAtReturn: Units_.Time,
+      arriveByReturn: Units_.Time,
+      modes: t.string,
+      transitMode: t.intersection([
+        t.string,
+        t.union([
+          t.literal('TRAIN'),
+          t.literal('BUS'),
+          t.literal('SUBWAY'),
+          t.literal('TRAM'),
+          t.literal('RAIL'),
+        ]),
+      ]),
+      options: t.type({}),
+      bookingIdToExtend: Units_.Uuid,
+      requestId: Common_.RequestId,
+    }),
+    t.record(
+      t.string,
+      t.union([
+        UnitsGeo_.ShortLocationString,
+        Address_.PlaceName,
+        Address_.ComponentAddress,
+        Station_.Id,
+        UnitsGeo_.ShortLocationString,
+        Address_.PlaceName,
+        Address_.ComponentAddress,
+        Station_.Id,
+        Units_.Time,
+        Units_.Time,
+        Units_.Time,
+        Units_.Time,
+        t.string,
+        t.intersection([
           t.string,
           t.union([
             t.literal('TRAIN'),
@@ -108,52 +134,17 @@ export const Payload = t.brand(
             t.literal('RAIL'),
           ]),
         ]),
-        options: t.type({}),
-        bookingIdToExtend: Units_.Uuid,
-        requestId: Common_.RequestId,
-      }),
-      t.record(
-        t.string,
-        t.union([
-          UnitsGeo_.ShortLocationString,
-          Address_.PlaceName,
-          Address_.ComponentAddress,
-          Station_.Id,
-          UnitsGeo_.ShortLocationString,
-          Address_.PlaceName,
-          Address_.ComponentAddress,
-          Station_.Id,
-          Units_.Time,
-          Units_.Time,
-          Units_.Time,
-          Units_.Time,
-          t.string,
-          t.intersection([
-            t.string,
-            t.union([
-              t.literal('TRAIN'),
-              t.literal('BUS'),
-              t.literal('SUBWAY'),
-              t.literal('TRAM'),
-              t.literal('RAIL'),
-            ]),
-          ]),
-          t.type({}),
-          Units_.Uuid,
-          Common_.RequestId,
-          t.union([t.string, t.number, t.boolean]),
-        ]),
-      ),
-    ]),
-    t.type({
-      from: Defined,
-      to: Defined,
-    }),
+        t.type({}),
+        Units_.Uuid,
+        Common_.RequestId,
+        t.union([t.string, t.number, t.boolean]),
+      ]),
+    ),
   ]),
   (
     x,
   ): x is t.Branded<
-    ({
+    {
       from?: UnitsGeo_.ShortLocationString;
       fromName?: Address_.PlaceName;
       fromAddress?: Address_.ComponentAddress;
@@ -191,10 +182,7 @@ export const Payload = t.brand(
       | Units_.Uuid
       | Common_.RequestId
       | (string | number | boolean)
-    >) & {
-      from: Defined;
-      to: Defined;
-    },
+    >,
     PayloadBrand
   > => true,
   'Payload',

diff --git a/maas-schemas/schemas/maas-backend/routes/routes-query/request.json b/maas-schemas/schemas/maas-backend/routes/routes-query/request.json
@@ -79,7 +79,6 @@
           "type": ["string", "number", "boolean"]
         }
       },
-      "required": ["from", "to"],
       "additionalProperties": false
     }
   }