c51af68432
Benchmark-gated (benches/ROUND10.md; every change carries a BEFORE/AFTER harness with equivalence/safety gates — two designs were rejected or rewritten by their own benches before adoption): - Auth hot path: TokenClaims/CurrentUser display fields to Arc<str>, role to inline SmolStr end-to-end (Bearer, cookie, Basic-auth cache) — 4→1 allocs per authenticated request, 3→0 per warm DAV request; JWT Encoding/Decoding/Validation built once. - Cold shared-album herd: leader-inline parent batching in PgAclEngine (+ cascade try_get_with single-flight) — 100→2 parent queries per 100-thumb cold herd, herd wall 1.9x, sequential + warm paths unchanged, all ROUND8/9 safety gates plus new herd-equivalence gates. - Query-shape pack: share download double-fetch 2→1 (2.18x), contact-group COUNT(*) 14.9x, save_faces UNNEST 3.9x, playlist reorder UNNEST 63.7x (now atomic), search files∥folders join! 1.45x, move drive-lookup join! 2.14x, trash partial (drive_id, trashed_at) indexes, CalDAV event-gate narrow read, favorites/recents binary-decode port, dead count_files removed. - NC surface: preview + avatar honour If-None-Match (e2e: 5 KB and 197 KB → 0 bytes per revalidation), avatar WebP→PNG transcode memoised, PROPFIND/trashbin integer+date emits on stack formatters, folder-header enrichment join!, chunk-PUT retry stat folded into create_new open. - common::fmt integer rendering rewritten on the std 2-digit LUT after the round's own bench caught the div-loop losing to to_string (16.1 ns vs 22.5; speeds every prior-round call site). - Micro-pack: WebDAV scope probe borrow-only, ShareService base_url snapshot, cookie_secure OnceLock, Arc'd AES-GCM cipher, stack request-id, tantivy analyzer clone dropped. - SPA: search stale-guard + AbortController (10→1 completed round-trips, stale-clobber gone), getFolder in-flight dedup, gridColumns matchMedia hoist (10k→0 style reads). Backend: cargo fmt + clippy -D warnings clean, 524 tests green. Frontend: npm run check clean, 301 vitest green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018DdM7V7M3QPW7HEHg3gLov
249 lines
9.4 KiB
Rust
249 lines
9.4 KiB
Rust
use crate::application::dtos::calendar_dto::{
|
|
CalendarDto, CalendarEventDto, CreateCalendarDto, CreateEventDto, CreateEventICalDto,
|
|
UpdateCalendarDto, UpdateEventDto,
|
|
};
|
|
use crate::common::errors::DomainError;
|
|
use chrono::{DateTime, Utc};
|
|
use uuid::Uuid;
|
|
|
|
/// Result of a multi-VEVENT PUT (`upsert_ical_events`). See #528.
|
|
#[derive(Debug, Clone)]
|
|
pub struct UpsertEventsResult {
|
|
/// Every event that was persisted for this PUT. Ordered as they
|
|
/// appeared in the body — the master (if present) is typically
|
|
/// first, followed by exception overrides.
|
|
pub events: Vec<CalendarEventDto>,
|
|
/// True if at least one row was newly created; false if every
|
|
/// event replaced an existing row. Drives the handler's choice
|
|
/// between 201 Created and 204 No Content.
|
|
pub any_inserted: bool,
|
|
}
|
|
|
|
/// Port for external calendar storage mechanisms
|
|
pub trait CalendarStoragePort: Send + Sync + 'static {
|
|
// Calendar operations
|
|
async fn create_calendar(
|
|
&self,
|
|
calendar: CreateCalendarDto,
|
|
owner_id: Uuid,
|
|
) -> Result<CalendarDto, DomainError>;
|
|
async fn update_calendar(
|
|
&self,
|
|
calendar_id: &str,
|
|
update: UpdateCalendarDto,
|
|
) -> Result<CalendarDto, DomainError>;
|
|
async fn delete_calendar(&self, calendar_id: &str) -> Result<(), DomainError>;
|
|
async fn get_calendar(&self, calendar_id: &str) -> Result<CalendarDto, DomainError>;
|
|
|
|
/// Batch sibling of [`Self::get_calendar`]: hydrate a page of
|
|
/// grant-derived calendar ids in ONE storage round-trip. Missing
|
|
/// rows (deleted/trashed race) drop out silently; ordering is not
|
|
/// guaranteed.
|
|
async fn get_calendars_by_ids(&self, ids: &[Uuid]) -> Result<Vec<CalendarDto>, DomainError>;
|
|
async fn list_calendars_by_owner(
|
|
&self,
|
|
owner_id: Uuid,
|
|
) -> Result<Vec<CalendarDto>, DomainError>;
|
|
async fn list_public_calendars(
|
|
&self,
|
|
limit: i64,
|
|
offset: i64,
|
|
) -> Result<Vec<CalendarDto>, DomainError>;
|
|
// Calendar properties
|
|
async fn set_calendar_property(
|
|
&self,
|
|
calendar_id: &str,
|
|
property_name: &str,
|
|
property_value: &str,
|
|
) -> Result<(), DomainError>;
|
|
async fn get_calendar_property(
|
|
&self,
|
|
calendar_id: &str,
|
|
property_name: &str,
|
|
) -> Result<Option<String>, DomainError>;
|
|
async fn get_calendar_properties(
|
|
&self,
|
|
calendar_id: &str,
|
|
) -> Result<std::collections::HashMap<String, String>, DomainError>;
|
|
|
|
// Event operations
|
|
async fn create_event(&self, event: CreateEventDto) -> Result<CalendarEventDto, DomainError>;
|
|
async fn create_event_from_ical(
|
|
&self,
|
|
event: CreateEventICalDto,
|
|
) -> Result<CalendarEventDto, DomainError>;
|
|
/// Upsert every VEVENT in an iCalendar body — one master and zero
|
|
/// or more per-instance exception overrides (RFC 5545 §3.8.4.4).
|
|
///
|
|
/// Routing: an event whose `RECURRENCE-ID` is unset targets the
|
|
/// master row `(calendar_id, ical_uid) WHERE recurrence_id IS NULL`;
|
|
/// an event whose `RECURRENCE-ID` is set targets its own exception
|
|
/// row `(calendar_id, ical_uid, recurrence_id)` and never touches
|
|
/// the master. Existing rows are replaced (delete-then-insert to
|
|
/// stay compatible with the DB-level partial unique indexes and to
|
|
/// keep the ETag surface identical to the pre-#528 single-event
|
|
/// path).
|
|
///
|
|
/// See AtalayaLabs/OxiCloud#528.
|
|
async fn upsert_ical_events(
|
|
&self,
|
|
event: CreateEventICalDto,
|
|
) -> Result<UpsertEventsResult, DomainError>;
|
|
async fn update_event(
|
|
&self,
|
|
event_id: &str,
|
|
update: UpdateEventDto,
|
|
) -> Result<CalendarEventDto, DomainError>;
|
|
async fn delete_event(&self, event_id: &str) -> Result<(), DomainError>;
|
|
async fn get_event(&self, event_id: &str) -> Result<CalendarEventDto, DomainError>;
|
|
/// Narrow projection for authz gates: the owning calendar of an event
|
|
/// without hydrating the full event row (notably `ical_data`, the raw
|
|
/// iCalendar body, which can run to tens of KB on recurring events).
|
|
async fn calendar_id_for_event(&self, event_id: &str) -> Result<String, DomainError>;
|
|
/// Indexed single-row lookup by iCalendar UID — the CalDAV
|
|
/// object-resource paths must use this instead of listing the whole
|
|
/// calendar (every row + its `ical_data`) and filtering client-side.
|
|
async fn find_event_by_ical_uid(
|
|
&self,
|
|
calendar_id: &str,
|
|
ical_uid: &str,
|
|
) -> Result<Option<CalendarEventDto>, DomainError>;
|
|
/// Indexed batch lookup by iCalendar UID (`ical_uid = ANY(...)`) — the
|
|
/// CalDAV multiget REPORT must use this instead of listing the whole
|
|
/// calendar (every row + its `ical_data`) and filtering client-side.
|
|
async fn find_events_by_ical_uids(
|
|
&self,
|
|
calendar_id: &str,
|
|
ical_uids: &[String],
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
async fn list_events_by_calendar(
|
|
&self,
|
|
calendar_id: &str,
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
/// Cursor stream over the calendar's events in bundle order (see
|
|
/// the repository doc) — feeds the streaming CalDAV emitters.
|
|
fn stream_events_uid_order(
|
|
&self,
|
|
calendar_id: &str,
|
|
) -> futures::stream::BoxStream<'static, Result<CalendarEventDto, DomainError>>;
|
|
async fn list_events_by_calendar_paginated(
|
|
&self,
|
|
calendar_id: &str,
|
|
limit: i64,
|
|
offset: i64,
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
async fn get_events_in_time_range(
|
|
&self,
|
|
calendar_id: &str,
|
|
start: &DateTime<Utc>,
|
|
end: &DateTime<Utc>,
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
}
|
|
|
|
/// Port for calendar use cases.
|
|
///
|
|
/// All methods require an explicit `user_id` parameter for authorization.
|
|
/// The CalDAV protocol handler extracts the user identity from JWT claims
|
|
/// and passes it through.
|
|
pub trait CalendarUseCase: Send + Sync + 'static {
|
|
// Calendar operations
|
|
async fn create_calendar(
|
|
&self,
|
|
calendar: CreateCalendarDto,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarDto, DomainError>;
|
|
async fn update_calendar(
|
|
&self,
|
|
calendar_id: &str,
|
|
update: UpdateCalendarDto,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarDto, DomainError>;
|
|
async fn delete_calendar(&self, calendar_id: &str, user_id: Uuid) -> Result<(), DomainError>;
|
|
async fn get_calendar(
|
|
&self,
|
|
calendar_id: &str,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarDto, DomainError>;
|
|
async fn list_my_calendars(&self, user_id: Uuid) -> Result<Vec<CalendarDto>, DomainError>;
|
|
async fn list_public_calendars(
|
|
&self,
|
|
limit: Option<i64>,
|
|
offset: Option<i64>,
|
|
) -> Result<Vec<CalendarDto>, DomainError>;
|
|
|
|
// Event operations
|
|
async fn create_event(
|
|
&self,
|
|
event: CreateEventDto,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarEventDto, DomainError>;
|
|
async fn create_event_from_ical(
|
|
&self,
|
|
event: CreateEventICalDto,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarEventDto, DomainError>;
|
|
/// Route a PUT'd iCalendar body containing one or more VEVENTs to
|
|
/// their per-instance rows. See `CalendarStoragePort::upsert_ical_events`
|
|
/// for the routing rules; this method just adds the `Permission::Create`
|
|
/// gate for the caller.
|
|
async fn upsert_ical_events(
|
|
&self,
|
|
event: CreateEventICalDto,
|
|
user_id: Uuid,
|
|
) -> Result<UpsertEventsResult, DomainError>;
|
|
async fn update_event(
|
|
&self,
|
|
event_id: &str,
|
|
update: UpdateEventDto,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarEventDto, DomainError>;
|
|
async fn delete_event(&self, event_id: &str, user_id: Uuid) -> Result<(), DomainError>;
|
|
async fn get_event(
|
|
&self,
|
|
event_id: &str,
|
|
user_id: Uuid,
|
|
) -> Result<CalendarEventDto, DomainError>;
|
|
/// Resolve one event by its iCalendar UID (the identifier CalDAV
|
|
/// object resources are addressed by). `Ok(None)` when no event with
|
|
/// that UID exists in the calendar.
|
|
async fn get_event_by_ical_uid(
|
|
&self,
|
|
calendar_id: &str,
|
|
ical_uid: &str,
|
|
user_id: Uuid,
|
|
) -> Result<Option<CalendarEventDto>, DomainError>;
|
|
/// Resolve a batch of events by their iCalendar UIDs with a single
|
|
/// indexed query. UIDs without a matching event are silently absent
|
|
/// from the result (CalDAV multiget semantics).
|
|
async fn get_events_by_ical_uids(
|
|
&self,
|
|
calendar_id: &str,
|
|
ical_uids: &[String],
|
|
user_id: Uuid,
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
async fn list_events(
|
|
&self,
|
|
calendar_id: &str,
|
|
limit: Option<i64>,
|
|
offset: Option<i64>,
|
|
user_id: Uuid,
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
/// Streaming support: cursor over the calendar's events in bundle
|
|
/// order, behind the same Read authz gate as [`Self::list_events`].
|
|
async fn stream_events_uid_order(
|
|
&self,
|
|
calendar_id: &str,
|
|
user_id: Uuid,
|
|
) -> Result<
|
|
futures::stream::BoxStream<'static, Result<CalendarEventDto, DomainError>>,
|
|
DomainError,
|
|
>;
|
|
async fn get_events_in_range(
|
|
&self,
|
|
calendar_id: &str,
|
|
start: DateTime<Utc>,
|
|
end: DateTime<Utc>,
|
|
user_id: Uuid,
|
|
) -> Result<Vec<CalendarEventDto>, DomainError>;
|
|
}
|