Redirecting...
+ + + """ + + return HTMLResponse(content=html_content) + + except Exception as import_error: + frontend_url = os.getenv("FRONTEND_URL", "http://localhost:5173") + return RedirectResponse(url=f"{frontend_url}?error={quote(f'Import failed: {str(import_error)}')}") - # Redirect back to frontend with success message - return RedirectResponse( - url=f"{FRONTEND_URL}?imported={imported_count}&owner={owner}", - status_code=302 - ) except Exception as e: - # Redirect back with error - return RedirectResponse( - url=f"{FRONTEND_URL}?error={str(e)}", - status_code=302 - ) + frontend_url = os.getenv("FRONTEND_URL", "http://localhost:5173") + return RedirectResponse(url=f"{frontend_url}?error={quote('OAuth error')}") -# Public endpoint for guests to update their info +@app.post("/events/{event_id}/import-google-contacts") +async def import_google_contacts( + event_id: UUID, + import_data: schemas.GoogleContactsImport, + db: Session = Depends(get_db), + current_user_id: UUID = Depends(get_current_user_id) +): + """ + Deprecated: Use /auth/google endpoint instead. + This endpoint is kept for backward compatibility. + """ + raise HTTPException( + status_code=410, + detail="Google import flow has been updated. Use the Google Import button instead." + ) + + +# ============================================ +# Public Guest Self-Service Endpoints +# ============================================ @app.get("/public/guest/{phone_number}") def get_guest_by_phone(phone_number: str, db: Session = Depends(get_db)): """ - Public endpoint: Get guest info by phone number - Returns guest if found, or None to allow new registration + Public endpoint: Get guest info by phone number (no authentication required) + Used for guest self-service lookup via shared link + + Returns: + - {found: true, guest_data} if guest found + - {found: false, phone_number} if not found """ - guest = db.query(models.Guest).filter(models.Guest.phone_number == phone_number).first() + guest = db.query(models.Guest).filter( + models.Guest.phone_number == phone_number + ).first() + if not guest: - # Return structure indicating not found, but don't raise error return {"found": False, "phone_number": phone_number} - return {"found": True, **guest.__dict__} + + # Return guest data (exclude sensitive fields if needed) + guest_dict = { + "found": True, + "first_name": guest.first_name, + "last_name": guest.last_name, + "phone_number": guest.phone_number, + "email": guest.email, + "rsvp_status": guest.rsvp_status, + "meal_preference": guest.meal_preference, + "has_plus_one": guest.has_plus_one, + "plus_one_name": guest.plus_one_name, + } + return guest_dict @app.put("/public/guest/{phone_number}") @@ -251,45 +707,54 @@ def update_guest_by_phone( ): """ Public endpoint: Allow guests to update their own info using phone number - Creates new guest if not found (marked as 'self-service') + No authentication required - guests can use shared URLs with phone number + + Features: + - Updates existing guest fields (first_name, last_name override imported values) + - Used for self-service RSVP and preference collection + - Guest must exist (typically from Google import) - returns 404 if not found """ - guest = db.query(models.Guest).filter(models.Guest.phone_number == phone_number).first() + guest = db.query(models.Guest).filter( + models.Guest.phone_number == phone_number + ).first() if not guest: - # Create new guest from link (not imported from contacts) - guest = models.Guest( - first_name=guest_update.first_name or "Guest", - last_name=guest_update.last_name or "", - phone_number=phone_number, - rsvp_status=guest_update.rsvp_status or "pending", - meal_preference=guest_update.meal_preference, - has_plus_one=guest_update.has_plus_one or False, - plus_one_name=guest_update.plus_one_name, - owner="self-service" # Mark as self-registered via link + # Guest not found - return 404 + raise HTTPException( + status_code=404, + detail=f"Guest with phone number {phone_number} not found. Please check the number and try again." ) - db.add(guest) - else: - # Update existing guest - # Always update names if provided (override contact names) - if guest_update.first_name is not None: - guest.first_name = guest_update.first_name - if guest_update.last_name is not None: - guest.last_name = guest_update.last_name - - # Update other fields - if guest_update.rsvp_status is not None: - guest.rsvp_status = guest_update.rsvp_status - if guest_update.meal_preference is not None: - guest.meal_preference = guest_update.meal_preference - if guest_update.has_plus_one is not None: - guest.has_plus_one = guest_update.has_plus_one - if guest_update.plus_one_name is not None: - guest.plus_one_name = guest_update.plus_one_name + + # Update existing guest - override with provided values + # This allows guests to correct their names/preferences even if imported from contacts + if guest_update.first_name is not None: + guest.first_name = guest_update.first_name + if guest_update.last_name is not None: + guest.last_name = guest_update.last_name + if guest_update.rsvp_status is not None: + guest.rsvp_status = guest_update.rsvp_status + if guest_update.meal_preference is not None: + guest.meal_preference = guest_update.meal_preference + if guest_update.has_plus_one is not None: + guest.has_plus_one = guest_update.has_plus_one + if guest_update.plus_one_name is not None: + guest.plus_one_name = guest_update.plus_one_name db.commit() db.refresh(guest) - return guest + + return { + "id": guest.id, + "first_name": guest.first_name, + "last_name": guest.last_name, + "phone_number": guest.phone_number, + "email": guest.email, + "rsvp_status": guest.rsvp_status, + "meal_preference": guest.meal_preference, + "has_plus_one": guest.has_plus_one, + "plus_one_name": guest.plus_one_name, + } if __name__ == "__main__": - uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True) \ No newline at end of file + uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True) diff --git a/backend/migrations.sql b/backend/migrations.sql new file mode 100644 index 0000000..cdb93fd --- /dev/null +++ b/backend/migrations.sql @@ -0,0 +1,296 @@ +-- Multi-Event Invitation App Database Schema +-- PostgreSQL Migration Script +-- Created: 2026-02-23 + +-- ============================================ +-- STEP 1: Enable UUID Extension +-- ============================================ +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + +-- ============================================ +-- STEP 2: Create Users Table +-- ============================================ +-- Track users who can manage events +CREATE TABLE IF NOT EXISTS users ( + id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), + email TEXT NOT NULL UNIQUE, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP +); + +CREATE INDEX idx_users_email ON users(email); + +-- Migrate existing owners from guests table to users (optional, run after creating guests table) +-- INSERT INTO users (email) SELECT DISTINCT owner FROM guests WHERE owner IS NOT NULL AND owner != 'self-service' ON CONFLICT DO NOTHING; + +-- ============================================ +-- STEP 3: Create Events Table +-- ============================================ +-- Store multiple events +CREATE TABLE IF NOT EXISTS events ( + id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), + name TEXT NOT NULL, + date TIMESTAMP WITH TIME ZONE, + location TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP +); + +CREATE INDEX idx_events_created_at ON events(created_at); + +-- ============================================ +-- STEP 4: Create Event Members Table (Authorization) +-- ============================================ +-- Track which users are members of which events and their roles +CREATE TABLE IF NOT EXISTS event_members ( + id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), + event_id UUID NOT NULL REFERENCES events(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + role TEXT NOT NULL DEFAULT 'admin' CHECK (role IN ('admin', 'editor', 'viewer')), + display_name TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + UNIQUE(event_id, user_id) +); + +CREATE INDEX idx_event_members_event_id ON event_members(event_id); +CREATE INDEX idx_event_members_user_id ON event_members(user_id); +CREATE INDEX idx_event_members_event_user ON event_members(event_id, user_id); + +-- ============================================ +-- STEP 5: Create Guests Table (Refactored) +-- ============================================ +-- Store guest information scoped by event +CREATE TABLE IF NOT EXISTS guests_v2 ( + id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), + event_id UUID NOT NULL REFERENCES events(id) ON DELETE CASCADE, + added_by_user_id UUID NOT NULL REFERENCES users(id), + + -- Guest Information + first_name TEXT NOT NULL, + last_name TEXT NOT NULL, + email TEXT, + phone_number TEXT, + + -- RSVP & Preferences + rsvp_status TEXT NOT NULL DEFAULT 'invited' CHECK (rsvp_status IN ('invited', 'confirmed', 'declined')), + meal_preference TEXT, + + -- Plus One + has_plus_one BOOLEAN DEFAULT FALSE, + plus_one_name TEXT, + + -- Event Details + table_number TEXT, + side TEXT, -- e.g. "groom side" / "bride side" / "Dvir side" / "Vered side" + + -- Source Information + owner_email TEXT, -- Email of person who added this guest + source TEXT DEFAULT 'manual' CHECK (source IN ('google', 'manual', 'self-service')), + + -- Notes & Metadata + notes TEXT, + created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP +); + +-- Indexes for performance +CREATE INDEX idx_guests_event_id ON guests_v2(event_id); +CREATE INDEX idx_guests_added_by_user_id ON guests_v2(added_by_user_id); +CREATE INDEX idx_guests_event_user ON guests_v2(event_id, added_by_user_id); +CREATE INDEX idx_guests_phone_number ON guests_v2(phone_number); +CREATE INDEX idx_guests_event_phone ON guests_v2(event_id, phone_number); +CREATE INDEX idx_guests_event_status ON guests_v2(event_id, rsvp_status); +CREATE INDEX idx_guests_owner_email ON guests_v2(event_id, owner_email); +CREATE INDEX idx_guests_source ON guests_v2(event_id, source); + +-- Trigger for auto-updating updated_at on guests_v2 +CREATE OR REPLACE FUNCTION update_guests_v2_updated_at() +RETURNS TRIGGER AS $$ +BEGIN + NEW.updated_at = CURRENT_TIMESTAMP; + RETURN NEW; +END; +$$ LANGUAGE 'plpgsql'; + +CREATE TRIGGER update_guests_v2_timestamp + BEFORE UPDATE ON guests_v2 + FOR EACH ROW + EXECUTE FUNCTION update_guests_v2_updated_at(); + +-- ============================================ +-- STEP 6: Migration from Old Schema (Optional) +-- ============================================ +-- This section is optional and only needed if migrating existing data + +-- Create migration function to handle existing guests table +-- Run this if you have existing data in the old guests table + +/* +DO $$ +DECLARE + default_event_id UUID; + default_user_id UUID; +BEGIN + -- Create a default event for migration + INSERT INTO events (name, date, location) + VALUES ('Migrated Wedding', NOW(), 'Unknown') + RETURNING id INTO default_event_id; + + -- Create default user for unmapped owners + INSERT INTO users (email) + VALUES ('admin@example.com') + ON CONFLICT DO NOTHING; + + SELECT id INTO default_user_id FROM users WHERE email = 'admin@example.com'; + + -- Migrate data from old guests table to new one + INSERT INTO guests_v2 (event_id, added_by_user_id, first_name, last_name, phone, side, status, notes) + SELECT + default_event_id, + COALESCE( + (SELECT id FROM users WHERE email = guests.owner), + default_user_id + ), + guests.first_name, + guests.last_name, + COALESCE(guests.phone_number, ''), + NULL, + CASE + WHEN guests.rsvp_status = 'accepted' THEN 'confirmed' + WHEN guests.rsvp_status = 'declined' THEN 'declined' + ELSE 'invited' + END, + COALESCE( + 'Meal: ' || guests.meal_preference || '; Plus-one: ' || guests.plus_one_name, + notes + ) + FROM guests; + + -- Create event_members record for default user + INSERT INTO event_members (event_id, user_id, role, display_name) + VALUES (default_event_id, default_user_id, 'admin', 'Admin') + ON CONFLICT DO NOTHING; +END $$; +*/ + +-- ============================================ +-- STEP 7: ALTER Guests Table (if already exists - add missing columns) +-- ============================================ +-- Safe migration that handles existing data + +-- Migration logic using a PL/pgSQL block +DO $$ +BEGIN + -- Check if column exists before creating/renaming + -- If rsvp_status doesn't exist, handle the rename or creation + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'rsvp_status' + ) THEN + -- If old status column exists, rename it + IF EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'status' + ) THEN + ALTER TABLE guests_v2 RENAME COLUMN status TO rsvp_status; + ELSE + -- Add rsvp_status column with default + ALTER TABLE guests_v2 ADD COLUMN rsvp_status TEXT DEFAULT 'invited'; + END IF; + END IF; + + -- Handle phone_number migration + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'phone_number' + ) THEN + IF EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'phone' + ) THEN + ALTER TABLE guests_v2 RENAME COLUMN phone TO phone_number; + ELSE + ALTER TABLE guests_v2 ADD COLUMN phone_number TEXT; + END IF; + END IF; + + -- Add other missing columns + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'email' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN email TEXT; + END IF; + + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'meal_preference' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN meal_preference TEXT; + END IF; + + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'has_plus_one' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN has_plus_one BOOLEAN DEFAULT FALSE; + END IF; + + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'plus_one_name' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN plus_one_name TEXT; + END IF; + + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'table_number' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN table_number TEXT; + END IF; + + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'owner_email' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN owner_email TEXT; + END IF; + + IF NOT EXISTS ( + SELECT FROM information_schema.columns + WHERE table_name = 'guests_v2' AND column_name = 'source' + ) THEN + ALTER TABLE guests_v2 ADD COLUMN source TEXT DEFAULT 'manual'; + END IF; + + RAISE NOTICE 'Migration completed successfully'; +END $$; + +-- Update CHECK constraint for rsvp_status if needed +DO $$ +BEGIN + -- Drop old constraint if it exists + ALTER TABLE guests_v2 DROP CONSTRAINT IF EXISTS guests_v2_status_check; + -- Add new constraint + ALTER TABLE guests_v2 ADD CONSTRAINT guests_v2_rsvp_status_check + CHECK (rsvp_status IN ('invited', 'confirmed', 'declined')); +EXCEPTION WHEN OTHERS THEN + -- Constraint might already exist, that's okay + NULL; +END $$; + +-- Add source constraint +DO $$ +BEGIN + ALTER TABLE guests_v2 ADD CONSTRAINT guests_v2_source_check + CHECK (source IN ('google', 'manual', 'self-service')); +EXCEPTION WHEN OTHERS THEN + NULL; +END $$; + +-- Add missing indexes if they don't exist +CREATE INDEX IF NOT EXISTS idx_guests_owner_email ON guests_v2(event_id, owner_email); +CREATE INDEX IF NOT EXISTS idx_guests_source ON guests_v2(event_id, source); +CREATE INDEX IF NOT EXISTS idx_guests_phone_number ON guests_v2(phone_number); +CREATE INDEX IF NOT EXISTS idx_guests_event_phone_new ON guests_v2(event_id, phone_number); + diff --git a/backend/models.py b/backend/models.py index 4cd02d0..b1326e8 100644 --- a/backend/models.py +++ b/backend/models.py @@ -1,34 +1,105 @@ -from sqlalchemy import Boolean, Column, Integer, String, DateTime +from sqlalchemy import Boolean, Column, Integer, String, DateTime, ForeignKey, Text, Enum as SQLEnum +from sqlalchemy.dialects.postgresql import UUID +from sqlalchemy.orm import relationship from sqlalchemy.sql import func from database import Base +import uuid +import enum + + +class User(Base): + __tablename__ = "users" + + id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, index=True) + email = Column(String, unique=True, nullable=False, index=True) + created_at = Column(DateTime(timezone=True), server_default=func.now()) + + # Relationships + event_memberships = relationship("EventMember", back_populates="user", cascade="all, delete-orphan") + guests_added = relationship("Guest", back_populates="added_by_user", foreign_keys="Guest.added_by_user_id") + + +class Event(Base): + __tablename__ = "events" + + id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, index=True) + name = Column(String, nullable=False) + date = Column(DateTime(timezone=True), nullable=True) + location = Column(String, nullable=True) + created_at = Column(DateTime(timezone=True), server_default=func.now()) + updated_at = Column(DateTime(timezone=True), onupdate=func.now()) + + # Relationships + members = relationship("EventMember", back_populates="event", cascade="all, delete-orphan") + guests = relationship("Guest", back_populates="event", cascade="all, delete-orphan") + + +class RoleEnum(str, enum.Enum): + admin = "admin" + editor = "editor" + viewer = "viewer" + + +class EventMember(Base): + __tablename__ = "event_members" + + id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, index=True) + event_id = Column(UUID(as_uuid=True), ForeignKey("events.id", ondelete="CASCADE"), nullable=False, index=True) + user_id = Column(UUID(as_uuid=True), ForeignKey("users.id", ondelete="CASCADE"), nullable=False, index=True) + role = Column(SQLEnum(RoleEnum), default=RoleEnum.admin, nullable=False) + display_name = Column(String, nullable=True) + created_at = Column(DateTime(timezone=True), server_default=func.now()) + + # Relationships + event = relationship("Event", back_populates="members") + user = relationship("User", back_populates="event_memberships") + + __table_args__ = ( + __import__('sqlalchemy').UniqueConstraint('event_id', 'user_id', name='uq_event_user'), + ) + + +class GuestStatus(str, enum.Enum): + invited = "invited" + confirmed = "confirmed" + declined = "declined" class Guest(Base): - __tablename__ = "guests" + __tablename__ = "guests_v2" - id = Column(Integer, primary_key=True, index=True) + id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, index=True) + event_id = Column(UUID(as_uuid=True), ForeignKey("events.id", ondelete="CASCADE"), nullable=False, index=True) + added_by_user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=False, index=True) + + # Guest Information first_name = Column(String, nullable=False) last_name = Column(String, nullable=False) - email = Column(String, unique=True, index=True) - phone_number = Column(String) + email = Column(String, nullable=True) + phone = Column(String, nullable=True) # Legacy field - use phone_number instead + phone_number = Column(String, nullable=True) - # RSVP status: pending, accepted, declined - rsvp_status = Column(String, default="pending") + # RSVP & Preferences + rsvp_status = Column(SQLEnum(GuestStatus), default=GuestStatus.invited, nullable=False) + meal_preference = Column(String, nullable=True) - # Meal preferences - meal_preference = Column(String) # vegetarian, vegan, gluten-free, no-preference, etc. - - # Plus one information + # Plus One has_plus_one = Column(Boolean, default=False) plus_one_name = Column(String, nullable=True) - # Owner tracking (who added this guest) - owner = Column(String, nullable=True) # e.g., 'me', 'fiancé', or specific name + # Event Details + table_number = Column(String, nullable=True) + side = Column(String, nullable=True) # e.g. "groom side", "bride side" - # Additional notes - notes = Column(String, nullable=True) - table_number = Column(Integer, nullable=True) + # Source Information + owner_email = Column(String, nullable=True) # Email of person who added this guest + source = Column(String, default="manual", nullable=False) # 'google', 'manual', 'self-service' - # Timestamps + # Notes & Metadata + notes = Column(Text, nullable=True) created_at = Column(DateTime(timezone=True), server_default=func.now()) updated_at = Column(DateTime(timezone=True), onupdate=func.now()) + + # Relationships + event = relationship("Event", back_populates="guests") + added_by_user = relationship("User", back_populates="guests_added", foreign_keys=[added_by_user_id]) diff --git a/backend/schemas.py b/backend/schemas.py index 08cf6d0..6fad0cf 100644 --- a/backend/schemas.py +++ b/backend/schemas.py @@ -1,33 +1,49 @@ -from pydantic import BaseModel, EmailStr -from typing import Optional +from pydantic import BaseModel, EmailStr, Field +from typing import Optional, List from datetime import datetime +from uuid import UUID -class GuestBase(BaseModel): - first_name: str - last_name: str - email: Optional[EmailStr] = None - phone_number: Optional[str] = None - rsvp_status: str = "pending" - meal_preference: Optional[str] = None - has_plus_one: bool = False - plus_one_name: Optional[str] = None - owner: Optional[str] = None - notes: Optional[str] = None - table_number: Optional[int] = None +# ============================================ +# User Schemas +# ============================================ +class UserBase(BaseModel): + email: EmailStr -class GuestCreate(GuestBase): +class UserCreate(UserBase): pass -class GuestUpdate(GuestBase): - first_name: Optional[str] = None - last_name: Optional[str] = None +class User(UserBase): + id: UUID + created_at: datetime + + class Config: + from_attributes = True -class Guest(GuestBase): - id: int +# ============================================ +# Event Schemas +# ============================================ +class EventBase(BaseModel): + name: str + date: Optional[datetime] = None + location: Optional[str] = None + + +class EventCreate(EventBase): + pass + + +class EventUpdate(BaseModel): + name: Optional[str] = None + date: Optional[datetime] = None + location: Optional[str] = None + + +class Event(EventBase): + id: UUID created_at: datetime updated_at: Optional[datetime] = None @@ -35,8 +51,136 @@ class Guest(GuestBase): from_attributes = True +class EventWithMembers(Event): + members: List["EventMember"] = [] + + +# ============================================ +# Event Member Schemas +# ============================================ +class EventMemberBase(BaseModel): + role: str = "admin" # admin, editor, viewer + display_name: Optional[str] = None + + +class EventMemberCreate(BaseModel): + user_email: str = Field(..., description="Email address of the user to invite") + role: str = "admin" + display_name: Optional[str] = None + + +class EventMember(EventMemberBase): + id: UUID + event_id: UUID + user_id: UUID + created_at: datetime + user: Optional[User] = None + + class Config: + from_attributes = True + + +# ============================================ +# Guest Schemas +# ============================================ +class GuestBase(BaseModel): + first_name: str + last_name: str + email: Optional[str] = None + phone_number: Optional[str] = None + rsvp_status: str = "invited" # invited, confirmed, declined + meal_preference: Optional[str] = None + has_plus_one: bool = False + plus_one_name: Optional[str] = None + table_number: Optional[str] = None + side: Optional[str] = None # e.g., "groom side", "bride side" + notes: Optional[str] = None + + +class GuestCreate(GuestBase): + pass + + +class GuestUpdate(BaseModel): + first_name: Optional[str] = None + last_name: Optional[str] = None + email: Optional[str] = None + phone_number: Optional[str] = None + rsvp_status: Optional[str] = None + meal_preference: Optional[str] = None + has_plus_one: Optional[bool] = None + plus_one_name: Optional[str] = None + table_number: Optional[str] = None + side: Optional[str] = None + notes: Optional[str] = None + + +class Guest(GuestBase): + id: UUID + event_id: UUID + added_by_user_id: UUID + owner_email: Optional[str] = None + source: str = "manual" + created_at: datetime + updated_at: Optional[datetime] = None + + class Config: + from_attributes = True + + +# ============================================ +# Bulk Import Schemas +# ============================================ +class GuestImportItem(BaseModel): + first_name: str + last_name: str + email: Optional[str] = None + phone_number: Optional[str] = None + side: Optional[str] = None + notes: Optional[str] = None + + +class GuestBulkImport(BaseModel): + guests: List[GuestImportItem] + + +# ============================================ +# Filter/Search Schemas +# ============================================ +class GuestFilter(BaseModel): + search: Optional[str] = None + side: Optional[str] = None + status: Optional[str] = None + added_by: Optional[str] = None # "me" for current user + + +# ============================================ +# WhatsApp Schemas +# ============================================ +class WhatsAppMessage(BaseModel): + message: str + phone: Optional[str] = None # Optional: override guest's phone + + +class WhatsAppStatus(BaseModel): + message_id: str + status: str + timestamp: datetime + + +# ============================================ +# Google Contacts Import Schema +# ============================================ +class GoogleContactsImport(BaseModel): + access_token: str + owner: Optional[str] = "Google Import" + + +# ============================================ +# Public Guest Self-Service Schema +# ============================================ class GuestPublicUpdate(BaseModel): - """Schema for public guest self-service updates""" + """Schema for public guest self-service updates (phone-based lookup)""" first_name: Optional[str] = None last_name: Optional[str] = None rsvp_status: Optional[str] = None @@ -44,8 +188,3 @@ class GuestPublicUpdate(BaseModel): has_plus_one: Optional[bool] = None plus_one_name: Optional[str] = None - -class MergeRequest(BaseModel): - """Schema for merging guests""" - keep_id: int - merge_ids: list[int] diff --git a/backend/whatsapp.py b/backend/whatsapp.py new file mode 100644 index 0000000..a2bb60c --- /dev/null +++ b/backend/whatsapp.py @@ -0,0 +1,282 @@ +""" +WhatsApp Cloud API Service +Handles sending WhatsApp messages via Meta's API +""" +import os +import httpx +import re +from typing import Optional +from datetime import datetime + + +class WhatsAppError(Exception): + """Custom exception for WhatsApp API errors""" + pass + + +class WhatsAppService: + """Service for sending WhatsApp messages via Meta API""" + + def __init__(self): + self.access_token = os.getenv("WHATSAPP_ACCESS_TOKEN") + self.phone_number_id = os.getenv("WHATSAPP_PHONE_NUMBER_ID") + self.api_version = os.getenv("WHATSAPP_API_VERSION", "v20.0") + self.verify_token = os.getenv("WHATSAPP_VERIFY_TOKEN", "") + + if not self.access_token or not self.phone_number_id: + raise WhatsAppError( + "WHATSAPP_ACCESS_TOKEN and WHATSAPP_PHONE_NUMBER_ID must be set in environment" + ) + + self.base_url = f"https://graph.facebook.com/{self.api_version}" + self.headers = { + "Authorization": f"Bearer {self.access_token}", + "Content-Type": "application/json" + } + + @staticmethod + def normalize_phone_to_e164(phone: str) -> str: + """ + Normalize phone number to E.164 format + E.164 format: +[country code][number] with no spaces or punctuation + + Examples: + - "+1-555-123-4567" -> "+15551234567" + - "555-123-4567" -> "+15551234567" (assumes US) + - "+972541234567" -> "+972541234567" + """ + # Remove all non-digit characters except leading + + cleaned = re.sub(r"[^\d+]", "", phone).lstrip("0") + + # If it starts with +, assume it's already in correct format or close + if cleaned.startswith("+"): + return cleaned + + # If it's a US number (10 digits), prepend +1 + if len(cleaned) == 10 and all(c.isdigit() for c in cleaned): + return f"+1{cleaned}" + + # If it's already got country code but no +, add it + if len(cleaned) >= 11 and cleaned[0] != "+": + return f"+{cleaned}" + + return f"+{cleaned}" + + def validate_phone(self, phone: str) -> bool: + """ + Validate that phone number is valid E.164 format + """ + try: + e164 = self.normalize_phone_to_e164(phone) + # E.164 should start with + and be 10-15 digits total + return e164.startswith("+") and 10 <= len(e164) <= 15 and all(c.isdigit() for c in e164[1:]) + except Exception: + return False + + async def send_text_message( + self, + to_phone: str, + message_text: str, + context_message_id: Optional[str] = None + ) -> dict: + """ + Send a text message via WhatsApp Cloud API + + Args: + to_phone: Recipient phone number (will be normalized to E.164) + message_text: Message body + context_message_id: Optional message ID to reply to + + Returns: + dict with message_id and status + + Raises: + WhatsAppError: If message fails to send + """ + # Normalize phone number + to_e164 = self.normalize_phone_to_e164(to_phone) + + if not self.validate_phone(to_e164): + raise WhatsAppError(f"Invalid phone number: {to_phone}") + + # Build payload + payload = { + "messaging_product": "whatsapp", + "to": to_e164, + "type": "text", + "text": { + "body": message_text + } + } + + # Add context if provided (for replies) + if context_message_id: + payload["context"] = { + "message_id": context_message_id + } + + # Send to API + url = f"{self.base_url}/{self.phone_number_id}/messages" + + try: + async with httpx.AsyncClient() as client: + response = await client.post( + url, + json=payload, + headers=self.headers, + timeout=30.0 + ) + + if response.status_code not in (200, 201): + error_data = response.json() + error_msg = error_data.get("error", {}).get("message", "Unknown error") + raise WhatsAppError( + f"WhatsApp API error ({response.status_code}): {error_msg}" + ) + + result = response.json() + return { + "message_id": result.get("messages", [{}])[0].get("id"), + "status": "sent", + "to": to_e164, + "timestamp": datetime.utcnow().isoformat(), + "type": "text" + } + + except httpx.HTTPError as e: + raise WhatsAppError(f"HTTP request failed: {str(e)}") + except Exception as e: + raise WhatsAppError(f"Failed to send WhatsApp message: {str(e)}") + + async def send_template_message( + self, + to_phone: str, + template_name: str, + language_code: str = "en", + parameters: Optional[list] = None + ) -> dict: + """ + Send a pre-approved template message via WhatsApp Cloud API + + Args: + to_phone: Recipient phone number + template_name: Template name (must be approved by Meta) + language_code: Language code (default: en) + parameters: List of parameter values for template placeholders + + Returns: + dict with message_id and status + """ + to_e164 = self.normalize_phone_to_e164(to_phone) + + if not self.validate_phone(to_e164): + raise WhatsAppError(f"Invalid phone number: {to_phone}") + + payload = { + "messaging_product": "whatsapp", + "to": to_e164, + "type": "template", + "template": { + "name": template_name, + "language": { + "code": language_code + } + } + } + + if parameters: + payload["template"]["parameters"] = { + "body": { + "parameters": [{"type": "text", "text": str(p)} for p in parameters] + } + } + + url = f"{self.base_url}/{self.phone_number_id}/messages" + + try: + async with httpx.AsyncClient() as client: + response = await client.post( + url, + json=payload, + headers=self.headers, + timeout=30.0 + ) + + if response.status_code not in (200, 201): + error_data = response.json() + error_msg = error_data.get("error", {}).get("message", "Unknown error") + raise WhatsAppError( + f"WhatsApp API error ({response.status_code}): {error_msg}" + ) + + result = response.json() + return { + "message_id": result.get("messages", [{}])[0].get("id"), + "status": "sent", + "to": to_e164, + "timestamp": datetime.utcnow().isoformat(), + "type": "template", + "template": template_name + } + + except httpx.HTTPError as e: + raise WhatsAppError(f"HTTP request failed: {str(e)}") + except Exception as e: + raise WhatsAppError(f"Failed to send WhatsApp template: {str(e)}") + + def handle_webhook_verification(self, challenge: str) -> str: + """ + Handle webhook verification challenge from Meta + + Args: + challenge: The challenge string from Meta + + Returns: + The challenge string to echo back + """ + return challenge + + def verify_webhook_signature(self, body: str, signature: str) -> bool: + """ + Verify webhook signature from Meta + + Args: + body: Raw request body + signature: x-hub-signature header value + + Returns: + True if signature is valid + """ + import hmac + import hashlib + + if not self.verify_token: + return False + + # Extract signature from header (format: sha1=...) + try: + hash_algo, hash_value = signature.split("=") + except ValueError: + return False + + # Compute expected signature + expected_signature = hmac.new( + self.verify_token.encode(), + body.encode(), + hashlib.sha1 + ).hexdigest() + + # Constant-time comparison + return hmac.compare_digest(hash_value, expected_signature) + + +# Singleton instance +_whatsapp_service: Optional[WhatsAppService] = None + + +def get_whatsapp_service() -> WhatsAppService: + """Get or create WhatsApp service singleton""" + global _whatsapp_service + if _whatsapp_service is None: + _whatsapp_service = WhatsAppService() + return _whatsapp_service diff --git a/frontend/index.html b/frontend/index.html index 615996f..bd1e7f4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,13 +1,12 @@ - + -Completing authentication...
+Please wait, you'll be redirected shortly.
+{he.noEvents}
+ +📍 {event.location}
+ )} +📅 {formatDate(event.date)}
+ +