Refactoring (#31)

* Refactoring code

* Code formatting

* More changes

* Moved to icarus-models::user

* Some refactoring

* Updated icarus-models

* Removing constants

* Replaced with icarus-models constants

* Formatting

* Switched to constants from icarus-models:

* Replaced Token with AccessToken from icarus-models

* Updated icarus-models

* Formatting

* Removing code

src/models/mod.rs

@@ -2,6 +2,4 @@ pub mod api;
 pub mod flags;
 pub mod icarus_action;
 pub mod song;
-pub mod token;
 pub mod upload_form;
-pub mod user;

src/models/song.rs

@@ -3,8 +3,6 @@ use std::io::Read;
 
 use serde::{Deserialize, Serialize};
 
-use crate::constants;
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Song {
     #[serde(alias = "id")]
@@ -127,9 +125,9 @@ impl Song {
         filename += &self.track.unwrap().to_string();
 
         if i_type == 0 {
-            filename += constants::file_extensions::_MP3_FILE_EXTENSION;
+            filename += icarus_models::constants::MPTHREE_EXTENSION;
         } else {
-            filename += constants::file_extensions::WAV_FILE_EXTENSION;
+            filename += icarus_models::constants::WAV_EXTENSION;
         }
 
         self.filename = Some(filename);

src/models/token.rs

@@ -1,47 +0,0 @@
-use std::default::Default;
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct Token {
-    #[serde(alias = "user_id")]
-    pub user_id: i32,
-    #[serde(alias = "username")]
-    pub username: Option<String>,
-    #[serde(alias = "token")]
-    pub access_token: Option<String>,
-    #[serde(alias = "token_type")]
-    pub token_type: Option<String>,
-    #[serde(alias = "expiration")]
-    pub expiration: Option<i32>,
-    #[serde(alias = "message")]
-    pub message: Option<String>,
-}
-
-impl Default for Token {
-    fn default() -> Self {
-        Token {
-            user_id: -1,
-            username: None,
-            access_token: None,
-            token_type: None,
-            expiration: None,
-            message: None,
-        }
-    }
-}
-
-impl Token {
-    pub fn bearer_token(&self) -> String {
-        let mut token: String = String::from("Bearer ");
-
-        match &self.access_token {
-            Some(tok) => {
-                token += tok;
-            }
-            None => {}
-        }
-
-        return token;
-    }
-}

src/models/user.rs

@@ -1,24 +0,0 @@
-use std::default::Default;
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct User {
-    pub username: String,
-    pub password: String,
-}
-
-impl Default for User {
-    fn default() -> Self {
-        User {
-            username: String::new(),
-            password: String::new(),
-        }
-    }
-}
-
-impl User {
-    pub fn _to_json(&self) -> Result<String, serde_json::Error> {
-        return serde_json::to_string_pretty(&self);
-    }
-}