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

refactor(postgres): format FeedSqlBuilder for improved readability

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-05-29 00:13:55 +02:00
parent 145b07d636
commit 8229285a2f
1 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
crates/adapters/postgres/src/feed/mod.rs
View File

@@ -106,7 +106,11 @@ struct FeedSqlBuilder<'a> {
impl<'a> FeedSqlBuilder<'a> { impl<'a> FeedSqlBuilder<'a> {
fn new(options: &'a FeedOptions, scope: &'a FeedScope, viewer: Option<uuid::Uuid>) -> Self { fn new(options: &'a FeedOptions, scope: &'a FeedScope, viewer: Option<uuid::Uuid>) -> Self {
Self { options, scope, viewer } Self {
options,
scope,
viewer,
}
} }
fn select(&self) -> String { fn select(&self) -> String {
@@ -165,10 +169,18 @@ impl<'a> FeedSqlBuilder<'a> {
fn filter_sql(&self) -> String { fn filter_sql(&self) -> String {
let f = &self.options.filter; let f = &self.options.filter;
let mut s = String::new(); let mut s = String::new();
if f.originals_only { s += " AND t.in_reply_to_id IS NULL"; } if f.originals_only {
if f.replies_only { s += " AND t.in_reply_to_id IS NOT NULL"; } s += " AND t.in_reply_to_id IS NULL";
if f.local_only { s += " AND t.local = true"; } }
if f.hide_sensitive { s += " AND t.sensitive = false"; } if f.replies_only {
s += " AND t.in_reply_to_id IS NOT NULL";
}
if f.local_only {
s += " AND t.local = true";
}
if f.hide_sensitive {
s += " AND t.sensitive = false";
}
s s
} }
@@ -194,7 +206,9 @@ impl<'a> FeedSqlBuilder<'a> {
); );
let data = format!( let data = format!(
"{} WHERE t.local=true AND t.visibility='public'{} {} LIMIT $1 OFFSET $2", "{} WHERE t.local=true AND t.visibility='public'{} {} LIMIT $1 OFFSET $2",
self.select(), filter, order self.select(),
filter,
order
); );
(count, data) (count, data)
} }
@@ -207,7 +221,8 @@ impl<'a> FeedSqlBuilder<'a> {
"SELECT COUNT(*) FROM thoughts t WHERE (t.user_id=ANY($1){}) AND t.visibility != 'direct'{}", "SELECT COUNT(*) FROM thoughts t WHERE (t.user_id=ANY($1){}) AND t.visibility != 'direct'{}",
fed, filter fed, filter
); );
let data = format!( let data =
format!(
"{} WHERE (t.user_id=ANY($1){}) AND t.visibility != 'direct'{} {} LIMIT $2 OFFSET $3", "{} WHERE (t.user_id=ANY($1){}) AND t.visibility != 'direct'{} {} LIMIT $2 OFFSET $3",
self.select(), fed, filter, order self.select(), fed, filter, order
); );
@@ -223,7 +238,9 @@ impl<'a> FeedSqlBuilder<'a> {
); );
let data = format!( let data = format!(
"{} WHERE t.content % $1 AND t.visibility='public'{} {} LIMIT $2 OFFSET $3", "{} WHERE t.content % $1 AND t.visibility='public'{} {} LIMIT $2 OFFSET $3",
self.select(), filter, order self.select(),
filter,
order
); );
(count, data) (count, data)
} }
@@ -243,7 +260,9 @@ impl<'a> FeedSqlBuilder<'a> {
JOIN thought_tags tt ON tt.thought_id = t.id JOIN thought_tags tt ON tt.thought_id = t.id
JOIN tags tg ON tg.id = tt.tag_id JOIN tags tg ON tg.id = tt.tag_id
WHERE tg.name = $1 AND t.visibility = 'public'{} {} LIMIT $2 OFFSET $3", WHERE tg.name = $1 AND t.visibility = 'public'{} {} LIMIT $2 OFFSET $3",
self.select(), filter, order self.select(),
filter,
order
); );
(count, data) (count, data)
} }
@@ -287,8 +306,13 @@ impl FeedRepository for PgFeedRepository {
.await .await
.into_domain()?; .into_domain()?;
Ok(Paginated { Ok(Paginated {
items: rows.into_iter().map(|r| row_to_entry(r, viewer)).collect::<Result<Vec<_>, _>>()?, items: rows
total, page: page.page, per_page: page.per_page, .into_iter()
.map(|r| row_to_entry(r, viewer))
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
}) })
} }
@@ -305,8 +329,13 @@ impl FeedRepository for PgFeedRepository {
.await .await
.into_domain()?; .into_domain()?;
Ok(Paginated { Ok(Paginated {
items: rows.into_iter().map(|r| row_to_entry(r, viewer)).collect::<Result<Vec<_>, _>>()?, items: rows
total, page: page.page, per_page: page.per_page, .into_iter()
.map(|r| row_to_entry(r, viewer))
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
}) })
} }
@@ -325,8 +354,13 @@ impl FeedRepository for PgFeedRepository {
.await .await
.into_domain()?; .into_domain()?;
Ok(Paginated { Ok(Paginated {
items: rows.into_iter().map(|r| row_to_entry(r, viewer)).collect::<Result<Vec<_>, _>>()?, items: rows
total, page: page.page, per_page: page.per_page, .into_iter()
.map(|r| row_to_entry(r, viewer))
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
}) })
} }
@@ -345,8 +379,13 @@ impl FeedRepository for PgFeedRepository {
.await .await
.into_domain()?; .into_domain()?;
Ok(Paginated { Ok(Paginated {
items: rows.into_iter().map(|r| row_to_entry(r, viewer)).collect::<Result<Vec<_>, _>>()?, items: rows
total, page: page.page, per_page: page.per_page, .into_iter()
.map(|r| row_to_entry(r, viewer))
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
}) })
} }
@@ -369,8 +408,13 @@ impl FeedRepository for PgFeedRepository {
.await .await
.into_domain()?; .into_domain()?;
Ok(Paginated { Ok(Paginated {
items: rows.into_iter().map(|r| row_to_entry(r, viewer)).collect::<Result<Vec<_>, _>>()?, items: rows
total, page: page.page, per_page: page.per_page, .into_iter()
.map(|r| row_to_entry(r, viewer))
.collect::<Result<Vec<_>, _>>()?,
total,
page: page.page,
per_page: page.per_page,
}) })
} }
} }