@moxi.gmbh/moxi-typescriptmodels 0.1.1151-test-server → 0.1.1161-test-server

package/common.d.ts

@@ -1,6 +1,10 @@
 
-export interface AcceptDrive extends FleetCommand {
-    driveOwner?: AccountOrTeamRef;
+export interface AcceptRide extends RideDriverCommand {
+    driver?: AccountOrTeamRef;
+}
+
+export interface AcceptRideSeries extends RideDriverSeriesCommand {
+    dispatcher?: AccountOrTeamRef;
 }
 
 export interface AcceptUserAgreement extends UserEdit {
@@ -8,7 +12,7 @@ export interface AcceptUserAgreement extends UserEdit {
 }
 
 export interface Account {
-    accountId?: AccountId;
+    accountId?: string;
     /**
      * Derived from subscriptions
      */
@@ -24,28 +28,24 @@ export interface Account {
 }
 
 export interface AccountCommand {
-    accountId?: AccountId;
+    accountId?: string;
 }
 
 export interface AccountFilter {
     activeServices?: Service[];
 }
 
-export interface AccountId {
-    type?: Class<Account>;
-}
-
 export interface AccountInfo {
     address?: AddressInfo;
     defaultLanguage?: string;
     notificationEmails?: string[];
     phoneNumber?: PhoneNumber;
-    zoneId?: ZoneId;
+    zoneId?: string;
 }
 
 export interface AccountOrTeamId {
-    accountId?: AccountId;
-    teamId?: TeamId;
+    accountId?: string;
+    teamId?: string;
 }
 
 export interface AccountOrTeamRef extends AccountOrTeamId {
@@ -54,20 +54,23 @@ export interface AccountOrTeamRef extends AccountOrTeamId {
 }
 
 export interface AccountPermission {
-    accountId?: AccountId;
+    accountId?: string;
     roles?: AccountRole[];
     teamPermissions?: TeamPermission[];
 }
 
 export interface AccountPermissionCommand extends UserUpdate {
-    accountId?: AccountId;
+    accountId?: string;
 }
 
 export interface AccountRef {
-    accountId?: AccountId;
+    accountId?: string;
     name?: string;
 }
 
+export interface AccountUpcaster {
+}
+
 export interface AccountUpdate extends AccountCommand {
 }
 
@@ -103,16 +106,16 @@ export interface AdminConfirmUser extends UserUpdateAfterSignup {
 
 export interface AdminSetUserPassword {
     password?: string;
-    userId?: UserId;
+    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 {
     /**
@@ -133,26 +136,26 @@ export interface AmbulanceInfo {
     requiresSuctionAspirator?: boolean;
 }
 
-export interface AnnotatedElement {
-    annotations?: Annotation[];
-    declaredAnnotations?: Annotation[];
-}
+/**
+ * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
 
-export interface AnnotatedType extends AnnotatedElement {
-    annotatedOwnerType?: AnnotatedType;
-    type?: Type;
+ */
+export interface AnonymizedGenericRideInfo extends GenericRideInfo {
 }
 
-export interface Annotation {
+/**
+ * Information about the ride, from the creator of the ride
+ */
+export interface AnonymizedRideInfo extends RideInfo {
 }
 
 export interface Appointment {
     pickup?: boolean;
-    time?: Date;
+    time?: string;
 }
 
 export interface AssignDriver extends RideCommand {
-    driveOwner?: AccountOrTeamRef;
+    driver?: AccountOrTeamRef;
 }
 
 export interface Attachment {
@@ -167,27 +170,47 @@ export interface AuthenticateWithToken extends UserUpdate {
 
 export interface AuthenticationResponse {
     authorizationHeader?: string;
-    impersonator?: UserId;
+    impersonator?: string;
     result?: AuthenticationResult;
-    sessionDeadline?: Date;
+    sessionDeadline?: string;
     userProfile?: UserProfile;
 }
 
 export interface AuthenticationService {
 }
 
+export interface BatchUpdateRideSeriesInfo extends RideSeriesPostConfirmCommand {
+    info?: GenericRideInfo;
+    updater?: AccountOrTeamRef;
+}
+
+export interface BatchUpdateRideSeriesTimes extends RideSeriesPostConfirmCommand {
+    rides?: SingleRideUpdate[];
+    updater?: AccountOrTeamRef;
+}
+
 export interface BookRide extends CreateRideCommand {
+    booker?: AccountOrTeamRef;
     info?: RideInfo;
-    owner?: AccountOrTeamRef;
 }
 
-export interface CancelDrive extends FleetModifyCommand {
+export interface BookRideSeries extends RideBookerSeriesCommand {
+    booker?: AccountOrTeamRef;
+    info?: GenericRideInfo;
+    rides?: SingleRide[];
 }
 
-export interface CancelRide extends RidePlannerCommand {
+export interface CancelRide extends RideBookerCommand {
     reason?: string;
 }
 
+export interface CancelRideSeries extends RideBookerSeriesCommand {
+}
+
+export interface CancelRidesInSeries extends RideSeriesPostConfirmCommand {
+    updater?: AccountOrTeamRef;
+}
+
 export interface CeliosSettings {
     certificate?: string;
     host?: string;
@@ -200,17 +223,11 @@ export interface CeliosSettings {
 export interface ChangeUserPassword {
     newPassword?: string;
     oldPassword?: string;
-    userId?: UserId;
+    userId?: string;
 }
 
 export interface CheckIfUserSignedUp {
-    userId?: UserId;
-}
-
-export interface Class<T> extends Serializable, GenericDeclaration, Type, AnnotatedElement, OfField<Class<any>>, Constable {
-}
-
-export interface Cloneable {
+    userId?: string;
 }
 
 export interface ConfirmAccount extends AccountCommand {
@@ -223,13 +240,16 @@ export interface ConfirmDrivePermission extends AccountUpdate {
 export interface ConfirmEverythingInAccount extends AccountCommand {
 }
 
+export interface ConfirmRideSeries extends RideDriverSeriesCommand {
+}
+
 export interface ConfirmSubscription extends AccountUpdate {
     subscriptionId?: string;
 }
 
 export interface ConfirmUser {
     token?: string;
-    userId?: UserId;
+    userId?: string;
 }
 
 export interface ConfirmablePermission {
@@ -237,14 +257,11 @@ export interface ConfirmablePermission {
     revoked?: boolean;
 }
 
-export interface Constable {
-}
-
 export interface CreateAccount extends AccountCommand {
     autoConfirm?: boolean;
     criticalInfo?: CriticalAccountInfo;
     info?: AccountInfo;
-    owner?: UserId;
+    owner?: string;
     requestService?: StandaloneService;
 }
 
@@ -253,8 +270,15 @@ export interface CreateOptimizationPlan extends OptimizerMessage {
     timeRange?: InstantRange;
 }
 
-export interface CreateRideCommand extends RidePlannerCommand {
-    owner?: AccountOrTeamId;
+export interface CreateRideCommand extends RideBookerCommand {
+    booker?: AccountOrTeamId;
+}
+
+export interface CreateRideFromSeries extends RideDriverCommand {
+    booker?: AccountOrTeamRef;
+    driver?: AccountOrTeamRef;
+    info?: RideInfo;
+    seriesInfo?: SeriesInfo;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -263,7 +287,7 @@ export interface CreateSqueezeInPlan extends OptimizerMessage {
 
 export interface CreateTeam extends AccountCommand {
     info?: TeamInfo;
-    teamId?: TeamId;
+    teamId?: string;
 }
 
 export interface CreateToken extends TokenCommand {
@@ -283,21 +307,13 @@ export interface CriticalAccountInfo {
 }
 
 export interface DateRange {
-    end?: Date;
-    start?: Date;
+    end?: string;
+    start?: string;
 }
 
 export interface DeleteUser extends UserEdit {
 }
 
-export interface Dimension extends Dimension2D, Serializable {
-}
-
-export interface Dimension2D extends Cloneable {
-    height?: number;
-    width?: number;
-}
-
 export interface DispoliveSettings {
     key?: string;
     type: "dispolive";
@@ -306,7 +322,7 @@ export interface DispoliveSettings {
 
 export interface District {
     info?: DistrictInfo;
-    polygons?: Polygon[];
+    polygons?: any[];
 }
 
 export interface DistrictInfo {
@@ -330,14 +346,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[];
 }
 
@@ -377,7 +397,7 @@ export interface FetchGoogleGeoLocation {
 }
 
 export interface FetchGoogleRoute {
-    departureTime?: Date;
+    departureTime?: string;
     from?: GeoLocation;
     to?: GeoLocation;
 }
@@ -400,7 +420,7 @@ export interface FindAccounts {
 }
 
 export interface FindMyAcceptedRides {
-    accountId?: AccountId;
+    accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
@@ -411,15 +431,23 @@ export interface FindMyAcceptedRides {
  * @deprecated
  */
 export interface FindMyRideOffers {
-    accountId?: AccountId;
+    accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
     term?: string;
 }
 
+export interface FindMyRideSeries {
+    accountId?: string;
+    descending?: boolean;
+    maxSize?: number;
+    term?: string;
+    timeRange?: InstantRange;
+}
+
 export interface FindMyRides {
-    accountId?: AccountId;
+    accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
@@ -427,19 +455,26 @@ export interface FindMyRides {
 }
 
 export interface FindMyTokens {
-    accountId?: AccountId;
-    teamId?: TeamId;
+    accountId?: string;
+    teamId?: string;
     term?: string;
 }
 
 export interface FindMyUsers {
-    accountId?: AccountId;
-    teamId?: TeamId;
+    accountId?: string;
+    teamId?: string;
     term?: string;
 }
 
+export interface FindPotentialRideSeries {
+    accountId?: string;
+    descending?: boolean;
+    filter?: RideInfoFilter;
+    maxSize?: number;
+}
+
 export interface FindPotentialRides {
-    accountId?: AccountId;
+    accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
@@ -466,20 +501,35 @@ export interface FindUsers {
     term?: string;
 }
 
-export interface FleetCommand extends RideCommand {
-}
-
-export interface FleetModifyCommand extends FleetCommand {
-}
-
 export interface GenerateToken {
     accountPermission?: AccountPermission;
     info?: TokenInfo;
-    tokenId?: TokenId;
+    tokenId?: string;
 }
 
-export interface GenericDeclaration extends AnnotatedElement {
-    typeParameters?: TypeVariable<any>[];
+/**
+ * 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;
+    purpose?: RidePurpose;
+    to?: AddressInfo;
+    vehicleType?: VehicleType;
+    weightInKg?: number;
 }
 
 export interface GeoJson {
@@ -509,7 +559,7 @@ export interface Geometry {
 }
 
 export interface GetAccount {
-    accountId?: AccountId;
+    accountId?: string;
 }
 
 export interface GetAccountsOfPotentialDrivers extends GetPotentialDrivers {
@@ -538,8 +588,15 @@ export interface GetIsoStates {
 export interface GetMonopolyAccounts {
 }
 
+export interface GetMyAcceptedRideSeries {
+    accountId?: string;
+    descending?: boolean;
+    maxSize?: number;
+    timeRange?: InstantRange;
+}
+
 export interface GetMyAcceptedRides {
-    accountId?: AccountId;
+    accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
@@ -552,13 +609,19 @@ export interface GetMyAccounts {
  * @deprecated
  */
 export interface GetMyRideOffers {
-    accountId?: AccountId;
+    accountId?: string;
+    maxSize?: number;
+    timeRange?: InstantRange;
+}
+
+export interface GetMyRideSeries {
+    accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
 export interface GetMyRides {
-    accountId?: AccountId;
+    accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
@@ -575,42 +638,60 @@ export interface GetNutsStates {
 export interface GetPotentialDrivers {
     fromDistrict?: string;
     mobility?: Mobility;
-    rideType?: RideType;
     toDistrict?: string;
+    vehicleType?: VehicleType;
     weightInKg?: number;
 }
 
+export interface GetPotentialRideSeries {
+    accountId?: string;
+    maxSize?: number;
+}
+
 export interface GetPotentialRides {
-    accountId?: AccountId;
+    accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
 export interface GetRide {
-    rideId?: RideId;
+    rideId?: string;
 }
 
 export interface GetRideCsv extends RideStatisticsQuery {
 }
 
-export interface GetRideData extends RideStatisticsQuery {
-    rideOwner?: AccountId;
+export interface GetRideDataForBooker extends RideStatisticsQuery {
+    accountId?: string;
+}
+
+export interface GetRideDataForDriver extends RideStatisticsQuery {
+    accountId?: string;
 }
 
 export interface GetRideLog {
-    rideId?: RideId;
+    rideId?: string;
+}
+
+export interface GetRideSeries {
+    rideSeriesId?: string;
+}
+
+export interface GetRidesInSeries {
+    filter?: RideFilter;
+    rideSeriesId?: string;
 }
 
 export interface GetTeam {
-    teamId?: TeamId;
+    teamId?: string;
 }
 
 export interface GetToken {
-    tokenId?: TokenId;
+    tokenId?: string;
 }
 
 export interface GetUserProfile {
-    userId?: UserId;
+    userId?: string;
 }
 
 export interface GiveDrivePermission extends AccountUpdate {
@@ -628,15 +709,12 @@ export interface GiveTeamPermission extends AccountPermissionCommand {
 }
 
 export interface ImpersonateUser {
-    userId?: UserId;
-}
-
-export interface InetAddress extends Serializable {
+    userId?: string;
 }
 
 export interface InstantRange {
-    end?: Date;
-    start?: Date;
+    end?: string;
+    start?: string;
 }
 
 export interface Insurer {
@@ -645,7 +723,7 @@ export interface Insurer {
 }
 
 export interface Invite {
-    accountId?: AccountId;
+    accountId?: string;
     invitedBy?: string;
 }
 
@@ -659,7 +737,7 @@ export interface InviteUser extends UserCommand {
  * Ip4 or ip6 range in CIDR format
  */
 export interface IpRange {
-    ip?: InetAddress;
+    ip?: string;
     range?: number;
 }
 
@@ -687,11 +765,6 @@ export interface NutsSubState {
     name?: string;
 }
 
-export interface OfField<F> extends TypeDescriptor {
-    array?: boolean;
-    primitive?: boolean;
-}
-
 export interface OffsetTimeRange {
     end?: Date;
     start?: Date;
@@ -702,7 +775,7 @@ export interface OptimizerMessage {
 
 export interface Person {
     address?: AddressInfo;
-    birthDay?: Date;
+    birthDay?: string;
     email?: string;
     firstName?: string;
     insuranceNumber?: string;
@@ -724,45 +797,8 @@ export interface PersonDimensions {
 export interface PhoneNumber {
 }
 
-export interface Point extends Point2D, Serializable {
-}
-
-export interface Point2D extends Cloneable {
-    x?: number;
-    y?: number;
-}
-
-export interface Polygon extends Shape, Serializable {
-    /**
-     * @deprecated
-     */
-    boundingBox?: Rectangle;
-    npoints?: number;
-    xpoints?: number[];
-    ypoints?: number[];
-}
-
-export interface Rectangle extends Rectangle2D, Shape, Serializable {
-    location?: Point;
-    rect?: Rectangle2D;
-    size?: Dimension;
-}
-
-export interface Rectangle2D extends RectangularShape {
-}
-
-export interface RectangularShape extends Shape, Cloneable {
-    centerX?: number;
-    centerY?: number;
-    empty?: boolean;
-    height?: number;
-    maxX?: number;
-    maxY?: number;
-    minX?: number;
-    minY?: number;
-    width?: number;
-    x?: number;
-    y?: number;
+export interface PlanRide extends RideDriverModifyCommand {
+    plannedStartTime?: string;
 }
 
 export interface Region {
@@ -773,21 +809,16 @@ export interface RegisterAuthenticationToken extends UserUpdate {
     hashedToken?: string;
 }
 
-export interface RegisterDifferentEta extends FleetModifyCommand {
-    destinationEta?: Date;
-    originEta?: Date;
-}
-
-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 {
     einsatzNumber?: string;
-    rideId?: RideId;
+    rideId?: string;
 }
 
 export interface RemoveAccount extends AccountUpdate {
@@ -801,7 +832,7 @@ export interface RemoveTeam extends TeamUpdate {
 }
 
 export interface RemoveTeamPermission extends AccountPermissionCommand {
-    teamId?: TeamId;
+    teamId?: string;
 }
 
 export interface ReportIssue {
@@ -809,6 +840,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;
@@ -823,16 +861,22 @@ export interface RequestUserReset {
     email?: string;
 }
 
+export interface ReturnRide extends RideDriverModifyCommand {
+}
+
+export interface ReturnRideSeries extends RideDriverSeriesCommand {
+}
+
 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;
 }
 
@@ -852,14 +896,22 @@ export interface RevokeToken extends TokenUpdate {
 
 export interface Ride {
     /**
-     * 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?: Date;
+    bookedTime?: string;
+    booker?: AccountOrTeamRef;
+    bookerReview?: Review;
     bookingStatus?: BookingStatus;
     cancelReason?: string;
     cancelled?: boolean;
@@ -868,37 +920,70 @@ 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?: Date;
+    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?: Date;
-    driveOwner?: AccountOrTeamRef;
+    desiredStartTime?: string;
     driveStatus?: DriveStatus;
+    driver?: AccountOrTeamRef;
     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?: Date;
+    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?: Date;
-    rideId?: RideId;
-    rideOwner?: AccountOrTeamRef;
-    riderReview?: Review;
+    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?: boolean;
 }
 
+export interface RideBookerCommand extends RideCommand {
+}
+
+export interface RideBookerSeriesCommand extends RideSeriesCommand {
+}
+
 export interface RideCommand {
-    rideId?: RideId;
+    rideId?: string;
+}
+
+export interface RideDriverCommand extends RideCommand {
+}
+
+export interface RideDriverModifyCommand extends RideDriverCommand {
+}
+
+export interface RideDriverSeriesCommand extends RideSeriesPreConfirmCommand {
 }
 
 /**
@@ -913,47 +998,43 @@ export interface RideDuration {
 
 export interface RideFilter {
     bookingStatuses?: BookingStatus[];
-    directions?: Direction[];
     driveStatuses?: DriveStatus[];
     driverAccountNames?: string[];
     driverTeamNames?: string[];
     hasInfection?: boolean;
     heavyWeight?: boolean;
     mobilities?: Mobility[];
+    purposes?: RidePurpose[];
     region?: Region;
     requiresMonitoring?: boolean;
     requiresOxygen?: boolean;
     requiresSuctionAspirator?: boolean;
-    rideType?: RideType;
     riderAccountNames?: string[];
     riderTeamNames?: string[];
     timeRange?: InstantRange;
+    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;
-}
-
-export interface RideId {
-    type?: Class<Ride>;
+    vehicleTypes?: { [P in VehicleType]?: number };
 }
 
 export interface RideIdResult {
-    rideId?: RideId;
+    rideId?: string;
 }
 
 /**
@@ -965,7 +1046,6 @@ export interface RideInfo {
     attendantsPresent?: number;
     comment?: string;
     dimensions?: PersonDimensions;
-    direction?: Direction;
     distanceInMeters?: number;
     from?: AddressInfo;
     /**
@@ -975,12 +1055,25 @@ export interface RideInfo {
     mobility?: Mobility;
     patient?: Person;
     plannedDuration?: RideDuration;
-    preferredDriver?: AccountId;
-    rideType?: RideType;
+    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 {
     actingFor?: AccountOrTeamRef;
     allowedViewers?: AccountOrTeamRef[];
@@ -993,7 +1086,7 @@ export interface RideLog {
     isSuperAdmin?: boolean;
     isToken?: boolean;
     superAdmin?: boolean;
-    timestamp?: Date;
+    timestamp?: string;
     token?: boolean;
 }
 
@@ -1001,17 +1094,47 @@ export interface RideOfferInfo {
     appointment?: Appointment;
 }
 
-export interface RidePlannerCommand extends RideCommand {
+export interface RideSeries {
+    accepted?: boolean;
+    booked?: boolean;
+    booker?: AccountOrTeamRef;
+    cancelled?: boolean;
+    confirmed?: boolean;
+    driver?: AccountOrTeamRef;
+    endTime?: string;
+    info?: GenericRideInfo;
+    rideSeriesId?: string;
+    rides?: SingleRide[];
+    startTime?: string;
+    status?: RideSeriesStatus;
+}
+
+export interface RideSeriesCommand {
+    rideSeriesId?: string;
+}
+
+export interface RideSeriesIdResult {
+    rideSeriesId?: string;
+}
+
+export interface RideSeriesPostConfirmCommand {
+    rideSeriesId?: string;
+    ridesToModify?: Ride[];
+}
+
+export interface RideSeriesPreConfirmCommand extends RideSeriesCommand {
 }
 
 export interface RideStatisticsQuery {
     dateRange?: DateRange;
-    timezoneOrDefault?: ZoneId;
-    zoneId?: ZoneId;
+    timezoneOrDefault?: string;
+    zoneId?: string;
 }
 
-export interface RideTypeSpecificFilter {
-    type: "ambulance" | "taxi";
+export interface RideSystemCommand extends RideCommand {
+}
+
+export interface RideUpcaster {
 }
 
 export interface Role<T> {
@@ -1021,12 +1144,12 @@ export interface Role<T> {
  * 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;
-    owner?: AccountOrTeamRef;
 }
 
 export interface SendConfirmationEmail {
-    userId?: UserId;
+    userId?: string;
 }
 
 export interface SendEmail {
@@ -1039,8 +1162,8 @@ export interface SendFreshdeskNewTicket {
 }
 
 export interface SendInvitationEmail {
-    accountIdOfInvite?: AccountId;
-    userId?: UserId;
+    accountIdOfInvite?: string;
+    userId?: string;
 }
 
 export interface SendSlack {
@@ -1048,7 +1171,12 @@ export interface SendSlack {
     message?: string;
 }
 
-export interface Serializable {
+/**
+ * Information about a ride that is part of series.
+ */
+export interface SeriesInfo {
+    returnTrip?: boolean;
+    rideSeriesId?: string;
 }
 
 export interface SetSettings extends AccountUpdate {
@@ -1058,21 +1186,16 @@ export interface SetSettings extends AccountUpdate {
 export interface SetUserPassword {
     confirmationCode?: string;
     password?: string;
-    userId?: UserId;
+    userId?: string;
 }
 
 export interface SetUserRole extends UserUpdate {
     role?: UserRole;
 }
 
-export interface Shape {
-    bounds?: Rectangle;
-    bounds2D?: Rectangle2D;
-}
-
 export interface SignInUser {
     password?: string;
-    userId?: UserId;
+    userId?: string;
 }
 
 export interface SignUpUser {
@@ -1080,7 +1203,20 @@ export interface SignUpUser {
     info?: UserInfo;
     inviteToken?: string;
     password?: string;
-    userId?: UserId;
+    userId?: string;
+}
+
+/**
+ * Individual ride timing within a series
+ */
+export interface SingleRide {
+    desiredStartTime?: string;
+    returnTrip?: boolean;
+}
+
+export interface SingleRideUpdate {
+    desiredStartTime?: string;
+    rideId?: string;
 }
 
 export interface StopImpersonatingUser {
@@ -1096,18 +1232,14 @@ export interface SubscriptionInfo extends TimedPermission {
     service?: Service;
 }
 
-export interface TaxiFilter extends RideTypeSpecificFilter {
+export interface TaxiFilter extends DrivePermissionFilter {
     allowedMobilities?: Mobility[];
     type: "taxi";
 }
 
 export interface Team {
     info?: TeamInfo;
-    teamId?: TeamId;
-}
-
-export interface TeamId {
-    type?: Class<Team>;
+    teamId?: string;
 }
 
 export interface TeamInfo {
@@ -1119,16 +1251,16 @@ export interface TeamInfo {
 
 export interface TeamPermission {
     roles?: TeamRole[];
-    teamId?: TeamId;
+    teamId?: string;
 }
 
 export interface TeamUpdate extends AccountUpdate {
-    teamId?: TeamId;
+    teamId?: string;
 }
 
 export interface TimeRange {
-    end?: Date;
-    start?: Date;
+    end?: string;
+    start?: string;
 }
 
 export interface TimedPermission {
@@ -1141,15 +1273,11 @@ export interface Token {
     info?: TokenInfo;
     lastUpdatedBy?: string;
     revoked?: boolean;
-    tokenId?: TokenId;
+    tokenId?: string;
 }
 
 export interface TokenCommand {
-    tokenId?: TokenId;
-}
-
-export interface TokenId extends UserOrTokenId {
-    type?: Class<Token>;
+    tokenId?: string;
 }
 
 export interface TokenInfo {
@@ -1161,20 +1289,6 @@ export interface TokenInfo {
 export interface TokenUpdate extends TokenCommand {
 }
 
-export interface Type {
-    typeName?: string;
-}
-
-export interface TypeDescriptor {
-}
-
-export interface TypeVariable<D> extends Type, AnnotatedElement {
-    annotatedBounds?: AnnotatedType[];
-    bounds?: Type[];
-    genericDeclaration?: D;
-    name?: string;
-}
-
 export interface UpdateAccountInfo extends AccountUpdate {
     autoConfirm?: boolean;
     criticalInfo?: CriticalAccountInfo;
@@ -1185,9 +1299,18 @@ export interface UpdateAccountPermission extends AccountPermissionCommand {
     accountPermission?: AccountPermission;
 }
 
-export interface UpdateRideBooking extends RidePlannerCommand {
+export interface UpdateRide extends RideBookerCommand {
+    booker?: AccountOrTeamRef;
     info?: RideInfo;
-    owner?: AccountOrTeamRef;
+}
+
+export interface UpdateRidePlan extends RideDriverModifyCommand {
+    plannedStartTime?: string;
+}
+
+export interface UpdateRideSeries extends RideBookerSeriesCommand {
+    info?: GenericRideInfo;
+    rides?: SingleRide[];
 }
 
 export interface UpdateTeam extends TeamUpdate {
@@ -1203,15 +1326,14 @@ export interface UpdateUserInfo extends UserEdit {
     info?: UserInfo;
 }
 
-export interface UserCommand {
-    userId?: UserId;
+export interface UserAndTokenUpcaster {
 }
 
-export interface UserEdit extends UserUpdateAfterSignup {
+export interface UserCommand {
+    userId?: string;
 }
 
-export interface UserId extends UserOrTokenId {
-    type?: Class<UserProfile>;
+export interface UserEdit extends UserUpdateAfterSignup {
 }
 
 export interface UserInfo {
@@ -1232,7 +1354,7 @@ export interface UserProfile {
     email?: string;
     emailConfirmed?: boolean;
     info?: UserInfo;
-    userId?: UserId;
+    userId?: string;
     userRole?: UserRole;
 }
 
@@ -1242,21 +1364,18 @@ export interface UserUpdate extends UserCommand {
 export interface UserUpdateAfterSignup extends UserUpdate {
 }
 
-export interface ZoneId extends Serializable {
-}
-
 export interface ZonedTimeRange {
     end?: Date;
     start?: Date;
 }
 
-export type AccountRole = "rideplanner" | "driveplanner" | "admin" | "owner";
+export type AccountRole = "ridebooker" | "dispatcher" | "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";
 
@@ -1266,20 +1385,24 @@ export type InsuranceType = "public_insurance" | "private_insurance" | "german_a
 
 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 OrganisationType = "medical" | "fleet";
 
-export type RideType = "taxi" | "ambulance";
+export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
-export type RideTypeSpecificFilterUnion = AmbulanceFilter | TaxiFilter;
+export type RideSeriesStatus = "booked" | "accepted" | "confirmed" | "cancelled";
 
-export type Service = "rideplanning" | "driveplanning" | "celios_integration" | "dispolive_integration";
+export type Service = "pro_medical" | "pro_fleet" | "celios_integration" | "dispolive_integration";
 
 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";
 
 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.1151-test-server",
+  "version": "0.1.1161-test-server",
   "types": "common.d.ts"
 }