@fabriktor/fx 0.0.141 → 0.0.143

package/dist/src/routes/departure.d.ts

@@ -40,6 +40,7 @@ export declare function validateRoutePlanAddresses(readers: RoutePlanningReaders
     owner_id: string;
     input: InRoute;
     departure: RouteDepartureReference;
+    end?: RouteDepartureReference;
     current?: Route;
     signal?: AbortSignal;
 }): Promise<void>;

package/dist/src/routes/departure.js

@@ -68,20 +68,39 @@ export function validateRoutePlanLocation(location, owner_id, timezone) {
 // Re-read saved operational addresses before optimization. A queued draft must
 // not submit stale location ownership, Place IDs or address timezones.
 export async function validateRoutePlanAddresses(readers, opts) {
-    const { input, departure, current, signal } = opts;
-    if (departure.source === RouteDepartureSource.SavedRoute) {
-        if (!current ||
-            current.id !== departure.route_id ||
-            current.owner_id !== opts.owner_id ||
-            current.start_place_id !== input.start_place_id ||
-            current.timezone !== input.timezone)
-            throw new PreActionBlocked(RoutePlanningBlock.DepartureChanged);
-    }
-    else {
-        const saved = await loadRouteDeparture(readers, opts.owner_id, departure, signal);
-        if (saved.address.place_id !== input.start_place_id ||
-            addressTimezone(saved.address) !== input.timezone)
-            throw new PreActionBlocked(RoutePlanningBlock.DepartureChanged);
+    const { input, current, signal } = opts;
+    const endpoints = [
+        {
+            place: input.start_place_id,
+            reference: opts.departure,
+            saved: current?.start_place_id,
+        },
+        {
+            place: input.end_place_id,
+            reference: opts.end,
+            saved: current?.end_place_id,
+        },
+    ];
+    for (const { place, reference, saved } of endpoints) {
+        if (!place)
+            continue;
+        if (!reference)
+            throw new PreActionBlocked(RoutePlanningBlock.Departure);
+        if (reference.source === RouteDepartureSource.SavedRoute) {
+            // Returning to an unchanged saved departure also works on existing routes.
+            if (!current ||
+                current.id !== reference.route_id ||
+                current.owner_id !== opts.owner_id ||
+                current.timezone !== input.timezone ||
+                (place !== saved && place !== current.start_place_id))
+                throw new PreActionBlocked(RoutePlanningBlock.DepartureChanged);
+        }
+        else {
+            const endpoint = await loadRouteDeparture(readers, opts.owner_id, reference, signal);
+            if (endpoint.address.place_id !== place ||
+                addressTimezone(endpoint.address) !== input.timezone)
+                throw new PreActionBlocked(RoutePlanningBlock.DepartureChanged);
+        }
     }
     for (const destination of input.destinations) {
         const location = (await readers.jobs.findOneLocation({

package/dist/src/routes/planning.js

@@ -39,6 +39,7 @@ export function newRoutePlan(opts) {
         from: { ...opts.day, h: opts.company.work_day_start_hour, min: 0 },
         to: { ...opts.day, h: opts.company.work_day_end_hour, min: 0 },
         start_place_id: opts.start_place_id,
+        end_place_id: "",
         vehicles: [],
         destinations: [],
         consider_traffic: routePlanningDefaults.consider_traffic,

package/dist/src/routes/routes.d.ts

@@ -23,6 +23,7 @@ export type CreateRouteResult = CreateValidatedRouteResult;
 export type CreatePlannedRouteOptions = Omit<PrepareRouteOptions, "request"> & {
     attempt: MultiCreateAttempt;
     departure: RouteDepartureReference;
+    end?: RouteDepartureReference;
 };
 export type ReplaceRouteOptions = RouteReplaceOptions & {
     availability?: RPRoutesAvailability;
@@ -39,6 +40,7 @@ export type ReplacePlannedRouteOptions = RouteMutationOptions & {
     in: InRoute;
     days_ago: PrepareRouteOptions["days_ago"];
     departure: RouteDepartureReference;
+    end?: RouteDepartureReference;
 };
 export type CreateTagOptions = TagInsertOptions & Pick<MultiCreateCheckpoint, "before_request" | "on_created">;
 export type ReplaceTagOptions = TagReplaceOptions;

package/dist/src/routes/routes.js

@@ -60,6 +60,7 @@ export class RoutesFX {
                 owner_id: actor.owner_id,
                 input: opts.in,
                 departure: opts.departure,
+                end: opts.end,
                 signal: attempt.signal,
             });
         }
@@ -124,6 +125,9 @@ export class RoutesFX {
                 ...(opts.in.start_place_id !== undefined
                     ? { start_place_id: input.start_place_id }
                     : {}),
+                ...(opts.in.end_place_id !== undefined
+                    ? { end_place_id: input.end_place_id }
+                    : {}),
                 override_itinerary,
             },
         });
@@ -140,6 +144,7 @@ export class RoutesFX {
                 owner_id: opts.actor.owner_id,
                 input,
                 departure: opts.departure,
+                end: opts.end,
                 current,
                 signal: opts.signal,
             });
@@ -150,7 +155,7 @@ export class RoutesFX {
                 days_ago: opts.days_ago,
                 request: { signal: opts.signal },
             });
-            // Retain this route's own assignments, but never another route's.
+            // Repeated locations are allowed; employee conflicts remain enforced.
             validateRouteInput(input, availability, current.id);
             const result = await this.replaceRoute({
                 id: current.id,

package/dist/src/routes/validation.d.ts

@@ -6,6 +6,7 @@ export declare function routeInput(input: InRoute): InRoute;
 export declare function validateRouteInput(input: InRoute, availability?: RPRoutesAvailability, replacing_route_id?: string): void;
 export declare function validateRouteDestination(destination: InRoute["destinations"][number], window: WindowInput): void;
 export declare function availableRouteIDs(availability: RPRoutesAvailability, kind: keyof RPRoutesAvailability["availables"], replacing_route_id?: string): Set<string>;
+export declare function routeAssignmentsByEntity(assignments: RPRoutesAvailability["assignations"]["locations"], replacing_route_id?: string): Map<string, string[]>;
 export declare function validateClientAvailabilityInput(input: InClientAvailability): void;
 export declare function validateRouteTeamInput(input: InRouteTeam): void;
 export declare function normalizedTagInput(input: InTag): InTag;

package/dist/src/routes/validation.js

@@ -78,6 +78,7 @@ export function routeInput(input) {
             employee_ids: vehicle.employee_ids.map((id) => id.trim()),
         })),
         start_place_id: input.start_place_id.trim(),
+        end_place_id: input.end_place_id?.trim() ?? "",
         destinations: input.destinations.map((destination) => ({
             tags: normalizeRouteTags(destination.tags),
             location_id: destination.location_id.trim(),
@@ -165,10 +166,17 @@ export function validateRouteDestination(destination, window) {
         });
     }
 }
-// Editing may retain this route's assignments, but must not re-enable an ID
-// also assigned to another route. Availability is still a backend snapshot.
+// Locations may be visited on several routes. Employees stay exclusive for
+// the checked day; editing may retain only this route's employee assignments.
 export function availableRouteIDs(availability, kind, replacing_route_id) {
     const ids = new Set(normalizeIDs(availability.availables[kind]));
+    if (kind === "locations") {
+        for (const assignment of availability.assignations.locations) {
+            for (const id of normalizeIDs(assignment.entity_ids))
+                ids.add(id);
+        }
+        return ids;
+    }
     for (const assignment of availability.assignations[kind]) {
         if (assignment.route_id === replacing_route_id) {
             for (const id of normalizeIDs(assignment.entity_ids))
@@ -183,6 +191,23 @@ export function availableRouteIDs(availability, kind, replacing_route_id) {
     }
     return ids;
 }
+// Group the backend's existing route references for informational display.
+// Exclude the route being edited and count each route only once per entity.
+export function routeAssignmentsByEntity(assignments, replacing_route_id) {
+    const out = new Map();
+    for (const assignment of assignments) {
+        const routeID = resolvedID(assignment.route_id);
+        if (!routeID || routeID === replacing_route_id)
+            continue;
+        for (const entityID of normalizeIDs(assignment.entity_ids)) {
+            const routes = out.get(entityID) ?? [];
+            if (!routes.includes(routeID))
+                routes.push(routeID);
+            out.set(entityID, routes);
+        }
+    }
+    return out;
+}
 export function validateClientAvailabilityInput(input) {
     validateRouteTimeWindow(input);
     for (const field of ["employer_id", "location_id"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.141",
+  "version": "0.0.143",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,9 +17,9 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.98",
+    "@fabriktor/client": "0.0.99",
     "@fabriktor/fx": "0.0.94",
-    "@fabriktor/schema": "0.0.68",
+    "@fabriktor/schema": "0.0.69",
     "convert": "8.0.2"
   }
 }