flibusta-apps/book_library_server
1
0
Fork 0
mirror of https://github.com/flibusta-apps/book_library_server.git synced 2025-12-06 15:15:36 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Update books query"

Browse Source 
This reverts commit abee7403b7.
This commit is contained in:
Bulat Kurbanov
2025-01-05 14:17:04 +01:00
parent abee7403b7
commit 91afa29862
4 changed files with 123 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,4 +2,3 @@
.env .env
.vscode .vscode
.idea

8
.idea/.gitignore generated vendored
View File

@@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

2
src/serializers/book.rs
View File

@@ -20,7 +20,7 @@ pub struct BookFilter {
pub id_lte: Option<i32>, pub id_lte: Option<i32>,
} }
#[derive(Serialize, sqlx::FromRow)] #[derive(Serialize)]
pub struct RemoteBook { pub struct RemoteBook {
pub id: i32, pub id: i32,
pub title: String, pub title: String,

146
src/views/books.rs
View File

@@ -27,61 +27,30 @@ pub async fn get_books(
axum_extra::extract::Query(book_filter): axum_extra::extract::Query<BookFilter>, axum_extra::extract::Query(book_filter): axum_extra::extract::Query<BookFilter>,
pagination: Query<Pagination>, pagination: Query<Pagination>,
) -> impl IntoResponse { ) -> impl IntoResponse {
let books_count = { let books_count = sqlx::query_scalar!(
let mut query_builder = r#"
sqlx::query_builder::QueryBuilder::new("SELECT COUNT(*) FROM books"); SELECT COUNT(*) FROM books
WHERE lang = ANY($1) AND
query_builder.push(" WHERE lang = ANY(?)"); ($2::boolean IS NULL OR is_deleted = $2) AND
query_builder.push_bind(&book_filter.allowed_langs); ($3::date IS NULL OR uploaded >= $3) AND
($4::date IS NULL OR uploaded <= $4) AND
if let Some(is_deleted) = book_filter.is_deleted { ($5::integer IS NULL OR id >= $5) AND
query_builder.push(" AND is_deleted = ?"); ($6::integer IS NULL OR id <= $6)
query_builder.push_bind(is_deleted); "#,
} &book_filter.allowed_langs,
book_filter.is_deleted,
match (book_filter.uploaded_gte, book_filter.uploaded_lte) { book_filter.uploaded_gte,
(Some(uploaded_gte), Some(uploaded_lte)) => { book_filter.uploaded_lte,
query_builder.push(" AND uploaded BETWEEN ? AND ?"); book_filter.id_gte,
query_builder.push_bind(uploaded_gte); book_filter.id_lte,
query_builder.push_bind(uploaded_lte); )
}
(Some(uploaded_gte), None) => {
query_builder.push(" AND uploaded >= ?");
query_builder.push_bind(uploaded_gte);
}
(None, Some(uploaded_lte)) => {
query_builder.push(" AND uploaded <= ?");
query_builder.push_bind(uploaded_lte);
}
_ => {}
}
match (book_filter.id_gte, book_filter.id_lte) {
(Some(id_gte), Some(id_lte)) => {
query_builder.push(" AND id BETWEEN ? AND ?");
query_builder.push_bind(id_gte);
query_builder.push_bind(id_lte);
}
(Some(id_gte), None) => {
query_builder.push(" AND id >= ?");
query_builder.push_bind(id_gte);
}
(None, Some(id_lte)) => {
query_builder.push(" AND id <= ?");
query_builder.push_bind(id_lte);
}
_ => {}
}
query_builder
.build_query_scalar()
.fetch_one(&db.0) .fetch_one(&db.0)
.await .await
.unwrap() .unwrap()
}; .unwrap();
let books = { let books = sqlx::query_as!(
let mut query_builder = sqlx::query_builder::QueryBuilder::new( RemoteBook,
r#" r#"
SELECT SELECT
b.id, b.id,
@@ -160,65 +129,28 @@ pub async fn get_books(
) AS "source!: Source", ) AS "source!: Source",
b.remote_id b.remote_id
FROM books b FROM books b
WHERE lang = ANY($1) AND
($2::boolean IS NULL OR is_deleted = $2) AND
($3::date IS NULL OR uploaded >= $3) AND
($4::date IS NULL OR uploaded <= $4) AND
($5::integer IS NULL OR id >= $5) AND
($6::integer IS NULL OR id <= $6)
ORDER BY b.id ASC
OFFSET $7
LIMIT $8
"#, "#,
); &book_filter.allowed_langs,
book_filter.is_deleted,
query_builder.push(" WHERE lang = ANY(?)"); book_filter.uploaded_gte,
query_builder.push_bind(&book_filter.allowed_langs); book_filter.uploaded_lte,
book_filter.id_gte,
if let Some(is_deleted) = book_filter.is_deleted { book_filter.id_lte,
query_builder.push(" AND is_deleted = ?"); (pagination.page - 1) * pagination.size,
query_builder.push_bind(is_deleted); pagination.size,
} )
match (book_filter.uploaded_gte, book_filter.uploaded_lte) {
(Some(uploaded_gte), Some(uploaded_lte)) => {
query_builder.push(" AND uploaded BETWEEN ? AND ?");
query_builder.push_bind(uploaded_gte);
query_builder.push_bind(uploaded_lte);
}
(Some(uploaded_gte), None) => {
query_builder.push(" AND uploaded >= ?");
query_builder.push_bind(uploaded_gte);
}
(None, Some(uploaded_lte)) => {
query_builder.push(" AND uploaded <= ?");
query_builder.push_bind(uploaded_lte);
}
_ => {}
}
match (book_filter.id_gte, book_filter.id_lte) {
(Some(id_gte), Some(id_lte)) => {
query_builder.push(" AND id BETWEEN ? AND ?");
query_builder.push_bind(id_gte);
query_builder.push_bind(id_lte);
}
(Some(id_gte), None) => {
query_builder.push(" AND id >= ?");
query_builder.push_bind(id_gte);
}
(None, Some(id_lte)) => {
query_builder.push(" AND id <= ?");
query_builder.push_bind(id_lte);
}
_ => {}
}
query_builder.push(" ORDER BY b.id ASC");
query_builder.push(" OFFSET ?");
query_builder.push_bind((pagination.page - 1) * pagination.size);
query_builder.push(" LIMIT ?");
query_builder.push_bind(pagination.size);
query_builder
.build_query_as()
.fetch_all(&db.0) .fetch_all(&db.0)
.await .await
.unwrap() .unwrap();
};
let page: Page<RemoteBook> = Page::new(books, books_count, &pagination); let page: Page<RemoteBook> = Page::new(books, books_count, &pagination);