diff --git a/src/database/controller/member_insert.rs b/src/database/controller/member_insert.rs index b4379d9..2965d75 100644 --- a/src/database/controller/member_insert.rs +++ b/src/database/controller/member_insert.rs @@ -5,7 +5,7 @@ use crate::schema::addresses::columns::id; use crate::schema::addresses::dsl::addresses; use crate::schema::addresses_entities::columns::{address_id, entitiy_id}; use crate::schema::addresses_entities::dsl::addresses_entities; -use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl}; +use diesel::{ExpressionMethods, RunQueryDsl}; use rocket::State; pub fn insert_address( @@ -48,7 +48,7 @@ pub fn insert_address( .execute(&connection); match result { - Ok(result) => true, + Ok(_) => true, Err(e) => { warn!( "Couldn't insert new address: {} for entity {}", diff --git a/src/database/controller/member_qualifications.rs b/src/database/controller/member_qualifications.rs index 52ce939..b703ed6 100644 --- a/src/database/controller/member_qualifications.rs +++ b/src/database/controller/member_qualifications.rs @@ -8,7 +8,7 @@ use crate::schema::qualification_categories::dsl::qualification_categories; use crate::schema::qualifications_members::columns::{member_id, qualification_id}; use crate::schema::qualifications_members::dsl::qualifications_members; use diesel::result::Error; -use diesel::{ExpressionMethods, Insertable, JoinOnDsl, QueryDsl, RunQueryDsl}; +use diesel::{ExpressionMethods, JoinOnDsl, QueryDsl, RunQueryDsl}; use rocket::State; use serde_json::error::Category; diff --git a/src/helper/session_cookies/controller/session_cookie_storage.rs b/src/helper/session_cookies/controller/session_cookie_storage.rs index b2ab482..a7d95d9 100644 --- a/src/helper/session_cookies/controller/session_cookie_storage.rs +++ b/src/helper/session_cookies/controller/session_cookie_storage.rs @@ -115,7 +115,7 @@ mod tests { #[test] pub fn test_add() { - let mut storage = SessionCookieStorage::new(); + let storage = SessionCookieStorage::new(); let uuid = Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8").unwrap(); diff --git a/src/main.rs b/src/main.rs index 757e409..2134eba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -62,7 +62,8 @@ fn main() { modules::api::member_management::view::member_qualifications::api_member_remove_qualification, modules::api::member_management::view::member_qualifications::api_member_get_qualifications, modules::api::member_management::view::member_qualifications::api_member_get_qualifications_for_category, - modules::api::member_management::view::member_qualifications::api_member_add_qualification + modules::api::member_management::view::member_qualifications::api_member_add_qualification, + modules::api::member_management::view::member_driving_permissions::api_member_add_driving_license, ], ) .mount("/css", StaticFiles::from("resources/css")) diff --git a/src/modules/api/member_management/controller/member_qualifications.rs b/src/modules/api/member_management/controller/member_qualifications.rs index 482f9ce..d89fa95 100644 --- a/src/modules/api/member_management/controller/member_qualifications.rs +++ b/src/modules/api/member_management/controller/member_qualifications.rs @@ -1,4 +1,4 @@ -use crate::modules::api::model::ApiError::ApiError; +use crate::modules::api::model::api_error::ApiError; use rocket_contrib::json::Json; use std::str::FromStr; diff --git a/src/modules/api/member_management/controller/parser.rs b/src/modules/api/member_management/controller/parser.rs index 8ad8878..7e191cf 100644 --- a/src/modules/api/member_management/controller/parser.rs +++ b/src/modules/api/member_management/controller/parser.rs @@ -1,4 +1,4 @@ -use crate::modules::api::model::ApiError::ApiError; +use crate::modules::api::model::api_error::ApiError; use crate::modules::member_management::model::member::Member; use rocket_contrib::json::Json; use std::str::FromStr; diff --git a/src/modules/api/member_management/view/member_driving_permissions.rs b/src/modules/api/member_management/view/member_driving_permissions.rs index 7254ace..19261a2 100644 --- a/src/modules/api/member_management/view/member_driving_permissions.rs +++ b/src/modules/api/member_management/view/member_driving_permissions.rs @@ -3,7 +3,7 @@ use crate::helper::settings::Settings; use crate::modules::api::member_management::controller::parser::{ parse_member_cookie, parse_member_id, }; -use crate::modules::api::model::ApiError::ApiError; +use crate::modules::api::model::api_error::ApiError; use rocket::State; use rocket_contrib::json::Json; use std::str::FromStr; @@ -12,7 +12,7 @@ use std::str::FromStr; "/api/member_management/add_driving_license?&", format = "json" )] -pub fn api_member_add_qualification( +pub fn api_member_add_driving_license( cookie: SessionCookie, settings: State, member_id: String, diff --git a/src/modules/api/member_management/view/member_qualifications.rs b/src/modules/api/member_management/view/member_qualifications.rs index d0aa558..4c7da70 100644 --- a/src/modules/api/member_management/view/member_qualifications.rs +++ b/src/modules/api/member_management/view/member_qualifications.rs @@ -10,7 +10,7 @@ use crate::modules::api::member_management::controller::member_qualifications::{ use crate::modules::api::member_management::controller::parser::{ parse_member_cookie, parse_member_id, }; -use crate::modules::api::model::ApiError::ApiError; +use crate::modules::api::model::api_error::ApiError; use crate::modules::member_management::model::qualifications::{ Qualification, QualificationCategory, QualificationList, }; diff --git a/src/modules/api/model/ApiError.rs b/src/modules/api/model/api_error.rs similarity index 100% rename from src/modules/api/model/ApiError.rs rename to src/modules/api/model/api_error.rs diff --git a/src/modules/api/model/mod.rs b/src/modules/api/model/mod.rs index 41fe423..9968549 100644 --- a/src/modules/api/model/mod.rs +++ b/src/modules/api/model/mod.rs @@ -1 +1 @@ -pub mod ApiError; +pub mod api_error;