feat: Jellyfin/Plex auto-import via watch queue
Some checks failed
CI / Check / Test (push) Failing after 6m5s

Webhook ingestion from media servers — movies land in a pending
watch queue, user rates and confirms to create diary entries.

- domain: WatchEvent, WebhookToken models, MediaServerParser port
- adapters: jellyfin + plex parser crates, SQLite + Postgres repos
- application: ingest/confirm/dismiss/cleanup use cases, token mgmt
- presentation: webhook endpoints (bearer + query param auth),
  watch queue + integrations settings HTML pages, OpenAPI docs
- worker: WatchEventCleanupJob (daily, 30d retention)

Movie resolution deferred to confirm — single canonical path
through log_review for enrichment, poster fetch, federation.
This commit is contained in:
2026-06-02 17:34:16 +02:00
parent 6bd728fd50
commit aadad3cfb0
65 changed files with 2946 additions and 38 deletions

View File

@@ -0,0 +1,28 @@
CREATE TABLE IF NOT EXISTS webhook_tokens (
id TEXT PRIMARY KEY NOT NULL,
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
token_hash TEXT NOT NULL,
provider TEXT NOT NULL,
label TEXT,
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
last_used_at TIMESTAMPTZ
);
CREATE INDEX IF NOT EXISTS idx_webhook_tokens_hash ON webhook_tokens(token_hash);
CREATE INDEX IF NOT EXISTS idx_webhook_tokens_user ON webhook_tokens(user_id);
CREATE TABLE IF NOT EXISTS watch_events (
id TEXT PRIMARY KEY NOT NULL,
user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
movie_id TEXT REFERENCES movies(id) ON DELETE SET NULL,
title TEXT NOT NULL,
year INTEGER,
external_metadata_id TEXT,
source TEXT NOT NULL,
watched_at TIMESTAMPTZ NOT NULL,
status TEXT NOT NULL DEFAULT 'pending',
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
);
CREATE INDEX IF NOT EXISTS idx_watch_events_user_status ON watch_events(user_id, status);
CREATE INDEX IF NOT EXISTS idx_watch_events_dedup ON watch_events(user_id, external_metadata_id, created_at);

View File

@@ -21,6 +21,7 @@ mod persons;
mod profile;
mod profile_fields;
mod users;
mod watch_event;
mod watchlist;
use models::{
@@ -36,6 +37,7 @@ pub use persons::{PostgresPersonAdapter, create_person_adapter};
pub use profile::PostgresMovieProfileRepository;
pub use profile_fields::PostgresProfileFieldsRepository;
pub use users::PostgresUserRepository;
pub use watch_event::{PostgresWatchEventRepository, PostgresWebhookTokenRepository};
pub use watchlist::PostgresWatchlistRepository;
fn format_year_month(ym: &str) -> String {

View File

@@ -0,0 +1,317 @@
use async_trait::async_trait;
use domain::{
errors::DomainError,
models::{PersistedWatchEvent, WatchEvent, WatchEventSource, WatchEventStatus, WebhookToken},
ports::{WatchEventRepository, WebhookTokenRepository},
value_objects::{MovieId, UserId, WatchEventId, WebhookTokenId},
};
use sqlx::{PgPool, Row};
use crate::models::{parse_datetime, parse_uuid};
fn map_err(e: sqlx::Error) -> DomainError {
tracing::error!("Database error: {:?}", e);
DomainError::InfrastructureError("Database operation failed".into())
}
// ── WatchEventRepository ──────────────────────────────────────────────────────
pub struct PostgresWatchEventRepository {
pool: PgPool,
}
impl PostgresWatchEventRepository {
pub fn new(pool: PgPool) -> Self {
Self { pool }
}
}
#[async_trait]
impl WatchEventRepository for PostgresWatchEventRepository {
async fn save(&self, event: &WatchEvent) -> Result<(), DomainError> {
let id = event.id().value().to_string();
let user_id = event.user_id().value().to_string();
let movie_id = event.movie_id().map(|m| m.value().to_string());
let source = event.source().to_string();
let status = event.status().to_string();
sqlx::query(
"INSERT INTO watch_events \
(id, user_id, movie_id, title, year, external_metadata_id, source, watched_at, status, created_at) \
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
)
.bind(&id)
.bind(&user_id)
.bind(&movie_id)
.bind(event.title())
.bind(event.year().map(|y| y as i32))
.bind(event.external_metadata_id())
.bind(&source)
.bind(event.watched_at())
.bind(&status)
.bind(event.created_at())
.execute(&self.pool)
.await
.map_err(map_err)?;
Ok(())
}
async fn update_status(
&self,
id: &WatchEventId,
status: WatchEventStatus,
) -> Result<(), DomainError> {
let id_str = id.value().to_string();
let status_str = status.to_string();
sqlx::query("UPDATE watch_events SET status = $1 WHERE id = $2")
.bind(&status_str)
.bind(&id_str)
.execute(&self.pool)
.await
.map_err(map_err)?;
Ok(())
}
async fn list_pending(&self, user_id: &UserId) -> Result<Vec<WatchEvent>, DomainError> {
let uid = user_id.value().to_string();
let rows = sqlx::query(
"SELECT id, user_id, movie_id, title, year, external_metadata_id, \
source, \
to_char(watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at, \
status, \
to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at \
FROM watch_events \
WHERE user_id = $1 AND status = 'pending' \
ORDER BY watched_at DESC",
)
.bind(&uid)
.fetch_all(&self.pool)
.await
.map_err(map_err)?;
rows.iter().map(row_to_watch_event).collect()
}
async fn get_by_id(&self, id: &WatchEventId) -> Result<Option<WatchEvent>, DomainError> {
let id_str = id.value().to_string();
let row = sqlx::query(
"SELECT id, user_id, movie_id, title, year, external_metadata_id, \
source, \
to_char(watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at, \
status, \
to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at \
FROM watch_events WHERE id = $1",
)
.bind(&id_str)
.fetch_optional(&self.pool)
.await
.map_err(map_err)?;
row.as_ref().map(row_to_watch_event).transpose()
}
async fn find_duplicate(
&self,
user_id: &UserId,
external_id: &str,
after: chrono::NaiveDateTime,
) -> Result<bool, DomainError> {
let uid = user_id.value().to_string();
let count: i64 = sqlx::query_scalar(
"SELECT COUNT(*) FROM watch_events \
WHERE user_id = $1 AND external_metadata_id = $2 AND created_at > $3",
)
.bind(&uid)
.bind(external_id)
.bind(after)
.fetch_one(&self.pool)
.await
.map_err(map_err)?;
Ok(count > 0)
}
async fn delete_non_pending_older_than(
&self,
before: chrono::NaiveDateTime,
) -> Result<u64, DomainError> {
let result =
sqlx::query("DELETE FROM watch_events WHERE status != 'pending' AND created_at < $1")
.bind(before)
.execute(&self.pool)
.await
.map_err(map_err)?;
Ok(result.rows_affected())
}
}
fn row_to_watch_event(row: &sqlx::postgres::PgRow) -> Result<WatchEvent, DomainError> {
let id_str: String = row.try_get("id").map_err(map_err)?;
let user_id_str: String = row.try_get("user_id").map_err(map_err)?;
let movie_id_str: Option<String> = row.try_get("movie_id").map_err(map_err)?;
let title: String = row.try_get("title").map_err(map_err)?;
let year: Option<i32> = row.try_get("year").map_err(map_err)?;
let ext_id: Option<String> = row.try_get("external_metadata_id").map_err(map_err)?;
let source_str: String = row.try_get("source").map_err(map_err)?;
let watched_at_str: String = row.try_get("watched_at").map_err(map_err)?;
let status_str: String = row.try_get("status").map_err(map_err)?;
let created_at_str: String = row.try_get("created_at").map_err(map_err)?;
let source: WatchEventSource = source_str
.parse()
.map_err(|e: String| DomainError::InfrastructureError(e))?;
let status: WatchEventStatus = status_str
.parse()
.map_err(|e: String| DomainError::InfrastructureError(e))?;
let movie_id = movie_id_str
.as_deref()
.map(parse_uuid)
.transpose()?
.map(MovieId::from_uuid);
Ok(WatchEvent::from_persistence(PersistedWatchEvent {
id: WatchEventId::from_uuid(parse_uuid(&id_str)?),
user_id: UserId::from_uuid(parse_uuid(&user_id_str)?),
movie_id,
title,
year: year.map(|y| y as u16),
external_metadata_id: ext_id,
source,
watched_at: parse_datetime(&watched_at_str)?,
status,
created_at: parse_datetime(&created_at_str)?,
}))
}
// ── WebhookTokenRepository ────────────────────────────────────────────────────
pub struct PostgresWebhookTokenRepository {
pool: PgPool,
}
impl PostgresWebhookTokenRepository {
pub fn new(pool: PgPool) -> Self {
Self { pool }
}
}
#[async_trait]
impl WebhookTokenRepository for PostgresWebhookTokenRepository {
async fn save(&self, token: &WebhookToken) -> Result<(), DomainError> {
let id = token.id().value().to_string();
let user_id = token.user_id().value().to_string();
let provider = token.provider().to_string();
sqlx::query(
"INSERT INTO webhook_tokens \
(id, user_id, token_hash, provider, label, created_at, last_used_at) \
VALUES ($1, $2, $3, $4, $5, $6, $7)",
)
.bind(&id)
.bind(&user_id)
.bind(token.token_hash())
.bind(&provider)
.bind(token.label())
.bind(token.created_at())
.bind(token.last_used_at())
.execute(&self.pool)
.await
.map_err(map_err)?;
Ok(())
}
async fn find_by_token_hash(&self, hash: &str) -> Result<Option<WebhookToken>, DomainError> {
let row = sqlx::query(
"SELECT id, user_id, token_hash, provider, label, \
to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at, \
to_char(last_used_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS last_used_at \
FROM webhook_tokens WHERE token_hash = $1",
)
.bind(hash)
.fetch_optional(&self.pool)
.await
.map_err(map_err)?;
row.as_ref().map(row_to_webhook_token).transpose()
}
async fn list_by_user(&self, user_id: &UserId) -> Result<Vec<WebhookToken>, DomainError> {
let uid = user_id.value().to_string();
let rows = sqlx::query(
"SELECT id, user_id, token_hash, provider, label, \
to_char(created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at, \
to_char(last_used_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS last_used_at \
FROM webhook_tokens WHERE user_id = $1 ORDER BY created_at DESC",
)
.bind(&uid)
.fetch_all(&self.pool)
.await
.map_err(map_err)?;
rows.iter().map(row_to_webhook_token).collect()
}
async fn delete(&self, id: &WebhookTokenId, user_id: &UserId) -> Result<(), DomainError> {
let id_str = id.value().to_string();
let uid = user_id.value().to_string();
let result = sqlx::query("DELETE FROM webhook_tokens WHERE id = $1 AND user_id = $2")
.bind(&id_str)
.bind(&uid)
.execute(&self.pool)
.await
.map_err(map_err)?;
if result.rows_affected() == 0 {
return Err(DomainError::NotFound(format!("Webhook token {id_str}")));
}
Ok(())
}
async fn touch_last_used(&self, id: &WebhookTokenId) -> Result<(), DomainError> {
let id_str = id.value().to_string();
sqlx::query("UPDATE webhook_tokens SET last_used_at = NOW() WHERE id = $1")
.bind(&id_str)
.execute(&self.pool)
.await
.map_err(map_err)?;
Ok(())
}
}
fn row_to_webhook_token(row: &sqlx::postgres::PgRow) -> Result<WebhookToken, DomainError> {
let id_str: String = row.try_get("id").map_err(map_err)?;
let user_id_str: String = row.try_get("user_id").map_err(map_err)?;
let token_hash: String = row.try_get("token_hash").map_err(map_err)?;
let provider_str: String = row.try_get("provider").map_err(map_err)?;
let label: Option<String> = row.try_get("label").map_err(map_err)?;
let created_at_str: String = row.try_get("created_at").map_err(map_err)?;
let last_used_str: Option<String> = row.try_get("last_used_at").map_err(map_err)?;
let provider: WatchEventSource = provider_str
.parse()
.map_err(|e: String| DomainError::InfrastructureError(e))?;
let last_used = last_used_str.as_deref().map(parse_datetime).transpose()?;
Ok(WebhookToken::from_persistence(
WebhookTokenId::from_uuid(parse_uuid(&id_str)?),
UserId::from_uuid(parse_uuid(&user_id_str)?),
token_hash,
provider,
label,
parse_datetime(&created_at_str)?,
last_used,
))
}