mirror of
https://github.com/Monadical-SAS/reflector.git
synced 2025-12-20 12:19:06 +00:00
* feat: calendar integration
* feat: add ICS calendar API endpoints for room configuration and sync
* feat: add Celery background tasks for ICS sync
* feat: implement Phase 2 - Multiple active meetings per room with grace period
This commit adds support for multiple concurrent meetings per room, implementing
grace period logic and improved meeting lifecycle management for calendar integration.
## Database Changes
- Remove unique constraint preventing multiple active meetings per room
- Add last_participant_left_at field to track when meeting becomes empty
- Add grace_period_minutes field (default: 15) for configurable grace period
## Meeting Controller Enhancements
- Add get_all_active_for_room() to retrieve all active meetings for a room
- Add get_active_by_calendar_event() to find meetings by calendar event ID
- Maintain backward compatibility with existing get_active() method
## New API Endpoints
- GET /rooms/{room_name}/meetings/active - List all active meetings
- POST /rooms/{room_name}/meetings/{meeting_id}/join - Join specific meeting
## Meeting Lifecycle Improvements
- 15-minute grace period after last participant leaves
- Automatic reactivation when participant rejoins during grace period
- Force close calendar meetings 30 minutes after scheduled end time
- Update process_meetings task to handle multiple active meetings
## Whereby Integration
- Clear grace period when participants join via webhook events
- Track participant count for grace period management
## Testing
- Add comprehensive tests for multiple active meetings
- Test grace period behavior and participant rejoin scenarios
- Test calendar meeting force closure logic
- All 5 new tests passing
This enables proper calendar integration with overlapping meetings while
preventing accidental meeting closures through the grace period mechanism.
* feat: implement frontend for calendar integration (Phase 3 & 4)
- Created MeetingSelection component for choosing between multiple active meetings
- Shows both active meetings and upcoming calendar events (30 min ahead)
- Displays meeting metadata with privacy controls (owner-only details)
- Supports creation of unscheduled meetings alongside calendar meetings
- Added waiting page for users joining before scheduled start time
- Shows countdown timer until meeting begins
- Auto-transitions to meeting when calendar event becomes active
- Handles early joining with proper routing
- Created collapsible info panel showing meeting details
- Displays calendar metadata (title, description, attendees)
- Shows participant count and duration
- Privacy-aware: sensitive info only visible to room owners
- Integrated ICS settings into room configuration dialog
- Test connection functionality with immediate feedback
- Manual sync trigger with detailed results
- Shows last sync time and ETag for monitoring
- Configurable sync intervals (1 min to 1 hour)
- New /room/{roomName} route for meeting selection
- Waiting room at /room/{roomName}/wait?eventId={id}
- Classic room page at /{roomName} with meeting info
- Uses sessionStorage to pass selected meeting between pages
- Added new endpoints for active/upcoming meetings
- Regenerated TypeScript client with latest OpenAPI spec
- Proper error handling and loading states
- Auto-refresh every 30 seconds for live updates
- Color-coded badges for meeting status
- Attendee status indicators (accepted/declined/tentative)
- Responsive design with Chakra UI components
- Clear visual hierarchy between active and upcoming meetings
- Smart truncation for long attendee lists
This completes the frontend implementation for calendar integration,
enabling users to seamlessly join scheduled meetings from their
calendar applications.
* WIP: Migrate calendar integration frontend to React Query
- Migrate all calendar components from useApi to React Query hooks
- Fix Chakra UI v3 compatibility issues (Card, Progress, spacing props, leftIcon)
- Update backend Meeting model to include calendar fields
- Replace imperative API calls with declarative React Query patterns
- Remove old OpenAPI generated files that conflict with new structure
* fix: alembic migrations
* feat: add calendar migration
* feat: update ics, first version working
* feat: implement tabbed interface for room edit dialog
- Add General, Calendar, and Share tabs to organize room settings
- Move ICS settings to dedicated Calendar tab
- Move Zulip configuration to Share tab
- Keep basic room settings and webhooks in General tab
- Remove redundant migration file
- Fix Chakra UI v3 compatibility issues in calendar components
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* fix: infinite loop
* feat: improve ICS calendar sync UX and fix room URL matching
- Replace "Test Connection" button with "Force Sync" button (Edit Room only)
- Show detailed sync results: total events downloaded vs room matches
- Remove emoticons and auto-hide timeout for cleaner UX
- Fix room URL matching to use UI_BASE_URL instead of BASE_URL
- Replace FaSync icon with LuRefreshCw for consistency
- Clear sync results when dialog closes or Force Sync pressed
- Update tests to reflect UI_BASE_URL change and exact URL matching
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* feat: reorganize room edit dialog and fix Force Sync button
- Move WebHook configuration from General to dedicated WebHook tab
- Add WebHook tab after Share tab in room edit dialog
- Fix Force Sync button not appearing by adding missing isEditing prop
- Fix indentation issues in MeetingSelection component
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* feat: complete calendar integration with UI improvements and code cleanup
Calendar Integration Tasks:
- Update upcoming meetings window from 30 to 120 minutes
- Include currently happening events in upcoming meetings API
- Create shared time utility functions (formatDateTime, formatCountdown, formatStartedAgo)
- Improve ongoing meetings UI logic with proper time detection
- Fix backend code organization and remove excessive documentation
UI/UX Improvements:
- Restructure room page layout using MinimalHeader pattern
- Remove borders from header and footer elements
- Change button text from "Leave Meeting" to "Leave Room"
- Remove "Back to Reflector" footer for cleaner design
- Extract WaitPageClient component for better separation
Backend Changes:
- calendar_events.py: Fix import organization and extend timing window
- rooms.py: Update API default from 30 to 120 minutes
- Enhanced test coverage for ongoing meeting scenarios
Frontend Changes:
- MinimalHeader: Add onLeave prop for custom navigation
- MeetingSelection: Complete layout restructure with shared utilities
- timeUtils: New shared utility file for consistent time formatting
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* feat: remove wait page and simplify Join button with 5-minute disable logic
- Remove entire wait page directory and associated files
- Update handleJoinUpcoming to create unscheduled meeting directly
- Simplify Join button to single state:
- Always shows "Join" text
- Blue when meeting can be joined (ongoing or within 5 minutes)
- Gray/disabled when more than 5 minutes away
- Remove confusing "Join Now", "Join Early" text variations
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* feat: improve calendar integration and meeting UI
- Refactor ICS sync tasks to use @asynctask decorator for cleaner async handling
- Extract meeting creation logic into reusable function
- Improve meeting selection UI with distinct current/upcoming sections
- Add early join functionality for upcoming meetings within 5-minute window
- Simplify non-ICS room workflow with direct Whereby embed
- Fix import paths and component organization
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <noreply@anthropic.com>
* feat: restore original recording consent functionality
- Remove custom ConsentDialogButton and WherebyEmbed components
- Merge RoomClient logic back into main room page
- Restore original consent UI: blue button with toast modal
- Maintain calendar integration features for ICS-enabled rooms
- Add consent-handler.md documentation of original functionality
- Preserve focus management and accessibility features
* fix: redirect Join Now button to local meeting page
- Change handleJoinDirect to use onMeetingSelect instead of opening external URL
- Join Now button now navigates to /{roomName}/{meetingId} instead of whereby.com
- Maintains proper routing within the application
* feat: remove restrictive message for non-owners in private rooms
- Remove confusing message about room owner permissions
- Cleaner UI for all users regardless of ownership status
- Users will only see available meetings and join options
* feat: improve meeting selection UI for better readability
- Limit page content to max 800px width for better 4K display readability
- Remove LIVE tag badge for cleaner interface
- Remove shadow from main live meeting box
- Remove blue border and hover effects for minimal design
- Change background to neutral gray for less visual noise
* feat: add room by name endpoint for non-authenticated access
- Add GET /rooms/name/{room_name} backend endpoint
- Endpoint supports non-authenticated access for public rooms
- Returns RoomDetails with webhook fields hidden for non-owners
- Update useRoomGetByName hook to use new direct endpoint
- Remove authentication requirement from frontend hook
- Regenerate API client types
Fixes: Non-authenticated users can now access room lobbies
* feat: add friendly message when no meetings are ongoing
- Show centered message with calendar icon when no meetings are active
- Message text: 'No meetings right now' with helpful description
- Contextual text for owners/shared rooms mentioning quick meeting option
- Consistent gray styling matching the rest of the interface
- Only displays when both currentMeetings and upcomingMeetings are empty
* style: center no meetings message and remove background
- Change from Box to Flex with flex=1 for vertical centering
- Remove gray background, border radius, and padding
- Message now appears cleanly centered in available space
- Maintains horizontal and vertical centering
* feat: move Create Meeting button to header
- Remove 'Start a Quick Meeting' box from main content area
- Add showCreateButton and onCreateMeeting props to MinimalHeader
- Create Meeting button now appears in header left of Leave Room
- Only shows for room owners or shared room users
- Update no meetings message to remove reference to quick meeting below
- Cleaner, more accessible UI with actions in the header
* style: change room title and no meetings text to pure black
- Update room title in MinimalHeader from gray.700 to black
- Update 'No meetings right now' text from gray.700 to black
- Improves visual hierarchy and readability
- Consistent with other pages' styling
* style: linting
* fix: remove plan files
* fix: alembic migration with named foreign keys
* feat: add SyncStatus enum and refactor ICS sync to use rooms controller
- Add SyncStatus enum to replace string literals in ICS sync status
- Replace direct SQL queries in worker with rooms_controller.get_ics_enabled()
- Improve type safety and maintainability of ICS sync code
- Enum values: SUCCESS, UNCHANGED, ERROR, SKIPPED maintain backward compatibility
* refactor: remove unnecessary docstring from get_ics_enabled method
The function name is self-explanatory
* fix: import top level
* feat: use Literal type for ICSStatus.status field
- Changed ICSStatus.status from str to Literal['enabled', 'disabled']
- Improves type safety and API documentation
* feat: update TypeScript definitions for ICSStatus Literal type
- OpenAPI generation now properly reflects Literal['enabled', 'disabled'] type
- Improves type safety for frontend consumers of the API
- Applied automatic formatting via pre-commit hooks
* refactor: replace loguru with structlog in ics_sync service
- Replace loguru import with structlog in services/ics_sync.py
- Update logging calls to use structlog's structured format with keyword args
- Maintains consistency with other services using structlog
- Changes: logger.info(f'...') -> logger.info('...', key=value) format
* chore: remove loguru dependency and improve type annotations
- Remove loguru from dependencies in pyproject.toml (replaced with structlog)
- Update meeting controller methods to properly return Optional types
- Update dependency lock file after loguru removal
* fix: resolve pyflakes warnings in ics_sync and meetings modules
Remove unused imports and variables to clean up code quality
* Remove grace period logic and improve meeting deactivation
- Removed grace_period_minutes and last_participant_left_at fields
- Simplified deactivation logic based on actual usage patterns:
* Active sessions: Keep meeting active regardless of scheduled time
* Calendar meetings: Wait until scheduled end if unused, deactivate immediately once used and empty
* On-the-fly meetings: Deactivate immediately when empty
- Created migration to drop unused database columns
- Updated tests to remove grace period test cases
* Update test to match new deactivation logic for calendar meetings
* fix: remove unwanted file
* fix: incompleted changes from EVENT_WINDOW*
* fix: update room ICS API tests to include required webhook fields and correct URL
- Add webhook_url and webhook_secret fields to room creation tests
- Fix room URL matching in ICS sync test to use UI_BASE_URL instead of BASE_URL
- Aligns test with actual API requirements and ICS sync service implementation
* fix: add Redis distributed locking to prevent race conditions in process_meetings
- Implement per-meeting locks using Redis to prevent concurrent processing
- Add lock extension after slow API calls (Whereby) to handle long-running operations
- Use redis-py's built-in lock.extend() with replace_ttl=True for simple TTL refresh
- Track and log skipped meetings when locked by other workers
- Document SSRF analysis showing it's low-risk due to async worker isolation
This prevents multiple workers from processing the same meeting simultaneously,
which could cause state corruption or duplicate deactivations.
* refactor: rename MinimalHeader to MeetingMinimalHeader for clarity
* fix: minor code quality improvements - add emoji constants, fix type safety, cleanup comments
* fix: database migration
* self-pr review
* self-pr review
* self-pr review treeshake
* fix: local fixes
* fix: creation of meeting
* fix: meeting selection create button
* compile fix
* fix: meeting selection responsive
* fix: rework process logic for meeting
* fix: meeting useEffect frontend-only dedupe (#647)
* meeting useEffect frontend-only dedupe
* format
* also get room by name backend fix
---------
Co-authored-by: Igor Loskutov <igor.loskutoff@gmail.com>
* invalidate meeting list on new meeting
* test fix
* room url copy button for ics
* calendar refresh quick action icon
* remove work.md
* meeting page frontend fixes
* hide number of meeting participants
* Revert "hide number of meeting participants"
This reverts commit 38906c5d1a.
* ui bits
* ui bits
* remove log
* room name typing stricten
* feat: protect atomic operation involving external service with redlock
---------
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Igor Monadical <igor@monadical.com>
Co-authored-by: Igor Loskutov <igor.loskutoff@gmail.com>
425 lines
13 KiB
Python
425 lines
13 KiB
Python
"""
|
|
Tests for CalendarEvent model.
|
|
"""
|
|
|
|
from datetime import datetime, timedelta, timezone
|
|
|
|
import pytest
|
|
|
|
from reflector.db.calendar_events import CalendarEvent, calendar_events_controller
|
|
from reflector.db.rooms import rooms_controller
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_create():
|
|
"""Test creating a calendar event."""
|
|
# Create a room first
|
|
room = await rooms_controller.add(
|
|
name="test-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
# Create calendar event
|
|
now = datetime.now(timezone.utc)
|
|
event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="test-event-123",
|
|
title="Team Meeting",
|
|
description="Weekly team sync",
|
|
start_time=now + timedelta(hours=1),
|
|
end_time=now + timedelta(hours=2),
|
|
location=f"https://example.com/{room.name}",
|
|
attendees=[
|
|
{"email": "alice@example.com", "name": "Alice", "status": "ACCEPTED"},
|
|
{"email": "bob@example.com", "name": "Bob", "status": "TENTATIVE"},
|
|
],
|
|
)
|
|
|
|
# Save event
|
|
saved_event = await calendar_events_controller.upsert(event)
|
|
|
|
assert saved_event.ics_uid == "test-event-123"
|
|
assert saved_event.title == "Team Meeting"
|
|
assert saved_event.room_id == room.id
|
|
assert len(saved_event.attendees) == 2
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_get_by_room():
|
|
"""Test getting calendar events for a room."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="events-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
now = datetime.now(timezone.utc)
|
|
|
|
# Create multiple events
|
|
for i in range(3):
|
|
event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid=f"event-{i}",
|
|
title=f"Meeting {i}",
|
|
start_time=now + timedelta(hours=i),
|
|
end_time=now + timedelta(hours=i + 1),
|
|
)
|
|
await calendar_events_controller.upsert(event)
|
|
|
|
# Get events for room
|
|
events = await calendar_events_controller.get_by_room(room.id)
|
|
|
|
assert len(events) == 3
|
|
assert all(e.room_id == room.id for e in events)
|
|
assert events[0].title == "Meeting 0"
|
|
assert events[1].title == "Meeting 1"
|
|
assert events[2].title == "Meeting 2"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_get_upcoming():
|
|
"""Test getting upcoming events within time window."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="upcoming-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
now = datetime.now(timezone.utc)
|
|
|
|
# Create events at different times
|
|
# Past event (should not be included)
|
|
past_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="past-event",
|
|
title="Past Meeting",
|
|
start_time=now - timedelta(hours=2),
|
|
end_time=now - timedelta(hours=1),
|
|
)
|
|
await calendar_events_controller.upsert(past_event)
|
|
|
|
# Upcoming event within 30 minutes
|
|
upcoming_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="upcoming-event",
|
|
title="Upcoming Meeting",
|
|
start_time=now + timedelta(minutes=15),
|
|
end_time=now + timedelta(minutes=45),
|
|
)
|
|
await calendar_events_controller.upsert(upcoming_event)
|
|
|
|
# Currently happening event (started 10 minutes ago, ends in 20 minutes)
|
|
current_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="current-event",
|
|
title="Current Meeting",
|
|
start_time=now - timedelta(minutes=10),
|
|
end_time=now + timedelta(minutes=20),
|
|
)
|
|
await calendar_events_controller.upsert(current_event)
|
|
|
|
# Future event beyond 30 minutes
|
|
future_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="future-event",
|
|
title="Future Meeting",
|
|
start_time=now + timedelta(hours=2),
|
|
end_time=now + timedelta(hours=3),
|
|
)
|
|
await calendar_events_controller.upsert(future_event)
|
|
|
|
# Get upcoming events (default 120 minutes) - should include current, upcoming, and future
|
|
upcoming = await calendar_events_controller.get_upcoming(room.id)
|
|
|
|
assert len(upcoming) == 3
|
|
# Events should be sorted by start_time (current event first, then upcoming, then future)
|
|
assert upcoming[0].ics_uid == "current-event"
|
|
assert upcoming[1].ics_uid == "upcoming-event"
|
|
assert upcoming[2].ics_uid == "future-event"
|
|
|
|
# Get upcoming with custom window
|
|
upcoming_extended = await calendar_events_controller.get_upcoming(
|
|
room.id, minutes_ahead=180
|
|
)
|
|
|
|
assert len(upcoming_extended) == 3
|
|
# Events should be sorted by start_time
|
|
assert upcoming_extended[0].ics_uid == "current-event"
|
|
assert upcoming_extended[1].ics_uid == "upcoming-event"
|
|
assert upcoming_extended[2].ics_uid == "future-event"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_get_upcoming_includes_currently_happening():
|
|
"""Test that get_upcoming includes currently happening events but excludes ended events."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="current-happening-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
now = datetime.now(timezone.utc)
|
|
|
|
# Event that ended in the past (should NOT be included)
|
|
past_ended_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="past-ended-event",
|
|
title="Past Ended Meeting",
|
|
start_time=now - timedelta(hours=2),
|
|
end_time=now - timedelta(minutes=30),
|
|
)
|
|
await calendar_events_controller.upsert(past_ended_event)
|
|
|
|
# Event currently happening (started 10 minutes ago, ends in 20 minutes) - SHOULD be included
|
|
currently_happening_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="currently-happening",
|
|
title="Currently Happening Meeting",
|
|
start_time=now - timedelta(minutes=10),
|
|
end_time=now + timedelta(minutes=20),
|
|
)
|
|
await calendar_events_controller.upsert(currently_happening_event)
|
|
|
|
# Event starting soon (in 5 minutes) - SHOULD be included
|
|
upcoming_soon_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="upcoming-soon",
|
|
title="Upcoming Soon Meeting",
|
|
start_time=now + timedelta(minutes=5),
|
|
end_time=now + timedelta(minutes=35),
|
|
)
|
|
await calendar_events_controller.upsert(upcoming_soon_event)
|
|
|
|
# Get upcoming events
|
|
upcoming = await calendar_events_controller.get_upcoming(room.id, minutes_ahead=30)
|
|
|
|
# Should only include currently happening and upcoming soon events
|
|
assert len(upcoming) == 2
|
|
assert upcoming[0].ics_uid == "currently-happening"
|
|
assert upcoming[1].ics_uid == "upcoming-soon"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_upsert():
|
|
"""Test upserting (create/update) calendar events."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="upsert-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
now = datetime.now(timezone.utc)
|
|
|
|
# Create new event
|
|
event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="upsert-test",
|
|
title="Original Title",
|
|
start_time=now,
|
|
end_time=now + timedelta(hours=1),
|
|
)
|
|
|
|
created = await calendar_events_controller.upsert(event)
|
|
assert created.title == "Original Title"
|
|
|
|
# Update existing event
|
|
event.title = "Updated Title"
|
|
event.description = "Added description"
|
|
|
|
updated = await calendar_events_controller.upsert(event)
|
|
assert updated.title == "Updated Title"
|
|
assert updated.description == "Added description"
|
|
assert updated.ics_uid == "upsert-test"
|
|
|
|
# Verify only one event exists
|
|
events = await calendar_events_controller.get_by_room(room.id)
|
|
assert len(events) == 1
|
|
assert events[0].title == "Updated Title"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_soft_delete():
|
|
"""Test soft deleting events no longer in calendar."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="delete-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
now = datetime.now(timezone.utc)
|
|
|
|
# Create multiple events
|
|
for i in range(4):
|
|
event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid=f"event-{i}",
|
|
title=f"Meeting {i}",
|
|
start_time=now + timedelta(hours=i),
|
|
end_time=now + timedelta(hours=i + 1),
|
|
)
|
|
await calendar_events_controller.upsert(event)
|
|
|
|
# Soft delete events not in current list
|
|
current_ids = ["event-0", "event-2"] # Keep events 0 and 2
|
|
deleted_count = await calendar_events_controller.soft_delete_missing(
|
|
room.id, current_ids
|
|
)
|
|
|
|
assert deleted_count == 2 # Should delete events 1 and 3
|
|
|
|
# Get non-deleted events
|
|
events = await calendar_events_controller.get_by_room(
|
|
room.id, include_deleted=False
|
|
)
|
|
assert len(events) == 2
|
|
assert {e.ics_uid for e in events} == {"event-0", "event-2"}
|
|
|
|
# Get all events including deleted
|
|
all_events = await calendar_events_controller.get_by_room(
|
|
room.id, include_deleted=True
|
|
)
|
|
assert len(all_events) == 4
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_past_events_not_deleted():
|
|
"""Test that past events are not soft deleted."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="past-events-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
now = datetime.now(timezone.utc)
|
|
|
|
# Create past event
|
|
past_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="past-event",
|
|
title="Past Meeting",
|
|
start_time=now - timedelta(hours=2),
|
|
end_time=now - timedelta(hours=1),
|
|
)
|
|
await calendar_events_controller.upsert(past_event)
|
|
|
|
# Create future event
|
|
future_event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="future-event",
|
|
title="Future Meeting",
|
|
start_time=now + timedelta(hours=1),
|
|
end_time=now + timedelta(hours=2),
|
|
)
|
|
await calendar_events_controller.upsert(future_event)
|
|
|
|
# Try to soft delete all events (only future should be deleted)
|
|
deleted_count = await calendar_events_controller.soft_delete_missing(room.id, [])
|
|
|
|
assert deleted_count == 1 # Only future event deleted
|
|
|
|
# Verify past event still exists
|
|
events = await calendar_events_controller.get_by_room(
|
|
room.id, include_deleted=False
|
|
)
|
|
assert len(events) == 1
|
|
assert events[0].ics_uid == "past-event"
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_calendar_event_with_raw_ics_data():
|
|
"""Test storing raw ICS data with calendar event."""
|
|
# Create room
|
|
room = await rooms_controller.add(
|
|
name="raw-ics-room",
|
|
user_id="test-user",
|
|
zulip_auto_post=False,
|
|
zulip_stream="",
|
|
zulip_topic="",
|
|
is_locked=False,
|
|
room_mode="normal",
|
|
recording_type="cloud",
|
|
recording_trigger="automatic-2nd-participant",
|
|
is_shared=False,
|
|
)
|
|
|
|
raw_ics = """BEGIN:VEVENT
|
|
UID:test-raw-123
|
|
SUMMARY:Test Event
|
|
DTSTART:20240101T100000Z
|
|
DTEND:20240101T110000Z
|
|
END:VEVENT"""
|
|
|
|
event = CalendarEvent(
|
|
room_id=room.id,
|
|
ics_uid="test-raw-123",
|
|
title="Test Event",
|
|
start_time=datetime.now(timezone.utc),
|
|
end_time=datetime.now(timezone.utc) + timedelta(hours=1),
|
|
ics_raw_data=raw_ics,
|
|
)
|
|
|
|
saved = await calendar_events_controller.upsert(event)
|
|
|
|
assert saved.ics_raw_data == raw_ics
|
|
|
|
# Retrieve and verify
|
|
retrieved = await calendar_events_controller.get_by_ics_uid(room.id, "test-raw-123")
|
|
assert retrieved is not None
|
|
assert retrieved.ics_raw_data == raw_ics
|