groombook/app
Archived
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(GRO-206): CTO review fixes — active filter on super user count + CI TAG fix

Browse Source 
- Add active=true filter to all 3 super user count queries in staff.ts
  (revoke, deactivate, delete) so inactive super users aren't counted
- Fix ci.yml deploy step: use steps.version.outputs.tag instead of
  invalid github.sha::7 expression
- Remove GRO-206 CI trigger junk line from README.md

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Barkley Trimsworth
2026-03-30 13:55:00 +00:00
parent c6a08be4c6
commit 7fdb32f95b
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -212,7 +212,7 @@ jobs:
- name: Deploy to groombook-dev - name: Deploy to groombook-dev
env: env:
TAG: pr-${{ github.event.pull_request.number }}-${{ github.sha::7 }} TAG: ${{ steps.version.outputs.tag }}
PR_NUM: ${{ github.event.pull_request.number }} PR_NUM: ${{ github.event.pull_request.number }}
run: | run: |
echo "Deploying images tagged $TAG to groombook-dev..." echo "Deploying images tagged $TAG to groombook-dev..."
README.md
-1
View File
@@ -215,4 +215,3 @@ All PRs require CI to pass before merge. See [CONTRIBUTING.md](./CONTRIBUTING.md
## License ## License
AGPL-3.0 AGPL-3.0
# GRO-206 CI trigger
apps/api/src/routes/staff.ts
+3 -3
View File
@@ -65,7 +65,7 @@ staffRouter.patch("/:id", zValidator("json", updateStaffSchema), async (c) => {
const superUserCount = await db const superUserCount = await db
.select({ id: staff.id }) .select({ id: staff.id })
.from(staff) .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 .limit(2); // just need count; fetch 2 to know if > 1
if (superUserCount.length <= 1) { if (superUserCount.length <= 1) {
return c.json( return c.json(
@@ -86,7 +86,7 @@ staffRouter.patch("/:id", zValidator("json", updateStaffSchema), async (c) => {
const superUserCount = await db const superUserCount = await db
.select({ id: staff.id }) .select({ id: staff.id })
.from(staff) .from(staff)
.where(eq(staff.isSuperUser, true)) .where(and(eq(staff.isSuperUser, true), eq(staff.active, true)))
.limit(2); .limit(2);
if (superUserCount.length <= 1) { if (superUserCount.length <= 1) {
return c.json( return c.json(
@@ -142,7 +142,7 @@ staffRouter.delete("/:id", async (c) => {
const superUserCount = await db const superUserCount = await db
.select({ id: staff.id }) .select({ id: staff.id })
.from(staff) .from(staff)
.where(eq(staff.isSuperUser, true)) .where(and(eq(staff.isSuperUser, true), eq(staff.active, true)))
.limit(2); .limit(2);
if (superUserCount.length <= 1) { if (superUserCount.length <= 1) {
return c.json( return c.json(