From a275a64e2382b351337bffe6496c349a3cd21bef Mon Sep 17 00:00:00 2001
From: phoenix <kundeng94@gmail.com>
Date: Sat, 5 Apr 2025 11:31:45 -0400
Subject: [PATCH 1/2] Added fields to user model

---
 src/user.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/user.rs b/src/user.rs
index 6efeb3c..f3e8720 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -27,6 +27,8 @@ pub struct User {
     pub status: String,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub last_login: String,
+    #[serde(skip_serializing_if = "init::is_uuid_nil")]
+    pub salt_id: uuid::Uuid,
 }
 
 impl Default for User {
@@ -43,6 +45,7 @@ impl Default for User {
             date_created: String::new(),
             status: String::new(),
             last_login: String::new(),
+            salt_id: uuid::Uuid::nil(),
         }
     }
 }
-- 
2.43.0


From 553c28c928fa0f7e6f67be20b304ec458b0ca32c Mon Sep 17 00:00:00 2001
From: phoenix <kundeng94@gmail.com>
Date: Sat, 5 Apr 2025 11:36:06 -0400
Subject: [PATCH 2/2] Added salt model

---
 src/user.rs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/user.rs b/src/user.rs
index f3e8720..56e570d 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -59,3 +59,29 @@ impl User {
         }
     }
 }
+
+pub mod salt {
+    use std::default::Default;
+
+    use crate::init;
+
+    use serde::{Deserialize, Serialize};
+
+    #[derive(Clone, Debug, Default, Deserialize, Serialize)]
+    pub struct Salt {
+        #[serde(skip_serializing_if = "init::is_uuid_nil")]
+        pub id: uuid::Uuid,
+        #[serde(skip_serializing_if = "String::is_empty")]
+        pub salt: String,
+    }
+
+    impl Salt {
+        pub fn to_json(&self, output_pretty: bool) -> Result<String, serde_json::Error> {
+            if output_pretty {
+                serde_json::to_string_pretty(&self)
+            } else {
+                serde_json::to_string(&self)
+            }
+        }
+    }
+}
-- 
2.43.0