@moxi.gmbh/moxi-typescriptmodels 0.1.1481-test-server → 0.1.1491-test-server

package/common.d.ts

@@ -1,9 +1,40 @@
 
+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 RideDriverSeriesCommand {
+export interface AcceptRideSeries extends SeriesDriverCommand {
     driver?: AccountOrTeamRef;
 }
 
@@ -189,23 +220,11 @@ export interface AuthenticationResponse {
 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;
 }
 
-export interface BookRideSeries extends RideBookerSeriesCommand {
-    booker?: AccountOrTeamRef;
+export interface BookRideSeries extends CreateSeriesCommand {
     info?: GenericRideInfo;
     rides?: SingleRide[];
 }
@@ -214,11 +233,8 @@ export interface CancelRide extends RideBookerCommand {
     reason?: string;
 }
 
-export interface CancelRideSeries extends RideBookerSeriesCommand {
-}
-
-export interface CancelRidesInSeries extends RideSeriesPostConfirmCommand {
-    updater?: AccountOrTeamRef;
+export interface CancelRideSeries extends SeriesBookerModifyCommand {
+    reason?: string;
 }
 
 export interface CeliosSettings {
@@ -278,17 +294,19 @@ export interface CreateOptimizationPlan extends OptimizerMessage {
 }
 
 export interface CreateRideCommand extends RideBookerCommand {
-    booker?: AccountOrTeamId;
+    booker?: AccountOrTeamRef;
 }
 
-export interface CreateRideFromSeries extends RideDriverCommand {
+export interface CreateRideFromSeries extends RideCommand {
+    bookedTime?: string;
     booker?: AccountOrTeamRef;
     driver?: AccountOrTeamRef;
     info?: RideInfo;
     seriesInfo?: SeriesInfo;
 }
 
-export interface CreateRidesFromSeries extends RideDriverSeriesCommand {
+export interface CreateSeriesCommand extends SeriesBookerCommand {
+    booker?: AccountOrTeamRef;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -434,42 +452,13 @@ export interface FindAccounts {
     term?: string;
 }
 
-/**
- * @deprecated
- */
-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 FindMyRideSeries {
-    accountId?: string;
-    descending?: boolean;
-    maxSize?: number;
-    term?: string;
-    timeRange?: InstantRange;
-}
-
-export interface FindMyRides {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindMySeries extends AbstractFindMyRides {
 }
 
 export interface FindMyTokens {
@@ -484,45 +473,27 @@ export interface FindMyUsers {
     term?: string;
 }
 
-export interface FindPotentialRideSeries {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideInfoFilter;
-    maxSize?: number;
+export interface FindRides extends AbstractFindRides {
 }
 
-/**
- * @deprecated
- */
-export interface FindPotentialRides {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeries extends AbstractFindRides {
 }
 
-export interface FindRides {
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeriesForDriver extends AbstractFindRidesForDriver {
 }
 
-export interface FindRidesForDriver {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeriesInMarketplace extends AbstractFindRidesInMarketplace {
 }
 
-export interface FindRidesInMarketplace {
-    accountId?: string;
-    descending?: boolean;
-    filter?: RideFilter;
-    maxSize?: number;
-    term?: string;
+export interface FindRidesAndSeriesResult {
+    ridesAndSeries?: RideOrSeriesUnion[];
+    ridesCount?: RideFilterCount;
+}
+
+export interface FindRidesForDriver extends AbstractFindRidesForDriver {
+}
+
+export interface FindRidesInMarketplace extends AbstractFindRidesInMarketplace {
 }
 
 export interface FindRidesResult {
@@ -530,6 +501,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;
 }
@@ -611,18 +591,6 @@ export interface GetAccountsOfPotentialDrivers extends IGetPotentialDrivers {
 export interface GetAccountsOfPotentialDriversAsAdmin extends IGetPotentialDrivers {
 }
 
-export interface GetAllRideSeriesForDriver {
-    accountId?: string;
-    descending?: boolean;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
-export interface GetAllRideSeriesInMarketplace {
-    accountId?: string;
-    maxSize?: number;
-}
-
 export interface GetDistrict {
     geoLocation?: GeoLocation;
     stateNutsCode?: string;
@@ -643,29 +611,17 @@ export interface GetIsoStates {
 export interface GetMonopolyAccounts {
 }
 
-/**
- * @deprecated
- */
-export interface GetMyAcceptedRides {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
 export interface GetMyAccounts {
     filter?: AccountFilter;
 }
 
-/**
- * @deprecated
- */
-export interface GetMyRideOffers {
+export interface GetMyRides {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetMyRides {
+export interface GetMySeries {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
@@ -680,6 +636,10 @@ export interface GetMyUserProfile {
 export interface GetNutsStates {
 }
 
+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.
 
@@ -706,15 +666,6 @@ export interface GetPotentialDriversAbstract {
     weightInKg?: number;
 }
 
-/**
- * @deprecated
- */
-export interface GetPotentialRides {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
 export interface GetRide {
     rideId?: string;
 }
@@ -734,29 +685,34 @@ export interface GetRideLog {
     rideId?: string;
 }
 
-export interface GetRideSeries {
-    rideSeriesId?: string;
+export interface GetRideOrSeries {
+    id?: string;
 }
 
-export interface GetRideSeriesForDriver {
+export interface GetRidesForDriver {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesForDriver {
+export interface GetRidesInMarketplace {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesInMarketplace {
+export interface GetSeriesForDriver {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesInSeries {
+export interface GetSeriesInMarketplace {
+    accountId?: string;
+    maxSize?: number;
+}
+
+export interface GetSplitRideSeries {
     filter?: RideFilter;
     rideSeriesId?: string;
 }
@@ -903,7 +859,7 @@ export interface ReadUpdates {
     maxSize?: number;
     maxTimeout?: number;
     tokenId?: string;
-    updateTypes?: TrackingUpdateType[];
+    updateTypes?: EntityType[];
 }
 
 export interface ReadUpdatesResult {
@@ -984,7 +940,7 @@ export interface ResetPosition {
 export interface ReturnRide extends RideDriverModifyCommand {
 }
 
-export interface ReturnRideSeries extends RideDriverSeriesCommand {
+export interface ReturnRideSeries extends SeriesDriverCommand {
 }
 
 export interface Review {
@@ -1014,7 +970,7 @@ export interface RevokeSubscription extends AccountUpdate {
 export interface RevokeToken extends TokenUpdate {
 }
 
-export interface Ride {
+export interface Ride extends RideOrSeries {
     /**
      * Derived from driver != null
      */
@@ -1052,6 +1008,7 @@ export interface Ride {
     driverReview?: Review;
     driverSyncStatus?: SyncStatus;
     endTimeDelay?: number;
+    entityType: "ride";
     /**
      * Expected Time of Arrival at the Destination/Drop-off location. 
      */
@@ -1090,9 +1047,6 @@ export interface Ride {
 export interface RideBookerCommand extends RideCommand {
 }
 
-export interface RideBookerSeriesCommand extends RideSeriesCommand {
-}
-
 export interface RideCommand {
     rideId?: string;
 }
@@ -1103,9 +1057,6 @@ export interface RideDriverCommand extends RideCommand {
 export interface RideDriverModifyCommand extends RideDriverCommand {
 }
 
-export interface RideDriverSeriesCommand extends RideSeriesPreConfirmCommand {
-}
-
 /**
  * All durations in seconds
  */
@@ -1121,6 +1072,7 @@ export interface RideFilter {
     driveStatuses?: DriveStatus[];
     driverAccountNames?: string[];
     driverTeamNames?: string[];
+    entityType?: EntityType;
     hasInfection?: boolean;
     heavyWeight?: boolean;
     mobilities?: Mobility[];
@@ -1160,38 +1112,8 @@ 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;
-    distanceInMeters?: number;
-    from?: AddressInfo;
-    /**
-     * Derived from weightInKg != null
-     */
-    heavyWeight?: boolean;
-    mobility?: Mobility;
-    patient?: Person;
-    plannedDuration?: RideDuration;
-    preferredDriver?: string;
-    purpose?: RidePurpose;
-    to?: AddressInfo;
-    vehicleType?: VehicleType;
-    weightInKg?: number;
-}
-
-export interface RideInfoFilter {
-    hasInfection?: boolean;
-    heavyWeight?: boolean;
-    mobilities?: Mobility[];
-    purposes?: RidePurpose[];
-    region?: Region;
-    requiresMonitoring?: boolean;
-    requiresOxygen?: boolean;
-    requiresSuctionAspirator?: boolean;
-    vehicleType?: VehicleType;
 }
 
 export interface RideLog {
@@ -1217,37 +1139,41 @@ export interface RideOfferInfo {
 export interface RideOperatorCommand extends RideCommand {
 }
 
-export interface RideSeries {
+export interface RideOrSeries {
+    entityType: "ride" | "rideseries";
+}
+
+/**
+ * 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;
+    /**
+     * Derived from bookedTime != null
+     */
     booked?: boolean;
+    bookedTime?: string;
     booker?: AccountOrTeamRef;
+    bookingStatus?: BookingStatus;
+    cancelReason?: string;
     cancelled?: boolean;
-    confirmed?: boolean;
     driver?: AccountOrTeamRef;
-    endTime?: string;
+    entityType: "rideseries";
     info?: GenericRideInfo;
     rideSeriesId?: string;
     rides?: SingleRide[];
-    startTime?: string;
-    status?: RideSeriesStatus;
-}
-
-export interface RideSeriesCommand {
-    rideSeriesId?: string;
+    searchEndTime?: string;
+    searchStartTime?: string;
+    split?: boolean;
 }
 
 export interface RideSeriesIdResult {
     rideSeriesId?: string;
 }
 
-export interface RideSeriesPostConfirmCommand {
-    rideSeriesId?: string;
-    ridesToModify?: Ride[];
-}
-
-export interface RideSeriesPreConfirmCommand extends RideSeriesCommand {
-}
-
 export interface RideSeriesUpdate {
     after?: RideSeries;
     before?: RideSeries;
@@ -1279,17 +1205,21 @@ export interface RideUpdate {
     type: "ride";
 }
 
-export interface Role<T> {
+export interface Role {
 }
 
 /**
  * Save a new ride or update a previously saved ride. Not allowed to saveRide after the ride has been booked. 
  */
 export interface SaveRide extends CreateRideCommand {
-    booker?: AccountOrTeamRef;
     info?: RideInfo;
 }
 
+export interface SaveRideSeries extends CreateSeriesCommand {
+    info?: GenericRideInfo;
+    rides?: SingleRide[];
+}
+
 export interface SendConfirmationEmail {
     userId?: string;
 }
@@ -1314,12 +1244,27 @@ export interface SendSlack {
     message?: string;
 }
 
+export interface SeriesBookerCommand extends SeriesCommand {
+}
+
+export interface SeriesBookerModifyCommand extends SeriesBookerCommand {
+}
+
+export interface SeriesCommand {
+    rideSeriesId?: string;
+}
+
+export interface SeriesDriverCommand extends SeriesCommand {
+}
+
 /**
  * Information about a ride that is part of series.
  */
 export interface SeriesInfo {
+    positionInSeries?: number;
     returnTrip?: boolean;
     rideSeriesId?: string;
+    totalRidesInSeries?: number;
 }
 
 export interface SetOperateAccounts extends AccountUpdate {
@@ -1358,16 +1303,15 @@ export interface SignUpUser {
 }
 
 /**
- * Individual ride timing within a series
+ * Individual ride timing within a series. Once a ride series is split, you cannot add rides, only remove
  */
 export interface SingleRide {
     desiredStartTime?: string;
     returnTrip?: boolean;
+    rideId?: string;
 }
 
-export interface SingleRideUpdate {
-    desiredStartTime?: string;
-    rideId?: string;
+export interface SplitRideSeries extends SeriesDriverCommand {
 }
 
 export interface StopImpersonatingUser {
@@ -1465,7 +1409,8 @@ export interface UpdateRidePlan extends RideDriverModifyCommand {
     plannedStartTime?: string;
 }
 
-export interface UpdateRideSeries extends RideBookerSeriesCommand {
+export interface UpdateRideSeries extends SeriesBookerModifyCommand {
+    booker?: AccountOrTeamRef;
     info?: GenericRideInfo;
     rides?: SingleRide[];
 }
@@ -1536,6 +1481,8 @@ 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";
@@ -1546,11 +1493,11 @@ export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chai
 
 export type OrganisationType = "medical" | "fleet" | "operator";
 
-export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
+export type RideOrSeriesUnion = Ride | RideSeries;
 
-export type RideSeriesStatus = "booked" | "accepted" | "confirmed" | "cancelled";
+export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
-export type Service = "pro_medical" | "pro_fleet" | "pro_operator" | "celios_integration" | "dispolive_integration";
+export type Service = "pro_medical" | "pro_fleet" | "pro_operator" | "celios_integration" | "dispolive_integration" | "ride_series";
 
 export type SlackChannel = "admin_monitoring" | "admin_respond_immediately" | "admin_respond_within_hour" | "admin_reported_issues";
 
@@ -1560,8 +1507,6 @@ export type SyncStatus = "not_synced" | "synced" | "update_not_synced";
 
 export type TeamRole = "dispatcher" | "ridebooker";
 
-export type TrackingUpdateType = "ride" | "rideseries";
-
 export type UserRole = "superadmin";
 
 export type VehicleType = "taxi" | "ambulance";

package/package.json

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