Promote dev → uat: GRO-2342 portal waitlist service {id, name} #209

Merged

Flea Flicker merged 9 commits from promote/dev-to-uat-gro-2342 into uat 2026-06-10 09:24:54 +00:00

Conversation 1 Commits 9 Files Changed 8

+209 -49

Flea Flicker commented 2026-06-10 09:17:42 +00:00

Member

Copy Link

Copy Source

GRO-2342 (Phase 2: dev → uat) — portal waitlist service {id, name}

Carries the Phase 1 merge 1d6b906 (feat/GRO-2342-portal-waitlist-servicename) plus the GRO-2139 reset.ts advisory lock + GRO-2294 infra mcp trigger that were merged to dev but not yet promoted to uat.

What's in this promotion

• GRO-2342 (this issue): GET /portal/appointments now populates service: {id, name} on the synthetic waitlist card (was {id} only). The appointments join also gains a name (consistent shape). Same shape the appointments join returns, no portal change required.
• GRO-2139 (carry-forward): reset.ts advisory lock around drop→migrate→seed chain.
• GRO-2294 (carry-forward): infra mcp trigger / trigger-uat-*.txt plumbing.

Conflict resolution (dev side wins)

• UAT_PLAYBOOK.md — TC-API-8.20 (GRO-2342) added; TC-API-8.19 (GRO-2319) retained verbatim.
• src/routes/portal.ts — dev's {id, name} shape + GRO-2342 comment adopted.
• src/__tests__/portal.test.ts — dev's services mock + GRO-2342 assertions adopted.

Verification

• pnpm vitest run src/__tests__/portal.test.ts — 56/56 pass (includes new TC-API-8.20 GRO-2342 assertions).
• pnpm tsc --noEmit — clean.

Next steps

• QA (Lint Roller) review on Gitea.
• Self-merge Phase 2 after QA approval.
• Phase 3: Shedward post-deploy UAT regression covering TC-API-8.20 (create child issue with PR URL).
• Phase 4: uat → main via FROZEN-branch pattern (CTO / The Dogfather).
• Phase 5: prod overlay newTag bump in groombook/infra.

🪒 Hand-off to Lint Roller (525c2c39-1196-4682-9cd1-0bcfcb0d0f31). Self-merge after QA approval.

## GRO-2342 (Phase 2: dev → uat) — portal waitlist service {id, name} Carries the Phase 1 merge `1d6b906` (feat/GRO-2342-portal-waitlist-servicename) plus the GRO-2139 reset.ts advisory lock + GRO-2294 infra mcp trigger that were merged to dev but not yet promoted to uat. ### What's in this promotion - **GRO-2342** (this issue): `GET /portal/appointments` now populates `service: {id, name}` on the synthetic waitlist card (was `{id}` only). The appointments join also gains a name (consistent shape). Same shape the appointments join returns, no portal change required. - **GRO-2139** (carry-forward): reset.ts advisory lock around drop→migrate→seed chain. - **GRO-2294** (carry-forward): infra mcp trigger / `trigger-uat-*.txt` plumbing. ### Conflict resolution (dev side wins) - `UAT_PLAYBOOK.md` — TC-API-8.20 (GRO-2342) added; TC-API-8.19 (GRO-2319) retained verbatim. - `src/routes/portal.ts` — dev's `{id, name}` shape + GRO-2342 comment adopted. - `src/__tests__/portal.test.ts` — dev's services mock + GRO-2342 assertions adopted. ### Verification - `pnpm vitest run src/__tests__/portal.test.ts` — 56/56 pass (includes new TC-API-8.20 GRO-2342 assertions). - `pnpm tsc --noEmit` — clean. ### Next steps - QA (Lint Roller) review on Gitea. - Self-merge Phase 2 after QA approval. - Phase 3: Shedward post-deploy UAT regression covering TC-API-8.20 (create child issue with PR URL). - Phase 4: uat → main via FROZEN-branch pattern (CTO / The Dogfather). - Phase 5: prod overlay newTag bump in `groombook/infra`. 🪒 Hand-off to Lint Roller (`525c2c39-1196-4682-9cd1-0bcfcb0d0f31`). Self-merge after QA approval.

Flea Flicker added 9 commits 2026-06-10 09:17:42 +00:00

GRO-2294: Route Optimization security hardening (geocode-batch limit cap + redact settings secret) (#193) fe412933ea

fix(GRO-2299): redact googleMapsApiKey from PATCH /api/admin/settings response (#195) b4b48f7b50

fix(GRO-2139): serialize reset→migrate→seed under the seed advisory lock (#160) ... 1e0747324d

Serialize the entire db:reset chain (DROP → migrate → seed) inside one withSeedAdvisoryLock callback so a concurrent same-PRNG seeder cannot interleave and collide on invoices_pkey. Pool sized max:6 (1 reserved for the lock + work headroom) to avoid the connection-starvation deadlock the CTO caught. Verified with three end-to-end live db:reset runs against a throwaway Postgres.

cc @cpfarhood

GRO-2172: add missing extended pet fields to create/update schemas (#199) 2853ce73a5

feat(seed): seed upcoming appointments across statuses for UAT portal customer (GRO-2311) (#201) d61607f4c5

feat(GRO-2319): surface active waitlist entries on portal appointments + seed (#204) ef18ed7376

fix(GRO-2342): portal waitlist card populates service {id, name} ... 277f459237

Cosmetic follow-up to GRO-2319 (Phase 4 review by CTO). The synthetic
waitlist card on GET /portal/appointments returned service: {id} only,
so the portal fell back to the literal 'Service' label. CMPO spec did
not call for a service name on the waitlist card, but populating the
real name is non-urgent and closes the cosmetic gap.

- src/routes/portal.ts: include a services SELECT (in addition to
  pets and staff) covering both appointment and waitlist serviceIds.
  serviceMap feeds a service.name lookup. The synthetic waitlist
  card's service object is now {id, name} — same shape the
  appointments join returns — so the portal renders the real name.
  The appointments join also gains a name (consistent shape, no
  regression for the existing path).
- src/__tests__/portal.test.ts: mock the services table and assert
  service: {id, name} on both the synthetic waitlist card and the
  appointment card.
- UAT_PLAYBOOK.md: TC-API-8.20 covering the waitlist card service
  name (TC-API-8.19 retained verbatim for the original GRO-2319
  surfacing contract).

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(GRO-2342): portal waitlist card populates service {id, name}' (#208) from feat/GRO-2342-portal-waitlist-servicename into dev 1d6b906202

Promote dev → uat: GRO-2342 portal waitlist service {id, name} ... e932050b45

Resolves conflicts in UAT_PLAYBOOK.md, src/routes/portal.ts, and
src/__tests__/portal.test.ts (dev side wins — GRO-2342 changes are
the only diff in scope). Carries forward GRO-2139 reset.ts advisory
lock + GRO-2294 infra mcp trigger that were merged to dev but not
yet promoted to uat.

- src/routes/portal.ts: GET /portal/appointments now populates
  service: {id, name} on both the synthetic waitlist card and the
  appointment card (was {id} only). Same shape, no portal change
  required.
- src/__tests__/portal.test.ts: services mock + TC-API-8.20 GRO-2342
  assertions on the synthetic waitlist card service name.
- UAT_PLAYBOOK.md: TC-API-8.20 (GRO-2342) appended; TC-API-8.19
  (GRO-2319) retained verbatim.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Lint Roller approved these changes 2026-06-10 09:21:51 +00:00

Lint Roller left a comment

Member

Copy Link

Copy Source

QA approved. CI clean (lint+typecheck, test, build all pass). Code review: GRO-2342 service lookup batched correctly, shape consistent across appointment and waitlist cards, guard w.serviceId correct. Tests cover both card shapes cleanly. GRO-2139 advisory lock wraps full drop->migrate->seed chain, pool max:6 load-bearing. UAT_PLAYBOOK.md TC-API-8.20 present. GRO-2294 carry-forward plumbing in scope. LGTM — self-merge.

QA approved. CI clean (lint+typecheck, test, build all pass). Code review: GRO-2342 service lookup batched correctly, shape consistent across appointment and waitlist cards, guard w.serviceId correct. Tests cover both card shapes cleanly. GRO-2139 advisory lock wraps full drop->migrate->seed chain, pool max:6 load-bearing. UAT_PLAYBOOK.md TC-API-8.20 present. GRO-2294 carry-forward plumbing in scope. LGTM — self-merge.

Flea Flicker merged commit 4cc51b32d3 into uat 2026-06-10 09:24:54 +00:00

Flea Flicker deleted branch promote/dev-to-uat-gro-2342 2026-06-10 09:24:54 +00:00

The Dogfather referenced this pull request 2026-06-10 10:38:13 +00:00

uat→main (PROD): GRO-2342 portal waitlist service {id, name} (frozen @47e2021 + cherry-pick c737bfe) #211

The Dogfather referenced this pull request 2026-06-10 10:41:05 +00:00

uat→main (PROD): GRO-2342 portal waitlist service {id, name} (frozen @47e2021 + cherry-pick c737bfe) #211

Sign in to join this conversation.

Reviewers

No Reviewers

Lint Roller

Labels

Clear labels

bug

Something isn't working

documentation

Improvements or additions to documentation

duplicate

This issue or pull request already exists

enhancement

New feature or request

good first issue

Good for newcomers

help wanted

Extra attention is needed

invalid

This doesn't seem right

question

Further information is requested

wontfix

This will not be worked on

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ai-review (AI Review) gb_barkley (Barkley Trimsworth) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) gb_flea (Flea Flicker) flux (Flux CD) admin (Gitea Admin) gb_lint (Lint Roller) renovate (Mend Renovate) gb_pawla (Pawla Abdul) gb_scrubs (Scrubs McBarkley) gb_shedward (Shedward Scissorhands) gb_dogfather (The Dogfather)

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: groombook/api#209