From fba29e605bd3a5c21e0f64c61d3ffbb243146612 Mon Sep 17 00:00:00 2001
From: The Dogfather <20+gb_dogfather@noreply.git.farh.net>
Date: Thu, 21 May 2026 03:48:11 +0000
Subject: [PATCH] fix: align types/index.ts with dev to resolve merge conflict

---
 apps/api/src/types/index.ts | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/apps/api/src/types/index.ts b/apps/api/src/types/index.ts
index ab23286..4f60f42 100644
--- a/apps/api/src/types/index.ts
+++ b/apps/api/src/types/index.ts
@@ -26,20 +26,6 @@ export interface Client {
   updatedAt: string;
 }
 
-// ─── Medical Alerts ────────────────────────────────────────────────────────────
-
-export type AlertSeverity = "low" | "medium" | "high";
-
-export interface MedicalAlert {
-  type: string;
-  description: string;
-  severity: AlertSeverity;
-}
-
-// ─── Pet Profile Summary ────────────────────────────────────────────────────
-
-export type CoatType = "short" | "medium" | "long" | "double" | "wire" | "silky" | "curly" | "hairless";
-
 export interface Pet {
   id: string;
   clientId: string;
@@ -56,16 +42,23 @@ export interface Pet {
   customFields: Record<string, string>;
   photoKey?: string;
   photoUploadedAt?: string;
-  // Extended fields (GRO-1176/GRO-1178)
-  coatType?: CoatType | null;
-  preferredCuts?: string[];
-  temperamentScore?: number | null; // 1–5, read-only (staff-set)
-  temperamentFlags?: string[];      // read-only (staff-set)
+  coatType?: string | null;
+  temperamentScore?: number | null;
+  temperamentFlags?: string[];
   medicalAlerts?: MedicalAlert[];
+  preferredCuts?: string[];
   createdAt: string;
   updatedAt: string;
 }
 
+export type MedicalAlertSeverity = "low" | "medium" | "high";
+
+export interface MedicalAlert {
+  type: string;
+  description: string;
+  severity: MedicalAlertSeverity;
+}
+
 export interface GroomingVisitLog {
   id: string;
   petId: string;