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

package/common.d.ts

@@ -1,10 +1,6 @@
 
-export interface AcceptRide extends RideDriverCommand {
-    driver?: AccountOrTeamRef;
-}
-
-export interface AcceptRideSeries extends RideDriverSeriesCommand {
-    dispatcher?: AccountOrTeamRef;
+export interface AcceptDrive extends FleetCommand {
+    driveOwner?: AccountOrTeamRef;
 }
 
 export interface AcceptUserAgreement extends UserEdit {
@@ -12,11 +8,7 @@ export interface AcceptUserAgreement extends UserEdit {
 }
 
 export interface Account {
-    accountId?: string;
-    /**
-     * Derived from subscriptions
-     */
-    activeOrganisationTypes?: OrganisationType[];
+    accountId?: AccountId;
     /**
      * Derived from subscriptions
      */
@@ -32,24 +24,28 @@ export interface Account {
 }
 
 export interface AccountCommand {
-    accountId?: string;
+    accountId?: AccountId;
 }
 
 export interface AccountFilter {
     activeServices?: Service[];
 }
 
+export interface AccountId {
+    type?: Class<Account>;
+}
+
 export interface AccountInfo {
     address?: AddressInfo;
     defaultLanguage?: string;
     notificationEmails?: string[];
     phoneNumber?: PhoneNumber;
-    zoneId?: string;
+    zoneId?: ZoneId;
 }
 
 export interface AccountOrTeamId {
-    accountId?: string;
-    teamId?: string;
+    accountId?: AccountId;
+    teamId?: TeamId;
 }
 
 export interface AccountOrTeamRef extends AccountOrTeamId {
@@ -58,23 +54,20 @@ export interface AccountOrTeamRef extends AccountOrTeamId {
 }
 
 export interface AccountPermission {
-    accountId?: string;
+    accountId?: AccountId;
     roles?: AccountRole[];
     teamPermissions?: TeamPermission[];
 }
 
 export interface AccountPermissionCommand extends UserUpdate {
-    accountId?: string;
+    accountId?: AccountId;
 }
 
 export interface AccountRef {
-    accountId?: string;
+    accountId?: AccountId;
     name?: string;
 }
 
-export interface AccountUpcaster {
-}
-
 export interface AccountUpdate extends AccountCommand {
 }
 
@@ -110,16 +103,16 @@ export interface AdminConfirmUser extends UserUpdateAfterSignup {
 
 export interface AdminSetUserPassword {
     password?: string;
-    userId?: string;
+    userId?: UserId;
 }
 
-export interface AmbulanceFilter extends DrivePermissionFilter {
+export interface AmbulanceFilter extends RideTypeSpecificFilter {
     heavyWeightAllowed?: boolean;
     type: "ambulance";
 }
 
 /**
- * Filled if (and only if) vehicleType == ambulance
+ * Filled if (and only if) rideType == ambulance
  */
 export interface AmbulanceInfo {
     /**
@@ -140,26 +133,26 @@ export interface AmbulanceInfo {
     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 AnnotatedElement {
+    annotations?: Annotation[];
+    declaredAnnotations?: Annotation[];
+}
 
- */
-export interface AnonymizedGenericRideInfo extends GenericRideInfo {
+export interface AnnotatedType extends AnnotatedElement {
+    annotatedOwnerType?: AnnotatedType;
+    type?: Type;
 }
 
-/**
- * Information about the ride, from the creator of the ride
- */
-export interface AnonymizedRideInfo extends RideInfo {
+export interface Annotation {
 }
 
 export interface Appointment {
     pickup?: boolean;
-    time?: string;
+    time?: Date;
 }
 
 export interface AssignDriver extends RideCommand {
-    driver?: AccountOrTeamRef;
+    driveOwner?: AccountOrTeamRef;
 }
 
 export interface Attachment {
@@ -174,47 +167,27 @@ export interface AuthenticateWithToken extends UserUpdate {
 
 export interface AuthenticationResponse {
     authorizationHeader?: string;
-    impersonator?: string;
+    impersonator?: UserId;
     result?: AuthenticationResult;
-    sessionDeadline?: string;
+    sessionDeadline?: Date;
     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 BookRideSeries extends RideBookerSeriesCommand {
-    booker?: AccountOrTeamRef;
-    info?: GenericRideInfo;
-    rides?: SingleRide[];
+export interface CancelDrive extends FleetModifyCommand {
 }
 
-export interface CancelRide extends RideBookerCommand {
+export interface CancelRide extends RidePlannerCommand {
     reason?: string;
 }
 
-export interface CancelRideSeries extends RideBookerSeriesCommand {
-}
-
-export interface CancelRidesInSeries extends RideSeriesPostConfirmCommand {
-    updater?: AccountOrTeamRef;
-}
-
 export interface CeliosSettings {
     certificate?: string;
     host?: string;
@@ -227,11 +200,17 @@ export interface CeliosSettings {
 export interface ChangeUserPassword {
     newPassword?: string;
     oldPassword?: string;
-    userId?: string;
+    userId?: UserId;
 }
 
 export interface CheckIfUserSignedUp {
-    userId?: string;
+    userId?: UserId;
+}
+
+export interface Class<T> extends Serializable, GenericDeclaration, Type, AnnotatedElement, OfField<Class<any>>, Constable {
+}
+
+export interface Cloneable {
 }
 
 export interface ConfirmAccount extends AccountCommand {
@@ -250,7 +229,7 @@ export interface ConfirmSubscription extends AccountUpdate {
 
 export interface ConfirmUser {
     token?: string;
-    userId?: string;
+    userId?: UserId;
 }
 
 export interface ConfirmablePermission {
@@ -258,11 +237,14 @@ export interface ConfirmablePermission {
     revoked?: boolean;
 }
 
+export interface Constable {
+}
+
 export interface CreateAccount extends AccountCommand {
     autoConfirm?: boolean;
     criticalInfo?: CriticalAccountInfo;
     info?: AccountInfo;
-    owner?: string;
+    owner?: UserId;
     requestService?: StandaloneService;
 }
 
@@ -271,18 +253,8 @@ export interface CreateOptimizationPlan extends OptimizerMessage {
     timeRange?: InstantRange;
 }
 
-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 CreateRideCommand extends RidePlannerCommand {
+    owner?: AccountOrTeamId;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -291,7 +263,7 @@ export interface CreateSqueezeInPlan extends OptimizerMessage {
 
 export interface CreateTeam extends AccountCommand {
     info?: TeamInfo;
-    teamId?: string;
+    teamId?: TeamId;
 }
 
 export interface CreateToken extends TokenCommand {
@@ -311,16 +283,19 @@ export interface CriticalAccountInfo {
 }
 
 export interface DateRange {
-    end?: string;
-    start?: string;
+    end?: Date;
+    start?: Date;
 }
 
 export interface DeleteUser extends UserEdit {
 }
 
-export interface DisconnectClient {
-    clientId?: string;
-    tokenId?: string;
+export interface Dimension extends Dimension2D, Serializable {
+}
+
+export interface Dimension2D extends Cloneable {
+    height?: number;
+    width?: number;
 }
 
 export interface DispoliveSettings {
@@ -331,7 +306,7 @@ export interface DispoliveSettings {
 
 export interface District {
     info?: DistrictInfo;
-    polygons?: any[];
+    polygons?: Polygon[];
 }
 
 export interface DistrictInfo {
@@ -355,18 +330,14 @@ export interface DrivePermission {
     revoked?: boolean;
 }
 
-export interface DrivePermissionFilter {
-    type: "ambulance" | "taxi";
-}
-
 export interface DrivePermissionInfo {
-    filter?: DrivePermissionFilterUnion;
+    filter?: RideTypeSpecificFilterUnion;
     monopoly?: boolean;
     regions?: Region[];
 }
 
 export interface DrivePermissionInfoRequest {
-    filter?: DrivePermissionFilterUnion;
+    filter?: RideTypeSpecificFilterUnion;
     regions?: Region[];
 }
 
@@ -406,7 +377,7 @@ export interface FetchGoogleGeoLocation {
 }
 
 export interface FetchGoogleRoute {
-    departureTime?: string;
+    departureTime?: Date;
     from?: GeoLocation;
     to?: GeoLocation;
 }
@@ -428,11 +399,8 @@ export interface FindAccounts {
     term?: string;
 }
 
-/**
- * @deprecated
- */
 export interface FindMyAcceptedRides {
-    accountId?: string;
+    accountId?: AccountId;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
@@ -443,23 +411,15 @@ export interface FindMyAcceptedRides {
  * @deprecated
  */
 export interface FindMyRideOffers {
-    accountId?: string;
+    accountId?: AccountId;
     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?: string;
+    accountId?: AccountId;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
@@ -467,26 +427,19 @@ export interface FindMyRides {
 }
 
 export interface FindMyTokens {
-    accountId?: string;
-    teamId?: string;
+    accountId?: AccountId;
+    teamId?: TeamId;
     term?: string;
 }
 
 export interface FindMyUsers {
-    accountId?: string;
-    teamId?: string;
+    accountId?: AccountId;
+    teamId?: TeamId;
     term?: string;
 }
 
-export interface FindPotentialRideSeries {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideInfoFilter;
-    maxSize?: number;
-}
-
 export interface FindPotentialRides {
-    accountId?: string;
+    accountId?: AccountId;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
@@ -500,14 +453,6 @@ export interface FindRides {
     term?: string;
 }
 
-export interface FindRidesForDriver {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
-}
-
 export interface FindRidesResult {
     count?: RideFilterCount;
     rides?: Ride[];
@@ -521,35 +466,20 @@ export interface FindUsers {
     term?: string;
 }
 
+export interface FleetCommand extends RideCommand {
+}
+
+export interface FleetModifyCommand extends FleetCommand {
+}
+
 export interface GenerateToken {
     accountPermission?: AccountPermission;
     info?: TokenInfo;
-    tokenId?: string;
+    tokenId?: TokenId;
 }
 
-/**
- * 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 GenericDeclaration extends AnnotatedElement {
+    typeParameters?: TypeVariable<any>[];
 }
 
 export interface GeoJson {
@@ -579,7 +509,7 @@ export interface Geometry {
 }
 
 export interface GetAccount {
-    accountId?: string;
+    accountId?: AccountId;
 }
 
 export interface GetAccountsOfPotentialDrivers extends GetPotentialDrivers {
@@ -588,18 +518,6 @@ export interface GetAccountsOfPotentialDrivers extends GetPotentialDrivers {
 export interface GetAccountsOfPotentialDriversAsAdmin extends GetPotentialDrivers {
 }
 
-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;
@@ -620,11 +538,8 @@ export interface GetIsoStates {
 export interface GetMonopolyAccounts {
 }
 
-/**
- * @deprecated
- */
 export interface GetMyAcceptedRides {
-    accountId?: string;
+    accountId?: AccountId;
     maxSize?: number;
     timeRange?: InstantRange;
 }
@@ -637,13 +552,13 @@ export interface GetMyAccounts {
  * @deprecated
  */
 export interface GetMyRideOffers {
-    accountId?: string;
+    accountId?: AccountId;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
 export interface GetMyRides {
-    accountId?: string;
+    accountId?: AccountId;
     maxSize?: number;
     timeRange?: InstantRange;
 }
@@ -660,76 +575,42 @@ export interface GetNutsStates {
 export interface GetPotentialDrivers {
     fromDistrict?: string;
     mobility?: Mobility;
+    rideType?: RideType;
     toDistrict?: string;
-    vehicleType?: VehicleType;
     weightInKg?: number;
 }
 
-/**
- * @deprecated
- */
 export interface GetPotentialRides {
-    accountId?: string;
+    accountId?: AccountId;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
 export interface GetRide {
-    rideId?: string;
+    rideId?: RideId;
 }
 
 export interface GetRideCsv extends RideStatisticsQuery {
 }
 
-export interface GetRideDataForBooker extends RideStatisticsQuery {
-    accountId?: string;
-}
-
-export interface GetRideDataForDriver extends RideStatisticsQuery {
-    accountId?: string;
+export interface GetRideData extends RideStatisticsQuery {
+    rideOwner?: AccountId;
 }
 
 export interface GetRideLog {
-    rideId?: string;
-}
-
-export interface GetRideSeries {
-    rideSeriesId?: string;
-}
-
-export interface GetRideSeriesForDriver {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
-export interface GetRidesForDriver {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
-export interface GetRidesInMarketplace {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
-export interface GetRidesInSeries {
-    filter?: RideFilter;
-    rideSeriesId?: string;
+    rideId?: RideId;
 }
 
 export interface GetTeam {
-    teamId?: string;
+    teamId?: TeamId;
 }
 
 export interface GetToken {
-    tokenId?: string;
+    tokenId?: TokenId;
 }
 
 export interface GetUserProfile {
-    userId?: string;
+    userId?: UserId;
 }
 
 export interface GiveDrivePermission extends AccountUpdate {
@@ -747,12 +628,15 @@ export interface GiveTeamPermission extends AccountPermissionCommand {
 }
 
 export interface ImpersonateUser {
-    userId?: string;
+    userId?: UserId;
+}
+
+export interface InetAddress extends Serializable {
 }
 
 export interface InstantRange {
-    end?: string;
-    start?: string;
+    end?: Date;
+    start?: Date;
 }
 
 export interface Insurer {
@@ -761,7 +645,7 @@ export interface Insurer {
 }
 
 export interface Invite {
-    accountId?: string;
+    accountId?: AccountId;
     invitedBy?: string;
 }
 
@@ -775,7 +659,7 @@ export interface InviteUser extends UserCommand {
  * Ip4 or ip6 range in CIDR format
  */
 export interface IpRange {
-    ip?: string;
+    ip?: InetAddress;
     range?: number;
 }
 
@@ -786,16 +670,6 @@ export interface IsoState {
     nutsCode?: string;
 }
 
-export interface Metric {
-    clientId?: string;
-    clientSegment?: number[];
-    maxSize?: number;
-    maxTimeout?: string;
-    tokenId?: string;
-    type?: string;
-    updates?: string[];
-}
-
 export interface NutsDistrict {
     code?: string;
     name?: string;
@@ -813,6 +687,11 @@ export interface NutsSubState {
     name?: string;
 }
 
+export interface OfField<F> extends TypeDescriptor {
+    array?: boolean;
+    primitive?: boolean;
+}
+
 export interface OffsetTimeRange {
     end?: Date;
     start?: Date;
@@ -823,7 +702,7 @@ export interface OptimizerMessage {
 
 export interface Person {
     address?: AddressInfo;
-    birthDay?: string;
+    birthDay?: Date;
     email?: string;
     firstName?: string;
     insuranceNumber?: string;
@@ -845,22 +724,45 @@ export interface PersonDimensions {
 export interface PhoneNumber {
 }
 
-export interface PlanRide extends RideDriverModifyCommand {
-    plannedStartTime?: string;
+export interface Point extends Point2D, Serializable {
 }
 
-export interface ReadUpdates {
-    clientId?: string;
-    maxSize?: number;
-    maxTimeout?: number;
-    tokenId?: string;
-    updateTypes?: TrackingUpdateType[];
+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 ReadUpdatesResult {
-    clientSegment?: number[];
-    lastIndex?: number;
-    updates?: any[];
+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 Region {
@@ -871,16 +773,21 @@ export interface RegisterAuthenticationToken extends UserUpdate {
     hashedToken?: string;
 }
 
-export interface RegisterDriveStatus extends RideDriverModifyCommand {
+export interface RegisterDifferentEta extends FleetModifyCommand {
+    destinationEta?: Date;
+    originEta?: Date;
+}
+
+export interface RegisterDriveStatus extends FleetModifyCommand {
     driveStatus?: DriveStatus;
 }
 
-export interface RegisterDriverSynced extends RideDriverModifyCommand {
+export interface RegisterDriverSynced extends FleetModifyCommand {
 }
 
 export interface RegisterEinsatz {
     einsatzNumber?: string;
-    rideId?: string;
+    rideId?: RideId;
 }
 
 export interface RemoveAccount extends AccountUpdate {
@@ -894,7 +801,7 @@ export interface RemoveTeam extends TeamUpdate {
 }
 
 export interface RemoveTeamPermission extends AccountPermissionCommand {
-    teamId?: string;
+    teamId?: TeamId;
 }
 
 export interface ReportIssue {
@@ -902,13 +809,6 @@ 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;
@@ -923,31 +823,16 @@ 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 RideDriverSeriesCommand {
-}
-
 export interface Review {
     comment?: string;
     stars?: number;
 }
 
-export interface ReviewRideAsBooker extends RideBookerCommand {
+export interface ReviewRideAsDriver extends FleetModifyCommand {
     review?: Review;
 }
 
-export interface ReviewRideAsDriver extends RideDriverModifyCommand {
+export interface ReviewRideAsRider extends RidePlannerCommand {
     review?: Review;
 }
 
@@ -967,22 +852,14 @@ export interface RevokeToken extends TokenUpdate {
 
 export interface Ride {
     /**
-     * Derived from driver != null
+     * Derived from driveOwner != null
      */
     accepted?: boolean;
-    actualEndTime?: string;
-    actualStartTime?: string;
-    /**
-     * Derived from driveStatus != null
-     */
-    arrived?: boolean;
     /**
      * Derived from bookedTime != null
      */
     booked?: boolean;
-    bookedTime?: string;
-    booker?: AccountOrTeamRef;
-    bookerReview?: Review;
+    bookedTime?: Date;
     bookingStatus?: BookingStatus;
     cancelReason?: string;
     cancelled?: boolean;
@@ -991,70 +868,37 @@ export interface Ride {
      */
     completed?: boolean;
     /**
-     * Desired Time of Arrival at the Destination/Drop-off location. Derived from info.appointment and info.plannedDuration
+     * Estimated Time of Arrival at the Destination/Drop-off location. Will differ from destinationPta if the driver reported a delay
      */
-    desiredEndTime?: string;
+    destinationEta?: Date;
     /**
-     * Desired 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. Derived from info.appointment and info.plannedDuration
      */
-    desiredStartTime?: string;
+    destinationPta?: Date;
+    driveOwner?: AccountOrTeamRef;
     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;
     /**
-     * Derived from plannedStartTime != null
-     */
-    planned?: boolean;
-    /**
-     * Planned Time of Arrival at the Destination/Drop-off location, reported by the driver. 
+     * Estimated Time of Arrival at the Origin/Pick-up location. Will differ from originPta if the driver reported a delay
      */
-    plannedEndTime?: string;
-    plannedStartTime?: string;
-    rideId?: string;
+    originEta?: Date;
     /**
-     * The time until which rides can be found. It's the planned time or else the desired time. 
+     * Planned Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
      */
-    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;
+    originPta?: Date;
+    rideId?: RideId;
+    rideOwner?: AccountOrTeamRef;
+    riderReview?: Review;
     /**
      * Derived from driveStatus != null
      */
     started?: boolean;
 }
 
-export interface RideBookerCommand extends RideCommand {
-}
-
-export interface RideBookerSeriesCommand extends RideSeriesCommand {
-}
-
 export interface RideCommand {
-    rideId?: string;
-}
-
-export interface RideDriverCommand extends RideCommand {
-}
-
-export interface RideDriverModifyCommand extends RideDriverCommand {
-}
-
-export interface RideDriverSeriesCommand extends RideSeriesPreConfirmCommand {
+    rideId?: RideId;
 }
 
 /**
@@ -1069,43 +913,47 @@ 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;
-    vehicleTypes?: { [P in VehicleType]?: number };
+}
+
+export interface RideId {
+    type?: Class<Ride>;
 }
 
 export interface RideIdResult {
-    rideId?: string;
+    rideId?: RideId;
 }
 
 /**
@@ -1117,6 +965,7 @@ export interface RideInfo {
     attendantsPresent?: number;
     comment?: string;
     dimensions?: PersonDimensions;
+    direction?: Direction;
     distanceInMeters?: number;
     from?: AddressInfo;
     /**
@@ -1126,25 +975,12 @@ export interface RideInfo {
     mobility?: Mobility;
     patient?: Person;
     plannedDuration?: RideDuration;
-    preferredDriver?: string;
-    purpose?: RidePurpose;
+    preferredDriver?: AccountId;
+    rideType?: RideType;
     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[];
@@ -1157,7 +993,7 @@ export interface RideLog {
     isSuperAdmin?: boolean;
     isToken?: boolean;
     superAdmin?: boolean;
-    timestamp?: string;
+    timestamp?: Date;
     token?: boolean;
 }
 
@@ -1165,67 +1001,17 @@ export interface RideOfferInfo {
     appointment?: Appointment;
 }
 
-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 RideSeriesUpdate {
-    after?: RideSeries;
-    before?: RideSeries;
-    entityId?: string;
-    eventType?: string;
-    index?: number;
-    timestamp?: string;
-    type: "rideseries";
+export interface RidePlannerCommand extends RideCommand {
 }
 
 export interface RideStatisticsQuery {
     dateRange?: DateRange;
-    timezoneOrDefault?: string;
-    zoneId?: string;
-}
-
-export interface RideSystemCommand extends RideCommand {
-}
-
-export interface RideUpcaster {
+    timezoneOrDefault?: ZoneId;
+    zoneId?: ZoneId;
 }
 
-export interface RideUpdate {
-    after?: Ride;
-    before?: Ride;
-    entityId?: string;
-    eventType?: string;
-    index?: number;
-    timestamp?: string;
-    type: "ride";
+export interface RideTypeSpecificFilter {
+    type: "ambulance" | "taxi";
 }
 
 export interface Role<T> {
@@ -1235,12 +1021,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?: string;
+    userId?: UserId;
 }
 
 export interface SendEmail {
@@ -1253,8 +1039,8 @@ export interface SendFreshdeskNewTicket {
 }
 
 export interface SendInvitationEmail {
-    accountIdOfInvite?: string;
-    userId?: string;
+    accountIdOfInvite?: AccountId;
+    userId?: UserId;
 }
 
 export interface SendSlack {
@@ -1262,12 +1048,7 @@ export interface SendSlack {
     message?: string;
 }
 
-/**
- * Information about a ride that is part of series.
- */
-export interface SeriesInfo {
-    returnTrip?: boolean;
-    rideSeriesId?: string;
+export interface Serializable {
 }
 
 export interface SetSettings extends AccountUpdate {
@@ -1277,16 +1058,21 @@ export interface SetSettings extends AccountUpdate {
 export interface SetUserPassword {
     confirmationCode?: string;
     password?: string;
-    userId?: string;
+    userId?: UserId;
 }
 
 export interface SetUserRole extends UserUpdate {
     role?: UserRole;
 }
 
+export interface Shape {
+    bounds?: Rectangle;
+    bounds2D?: Rectangle2D;
+}
+
 export interface SignInUser {
     password?: string;
-    userId?: string;
+    userId?: UserId;
 }
 
 export interface SignUpUser {
@@ -1294,20 +1080,7 @@ export interface SignUpUser {
     info?: UserInfo;
     inviteToken?: string;
     password?: string;
-    userId?: string;
-}
-
-/**
- * Individual ride timing within a series
- */
-export interface SingleRide {
-    desiredStartTime?: string;
-    returnTrip?: boolean;
-}
-
-export interface SingleRideUpdate {
-    desiredStartTime?: string;
-    rideId?: string;
+    userId?: UserId;
 }
 
 export interface StopImpersonatingUser {
@@ -1323,14 +1096,18 @@ export interface SubscriptionInfo extends TimedPermission {
     service?: Service;
 }
 
-export interface TaxiFilter extends DrivePermissionFilter {
+export interface TaxiFilter extends RideTypeSpecificFilter {
     allowedMobilities?: Mobility[];
     type: "taxi";
 }
 
 export interface Team {
     info?: TeamInfo;
-    teamId?: string;
+    teamId?: TeamId;
+}
+
+export interface TeamId {
+    type?: Class<Team>;
 }
 
 export interface TeamInfo {
@@ -1342,16 +1119,16 @@ export interface TeamInfo {
 
 export interface TeamPermission {
     roles?: TeamRole[];
-    teamId?: string;
+    teamId?: TeamId;
 }
 
 export interface TeamUpdate extends AccountUpdate {
-    teamId?: string;
+    teamId?: TeamId;
 }
 
 export interface TimeRange {
-    end?: string;
-    start?: string;
+    end?: Date;
+    start?: Date;
 }
 
 export interface TimedPermission {
@@ -1364,11 +1141,15 @@ export interface Token {
     info?: TokenInfo;
     lastUpdatedBy?: string;
     revoked?: boolean;
-    tokenId?: string;
+    tokenId?: TokenId;
 }
 
 export interface TokenCommand {
-    tokenId?: string;
+    tokenId?: TokenId;
+}
+
+export interface TokenId extends UserOrTokenId {
+    type?: Class<Token>;
 }
 
 export interface TokenInfo {
@@ -1380,6 +1161,20 @@ 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;
@@ -1390,24 +1185,9 @@ export interface UpdateAccountPermission extends AccountPermissionCommand {
     accountPermission?: AccountPermission;
 }
 
-export interface UpdatePosition {
-    clientSegment?: number[];
-    lastIndex?: number;
-    tokenId?: string;
-}
-
-export interface UpdateRide extends RideBookerCommand {
-    booker?: AccountOrTeamRef;
+export interface UpdateRideBooking extends RidePlannerCommand {
     info?: RideInfo;
-}
-
-export interface UpdateRidePlan extends RideDriverModifyCommand {
-    plannedStartTime?: string;
-}
-
-export interface UpdateRideSeries extends RideBookerSeriesCommand {
-    info?: GenericRideInfo;
-    rides?: SingleRide[];
+    owner?: AccountOrTeamRef;
 }
 
 export interface UpdateTeam extends TeamUpdate {
@@ -1423,16 +1203,17 @@ export interface UpdateUserInfo extends UserEdit {
     info?: UserInfo;
 }
 
-export interface UserAndTokenUpcaster {
-}
-
 export interface UserCommand {
-    userId?: string;
+    userId?: UserId;
 }
 
 export interface UserEdit extends UserUpdateAfterSignup {
 }
 
+export interface UserId extends UserOrTokenId {
+    type?: Class<UserProfile>;
+}
+
 export interface UserInfo {
     firstName?: string;
     language?: string;
@@ -1451,7 +1232,7 @@ export interface UserProfile {
     email?: string;
     emailConfirmed?: boolean;
     info?: UserInfo;
-    userId?: string;
+    userId?: UserId;
     userRole?: UserRole;
 }
 
@@ -1461,18 +1242,21 @@ 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 = "ridebooker" | "dispatcher" | "admin" | "owner";
+export type AccountRole = "rideplanner" | "driveplanner" | "admin" | "owner";
 
 export type AuthenticationResult = "SUCCESS" | "NOT_CONFIRMED";
 
-export type BookingStatus = "saved" | "booked" | "accepted" | "planned" | "started" | "completed" | "cancelled";
+export type BookingStatus = "saved" | "booked" | "accepted" | "started" | "completed" | "cancelled";
 
-export type DrivePermissionFilterUnion = AmbulanceFilter | TaxiFilter;
+export type Direction = "admission" | "relocation" | "discharge" | "consultation";
 
 export type DriveStatus = "driving_to_origin" | "arrived_at_origin" | "driving_to_destination" | "arrived_at_destination" | "completed";
 
@@ -1482,26 +1266,20 @@ export type InsuranceType = "public_insurance" | "private_insurance" | "german_a
 
 export type IntegrationType = "dispolive" | "celios";
 
-export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chair" | "stretcher";
+export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chair" | "lying_down";
 
-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 = "pro_medical" | "pro_fleet" | "celios_integration" | "dispolive_integration";
+export type Service = "rideplanning" | "driveplanning" | "celios_integration" | "dispolive_integration";
 
 export type SlackChannel = "admin_monitoring" | "admin_respond_immediately" | "admin_respond_within_hour" | "admin_reported_issues";
 
-export type StandaloneService = "pro_medical" | "pro_fleet";
+export type StandaloneService = "rideplanning" | "driveplanning";
 
 export type SyncStatus = "not_synced" | "synced" | "update_not_synced";
 
-export type TeamRole = "dispatcher" | "ridebooker";
-
-export type TrackingUpdateType = "ride" | "rideseries";
+export type TeamRole = "driveplanner" | "rideplanner";
 
 export type UserRole = "superadmin";
-
-export type VehicleType = "taxi" | "ambulance";

package/package.json

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