Refactoring

This commit is contained in:
Keanu D?lle 2020-09-17 22:56:24 +02:00
parent 4c65ed47e4
commit 9ac3e80425
10 changed files with 12 additions and 11 deletions

View File

@ -5,7 +5,7 @@ use crate::schema::addresses::columns::id;
use crate::schema::addresses::dsl::addresses; use crate::schema::addresses::dsl::addresses;
use crate::schema::addresses_entities::columns::{address_id, entitiy_id}; use crate::schema::addresses_entities::columns::{address_id, entitiy_id};
use crate::schema::addresses_entities::dsl::addresses_entities; use crate::schema::addresses_entities::dsl::addresses_entities;
use diesel::{ExpressionMethods, QueryDsl, RunQueryDsl}; use diesel::{ExpressionMethods, RunQueryDsl};
use rocket::State; use rocket::State;
pub fn insert_address( pub fn insert_address(
@ -48,7 +48,7 @@ pub fn insert_address(
.execute(&connection); .execute(&connection);
match result { match result {
Ok(result) => true, Ok(_) => true,
Err(e) => { Err(e) => {
warn!( warn!(
"Couldn't insert new address: {} for entity {}", "Couldn't insert new address: {} for entity {}",

View File

@ -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::columns::{member_id, qualification_id};
use crate::schema::qualifications_members::dsl::qualifications_members; use crate::schema::qualifications_members::dsl::qualifications_members;
use diesel::result::Error; use diesel::result::Error;
use diesel::{ExpressionMethods, Insertable, JoinOnDsl, QueryDsl, RunQueryDsl}; use diesel::{ExpressionMethods, JoinOnDsl, QueryDsl, RunQueryDsl};
use rocket::State; use rocket::State;
use serde_json::error::Category; use serde_json::error::Category;

View File

@ -115,7 +115,7 @@ mod tests {
#[test] #[test]
pub fn test_add() { pub fn test_add() {
let mut storage = SessionCookieStorage::new(); let storage = SessionCookieStorage::new();
let uuid = Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8").unwrap(); let uuid = Uuid::parse_str("936DA01F9ABD4d9d80C702AF85C822A8").unwrap();

View File

@ -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_remove_qualification,
modules::api::member_management::view::member_qualifications::api_member_get_qualifications, 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_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")) .mount("/css", StaticFiles::from("resources/css"))

View File

@ -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 rocket_contrib::json::Json;
use std::str::FromStr; use std::str::FromStr;

View File

@ -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 crate::modules::member_management::model::member::Member;
use rocket_contrib::json::Json; use rocket_contrib::json::Json;
use std::str::FromStr; use std::str::FromStr;

View File

@ -3,7 +3,7 @@ use crate::helper::settings::Settings;
use crate::modules::api::member_management::controller::parser::{ use crate::modules::api::member_management::controller::parser::{
parse_member_cookie, parse_member_id, 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::State;
use rocket_contrib::json::Json; use rocket_contrib::json::Json;
use std::str::FromStr; use std::str::FromStr;
@ -12,7 +12,7 @@ use std::str::FromStr;
"/api/member_management/add_driving_license?<member_id>&<license_name>", "/api/member_management/add_driving_license?<member_id>&<license_name>",
format = "json" format = "json"
)] )]
pub fn api_member_add_qualification( pub fn api_member_add_driving_license(
cookie: SessionCookie, cookie: SessionCookie,
settings: State<Settings>, settings: State<Settings>,
member_id: String, member_id: String,

View File

@ -10,7 +10,7 @@ use crate::modules::api::member_management::controller::member_qualifications::{
use crate::modules::api::member_management::controller::parser::{ use crate::modules::api::member_management::controller::parser::{
parse_member_cookie, parse_member_id, 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::{ use crate::modules::member_management::model::qualifications::{
Qualification, QualificationCategory, QualificationList, Qualification, QualificationCategory, QualificationList,
}; };

View File

@ -1 +1 @@
pub mod ApiError; pub mod api_error;