@moxi.gmbh/moxi-typescriptmodels 0.1.1791-test-server → 0.1.1801-test-server

package/common.d.ts

@@ -182,16 +182,15 @@ export interface AmbulanceInfo {
 }
 
 /**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
+ * Information about the ride, from the creator of the ride
  */
-export interface AnonymizedGenericRideInfo extends GenericRideInfo {
+export interface AnonymizedRideInfo extends RideInfo {
 }
 
 /**
  * Information about the ride, from the creator of the ride
  */
-export interface AnonymizedRideInfo extends RideInfo {
+export interface AnonymizedSeriesRideInfo extends SeriesRideInfo {
 }
 
 export interface Appointment {
@@ -311,7 +310,7 @@ export interface CreateRideCommand extends RideBookerCommand {
 
 export interface CreateSeriesCommand extends SeriesBookerCommand {
     booker?: AccountOrTeamRef;
-    info?: GenericRideInfo;
+    info?: SeriesRideInfo;
 }
 
 export interface CreateSqueezeInPlan extends OptimizerMessage {
@@ -490,7 +489,7 @@ export interface FindRidesAndSeriesInMarketplace extends AbstractFindRidesInMark
 }
 
 export interface FindRidesAndSeriesResult {
-    ridesAndSeries?: RideOrSeries[];
+    ridesAndSeries?: RideOrMinimizedSeries[];
     ridesCount?: RideFilterCount;
 }
 
@@ -552,7 +551,6 @@ export interface GenericRideInfo {
     patient?: Person;
     plannedDuration?: RideDuration;
     preferredDriver?: string;
-    purpose?: RidePurpose;
     to?: AddressInfo;
     vehicleType?: VehicleType;
     weightInKg?: number;
@@ -816,7 +814,8 @@ export interface Metric {
 /**
  * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
  */
-export interface MinimizedRideSeries extends RideSeries {
+export interface MinimizedRideSeries extends RideSeries, RideOrMinimizedSeries {
+    info?: SeriesRideInfo;
 }
 
 export interface NutsDistrict {
@@ -999,7 +998,7 @@ export interface RevokeSubscription extends AccountUpdate {
 export interface RevokeToken extends TokenUpdate {
 }
 
-export interface Ride extends RideOrSeries {
+export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     /**
      * Derived from driver != null
      */
@@ -1142,6 +1141,7 @@ export interface RideIdResult {
  */
 export interface RideInfo extends GenericRideInfo {
     appointment?: Appointment;
+    purpose?: RidePurpose;
 }
 
 export interface RideLog {
@@ -1163,6 +1163,12 @@ export interface RideLog {
 export interface RideOperatorCommand extends RideCommand {
 }
 
+export interface RideOrMinimizedSeries {
+    bookingStatus?: BookingStatus;
+    entityType?: EntityType;
+    info?: GenericRideInfo;
+}
+
 export interface RideOrSeries {
     bookingStatus?: BookingStatus;
     entityType?: EntityType;
@@ -1187,6 +1193,7 @@ export interface RideSeries extends RideOrSeries {
     cancelReason?: string;
     cancelled?: boolean;
     driver?: AccountOrTeamRef;
+    info?: SeriesRideInfo;
     rideSeriesId?: string;
     rides?: Ride[];
     ridesSummaries?: RideSummary[];
@@ -1311,6 +1318,13 @@ export interface SeriesInfo {
 export interface SeriesOperatorCommand extends SeriesCommand {
 }
 
+/**
+ * Information about the ride, from the creator of the ride
+ */
+export interface SeriesRideInfo extends GenericRideInfo {
+    purpose?: SeriesPurpose;
+}
+
 export interface SetOperations extends AccountUpdate {
     operateAccounts?: string[];
 }
@@ -1448,7 +1462,7 @@ export interface UpdateRidePlan extends RideDriverModifyCommand {
 
 export interface UpdateRideSeries extends SeriesCommandWithSeparateEvent {
     booker?: AccountOrTeamRef;
-    info?: GenericRideInfo;
+    info?: SeriesRideInfo;
     rideSummaries?: RideSummary[];
 }
 
@@ -1456,7 +1470,7 @@ export interface UpdateRideSeriesEvent extends SeriesBookerCommand {
     addRides?: string[];
     booker?: AccountOrTeamRef;
     cancelRides?: string[];
-    info?: GenericRideInfo;
+    info?: SeriesRideInfo;
     rideSummaries?: RideSummary[];
     updateRides?: string[];
 }
@@ -1541,6 +1555,8 @@ export type OrganisationType = "medical" | "fleet" | "operator";
 
 export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
+export type SeriesPurpose = "consultation";
+
 export type Service = "pro_medical" | "pro_fleet" | "pro_operator" | "celios_integration" | "dispolive_integration" | "moxi_operations";
 
 export type SlackChannel = "admin_monitoring" | "admin_respond_immediately" | "admin_respond_within_hour" | "admin_reported_issues";

package/package.json

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