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

package/common.d.ts

@@ -1,6 +1,41 @@
 
-export interface AcceptDrive extends FleetCommand {
-    driveOwner?: AccountOrTeamRef;
+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;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface AcceptRide extends RideDriverCommand {
+    driver?: AccountOrTeamRef;
+}
+
+export interface AcceptRideSeries extends SeriesDriverCommand {
+    driver?: AccountOrTeamRef;
 }
 
 export interface AcceptUserAgreement extends UserEdit {
@@ -9,6 +44,10 @@ export interface AcceptUserAgreement extends UserEdit {
 
 export interface Account {
     accountId?: string;
+    /**
+     * Derived from subscriptions
+     */
+    activeOrganisationTypes?: OrganisationType[];
     /**
      * Derived from subscriptions
      */
@@ -18,6 +57,12 @@ export interface Account {
     drivePermissions?: DrivePermission[];
     info?: AccountInfo;
     integrationSettings?: any[];
+    operateAccounts?: 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. 
+     */
+    organisationTypes?: OrganisationType[];
     subscriptions?: Subscription[];
     teams?: Team[];
     unconfirmedCriticalInfo?: CriticalAccountInfo;
@@ -36,6 +81,7 @@ export interface AccountInfo {
     defaultLanguage?: string;
     notificationEmails?: string[];
     phoneNumber?: PhoneNumber;
+    zoneId?: string;
 }
 
 export interface AccountOrTeamId {
@@ -63,9 +109,16 @@ export interface AccountRef {
     name?: string;
 }
 
+export interface AccountUpcaster {
+}
+
 export interface AccountUpdate extends AccountCommand {
 }
 
+export interface AddOperations extends AccountUpdate {
+    operateAccount?: string;
+}
+
 /**
  * Address info of a google-validated address, including geolocation and district code
  */
@@ -101,13 +154,13 @@ export interface AdminSetUserPassword {
     userId?: string;
 }
 
-export interface AmbulanceFilter extends RideTypeSpecificFilter {
+export interface AmbulanceFilter extends DrivePermissionFilter {
     heavyWeightAllowed?: boolean;
     type: "ambulance";
 }
 
 /**
- * Filled if (and only if) rideType == ambulance
+ * Filled if (and only if) vehicleType == ambulance
  */
 export interface AmbulanceInfo {
     /**
@@ -128,13 +181,29 @@ export interface AmbulanceInfo {
     requiresSuctionAspirator?: boolean;
 }
 
+/**
+ * Information about the ride, from the creator of the ride
+ */
+export interface AnonymizedRideInfo extends RideInfo {
+}
+
+/**
+ * Information about the ride, from the creator of the ride
+ */
+export interface AnonymizedSeriesRideInfo extends SeriesRideInfo {
+}
+
 export interface Appointment {
     pickup?: boolean;
     time?: string;
 }
 
-export interface AssignDriver extends RideCommand {
-    driveOwner?: AccountOrTeamRef;
+export interface AssignDriver extends RideOperatorCommand {
+    driver?: AccountOrTeamRef;
+}
+
+export interface AssignRideSeriesDriver extends SeriesOperatorCommand {
+    driver?: AccountOrTeamRef;
 }
 
 export interface Attachment {
@@ -160,13 +229,22 @@ export interface AuthenticationService {
 
 export interface BookRide extends CreateRideCommand {
     info?: RideInfo;
-    owner?: AccountOrTeamRef;
 }
 
-export interface CancelDrive extends FleetModifyCommand {
+export interface BookRideSeries extends CreateSeriesCommand {
+    rideSummaries?: RideSummary[];
+}
+
+export interface CancelRide extends RideBookerCommand {
+    reason?: string;
+}
+
+export interface CancelRideSeries extends SeriesCommandWithSeparateEvent {
+    reason?: string;
 }
 
-export interface CancelRide extends RidePlannerCommand {
+export interface CancelRideSeriesEvent extends SeriesBookerCommand {
+    cancelRides?: string[];
     reason?: string;
 }
 
@@ -226,8 +304,13 @@ export interface CreateOptimizationPlan extends OptimizerMessage {
     timeRange?: InstantRange;
 }
 
-export interface CreateRideCommand extends RidePlannerCommand {
-    owner?: AccountOrTeamId;
+export interface CreateRideCommand extends RideBookerCommand {
+    booker?: AccountOrTeamRef;
+}
+
+export interface CreateSeriesCommand extends SeriesBookerCommand {
+    booker?: AccountOrTeamRef;
+    info?: SeriesRideInfo;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -263,6 +346,11 @@ export interface DateRange {
 export interface DeleteUser extends UserEdit {
 }
 
+export interface DisconnectClient {
+    clientId?: string;
+    tokenId?: string;
+}
+
 export interface DispoliveSettings {
     key?: string;
     type: "dispolive";
@@ -295,14 +383,18 @@ export interface DrivePermission {
     revoked?: boolean;
 }
 
+export interface DrivePermissionFilter {
+    type: "ambulance" | "taxi";
+}
+
 export interface DrivePermissionInfo {
-    filter?: RideTypeSpecificFilterUnion;
+    filter?: DrivePermissionFilterUnion;
     monopoly?: boolean;
     regions?: Region[];
 }
 
 export interface DrivePermissionInfoRequest {
-    filter?: RideTypeSpecificFilterUnion;
+    filter?: DrivePermissionFilterUnion;
     regions?: Region[];
 }
 
@@ -364,36 +456,17 @@ export interface FindAccounts {
     term?: string;
 }
 
-export interface FindMyAcceptedRides {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindMyRides extends AbstractFindMyRides {
 }
 
-/**
- * @deprecated
- */
-export interface FindMyRideOffers {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+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;
 }
 
@@ -403,19 +476,27 @@ export interface FindMyUsers {
     term?: string;
 }
 
-export interface FindPotentialRides {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRides extends AbstractFindRides {
 }
 
-export interface FindRides {
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeries extends AbstractFindRides {
+}
+
+export interface FindRidesAndSeriesForDriver extends AbstractFindRidesForDriver {
+}
+
+export interface FindRidesAndSeriesInMarketplace extends AbstractFindRidesInMarketplace {
+}
+
+export interface FindRidesAndSeriesResult {
+    ridesAndSeries?: RideOrMinimizedSeries[];
+    ridesCount?: RideFilterCount;
+}
+
+export interface FindRidesForDriver extends AbstractFindRidesForDriver {
+}
+
+export interface FindRidesInMarketplace extends AbstractFindRidesInMarketplace {
 }
 
 export interface FindRidesResult {
@@ -423,6 +504,15 @@ 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;
 }
@@ -431,10 +521,10 @@ export interface FindUsers {
     term?: string;
 }
 
-export interface FleetCommand extends RideCommand {
-}
-
-export interface FleetModifyCommand extends FleetCommand {
+export interface FirebaseMessage {
+    data?: { [index: string]: string };
+    notification?: Notification;
+    topic?: string;
 }
 
 export interface GenerateToken {
@@ -443,6 +533,35 @@ export interface GenerateToken {
     tokenId?: string;
 }
 
+export interface GenerateTokenResult {
+    entity?: Token;
+    jwt?: string;
+}
+
+/**
+ * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
+
+ */
+export interface GenericRideInfo {
+    ambulanceInfo?: AmbulanceInfo;
+    attendantsPresent?: number;
+    comment?: string;
+    dimensions?: PersonDimensions;
+    distanceInMeters?: number;
+    from?: AddressInfo;
+    /**
+     * Derived from weightInKg != null
+     */
+    heavyWeight?: boolean;
+    mobility?: Mobility;
+    patient?: Person;
+    plannedDuration?: RideDuration;
+    preferredDriver?: string;
+    to?: AddressInfo;
+    vehicleType?: VehicleType;
+    weightInKg?: number;
+}
+
 export interface GeoJson {
     features?: Feature[];
 }
@@ -473,10 +592,16 @@ export interface GetAccount {
     accountId?: string;
 }
 
-export interface GetAccountsOfPotentialDrivers extends GetPotentialDrivers {
+/**
+ * @deprecated
+ */
+export interface GetAccountsOfPotentialDrivers extends IGetPotentialDrivers {
 }
 
-export interface GetAccountsOfPotentialDriversAsAdmin extends GetPotentialDrivers {
+/**
+ * @deprecated
+ */
+export interface GetAccountsOfPotentialDriversAsAdmin extends IGetPotentialDrivers {
 }
 
 export interface GetDistrict {
@@ -499,26 +624,17 @@ export interface GetIsoStates {
 export interface GetMonopolyAccounts {
 }
 
-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;
@@ -533,20 +649,36 @@ export interface GetMyUserProfile {
 export interface GetNutsStates {
 }
 
-export interface GetPotentialDrivers {
+export interface GetOneSeries {
+    rideSeriesId?: string;
+}
+
+/**
+ * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
+
+ */
+export interface GetPotentialDriverIds 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 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;
-    rideType?: RideType;
     toDistrict?: string;
+    vehicleType?: VehicleType;
     weightInKg?: number;
 }
 
-export interface GetPotentialRides {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
 export interface GetRide {
     rideId?: string;
 }
@@ -554,14 +686,53 @@ export interface GetRide {
 export interface GetRideCsv extends RideStatisticsQuery {
 }
 
-export interface GetRideData extends RideStatisticsQuery {
-    rideOwner?: string;
+export interface GetRideDataForBooker extends RideStatisticsQuery {
+    accountId?: string;
+}
+
+export interface GetRideDataForDriver extends RideStatisticsQuery {
+    accountId?: string;
 }
 
 export interface GetRideLog {
     rideId?: string;
 }
 
+export interface GetRideOrSeries {
+    id?: string;
+}
+
+export interface GetRidesForDriver {
+    accountId?: string;
+    maxSize?: number;
+    timeRange?: InstantRange;
+}
+
+export interface GetRidesInMarketplace {
+    accountId?: string;
+    maxSize?: number;
+    timeRange?: InstantRange;
+}
+
+export interface GetRidesInSeries {
+    rideSeriesId?: string;
+}
+
+export interface GetSeriesForDriver {
+    accountId?: string;
+    maxSize?: number;
+    timeRange?: InstantRange;
+}
+
+export interface GetSeriesInMarketplace {
+    accountId?: string;
+    maxSize?: number;
+}
+
+export interface GetSeriesLog {
+    rideSeriesId?: string;
+}
+
 export interface GetTeam {
     teamId?: string;
 }
@@ -588,6 +759,18 @@ export interface GiveTeamPermission extends AccountPermissionCommand {
     teamPermission?: TeamPermission;
 }
 
+export interface HalfHourBeforeStart {
+    rideId?: string;
+}
+
+export interface IGetPotentialDrivers {
+    fromDistrict?: string;
+    mobility?: Mobility;
+    toDistrict?: string;
+    vehicleType?: VehicleType;
+    weightInKg?: number;
+}
+
 export interface ImpersonateUser {
     userId?: string;
 }
@@ -628,6 +811,28 @@ export interface IsoState {
     nutsCode?: string;
 }
 
+export interface Metric {
+    clientId?: string;
+    clientSegment?: number[];
+    maxSize?: number;
+    maxTimeout?: string;
+    tokenId?: string;
+    type?: string;
+    updates?: string[];
+}
+
+/**
+ * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
+ */
+export interface MinimizedRideSeries extends RideSeries, RideOrMinimizedSeries {
+    info?: SeriesRideInfo;
+}
+
+export interface Notification {
+    body?: string;
+    title?: string;
+}
+
 export interface NutsDistrict {
     code?: string;
     name?: string;
@@ -650,6 +855,10 @@ export interface OffsetTimeRange {
     start?: Date;
 }
 
+export interface OneHourAfterEnd {
+    rideId?: string;
+}
+
 export interface OptimizerMessage {
 }
 
@@ -677,6 +886,24 @@ export interface PersonDimensions {
 export interface PhoneNumber {
 }
 
+export interface PlanRide extends RideDriverModifyCommand {
+    plannedStartTime?: string;
+}
+
+export interface ReadUpdates {
+    clientId?: string;
+    maxSize?: number;
+    maxTimeout?: number;
+    tokenId?: string;
+    updateTypes?: EntityType[];
+}
+
+export interface ReadUpdatesResult {
+    clientSegment?: number[];
+    lastIndex?: number;
+    updates?: any[];
+}
+
 export interface Region {
     nutsCode?: string;
 }
@@ -685,16 +912,11 @@ export interface RegisterAuthenticationToken extends UserUpdate {
     hashedToken?: string;
 }
 
-export interface RegisterDifferentEta extends FleetModifyCommand {
-    destinationEta?: string;
-    originEta?: string;
-}
-
-export interface RegisterDriveStatus extends FleetModifyCommand {
+export interface RegisterDriveStatus extends RideDriverModifyCommand {
     driveStatus?: DriveStatus;
 }
 
-export interface RegisterDriverSynced extends FleetModifyCommand {
+export interface RegisterDriverSynced extends RideDriverModifyCommand {
 }
 
 export interface RegisterEinsatz {
@@ -705,6 +927,14 @@ export interface RegisterEinsatz {
 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;
 }
@@ -721,6 +951,13 @@ export interface ReportIssue {
     issue?: string;
 }
 
+/**
+ * Can only report delays when ride has started and has not arrived at destination.
+ */
+export interface ReportRideDelay extends RideDriverModifyCommand {
+    minutes?: number;
+}
+
 export interface RequestDrivePermission extends AccountUpdate {
     drivePermissionId?: string;
     info?: DrivePermissionInfoRequest;
@@ -735,16 +972,31 @@ export interface RequestUserReset {
     email?: string;
 }
 
+/**
+ * Resets the lastIndex position of your token.
+ */
+export interface ResetPosition {
+    index?: number;
+    timestamp?: string;
+    tokenId?: string;
+}
+
+export interface ReturnRide extends RideDriverModifyCommand {
+}
+
+export interface ReturnRideSeries extends SeriesDriverCommand {
+}
+
 export interface Review {
     comment?: string;
     stars?: number;
 }
 
-export interface ReviewRideAsDriver extends FleetModifyCommand {
+export interface ReviewRideAsBooker extends RideBookerCommand {
     review?: Review;
 }
 
-export interface ReviewRideAsRider extends RidePlannerCommand {
+export interface ReviewRideAsDriver extends RideDriverModifyCommand {
     review?: Review;
 }
 
@@ -755,6 +1007,9 @@ export interface RevokeDrivePermission extends AccountUpdate {
     drivePermissionId?: string;
 }
 
+export interface RevokeSecondaryTokenPermission extends SecondaryTokenPermissionCommand {
+}
+
 export interface RevokeSubscription extends AccountUpdate {
     subscriptionId?: string;
 }
@@ -762,17 +1017,23 @@ export interface RevokeSubscription extends AccountUpdate {
 export interface RevokeToken extends TokenUpdate {
 }
 
-export interface Ride {
+export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     /**
-     * Derived from driveOwner != null
+     * Derived from driver != null
      */
     accepted?: boolean;
+    actualEndTime?: string;
+    actualStartTime?: string;
+    /**
+     * Derived from driveStatus != null
+     */
+    arrived?: boolean;
     /**
      * Derived from bookedTime != null
      */
     booked?: boolean;
-    bookedTime?: string;
-    bookingStatus?: BookingStatus;
+    booker?: AccountOrTeamRef;
+    bookerReview?: Review;
     cancelReason?: string;
     cancelled?: boolean;
     /**
@@ -780,39 +1041,65 @@ export interface Ride {
      */
     completed?: boolean;
     /**
-     * Estimated Time of Arrival at the Destination/Drop-off location. Will differ from destinationPta if the driver reported a delay
+     * Desired Time of Arrival at the Destination/Drop-off location. Derived from info.appointment and info.plannedDuration
      */
-    destinationEta?: string;
+    desiredEndTime?: string;
     /**
-     * Planned Time of Arrival at the Destination/Drop-off location. Derived from info.appointment and info.plannedDuration
+     * Desired Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
      */
-    destinationPta?: string;
-    driveOwner?: AccountOrTeamRef;
+    desiredStartTime?: string;
     driveStatus?: DriveStatus;
     driverReview?: Review;
     driverSyncStatus?: SyncStatus;
+    endTimeDelay?: number;
+    /**
+     * Expected Time of Arrival at the Destination/Drop-off location. 
+     */
+    expectedEndTime?: string;
+    /**
+     * Expected Time of Arrival at the Origin/Pick-up location. 
+     */
+    expectedStartTime?: string;
     info?: RideInfo;
     /**
-     * Estimated Time of Arrival at the Origin/Pick-up location. Will differ from originPta if the driver reported a delay
+     * Derived from plannedStartTime != null
      */
-    originEta?: string;
+    planned?: boolean;
     /**
-     * Planned Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
+     * Planned Time of Arrival at the Destination/Drop-off location, reported by the driver. 
      */
-    originPta?: string;
+    plannedEndTime?: string;
+    plannedStartTime?: string;
     rideId?: string;
-    rideOwner?: AccountOrTeamRef;
-    riderReview?: Review;
+    /**
+     * 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?: boolean;
 }
 
+export interface RideBookerCommand extends RideCommand {
+}
+
 export interface RideCommand {
     rideId?: string;
 }
 
+export interface RideDriverCommand extends RideCommand {
+}
+
+export interface RideDriverModifyCommand extends RideDriverCommand {
+}
+
 /**
  * All durations in seconds
  */
@@ -825,39 +1112,41 @@ export interface RideDuration {
 
 export interface RideFilter {
     bookingStatuses?: BookingStatus[];
-    directions?: Direction[];
     driveStatuses?: DriveStatus[];
     driverAccountNames?: string[];
     driverTeamNames?: string[];
+    entityType?: EntityType;
     hasInfection?: boolean;
     heavyWeight?: boolean;
     mobilities?: Mobility[];
+    purposes?: RidePurpose[];
     region?: Region;
     requiresMonitoring?: boolean;
     requiresOxygen?: boolean;
     requiresSuctionAspirator?: boolean;
-    rideType?: RideType;
     riderAccountNames?: string[];
     riderTeamNames?: string[];
     timeRange?: InstantRange;
+    unfoldRideSeries?: boolean;
+    vehicleType?: VehicleType;
 }
 
 export interface RideFilterCount {
     bookingStatuses?: { [P in BookingStatus]?: number };
-    directions?: { [P in Direction]?: number };
     driveStatuses?: { [P in DriveStatus]?: number };
     driverAccountNames?: { [index: string]: number };
     driverTeamNames?: { [index: string]: number };
     hasInfection?: number;
     heavyWeight?: number;
     mobilities?: { [P in Mobility]?: number };
+    purposes?: { [P in RidePurpose]?: number };
     requiresMonitoring?: number;
     requiresOxygen?: number;
     requiresSuctionAspirator?: number;
-    rideTypes?: { [P in RideType]?: number };
     riderAccountNames?: { [index: string]: number };
     riderTeamNames?: { [index: string]: number };
     total?: number;
+    vehicleTypes?: { [P in VehicleType]?: number };
 }
 
 export interface RideIdResult {
@@ -867,26 +1156,9 @@ export interface RideIdResult {
 /**
  * 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;
-    direction?: Direction;
-    distanceInMeters?: number;
-    from?: AddressInfo;
-    /**
-     * Derived from weightInKg != null
-     */
-    heavyWeight?: boolean;
-    mobility?: Mobility;
-    patient?: Person;
-    plannedDuration?: RideDuration;
-    preferredDriver?: string;
-    rideType?: RideType;
-    to?: AddressInfo;
-    weightInKg?: number;
+    purpose?: RidePurpose;
 }
 
 export interface RideLog {
@@ -905,22 +1177,95 @@ export interface RideLog {
     token?: boolean;
 }
 
-export interface RideOfferInfo {
-    appointment?: Appointment;
+export interface RideOperatorCommand extends RideCommand {
 }
 
-export interface RidePlannerCommand extends RideCommand {
+export interface RideOrMinimizedSeries {
+    bookingStatus?: BookingStatus;
+    entityType?: EntityType;
+    info?: GenericRideInfo;
+}
+
+export interface RideOrSeries {
+    bookedTime?: string;
+    bookingStatus?: BookingStatus;
+    driver?: AccountOrTeamRef;
+    entityType?: EntityType;
+    info?: GenericRideInfo;
+}
+
+/**
+ * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
+ */
+export interface RideSeries extends RideOrSeries {
+    /**
+     * Derived from driver != null
+     */
+    accepted?: boolean;
+    activeRideCount?: number;
+    /**
+     * Derived from bookedTime != null
+     */
+    booked?: boolean;
+    booker?: AccountOrTeamRef;
+    cancelReason?: string;
+    cancelled?: boolean;
+    info?: SeriesRideInfo;
+    rideSeriesId?: string;
+    rides?: Ride[];
+    ridesSummaries?: RideSummary[];
+    searchEndTime?: string;
+    searchStartTime?: string;
+}
+
+export interface RideSeriesIdResult {
+    rideSeriesId?: string;
+}
+
+export interface RideSeriesUpdate {
+    after?: RideSeries;
+    before?: RideSeries;
+    entityId?: string;
+    eventType?: string;
+    index?: number;
+    timestamp?: string;
+    type: "rideseries";
+}
+
+export interface RideSeriesUtils {
 }
 
 export interface RideStatisticsQuery {
     dateRange?: DateRange;
+    zoneId?: string;
 }
 
-export interface RideTypeSpecificFilter {
-    type: "ambulance" | "taxi";
+/**
+ * Individual ride timing within a series. Once a ride series is split, you cannot add rides, only remove
+ */
+export interface RideSummary {
+    appointmentTime?: string;
+    returnTrip?: boolean;
+    rideId?: string;
 }
 
-export interface Role<T> {
+export interface RideSystemCommand extends RideCommand {
+}
+
+export interface RideUpcaster {
+}
+
+export interface RideUpdate {
+    after?: Ride;
+    before?: Ride;
+    entityId?: string;
+    eventType?: string;
+    index?: number;
+    timestamp?: string;
+    type: "ride";
+}
+
+export interface Role {
 }
 
 /**
@@ -928,7 +1273,14 @@ export interface Role<T> {
  */
 export interface SaveRide extends CreateRideCommand {
     info?: RideInfo;
-    owner?: AccountOrTeamRef;
+}
+
+export interface SaveRideSeries extends CreateSeriesCommand {
+    rideSummaries?: RideSummary[];
+}
+
+export interface SecondaryTokenPermissionCommand extends TokenUpdate {
+    accountId?: string;
 }
 
 export interface SendConfirmationEmail {
@@ -942,6 +1294,7 @@ export interface SendEmail {
 export interface SendFreshdeskNewTicket {
     email?: string;
     message?: string;
+    subject?: string;
 }
 
 export interface SendInvitationEmail {
@@ -954,6 +1307,57 @@ export interface SendSlack {
     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.
+ */
+export interface SeriesInfo {
+    desyncedFromSeries?: boolean;
+    positionInSeries?: number;
+    returnTrip?: boolean;
+    rideSeriesId?: string;
+    totalRidesInSeries?: number;
+}
+
+export interface SeriesOperatorCommand extends SeriesCommand {
+}
+
+/**
+ * Information about the ride, from the creator of the ride
+ */
+export interface SeriesRideInfo extends GenericRideInfo {
+    purpose?: SeriesPurpose;
+}
+
+export interface SetOperations extends AccountUpdate {
+    operateAccounts?: string[];
+}
+
+export interface SetOperator extends AccountUpdate {
+    operator?: string;
+}
+
+export interface SetSecondaryTokenPermission extends SecondaryTokenPermissionCommand {
+    accountPermission?: AccountPermission;
+}
+
 export interface SetSettings extends AccountUpdate {
     settings?: any;
 }
@@ -994,7 +1398,7 @@ export interface SubscriptionInfo extends TimedPermission {
     service?: Service;
 }
 
-export interface TaxiFilter extends RideTypeSpecificFilter {
+export interface TaxiFilter extends DrivePermissionFilter {
     allowedMobilities?: Mobility[];
     type: "taxi";
 }
@@ -1030,10 +1434,11 @@ export interface TimedPermission {
 }
 
 export interface Token {
-    accountPermission?: AccountPermission;
+    accountPermissions?: AccountPermission[];
     createdBy?: string;
     info?: TokenInfo;
     lastUpdatedBy?: string;
+    owner?: string;
     revoked?: boolean;
     tokenId?: string;
 }
@@ -1061,9 +1466,34 @@ export interface UpdateAccountPermission extends AccountPermissionCommand {
     accountPermission?: AccountPermission;
 }
 
-export interface UpdateRideBooking extends RidePlannerCommand {
+export interface UpdatePosition {
+    clientSegment?: number[];
+    lastIndex?: number;
+    tokenId?: string;
+}
+
+export interface UpdateRide extends RideBookerCommand {
+    booker?: AccountOrTeamRef;
     info?: RideInfo;
-    owner?: AccountOrTeamRef;
+}
+
+export interface UpdateRidePlan extends RideDriverModifyCommand {
+    plannedStartTime?: string;
+}
+
+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 {
@@ -1079,6 +1509,9 @@ export interface UpdateUserInfo extends UserEdit {
     info?: UserInfo;
 }
 
+export interface UserAndTokenUpcaster {
+}
+
 export interface UserCommand {
     userId?: string;
 }
@@ -1119,36 +1552,42 @@ export interface ZonedTimeRange {
     start?: Date;
 }
 
-export type AccountRole = "rideplanner" | "driveplanner" | "admin" | "owner";
+export type AccountRole = "ridebooker" | "dispatcher" | "operator" | "admin" | "owner";
 
 export type AuthenticationResult = "SUCCESS" | "NOT_CONFIRMED";
 
-export type BookingStatus = "saved" | "booked" | "accepted" | "started" | "completed" | "cancelled";
+export type BookingStatus = "saved" | "booked" | "accepted" | "planned" | "started" | "completed" | "cancelled";
 
-export type Direction = "admission" | "relocation" | "discharge" | "consultation";
+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";
 
 export type IntegrationType = "dispolive" | "celios";
 
-export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chair" | "lying_down";
+export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chair" | "stretcher";
 
-export type RideType = "taxi" | "ambulance";
+export type OrganisationType = "medical" | "fleet" | "operator";
 
-export type RideTypeSpecificFilterUnion = AmbulanceFilter | TaxiFilter;
+export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
-export type Service = "rideplanning" | "driveplanning" | "celios_integration" | "dispolive_integration";
+export type SeriesPurpose = "consultation";
+
+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";
 
-export type StandaloneService = "rideplanning" | "driveplanning";
+export type StandaloneService = "pro_medical" | "pro_fleet" | "pro_operator";
 
 export type SyncStatus = "not_synced" | "synced" | "update_not_synced";
 
-export type TeamRole = "driveplanner" | "rideplanner";
+export type TeamRole = "dispatcher" | "ridebooker";
 
 export type UserRole = "superadmin";
+
+export type VehicleType = "taxi" | "ambulance";

package/package.json

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