Skip to content

Commit

Permalink
refactor: update fetcher
Browse files Browse the repository at this point in the history
  • Loading branch information
snamiki1212 committed Jun 9, 2023
1 parent f1c03c0 commit 15ab7aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/app/article/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pub fn fetch_articles_list(
let mut query = articles::table.inner_join(users::table).into_boxed();

if let Some(tag_name) = &params.tag {
let ids = Tag::fetch_ids_by_name(conn, tag_name)
let ids = Tag::fetch_article_ids_by_name(conn, tag_name)
.expect("could not fetch tagged article ids."); // TODO: use ? or error handling
query = query.filter(articles::id.eq_any(ids));
}
Expand Down Expand Up @@ -119,7 +119,7 @@ pub fn fetch_articles_list(
let mut query = articles::table.inner_join(users::table).into_boxed();

if let Some(tag_name) = &params.tag {
let ids = Tag::fetch_ids_by_name(conn, tag_name)
let ids = Tag::fetch_article_ids_by_name(conn, tag_name)
.expect("could not fetch tagged article ids."); // TODO: use ? or error handling
query = query.filter(articles::id.eq_any(ids));
}
Expand Down
13 changes: 7 additions & 6 deletions src/app/tag/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,16 @@ impl Tag {
Ok(list)
}

pub fn fetch_ids_by_name(
pub fn fetch_article_ids_by_name(
conn: &mut PgConnection,
tag_name: &str,
) -> Result<Vec<Uuid>, AppError> {
let ids = tags::table
.filter(Self::with_name(tag_name))
.select(tags::article_id)
.load::<Uuid>(conn)?;
Ok(ids)
let article_ids = Self::by_name(tag_name)
.load::<Tag>(conn)?
.iter()
.map(|tag| tag.article_id)
.collect();
Ok(article_ids)
}

pub fn create_list(
Expand Down

0 comments on commit 15ab7aa

Please sign in to comment.