Refactoring #34
@@ -238,14 +238,17 @@ impl CommitManager {
|
||||
|
||||
let mut usr_mgr: managers::user_manager::UserManager =
|
||||
managers::user_manager::UserManager {
|
||||
user: models::user::User {
|
||||
username: String::new(),
|
||||
password: String::new(),
|
||||
},
|
||||
user: icarus_models::user::User::default(),
|
||||
ica_action: self.ica_action.clone(),
|
||||
};
|
||||
usr_mgr.parse_user_from_actions();
|
||||
|
||||
// let mut new_usr = icarus_models::user::User::default();
|
||||
// new_usr.username = usr_mgr.user.username.clone();
|
||||
// new_usr.password = usr_mgr.user.password.clone();
|
||||
|
||||
println!("Username: {}", usr_mgr.user.username);
|
||||
|
||||
let usr = usr_mgr.retrieve_user();
|
||||
let mut tok_mgr = managers::token_manager::TokenManager {
|
||||
user: usr,
|
||||
|
||||
@@ -3,14 +3,14 @@ use std::default::Default;
|
||||
use crate::models;
|
||||
|
||||
pub struct TokenManager {
|
||||
pub user: models::user::User,
|
||||
pub user: icarus_models::user::User,
|
||||
pub api: models::api::API,
|
||||
}
|
||||
|
||||
impl Default for TokenManager {
|
||||
fn default() -> Self {
|
||||
let mut token = TokenManager {
|
||||
user: models::user::User::default(),
|
||||
user: icarus_models::user::User::default(),
|
||||
api: models::api::API::default(),
|
||||
};
|
||||
|
||||
|
||||
@@ -6,21 +6,21 @@ use crate::models::{self};
|
||||
|
||||
#[derive(Debug, Deserialize, Serialize)]
|
||||
pub struct UserManager {
|
||||
pub user: models::user::User,
|
||||
pub user: icarus_models::user::User,
|
||||
pub ica_action: models::icarus_action::IcarusAction,
|
||||
}
|
||||
|
||||
impl Default for UserManager {
|
||||
fn default() -> Self {
|
||||
UserManager {
|
||||
user: models::user::User::default(),
|
||||
user: icarus_models::user::User::default(),
|
||||
ica_action: models::icarus_action::IcarusAction::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl UserManager {
|
||||
pub fn retrieve_user(&self) -> models::user::User {
|
||||
pub fn retrieve_user(&self) -> icarus_models::user::User {
|
||||
return self.user.clone();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
use std::default::Default;
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
@@ -22,3 +23,4 @@ impl User {
|
||||
return serde_json::to_string_pretty(&self);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user