Update max additional guests logic and refine guest counts display

Set default max additional guests to 10 and renamed related labels for clarity. Improved guest count calculation by adding total confirmed guests and refining additional guest computations. Updated the UI to reflect these changes concisely and consistently.

backend/app/schemas/guests.py

@@ -1,11 +1,10 @@
-import uuid
-
-from pydantic import BaseModel, EmailStr, ConfigDict
 from datetime import datetime
 from typing import Optional, Any, Dict
-from app.models.guest import GuestStatus
 from uuid import UUID
 
+from pydantic import BaseModel, EmailStr, ConfigDict
+
+from app.models.guest import GuestStatus
 from app.schemas.rsvp import RSVPSchema, RSVPStatus
 
 
@@ -50,6 +49,8 @@ class GuestRead(GuestBase):
     is_blocked: bool
     model_config = ConfigDict(from_attributes=True)
     invitation_code: str
+    rsvp: Optional[RSVPSchema] = None
+
 
 class GuestWithRSVPResponse(BaseModel):
     """
@@ -62,6 +63,7 @@ class GuestWithRSVPResponse(BaseModel):
     class Config:
         from_attributes = True
 
+
 def map_rsvp_status_to_guest_status(rsvp_status: RSVPStatus) -> GuestStatus:
     if rsvp_status == RSVPStatus.ATTENDING:
         return GuestStatus.CONFIRMED
@@ -70,4 +72,4 @@ def map_rsvp_status_to_guest_status(rsvp_status: RSVPStatus) -> GuestStatus:
     elif rsvp_status == RSVPStatus.MAYBE:
         return GuestStatus.PENDING
     else:
-        return GuestStatus.INVITED
+        return GuestStatus.INVITED

frontend/src/client/schemas.gen.ts

@@ -2427,6 +2427,16 @@ export const GuestReadSchema = {
       type: "string",
       title: "Invitation Code",
     },
+    rsvp: {
+      anyOf: [
+        {
+          $ref: "#/components/schemas/RSVPSchema",
+        },
+        {
+          type: "null",
+        },
+      ],
+    },
   },
   type: "object",
   required: [

frontend/src/client/types.gen.ts

@@ -370,6 +370,7 @@ export type GuestRead = {
   actual_additional_guests: number;
   is_blocked: boolean;
   invitation_code: string;
+  rsvp?: RsvpSchema | null;
 };
 
 export type GuestStatus =

frontend/src/components/guests/guests-list.tsx

@@ -101,7 +101,7 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
     full_name: "",
     email: "",
     phone: "",
-    max_additional_guests: 0,
+    max_additional_guests: 10,
     dietary_restrictions: "",
     notes: "",
     can_bring_guests: true,
@@ -293,7 +293,7 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
       "Phone",
       "Invitation Code",
       "Status",
-      "Additional Guests",
+      "Max Additional Guests",
     ];
     const csvContent = [
       headers.join(","),
@@ -348,6 +348,12 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
     }
   }, [addGuestOpen, editGuestOpen, currentGuest]);
 
+  const confirmedGuestCount =
+    guests?.filter((g) => g.status === GuestStatus.CONFIRMED).length || 0;
+  const confirmedAdditionalGuestsCount =
+    guests?.reduce((acc, g) => acc + (g.actual_additional_guests || 0), 0) || 0;
+  const totalConfirmedGuestsCount =
+    confirmedGuestCount + confirmedAdditionalGuestsCount;
   return (
     <div className="space-y-4 w-full">
       {error && (
@@ -414,14 +420,14 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
                 </div>
                 <div className="grid grid-cols-4 items-center gap-4">
                   <Label htmlFor="max_additional_guests" className="text-right">
-                    Additional Guests
+                    Max Add. Guests
                   </Label>
                   <Input
                     id="max_additional_guests"
                     name="max_additional_guests"
                     type="number"
                     min="0"
-                    value={formData.max_additional_guests || 0}
+                    value={formData.max_additional_guests || 10}
                     onChange={handleInputChange}
                     className="col-span-3"
                   />
@@ -578,8 +584,8 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
 
                   {/* Dietary Restrictions Column */}
                   <TableCell>
-                    {guest.dietary_restrictions &&
-                    guest.dietary_restrictions.length > 0 ? (
+                    {guest.rsvp?.dietary_requirements &&
+                    guest.rsvp.dietary_requirements.length > 0 ? (
                       <Popover>
                         <PopoverTrigger asChild>
                           <Button
@@ -592,7 +598,7 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
                         </PopoverTrigger>
                         <PopoverContent className="max-w-xs">
                           <p className="text-sm">
-                            {guest.dietary_restrictions}
+                            {guest.rsvp.dietary_requirements}
                           </p>
                         </PopoverContent>
                       </Popover>
@@ -603,7 +609,8 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
 
                   {/* Notes Column */}
                   <TableCell>
-                    {guest.notes && guest.notes.length > 0 ? (
+                    {guest.rsvp?.response_message &&
+                    guest.rsvp.response_message.length > 0 ? (
                       <Popover>
                         <PopoverTrigger asChild>
                           <Button
@@ -615,7 +622,9 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
                           </Button>
                         </PopoverTrigger>
                         <PopoverContent className="max-w-xs">
-                          <p className="text-sm">{guest.notes}</p>
+                          <p className="text-sm">
+                            {guest.rsvp.response_message}
+                          </p>
                         </PopoverContent>
                       </Popover>
                     ) : (
@@ -682,14 +691,9 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
           Showing {filteredGuests.length} of {guests?.length || 0} guests
         </div>
         <div>
-          Total Confirmed:{" "}
-          {guests?.filter((g) => g.status === GuestStatus.CONFIRMED).length ||
-            0}{" "}
-          | Total Additional Guests:{" "}
-          {guests?.reduce(
-            (acc, g) => acc + (g.max_additional_guests || 0),
-            0,
-          ) || 0}
+          Guests Confirmed: {confirmedGuestCount} | Additional Guests:{" "}
+          {confirmedAdditionalGuestsCount} | Total Guests:{" "}
+          {totalConfirmedGuestsCount}
         </div>
       </div>
 
@@ -743,7 +747,7 @@ const GuestListTable = ({ event }: GuestListTableProps) => {
                 htmlFor="edit_max_additional_guests"
                 className="text-right"
               >
-                Additional Guests
+                Max Add. Guests
               </Label>
               <Input
                 id="edit_max_additional_guests"