@moxi.gmbh/moxi-typescriptmodels 0.1.1321-test-server → 0.1.1351-test-server

package/common.d.ts

@@ -3,8 +3,8 @@ export interface AcceptRide extends RideDriverCommand {
     driver?: AccountOrTeamRef;
 }
 
-export interface AcceptRideSeries extends RideDriverSeriesCommand {
-    dispatcher?: AccountOrTeamRef;
+export interface AcceptRideSeries extends SeriesDriverCommand {
+    driver?: AccountOrTeamRef;
 }
 
 export interface AcceptUserAgreement extends UserEdit {
@@ -183,22 +183,12 @@ 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 {
+export interface BookRideSeries extends SeriesBookerCommand {
     booker?: AccountOrTeamRef;
     info?: GenericRideInfo;
     rides?: SingleRide[];
@@ -208,10 +198,8 @@ export interface CancelRide extends RideBookerCommand {
     reason?: string;
 }
 
-export interface CancelRideSeries extends RideBookerSeriesCommand {
-}
-
-export interface CancelRidesInSeries extends RideSeriesPostConfirmCommand {
+export interface CancelRideSeries extends SeriesBookerModifyCommand {
+    reason?: string;
 }
 
 export interface CeliosSettings {
@@ -274,16 +262,14 @@ export interface CreateRideCommand extends RideBookerCommand {
     booker?: AccountOrTeamId;
 }
 
-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 CreateSqueezeInPlan extends OptimizerMessage {
     accountOrTeam?: AccountOrTeamRef;
 }
@@ -427,10 +413,7 @@ export interface FindAccounts {
     term?: string;
 }
 
-/**
- * @deprecated
- */
-export interface FindMyAcceptedRides {
+export interface FindMyRides {
     accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
@@ -438,10 +421,7 @@ export interface FindMyAcceptedRides {
     term?: string;
 }
 
-/**
- * @deprecated
- */
-export interface FindMyRideOffers {
+export interface FindMyRidesAndSeries {
     accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
@@ -449,15 +429,7 @@ export interface FindMyRideOffers {
     term?: string;
 }
 
-export interface FindMyRideSeries {
-    accountId?: string;
-    descending?: boolean;
-    maxSize?: number;
-    term?: string;
-    timeRange?: InstantRange;
-}
-
-export interface FindMyRides {
+export interface FindMySeries {
     accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
@@ -477,17 +449,21 @@ export interface FindMyUsers {
     term?: string;
 }
 
-export interface FindPotentialRideSeries {
-    accountId?: string;
+export interface FindRides {
     descending?: boolean;
-    filter?: RideInfoFilter;
+    filter?: RideFilter;
     maxSize?: number;
+    term?: string;
 }
 
-/**
- * @deprecated
- */
-export interface FindPotentialRides {
+export interface FindRidesAndSeries {
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface FindRidesAndSeriesForDriver {
     accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
@@ -495,13 +471,19 @@ export interface FindPotentialRides {
     term?: string;
 }
 
-export interface FindRides {
+export interface FindRidesAndSeriesInMarketplace {
+    accountId?: string;
     descending?: boolean;
     filter?: RideFilter;
     maxSize?: number;
     term?: string;
 }
 
+export interface FindRidesAndSeriesResult {
+    ridesAndSeries?: RideOrSeriesUnion[];
+    ridesCount?: RideFilterCount;
+}
+
 export interface FindRidesForDriver {
     accountId?: string;
     descending?: boolean;
@@ -523,6 +505,29 @@ export interface FindRidesResult {
     rides?: Ride[];
 }
 
+export interface FindSeries {
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface FindSeriesForDriver {
+    accountId?: string;
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
+export interface FindSeriesInMarketplace {
+    accountId?: string;
+    descending?: boolean;
+    filter?: RideFilter;
+    maxSize?: number;
+    term?: string;
+}
+
 export interface FindTokens {
     term?: string;
 }
@@ -598,18 +603,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;
@@ -630,29 +623,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;
@@ -667,6 +648,10 @@ export interface GetMyUserProfile {
 export interface GetNutsStates {
 }
 
+export interface GetOneSeries {
+    rideSeriesId?: string;
+}
+
 export interface GetPotentialDrivers {
     fromDistrict?: string;
     mobility?: Mobility;
@@ -675,15 +660,6 @@ export interface GetPotentialDrivers {
     weightInKg?: number;
 }
 
-/**
- * @deprecated
- */
-export interface GetPotentialRides {
-    accountId?: string;
-    maxSize?: number;
-    timeRange?: InstantRange;
-}
-
 export interface GetRide {
     rideId?: string;
 }
@@ -703,29 +679,30 @@ export interface GetRideLog {
     rideId?: string;
 }
 
-export interface GetRideSeries {
-    rideSeriesId?: string;
+export interface GetRidesForDriver {
+    accountId?: string;
+    maxSize?: number;
+    timeRange?: InstantRange;
 }
 
-export interface GetRideSeriesForDriver {
+export interface GetRidesInMarketplace {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesForDriver {
+export interface GetSeriesForDriver {
     accountId?: string;
     maxSize?: number;
     timeRange?: InstantRange;
 }
 
-export interface GetRidesInMarketplace {
+export interface GetSeriesInMarketplace {
     accountId?: string;
     maxSize?: number;
-    timeRange?: InstantRange;
 }
 
-export interface GetRidesInSeries {
+export interface GetSplitRideSeries {
     filter?: RideFilter;
     rideSeriesId?: string;
 }
@@ -864,7 +841,7 @@ export interface ReadUpdates {
     maxSize?: number;
     maxTimeout?: number;
     tokenId?: string;
-    updateTypes?: TrackingUpdateType[];
+    updateTypes?: EntityType[];
 }
 
 export interface ReadUpdatesResult {
@@ -945,7 +922,7 @@ export interface ResetPosition {
 export interface ReturnRide extends RideDriverModifyCommand {
 }
 
-export interface ReturnRideSeries extends RideDriverSeriesCommand {
+export interface ReturnRideSeries extends SeriesDriverCommand {
 }
 
 export interface Review {
@@ -975,7 +952,7 @@ export interface RevokeSubscription extends AccountUpdate {
 export interface RevokeToken extends TokenUpdate {
 }
 
-export interface Ride {
+export interface Ride extends RideOrSeries {
     /**
      * Derived from driver != null
      */
@@ -1013,6 +990,7 @@ export interface Ride {
     driverReview?: Review;
     driverSyncStatus?: SyncStatus;
     endTimeDelay?: number;
+    entityType: "ride";
     /**
      * Expected Time of Arrival at the Destination/Drop-off location. 
      */
@@ -1051,9 +1029,6 @@ export interface Ride {
 export interface RideBookerCommand extends RideCommand {
 }
 
-export interface RideBookerSeriesCommand extends RideSeriesCommand {
-}
-
 export interface RideCommand {
     rideId?: string;
 }
@@ -1064,9 +1039,6 @@ export interface RideDriverCommand extends RideCommand {
 export interface RideDriverModifyCommand extends RideDriverCommand {
 }
 
-export interface RideDriverSeriesCommand extends RideSeriesPreConfirmCommand {
-}
-
 /**
  * All durations in seconds
  */
@@ -1143,18 +1115,6 @@ export interface RideInfo {
     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[];
@@ -1175,37 +1135,41 @@ export interface RideOfferInfo {
     appointment?: Appointment;
 }
 
-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;
@@ -1248,6 +1212,12 @@ export interface SaveRide extends CreateRideCommand {
     info?: RideInfo;
 }
 
+export interface SaveRideSeries extends SeriesBookerCommand {
+    booker?: AccountOrTeamRef;
+    info?: GenericRideInfo;
+    rides?: SingleRide[];
+}
+
 export interface SendConfirmationEmail {
     userId?: string;
 }
@@ -1271,6 +1241,19 @@ 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.
  */
@@ -1307,16 +1290,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 {
@@ -1406,7 +1388,6 @@ export interface UpdatePosition {
 }
 
 export interface UpdateRide extends RideBookerCommand {
-    booker?: AccountOrTeamRef;
     info?: RideInfo;
 }
 
@@ -1414,7 +1395,7 @@ export interface UpdateRidePlan extends RideDriverModifyCommand {
     plannedStartTime?: string;
 }
 
-export interface UpdateRideSeries extends RideBookerSeriesCommand {
+export interface UpdateRideSeries extends SeriesBookerModifyCommand {
     info?: GenericRideInfo;
     rides?: SingleRide[];
 }
@@ -1485,6 +1466,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";
@@ -1495,9 +1478,9 @@ export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chai
 
 export type OrganisationType = "medical" | "fleet";
 
-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" | "celios_integration" | "dispolive_integration" | "ride_series";
 
@@ -1509,8 +1492,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.1321-test-server",
+  "version": "0.1.1351-test-server",
   "types": "common.d.ts"
 }