apps/api/src/routes/admin.ts

@@ -23,7 +23,7 @@ import { Hono } from 'hono';
 import type { Context } from 'hono';
 import { zValidator } from '@hono/zod-validator';
 import { z } from 'zod';
-import { eq } from 'drizzle-orm';
+import { eq, sql } from 'drizzle-orm';
 import { db } from '../db/client.js';
 import { users, memberCredentials, calendars, appConfig } from '../db/schema.js';
 import { requireAdmin } from '../lib/requireAdmin.js';
@@ -255,10 +255,19 @@ adminRouter.post('/config/timezone/seed', zValidator('json', timezoneSchema), as
     .limit(1);
 
   const alreadySet = existing?.value != null;
+
+  // WR-02: Use onDuplicateKeyUpdate with a no-op (`set: { value: sql`value` }`)
+  // so a concurrent seed or a seed racing a PUT cannot 500 on the PK constraint.
+  // The no-op preserves the existing value (D-03 no-overwrite). We always INSERT
+  // here and let the DB determine whether a row was inserted or not; `seeded` still
+  // reflects the pre-flight SELECT so the caller gets the correct flag even in the
+  // concurrent race (the winner observes alreadySet=false → seeded:true; the loser
+  // observes alreadySet=true → seeded:false and the INSERT is a no-op).
   if (!alreadySet) {
     await db
       .insert(appConfig)
-      .values({ key: 'household_timezone', value: timezone });
+      .values({ key: 'household_timezone', value: timezone })
+      .onDuplicateKeyUpdate({ set: { value: sql`value` } });
   }
 
   return c.json({ ok: true, seeded: !alreadySet }, 200);

apps/api/tests/routes/admin.test.ts

@@ -704,7 +704,26 @@ describe('admin timezone config', () => {
   // POST /api/admin/config/timezone/seed — seeds when unset (D-02)
   // -------------------------------------------------------------------------
 
-  it('POST seed when unset stores the value and returns ok (D-02)', async () => {
+  // -------------------------------------------------------------------------
+  // POST /api/admin/config/timezone/seed — access control (WR-02)
+  // -------------------------------------------------------------------------
+
+  it('POST seed returns 403 for a non-admin authenticated user (WR-02 access control)', async () => {
+    const nonAdminId = await seedUser('tz-non-admin-seed', false);
+    currentDevUserId = nonAdminId;
+    const app = await getApp();
+
+    const res = await app.fetch(
+      jsonRequest('POST', '/api/admin/config/timezone/seed', { timezone: 'America/Chicago' }),
+    );
+    expect(res.status).toBe(403);
+  });
+
+  // -------------------------------------------------------------------------
+  // POST /api/admin/config/timezone/seed — seeds when unset (D-02)
+  // -------------------------------------------------------------------------
+
+  it('POST seed when unset stores the value and returns { ok: true, seeded: true } (D-02, WR-02)', async () => {
     const adminId = await seedUser('tz-admin-seed-unset', true);
     currentDevUserId = adminId;
     const app = await getApp();
@@ -713,6 +732,10 @@ describe('admin timezone config', () => {
       jsonRequest('POST', '/api/admin/config/timezone/seed', { timezone: 'Europe/London' }),
     );
     expect(res.status).toBe(200);
+    const body = (await res.json()) as { ok: boolean; seeded: boolean };
+    // WR-02: seeded flag must be true when this request performed the seed
+    expect(body.ok).toBe(true);
+    expect(body.seeded).toBe(true);
 
     // Verify the value was stored
     const [row] = await db
@@ -752,4 +775,42 @@ describe('admin timezone config', () => {
       .limit(1);
     expect(row?.value).toBe('America/Chicago');
   });
+
+  // -------------------------------------------------------------------------
+  // POST /api/admin/config/timezone/seed — idempotent under concurrent race (WR-02)
+  // -------------------------------------------------------------------------
+
+  it('POST seed when value already exists returns 200 with seeded:false and does NOT throw (WR-02 idempotent race)', async () => {
+    const adminId = await seedUser('tz-admin-seed-race', true);
+    currentDevUserId = adminId;
+    const app = await getApp();
+
+    // First seed establishes the value (simulates the "winner" of the race)
+    const firstRes = await app.fetch(
+      jsonRequest('POST', '/api/admin/config/timezone/seed', { timezone: 'America/New_York' }),
+    );
+    expect(firstRes.status).toBe(200);
+    const firstBody = (await firstRes.json()) as { ok: boolean; seeded: boolean };
+    expect(firstBody.seeded).toBe(true);
+
+    // Second seed with a different value — simulates the "loser" of the race that
+    // arrives after the row already exists. Pre-fix this would throw a 500 due to
+    // the PK constraint. Post-fix it must return 200 with seeded:false and preserve
+    // the original value (D-03 no-overwrite).
+    const secondRes = await app.fetch(
+      jsonRequest('POST', '/api/admin/config/timezone/seed', { timezone: 'Europe/Paris' }),
+    );
+    expect(secondRes.status).toBe(200);
+    const secondBody = (await secondRes.json()) as { ok: boolean; seeded: boolean };
+    expect(secondBody.ok).toBe(true);
+    expect(secondBody.seeded).toBe(false);
+
+    // The stored value must still be America/New_York (winner's value preserved, D-03)
+    const [row] = await db
+      .select({ value: appConfig.value })
+      .from(appConfig)
+      .where(eq(appConfig.key, 'household_timezone'))
+      .limit(1);
+    expect(row?.value).toBe('America/New_York');
+  });
 });