Adding rust caching in workflow

.gitea/workflows/pr.yml

@@ -1,46 +0,0 @@
-name: textsender_models PR
-
-on:
-  pull_request:
-    branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: cargo check
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add rustfmt
-      - run: cargo fmt --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: 1.96
-      - uses: Swatinem/rust-cache@v2
-      - run: rustup component add clippy
-      - run: cargo clippy -- -D warnings

.gitea/workflows/release.yml

@@ -3,10 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - main
+      - v0.3.0-migrate
   pull_request:
     branches:
-      - main
+      - v0.3.0-migrate
 
 jobs:
   release:
@@ -20,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
           components: cargo
 
       - name: Extract Version from Cargo.toml

.gitea/workflows/rust.yml

@@ -3,11 +3,10 @@ name: Rust Build
 on:
   push:
     branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+      - v0.3.0-migrate
+  pull_request:
+    branches:
+      - v0.3.0-migrate
 
 jobs:
   check:
@@ -17,7 +16,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo check
 
@@ -28,7 +27,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo test
 
@@ -39,7 +38,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
@@ -51,7 +50,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
@@ -63,6 +62,6 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.96
+          toolchain: 1.95
       - uses: Swatinem/rust-cache@v2
       - run: cargo build

Cargo.lock

@@ -31,9 +31,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "bumpalo"
@@ -43,9 +43,9 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
 [[package]]
 name = "cc"
-version = "1.2.64"
+version = "1.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -93,6 +93,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 dependencies = [
+ "powerfmt",
  "serde_core",
 ]
 
@@ -246,12 +247,13 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.102"
+version = "0.3.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
+checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
 dependencies = [
  "cfg-if",
  "futures-util",
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -284,15 +286,15 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "log"
-version = "0.4.32"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
 
 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
 [[package]]
 name = "miniz_oxide"
@@ -318,9 +320,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "openssl"
-version = "0.10.81"
+version = "0.10.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
+checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -343,9 +345,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.117"
+version = "0.9.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
+checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
 dependencies = [
  "cc",
  "libc",
@@ -407,9 +409,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
 [[package]]
 name = "regex"
-version = "1.12.4"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -430,9 +432,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.11"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "rustversion"
@@ -521,7 +523,7 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.4.1"
+version = "0.2.5"
 dependencies = [
  "const_format",
  "dotenvy",
@@ -555,11 +557,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.49"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
+ "itoa",
  "num-conv",
  "powerfmt",
  "serde_core",
@@ -569,15 +572,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.9"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.29"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -621,9 +624,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.23.3"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
+checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
 dependencies = [
  "getrandom",
  "js-sys",
@@ -639,9 +642,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "wasip2"
-version = "1.0.4+wasi-0.2.12"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
  "wit-bindgen 0.57.1",
 ]
@@ -657,9 +660,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.125"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
+checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -670,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.125"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
+checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -680,9 +683,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.125"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
+checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -693,9 +696,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.125"
+version = "0.2.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
+checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
 dependencies = [
  "unicode-ident",
 ]

Cargo.toml

@@ -1,28 +1,20 @@
 [package]
 name = "textsender_models"
-version = "0.4.1"
+version = "0.2.5"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.95"
 description = "Models used for the textsender project"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.150" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
-uuid = { version = "1.23.3", features = ["v4", "serde"] }
+serde_json = { version = "1.0.149" }
+# rand = { version = "0.10.1" }
+time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
+uuid = { version = "1.23.1", features = ["v4", "serde"] }
 dotenvy = { version = "0.15.7" }
 const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }
-utoipa = { version = "5.5.0", features = ["uuid", "time"] }
-
-[features]
-default = ["full"]
-full = ["user", "message", "contact", "config", "envy", "token"]
-user = []
-message = []
-contact = []
-config = []
-envy = []
-token = []
+utoipa = { version = "5.4.0", features = ["uuid", "time"] }
 
 [dev-dependencies]
+# tempfile = { version = "3.27.0" }

src/config/auxiliary/mod.rs

@@ -1,4 +1,6 @@
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct TwilioConfig {
     #[serde(alias = "auth_id")]
     pub account_sid: String,

src/contact/mod.rs

@@ -1,6 +1,6 @@
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Contact {
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: Option<uuid::Uuid>,
@@ -14,6 +14,7 @@ pub struct Contact {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub nickname: Option<String>,
     pub phone_number: String,
+    // empty
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub user_id: Option<uuid::Uuid>,
 }

src/message/event/mod.rs

@@ -1,13 +1,13 @@
+use serde::{Deserialize, Serialize};
+
 pub const MESSAGE_EVENT_RESPONSE_STATUS_INSTANT: &str = "INSTANT";
 pub const MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED: &str = "SCHEDULED";
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct MessageEventResponse {
     pub id: uuid::Uuid,
     pub scheduled_message_event_id: uuid::Uuid,
-    /// Stores a json response of the sent message
+    // Json field
     pub response: String,
     pub user_id: uuid::Uuid,
     pub contact_id: uuid::Uuid,

src/message/mod.rs

@@ -1,9 +1,9 @@
 pub mod event;
 pub mod scheduling;
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Message {
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: Option<uuid::Uuid>,

src/message/scheduling/mod.rs

@@ -1,26 +1,24 @@
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct ScheduledMessageEvent {
-    pub id: uuid::Uuid,
-    pub contact_id: uuid::Uuid,
-    pub message_id: uuid::Uuid,
-    pub scheduled_message_id: uuid::Uuid,
+    id: uuid::Uuid,
+    contact_id: uuid::Uuid,
+    message_id: uuid::Uuid,
+    scheduled_message_id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
-    pub created: Option<time::OffsetDateTime>,
+    created: Option<time::OffsetDateTime>,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct ScheduledMessage {
-    pub id: uuid::Uuid,
+    id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
-    pub scheduled: Option<time::OffsetDateTime>,
+    scheduled: Option<time::OffsetDateTime>,
     #[serde(with = "time::serde::rfc3339::option")]
-    pub created: Option<time::OffsetDateTime>,
-    pub status: String,
-    pub user_id: uuid::Uuid,
+    created: Option<time::OffsetDateTime>,
+    status: String,
+    user_id: uuid::Uuid,
 }
 
 pub const READY: &str = "READY";

src/token/mod.rs

@@ -1,40 +1,18 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Claims {
     pub user_id: uuid::Uuid,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub role: Option<String>,
+    pub role: String,
     #[serde(alias = "iss")]
     pub issued: String,
     #[serde(alias = "exp")]
-    #[serde(deserialize_with = "deserialize_i64_from_f64")]
     pub expired: i64,
     #[serde(alias = "iat")]
-    #[serde(deserialize_with = "deserialize_i64_from_f64")]
     pub issued_at: i64,
 }
 
-fn deserialize_i64_from_f64<'de, D>(deserializer: D) -> Result<i64, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let val = f64::deserialize(deserializer)?;
-    // Handle NaN and infinity cases
-    if val.is_nan() || val.is_infinite() {
-        return Err(serde::de::Error::custom("invalid float value"));
-    }
-    // Round to nearest integer and convert
-    let rounded = val.round();
-    // Check if the rounded value can fit in i64
-    if rounded < (i64::MIN as f64) || rounded > (i64::MAX as f64) {
-        Err(serde::de::Error::custom("float out of i64 range"))
-    } else {
-        Ok(rounded as i64)
-    }
-}
-
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct LoginResult {
     pub user_id: uuid::Uuid,
     pub access_token: String,
@@ -43,7 +21,7 @@ pub struct LoginResult {
     pub issued_at: i64,
 }
 
-/// Alias for LoginResult
+// Alias for LoginResult
 pub type Login = LoginResult;
 
 pub fn get_issued() -> time::Result<time::OffsetDateTime> {
@@ -64,10 +42,9 @@ pub struct TokenResource {
     pub message: String,
     pub issuer: String,
     pub audiences: Vec<String>,
-    pub user_id: uuid::Uuid,
+    pub id: uuid::Uuid,
 }
 
-/// Token type
 pub const TOKEN_TYPE: &str = "JWT";
 
 pub fn create_token(
@@ -85,8 +62,8 @@ pub fn create_token(
     payload.set_subject(message);
     payload.set_issuer(issuer);
     payload.set_audience(audiences.clone());
-    if !token_resource.user_id.is_nil() {
-        match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) {
+    if !token_resource.id.is_nil() {
+        match payload.set_claim("id", Some(serde_json::json!(token_resource.id))) {
             Ok(_) => {}
             Err(err) => {
                 return Err(err);

src/user/mod.rs

@@ -1,6 +1,6 @@
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct User {
     pub id: uuid::Uuid,
     pub phone_number: String,
@@ -18,9 +18,7 @@ pub struct User {
     pub salt_id: uuid::Uuid,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct ServiceUser {
     pub id: uuid::Uuid,
     pub username: String,
@@ -34,9 +32,7 @@ pub struct ServiceUser {
     pub salt_id: uuid::Uuid,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Organization {
     pub id: uuid::Uuid,
     pub name: String,
@@ -44,9 +40,7 @@ pub struct Organization {
     pub created: Option<time::OffsetDateTime>,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct UserLoginHistory {
     pub id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
@@ -54,9 +48,7 @@ pub struct UserLoginHistory {
     pub user_id: uuid::Uuid,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct ServiceUserLoginHistory {
     pub id: uuid::Uuid,
     #[serde(with = "time::serde::rfc3339::option")]
@@ -64,9 +56,7 @@ pub struct ServiceUserLoginHistory {
     pub service_user_id: uuid::Uuid,
 }
 
-#[derive(
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct UserProfile {
     pub user_id: uuid::Uuid,
     pub phone_number: String,
@@ -79,7 +69,7 @@ pub struct UserProfile {
     pub last_login: Option<time::OffsetDateTime>,
 }
 
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Salt {
     // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: uuid::Uuid,