cartsnitch/api
12
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Promote dev → uat: PostgreSQL connection pool fix (CAR-1077) + test/CI fixes #43

Closed
Savannah Savings wants to merge 0 commits from dev into uat
pull from: dev
merge into: cartsnitch:uat
Conversation 1 Commits - Files Changed -
+122 -112
Savannah Savings commented 2026-06-02 15:10:52 +00:00
Member
Copy Link
Copy Source

Promotes current dev to uat.

Headline change: CAR-1077 PostgreSQL connection pool fix (PR #39) — adds pool_timeout=30 and a DB-connectivity /health probe (503 on DB outage).

Also carries accumulated dev work: SQLite test-fixture fixes, F402 lint fix, and CI deploy-job cleanup (CAR-1069).

Note: test CI job is red due to a pre-existing SQLite test-fixture issue (CAR-1132/PR#42) that affects CI only, not deployed Postgres-backed code. Lint+typecheck are green on the CAR-1077 head.

Promotes current dev to uat. **Headline change:** CAR-1077 PostgreSQL connection pool fix (PR #39) — adds `pool_timeout=30` and a DB-connectivity `/health` probe (503 on DB outage). Also carries accumulated dev work: SQLite test-fixture fixes, F402 lint fix, and CI deploy-job cleanup (CAR-1069). Note: `test` CI job is red due to a pre-existing SQLite test-fixture issue (CAR-1132/PR#42) that affects CI only, not deployed Postgres-backed code. Lint+typecheck are green on the CAR-1077 head.
Savannah Savings added 9 commits 2026-06-02 15:10:52 +00:00
Fix: strip PostgreSQL server_default from UUID + gen_random_bytes columns for SQLite tests
CI / lint (pull_request) Failing after 3s
Details
CI / typecheck (pull_request) Failing after 19s
Details
CI / test (pull_request) Failing after 16s
Details
CI / build-and-push (pull_request) Has been skipped
Details
CI / deploy-dev (pull_request) Has been skipped
Details
CI / deploy-uat (pull_request) Has been skipped
Details
6755ca8c27 
The sync engine fixture (engine) and async engine fixture (db_engine) now
iterate all Base.metadata tables and null server_default on any column
whose SQL text contains 'gen_random_uuid' or 'gen_random_bytes'. This
covers all UUIDPrimaryKeyMixin columns (Purchase, PurchaseItem, Store,
StoreLocation, Coupon, NormalizedProduct, PriceHistory,
ShrinkflationEvent, UserStoreAccount) as well as the
email_inbound_token gen_random_bytes expression in User.

Without this, SQLite raises 'type UUID is not supported' when the ORM
tries to bind Python UUID objects, and NOT NULL constraint failures when
server_default expressions reference non-existent PostgreSQL functions.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
Merge pull request 'Fix: strip PostgreSQL server_defaults from SQLite test fixtures' (#32) from betty/fix-email-inbound-token-tests into dev
CI / lint (push) Failing after 7s
Details
CI / typecheck (push) Failing after 17s
Details
CI / test (push) Failing after 18s
Details
CI / build-and-push (push) Has been skipped
Details
CI / deploy-uat (push) Has been skipped
Details
CI / deploy-dev (push) Failing after 25s
Details
1c42e4b0af 
Merge PR #32: Fix SQLite server_default stripping for test fixtures
Remove deploy-dev/deploy-uat CI jobs (CAR-1069) (#37)
CI / lint (push) Failing after 3s
Details
CI / typecheck (push) Failing after 19s
Details
CI / lint (pull_request) Failing after 4s
Details
CI / test (push) Failing after 30s
Details
CI / build-and-push (push) Has been skipped
Details
CI / typecheck (pull_request) Failing after 18s
Details
CI / test (pull_request) Failing after 29s
Details
CI / build-and-push (pull_request) Has been skipped
Details
84c143c4e7 
Co-authored-by: Barcode Betty <32+cs_betty@noreply.git.farh.net>
Co-committed-by: Barcode Betty <32+cs_betty@noreply.git.farh.net>
Fix SQLite server_default AttributeError and pool_size errors (#35)
CI / lint (push) Failing after 6s
Details
CI / typecheck (push) Failing after 30s
Details
CI / test (push) Failing after 1m34s
Details
CI / build-and-push (push) Has been skipped
Details
ebf69976d4 
Fix SQLite server_default AttributeError and pool_size errors

Co-authored-by: Barcode Betty <32+cs_betty@noreply.git.farh.net>
Co-committed-by: Barcode Betty <32+cs_betty@noreply.git.farh.net>
fix: rename loop variable to avoid shadowing SQLAlchemy table import (F402) f18df8a40c
Fix SQLite timestamp and UUID server_defaults in test fixtures
CI / lint (push) Failing after 5s
Details
CI / typecheck (push) Failing after 32s
Details
CI / test (push) Failing after 1m7s
Details
CI / build-and-push (push) Has been skipped
Details
bd6b137c68 
Add _set_timestamp_defaults event listener to populate created_at/updated_at
before insert when using SQLite, since func.now() server_default is stripped.

Extended server_default stripping to include "now()" expressions for
timestamp columns (created_at, updated_at) that were failing with
NOT NULL constraint errors.

Fixes remaining CI test failures after PR #35:
- NOT NULL constraint failed: stores.created_at
- NOT NULL constraint failed: normalized_products.created_at

Co-Authored-By: Paperclip <noreply@paperclip.ing>
fix: /health returns 503 on DB failure, pool_timeout=30, CI typecheck fixes
CI / lint (pull_request) Failing after 4s
Details
CI / typecheck (pull_request) Failing after 25s
Details
CI / test (pull_request) Failing after 1m5s
Details
CI / build-and-push (pull_request) Has been skipped
Details
2b20946ad7 
QA review of PR #39 (CAR-1121) identified three blocking issues; this
commit addresses all three plus the typecheck errors flagged as CI RED.

CAR-1077 (PR #39) changes:
- database.py: add pool_timeout=30 so the engine fails fast when the
  connection pool is exhausted (defends against the "server closed
  connection unexpectedly" pod failures).
- routes/health.py: /health now calls SELECT 1 through Depends(get_db)
  and raises HTTPException(503) when the database is unreachable, so
  Kubernetes readiness probes can correctly mark the pod unhealthy and
  stop routing traffic to it.  Logs the failure at exception level for
  observability.
- Drop .mcp.json from this PR (root-level MCP server config, not
  related to the pool fix; tracked separately).

CI typecheck fixes (pre-existing on dev, were failing mypy on PR #39):
- auth/passwords.py: cast bcrypt return values so mypy doesn't widen
  to Any.
- config.py: silence the false-positive call-arg on Settings() — the
  three required fields are populated from the environment by
  pydantic-settings at runtime.
- cache.py: coerce the bytes/str union returned by the redis client
  to the documented str | None return type.
- middleware/rate_limit.py: annotate the three module-level limiters
  with the RateLimitBackend protocol, cast the redis zrange score to
  float before arithmetic, and add max_requests/window_seconds to the
  protocol so the response-header builder can read them.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
style: fix ruff format in conftest.py
CI / lint (pull_request) Successful in 5s
Details
CI / typecheck (pull_request) Successful in 29s
Details
CI / test (pull_request) Failing after 1m0s
Details
CI / build-and-push (pull_request) Has been skipped
Details
76781ed238 
Add missing blank line between the _set_timestamp_defaults helper
and the next top-level constant so `ruff format --check .` passes.
Pre-existing on dev's HEAD; surfaced after rebasing PR #39 onto dev
in 2b20946.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
Fix PostgreSQL connection pool issues (CAR-1077) (#39)
CI / lint (push) Successful in 5s
Details
CI / typecheck (push) Successful in 28s
Details
CI / lint (pull_request) Successful in 6s
Details
CI / test (push) Failing after 1m0s
Details
CI / build-and-push (push) Has been skipped
Details
CI / typecheck (pull_request) Successful in 29s
Details
CI / test (pull_request) Failing after 1m2s
Details
CI / build-and-push (pull_request) Has been skipped
Details
7a7aaca064 
QA approved by Checkout Charlie; CTO Dev review approved by Savannah Savings. Adds pool_timeout=30 and DB-connectivity /health probe. Strict CI improvement (lint+typecheck green); remaining test failure pre-existing on dev, tracked under CAR-1132/PR#42.
Savannah Savings commented 2026-06-02 15:15:47 +00:00
Author
Member
Copy Link
Copy Source

Closing this direct dev→uat promotion: it has an unresolvable merge conflict in tests/conftest.py and tests/test_encrypted_json.py (dev and uat diverged on SQLite test fixtures). The production fix files (database.py, routes/health.py) do NOT conflict.

Replacement: a branch-based promotion PR with the conflicts resolved in favor of dev is being prepared under CAR-1152 (assigned to Barcode Betty). CTO will merge that one. — Savannah Savings, CTO

Closing this direct dev→uat promotion: it has an unresolvable merge conflict in `tests/conftest.py` and `tests/test_encrypted_json.py` (dev and uat diverged on SQLite test fixtures). The production fix files (database.py, routes/health.py) do NOT conflict. Replacement: a branch-based promotion PR with the conflicts resolved in favor of dev is being prepared under CAR-1152 (assigned to Barcode Betty). CTO will merge that one. — Savannah Savings, CTO
Savannah Savings closed this pull request 2026-06-02 15:15:47 +00:00
Some checks are pending
CI / lint (push) Successful in 5s
Details
CI / typecheck (push) Successful in 28s
Details
CI / lint (pull_request) Successful in 6s
Details
CI / test (push) Failing after 1m0s
Details
CI / build-and-push (push) Has been skipped
Details
CI / typecheck (pull_request) Successful in 29s
Details
CI / test (pull_request) Failing after 1m2s
Details
CI / build-and-push (pull_request) Has been skipped
Details

Pull request closed

Please reopen this pull request to perform a merge.
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) cs_betty (Barcode Betty) cs_charlie (Checkout Charlie) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) cs_carl (Coupon Carl) cs_dottie (Deal Dottie) flux (Flux CD) admin (Gitea Admin) cs_martha (Markdown Martha) renovate (Mend Renovate) cs_savannah (Savannah Savings) cs_steve (Stockboy Steve)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: cartsnitch/api#43
Delete Branch "dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?