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

Fix

Browse Source
This commit is contained in:
Bulat Kurbanov
2024-12-26 01:28:32 +01:00
parent 3e8500e825
commit c58e10bfa0
29 changed files with 1622 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/serializers/author.rs
View File

@@ -5,6 +5,7 @@ use super::date::naive_date_serializer;
use super::sequence::Sequence;
#[derive(sqlx::FromRow, sqlx::Type, Serialize)]
#[sqlx(type_name = "author_type")]
pub struct Author {
pub id: i32,
pub first_name: String,
@@ -23,7 +24,7 @@ pub struct AuthorBook {
pub available_types: Vec<String>,
#[serde(serialize_with = "naive_date_serializer::serialize")]
pub uploaded: NaiveDate,
pub translators: sqlx::types::Json<Vec<Author>>,
pub sequences: sqlx::types::Json<Vec<Sequence>>,
pub translators: Vec<Author>,
pub sequences: Vec<Sequence>,
pub annotation_exists: bool,
}

6
src/serializers/book.rs
View File

@@ -81,8 +81,8 @@ pub struct Book {
pub available_types: Vec<String>,
#[serde(serialize_with = "naive_date_serializer::serialize")]
pub uploaded: NaiveDate,
pub authors: sqlx::types::Json<Vec<Author>>,
pub translators: sqlx::types::Json<Vec<Author>>,
pub sequences: sqlx::types::Json<Vec<Sequence>>,
pub authors: Vec<Author>,
pub translators: Vec<Author>,
pub sequences: Vec<Sequence>,
pub annotation_exists: bool,
}

1
src/serializers/genre.rs
View File

@@ -3,6 +3,7 @@ use serde::{Deserialize, Serialize};
use super::source::Source;
#[derive(sqlx::FromRow, sqlx::Type, Serialize)]
#[sqlx(type_name = "genre_type")]
pub struct Genre {
pub id: i32,
pub source: Source,

5
src/serializers/sequence.rs
View File

@@ -5,6 +5,7 @@ use super::author::Author;
use super::date::naive_date_serializer;
#[derive(sqlx::FromRow, sqlx::Type, Serialize)]
#[sqlx(type_name = "sequence_type")]
pub struct Sequence {
pub id: i32,
pub name: String,
@@ -20,8 +21,8 @@ pub struct SequenceBook {
pub available_types: Vec<String>,
#[serde(serialize_with = "naive_date_serializer::serialize")]
pub uploaded: NaiveDate,
pub authors: sqlx::types::Json<Vec<Author>>,
pub translators: sqlx::types::Json<Vec<Author>>,
pub authors: Vec<Author>,
pub translators: Vec<Author>,
pub annotation_exists: bool,
pub position: i32,
}

1
src/serializers/source.rs
View File

@@ -1,6 +1,7 @@
use serde::Serialize;
#[derive(sqlx::FromRow, sqlx::Type, Serialize)]
#[sqlx(type_name = "source_type")]
pub struct Source {
pub id: i32,
pub name: String,

4
src/serializers/translator.rs
View File

@@ -15,7 +15,7 @@ pub struct TranslatorBook {
pub available_types: Vec<String>,
#[serde(serialize_with = "naive_date_serializer::serialize")]
pub uploaded: NaiveDate,
pub authors: sqlx::types::Json<Vec<Author>>,
pub sequences: sqlx::types::Json<Vec<Sequence>>,
pub authors: Vec<Author>,
pub sequences: Vec<Sequence>,
pub annotation_exists: bool,
}

26
src/views/authors.rs
View File

@@ -216,16 +216,16 @@ async fn get_author_books(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author
@@ -233,11 +233,11 @@ async fn get_author_books(
) AS "translators!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence

311
src/views/books.rs
View File

@@ -62,16 +62,16 @@ pub async fn get_books(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -79,16 +79,16 @@ pub async fn get_books(
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author
@@ -96,11 +96,11 @@ pub async fn get_books(
) AS "translators!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence
@@ -111,10 +111,10 @@ pub async fn get_books(
) AS "annotation_exists!: bool",
(
SELECT
JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
ROW(
sources.id,
sources.name
)::source_type
FROM sources
WHERE sources.id = b.source
) AS "source!: Source",
@@ -245,16 +245,16 @@ pub async fn get_random_book(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -262,16 +262,16 @@ pub async fn get_random_book(
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author
@@ -279,11 +279,11 @@ pub async fn get_random_book(
) AS "translators!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence
@@ -291,17 +291,18 @@ pub async fn get_random_book(
) AS "sequences!: Vec<Sequence>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', genres.id,
'code', genres.code,
'description', genres.description,
'meta', genres.meta,
'source', JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
)
ARRAY_AGG(
ROW(
genres.id,
ROW(
sources.id,
sources.name
)::source_type,
genres.remote_id,
genres.code,
genres.description,
genres.meta
)::genre_type
)
FROM book_genres
JOIN genres ON genres.id = book_genres.genre
@@ -313,10 +314,10 @@ pub async fn get_random_book(
) AS "annotation_exists!: bool",
(
SELECT
JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
ROW(
sources.id,
sources.name
)::source_type
FROM sources
WHERE sources.id = b.source
) AS "source!: Source",
@@ -353,16 +354,16 @@ pub async fn get_remote_book(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -370,16 +371,16 @@ pub async fn get_remote_book(
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author
@@ -387,11 +388,11 @@ pub async fn get_remote_book(
) AS "translators!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence
@@ -399,17 +400,18 @@ pub async fn get_remote_book(
) AS "sequences!: Vec<Sequence>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', genres.id,
'code', genres.code,
'description', genres.description,
'meta', genres.meta,
'source', JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
)
ARRAY_AGG(
ROW(
genres.id,
ROW(
sources.id,
sources.name
)::source_type,
remote_id,
genres.code,
genres.description,
genres.meta
)::genre_type
)
FROM book_genres
JOIN genres ON genres.id = book_genres.genre
@@ -421,10 +423,10 @@ pub async fn get_remote_book(
) AS "annotation_exists!: bool",
(
SELECT
JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
ROW(
sources.id,
sources.name
)::source_type
FROM sources
WHERE sources.id = b.source
) AS "source!: Source",
@@ -491,16 +493,16 @@ pub async fn search_books(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -508,16 +510,16 @@ pub async fn search_books(
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author
@@ -525,11 +527,11 @@ pub async fn search_books(
) AS "translators!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence
@@ -573,16 +575,16 @@ pub async fn get_book(db: Database, Path(book_id): Path<i32>) -> impl IntoRespon
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -590,16 +592,16 @@ pub async fn get_book(db: Database, Path(book_id): Path<i32>) -> impl IntoRespon
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author
@@ -607,11 +609,11 @@ pub async fn get_book(db: Database, Path(book_id): Path<i32>) -> impl IntoRespon
) AS "translators!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence
@@ -619,17 +621,18 @@ pub async fn get_book(db: Database, Path(book_id): Path<i32>) -> impl IntoRespon
) AS "sequences!: Vec<Sequence>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', genres.id,
'code', genres.code,
'description', genres.description,
'meta', genres.meta,
'source', JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
)
ARRAY_AGG(
ROW(
genres.id,
ROW(
sources.id,
sources.name
)::source_type,
genres.remote_id,
genres.code,
genres.description,
genres.meta
)::genre_type
)
FROM book_genres
JOIN genres ON genres.id = book_genres.genre
@@ -641,10 +644,10 @@ pub async fn get_book(db: Database, Path(book_id): Path<i32>) -> impl IntoRespon
) AS "annotation_exists!: bool",
(
SELECT
JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
ROW(
sources.id,
sources.name
)::source_type
FROM sources
WHERE sources.id = b.source
) AS "source!: Source",

16
src/views/genres.rs
View File

@@ -39,10 +39,10 @@ pub async fn get_genres(
genres.meta,
(
SELECT
JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
ROW(
sources.id,
sources.name
)::source_type
FROM sources
WHERE sources.id = genres.source
) AS "source!: Source"
@@ -76,10 +76,10 @@ pub async fn get_genre_metas(db: Database) -> impl IntoResponse {
genres.meta,
(
SELECT
JSONB_BUILD_OBJECT(
'id', sources.id,
'name', sources.name
)
ROW(
sources.id,
sources.name
)::source_type
FROM sources
WHERE sources.id = genres.source
) AS "source!: Source"

32
src/views/sequences.rs
View File

@@ -215,16 +215,16 @@ async fn get_sequence_books(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -232,16 +232,16 @@ async fn get_sequence_books(
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM translations
JOIN authors ON authors.id = translations.author

26
src/views/translators.rs
View File

@@ -88,16 +88,16 @@ async fn get_translated_books(
b.uploaded,
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', authors.id,
'first_name', authors.first_name,
'last_name', authors.last_name,
'middle_name', authors.middle_name,
'annotation_exists', EXISTS(
ARRAY_AGG(
ROW(
authors.id,
authors.first_name,
authors.last_name,
authors.middle_name,
EXISTS(
SELECT * FROM author_annotations WHERE author = authors.id
)
)
)::author_type
)
FROM book_authors
JOIN authors ON authors.id = book_authors.author
@@ -105,11 +105,11 @@ async fn get_translated_books(
) AS "authors!: Vec<Author>",
(
SELECT
JSONB_AGG(
JSONB_BUILD_OBJECT(
'id', sequences.id,
'name', sequences.name
)
ARRAY_AGG(
ROW(
sequences.id,
sequences.name
)::sequence_type
)
FROM book_sequences
JOIN sequences ON sequences.id = book_sequences.sequence