@moxi.gmbh/moxi-typescriptmodels 0.1.1401-test-server → 0.1.1401

package/common.d.ts

@@ -1,9 +1,43 @@
 
+export interface AbstractFindMyRides {
+    accountId?: string;
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface AbstractFindRides {
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface AbstractFindRidesForDriver {
+    accountId?: string;
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface AbstractFindRidesInMarketplace {
+    accountId?: string;
+    descending?: boolean;
+    filter?: RideFilter;
+    /**
+     * @deprecated
+     */
+    maxSize?: number;
+    term?: string;
+}
+
 export interface AcceptRide extends RideDriverCommand {
     driver?: AccountOrTeamRef;
 }
 
-export interface AcceptRideSeries extends RideDriverSeriesCommand {
+export interface AcceptRideSeries extends SeriesDriverCommand {
     driver?: AccountOrTeamRef;
 }
 
@@ -27,7 +61,7 @@ export interface Account {
     info?: AccountInfo;
     integrationSettings?: any[];
     operateAccounts?: string[];
-    operator?: string;
+    operators?: string[];
     /**
      * Derived from subscriptions. Includes organisation types that have not been confirmed yet by a superadmin or are active in past or future. 
      */
@@ -47,6 +81,7 @@ export interface AccountFilter {
 
 export interface AccountInfo {
     address?: AddressInfo;
+    companyInfo?: CompanyInfo;
     defaultLanguage?: string;
     notificationEmails?: string[];
     phoneNumber?: PhoneNumber;
@@ -73,6 +108,10 @@ export interface AccountPermissionCommand extends UserUpdate {
     accountId?: string;
 }
 
+export interface AccountPermissionFilter {
+    roles?: AccountRole[];
+}
+
 export interface AccountRef {
     accountId?: string;
     name?: string;
@@ -84,14 +123,15 @@ export interface AccountUpcaster {
 export interface AccountUpdate extends AccountCommand {
 }
 
-/**
- * Address info of a google-validated address, including geolocation and district code
- */
+export interface AddOperations extends AccountUpdate {
+    operateAccount?: string;
+}
+
 export interface AddressInfo {
     addition?: string;
     city?: string;
     /**
-     * Derived from districtNutsCode
+     * The NUTS country code, derived from districtNutsCode
      */
     country?: string;
     districtNutsCode?: string;
@@ -100,12 +140,12 @@ export interface AddressInfo {
     number?: string;
     placeName?: string;
     /**
-     * Derived from districtNutsCode
+     * The NUTS level 1 code, derived from districtNutsCode
      */
     state?: string;
     street?: string;
     /**
-     * Derived from districtNutsCode
+     * The NUTS level 2 code, derived from districtNutsCode
      */
     subState?: string;
     zipCode?: string;
@@ -125,38 +165,31 @@ export interface AmbulanceFilter extends DrivePermissionFilter {
 }
 
 /**
- * Filled if (and only if) vehicleType == ambulance
+ * Mandatory if the vehicleType is ambulance, forbidden if taxi
  */
 export interface AmbulanceInfo {
     /**
-     * Derived from infectionDescription != blank
+     * True if infectionDescription is given
      */
     hasInfection?: boolean;
     infectionDescription?: string;
     monitoringDescription?: string;
     oxygenLiterPerHour?: number;
     /**
-     * Derived from monitoringDescription != blank
+     * True if monitoringDescription is given
      */
     requiresMonitoring?: boolean;
     /**
-     * Derived from oxygenLiterPerHour != null
+     * True if oxygenLiterPerHour is given
      */
     requiresOxygen?: boolean;
     requiresSuctionAspirator?: boolean;
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
- */
-export interface AnonymizedGenericRideInfo extends GenericRideInfo {
+export interface AnonymizedRideInfo extends RideInfo {
 }
 
-/**
- * Information about the ride, from the creator of the ride
- */
-export interface AnonymizedRideInfo extends RideInfo {
+export interface AnonymizedSeriesRideInfo extends SeriesRideInfo {
 }
 
 export interface Appointment {
@@ -168,6 +201,10 @@ export interface AssignDriver extends RideOperatorCommand {
     driver?: AccountOrTeamRef;
 }
 
+export interface AssignRideSeriesDriver extends SeriesOperatorCommand {
+    driver?: AccountOrTeamRef;
+}
+
 export interface Attachment {
     base64Data?: string;
     fileName?: string;
@@ -181,44 +218,38 @@ export interface AuthenticateWithToken extends UserUpdate {
 export interface AuthenticationResponse {
     authorizationHeader?: string;
     impersonator?: string;
+    refreshToken?: string;
+    refreshTokenDeadline?: string;
     result?: AuthenticationResult;
     sessionDeadline?: string;
     userProfile?: UserProfile;
 }
 
-export interface AuthenticationService {
-}
-
-export interface BatchUpdateRideSeriesInfo extends RideSeriesPostConfirmCommand {
-    info?: GenericRideInfo;
-    updater?: AccountOrTeamRef;
+export interface AuthenticationResponseFactory {
 }
 
-export interface BatchUpdateRideSeriesTimes extends RideSeriesPostConfirmCommand {
-    rides?: SingleRideUpdate[];
-    updater?: AccountOrTeamRef;
+export interface AuthenticationService {
 }
 
 export interface BookRide extends CreateRideCommand {
-    booker?: AccountOrTeamRef;
     info?: RideInfo;
 }
 
-export interface BookRideSeries extends RideBookerSeriesCommand {
-    booker?: AccountOrTeamRef;
-    info?: GenericRideInfo;
-    rides?: SingleRide[];
+export interface BookRideSeries extends CreateSeriesCommand {
+    rideSummaries?: RideSummary[];
 }
 
 export interface CancelRide extends RideBookerCommand {
     reason?: string;
 }
 
-export interface CancelRideSeries extends RideBookerSeriesCommand {
+export interface CancelRideSeries extends SeriesCommandWithSeparateEvent {
+    reason?: string;
 }
 
-export interface CancelRidesInSeries extends RideSeriesPostConfirmCommand {
-    updater?: AccountOrTeamRef;
+export interface CancelRideSeriesEvent extends SeriesBookerCommand {
+    cancelRides?: string[];
+    reason?: string;
 }
 
 export interface CeliosSettings {
@@ -240,6 +271,28 @@ export interface CheckIfUserSignedUp {
     userId?: string;
 }
 
+export interface CheckSession {
+    userId?: string;
+}
+
+/**
+ * You can send in custom values. For every value you don't send in, we lookup the default setting you set up in your account. 
+ */
+export interface CleaningAndSlack {
+    cleaningAtGarage?: boolean;
+    cleaningDuration?: number;
+    dropoffDuration?: number;
+    pickupDuration?: number;
+}
+
+export interface CompanyInfo {
+    businessLicenseDocument?: Document;
+    creationDate?: string;
+    hasLiabilityInsurance?: boolean;
+    publicLiabilityPolicyDocument?: Document;
+    registrationNumber?: string;
+}
+
 export interface ConfirmAccount extends AccountCommand {
 }
 
@@ -255,6 +308,7 @@ export interface ConfirmSubscription extends AccountUpdate {
 }
 
 export interface ConfirmUser {
+    activateOneTimePassword?: boolean;
     token?: string;
     userId?: string;
 }
@@ -278,17 +332,12 @@ export interface CreateOptimizationPlan extends OptimizerMessage {
 }
 
 export interface CreateRideCommand extends RideBookerCommand {
-    booker?: AccountOrTeamId;
-}
-
-export interface CreateRideFromSeries extends RideDriverCommand {
     booker?: AccountOrTeamRef;
-    driver?: AccountOrTeamRef;
-    info?: RideInfo;
-    seriesInfo?: SeriesInfo;
 }
 
-export interface CreateRidesFromSeries extends RideDriverSeriesCommand {
+export interface CreateSeriesCommand extends SeriesBookerCommand {
+    booker?: AccountOrTeamRef;
+    info?: SeriesRideInfo;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -324,6 +373,11 @@ export interface DateRange {
 export interface DeleteUser extends UserEdit {
 }
 
+export interface DetailsFilter extends WebsocketFilter {
+    id?: string;
+    screen: "ride_details";
+}
+
 export interface DisconnectClient {
     clientId?: string;
     tokenId?: string;
@@ -347,6 +401,12 @@ export interface DistrictInfo {
     type?: string;
 }
 
+export interface Document {
+    id?: string;
+    name?: string;
+    size?: number;
+}
+
 export interface DownloadableFile {
     base64Data?: string;
     fileName?: string;
@@ -434,47 +494,25 @@ export interface FindAccounts {
     term?: string;
 }
 
-/**
- * @deprecated
- */
-export interface FindMyAcceptedRides {
+export interface FindDuplicateRides {
     accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+    appointmentTime?: string;
+    patientBirthDay?: string;
+    patientFirstName?: string;
+    patientLastName?: string;
 }
 
-/**
- * @deprecated
- */
-export interface FindMyRideOffers {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindMyRides extends AbstractFindMyRides {
 }
 
-export interface FindMyRideSeries {
-    accountId?: string;
-    descending?: boolean;
-    maxSize?: number;
-    term?: string;
-    timeRange?: InstantRange;
+export interface FindMyRidesAndSeries extends AbstractFindMyRides {
 }
 
-export interface FindMyRides {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindMySeries extends AbstractFindMyRides {
 }
 
 export interface FindMyTokens {
     accountId?: string;
-    teamId?: string;
     term?: string;
 }
 
@@ -484,45 +522,27 @@ export interface FindMyUsers {
     term?: string;
 }
 
-export interface FindPotentialRideSeries {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideInfoFilter;
-    maxSize?: number;
+export interface FindRides extends AbstractFindRides {
 }
 
-/**
- * @deprecated
- */
-export interface FindPotentialRides {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeries extends AbstractFindRides {
 }
 
-export interface FindRides {
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeriesForDriver extends AbstractFindRidesForDriver {
 }
 
-export interface FindRidesForDriver {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeriesInMarketplace extends AbstractFindRidesInMarketplace {
 }
 
-export interface FindRidesInMarketplace {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeriesResult {
+    ridesAndSeries?: RideOrMinimizedSeries[];
+    ridesCount?: RideFilterCount;
+}
+
+export interface FindRidesForDriver extends AbstractFindRidesForDriver {
+}
+
+export interface FindRidesInMarketplace extends AbstractFindRidesInMarketplace {
 }
 
 export interface FindRidesResult {
@@ -530,24 +550,47 @@ export interface FindRidesResult {
     rides?: Ride[];
 }
 
+export interface FindSeries extends AbstractFindRides {
+}
+
+export interface FindSeriesForDriver extends AbstractFindRidesForDriver {
+}
+
+export interface FindSeriesInMarketplace extends AbstractFindRidesInMarketplace {
+}
+
 export interface FindTokens {
     term?: string;
 }
 
 export interface FindUsers {
+    accountFilter?: AccountFilter;
+    accountPermissionFilter?: AccountPermissionFilter;
     term?: string;
 }
 
+export interface FirebaseMessage {
+    data?: { [index: string]: string };
+    notification?: Notification;
+    topic?: string;
+}
+
+export interface FleetOverviewFilter extends WebsocketFilter {
+    queryFilter?: FindRidesAndSeriesForDriver;
+    screen: "fleet_overview";
+}
+
 export interface GenerateToken {
     accountPermission?: AccountPermission;
     info?: TokenInfo;
     tokenId?: string;
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
+export interface GenerateTokenResult {
+    entity?: Token;
+    jwt?: string;
+}
 
- */
 export interface GenericRideInfo {
     ambulanceInfo?: AmbulanceInfo;
     attendantsPresent?: number;
@@ -563,7 +606,6 @@ export interface GenericRideInfo {
     patient?: Person;
     plannedDuration?: RideDuration;
     preferredDriver?: string;
-    purpose?: RidePurpose;
     to?: AddressInfo;
     vehicleType?: VehicleType;
     weightInKg?: number;
@@ -611,18 +653,6 @@ export interface GetAccountsOfPotentialDrivers extends IGetPotentialDrivers {
 export interface GetAccountsOfPotentialDriversAsAdmin extends IGetPotentialDrivers {
 }
 
-export interface GetAllRideSeriesForDriver {
-    accountId?: string;
-    descending?: boolean;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
-export interface GetAllRideSeriesInMarketplace {
-    accountId?: string;
-    maxSize?: number;
-}
-
 export interface GetDistrict {
     geoLocation?: GeoLocation;
     stateNutsCode?: string;
@@ -643,29 +673,17 @@ export interface GetIsoStates {
 export interface GetMonopolyAccounts {
 }
 
-/**
- * @deprecated
- */
-export interface GetMyAcceptedRides {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
 export interface GetMyAccounts {
     filter?: AccountFilter;
 }
 
-/**
- * @deprecated
- */
-export interface GetMyRideOffers {
+export interface GetMyRides {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetMyRides {
+export interface GetMySeries {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
@@ -680,10 +698,10 @@ export interface GetMyUserProfile {
 export interface GetNutsStates {
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
+export interface GetOneSeries {
+    rideSeriesId?: string;
+}
 
- */
 export interface GetPotentialDriverIds extends GetPotentialDriversAbstract {
 }
 
@@ -694,27 +712,13 @@ export interface GetPotentialDriverIds extends GetPotentialDriversAbstract {
 export interface GetPotentialDrivers extends GetPotentialDriversAbstract {
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
- */
 export interface GetPotentialDriversAbstract {
     fromDistrict?: string;
     mobility?: Mobility;
-    toDistrict?: string;
     vehicleType?: VehicleType;
     weightInKg?: number;
 }
 
-/**
- * @deprecated
- */
-export interface GetPotentialRides {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
 export interface GetRide {
     rideId?: string;
 }
@@ -734,30 +738,38 @@ export interface GetRideLog {
     rideId?: string;
 }
 
-export interface GetRideSeries {
-    rideSeriesId?: string;
+export interface GetRideOrSeries {
+    id?: string;
 }
 
-export interface GetRideSeriesForDriver {
+export interface GetRidesForDriver {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesForDriver {
+export interface GetRidesInMarketplace {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesInMarketplace {
+export interface GetRidesInSeries {
+    rideSeriesId?: string;
+}
+
+export interface GetSeriesForDriver {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesInSeries {
-    filter?: RideFilter;
+export interface GetSeriesInMarketplace {
+    accountId?: string;
+    maxSize?: number;
+}
+
+export interface GetSeriesLog {
     rideSeriesId?: string;
 }
 
@@ -787,6 +799,15 @@ export interface GiveTeamPermission extends AccountPermissionCommand {
     teamPermission?: TeamPermission;
 }
 
+export interface HalfHourBeforeStart {
+    rideId?: string;
+}
+
+export interface HospitalOverviewFilter extends WebsocketFilter {
+    queryFilter?: FindMyRidesAndSeries;
+    screen: "hospital_overview";
+}
+
 export interface IGetPotentialDrivers {
     fromDistrict?: string;
     mobility?: Mobility;
@@ -835,6 +856,11 @@ export interface IsoState {
     nutsCode?: string;
 }
 
+export interface MarketplaceOverviewFilter extends WebsocketFilter {
+    queryFilter?: FindRidesAndSeriesInMarketplace;
+    screen: "marketplace";
+}
+
 export interface Metric {
     clientId?: string;
     clientSegment?: number[];
@@ -845,6 +871,18 @@ export interface Metric {
     updates?: string[];
 }
 
+/**
+ * A series of rides. 
+ */
+export interface MinimizedRideSeries extends RideSeries, RideOrMinimizedSeries {
+    info?: SeriesRideInfo;
+}
+
+export interface Notification {
+    body?: string;
+    title?: string;
+}
+
 export interface NutsDistrict {
     code?: string;
     name?: string;
@@ -867,6 +905,25 @@ export interface OffsetTimeRange {
     start?: Date;
 }
 
+export interface OneHourAfterEnd {
+    rideId?: string;
+}
+
+export interface OneTimePasswordExpires {
+    userId?: string;
+}
+
+export interface OneTimePasswordState {
+    hashedPassword?: string;
+    loginAttempts?: number;
+    userId?: string;
+}
+
+export interface OperationsOverviewFilter extends WebsocketFilter {
+    queryFilter?: FindRidesAndSeries;
+    screen: "operations_overview";
+}
+
 export interface OptimizerMessage {
 }
 
@@ -883,7 +940,7 @@ export interface Person {
 }
 
 /**
- * Filled if (and only if) patient exceeds 130 kg
+ * Mandatory if weight exceeds 130 kg, otherwise forbidden
  */
 export interface PersonDimensions {
     heightInCm?: number;
@@ -903,7 +960,7 @@ export interface ReadUpdates {
     maxSize?: number;
     maxTimeout?: number;
     tokenId?: string;
-    updateTypes?: TrackingUpdateType[];
+    updateTypes?: EntityType[];
 }
 
 export interface ReadUpdatesResult {
@@ -912,6 +969,19 @@ export interface ReadUpdatesResult {
     updates?: any[];
 }
 
+export interface RefreshTokenData {
+    expiresAt?: string;
+    hashedToken?: string;
+    userId?: string;
+}
+
+export interface RefreshTokenService {
+}
+
+export interface RefreshUserToken {
+    refreshToken?: string;
+}
+
 export interface Region {
     nutsCode?: string;
 }
@@ -932,9 +1002,22 @@ export interface RegisterEinsatz {
     rideId?: string;
 }
 
+export interface RegisterOneTimePassword {
+    oneTimePassword?: string;
+    userId?: string;
+}
+
 export interface RemoveAccount extends AccountUpdate {
 }
 
+export interface RemoveOperations extends AccountUpdate {
+    operateAccount?: string;
+}
+
+export interface RemoveOperator extends AccountUpdate {
+    operator?: string;
+}
+
 export interface RemoveSettings extends AccountUpdate {
     type?: IntegrationType;
 }
@@ -984,7 +1067,7 @@ export interface ResetPosition {
 export interface ReturnRide extends RideDriverModifyCommand {
 }
 
-export interface ReturnRideSeries extends RideDriverSeriesCommand {
+export interface ReturnRideSeries extends SeriesDriverCommand {
 }
 
 export interface Review {
@@ -1007,6 +1090,9 @@ export interface RevokeDrivePermission extends AccountUpdate {
     drivePermissionId?: string;
 }
 
+export interface RevokeSecondaryTokenPermission extends SecondaryTokenPermissionCommand {
+}
+
 export interface RevokeSubscription extends AccountUpdate {
     subscriptionId?: string;
 }
@@ -1014,75 +1100,69 @@ export interface RevokeSubscription extends AccountUpdate {
 export interface RevokeToken extends TokenUpdate {
 }
 
-export interface Ride {
+export interface RevokeUserRefreshTokens {
+    userId?: string;
+}
+
+export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     /**
-     * Derived from driver != null
+     * 'accepted' is true if a driver has accepted the ride.
      */
     accepted?: boolean;
+    acceptedTime?: string;
     actualEndTime?: string;
     actualStartTime?: string;
     /**
-     * Derived from driveStatus != null
+     * 'arrived' is true if the driver has reported driveStatus is 'arrived_at_origin'.
      */
     arrived?: boolean;
     /**
-     * Derived from bookedTime != null
+     * 'booked' is false if the ride has only been saved.
      */
     booked?: boolean;
-    bookedTime?: string;
     booker?: AccountOrTeamRef;
     bookerReview?: Review;
-    bookingStatus?: BookingStatus;
     cancelReason?: string;
     cancelled?: boolean;
     /**
-     * Derived from driveStatus == completed
+     * 'completed' is true if the driver has reported driveStatus is 'completed'.
      */
     completed?: boolean;
     /**
-     * Desired Time of Arrival at the Destination/Drop-off location. Derived from info.appointment and info.plannedDuration
+     * The booker determines the desiredEndTime via 'info.appointment' and 'info.plannedDuration'. It means the desired time of arrival at the 'to' or 'drop-off' location.
      */
     desiredEndTime?: string;
     /**
-     * Desired Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
+     * The booker determines the desiredStartTime via 'info.appointment' and 'info.plannedDuration'. It means the desired time of arrival at the 'from' or 'pick-up' location.
      */
     desiredStartTime?: string;
     driveStatus?: DriveStatus;
-    driver?: AccountOrTeamRef;
     driverReview?: Review;
     driverSyncStatus?: SyncStatus;
     endTimeDelay?: number;
     /**
-     * Expected Time of Arrival at the Destination/Drop-off location. 
+     * The driver determines the expectedEndTime when indicating delays. It means the expected time of arrival at the 'to' or 'drop-off' location. 
      */
     expectedEndTime?: string;
     /**
-     * Expected Time of Arrival at the Origin/Pick-up location. 
+     * The driver determines the expectedEndTime when indicating delays. It means the expected time of arrival at the 'from' or 'pick-up' location. 
      */
     expectedStartTime?: string;
     info?: RideInfo;
     /**
-     * Derived from plannedStartTime != null
+     * 'planned' is true if the driver has reported a planned time for the ride.
      */
     planned?: boolean;
     /**
-     * Planned Time of Arrival at the Destination/Drop-off location, reported by the driver. 
+     * The driver determines the plannedEndTime. It means the planned time of arrival at the 'to' or 'drop-off' location. 
      */
     plannedEndTime?: string;
     plannedStartTime?: string;
     rideId?: 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
+     * 'started' is true if the driver has reported a driveStatus.
      */
     started?: boolean;
 }
@@ -1090,9 +1170,6 @@ export interface Ride {
 export interface RideBookerCommand extends RideCommand {
 }
 
-export interface RideBookerSeriesCommand extends RideSeriesCommand {
-}
-
 export interface RideCommand {
     rideId?: string;
 }
@@ -1103,16 +1180,19 @@ export interface RideDriverCommand extends RideCommand {
 export interface RideDriverModifyCommand extends RideDriverCommand {
 }
 
-export interface RideDriverSeriesCommand extends RideSeriesPreConfirmCommand {
-}
-
-/**
- * All durations in seconds
- */
 export interface RideDuration {
     driving?: number;
+    /**
+     * Seconds of slack for dropping off the patient, currently hardcoded to 15 minutes
+     */
     droppingOff?: number;
+    /**
+     * Seconds of slack for picking up the patient, currently hardcoded to 15 minutes
+     */
     pickingUp?: number;
+    /**
+     * Seconds of driving time plus the pick-up and drop-off slack times
+     */
     total?: number;
 }
 
@@ -1121,6 +1201,7 @@ export interface RideFilter {
     driveStatuses?: DriveStatus[];
     driverAccountNames?: string[];
     driverTeamNames?: string[];
+    entityType?: EntityType;
     hasInfection?: boolean;
     heavyWeight?: boolean;
     mobilities?: Mobility[];
@@ -1132,6 +1213,7 @@ export interface RideFilter {
     riderAccountNames?: string[];
     riderTeamNames?: string[];
     timeRange?: InstantRange;
+    unfoldRideSeries?: boolean;
     vehicleType?: VehicleType;
 }
 
@@ -1157,41 +1239,9 @@ export interface RideIdResult {
     rideId?: string;
 }
 
-/**
- * Information about the ride, from the creator of the ride
- */
-export interface RideInfo {
-    ambulanceInfo?: AmbulanceInfo;
+export interface RideInfo extends GenericRideInfo {
     appointment?: Appointment;
-    attendantsPresent?: number;
-    comment?: string;
-    dimensions?: PersonDimensions;
-    distanceInMeters?: number;
-    from?: AddressInfo;
-    /**
-     * Derived from weightInKg != null
-     */
-    heavyWeight?: boolean;
-    mobility?: Mobility;
-    patient?: Person;
-    plannedDuration?: RideDuration;
-    preferredDriver?: string;
     purpose?: RidePurpose;
-    to?: AddressInfo;
-    vehicleType?: VehicleType;
-    weightInKg?: number;
-}
-
-export interface RideInfoFilter {
-    hasInfection?: boolean;
-    heavyWeight?: boolean;
-    mobilities?: Mobility[];
-    purposes?: RidePurpose[];
-    region?: Region;
-    requiresMonitoring?: boolean;
-    requiresOxygen?: boolean;
-    requiresSuctionAspirator?: boolean;
-    vehicleType?: VehicleType;
 }
 
 export interface RideLog {
@@ -1210,44 +1260,66 @@ export interface RideLog {
     token?: boolean;
 }
 
-export interface RideOfferInfo {
-    appointment?: Appointment;
+export interface RideOperatorCommand extends RideCommand {
 }
 
-export interface RideOperatorCommand extends RideCommand {
+export interface RideOrMinimizedSeries {
+    bookingStatus?: BookingStatus;
+    entityType?: EntityType;
+    info?: GenericRideInfo;
+    searchEndTime?: string;
+    searchStartTime?: string;
 }
 
-export interface RideSeries {
-    accepted?: boolean;
-    booked?: boolean;
-    booker?: AccountOrTeamRef;
-    cancelled?: boolean;
-    confirmed?: boolean;
+export interface RideOrSeries {
+    bookedTime?: string;
+    bookingStatus?: BookingStatus;
+    cleaningAndSlack?: CleaningAndSlack;
     driver?: AccountOrTeamRef;
-    endTime?: string;
+    entityType?: EntityType;
     info?: GenericRideInfo;
-    rideSeriesId?: string;
-    rides?: SingleRide[];
-    startTime?: string;
-    status?: RideSeriesStatus;
+    marketplaceTime?: string;
+    totalDuration?: number;
 }
 
-export interface RideSeriesCommand {
+/**
+ * A series of rides. 
+ */
+export interface RideSeries extends RideOrSeries {
+    /**
+     * 'accepted' is true if a driver has accepted the series.
+     */
+    accepted?: boolean;
+    acceptedTime?: string;
+    /**
+     * The number of rides in the series that are not cancelled.
+     */
+    activeRideCount?: number;
+    /**
+     * 'booked' is false if the series has only been saved.
+     */
+    booked?: boolean;
+    booker?: AccountOrTeamRef;
+    cancelReason?: string;
+    cancelled?: boolean;
+    info?: SeriesRideInfo;
     rideSeriesId?: string;
+    rides?: Ride[];
+    ridesSummaries?: RideSummary[];
+    /**
+     * searchEndTime is the time from which series can be found in our system. It's the searchEndTime of the last ride in the series. 
+     */
+    searchEndTime?: string;
+    /**
+     * searchStartTime is the time from which series can be found in our system. It's the searchStartTime of the first ride in the series. 
+     */
+    searchStartTime?: string;
 }
 
 export interface RideSeriesIdResult {
     rideSeriesId?: string;
 }
 
-export interface RideSeriesPostConfirmCommand {
-    rideSeriesId?: string;
-    ridesToModify?: Ride[];
-}
-
-export interface RideSeriesPreConfirmCommand extends RideSeriesCommand {
-}
-
 export interface RideSeriesUpdate {
     after?: RideSeries;
     before?: RideSeries;
@@ -1258,11 +1330,23 @@ export interface RideSeriesUpdate {
     type: "rideseries";
 }
 
+export interface RideSeriesUtils {
+}
+
 export interface RideStatisticsQuery {
     dateRange?: DateRange;
     zoneId?: string;
 }
 
+/**
+ * Individual ride timing within a series. Once a ride series is accepted, you cannot add rides, only remove
+ */
+export interface RideSummary {
+    appointmentTime?: string;
+    returnTrip?: boolean;
+    rideId?: string;
+}
+
 export interface RideSystemCommand extends RideCommand {
 }
 
@@ -1279,17 +1363,24 @@ export interface RideUpdate {
     type: "ride";
 }
 
-export interface Role<T> {
+export interface Role {
 }
 
 /**
  * Save a new ride or update a previously saved ride. Not allowed to saveRide after the ride has been booked. 
  */
 export interface SaveRide extends CreateRideCommand {
-    booker?: AccountOrTeamRef;
     info?: RideInfo;
 }
 
+export interface SaveRideSeries extends CreateSeriesCommand {
+    rideSummaries?: RideSummary[];
+}
+
+export interface SecondaryTokenPermissionCommand extends TokenUpdate {
+    accountId?: string;
+}
+
 export interface SendConfirmationEmail {
     userId?: string;
 }
@@ -1301,6 +1392,7 @@ export interface SendEmail {
 export interface SendFreshdeskNewTicket {
     email?: string;
     message?: string;
+    subject?: string;
 }
 
 export interface SendInvitationEmail {
@@ -1308,20 +1400,57 @@ export interface SendInvitationEmail {
     userId?: string;
 }
 
+export interface SendOneTimePasswordEmail {
+    oneTimePassword?: string;
+    userId?: string;
+}
+
+export interface SendSensitiveEmail {
+    message?: EmailMessage;
+}
+
 export interface SendSlack {
     channel?: SlackChannel;
     message?: string;
 }
 
+export interface SendToFirebase {
+    message?: FirebaseMessage;
+}
+
+export interface SeriesBookerCommand extends SeriesCommand {
+}
+
+export interface SeriesCommand {
+    rideSeriesId?: string;
+}
+
+export interface SeriesCommandWithSeparateEvent {
+    rideSeriesId?: string;
+}
+
+export interface SeriesDriverCommand extends SeriesCommand {
+}
+
 /**
- * Information about a ride that is part of series.
+ * If the ride is part of a series, seriesInfo will contain context about the position of the ride within the series.
  */
 export interface SeriesInfo {
+    desyncedFromSeries?: boolean;
+    positionInSeries?: number;
     returnTrip?: boolean;
     rideSeriesId?: string;
+    totalRidesInSeries?: number;
+}
+
+export interface SeriesOperatorCommand extends SeriesCommand {
+}
+
+export interface SeriesRideInfo extends GenericRideInfo {
+    purpose?: SeriesPurpose;
 }
 
-export interface SetOperateAccounts extends AccountUpdate {
+export interface SetOperations extends AccountUpdate {
     operateAccounts?: string[];
 }
 
@@ -1329,6 +1458,10 @@ export interface SetOperator extends AccountUpdate {
     operator?: string;
 }
 
+export interface SetSecondaryTokenPermission extends SecondaryTokenPermissionCommand {
+    accountPermission?: AccountPermission;
+}
+
 export interface SetSettings extends AccountUpdate {
     settings?: any;
 }
@@ -1344,11 +1477,13 @@ export interface SetUserRole extends UserUpdate {
 }
 
 export interface SignInUser {
+    activateOneTimePassword?: boolean;
     password?: string;
     userId?: string;
 }
 
 export interface SignUpUser {
+    activateOneTimePassword?: boolean;
     email?: string;
     info?: UserInfo;
     inviteToken?: string;
@@ -1356,17 +1491,8 @@ export interface SignUpUser {
     userId?: string;
 }
 
-/**
- * Individual ride timing within a series
- */
-export interface SingleRide {
-    desiredStartTime?: string;
-    returnTrip?: boolean;
-}
-
-export interface SingleRideUpdate {
-    desiredStartTime?: string;
-    rideId?: string;
+export interface SignedInUser {
+    userId?: string;
 }
 
 export interface StopImpersonatingUser {
@@ -1418,10 +1544,11 @@ export interface TimedPermission {
 }
 
 export interface Token {
-    accountPermission?: AccountPermission;
+    accountPermissions?: AccountPermission[];
     createdBy?: string;
     info?: TokenInfo;
     lastUpdatedBy?: string;
+    owner?: string;
     revoked?: boolean;
     tokenId?: string;
 }
@@ -1464,9 +1591,19 @@ export interface UpdateRidePlan extends RideDriverModifyCommand {
     plannedStartTime?: string;
 }
 
-export interface UpdateRideSeries extends RideBookerSeriesCommand {
-    info?: GenericRideInfo;
-    rides?: SingleRide[];
+export interface UpdateRideSeries extends SeriesCommandWithSeparateEvent {
+    booker?: AccountOrTeamRef;
+    info?: SeriesRideInfo;
+    rideSummaries?: RideSummary[];
+}
+
+export interface UpdateRideSeriesEvent extends SeriesBookerCommand {
+    addRides?: string[];
+    booker?: AccountOrTeamRef;
+    cancelRides?: string[];
+    info?: SeriesRideInfo;
+    rideSummaries?: RideSummary[];
+    updateRides?: string[];
 }
 
 export interface UpdateTeam extends TeamUpdate {
@@ -1520,6 +1657,26 @@ export interface UserUpdate extends UserCommand {
 export interface UserUpdateAfterSignup extends UserUpdate {
 }
 
+export interface WebsocketFilter {
+    screen: "ride_details" | "fleet_overview" | "hospital_overview" | "marketplace" | "operations_overview";
+}
+
+export interface WebsocketMultipleUpdates extends WebsocketUpdate {
+    ridesAndSeries?: RideOrMinimizedSeries[];
+    ridesCount?: RideFilterCount;
+    type: "multiple_updates";
+}
+
+export interface WebsocketSingleUpdate extends WebsocketUpdate {
+    id?: string;
+    rideOrSeries?: RideOrMinimizedSeries;
+    type: "single_update";
+}
+
+export interface WebsocketUpdate {
+    type: "multiple_updates" | "single_update";
+}
+
 export interface ZonedTimeRange {
     end?: Date;
     start?: Date;
@@ -1527,14 +1684,18 @@ export interface ZonedTimeRange {
 
 export type AccountRole = "ridebooker" | "dispatcher" | "operator" | "admin" | "owner";
 
-export type AuthenticationResult = "SUCCESS" | "NOT_CONFIRMED";
+export type AuthenticationResult = "SUCCESS" | "NOT_CONFIRMED" | "ONE_TIME_PASSWORD_NEEDED";
 
 export type BookingStatus = "saved" | "booked" | "accepted" | "planned" | "started" | "completed" | "cancelled";
 
+export type DocumentType = "businessLicense" | "publicLiabilityPolicy";
+
 export type DrivePermissionFilterUnion = AmbulanceFilter | TaxiFilter;
 
 export type DriveStatus = "driving_to_origin" | "arrived_at_origin" | "driving_to_destination" | "arrived_at_destination" | "completed";
 
+export type EntityType = "ride" | "rideseries";
+
 export type GeometryUnion = GeoPolygon | GeoMultiPolygon;
 
 export type InsuranceType = "public_insurance" | "private_insurance" | "german_accident_insurance" | "no_or_unknown_insurance";
@@ -1547,9 +1708,11 @@ export type OrganisationType = "medical" | "fleet" | "operator";
 
 export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
-export type RideSeriesStatus = "booked" | "accepted" | "confirmed" | "cancelled";
+export type Screen = "marketplace" | "operations_overview" | "hospital_overview" | "fleet_overview" | "ride_details";
+
+export type SeriesPurpose = "consultation";
 
-export type Service = "pro_medical" | "pro_fleet" | "pro_operator" | "celios_integration" | "dispolive_integration";
+export type Service = "pro_medical" | "pro_fleet" | "pro_operator" | "celios_integration" | "dispolive_integration" | "moxi_operations";
 
 export type SlackChannel = "admin_monitoring" | "admin_respond_immediately" | "admin_respond_within_hour" | "admin_reported_issues";
 
@@ -1559,8 +1722,12 @@ export type SyncStatus = "not_synced" | "synced" | "update_not_synced";
 
 export type TeamRole = "dispatcher" | "ridebooker";
 
-export type TrackingUpdateType = "ride" | "rideseries";
-
 export type UserRole = "superadmin";
 
 export type VehicleType = "taxi" | "ambulance";
+
+export type WebsocketFilterUnion = MarketplaceOverviewFilter | HospitalOverviewFilter | FleetOverviewFilter | OperationsOverviewFilter | DetailsFilter;
+
+export type WebsocketUpdateType = "single_update" | "multiple_updates";
+
+export type WebsocketUpdateUnion = WebsocketSingleUpdate | WebsocketMultipleUpdates;