Adding sqlx::FromRow trait

.gitea/workflows/pr.yml

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

.gitea/workflows/rust.yml

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

Cargo.lock

@@ -521,7 +521,7 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "textsender_models"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 rust-version = "1.96"
 description = "Models used for the textsender project"

src/contact/mod.rs

@@ -1,4 +1,6 @@
-#[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize, utoipa::ToSchema)]
+#[derive(
+    Clone, Debug, Default, serde::Deserialize, serde::Serialize, sqlx::FromRow, 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,7 +1,9 @@
 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, utoipa::ToSchema)]
+#[derive(
+    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,

src/message/mod.rs

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

src/user/mod.rs

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