Merge branch 'dev' into flea-flicker/pet-profile-editor

fix: align types/index.ts with dev to resolve merge conflict
fix(GRO-1365): address QA review findings on api/#21
2026-05-21 03:48:20 +00:00 · 2026-05-21 03:48:11 +00:00 · 2026-05-20 16:31:43 +00:00 · 2026-05-20 10:55:09 +00:00
2 changed files with 4 additions and 15 deletions
@@ -19,11 +19,9 @@
    "@hono/node-server": "^1.13.7",
    "@hono/zod-validator": "^0.7.6",
    "better-auth": "^1.5.6",
-    "drizzle-orm": "^0.38.4",
    "hono": "^4.6.17",
    "node-cron": "^3.0.3",
    "nodemailer": "^6.9.16",
-    "postgres": "^3.4.5",
    "stripe": "^22.0.0",
    "telnyx": "^1.23.0",
    "zod": "^4.3.6"
@@ -28,10 +28,7 @@ importers:
        version: 0.7.6(hono@4.12.18)(zod@4.4.3)
      better-auth:
        specifier: ^1.5.6
-        version: 1.6.10(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0))
-      drizzle-orm:
-        specifier: ^0.38.4
-        version: 0.38.4(kysely@0.28.17)(postgres@3.4.9)
+        version: 1.6.10(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0))
      hono:
        specifier: ^4.6.17
        version: 4.12.18
@@ -41,9 +38,6 @@ importers:
      nodemailer:
        specifier: ^6.9.16
        version: 6.10.1
-      postgres:
-        specifier: ^3.4.5
-        version: 3.4.9
      stripe:
        specifier: ^22.0.0
        version: 22.1.1(@types/node@22.19.18)
@@ -2930,12 +2924,10 @@ snapshots:
      nanostores: 1.3.0
      zod: 4.4.3

-  '@better-auth/drizzle-adapter@1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))':
+  '@better-auth/drizzle-adapter@1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)':
    dependencies:
      '@better-auth/core': 1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0)
      '@better-auth/utils': 0.4.0
-    optionalDependencies:
-      drizzle-orm: 0.38.4(kysely@0.28.17)(postgres@3.4.9)

  '@better-auth/kysely-adapter@1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)(kysely@0.28.17)':
    dependencies:
@@ -3927,10 +3919,10 @@ snapshots:

  balanced-match@4.0.4: {}

-  better-auth@1.6.10(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0)):
+  better-auth@1.6.10(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0)):
    dependencies:
      '@better-auth/core': 1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0)
-      '@better-auth/drizzle-adapter': 1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))
+      '@better-auth/drizzle-adapter': 1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)
      '@better-auth/kysely-adapter': 1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)(kysely@0.28.17)
      '@better-auth/memory-adapter': 1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)
      '@better-auth/mongo-adapter': 1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)
@@ -3947,7 +3939,6 @@ snapshots:
      nanostores: 1.3.0
      zod: 4.4.3
    optionalDependencies:
-      drizzle-orm: 0.38.4(kysely@0.28.17)(postgres@3.4.9)
      vitest: 3.2.4(@types/node@22.19.18)(tsx@4.21.0)
    transitivePeerDependencies:
      - '@cloudflare/workers-types'
Author	SHA1	Message	Date
The Dogfather	87cb4a74a9	Merge branch 'dev' into flea-flicker/pet-profile-editor CI / Lint & Typecheck (pull_request) Successful in 16s Details CI / Test (pull_request) Failing after 21s Details CI / Build & Push Docker Image (pull_request) Has been skipped Details	2026-05-21 03:48:20 +00:00
The Dogfather	fba29e605b	fix: align types/index.ts with dev to resolve merge conflict CI / Lint & Typecheck (pull_request) Failing after 13s Details CI / Test (pull_request) Failing after 20s Details CI / Build (pull_request) Has been skipped Details CI / Build & Push Docker Images (pull_request) Has been skipped Details CI / Update Infra Image Tags (pull_request) Has been skipped Details	2026-05-21 03:48:11 +00:00
Chris Farhood	e4a6e2e540	fix(GRO-1365): address QA review findings on api/#21 CI / Lint & Typecheck (pull_request) Failing after 13s Details CI / Test (pull_request) Failing after 20s Details CI / Build & Push Docker Images (pull_request) Has been skipped Details CI / Build (pull_request) Has been skipped Details CI / Update Infra Image Tags (pull_request) Has been skipped Details 1. Fix vi.mock factory: importOriginal -> db.and/eq/exists/or stubs (removes ReferenceError from undeclared imports in test) 2. Remove MedicalAlert.id — not in schema/migration/DB, only in types 3. Replace z.string().max(100) coatType with z.enum for CoatType union 4. Fix test expecting coatType "smooth" (invalid) -> "double" (valid) 5. Add TC-API-3.8 through TC-API-3.15 to UAT_PLAYBOOK.md §4.3 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-20 16:31:43 +00:00
Chris Farhood	9787a1a442	fix: add missing extended pet profile fields to buildPet factory CI / Lint & Typecheck (pull_request) Failing after 17s Details CI / Test (pull_request) Failing after 22s Details CI / Build (pull_request) Has been skipped Details CI / Build & Push Docker Images (pull_request) Has been skipped Details CI / Update Infra Image Tags (pull_request) Has been skipped Details - Add coatType, temperamentScore, temperamentFlags, medicalAlerts, preferredCuts - Fixes TypeScript error on factories.ts:89 where extended profile fields were missing - GRO-1346 Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-20 10:55:09 +00:00