b793cd6955
Mirrors the water-log Smartsheet pattern (migration 0093 + src/services/smartsheet-sync.ts). End-to-end wiring is in place; the brand fills in sheet ID + token + column mapping whenever ready. DB: - 0095_time_tracking_smartsheet_sync.sql — config + sync_queue + sync_log tables with brand-scoped RLS. Unique constraint on (brand_id, log_id) keeps the queue idempotent against retries. Code: - db/schema/time-tracking.ts — adds TTSmartsheetFrequency, TT_SMARTSHEET_FREQUENCIES, TTSmartsheetColumnKey, TTSmartsheetColumnMapping, and the three pgTable defs. - src/services/time-tracking-smartsheet-sync.ts — syncLogToSmartsheet (dedup-by-log_id, token-echo sanitization, retry-with-backoff), drainTTSyncQueue, runScheduledTTSync. - src/actions/time-tracking/smartsheet.ts — full admin CRUD (getTTSmartsheetConfig, saveTTSmartsheetConfig, testTTSmartsheetConnection, getTTSmartsheetRecent, getTTSmartsheetQueueSummary, disableTTSmartsheet). - src/actions/time-tracking/field.ts — clockOutWorker calls the new enqueueClockOutForSync helper in its OWN transaction (so a queue- insert failure can never poison the clock-out commit; reviewer caught this in cycle 2's same-style bug pattern). - src/components/admin/time-tracking/TimeTrackingSmartsheetCard.tsx — slim, focused card: sheet ID + token + frequency + enable + Test Connection → column-mapping dropdowns + Recent Activity table. - src/app/admin/water-log/settings/page.tsx — §06 section renders the new card as a sibling of the existing water-log smartsheet card. Permission gate uses can_manage_settings + platform_admin (not can_manage_water_log) — feature is a brand-level integration setting, not water-log-specific. Out of scope / deferred: - /api/time-tracking/smartsheet-sync cron route. The trigger is optional: realtime mode syncs inline; 15-min/hourly modes need the cron. Add in a follow-up cycle when the cron infrastructure is revisited. - drag-and-drop column-mapping UX (current card uses plain dropdowns). - backfill flow (no equivalent of the water-log "backfill past N days" feature yet). - can_manage_time_tracking permission flag (uses can_manage_settings as the proxy; revisit once the admin_users schema gets a time-tracking-specific permission column).
317 lines
9.9 KiB
TypeScript
317 lines
9.9 KiB
TypeScript
/**
|
|
* Time Tracking. Source: `db/migrations/0001_init.sql` and the
|
|
* Cycle-5 Smartsheet scaffold (`db/migrations/0095_*.sql`).
|
|
*/
|
|
import {
|
|
pgTable,
|
|
uuid,
|
|
text,
|
|
numeric,
|
|
integer,
|
|
boolean,
|
|
timestamp,
|
|
index,
|
|
jsonb,
|
|
customType,
|
|
} from "drizzle-orm/pg-core";
|
|
import { brands } from "./brands";
|
|
|
|
// drizzle-orm/pg-core does not export a `bytea` shorthand the way
|
|
// many typed helpers do; declare it once here so the schema can use
|
|
// raw BYTEA columns for encrypted tokens. Mirrors the helper in
|
|
// `db/schema/water-log.ts` for the water-log smartsheet config.
|
|
const bytea = customType<{ data: Buffer; default: false }>({
|
|
dataType() {
|
|
return "bytea";
|
|
},
|
|
});
|
|
|
|
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(),
|
|
},
|
|
);
|
|
|
|
export const timeTrackingWorkers = pgTable(
|
|
"time_tracking_workers",
|
|
{
|
|
id: uuid("id").primaryKey().defaultRandom(),
|
|
brandId: uuid("brand_id")
|
|
.notNull()
|
|
.references(() => brands.id, { onDelete: "cascade" }),
|
|
name: text("name").notNull(),
|
|
role: text("role", { enum: ["worker", "time_admin"] })
|
|
.notNull()
|
|
.default("worker"),
|
|
lang: text("lang").notNull().default("en"),
|
|
pin: text("pin").notNull(),
|
|
active: boolean("active").notNull().default(true),
|
|
lastUsedAt: timestamp("last_used_at", { withTimezone: true }),
|
|
createdAt: timestamp("created_at", { withTimezone: true })
|
|
.notNull()
|
|
.defaultNow(),
|
|
},
|
|
(t) => ({
|
|
brandIdx: index("time_tracking_workers_brand_idx").on(t.brandId),
|
|
}),
|
|
);
|
|
|
|
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" }),
|
|
workerId: uuid("worker_id")
|
|
.notNull()
|
|
.references(() => timeTrackingWorkers.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),
|
|
workerIdx: index("time_tracking_logs_worker_idx").on(t.workerId),
|
|
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" }),
|
|
workerId: uuid("worker_id").references(
|
|
() => timeTrackingWorkers.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;
|
|
export type TimeTrackingWorker = typeof timeTrackingWorkers.$inferSelect;
|
|
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(),
|
|
encryptedApiToken: bytea("encrypted_api_token").notNull(),
|
|
tokenIv: bytea("token_iv").notNull(),
|
|
tokenAuthTag: bytea("token_auth_tag").notNull(),
|
|
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; |