16ad0955f2
Deploy to route.crispygoat.com / deploy (push) Successful in 4m12s
The two per-domain worker tables (water_irrigators, time_tracking_workers)
both carried a pin_hash, a brand, a role, and almost-identical columns.
Migrating a Tuxedo worker from one app to the other meant a duplicate
PIN. Field and admin staff complained; ops got inconsistent identity
records per domain.
Unify into a single field_workers table. Cycle 10 migration
0097_field_workers.sql:
- creates field_workers (id, brand_id, name, pin_hash, role with CHECK
IN ('worker','time_admin','irrigator','water_admin'),
language_preference, phone, notes, active, last_used_at, …)
- adds brand-scoped RLS, brand index, active index
- nullable field_worker_id on downstream tables, backfilled via
UPDATE … FROM, NULL count verified with RAISE EXCEPTION before
SET NOT NULL
- drops the two old tables and renames FK columns
(irrigator_id → field_worker_id, worker_id → field_worker_id)
- reissues the one-open-clock-in partial unique index against
field_worker_id
Application surface:
- All actions/services now read/write fieldWorkers. Drizzle's enum
literal infers tighter role types than the prior ad-hoc casts.
- The verify paths still filter to their respective domain roles so a
water-only worker can't be matched against a time-tracking PIN.
- API surface preserved: action function names didn't change.
- Seed file updated so QA reseeds work post-deploy.
Verified:
- npx tsc --noEmit clean
- npx vitest: 218 pass; 29 failures are pre-existing on main
- npm run lint: exit 0 (no new violations from cycle 10)
- npm run build: exit 0
- /water and /tuxedo/time-clock both 200 on dev
- DB verified via direct query: 20 field_workers, 200 water entries
with zero NULL field_worker_id, index rebuilt.
PR-reviewer: APPROVED.
306 lines
10 KiB
TypeScript
306 lines
10 KiB
TypeScript
/**
|
|
* Time Tracking. Source: `db/migrations/0001_init.sql` and the
|
|
* Cycle-5 Smartsheet scaffold (`db/migrations/0095_*.sql`).
|
|
*
|
|
* Cycle 7: the encrypted token columns on
|
|
* `time_tracking_smartsheet_config` moved to `smartsheet_workspace`
|
|
* (see `db/schema/smartsheet-workspace.ts`).
|
|
*
|
|
* Cycle 10: the `time_tracking_workers` table was DROPPED in
|
|
* `db/migrations/0097_field_workers.sql`. Worker records now live
|
|
* in `field_workers` (see `db/schema/field-workers.ts`). The
|
|
* `worker_id` column on the downstream tables
|
|
* (`time_tracking_logs`, `time_tracking_notification_log`) was
|
|
* renamed to `field_worker_id` and the FK repointed.
|
|
*/
|
|
import {
|
|
pgTable,
|
|
uuid,
|
|
text,
|
|
numeric,
|
|
integer,
|
|
boolean,
|
|
timestamp,
|
|
index,
|
|
jsonb,
|
|
} from "drizzle-orm/pg-core";
|
|
import { brands } from "./brands";
|
|
import { fieldWorkers } from "./field-workers";
|
|
|
|
export const timeTrackingSettings = pgTable(
|
|
"time_tracking_settings",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.unique()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
payPeriodStartDay: integer("pay_period_start_day").notNull().default(0),
|
|
payPeriodLengthDays: integer("pay_period_length_days")
|
|
.notNull()
|
|
.default(7),
|
|
dailyOvertimeThreshold: numeric("daily_overtime_threshold", {
|
|
precision: 5,
|
|
scale: 2,
|
|
}).notNull().default("8.0"),
|
|
weeklyOvertimeThreshold: numeric("weekly_overtime_threshold", {
|
|
precision: 5,
|
|
scale: 2,
|
|
}).notNull().default("40.0"),
|
|
overtimeMultiplier: numeric("overtime_multiplier", {
|
|
precision: 3,
|
|
scale: 2,
|
|
}).notNull().default("1.50"),
|
|
overtimeNotifications: boolean("overtime_notifications")
|
|
.notNull()
|
|
.default(true),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
updatedAt: timestamp("updated_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
);
|
|
|
|
// Cycle 10: `time_tracking_workers` table was DROPPED in
|
|
// 0097_field_workers.sql. Worker records now live in `field_workers`
|
|
// (see `db/schema/field-workers.ts`). Any code that previously read
|
|
// from timeTrackingWorkers should now read from fieldWorkers and
|
|
// filter by role = 'worker' or 'time_admin' if it needs time-only
|
|
// workers.
|
|
|
|
export const timeTrackingTasks = pgTable(
|
|
"time_tracking_tasks",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
name: text("name").notNull(),
|
|
nameEs: text("name_es"),
|
|
unit: text("unit", { enum: ["hours", "pieces", "units"] })
|
|
.notNull()
|
|
.default("hours"),
|
|
sortOrder: integer("sort_order").notNull().default(0),
|
|
active: boolean("active").notNull().default(true),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
(t) => ({
|
|
brandIdx: index("time_tracking_tasks_brand_idx").on(t.brandId),
|
|
}),
|
|
);
|
|
|
|
export const timeTrackingLogs = pgTable(
|
|
"time_tracking_logs",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
/** Cycle 10: was `worker_id` (FK → time_tracking_workers); now unified. */
|
|
fieldWorkerId: uuid("field_worker_id")
|
|
.notNull()
|
|
.references(() => fieldWorkers.id, { onDelete: "cascade" }),
|
|
taskId: uuid("task_id").references(() => timeTrackingTasks.id, {
|
|
onDelete: "set null",
|
|
}),
|
|
taskName: text("task_name").notNull(),
|
|
clockIn: timestamp("clock_in", { withTimezone: true }).notNull(),
|
|
clockOut: timestamp("clock_out", { withTimezone: true }),
|
|
lunchBreakMinutes: integer("lunch_break_minutes").notNull().default(0),
|
|
notes: text("notes"),
|
|
submittedVia: text("submitted_via", {
|
|
enum: ["manual", "field", "import"],
|
|
}).notNull().default("manual"),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
(t) => ({
|
|
brandIdx: index("time_tracking_logs_brand_idx").on(t.brandId),
|
|
fieldWorkerIdx: index("time_tracking_logs_field_worker_idx").on(
|
|
t.fieldWorkerId,
|
|
),
|
|
clockInIdx: index("time_tracking_logs_clock_in_idx").on(t.clockIn),
|
|
}),
|
|
);
|
|
|
|
export const timeTrackingNotificationLog = pgTable(
|
|
"time_tracking_notification_log",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
/** Cycle 10: was `worker_id` (FK → time_tracking_workers); now unified. */
|
|
fieldWorkerId: uuid("field_worker_id").references(
|
|
() => fieldWorkers.id,
|
|
{ onDelete: "set null" },
|
|
),
|
|
notificationType: text("notification_type").notNull(),
|
|
recipient: text("recipient").notNull(),
|
|
subject: text("subject"),
|
|
body: text("body").notNull(),
|
|
status: text("status", {
|
|
enum: ["pending", "sent", "failed"],
|
|
}).notNull().default("pending"),
|
|
sentAt: timestamp("sent_at", { withTimezone: true }),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
);
|
|
|
|
export type TimeTrackingSettings = typeof timeTrackingSettings.$inferSelect;
|
|
// Cycle 10: `TimeTrackingWorker` was removed. Use `FieldWorker` from
|
|
// `./field-workers` instead; filter by role = 'worker' or 'time_admin'
|
|
// if you need time-only workers.
|
|
export type TimeTrackingTask = typeof timeTrackingTasks.$inferSelect;
|
|
export type TimeTrackingLog = typeof timeTrackingLogs.$inferSelect;
|
|
export type TimeTrackingNotificationLog =
|
|
typeof timeTrackingNotificationLog.$inferSelect;
|
|
|
|
// ── Smartsheet sync (Cycle 5) ──────────────────────────────────────────────
|
|
|
|
/**
|
|
* Allowed sync frequencies. Mirrors the water-log smartsheet
|
|
* pattern (see `db/schema/water-log.ts` SMARTSHEET_FREQUENCIES).
|
|
*/
|
|
export const TT_SMARTSHEET_FREQUENCIES = [
|
|
"realtime",
|
|
"every_15_minutes",
|
|
"hourly",
|
|
] as const;
|
|
export type TTSmartsheetFrequency = (typeof TT_SMARTSHEET_FREQUENCIES)[number];
|
|
|
|
/**
|
|
* Time-tracking fields a brand can map to their Smartsheet columns.
|
|
* `log_id` and `clock_in` are required (used for dedup).
|
|
*/
|
|
export type TTSmartsheetColumnKey =
|
|
| "log_id"
|
|
| "clock_in"
|
|
| "clock_out"
|
|
| "worker"
|
|
| "task"
|
|
| "hours"
|
|
| "lunch_minutes"
|
|
| "notes";
|
|
export const TT_SMARTSHEET_COLUMN_KEYS: readonly TTSmartsheetColumnKey[] = [
|
|
"log_id",
|
|
"clock_in",
|
|
"clock_out",
|
|
"worker",
|
|
"task",
|
|
"hours",
|
|
"lunch_minutes",
|
|
"notes",
|
|
] as const;
|
|
|
|
/**
|
|
* Shape stored in `time_tracking_smartsheet_config.column_mapping`.
|
|
* Required: log_id + clock_in (for dedup). All others nullable.
|
|
*/
|
|
export type TTSmartsheetColumnMapping = {
|
|
log_id: string;
|
|
clock_in: string;
|
|
clock_out: string | null;
|
|
worker: string | null;
|
|
task: string | null;
|
|
hours: string | null;
|
|
lunch_minutes: string | null;
|
|
notes: string | null;
|
|
};
|
|
|
|
export const timeTrackingSmartsheetConfig = pgTable(
|
|
"time_tracking_smartsheet_config",
|
|
{
|
|
brandId: uuid("brand_id")
|
|
.primaryKey()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
sheetId: text("sheet_id").notNull(),
|
|
// Cycle 7: encrypted token columns moved to smartsheet_workspace.
|
|
// See migration 0096_smartsheet_workbook_hub.sql.
|
|
columnMapping: jsonb("column_mapping")
|
|
.$type<TTSmartsheetColumnMapping>()
|
|
.notNull(),
|
|
syncFrequency: text("sync_frequency")
|
|
.$type<TTSmartsheetFrequency>()
|
|
.notNull()
|
|
.default("hourly"),
|
|
syncEnabled: boolean("sync_enabled").notNull().default(false),
|
|
lastSyncAt: timestamp("last_sync_at", { withTimezone: true }),
|
|
lastSyncError: text("last_sync_error"),
|
|
createdBy: text("created_by"),
|
|
updatedBy: text("updated_by"),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
updatedAt: timestamp("updated_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
);
|
|
|
|
export const timeTrackingSmartsheetSyncQueue = pgTable(
|
|
"time_tracking_smartsheet_sync_queue",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
logId: uuid("log_id")
|
|
.notNull()
|
|
.references(() => timeTrackingLogs.id, { onDelete: "cascade" }),
|
|
smartsheetRowId: text("smartsheet_row_id"),
|
|
status: text("status", {
|
|
enum: ["pending", "syncing", "synced", "failed"],
|
|
})
|
|
.notNull()
|
|
.default("pending"),
|
|
attempts: integer("attempts").notNull().default(0),
|
|
lastError: text("last_error"),
|
|
nextAttemptAt: timestamp("next_attempt_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
syncedAt: timestamp("synced_at", { withTimezone: true }),
|
|
},
|
|
);
|
|
|
|
export const timeTrackingSmartsheetSyncLog = pgTable(
|
|
"time_tracking_smartsheet_sync_log",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
logId: uuid("log_id").references(() => timeTrackingLogs.id, {
|
|
onDelete: "set null",
|
|
}),
|
|
smartsheetRowId: text("smartsheet_row_id"),
|
|
action: text("action", {
|
|
enum: ["sync", "retry", "skip", "queue"],
|
|
}).notNull(),
|
|
success: boolean("success").notNull(),
|
|
error: text("error"),
|
|
durationMs: integer("duration_ms"),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
);
|
|
|
|
export type TimeTrackingSmartsheetConfig =
|
|
typeof timeTrackingSmartsheetConfig.$inferSelect;
|
|
export type TimeTrackingSmartsheetConfigInsert =
|
|
typeof timeTrackingSmartsheetConfig.$inferInsert;
|
|
export type TimeTrackingSmartsheetSyncQueue =
|
|
typeof timeTrackingSmartsheetSyncQueue.$inferSelect;
|
|
export type TimeTrackingSmartsheetSyncLog =
|
|
typeof timeTrackingSmartsheetSyncLog.$inferSelect; |