From c76e7b71b5c47f01a63f62991c51e96b9b955d24 Mon Sep 17 00:00:00 2001
From: phoenix <kundeng94@gmail.com>
Date: Thu, 13 Mar 2025 19:59:09 -0400
Subject: [PATCH] Moved to icarus-models::user

---
 src/managers/commit_manager.rs | 11 +++++++----
 src/managers/token_manager.rs  |  4 ++--
 src/managers/user_manager.rs   |  6 +++---
 src/models/user.rs             |  2 ++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/managers/commit_manager.rs b/src/managers/commit_manager.rs
index c4112a6..a9ce7f5 100644
--- a/src/managers/commit_manager.rs
+++ b/src/managers/commit_manager.rs
@@ -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,
diff --git a/src/managers/token_manager.rs b/src/managers/token_manager.rs
index 8ba8a1d..463471b 100644
--- a/src/managers/token_manager.rs
+++ b/src/managers/token_manager.rs
@@ -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(),
         };
 
diff --git a/src/managers/user_manager.rs b/src/managers/user_manager.rs
index 16bb8f2..cf52bd8 100644
--- a/src/managers/user_manager.rs
+++ b/src/managers/user_manager.rs
@@ -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();
     }
 
diff --git a/src/models/user.rs b/src/models/user.rs
index 46a37c0..3eaeead 100644
--- a/src/models/user.rs
+++ b/src/models/user.rs
@@ -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);
     }
 }
+*/