GKaszewski/thoughts
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(domain): from_db_str returns Result — unknown DB values are errors not silent defaults

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-05-15 13:57:38 +02:00
parent 5a64dd361c
commit f697267828
7 changed files with 75 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/adapters/postgres-search/src/lib.rs
View File

@@ -67,13 +67,13 @@ const FEED_SELECT: &str = "
(SELECT COUNT(*) FROM thoughts r WHERE r.in_reply_to_id=t.id) AS reply_count
FROM thoughts t JOIN users u ON u.id=t.user_id";
fn row_to_entry(r: FeedRow) -> FeedEntry {
fn row_to_entry(r: FeedRow) -> Result<FeedEntry, DomainError> {
let thought = Thought {
id: ThoughtId::from_uuid(r.thought_id),
user_id: UserId::from_uuid(r.t_user_id),
content: Content::new_remote(r.content),
in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid),
visibility: Visibility::from_db_str(&r.visibility),
visibility: Visibility::from_db_str(&r.visibility)?,
content_warning: r.content_warning,
sensitive: r.sensitive,
local: r.t_local,
@@ -94,7 +94,7 @@ fn row_to_entry(r: FeedRow) -> FeedEntry {
created_at: r.author_created_at,
updated_at: r.author_updated_at,
};
FeedEntry {
Ok(FeedEntry {
thought,
author,
like_count: r.like_count,
@@ -102,7 +102,7 @@ fn row_to_entry(r: FeedRow) -> FeedEntry {
reply_count: r.reply_count,
liked_by_viewer: false,
boosted_by_viewer: false,
}
})
}
#[async_trait]
@@ -137,7 +137,10 @@ impl SearchPort for PgSearchRepository {
.map_err(|e| DomainError::Internal(e.to_string()))?;
Ok(Paginated {
items: rows.into_iter().map(row_to_entry).collect(),
items: rows
.into_iter()
.map(row_to_entry)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,

33
crates/adapters/postgres/src/feed.rs
View File

@@ -106,13 +106,13 @@ fn feed_select(viewer: Option<uuid::Uuid>) -> String {
)
}
fn row_to_entry(r: FeedRow) -> FeedEntry {
fn row_to_entry(r: FeedRow) -> Result<FeedEntry, DomainError> {
let thought = Thought {
id: ThoughtId::from_uuid(r.thought_id),
user_id: UserId::from_uuid(r.t_user_id),
content: Content::new_remote(r.content),
in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid),
visibility: Visibility::from_db_str(&r.visibility),
visibility: Visibility::from_db_str(&r.visibility)?,
content_warning: r.content_warning,
sensitive: r.sensitive,
local: r.t_local,
@@ -133,7 +133,7 @@ fn row_to_entry(r: FeedRow) -> FeedEntry {
created_at: r.author_created_at,
updated_at: r.author_updated_at,
};
FeedEntry {
Ok(FeedEntry {
thought,
author,
like_count: r.like_count,
@@ -141,7 +141,7 @@ fn row_to_entry(r: FeedRow) -> FeedEntry {
reply_count: r.reply_count,
liked_by_viewer: r.liked_by_viewer,
boosted_by_viewer: r.boosted_by_viewer,
}
})
}
#[async_trait]
@@ -176,7 +176,10 @@ impl FeedRepository for PgFeedRepository {
.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(row_to_entry).collect(),
items: rows
.into_iter()
.map(row_to_entry)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
@@ -206,7 +209,10 @@ impl FeedRepository for PgFeedRepository {
.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(row_to_entry).collect(),
items: rows
.into_iter()
.map(row_to_entry)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
@@ -239,7 +245,10 @@ impl FeedRepository for PgFeedRepository {
.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(row_to_entry).collect(),
items: rows
.into_iter()
.map(row_to_entry)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
@@ -281,7 +290,10 @@ impl FeedRepository for PgFeedRepository {
.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(row_to_entry).collect(),
items: rows
.into_iter()
.map(row_to_entry)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
@@ -321,7 +333,10 @@ impl FeedRepository for PgFeedRepository {
.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(row_to_entry).collect(),
items: rows
.into_iter()
.map(row_to_entry)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,

19
crates/adapters/postgres/src/follow.rs
View File

@@ -76,13 +76,18 @@ impl FollowRepository for PgFollowRepository {
.fetch_optional(&self.pool)
.await
.into_domain()
.map(|o| o.map(|r| Follow {
follower_id: UserId::from_uuid(r.follower_id),
following_id: UserId::from_uuid(r.following_id),
state: FollowState::from_db_str(&r.state),
ap_id: r.ap_id,
created_at: r.created_at,
}))
.and_then(|o| {
o.map(|r| {
Ok(Follow {
follower_id: UserId::from_uuid(r.follower_id),
following_id: UserId::from_uuid(r.following_id),
state: FollowState::from_db_str(&r.state)?,
ap_id: r.ap_id,
created_at: r.created_at,
})
})
.transpose()
})
}
async fn update_state(

5
crates/adapters/postgres/src/tag.rs
View File

@@ -105,7 +105,10 @@ impl TagRepository for PgTagRepository {
.fetch_all(&self.pool).await.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(Thought::from).collect(),
items: rows
.into_iter()
.map(Thought::try_from)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,

20
crates/adapters/postgres/src/thought.rs
View File

@@ -36,20 +36,21 @@ pub(crate) struct ThoughtRow {
pub updated_at: Option<DateTime<Utc>>,
}
impl From<ThoughtRow> for Thought {
fn from(r: ThoughtRow) -> Self {
Thought {
impl TryFrom<ThoughtRow> for Thought {
type Error = DomainError;
fn try_from(r: ThoughtRow) -> Result<Self, DomainError> {
Ok(Thought {
id: ThoughtId::from_uuid(r.id),
user_id: UserId::from_uuid(r.user_id),
content: Content::new_remote(r.content),
in_reply_to_id: r.in_reply_to_id.map(ThoughtId::from_uuid),
visibility: Visibility::from_db_str(&r.visibility),
visibility: Visibility::from_db_str(&r.visibility)?,
content_warning: r.content_warning,
sensitive: r.sensitive,
local: r.local,
created_at: r.created_at,
updated_at: r.updated_at,
}
})
}
}
@@ -85,7 +86,7 @@ impl ThoughtRepository for PgThoughtRepository {
.fetch_optional(&self.pool)
.await
.into_domain()
.map(|o| o.map(Thought::from))
.and_then(|o| o.map(Thought::try_from).transpose())
}
async fn delete(&self, id: &ThoughtId, user_id: &UserId) -> Result<(), DomainError> {
@@ -129,7 +130,7 @@ impl ThoughtRepository for PgThoughtRepository {
.fetch_all(&self.pool)
.await
.into_domain()
.map(|rows| rows.into_iter().map(Thought::from).collect())
.and_then(|rows| rows.into_iter().map(Thought::try_from).collect())
}
async fn list_by_user(
@@ -155,7 +156,10 @@ impl ThoughtRepository for PgThoughtRepository {
.into_domain()?;
Ok(Paginated {
items: rows.into_iter().map(Thought::from).collect(),
items: rows
.into_iter()
.map(Thought::try_from)
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,

11
crates/domain/src/models/social.rs
View File

@@ -35,11 +35,14 @@ impl FollowState {
}
}
pub fn from_db_str(s: &str) -> Self {
pub fn from_db_str(s: &str) -> Result<Self, crate::errors::DomainError> {
match s {
"pending" => Self::Pending,
"rejected" => Self::Rejected,
_ => Self::Accepted,
"pending" => Ok(Self::Pending),
"accepted" => Ok(Self::Accepted),
"rejected" => Ok(Self::Rejected),
other => Err(crate::errors::DomainError::Internal(format!(
"unknown follow_state: '{other}'"
))),
}
}
}

13
crates/domain/src/models/thought.rs
View File

@@ -33,12 +33,15 @@ impl Visibility {
}
}
pub fn from_db_str(s: &str) -> Self {
pub fn from_db_str(s: &str) -> Result<Self, crate::errors::DomainError> {
match s {
"followers" => Self::Followers,
"unlisted" => Self::Unlisted,
"direct" => Self::Direct,
_ => Self::Public,
"public" => Ok(Self::Public),
"followers" => Ok(Self::Followers),
"unlisted" => Ok(Self::Unlisted),
"direct" => Ok(Self::Direct),
other => Err(crate::errors::DomainError::Internal(format!(
"unknown visibility: '{other}'"
))),
}
}
}