@fabriktor/fx 0.0.72 → 0.0.73

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

@@ -57,7 +57,7 @@ export type CreateJobProgramResult = {
 } | {
     mode: typeof JobProgramCreateMode.Immediate;
 };
-export type FindLocationOverlapsInput = Pick<LocationInsert, "y" | "m" | "d" | "h" | "min" | "tz" | "end_date">;
+export type FindLocationOverlapsInput = Pick<LocationInsert, "y" | "m" | "d" | "h" | "min" | "tz" | "end_date" | "lat" | "lon">;
 export type FindLocationOverlapsOptions = {
     in: FindLocationOverlapsInput;
     source_id?: string;

package/dist/src/jobs/jobs.js

@@ -19,9 +19,8 @@ const msgProgramStartPast = "Program start date must not be in the past.";
 const msgJobStartOutsideLocation = "Job start date must fall within the parent location time span.";
 const msgProgramStartOutsideLocation = "Program job start date must fall within the parent location time span.";
 const msgLocationMemberAssigned = "Cannot remove a location member while they are assigned to a non-terminated job in that location.";
-const msgDateInvalid = "Date contains an invalid UTC value.";
 const msgLocationRangeInvalid = "Location contains an invalid scheduled time span.";
-const msgTimezoneInvalid = "Program timezone is invalid.";
+const msgTimezoneInvalid = "Location timezone is invalid.";
 const resourceLocation = "location";
 const resourceJobProgram = "job_program";
 const resourceJob = "job";
@@ -119,9 +118,11 @@ export class JobsFX {
             field: "in",
             msg: msgJobMembersOutsideLocation,
         });
-        validateJobStart(opts, this.now());
+        const timezone = locationTimezone(opts.location, "location");
         const input = {
             ...opts.in,
+            tz: timezone,
+            timezone,
             status: opts.start_immediately ? Started : Pending,
             is_active: opts.start_immediately,
             auto_start: opts.start_immediately ? true : opts.auto_start,
@@ -131,6 +132,12 @@ export class JobsFX {
             location_id,
             recurrent: false,
         };
+        validateJobStart({
+            input,
+            location: opts.location,
+            now: this.now(),
+            start_immediately: opts.start_immediately,
+        });
         return await this.jobs.insertOneJob({
             in: input,
         });
@@ -158,8 +165,18 @@ export class JobsFX {
             field: "in",
             msg: msgProgramMembersOutsideLocation,
         });
+        const timezone = locationTimezone(opts.location, "location");
         const input = {
             ...opts.in,
+            timezone,
+            job_start_date: {
+                ...opts.in.job_start_date,
+                tz: timezone,
+            },
+            recurrence_end_date: {
+                ...opts.in.recurrence_end_date,
+                tz: timezone,
+            },
             job_current_members,
             job_foremen,
             job_location_id,
@@ -189,6 +206,8 @@ export class JobsFX {
     }
     async findLocationOverlaps(opts) {
         const input = {
+            lat: opts.in.lat,
+            lon: opts.in.lon,
             start_date: {
                 y: opts.in.y,
                 m: opts.in.m,
@@ -420,31 +439,44 @@ function validateLocationMembers(opts) {
         });
     }
 }
-function validateJobStart(opts, now) {
-    const start_ms = utcMilliseconds(opts.in.utc, "in");
-    if (!opts.start_immediately && start_ms < now.getTime()) {
+function validateJobStart(opts) {
+    const now = localDateParts(opts.now, opts.input.timezone);
+    if (now === undefined) {
+        throw errValidation({
+            field: "in",
+            msg: msgTimezoneInvalid,
+        });
+    }
+    if (!opts.start_immediately && compareLocalDate(opts.input, now) < 0) {
         throw errValidation({
             field: "in",
             msg: msgJobStartPast,
         });
     }
     validateLocationStart({
-        start_ms,
+        start: opts.input,
         location: opts.location,
         field: "in",
         msg: msgJobStartOutsideLocation,
     });
 }
 function validateProgramStart(opts) {
-    const start_ms = utcMilliseconds(opts.input.job_start_date.utc, "in");
-    if (!opts.current_day && start_ms < opts.now.getTime()) {
+    const now = localDateParts(opts.now, opts.input.timezone);
+    if (now === undefined) {
+        throw errValidation({
+            field: "in",
+            msg: msgTimezoneInvalid,
+        });
+    }
+    if (!opts.current_day &&
+        compareLocalDate(opts.input.job_start_date, now) < 0) {
         throw errValidation({
             field: "in",
             msg: msgProgramStartPast,
         });
     }
     validateLocationStart({
-        start_ms,
+        start: opts.input.job_start_date,
         location: opts.location,
         field: "in",
         msg: msgProgramStartOutsideLocation,
@@ -454,17 +486,16 @@ function validateLocationStart(opts) {
     if (opts.location.type === LocationTypePersistent) {
         return;
     }
-    const location_start_ms = parsedUTC(opts.location.utc);
-    const location_end_ms = parsedUTC(opts.location.end_date.utc);
-    if (location_start_ms === undefined ||
-        location_end_ms === undefined ||
-        location_end_ms < location_start_ms) {
+    const start = localDateFromLocation(opts.location);
+    const end = opts.location.end_date;
+    if (compareLocalDate(end, start) < 0) {
         throw errValidation({
             field: opts.field,
             msg: msgLocationRangeInvalid,
         });
     }
-    if (opts.start_ms < location_start_ms || opts.start_ms > location_end_ms) {
+    if (compareLocalDate(opts.start, start) < 0 ||
+        compareLocalDate(opts.start, end) > 0) {
         throw errValidation({
             field: opts.field,
             msg: opts.msg,
@@ -472,7 +503,7 @@ function validateLocationStart(opts) {
     }
 }
 function isCurrentProgramDay(input, now) {
-    const day = localDayParts(now, input.timezone);
+    const day = localDateParts(now, input.timezone);
     if (day === undefined) {
         throw errValidation({
             field: "in",
@@ -483,7 +514,26 @@ function isCurrentProgramDay(input, now) {
         input.job_start_date.m === day.m &&
         input.job_start_date.d === day.d);
 }
-function localDayParts(now, timezone) {
+function locationTimezone(location, field) {
+    const out = location.address_timezone.trim();
+    if (out === "") {
+        throw errValidation({
+            field,
+            msg: msgTimezoneInvalid,
+        });
+    }
+    return out;
+}
+function localDateFromLocation(location) {
+    return {
+        y: location.y,
+        m: location.m,
+        d: location.d,
+        h: location.h,
+        min: location.min,
+    };
+}
+function localDateParts(now, timezone) {
     const time_zone = timezone.trim();
     if (time_zone === "") {
         return undefined;
@@ -495,6 +545,9 @@ function localDayParts(now, timezone) {
             year: "numeric",
             month: "numeric",
             day: "numeric",
+            hour: "numeric",
+            minute: "numeric",
+            hourCycle: "h23",
         }).formatToParts(now);
     }
     catch {
@@ -503,15 +556,40 @@ function localDayParts(now, timezone) {
     const y = datePart(parts, "year");
     const m = datePart(parts, "month");
     const d = datePart(parts, "day");
-    if (y === undefined || m === undefined || d === undefined) {
+    const h = datePart(parts, "hour");
+    const min = datePart(parts, "minute");
+    if (y === undefined ||
+        m === undefined ||
+        d === undefined ||
+        h === undefined ||
+        min === undefined) {
         return undefined;
     }
     return {
         y,
         m,
         d,
+        h,
+        min,
     };
 }
+function compareLocalDate(a, b) {
+    for (const [left, right] of [
+        [a.y, b.y],
+        [a.m, b.m],
+        [a.d, b.d],
+        [a.h, b.h],
+        [a.min, b.min],
+    ]) {
+        if (left < right) {
+            return -1;
+        }
+        if (left > right) {
+            return 1;
+        }
+    }
+    return 0;
+}
 function datePart(parts, type) {
     const raw = parts.find((part) => part.type === type)?.value;
     if (raw === undefined) {
@@ -523,27 +601,6 @@ function datePart(parts, type) {
     }
     return out;
 }
-function utcMilliseconds(v, field) {
-    const out = parsedUTC(v);
-    if (out === undefined) {
-        throw errValidation({
-            field,
-            msg: msgDateInvalid,
-        });
-    }
-    return out;
-}
-function parsedUTC(v) {
-    const raw = v.trim();
-    if (raw === "") {
-        return undefined;
-    }
-    const out = globalThis.Date.parse(raw);
-    if (!Number.isFinite(out)) {
-        return undefined;
-    }
-    return out;
-}
 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.72",
+  "version": "0.0.73",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.65",
-    "@fabriktor/schema": "0.0.47"
+    "@fabriktor/client": "0.0.67",
+    "@fabriktor/schema": "0.0.49"
   }
 }