bump: uuid

.gitea/workflows/pr.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - main
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check:
     name: Check

.gitea/workflows/rust.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - main
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check:
     name: Check

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "textsender_models"
-version = "0.4.3"
+version = "0.3.4"
 edition = "2024"
 rust-version = "1.96"
 description = "Models used for the textsender project"
@@ -9,12 +9,11 @@ description = "Models used for the textsender project"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = { version = "1.0.150" }
 time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] }
-sqlx = { version = "0.8.6", features = ["postgres", "runtime-tokio-native-tls", "time", "uuid"] }
 uuid = { version = "1.23.3", 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"]

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, utoipa::ToSchema)]
 pub struct Contact {
     #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: Option<uuid::Uuid>,

src/message/event/mod.rs

@@ -1,14 +1,14 @@
+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
-    pub response: serde_json::Value,
+    // Json field
+    pub response: String,
     pub user_id: uuid::Uuid,
     pub contact_id: uuid::Uuid,
     pub message_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,6 +1,6 @@
-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")]
@@ -34,7 +34,7 @@ where
     }
 }
 
-#[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,

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,