Adding utoipa to models

.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
+      - v0.3.0-migrate
-
+  pull_request:
-concurrency:
+    branches:
-  group: ${{ github.workflow }}-${{ github.ref }}
+      - v0.3.0-migrate
-  cancel-in-progress: true
 
 jobs:
   check:
@@ -17,8 +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
 
   test:
@@ -28,8 +26,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
 
   fmt:
@@ -39,8 +36,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,8 +47,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 +58,5 @@ 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.toml

@@ -1,29 +1,21 @@
 [package]
 name = "textsender_models"
-version = "0.4.2"
+version = "0.3.0"
 edition = "2024"
-rust-version = "1.96"
+rust-version = "1.95"
-description = "Models used for the textsender project"
+description = "models used for the textsender project"
+# license = "MIT"
 
 [dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.150" }
+serde_json = { version = "1.0.149" }
-time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
+rand = { version = "0.10.1" }
-sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
+time = { version = "0.3.47", features = ["formatting", "macros", "parsing", "serde"] }
-uuid = { version = "1.23.3", features = ["v4", "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"] }
+utoipa = { version = "5.4.0", features = ["uuid", "time"] }
-
-[features]
-default = ["full"]
-full = ["user", "message", "contact", "config", "envy", "token"]
-user = []
-message = []
-contact = []
-config = []
-envy = []
-token = []
 
 [dev-dependencies]
+tempfile = { version = "3.27.0" }

src/config/auxiliary/mod.rs

@@ -1,7 +1,9 @@
-#[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,
+    pub account_sid: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub service_sid: String,
     #[serde(skip_serializing_if = "String::is_empty")]

src/contact/mod.rs

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

src/lib.rs

@@ -6,10 +6,7 @@ pub mod token;
 pub mod user;
 
 pub mod init {
-    pub fn is_uuid_nil(uuid: &Option<uuid::Uuid>) -> bool {
+    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
-        match uuid {
+        uuid.is_nil()
-            Some(id) => id.is_nil(),
-            None => true,
-        }
     }
 }

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

src/message/scheduling/mod.rs

@@ -1,26 +1,24 @@
-#[derive(
+use serde::{Deserialize, Serialize};
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
+
-)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct ScheduledMessageEvent {
-    pub id: uuid::Uuid,
+    id: uuid::Uuid,
-    pub contact_id: uuid::Uuid,
+    contact_id: uuid::Uuid,
-    pub message_id: uuid::Uuid,
+    message_id: uuid::Uuid,
-    pub scheduled_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(
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 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>,
+    created: Option<time::OffsetDateTime>,
-    pub status: String,
+    status: String,
-    pub user_id: uuid::Uuid,
+    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: String,
-    pub role: Option<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>
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-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)]
 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() {
+    if !token_resource.id.is_nil() {
-        match payload.set_claim("user_id", Some(serde_json::json!(token_resource.user_id))) {
+        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(
+use serde::{Deserialize, Serialize};
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
+
-)]
+#[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(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, 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(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, 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(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, 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(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, 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(
+#[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
-    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, utoipa::ToSchema,
-)]
 pub struct UserProfile {
     pub user_id: uuid::Uuid,
     pub phone_number: String,
@@ -79,9 +69,9 @@ 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")]
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub salt: String,