@moxi.gmbh/moxi-typescriptmodels 0.1.1081-test-server → 0.1.1111-test-server

package/common.d.ts

@@ -13,6 +13,10 @@ export interface AcceptUserAgreement extends UserEdit {
 
 export interface Account {
     accountId?: string;
+    /**
+     * Derived from subscriptions
+     */
+    activeOrganisationTypes?: OrganisationType[];
     /**
      * Derived from subscriptions
      */
@@ -139,7 +143,13 @@ export interface AmbulanceInfo {
 /**
  * Same as RideInfo, except it does not contain an appointment
  */
-export interface AnonymizedRideInfo extends GenericRideInfo {
+export interface AnonymizedGenericRideInfo extends GenericRideInfo {
+}
+
+/**
+ * Information about the ride, from the creator of the ride
+ */
+export interface AnonymizedRideInfo extends RideInfo {
 }
 
 export interface Appointment {
@@ -271,8 +281,7 @@ export interface CreateRideFromSeries extends RideDriverCommand {
     booker?: AccountOrTeamRef;
     driver?: AccountOrTeamRef;
     info?: RideInfo;
-    returnTrip?: boolean;
-    rideSeriesId?: string;
+    seriesInfo?: SeriesInfo;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -798,28 +807,6 @@ export interface PlanRide extends RideDriverModifyCommand {
     plannedStartTime?: string;
 }
 
-export interface ReadUpdateResult<T> {
-    after?: T;
-    before?: T;
-    /**
-     * The id of the entity that the update is about
-     */
-    entityId?: string;
-    /**
-     * The type/name of the event that caused this update
-     */
-    eventType?: string;
-    /**
-     * Index of this update
-     */
-    index?: number;
-    /**
-     * Time at which this update occurred
-     */
-    timestamp?: string;
-    type: "rideseries" | "ride";
-}
-
 export interface ReadUpdates {
     clientId?: string;
     maxSize?: number;
@@ -831,7 +818,7 @@ export interface ReadUpdates {
 export interface ReadUpdatesResult {
     clientSegment?: number[];
     lastIndex?: number;
-    updates?: ReadUpdateResultUnion<any>[];
+    updates?: any[];
 }
 
 export interface Region {
@@ -969,14 +956,6 @@ export interface Ride {
      * Desired Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
      */
     desiredStartTime?: string;
-    /**
-     * Display time is the planned time, or else the desired time
-     */
-    displayEndTime?: string;
-    /**
-     * Display time is the planned time, or else the desired time
-     */
-    displayStartTime?: string;
     driveStatus?: DriveStatus;
     driver?: AccountOrTeamRef;
     driverReview?: Review;
@@ -1000,9 +979,16 @@ export interface Ride {
      */
     plannedEndTime?: string;
     plannedStartTime?: string;
-    returnTrip?: boolean;
     rideId?: string;
-    rideSeriesId?: string;
+    /**
+     * The time until which rides can be found. It's the planned time or else the desired time. 
+     */
+    searchEndTime?: string;
+    /**
+     * The time from which rides can be found. It's the planned time or else the desired time. 
+     */
+    searchStartTime?: string;
+    seriesInfo?: SeriesInfo;
     startTimeDelay?: number;
     /**
      * Derived from driveStatus != null
@@ -1168,9 +1154,13 @@ export interface RideSeriesPostConfirmCommand {
 export interface RideSeriesPreConfirmCommand extends RideSeriesCommand {
 }
 
-export interface RideSeriesUpdate extends ReadUpdateResultUnion<RideSeries> {
+export interface RideSeriesUpdate {
     after?: RideSeries;
     before?: RideSeries;
+    entityId?: string;
+    eventType?: string;
+    index?: number;
+    timestamp?: string;
     type: "rideseries";
 }
 
@@ -1186,9 +1176,13 @@ export interface RideSystemCommand extends RideCommand {
 export interface RideUpcaster {
 }
 
-export interface RideUpdate extends ReadUpdateResultUnion<Ride> {
+export interface RideUpdate {
     after?: Ride;
     before?: Ride;
+    entityId?: string;
+    eventType?: string;
+    index?: number;
+    timestamp?: string;
     type: "ride";
 }
 
@@ -1226,6 +1220,14 @@ export interface SendSlack {
     message?: string;
 }
 
+/**
+ * Information about a ride that is part of series.
+ */
+export interface SeriesInfo {
+    returnTrip?: boolean;
+    rideSeriesId?: string;
+}
+
 export interface SetSettings extends AccountUpdate {
     settings?: any;
 }
@@ -1439,8 +1441,6 @@ export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chai
 
 export type OrganisationType = "medical" | "fleet";
 
-export type ReadUpdateResultUnion<T> = RideUpdate | RideSeriesUpdate;
-
 export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
 export type RideSeriesStatus = "booked" | "accepted" | "confirmed" | "cancelled";

package/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@moxi.gmbh/moxi-typescriptmodels",
-  "version": "0.1.1081-test-server",
+  "version": "0.1.1111-test-server",
   "types": "common.d.ts"
 }