diff --git a/public/database/src/generated/entities/edit_operation.rs b/public/database/src/generated/entities/edit_operation.rs deleted file mode 100644 index 98b4275..0000000 --- a/public/database/src/generated/entities/edit_operation.rs +++ /dev/null @@ -1,30 +0,0 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.18 - -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -#[sea_orm::model] -#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)] -#[sea_orm(table_name = "edit_operation")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub id: Uuid, - pub session_id: Uuid, - pub resource_type: String, - pub resource_id: Option, - pub operation_type: String, - #[sea_orm(column_type = "JsonBinary")] - pub payload: Json, - pub created_at: DateTimeUtc, - pub applied_at: Option, - #[sea_orm( - belongs_to, - from = "session_id", - to = "id", - on_update = "Cascade", - on_delete = "Cascade" - )] - pub editing_session: HasOne, -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/public/database/src/generated/entities/editing_session.rs b/public/database/src/generated/entities/editing_session.rs deleted file mode 100644 index 595305d..0000000 --- a/public/database/src/generated/entities/editing_session.rs +++ /dev/null @@ -1,23 +0,0 @@ -//! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.18 - -use sea_orm::entity::prelude::*; -use serde::{Deserialize, Serialize}; - -#[sea_orm::model] -#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Deserialize)] -#[sea_orm(table_name = "editing_session")] -pub struct Model { - #[sea_orm(primary_key, auto_increment = false)] - pub id: Uuid, - pub name: Option, - pub created_by: Option, - pub status: String, - pub created_at: DateTimeUtc, - pub applied_at: Option, - pub applied_by: Option, - pub expires_at: Option, - #[sea_orm(has_many)] - pub edit_operations: HasMany, -} - -impl ActiveModelBehavior for ActiveModel {} diff --git a/public/database/src/generated/entities/mod.rs b/public/database/src/generated/entities/mod.rs index 1f4ed58..8adf245 100644 --- a/public/database/src/generated/entities/mod.rs +++ b/public/database/src/generated/entities/mod.rs @@ -3,8 +3,6 @@ pub mod prelude; pub mod config; -pub mod edit_operation; -pub mod editing_session; pub mod upstream; pub mod upstream_target; pub mod user; diff --git a/public/database/src/generated/entities/prelude.rs b/public/database/src/generated/entities/prelude.rs index a66a6d5..537ed66 100644 --- a/public/database/src/generated/entities/prelude.rs +++ b/public/database/src/generated/entities/prelude.rs @@ -1,8 +1,6 @@ //! `SeaORM` Entity, @generated by sea-orm-codegen 2.0.0-rc.18 pub use super::config::Entity as Config; -pub use super::edit_operation::Entity as EditOperation; -pub use super::editing_session::Entity as EditingSession; pub use super::upstream::Entity as Upstream; pub use super::upstream_target::Entity as UpstreamTarget; pub use super::user::Entity as User; diff --git a/public/migration/src/lib.rs b/public/migration/src/lib.rs index 71c86cc..f31841c 100644 --- a/public/migration/src/lib.rs +++ b/public/migration/src/lib.rs @@ -15,7 +15,6 @@ impl MigratorTrait for Migrator { Box::new(m20251011_000003_create_user_identity_table::Migration), Box::new(m20251223_000004_create_upstream_table::Migration), Box::new(m20251223_000005_create_upstream_target_table::Migration), - Box::new(m20251230_000006_create_editing_session_table::Migration), ] } } diff --git a/public/migration/src/migrations.rs b/public/migration/src/migrations.rs index 55f0835..aef516b 100644 --- a/public/migration/src/migrations.rs +++ b/public/migration/src/migrations.rs @@ -3,4 +3,3 @@ pub mod m20251011_000002_create_user_table; pub mod m20251011_000003_create_user_identity_table; pub mod m20251223_000004_create_upstream_table; pub mod m20251223_000005_create_upstream_target_table; -pub mod m20251230_000006_create_editing_session_table; diff --git a/public/migration/src/migrations/m20251230_000006_create_editing_session_table.rs b/public/migration/src/migrations/m20251230_000006_create_editing_session_table.rs deleted file mode 100644 index 2765fa3..0000000 --- a/public/migration/src/migrations/m20251230_000006_create_editing_session_table.rs +++ /dev/null @@ -1,117 +0,0 @@ -use sea_orm_migration::{prelude::*, schema::*}; - -#[derive(DeriveMigrationName)] -pub struct Migration; - -#[forbid(dead_code)] -#[derive(DeriveIden)] -pub enum EditingSession { - Table, - Id, - Name, - CreatedBy, - Status, - CreatedAt, - AppliedAt, - AppliedBy, - ExpiresAt, -} - -#[forbid(dead_code)] -#[derive(DeriveIden)] -pub enum EditOperation { - Table, - Id, - SessionId, - ResourceType, - ResourceId, - OperationType, - Payload, - CreatedAt, - AppliedAt, -} - -#[async_trait::async_trait] -impl MigrationTrait for Migration { - async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .create_table( - Table::create() - .table(EditingSession::Table) - .if_not_exists() - .col(pk_uuid(EditingSession::Id)) - .col(ColumnDef::new(EditingSession::Name).string().null()) - .col(ColumnDef::new(EditingSession::CreatedBy).uuid().null()) - .col( - ColumnDef::new(EditingSession::Status) - .string() - .default("pending") - .not_null(), - ) - .col( - ColumnDef::new(EditingSession::CreatedAt) - .timestamp() - .default(SimpleExpr::Keyword(Keyword::CurrentTimestamp)) - .not_null(), - ) - .col(ColumnDef::new(EditingSession::AppliedAt).timestamp().null()) - .col(ColumnDef::new(EditingSession::AppliedBy).uuid().null()) - .col(ColumnDef::new(EditingSession::ExpiresAt).timestamp().null()) - .to_owned(), - ) - .await?; - - manager - .create_table( - Table::create() - .table(EditOperation::Table) - .if_not_exists() - .col(pk_uuid(EditOperation::Id)) - .col(ColumnDef::new(EditOperation::SessionId).uuid().not_null()) - .col( - ColumnDef::new(EditOperation::ResourceType) - .string() - .not_null(), - ) // e.g. "upstream", "location" - .col(ColumnDef::new(EditOperation::ResourceId).uuid().null()) // null for create - .col( - ColumnDef::new(EditOperation::OperationType) - .string() - .not_null(), - ) // "create"|"update"|"delete" - .col( - ColumnDef::new(EditOperation::Payload) - .json_binary() - .not_null(), - ) // patch or full object - .col( - ColumnDef::new(EditOperation::CreatedAt) - .timestamp() - .default(SimpleExpr::Keyword(Keyword::CurrentTimestamp)) - .not_null(), - ) - .col(ColumnDef::new(EditOperation::AppliedAt).timestamp().null()) - .foreign_key( - ForeignKey::create() - .name("fk-edit-op-session") - .from(EditOperation::Table, EditOperation::SessionId) - .to(EditingSession::Table, EditingSession::Id) - .on_delete(ForeignKeyAction::Cascade) - .on_update(ForeignKeyAction::Cascade), - ) - .to_owned(), - ) - .await?; - - Ok(()) - } - - async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { - manager - .drop_table(Table::drop().table(EditOperation::Table).to_owned()) - .await?; - manager - .drop_table(Table::drop().table(EditingSession::Table).to_owned()) - .await - } -}