Gabriel Kaszewski
c224cc6bd2
row-to-domain conversions, date/uuid utils Eliminates 39 map_err copies, consolidates parse_uuid/parse_datetime/ datetime_to_str/format_year_month, extracts 7 shared row-to-domain conversion functions (movie, review, watchlist, stats, user_summary). Row structs stay per-adapter (FromRow is db-specific), only conversion logic is shared. Net -281 lines.
295 lines
11 KiB
Rust
295 lines
11 KiB
Rust
use async_trait::async_trait;
|
|
use domain::{
|
|
errors::DomainError,
|
|
models::{
|
|
DiaryEntry, Movie, PersistedReview, Review, ReviewSource, WatchlistEntry,
|
|
WatchlistWithMovie,
|
|
},
|
|
ports::LocalApContentQuery,
|
|
value_objects::{
|
|
Comment, ExternalMetadataId, MovieId, MovieTitle, PosterPath, Rating, ReleaseYear,
|
|
ReviewId, UserId, WatchlistEntryId,
|
|
},
|
|
};
|
|
use sqlx::{PgPool, Row};
|
|
|
|
pub struct PostgresApContentQuery {
|
|
pool: PgPool,
|
|
}
|
|
|
|
impl PostgresApContentQuery {
|
|
pub fn new(pool: PgPool) -> Self {
|
|
Self { pool }
|
|
}
|
|
}
|
|
|
|
// ── Local row types ──────────────────────────────────────────────────────────
|
|
|
|
use adapter_common::{parse_uuid, parse_datetime};
|
|
|
|
#[derive(sqlx::FromRow)]
|
|
struct MovieRow {
|
|
id: String,
|
|
external_metadata_id: Option<String>,
|
|
title: String,
|
|
release_year: i64,
|
|
director: Option<String>,
|
|
poster_path: Option<String>,
|
|
}
|
|
|
|
impl MovieRow {
|
|
fn into_domain(self) -> Result<Movie, DomainError> {
|
|
let id = MovieId::from_uuid(parse_uuid(&self.id)?);
|
|
let external_metadata_id = self
|
|
.external_metadata_id
|
|
.map(ExternalMetadataId::new)
|
|
.transpose()?;
|
|
let title = MovieTitle::new(self.title)?;
|
|
let release_year = ReleaseYear::new(self.release_year as u16)?;
|
|
let poster_path = self.poster_path.map(PosterPath::new).transpose()?;
|
|
Ok(Movie::from_persistence(
|
|
id,
|
|
external_metadata_id,
|
|
title,
|
|
release_year,
|
|
self.director,
|
|
poster_path,
|
|
))
|
|
}
|
|
}
|
|
|
|
#[derive(sqlx::FromRow)]
|
|
struct ReviewRow {
|
|
id: String,
|
|
movie_id: String,
|
|
user_id: String,
|
|
rating: i64,
|
|
comment: Option<String>,
|
|
watched_at: String,
|
|
created_at: String,
|
|
remote_actor_url: Option<String>,
|
|
watch_medium: Option<String>,
|
|
}
|
|
|
|
impl ReviewRow {
|
|
fn into_domain(self) -> Result<Review, DomainError> {
|
|
let id = ReviewId::from_uuid(parse_uuid(&self.id)?);
|
|
let movie_id = MovieId::from_uuid(parse_uuid(&self.movie_id)?);
|
|
let user_id = UserId::from_uuid(parse_uuid(&self.user_id)?);
|
|
let rating = Rating::new(self.rating as u8)?;
|
|
let comment = self.comment.map(Comment::new).transpose()?;
|
|
let watched_at = parse_datetime(&self.watched_at)?;
|
|
let created_at = parse_datetime(&self.created_at)?;
|
|
let source = match self.remote_actor_url {
|
|
None => ReviewSource::Local,
|
|
Some(url) => ReviewSource::Remote { actor_url: url },
|
|
};
|
|
let watch_medium = self.watch_medium.map(|s| s.parse()).transpose()?;
|
|
Ok(Review::from_persistence(PersistedReview {
|
|
id,
|
|
movie_id,
|
|
user_id,
|
|
rating,
|
|
comment,
|
|
watched_at,
|
|
created_at,
|
|
source,
|
|
watch_medium,
|
|
}))
|
|
}
|
|
}
|
|
|
|
#[derive(sqlx::FromRow)]
|
|
struct DiaryRow {
|
|
id: String,
|
|
external_metadata_id: Option<String>,
|
|
title: String,
|
|
release_year: i64,
|
|
director: Option<String>,
|
|
poster_path: Option<String>,
|
|
review_id: String,
|
|
movie_id: String,
|
|
user_id: String,
|
|
rating: i64,
|
|
comment: Option<String>,
|
|
watched_at: String,
|
|
created_at: String,
|
|
remote_actor_url: Option<String>,
|
|
watch_medium: Option<String>,
|
|
}
|
|
|
|
impl DiaryRow {
|
|
fn into_domain(self) -> Result<DiaryEntry, DomainError> {
|
|
let movie = MovieRow {
|
|
id: self.id,
|
|
external_metadata_id: self.external_metadata_id,
|
|
title: self.title,
|
|
release_year: self.release_year,
|
|
director: self.director,
|
|
poster_path: self.poster_path,
|
|
}
|
|
.into_domain()?;
|
|
let review = ReviewRow {
|
|
id: self.review_id,
|
|
movie_id: self.movie_id,
|
|
user_id: self.user_id,
|
|
rating: self.rating,
|
|
comment: self.comment,
|
|
watched_at: self.watched_at,
|
|
created_at: self.created_at,
|
|
remote_actor_url: self.remote_actor_url,
|
|
watch_medium: self.watch_medium,
|
|
}
|
|
.into_domain()?;
|
|
Ok(DiaryEntry::new(movie, review))
|
|
}
|
|
}
|
|
|
|
// ── LocalApContentQuery impl ─────────────────────────────────────────────────
|
|
|
|
#[async_trait]
|
|
impl LocalApContentQuery for PostgresApContentQuery {
|
|
async fn get_local_watchlist_for_user(
|
|
&self,
|
|
user_id: &UserId,
|
|
) -> Result<Vec<WatchlistWithMovie>, DomainError> {
|
|
let uid = user_id.value().to_string();
|
|
let rows = sqlx::query(
|
|
"SELECT w.id, w.user_id, w.movie_id,
|
|
to_char(w.added_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS added_at,
|
|
m.id AS m_id, m.external_metadata_id, m.title, m.release_year,
|
|
m.director, m.poster_path
|
|
FROM watchlist_entries w
|
|
JOIN movies m ON m.id = w.movie_id
|
|
WHERE w.user_id = $1
|
|
ORDER BY w.added_at DESC",
|
|
)
|
|
.bind(&uid)
|
|
.fetch_all(&self.pool)
|
|
.await
|
|
.map_err(adapter_common::map_sqlx_error)?;
|
|
|
|
rows.into_iter()
|
|
.map(|row| {
|
|
let entry = WatchlistEntry {
|
|
id: WatchlistEntryId::from_uuid(parse_uuid(
|
|
&row.try_get::<String, _>("id")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
)?),
|
|
user_id: UserId::from_uuid(parse_uuid(
|
|
&row.try_get::<String, _>("user_id")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
)?),
|
|
movie_id: MovieId::from_uuid(parse_uuid(
|
|
&row.try_get::<String, _>("movie_id")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
)?),
|
|
added_at: parse_datetime(
|
|
&row.try_get::<String, _>("added_at")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
)?,
|
|
};
|
|
let movie = MovieRow {
|
|
id: row
|
|
.try_get("m_id")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
external_metadata_id: row
|
|
.try_get("external_metadata_id")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
title: row
|
|
.try_get("title")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
release_year: row
|
|
.try_get("release_year")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
director: row
|
|
.try_get("director")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
poster_path: row
|
|
.try_get("poster_path")
|
|
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?,
|
|
}
|
|
.into_domain()?;
|
|
Ok(WatchlistWithMovie { entry, movie })
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
async fn get_local_reviews_for_movie(
|
|
&self,
|
|
movie_id: &MovieId,
|
|
) -> Result<Vec<DiaryEntry>, DomainError> {
|
|
let mid = movie_id.value().to_string();
|
|
let rows = sqlx::query_as::<_, DiaryRow>(
|
|
"SELECT m.id, m.external_metadata_id, m.title, m.release_year, m.director, m.poster_path,
|
|
r.id AS review_id, r.movie_id, r.user_id, r.rating, r.comment,
|
|
to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
|
|
to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
|
|
r.remote_actor_url,
|
|
r.watch_medium
|
|
FROM reviews r
|
|
INNER JOIN movies m ON m.id = r.movie_id
|
|
WHERE r.movie_id = $1 AND r.remote_actor_url IS NULL
|
|
ORDER BY r.created_at DESC",
|
|
)
|
|
.bind(&mid)
|
|
.fetch_all(&self.pool)
|
|
.await
|
|
.map_err(adapter_common::map_sqlx_error)?;
|
|
rows.into_iter().map(DiaryRow::into_domain).collect()
|
|
}
|
|
|
|
async fn get_local_reviews_page(
|
|
&self,
|
|
user_id: &UserId,
|
|
before: Option<chrono::NaiveDateTime>,
|
|
limit: usize,
|
|
) -> Result<Vec<DiaryEntry>, DomainError> {
|
|
let uid = user_id.value().to_string();
|
|
let limit_i64 = limit as i64;
|
|
|
|
let rows = if let Some(before_ts) = before {
|
|
let ts = before_ts.format("%Y-%m-%d %H:%M:%S").to_string();
|
|
sqlx::query_as::<_, DiaryRow>(
|
|
"SELECT m.id, m.external_metadata_id, m.title, m.release_year, m.director, m.poster_path,
|
|
r.id AS review_id, r.movie_id, r.user_id, r.rating, r.comment,
|
|
to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
|
|
to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
|
|
r.remote_actor_url,
|
|
r.watch_medium
|
|
FROM reviews r
|
|
INNER JOIN movies m ON m.id = r.movie_id
|
|
WHERE r.user_id = $1 AND r.remote_actor_url IS NULL AND r.watched_at < $2::timestamptz
|
|
ORDER BY r.watched_at DESC
|
|
LIMIT $3",
|
|
)
|
|
.bind(&uid)
|
|
.bind(&ts)
|
|
.bind(limit_i64)
|
|
.fetch_all(&self.pool)
|
|
.await
|
|
.map_err(adapter_common::map_sqlx_error)?
|
|
} else {
|
|
sqlx::query_as::<_, DiaryRow>(
|
|
"SELECT m.id, m.external_metadata_id, m.title, m.release_year, m.director, m.poster_path,
|
|
r.id AS review_id, r.movie_id, r.user_id, r.rating, r.comment,
|
|
to_char(r.watched_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS watched_at,
|
|
to_char(r.created_at AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS') AS created_at,
|
|
r.remote_actor_url,
|
|
r.watch_medium
|
|
FROM reviews r
|
|
INNER JOIN movies m ON m.id = r.movie_id
|
|
WHERE r.user_id = $1 AND r.remote_actor_url IS NULL
|
|
ORDER BY r.watched_at DESC
|
|
LIMIT $2",
|
|
)
|
|
.bind(&uid)
|
|
.bind(limit_i64)
|
|
.fetch_all(&self.pool)
|
|
.await
|
|
.map_err(adapter_common::map_sqlx_error)?
|
|
};
|
|
rows.into_iter().map(DiaryRow::into_domain).collect()
|
|
}
|
|
}
|