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.
420 lines
14 KiB
TypeScript
420 lines
14 KiB
TypeScript
/**
|
||
* Water Log. Source: `db/migrations/0001_init.sql` + `0090_water_log_completion.sql`.
|
||
*
|
||
* Six tables, all brand-scoped with RLS:
|
||
* - water_headgates — physical gates a measurement is tied to
|
||
* - field_workers — unified worker table (cycle 10; replaces
|
||
* water_irrigators + time_tracking_workers)
|
||
* - water_sessions — short-lived PIN sessions for irrigators
|
||
* - water_log_entries — the actual reading logs
|
||
* - water_alert_log — high/low threshold alert history
|
||
* - water_admin_settings — per-brand admin PIN + alert config
|
||
* - water_admin_sessions — admin sign-in sessions (separate cookie)
|
||
* - water_audit_log — who changed what, when
|
||
*/
|
||
import {
|
||
pgTable,
|
||
uuid,
|
||
text,
|
||
numeric,
|
||
boolean,
|
||
timestamp,
|
||
date,
|
||
jsonb,
|
||
doublePrecision,
|
||
index,
|
||
uniqueIndex,
|
||
integer,
|
||
} from "drizzle-orm/pg-core";
|
||
import { brands } from "./brands";
|
||
import { adminUsers } from "./brands";
|
||
import { fieldWorkers } from "./field-workers";
|
||
|
||
// Cycle 7: the `bytea` customType used to live here for the
|
||
// encrypted Smartsheet token columns. Those columns moved to
|
||
// `smartsheet_workspace` (see `db/schema/smartsheet-workspace.ts`),
|
||
// so the helper is no longer needed here.
|
||
|
||
export const waterHeadgates = pgTable(
|
||
"water_headgates",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
name: text("name").notNull(),
|
||
/** Per-headgate opaque token used in the QR code. */
|
||
headgateToken: text("headgate_token").notNull().unique(),
|
||
/** Open / Closed / Maintenance. */
|
||
status: text("status").notNull().default("open"),
|
||
/** Display unit: CFS, GPM, Inches, AF/Day, etc. */
|
||
unit: text("unit").notNull().default("CFS"),
|
||
/** Optional max-flow marker in GPM. */
|
||
maxFlowGpm: numeric("max_flow_gpm"),
|
||
/** High-water alert threshold (units match `unit`). */
|
||
highThreshold: numeric("high_threshold"),
|
||
/** Low-water alert threshold (units match `unit`). */
|
||
lowThreshold: numeric("low_threshold"),
|
||
notes: text("notes"),
|
||
active: boolean("active").notNull().default(true),
|
||
lastUsedAt: timestamp("last_used_at", { withTimezone: true }),
|
||
createdAt: timestamp("created_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
},
|
||
(t) => ({
|
||
brandIdx: index("water_headgates_brand_idx").on(t.brandId),
|
||
tokenIdx: uniqueIndex("water_headgates_token_idx").on(t.headgateToken),
|
||
}),
|
||
);
|
||
|
||
// Cycle 10: water_irrigators 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 waterIrrigators should now
|
||
// read from fieldWorkers and filter by role = 'irrigator' or
|
||
// 'water_admin' if it needs water-only workers.
|
||
|
||
export const waterSessions = pgTable(
|
||
"water_sessions",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
/** Cycle 10: was `irrigator_id` (FK → water_irrigators); now unified. */
|
||
fieldWorkerId: uuid("field_worker_id")
|
||
.notNull()
|
||
.references(() => fieldWorkers.id, { onDelete: "cascade" }),
|
||
expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
|
||
createdAt: timestamp("created_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
},
|
||
);
|
||
|
||
export const waterLogEntries = pgTable(
|
||
"water_log_entries",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
headgateId: uuid("headgate_id")
|
||
.notNull()
|
||
.references(() => waterHeadgates.id, { onDelete: "cascade" }),
|
||
/** Cycle 10: was `irrigator_id` (FK → water_irrigators); now unified. */
|
||
fieldWorkerId: uuid("field_worker_id")
|
||
.notNull()
|
||
.references(() => fieldWorkers.id, { onDelete: "cascade" }),
|
||
/** Raw measurement value, in the entry's `unit`. */
|
||
measurement: numeric("measurement").notNull(),
|
||
unit: text("unit").notNull(),
|
||
/** "manual" | "meter" | "estimate" | "qr" */
|
||
method: text("method").notNull().default("manual"),
|
||
/** Optional auto-computed total (in gallons) when CFS × duration is known. */
|
||
totalGallons: numeric("total_gallons"),
|
||
notes: text("notes"),
|
||
submittedVia: text("submitted_via").notNull().default("app"),
|
||
photoUrl: text("photo_url"),
|
||
latitude: doublePrecision("latitude"),
|
||
longitude: doublePrecision("longitude"),
|
||
/** Date-only mirror of loggedAt for fast grouping / dashboard queries. */
|
||
loggedDate: date("logged_date"),
|
||
loggedAt: timestamp("logged_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
loggedBy: uuid("logged_by").references(() => adminUsers.id),
|
||
},
|
||
(t) => ({
|
||
brandIdx: index("water_log_entries_brand_idx").on(t.brandId),
|
||
headgateIdx: index("water_log_entries_headgate_idx").on(t.headgateId),
|
||
brandDateIdx: index("water_log_entries_brand_date_idx").on(
|
||
t.brandId,
|
||
t.loggedDate,
|
||
),
|
||
fieldWorkerIdx: index("water_log_entries_field_worker_idx").on(
|
||
t.fieldWorkerId,
|
||
t.loggedAt,
|
||
),
|
||
}),
|
||
);
|
||
|
||
export const waterAlertLog = pgTable(
|
||
"water_alert_log",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
alertType: text("alert_type").notNull(),
|
||
headgateId: uuid("headgate_id").references(() => waterHeadgates.id, {
|
||
onDelete: "set null",
|
||
}),
|
||
message: text("message").notNull(),
|
||
sentTo: text("sent_to"),
|
||
sentAt: timestamp("sent_at", { withTimezone: true }),
|
||
createdAt: timestamp("created_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
},
|
||
);
|
||
|
||
export const waterAdminSettings = pgTable("water_admin_settings", {
|
||
brandId: uuid("brand_id")
|
||
.primaryKey()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
/** Hashed admin PIN (scrypt $ N$r$p$salt$hash format). */
|
||
pinHash: text("pin_hash"),
|
||
enabled: boolean("enabled").notNull().default(true),
|
||
sessionDurationHours: integer("session_duration_hours")
|
||
.notNull()
|
||
.default(4),
|
||
canEditEntries: boolean("can_edit_entries").notNull().default(true),
|
||
canDeleteEntries: boolean("can_delete_entries").notNull().default(true),
|
||
canExportCsv: boolean("can_export_csv").notNull().default(true),
|
||
alertPhone: text("alert_phone"),
|
||
alertsEnabled: boolean("alerts_enabled").notNull().default(false),
|
||
updatedAt: timestamp("updated_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
updatedBy: uuid("updated_by").references(() => adminUsers.id),
|
||
});
|
||
|
||
export const waterAdminSessions = pgTable(
|
||
"water_admin_sessions",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
adminUserId: uuid("admin_user_id")
|
||
.notNull()
|
||
.references(() => adminUsers.id, { onDelete: "cascade" }),
|
||
pinHashUsed: text("pin_hash_used").notNull(),
|
||
expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
|
||
createdAt: timestamp("created_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
},
|
||
(t) => ({
|
||
adminIdx: index("water_admin_sessions_admin_idx").on(
|
||
t.adminUserId,
|
||
t.expiresAt,
|
||
),
|
||
}),
|
||
);
|
||
|
||
export const waterAuditLog = pgTable(
|
||
"water_audit_log",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
actorId: uuid("actor_id").references(() => adminUsers.id),
|
||
actorLabel: text("actor_label").notNull(),
|
||
action: text("action").notNull(),
|
||
entityType: text("entity_type").notNull(),
|
||
entityId: uuid("entity_id"),
|
||
details: jsonb("details"),
|
||
createdAt: timestamp("created_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
},
|
||
(t) => ({
|
||
brandRecentIdx: index("water_audit_log_brand_recent_idx").on(
|
||
t.brandId,
|
||
t.createdAt,
|
||
),
|
||
}),
|
||
);
|
||
|
||
// ── Inferred types (used by every action and client component) ────────────
|
||
|
||
export type WaterHeadgate = typeof waterHeadgates.$inferSelect;
|
||
export type WaterHeadgateInsert = typeof waterHeadgates.$inferInsert;
|
||
|
||
// Cycle 10: `WaterIrrigator` / `WaterIrrigatorInsert` were removed.
|
||
// Use `FieldWorker` from `./field-workers` instead; filter by role =
|
||
// 'irrigator' or 'water_admin' if you need water-only workers.
|
||
|
||
export type WaterSession = typeof waterSessions.$inferSelect;
|
||
export type WaterLogEntry = typeof waterLogEntries.$inferSelect;
|
||
export type WaterLogEntryInsert = typeof waterLogEntries.$inferInsert;
|
||
|
||
export type WaterAlertLog = typeof waterAlertLog.$inferSelect;
|
||
export type WaterAdminSettings = typeof waterAdminSettings.$inferSelect;
|
||
export type WaterAdminSession = typeof waterAdminSessions.$inferSelect;
|
||
export type WaterAuditLog = typeof waterAuditLog.$inferSelect;
|
||
|
||
// ── Smartsheet integration (added in 0093_water_smartsheet_sync.sql) ────────
|
||
|
||
/**
|
||
* Allowed sync frequencies. Stored as TEXT to match the convention
|
||
* in CLAUDE.md ("Status enums stored as TEXT — no PostgreSQL ENUM type").
|
||
*/
|
||
export const SMARTSHEET_FREQUENCIES = [
|
||
"realtime",
|
||
"every_15_minutes",
|
||
"hourly",
|
||
] as const;
|
||
export type SmartsheetFrequency = (typeof SMARTSHEET_FREQUENCIES)[number];
|
||
|
||
/**
|
||
* The Water-log fields a brand can map to their Smartsheet columns.
|
||
* `entry_id` and `logged_at` are required (used for dedup).
|
||
*/
|
||
export type SmartsheetColumnKey =
|
||
| "entry_id"
|
||
| "logged_at"
|
||
| "headgate"
|
||
| "measurement"
|
||
| "unit"
|
||
| "irrigator"
|
||
| "notes";
|
||
export const SMARTSHEET_COLUMN_KEYS: readonly SmartsheetColumnKey[] = [
|
||
"entry_id",
|
||
"logged_at",
|
||
"headgate",
|
||
"measurement",
|
||
"unit",
|
||
"irrigator",
|
||
"notes",
|
||
] as const;
|
||
|
||
/**
|
||
* Shape stored in `water_smartsheet_config.column_mapping`. The values
|
||
* are Smartsheet column IDs (numeric strings, e.g. "8309876543210123").
|
||
*
|
||
* Only `entry_id` and `logged_at` are required (used for dedup). All
|
||
* other fields are nullable — `null` means "not mapped, don't write
|
||
* this column". The UI uses an empty string in the dropdown to mean
|
||
* the same thing and we coerce on the server.
|
||
*/
|
||
export type SmartsheetColumnMapping = {
|
||
entry_id: string;
|
||
logged_at: string;
|
||
headgate: string | null;
|
||
measurement: string | null;
|
||
unit: string | null;
|
||
irrigator: string | null;
|
||
notes: string | null;
|
||
};
|
||
|
||
export const waterSmartsheetConfig = pgTable("water_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<SmartsheetColumnMapping>()
|
||
.notNull(),
|
||
syncFrequency: text("sync_frequency")
|
||
.$type<SmartsheetFrequency>()
|
||
.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 type WaterSmartsheetConfig = typeof waterSmartsheetConfig.$inferSelect;
|
||
export type WaterSmartsheetConfigInsert = typeof waterSmartsheetConfig.$inferInsert;
|
||
|
||
/**
|
||
* Sync queue status. Mirrors the SQL CHECK constraint.
|
||
*/
|
||
export const SMARTSHEET_QUEUE_STATUSES = [
|
||
"pending",
|
||
"syncing",
|
||
"synced",
|
||
"failed",
|
||
] as const;
|
||
export type SmartsheetQueueStatus = (typeof SMARTSHEET_QUEUE_STATUSES)[number];
|
||
|
||
export const waterSmartsheetSyncQueue = pgTable(
|
||
"water_smartsheet_sync_queue",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
entryId: uuid("entry_id")
|
||
.notNull()
|
||
.references(() => waterLogEntries.id, { onDelete: "cascade" }),
|
||
smartsheetRowId: text("smartsheet_row_id"),
|
||
status: text("status")
|
||
.$type<SmartsheetQueueStatus>()
|
||
.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 }),
|
||
},
|
||
(t) => ({
|
||
entryUnique: uniqueIndex("water_smartsheet_queue_entry_unique").on(
|
||
t.brandId,
|
||
t.entryId,
|
||
),
|
||
brandStatusIdx: index("water_smartsheet_queue_brand_status_idx").on(
|
||
t.brandId,
|
||
t.status,
|
||
t.nextAttemptAt,
|
||
),
|
||
brandRecentIdx: index("water_smartsheet_queue_brand_created_idx").on(
|
||
t.brandId,
|
||
t.createdAt,
|
||
),
|
||
}),
|
||
);
|
||
|
||
export type WaterSmartsheetSyncQueue = typeof waterSmartsheetSyncQueue.$inferSelect;
|
||
export type WaterSmartsheetSyncQueueInsert = typeof waterSmartsheetSyncQueue.$inferInsert;
|
||
|
||
export const SMARTSHEET_LOG_ACTIONS = ["sync", "retry", "skip", "queue"] as const;
|
||
export type SmartsheetLogAction = (typeof SMARTSHEET_LOG_ACTIONS)[number];
|
||
|
||
export const waterSmartsheetSyncLog = pgTable(
|
||
"water_smartsheet_sync_log",
|
||
{
|
||
id: uuid("id").primaryKey().defaultRandom(),
|
||
brandId: uuid("brand_id")
|
||
.notNull()
|
||
.references(() => brands.id, { onDelete: "cascade" }),
|
||
entryId: uuid("entry_id").references(() => waterLogEntries.id, {
|
||
onDelete: "set null",
|
||
}),
|
||
smartsheetRowId: text("smartsheet_row_id"),
|
||
action: text("action").$type<SmartsheetLogAction>().notNull(),
|
||
success: boolean("success").notNull(),
|
||
error: text("error"),
|
||
durationMs: integer("duration_ms"),
|
||
createdAt: timestamp("created_at", { withTimezone: true })
|
||
.notNull()
|
||
.defaultNow(),
|
||
},
|
||
(t) => ({
|
||
brandRecentIdx: index("water_smartsheet_log_brand_recent_idx").on(
|
||
t.brandId,
|
||
t.createdAt,
|
||
),
|
||
}),
|
||
);
|
||
|
||
export type WaterSmartsheetSyncLog = typeof waterSmartsheetSyncLog.$inferSelect;
|
||
export type WaterSmartsheetSyncLogInsert = typeof waterSmartsheetSyncLog.$inferInsert;
|