@fabriktor/fx 0.0.73 → 0.0.76

package/dist/src/jobs/jobs.d.ts

@@ -74,6 +74,10 @@ export type RemoveJobMemberOptions = {
     job: Job;
     member_id: string;
 };
+export type UpdateOperationalLocationOptions = {
+    location: Location;
+    in: CreateOperationalLocationInput;
+};
 export type SetLocationMembersOptions = {
     location: Location;
     current_members: string[];
@@ -110,6 +114,7 @@ export interface JobsFXOperator {
     createJobProgram(opts: CreateJobProgramOptions): Promise<CreateJobProgramResult>;
     createLocationJobProgram(opts: CreateJobProgramOptions): Promise<CreateLocationJobProgramResult>;
     findLocationOverlaps(opts: FindLocationOverlapsOptions): Promise<OperationResultOf<RPJobsFindOverlaps>>;
+    updateOperationalLocation(opts: UpdateOperationalLocationOptions): Promise<Location>;
     addJobForeman(opts: AddJobForemanOptions): Promise<OperationResult>;
     removeJobMember(opts: RemoveJobMemberOptions): Promise<OperationResult>;
     setLocationMembers(opts: SetLocationMembersOptions): Promise<OperationResult>;
@@ -139,8 +144,10 @@ export declare class JobsFX implements JobsFXOperator {
     findLocationOverlaps(opts: FindLocationOverlapsOptions): Promise<OperationResultOf<RPJobsFindOverlaps>>;
     addJobForeman(opts: AddJobForemanOptions): Promise<OperationResult>;
     removeJobMember(opts: RemoveJobMemberOptions): Promise<OperationResult>;
+    updateOperationalLocation(opts: UpdateOperationalLocationOptions): Promise<Location>;
     setLocationMembers(opts: SetLocationMembersOptions): Promise<OperationResult>;
     setJobMembers(opts: SetJobMembersOptions): Promise<OperationResult>;
+    private validateLocationMemberRemoval;
     jobLifecycleControls(opts: JobLifecycleControlsOptions): JobLifecycleControls;
     startJob(opts: JobLifecycleOptions): Promise<Job>;
     terminateJob(opts: JobLifecycleOptions): Promise<Job>;

package/dist/src/jobs/jobs.js

@@ -279,30 +279,29 @@ export class JobsFX {
             },
         });
     }
+    async updateOperationalLocation(opts) {
+        const id = requiredID(opts.location.id, "location", msgLocationIDRequired);
+        const current_members = normalizeIDs(opts.in.current_members);
+        await this.validateLocationMemberRemoval({
+            location: opts.location,
+            current_members,
+        });
+        return await this.replaceLocation({
+            id,
+            in: {
+                ...opts.in,
+                ...locationAddressInput(opts.location),
+                current_members,
+            },
+        });
+    }
     async setLocationMembers(opts) {
         const id = requiredID(opts.location.id, "location", msgLocationIDRequired);
         const current_members = normalizeIDs(opts.current_members);
-        const next = new Set(current_members);
-        const removed = normalizeIDs(opts.location.current_members).filter((member_id) => !next.has(member_id));
-        if (removed.length > 0) {
-            const out = await this.jobs.queryJobs({
-                query: {
-                    location_id: id,
-                },
-            });
-            const removed_set = new Set(removed);
-            for (const job of out.value ?? []) {
-                if (job.status === Terminated) {
-                    continue;
-                }
-                if (normalizeIDs(job.current_members).some((member_id) => removed_set.has(member_id))) {
-                    throw errValidation({
-                        field: "current_members",
-                        msg: msgLocationMemberAssigned,
-                    });
-                }
-            }
-        }
+        await this.validateLocationMemberRemoval({
+            location: opts.location,
+            current_members,
+        });
         return await this.jobs.replaceOneLocation({
             id,
             in: {
@@ -335,6 +334,32 @@ export class JobsFX {
             },
         });
     }
+    async validateLocationMemberRemoval(opts) {
+        const id = opts.location.id.trim();
+        const next = new Set(opts.current_members);
+        const removed = normalizeIDs(opts.location.current_members).filter((member_id) => !next.has(member_id));
+        if (removed.length === 0) {
+            return;
+        }
+        const out = await this.jobs.queryJobs({
+            query: {
+                owner_id: opts.location.owner_id,
+                location_id: id,
+            },
+        });
+        const removed_set = new Set(removed);
+        for (const job of out.value ?? []) {
+            if (job.status === Terminated) {
+                continue;
+            }
+            if (normalizeIDs(job.current_members).some((member_id) => removed_set.has(member_id))) {
+                throw errValidation({
+                    field: "current_members",
+                    msg: msgLocationMemberAssigned,
+                });
+            }
+        }
+    }
     jobLifecycleControls(opts) {
         const actor_id = requiredID(opts.actor_id, "actor_id", msgMemberIDRequired);
         const can_manage = opts.job.owner_id === actor_id ||
@@ -601,6 +626,21 @@ function datePart(parts, type) {
     }
     return out;
 }
+function locationAddressInput(location) {
+    return {
+        address_timezone: location.address_timezone,
+        lat: location.lat,
+        lon: location.lon,
+        street: location.street,
+        city: location.city,
+        state: location.state,
+        postal_code: location.postal_code,
+        country: location.country,
+        formatted_address: location.formatted_address,
+        place_name: location.place_name,
+        place_id: location.place_id,
+    };
+}
 function requiredID(v, field, msg) {
     const out = resolvedID(v);
     if (out === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.73",
+  "version": "0.0.76",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {