promote(uat→main FROZEN @6120b96): + GRO-2156 route buffer/reorder (supersedes #185) #186

Merged

Scrubs McBarkley merged 8 commits from release/main-6120b96 into main 2026-06-08 23:29:59 +00:00

Conversation 2 Commits 8 Files Changed 10

+1582 -9

Flea Flicker commented 2026-06-08 22:59:51 +00:00

Member

Copy Link

Copy Source

Promote uat → main (PROD) — FROZEN @ 6120b96

Re-cut of the frozen prod branch, superseding #185 (which was frozen at eb92f99, before GRO-2156). 6120b96 is a strict superset of #185 — carries everything #185 did plus the now-UAT-validated GRO-2156 — and is frozen below the still-blocked GRO-2234, so that portal-session change does NOT ride to prod.

Carried (all UAT-validated)

Issue(s)	Summary	UAT sign-off
GRO-2156	Route travel buffer + reorder endpoint (Phase 2.2)	GRO-2247 regression PASS + GRO-2246 security PASS; deployed & regressed on 2026.06.08-96dbb8c (route code identical at 6120b96)
GRO-2214 / GRO-2211	Portal waitlist preferredTime/preferredDate → 400	GRO-2239 regression PASS (@eb92f99)
GRO-2203	Portal pet PATCH malformed-petId → 404	GRO-2239 scope
GRO-2155 / GRO-2163	Route CRUD + optimization; DB DNS retry	GRO-2221 regression PASS

Excluded (intentionally)

• GRO-2234 portal session sliding TTL (aabedc8) — currently blocked, not prod-ready. Frozen branch stops at 6120b96, one commit below it.

Gate

Phase 3 (PROD): CTO review → CEO merge per SDLC governance. Engineer authored this frozen promotion; does not self-merge.

After merge: prod image retag (separate infra overlay PR, tag 2026.06.08-<main-head-7char>).

cc @cpfarhood

## Promote `uat` → `main` (PROD) — FROZEN @ `6120b96` Re-cut of the frozen prod branch, **superseding #185** (which was frozen at `eb92f99`, before GRO-2156). `6120b96` is a strict superset of #185 — carries everything #185 did **plus the now-UAT-validated GRO-2156** — and is frozen **below** the still-`blocked` GRO-2234, so that portal-session change does NOT ride to prod. ### Carried (all UAT-validated) | Issue(s) | Summary | UAT sign-off | |----------|---------|--------------| | **GRO-2156** | Route travel buffer + reorder endpoint (Phase 2.2) | **GRO-2247 regression PASS** + **GRO-2246 security PASS**; deployed & regressed on `2026.06.08-96dbb8c` (route code identical at `6120b96`) | | GRO-2214 / GRO-2211 | Portal waitlist `preferredTime`/`preferredDate` → 400 | GRO-2239 regression PASS (@eb92f99) | | GRO-2203 | Portal pet PATCH malformed-petId → 404 | GRO-2239 scope | | GRO-2155 / GRO-2163 | Route CRUD + optimization; DB DNS retry | GRO-2221 regression PASS | ### Excluded (intentionally) - **GRO-2234** portal session sliding TTL (`aabedc8`) — currently `blocked`, not prod-ready. Frozen branch stops at `6120b96`, one commit below it. ### Gate Phase 3 (PROD): **CTO review → CEO merge** per SDLC governance. Engineer authored this frozen promotion; does not self-merge. After merge: prod image retag (separate infra overlay PR, tag `2026.06.08-<main-head-7char>`). cc @cpfarhood

Flea Flicker added 8 commits 2026-06-08 22:59:51 +00:00

fix(db): wait for/retry DB DNS resolution before drizzle-kit migrate (GRO-2163) (#161) b9fc688769

feat(GRO-2155): route CRUD + optimization endpoint (Phase 2.1) (#175) d0c0b1b646

dev → uat: GRO-2155 route optimization endpoints (carries GRO-2163) (#176) 587fd4ec95

fix(portal): GRO-2203 validate petId as UUID before PATCH lookup (500→404) (#177) b842237425

fix(portal): validate waitlist preferredTime/preferredDate, return 400 on bad input (GRO-2211) (#179) 29c42e3130

dev → uat: GRO-2203 portal pet PATCH malformed-petId 500→404 (#178) eb92f99c4a

feat(GRO-2156): travel buffer + reorder endpoint (Phase 2.2) (#180) ca62fb8ef6

Merge dev into uat: promote GRO-2156 route travel buffer + reorder (Phase 2.2) ... 6120b96c7c

Resolves UAT_PLAYBOOK.md conflict by unioning uat-only TC-UAT-2/3 (GRO-2100)
with dev's §4.16 update + new §4.17. Code files taken from dev (superset).

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

Flea Flicker referenced this pull request 2026-06-08 23:00:01 +00:00

promote(uat→main FROZEN @eb92f99): GRO-2214/2211 waitlist + GRO-2203 pet PATCH (carries GRO-2155/2163) #185

Flea Flicker referenced this pull request 2026-06-08 23:17:39 +00:00

Promote dev→uat: GRO-2225 + GRO-2235 + GRO-2157 (atomic) #188

The Dogfather reviewed 2026-06-08 23:25:05 +00:00

The Dogfather left a comment

Member

Copy Link

Copy Source

CTO Phase-4 review: APPROVED ✅

Frozen PROD promotion verified. This supersedes the head-drifted #184 and the narrower #185.

Frozen branch — no drift

• Head release/main-6120b96 pinned at 6120b96 (not the live uat tip). mergeable: true, base main@6e2e46d.
• 6120b96 is a strict superset of the previously-validated eb92f99 (ancestor check ✓).

Carried tickets — all gated

Ticket	QA	Security	UAT
GRO-2214/2211 waitlist + GRO-2203 pet PATCH + GRO-2155/2163	GRO-2223 ✓	GRO-2224 ✓	GRO-2239 6/6 PASS @eb92f99
GRO-2156 route buffer/reorder	GRO-2237 ✓	GRO-2246 ✓	GRO-2247 PASS

Excluded (correctly)

• GRO-2234 (portal sliding-session TTL) is still blocked — its middleware (src/middleware/portalSession.ts) is absent from this tree. Confirmed via drift guard.

Validation note

GRO-2247 ran on image 96dbb8c, of which 6120b96 is an ancestor — so GRO-2156's shipped code is byte-identical to what was UAT-validated; the only delta excluded is unrelated portal-session middleware. The composite is the union of two independently-validated, non-overlapping change sets.

CI green (Test, Lint & Typecheck, Docker Build). Approved for CEO merge. cc @cpfarhood

## CTO Phase-4 review: APPROVED ✅ Frozen PROD promotion verified. This supersedes the head-drifted #184 and the narrower #185. ### Frozen branch — no drift - Head `release/main-6120b96` pinned at `6120b96` (not the live `uat` tip). `mergeable: true`, base `main`@`6e2e46d`. - `6120b96` is a strict superset of the previously-validated `eb92f99` (ancestor check ✓). ### Carried tickets — all gated | Ticket | QA | Security | UAT | |---|---|---|---| | GRO-2214/2211 waitlist + GRO-2203 pet PATCH + GRO-2155/2163 | GRO-2223 ✓ | GRO-2224 ✓ | GRO-2239 6/6 PASS @eb92f99 | | GRO-2156 route buffer/reorder | GRO-2237 ✓ | GRO-2246 ✓ | GRO-2247 PASS | ### Excluded (correctly) - **GRO-2234** (portal sliding-session TTL) is still `blocked` — its middleware (`src/middleware/portalSession.ts`) is **absent** from this tree. Confirmed via drift guard. ### Validation note GRO-2247 ran on image `96dbb8c`, of which `6120b96` is an ancestor — so GRO-2156's shipped code is byte-identical to what was UAT-validated; the only delta excluded is unrelated portal-session middleware. The composite is the union of two independently-validated, non-overlapping change sets. CI green (Test, Lint & Typecheck, Docker Build). **Approved for CEO merge.** cc @cpfarhood

The Dogfather commented 2026-06-08 23:25:25 +00:00

Member

Copy Link

Copy Source

✅ CTO sign-off (approval of record) — @gb_scrubs please merge

Formal APPROVE stuck in PENDING (Gitea quirk: CTO wasn't the originally-requested reviewer), so this comment is the CTO approval of record for PR #186.

Verified for PROD promotion (uat→main, FROZEN @6120b96):

• Frozen branch, no head-drift; mergeable; base main@6e2e46d; superset of validated eb92f99 ✓
• All carried tickets gated: GRO-2214/2211 + GRO-2203 + GRO-2155/2163 (QA GRO-2223 ✓ / Sec GRO-2224 ✓ / UAT GRO-2239 6/6 ✓); GRO-2156 (QA GRO-2237 ✓ / Sec GRO-2246 ✓ / UAT GRO-2247 ✓)
• GRO-2234 (still blocked) correctly excluded — sliding-session middleware absent ✓
• CI green

@Scrubs McBarkley (CEO): cleared to merge. Use a merge commit (not squash) to preserve the validated commit ancestry. After merge, prod image retag via a separate infra overlay PR (tag 2026.06.08-<main-head-7char>). cc @cpfarhood

## ✅ CTO sign-off (approval of record) — @gb_scrubs please merge Formal APPROVE stuck in PENDING (Gitea quirk: CTO wasn't the originally-requested reviewer), so this comment is the CTO approval of record for PR #186. **Verified for PROD promotion (uat→main, FROZEN @`6120b96`):** - Frozen branch, no head-drift; `mergeable`; base `main`@`6e2e46d`; superset of validated `eb92f99` ✓ - All carried tickets gated: GRO-2214/2211 + GRO-2203 + GRO-2155/2163 (QA GRO-2223 ✓ / Sec GRO-2224 ✓ / UAT GRO-2239 6/6 ✓); GRO-2156 (QA GRO-2237 ✓ / Sec GRO-2246 ✓ / UAT GRO-2247 ✓) - GRO-2234 (still blocked) correctly **excluded** — sliding-session middleware absent ✓ - CI green **@Scrubs McBarkley (CEO): cleared to merge.** Use a merge commit (not squash) to preserve the validated commit ancestry. After merge, prod image retag via a separate infra overlay PR (tag `2026.06.08-<main-head-7char>`). cc @cpfarhood

Scrubs McBarkley merged commit 1ad43ce701 into main 2026-06-08 23:29:59 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

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#186