From 08c6cfeb1f2b792a4790fa7a4348e6f86a82783d Mon Sep 17 00:00:00 2001 From: Ninjdai Date: Mon, 4 Aug 2025 19:55:33 +0200 Subject: [PATCH 1/2] refactor: rename bnf deserializer structs to be more accurate --- src/utils/bnf.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/utils/bnf.rs b/src/utils/bnf.rs index 35e4ed2..64566ea 100644 --- a/src/utils/bnf.rs +++ b/src/utils/bnf.rs @@ -9,13 +9,13 @@ pub struct Response { #[serde(rename = "numberOfRecords")] records_number: u32, #[serde(rename = "records")] - records: RecordListElement + record_list: RecordList } #[derive(Deserialize)] -pub struct RecordListElement { +pub struct RecordList { #[serde(default, rename = "record")] - record: Vec + records: Vec } #[derive(Deserialize)] @@ -27,11 +27,11 @@ pub struct Record { #[derive(Deserialize)] pub struct RecordData { #[serde(rename = "record")] - record: RecordDataFields + datafield_list: DataFieldList } #[derive(Deserialize)] -pub struct RecordDataFields { +pub struct DataFieldList { #[serde(default, rename = "datafield")] datafields: Vec } @@ -89,9 +89,9 @@ pub async fn fetch_book_by_ean(web_client: &reqwest::Client, ean: &String) -> Op log::debug!(target: "api", "BNF returned 0 records for fetch"); return None; } - let record = &v.records.record.first().unwrap(); - let data_dubfield = record.record_data.record.datafields.iter().find(|d| d.tag == "200").unwrap().subfields.clone(); - let price_new = match record.record_data.record.datafields.iter().find(|d| d.tag == "010") { + let record = &v.record_list.records.first().unwrap(); + let data_dubfield = record.record_data.datafield_list.datafields.iter().find(|d| d.tag == "200").unwrap().subfields.clone(); + let price_new = match record.record_data.datafield_list.datafields.iter().find(|d| d.tag == "010") { Some(f) => f.subfields.iter().find(|p| p.code=="d").map_or(None, |v| Some(v.value.clone())), None => None }; From 595d28b69b14741a38ec4003106b4f43c3b0701c Mon Sep 17 00:00:00 2001 From: Ninjdai Date: Mon, 4 Aug 2025 19:58:06 +0200 Subject: [PATCH 2/2] refactor: remove unused imports --- src/routes/auth.rs | 12 +++--------- src/utils/cli.rs | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/routes/auth.rs b/src/routes/auth.rs index e2ea921..3c4d226 100644 --- a/src/routes/auth.rs +++ b/src/routes/auth.rs @@ -1,13 +1,7 @@ -use std::sync::{Arc, LazyLock}; +use std::sync::Arc; -use argon2::PasswordHash; -use axum::{ - extract::{FromRequestParts, Request, State}, http::{request::Parts, HeaderMap, StatusCode}, middleware::Next, response::{IntoResponse, Response}, routing::{get, post}, Json, RequestPartsExt, Router -}; -use axum_extra::{ - headers::{authorization::Bearer, Authorization}, - TypedHeader, -}; +use axum::{extract::{FromRequestParts, Request, State}, http::{request::Parts, StatusCode}, middleware::Next, response::{IntoResponse, Response}, Json, RequestPartsExt}; +use axum_extra::{headers::{authorization::Bearer, Authorization}, TypedHeader}; use jsonwebtoken::{decode, encode, DecodingKey, EncodingKey, Header, Validation}; use sea_orm::{ColumnTrait, EntityTrait, QueryFilter}; use serde::{Deserialize, Serialize}; diff --git a/src/utils/cli.rs b/src/utils/cli.rs index a61101d..0c1ce3e 100644 --- a/src/utils/cli.rs +++ b/src/utils/cli.rs @@ -1,7 +1,7 @@ use std::{fmt::Display, sync::Arc}; use argon2::{password_hash::{SaltString}, Argon2, PasswordHasher}; -use inquire::{min_length, prompt_text, Confirm, Password, Select, Text}; +use inquire::{min_length, Confirm, Password, Select, Text}; use password_hash::rand_core::OsRng; use sea_orm::{ActiveModelTrait, ActiveValue::{NotSet, Set}, ColumnTrait, DatabaseConnection, EntityTrait, ModelTrait, QueryFilter};