fix(staff): count only active super users in last-super-user guardrail

Add active=true filter to all 3 superUserCount queries in staff.ts
(revoke, deactivate, delete) so inactive super users aren't counted,
preventing false positives when checking the last-super-user guardrail.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit was merged in pull request #183.
This commit is contained in:
Barkley Trimsworth
2026-03-30 14:50:50 +00:00
parent 40143c4efa
commit 853c55fd04
+3 -3
View File
@@ -65,7 +65,7 @@ staffRouter.patch("/:id", zValidator("json", updateStaffSchema), async (c) => {
const superUserCount = await db
.select({ id: staff.id })
.from(staff)
.where(eq(staff.isSuperUser, true))
.where(and(eq(staff.isSuperUser, true), eq(staff.active, true)))
.limit(2); // just need count; fetch 2 to know if > 1
if (superUserCount.length <= 1) {
return c.json(
@@ -86,7 +86,7 @@ staffRouter.patch("/:id", zValidator("json", updateStaffSchema), async (c) => {
const superUserCount = await db
.select({ id: staff.id })
.from(staff)
.where(eq(staff.isSuperUser, true))
.where(and(eq(staff.isSuperUser, true), eq(staff.active, true)))
.limit(2);
if (superUserCount.length <= 1) {
return c.json(
@@ -142,7 +142,7 @@ staffRouter.delete("/:id", async (c) => {
const superUserCount = await db
.select({ id: staff.id })
.from(staff)
.where(eq(staff.isSuperUser, true))
.where(and(eq(staff.isSuperUser, true), eq(staff.active, true)))
.limit(2);
if (superUserCount.length <= 1) {
return c.json(