From f7612711b0af5378a08b87641ad542e66948695c Mon Sep 17 00:00:00 2001 From: Mika Date: Fri, 28 Mar 2025 17:27:50 +0100 Subject: [PATCH] add entity and migration crates with SeaORM models for group, project, user, and user_group_project --- Cargo.toml | 9 ++++ crates/backend/Cargo.toml | 12 ++--- crates/entity/Cargo.toml | 8 ++++ crates/entity/src/group.rs | 42 ++++++++++++++++++ crates/entity/src/lib.rs | 8 ++++ crates/entity/src/prelude.rs | 6 +++ crates/entity/src/project.rs | 35 +++++++++++++++ crates/entity/src/user.rs | 27 ++++++++++++ crates/entity/src/user_group_project.rs | 58 +++++++++++++++++++++++++ 9 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 crates/entity/Cargo.toml create mode 100644 crates/entity/src/group.rs create mode 100644 crates/entity/src/lib.rs create mode 100644 crates/entity/src/prelude.rs create mode 100644 crates/entity/src/project.rs create mode 100644 crates/entity/src/user.rs create mode 100644 crates/entity/src/user_group_project.rs diff --git a/Cargo.toml b/Cargo.toml index 1c8e083..1f8e3a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,3 +7,12 @@ name = "peer-group-grading" version = "0.1.0" edition = "2024" +[workspace.dependencies] +entity = { path = "crates/entity" } +migration = { path = "crates/migration" } + +serde = { version = "*", features = ["derive"] } +sea-orm = { version = "1.1.0", features = [ + "runtime-tokio-rustls", + "sqlx-postgres", +] } diff --git a/crates/backend/Cargo.toml b/crates/backend/Cargo.toml index f741117..fd0e4ab 100644 --- a/crates/backend/Cargo.toml +++ b/crates/backend/Cargo.toml @@ -1,16 +1,18 @@ [package] name = "backend" -version = {workspace = true} -edition = {workspace = true} +version = { workspace = true } +edition = { workspace = true } [dependencies] +entity = { workspace = true } +migration = { workspace = true } + actix-web = "4" actix-session = { version = "0.10", features = ["redis-session"] } actix-cors = "0.7" actix-files = "0.6" tracing-actix-web = "0.7.16" -env_logger = "0.11" - -serde = {version = "1", features = ["derive"]} +env_logger = "0.11" +serde = { version = "1", features = ["derive"] } diff --git a/crates/entity/Cargo.toml b/crates/entity/Cargo.toml new file mode 100644 index 0000000..32b3d5c --- /dev/null +++ b/crates/entity/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "entity" +version = { workspace = true } +edition = { workspace = true } + +[dependencies] +serde = { workspace = true } +sea-orm = { workspace = true } diff --git a/crates/entity/src/group.rs b/crates/entity/src/group.rs new file mode 100644 index 0000000..50d6e4f --- /dev/null +++ b/crates/entity/src/group.rs @@ -0,0 +1,42 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 + +use sea_orm::entity::prelude::*; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[sea_orm(table_name = "group")] +pub struct Model { + #[sea_orm(primary_key, auto_increment = false)] + pub id: Uuid, + #[sea_orm(primary_key, auto_increment = false)] + pub project_id: Uuid, + pub name: String, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation { + #[sea_orm( + belongs_to = "super::project::Entity", + from = "Column::ProjectId", + to = "super::project::Column::Id", + on_update = "Cascade", + on_delete = "Cascade" + )] + Project, + #[sea_orm(has_many = "super::user_group_project::Entity")] + UserGroupProject, +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::Project.def() + } +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::UserGroupProject.def() + } +} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/crates/entity/src/lib.rs b/crates/entity/src/lib.rs new file mode 100644 index 0000000..8d75c11 --- /dev/null +++ b/crates/entity/src/lib.rs @@ -0,0 +1,8 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 + +pub mod prelude; + +pub mod group; +pub mod project; +pub mod user; +pub mod user_group_project; diff --git a/crates/entity/src/prelude.rs b/crates/entity/src/prelude.rs new file mode 100644 index 0000000..a85fdc4 --- /dev/null +++ b/crates/entity/src/prelude.rs @@ -0,0 +1,6 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 + +pub use super::group::Entity as Group; +pub use super::project::Entity as Project; +pub use super::user::Entity as User; +pub use super::user_group_project::Entity as UserGroupProject; diff --git a/crates/entity/src/project.rs b/crates/entity/src/project.rs new file mode 100644 index 0000000..12ac6e0 --- /dev/null +++ b/crates/entity/src/project.rs @@ -0,0 +1,35 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 + +use sea_orm::entity::prelude::*; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[sea_orm(table_name = "project")] +pub struct Model { + #[sea_orm(primary_key, auto_increment = false)] + pub id: Uuid, + pub name: String, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation { + #[sea_orm(has_many = "super::group::Entity")] + Group, +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::Group.def() + } +} + +impl Related for Entity { + fn to() -> RelationDef { + super::group::Relation::UserGroupProject.def() + } + fn via() -> Option { + Some(super::group::Relation::Project.def().rev()) + } +} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/crates/entity/src/user.rs b/crates/entity/src/user.rs new file mode 100644 index 0000000..852b424 --- /dev/null +++ b/crates/entity/src/user.rs @@ -0,0 +1,27 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 + +use sea_orm::entity::prelude::*; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[sea_orm(table_name = "user")] +pub struct Model { + #[sea_orm(primary_key, auto_increment = false)] + pub id: Uuid, + pub name: String, + pub role: String, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation { + #[sea_orm(has_many = "super::user_group_project::Entity")] + UserGroupProject, +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::UserGroupProject.def() + } +} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/crates/entity/src/user_group_project.rs b/crates/entity/src/user_group_project.rs new file mode 100644 index 0000000..53e184b --- /dev/null +++ b/crates/entity/src/user_group_project.rs @@ -0,0 +1,58 @@ +//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.4 + +use sea_orm::entity::prelude::*; +use serde::{Deserialize, Serialize}; + +#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)] +#[sea_orm(table_name = "user_group_project")] +pub struct Model { + #[sea_orm(primary_key, auto_increment = false)] + pub user_id: Uuid, + #[sea_orm(primary_key, auto_increment = false)] + pub group_id: Uuid, + #[sea_orm(primary_key, auto_increment = false)] + pub project_id: Uuid, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation { + #[sea_orm( + belongs_to = "super::group::Entity", + from = "(Column::GroupId, Column::ProjectId)", + to = "(super::group::Column::Id, super::group::Column::ProjectId)", + on_update = "Cascade", + on_delete = "Cascade" + )] + Group, + #[sea_orm( + belongs_to = "super::user::Entity", + from = "Column::UserId", + to = "super::user::Column::Id", + on_update = "Cascade", + on_delete = "Cascade" + )] + User, +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::Group.def() + } +} + +impl Related for Entity { + fn to() -> RelationDef { + Relation::User.def() + } +} + +impl Related for Entity { + fn to() -> RelationDef { + super::group::Relation::Project.def() + } + fn via() -> Option { + Some(super::group::Relation::UserGroupProject.def().rev()) + } +} + +impl ActiveModelBehavior for ActiveModel {}