From d78f62bfb9be12d7e9ef4ddbcc2d72f0a48cc0a5 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Sat, 12 Oct 2024 00:59:42 +0200 Subject: [PATCH] make tasks id pk and add serde::Serialize to tasks and services --- Cargo.toml | 4 +++- src/entities/services.rs | 2 +- src/entities/tasks.rs | 2 +- src/migrator/m20241011_000007_add_service_tables.rs | 8 +++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1751c3e..db1994e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "twba-local-db" -version = "0.4.0" +version = "0.4.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -14,6 +14,8 @@ thiserror = "1.0" futures = "0.3" tracing = "0.1" +serde = "1.0" + anyhow = { version = "1.0", optional = true } tracing-subscriber = { version = "0.3", optional = true } diff --git a/src/entities/services.rs b/src/entities/services.rs index a180925..e551a6b 100644 --- a/src/entities/services.rs +++ b/src/entities/services.rs @@ -1,6 +1,6 @@ use sea_orm::entity::prelude::*; -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)] +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)] #[sea_orm(table_name = "services")] pub struct Model { #[sea_orm(primary_key)] diff --git a/src/entities/tasks.rs b/src/entities/tasks.rs index cd96564..01de09b 100644 --- a/src/entities/tasks.rs +++ b/src/entities/tasks.rs @@ -1,6 +1,6 @@ use sea_orm::entity::prelude::*; -#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)] +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)] #[sea_orm(table_name = "tasks")] pub struct Model { #[sea_orm(primary_key)] diff --git a/src/migrator/m20241011_000007_add_service_tables.rs b/src/migrator/m20241011_000007_add_service_tables.rs index cb2d352..421fe5f 100644 --- a/src/migrator/m20241011_000007_add_service_tables.rs +++ b/src/migrator/m20241011_000007_add_service_tables.rs @@ -26,7 +26,13 @@ impl MigrationTrait for Migration { .create_table( Table::create() .table(Tasks::Table) - .col(ColumnDef::new(Tasks::Id).integer().not_null()) + .col( + ColumnDef::new(Tasks::Id) + .integer() + .not_null() + .auto_increment() + .primary_key(), + ) .col(ColumnDef::new(Tasks::ServiceId).integer().not_null()) .col(ColumnDef::new(Tasks::Description).string().null()) .col(ColumnDef::new(Tasks::Progress).big_integer().default(0))