chore(release): bump version to 1.2.0

Cargo.toml

@@ -3,13 +3,16 @@ members = ["actix-macros", "actix-test", "providers"]
 
 [package]
 name = "schedule-parser-rusted"
-version = "1.1.1"
+version = "1.2.0"
 edition = "2024"
 publish = false
 
 [profile.release]
 debug = true
 
+[features]
+trace = ["tracing", "console-subscriber"]
+
 [dependencies]
 providers = { path = "providers" }
 actix-macros = { path = "actix-macros" }
@@ -23,8 +26,7 @@ derive_more = { version = "2.0.1", features = ["full"] }
 dotenvy = "0.15.7"
 
 # sql
-diesel = { version = "2.2.12", features = ["postgres"] }
+database = { path = "database" }
-diesel-derive-enum = { git = "https://github.com/Havunen/diesel-derive-enum.git", features = ["postgres"] }
 
 # logging
 env_logger = "0.11.8"
@@ -70,6 +72,10 @@ base64 = "0.22.1"
 percent-encoding = "2.3.2"
 ed25519-dalek = "3.0.0-pre.0"
 
+# development tracing
+console-subscriber = { version = "0.4.1", optional = true }
+tracing = { version = "0.1.41", optional = true }
+
 [dev-dependencies]
 providers = { path = "providers", features = ["test"] }
-actix-test = { path = "actix-test" }
+actix-test = { path = "actix-test" }

database/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "database"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+migration = { path = "migration" }
+entity = { path = "entity" }
+sea-orm = { version = "2.0.0-rc.6", features = ["sqlx-postgres", "runtime-tokio"] }
+
+paste = "1.0.15"

database/entity/.gitignore

@@ -0,0 +1 @@
+/target

database/entity/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "entity"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+sea-orm = "2.0.0-rc.6"
+serde = { version = "1.0.219", features = ["derive"] }
+utoipa = "5.4.0"

database/entity/src/lib.rs

@@ -0,0 +1,6 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+
+pub mod prelude;
+
+pub mod sea_orm_active_enums;
+pub mod user;

database/entity/src/prelude.rs

@@ -0,0 +1,3 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+
+pub use super::user::Entity as User;

database/entity/src/sea_orm_active_enums.rs

@@ -0,0 +1,25 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+
+use sea_orm::entity::prelude::*;
+
+#[derive(
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    EnumIter,
+    DeriveActiveEnum,
+    :: serde :: Serialize,
+    :: serde :: Deserialize,
+    :: utoipa :: ToSchema,
+)]
+#[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "user_role")]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum UserRole {
+    #[sea_orm(string_value = "student")]
+    Student,
+    #[sea_orm(string_value = "teacher")]
+    Teacher,
+    #[sea_orm(string_value = "admin")]
+    Admin,
+}

database/entity/src/user.rs

@@ -0,0 +1,25 @@
+//! `SeaORM` Entity, @generated by sea-orm-codegen 1.1.12
+
+use super::sea_orm_active_enums::UserRole;
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[sea_orm(table_name = "user")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(unique)]
+    pub username: String,
+    pub password: Option<String>,
+    pub vk_id: Option<i32>,
+    pub group: Option<String>,
+    pub role: UserRole,
+    pub android_version: Option<String>,
+    #[sea_orm(unique)]
+    pub telegram_id: Option<i64>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}

database/migration/.gitignore

@@ -0,0 +1 @@
+/target

database/migration/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "migration"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+name = "migration"
+path = "src/lib.rs"
+
+[dependencies]
+async-std = { version = "1", features = ["attributes", "tokio1"] }
+
+[dependencies.sea-orm-migration]
+version = "2.0.0-rc.6"
+features = [
+    # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
+    # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
+    # e.g.
+    "runtime-tokio", # `ASYNC_RUNTIME` feature
+    "sqlx-postgres", # `DATABASE_DRIVER` feature
+]

database/migration/src/lib.rs

@@ -0,0 +1,16 @@
+pub use sea_orm_migration::prelude::MigratorTrait;
+
+use sea_orm_migration::prelude::*;
+
+mod m20250904_024854_init;
+
+pub struct Migrator;
+
+#[async_trait::async_trait]
+impl MigratorTrait for Migrator {
+    fn migrations() -> Vec<Box<dyn MigrationTrait>> {
+        vec![
+            Box::new(m20250904_024854_init::Migration),
+        ]
+    }
+}

database/migration/src/m20250904_024854_init.rs

@@ -0,0 +1,70 @@
+use sea_orm_migration::prelude::extension::postgres::Type;
+use sea_orm_migration::sea_orm::{EnumIter, Iterable};
+use sea_orm_migration::{prelude::*, schema::*};
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_type(
+                Type::create()
+                    .as_enum(UserRole)
+                    .values(UserRoleVariants::iter())
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_table(
+                Table::create()
+                    .table(User::Table)
+                    .if_not_exists()
+                    .col(string_uniq(User::Id).primary_key().not_null())
+                    .col(string_uniq(User::Username).not_null())
+                    .col(string_null(User::Password))
+                    .col(integer_null(User::VkId))
+                    .col(string_null(User::Group))
+                    .col(enumeration(User::Role, UserRole, UserRoleVariants::iter()))
+                    .col(string_null(User::AndroidVersion))
+                    .col(big_integer_null(User::TelegramId).unique_key())
+                    .to_owned(),
+            )
+            .await
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_table(Table::drop().table(User::Table).to_owned())
+            .await?;
+
+        manager
+            .drop_type(Type::drop().name(UserRole).to_owned())
+            .await
+    }
+}
+
+#[derive(DeriveIden)]
+struct UserRole;
+
+#[derive(DeriveIden, EnumIter)]
+enum UserRoleVariants {
+    Student,
+    Teacher,
+    Admin,
+}
+
+#[derive(DeriveIden)]
+enum User {
+    Table,
+    Id,
+    Username,
+    Password,
+    VkId,
+    Group,
+    Role,
+    AndroidVersion,
+    TelegramId,
+}

database/migration/src/main.rs

@@ -0,0 +1,6 @@
+use sea_orm_migration::prelude::*;
+
+#[async_std::main]
+async fn main() {
+    cli::run_cli(migration::Migrator).await;
+}

database/src/lib.rs

@@ -0,0 +1,10 @@
+pub mod query;
+
+pub use migration;
+pub use sea_orm;
+
+pub mod entity {
+    pub use entity::*;
+
+    pub use entity::user::{ActiveModel as ActiveUser, Model as User, Entity as UserEntity, Column as UserColumn};
+}

database/src/query.rs

@@ -0,0 +1,62 @@
+use paste::paste;
+use sea_orm::ColumnTrait;
+use sea_orm::EntityTrait;
+use sea_orm::QueryFilter;
+
+pub struct Query;
+
+macro_rules! ref_type {
+    (String) => {
+        &String
+    };
+    (str) => {
+        &str
+    };
+    ($other:ty) => {
+        $other
+    };
+}
+
+macro_rules! define_is_exists {
+    ($entity: ident, $by: ident, $by_type: ident, $by_column: ident) => {
+        paste! {
+            pub async fn [<is_ $entity _exists_by_ $by>](
+                db: &::sea_orm::DbConn,
+                $by: ref_type!($by_type)
+            ) -> Result<bool, ::sea_orm::DbErr> {
+                ::entity::$entity::Entity::find()
+                    .filter(::entity::$entity::Column::$by_column.eq($by))
+                    .one(db)
+                    .await
+                    .map(|x| x.is_some())
+            }
+        }
+    };
+}
+
+macro_rules! define_find_by {
+    ($entity: ident, $by: ident, $by_type: ident, $by_column: ident) => {
+        paste! {
+            pub async fn [<find_ $entity _by_ $by>](
+                db: &::sea_orm::DbConn,
+                $by: ref_type!($by_type)
+            ) -> Result<Option<::entity::$entity::Model>, ::sea_orm::DbErr> {
+                ::entity::$entity::Entity::find()
+                    .filter(::entity::$entity::Column::$by_column.eq($by))
+                    .one(db)
+                    .await
+            }
+        }
+    };
+}
+
+impl Query {
+    define_find_by!(user, id, str, Id);
+    define_find_by!(user, telegram_id, i64, TelegramId);
+    define_find_by!(user, vk_id, i32, VkId);
+    define_find_by!(user, username, str, Username);
+
+    define_is_exists!(user, id, str, Id);
+    define_is_exists!(user, username, str, Username);
+    define_is_exists!(user, telegram_id, i64, TelegramId);
+}

diesel.toml

@@ -1,9 +0,0 @@
-# For documentation on how to configure this file,
-# see https://diesel.rs/guides/configuring-diesel-cli
-
-[print_schema]
-file = "src/database/schema.rs"
-custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
-
-[migrations_directory]
-dir = "./migrations"

migrations/00000000000000_diesel_initial_setup/down.sql

@@ -1,6 +0,0 @@
--- This file was automatically created by Diesel to set up helper functions
--- and other internal bookkeeping. This file is safe to edit, any future
--- changes will be added to existing projects as new migrations.
-
-DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
-DROP FUNCTION IF EXISTS diesel_set_updated_at();

migrations/00000000000000_diesel_initial_setup/up.sql

@@ -1,36 +0,0 @@
--- This file was automatically created by Diesel to set up helper functions
--- and other internal bookkeeping. This file is safe to edit, any future
--- changes will be added to existing projects as new migrations.
-
-
-
-
--- Sets up a trigger for the given table to automatically set a column called
--- `updated_at` whenever the row is modified (unless `updated_at` was included
--- in the modified columns)
---
--- # Example
---
--- ```sql
--- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
---
--- SELECT diesel_manage_updated_at('users');
--- ```
-CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
-BEGIN
-    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
-                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
-BEGIN
-    IF (
-        NEW IS DISTINCT FROM OLD AND
-        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
-    ) THEN
-        NEW.updated_at := current_timestamp;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;

migrations/2025-03-21-211822_create_user_role/down.sql

@@ -1 +0,0 @@
-DROP TYPE user_role;

migrations/2025-03-21-211822_create_user_role/up.sql

@@ -1,4 +0,0 @@
-CREATE TYPE user_role AS ENUM (
-    'STUDENT',
-    'TEACHER',
-    'ADMIN');

migrations/2025-03-21-212111_create_users/down.sql

@@ -1 +0,0 @@
-DROP TABLE users;

migrations/2025-03-21-212111_create_users/up.sql

@@ -1,11 +0,0 @@
-CREATE TABLE users
-(
-    id           text PRIMARY KEY NOT NULL,
-    username     text UNIQUE      NOT NULL,
-    password     text             NOT NULL,
-    vk_id        int4             NULL,
-    access_token text UNIQUE      NOT NULL,
-    "group"      text             NOT NULL,
-    role         user_role        NOT NULL,
-    version      text             NOT NULL
-);

migrations/2025-03-21-212723_create_fcm/down.sql

@@ -1 +0,0 @@
-DROP TABLE fcm;

migrations/2025-03-21-212723_create_fcm/up.sql

@@ -1,6 +0,0 @@
-CREATE TABLE fcm
-(
-    user_id text PRIMARY KEY NOT NULL REFERENCES users (id),
-    token   text             NOT NULL,
-    topics  text[]           NOT NULL CHECK ( array_position(topics, null) is null )
-);

migrations/2025-05-28-185850_add_tg_id_to_users/down.sql

@@ -1,2 +0,0 @@
-ALTER TABLE users DROP CONSTRAINT users_telegram_id_key;
-ALTER TABLE users DROP COLUMN telegram_id;

migrations/2025-05-28-185850_add_tg_id_to_users/up.sql

@@ -1,2 +0,0 @@
-ALTER TABLE users ADD telegram_id int8 NULL;
-ALTER TABLE users ADD CONSTRAINT users_telegram_id_key UNIQUE (telegram_id);

migrations/2025-05-28-191056_make_users_password_nullable/down.sql

@@ -1,2 +0,0 @@
-UPDATE users SET "password" = '' WHERE "password" IS NULL;
-ALTER TABLE users ALTER COLUMN "password" SET NOT NULL;

migrations/2025-05-28-191056_make_users_password_nullable/up.sql

@@ -1 +0,0 @@
-ALTER TABLE users ALTER COLUMN "password" DROP NOT NULL;

migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/down.sql

@@ -1,3 +0,0 @@
-UPDATE users SET "android_version" = '' WHERE "android_version" IS NULL;
-ALTER TABLE users ALTER COLUMN "android_version" SET NOT NULL;
-ALTER TABLE users RENAME COLUMN android_version TO "version";

migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/up.sql

@@ -1,2 +0,0 @@
-ALTER TABLE users RENAME COLUMN "version" TO android_version;
-ALTER TABLE users ALTER COLUMN android_version DROP NOT NULL;

migrations/2025-05-29-140941_make_users_group_nullable/down.sql

@@ -1,2 +0,0 @@
-UPDATE users SET "group" = '' WHERE "group" IS NULL;
-ALTER TABLE users ALTER COLUMN "group" SET NOT NULL;

migrations/2025-05-29-140941_make_users_group_nullable/up.sql

@@ -1 +0,0 @@
-ALTER TABLE users ALTER COLUMN "group" DROP NOT NULL;

migrations/2025-05-29-142329_make_users_access_token_nullable/down.sql

@@ -1,2 +0,0 @@
-UPDATE users SET "access_token" = '' WHERE "access_token" IS NULL;
-ALTER TABLE users ALTER COLUMN "access_token" SET NOT NULL;

migrations/2025-05-29-142329_make_users_access_token_nullable/up.sql

@@ -1 +0,0 @@
-ALTER TABLE users ALTER COLUMN "access_token" DROP NOT NULL;

src/database/driver.rs

@@ -1,148 +0,0 @@
-pub mod users {
-    use crate::database::models::User;
-    use crate::database::schema::users::dsl::users;
-    use crate::database::schema::users::dsl::*;
-    use crate::state::AppState;
-    use actix_web::web;
-    use diesel::{insert_into, ExpressionMethods, QueryResult};
-    use diesel::{QueryDsl, RunQueryDsl};
-    use diesel::{SaveChangesDsl, SelectableHelper};
-    use std::ops::DerefMut;
-
-    pub async fn get(state: &web::Data<AppState>, _id: &String) -> QueryResult<User> {
-        users
-            .filter(id.eq(_id))
-            .select(User::as_select())
-            .first(state.get_database().await.deref_mut())
-    }
-
-    pub async fn get_by_username(
-        state: &web::Data<AppState>,
-        _username: &String,
-    ) -> QueryResult<User> {
-        users
-            .filter(username.eq(_username))
-            .select(User::as_select())
-            .first(state.get_database().await.deref_mut())
-    }
-
-    //noinspection RsTraitObligations
-    pub async fn get_by_vk_id(state: &web::Data<AppState>, _vk_id: i32) -> QueryResult<User> {
-        users
-            .filter(vk_id.eq(_vk_id))
-            .select(User::as_select())
-            .first(state.get_database().await.deref_mut())
-    }
-
-    //noinspection RsTraitObligations
-    pub async fn get_by_telegram_id(
-        state: &web::Data<AppState>,
-        _telegram_id: i64,
-    ) -> QueryResult<User> {
-        users
-            .filter(telegram_id.eq(_telegram_id))
-            .select(User::as_select())
-            .first(state.get_database().await.deref_mut())
-    }
-
-    //noinspection DuplicatedCode
-    pub async fn contains_by_username(state: &web::Data<AppState>, _username: &String) -> bool {
-        // и как это нахуй сократить блять примеров нихуя нет, нихуя не работает
-        // как меня этот раст заебал уже
-
-        match users
-            .filter(username.eq(_username))
-            .count()
-            .get_result::<i64>(state.get_database().await.deref_mut())
-        {
-            Ok(count) => count > 0,
-            Err(_) => false,
-        }
-    }
-
-    //noinspection DuplicatedCode
-    //noinspection RsTraitObligations
-    pub async fn contains_by_vk_id(state: &web::Data<AppState>, _vk_id: i32) -> bool {
-        match users
-            .filter(vk_id.eq(_vk_id))
-            .count()
-            .get_result::<i64>(state.get_database().await.deref_mut())
-        {
-            Ok(count) => count > 0,
-            Err(_) => false,
-        }
-    }
-
-    pub async fn insert(state: &web::Data<AppState>, user: &User) -> QueryResult<usize> {
-        insert_into(users)
-            .values(user)
-            .execute(state.get_database().await.deref_mut())
-    }
-
-    /// Function declaration [User::save][UserSave::save].
-    pub trait UserSave {
-        /// Saves the user's changes to the database.
-        ///
-        /// # Arguments
-        ///
-        /// * `state`: The state of the actix-web application that stores the mutex of the [connection][diesel::PgConnection].
-        ///
-        /// returns: `QueryResult<User>`
-        ///
-        /// # Examples
-        ///
-        /// ```
-        /// use crate::database::driver::users;
-        ///
-        /// #[derive(Deserialize)]
-        /// struct Params {
-        ///     pub username: String,
-        /// }
-        ///
-        /// #[patch("/")]
-        /// async fn patch_user(
-        ///     app_state: web::Data<AppState>,
-        ///     user: SyncExtractor<User>,
-        ///     web::Query(params): web::Query<Params>,
-        /// ) -> web::Json<User> {
-        ///     let mut user = user.into_inner();
-        ///
-        ///     user.username = params.username;
-        ///
-        ///     match user.save(&app_state) {
-        ///         Ok(user) => web::Json(user),
-        ///         Err(e) => {
-        ///             eprintln!("Failed to save user: {e}");
-        ///             panic!();
-        ///         }
-        ///     }
-        /// }
-        /// ```
-        async fn save(&self, state: &web::Data<AppState>) -> QueryResult<User>;
-    }
-
-    /// Implementation of [UserSave][UserSave] trait.
-    impl UserSave for User {
-        async fn save(&self, state: &web::Data<AppState>) -> QueryResult<User> {
-            self.save_changes::<Self>(state.get_database().await.deref_mut())
-        }
-    }
-
-    #[cfg(test)]
-    pub async fn delete_by_username(state: &web::Data<AppState>, _username: &String) -> bool {
-        match diesel::delete(users.filter(username.eq(_username)))
-            .execute(state.get_database().await.deref_mut())
-        {
-            Ok(count) => count > 0,
-            Err(_) => false,
-        }
-    }
-
-    #[cfg(test)]
-    pub async fn insert_or_ignore(state: &web::Data<AppState>, user: &User) -> QueryResult<usize> {
-        insert_into(users)
-            .values(user)
-            .on_conflict_do_nothing()
-            .execute(state.get_database().await.deref_mut())
-    }
-}

src/database/mod.rs

@@ -1,3 +0,0 @@
-pub mod driver;
-pub mod models;
-pub mod schema;

src/database/models.rs

@@ -1,87 +0,0 @@
-use actix_macros::ResponderJson;
-use diesel::QueryId;
-use diesel::prelude::*;
-use serde::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-#[derive(
-    Copy, Clone, PartialEq, Debug, Serialize, Deserialize, diesel_derive_enum::DbEnum, ToSchema,
-)]
-#[ExistingTypePath = "crate::database::schema::sql_types::UserRole"]
-#[DbValueStyle = "UPPERCASE"]
-#[serde(rename_all = "UPPERCASE")]
-pub enum UserRole {
-    Student,
-    Teacher,
-    Admin,
-}
-
-#[derive(
-    Identifiable,
-    AsChangeset,
-    Queryable,
-    QueryId,
-    Selectable,
-    Serialize,
-    Insertable,
-    Debug,
-    ToSchema,
-    ResponderJson,
-)]
-#[diesel(table_name = crate::database::schema::users)]
-#[diesel(treat_none_as_null = true)]
-pub struct User {
-    /// Account UUID.
-    pub id: String,
-
-    /// User name.
-    pub username: String,
-
-    /// BCrypt password hash.
-    pub password: Option<String>,
-
-    /// ID of the linked VK account.
-    pub vk_id: Option<i32>,
-
-    /// JWT access token.
-    pub access_token: Option<String>,
-
-    /// Group.
-    pub group: Option<String>,
-
-    /// Role.
-    pub role: UserRole,
-
-    /// Version of the installed Polytechnic+ application.
-    pub android_version: Option<String>,
-
-    /// ID of the linked Telegram account.
-    pub telegram_id: Option<i64>,
-}
-
-#[derive(
-    Debug,
-    Clone,
-    Serialize,
-    Identifiable,
-    Queryable,
-    Selectable,
-    Insertable,
-    AsChangeset,
-    Associations,
-    ToSchema,
-    ResponderJson,
-)]
-#[diesel(belongs_to(User))]
-#[diesel(table_name = crate::database::schema::fcm)]
-#[diesel(primary_key(user_id))]
-pub struct FCM {
-    /// Account UUID.
-    pub user_id: String,
-
-    /// FCM token.
-    pub token: String,
-
-    /// List of topics subscribed to by the user.
-    pub topics: Vec<Option<String>>,
-}

src/database/schema.rs

@@ -1,39 +0,0 @@
-// @generated automatically by Diesel CLI.
-
-pub mod sql_types {
-    #[derive(diesel::query_builder::QueryId, Clone, diesel::sql_types::SqlType)]
-    #[diesel(postgres_type(name = "user_role"))]
-    pub struct UserRole;
-}
-
-diesel::table! {
-    fcm (user_id) {
-        user_id -> Text,
-        token -> Text,
-        topics -> Array<Nullable<Text>>,
-    }
-}
-
-diesel::table! {
-    use diesel::sql_types::*;
-    use super::sql_types::UserRole;
-
-    users (id) {
-        id -> Text,
-        username -> Text,
-        password -> Nullable<Text>,
-        vk_id -> Nullable<Int4>,
-        access_token -> Nullable<Text>,
-        group -> Nullable<Text>,
-        role -> UserRole,
-        android_version -> Nullable<Text>,
-        telegram_id -> Nullable<Int8>,
-    }
-}
-
-diesel::joinable!(fcm -> users (user_id));
-
-diesel::allow_tables_to_appear_in_same_query!(
-    fcm,
-    users,
-);

src/extractors/authorized_user.rs

@@ -1,5 +1,3 @@
-use crate::database::driver;
-use crate::database::models::User;
 use crate::extractors::base::FromRequestAsync;
 use crate::state::AppState;
 use crate::utility::jwt;
@@ -8,9 +6,12 @@ use actix_web::body::BoxBody;
 use actix_web::dev::Payload;
 use actix_web::http::header;
 use actix_web::{web, HttpRequest};
+use database::entity::User;
+use database::query::Query;
 use derive_more::Display;
 use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
+use std::ops::Deref;
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Display, MiddlewareError)]
 #[status_code = "actix_web::http::StatusCode::UNAUTHORIZED"]
@@ -88,10 +89,20 @@ impl FromRequestAsync for User {
         let user_id = jwt::verify_and_decode(&access_token)
             .map_err(|_| Error::InvalidAccessToken.into_err())?;
 
-        let app_state = req.app_data::<web::Data<AppState>>().unwrap();
+        let db = req
+            .app_data::<web::Data<AppState>>()
+            .unwrap()
+            .get_database();
 
-        driver::users::get(app_state, &user_id)
+        Query::find_user_by_id(db, &user_id)
             .await
             .map_err(|_| Error::NoUser.into())
+            .and_then(|user| {
+                if let Some(user) = user {
+                    Ok(user)
+                } else {
+                    Err(actix_web::Error::from(Error::NoUser))
+                }
+            })
     }
 }

src/main.rs

@@ -12,8 +12,6 @@ use utoipa_rapidoc::RapiDoc;
 
 mod state;
 
-mod database;
-
 mod extractors;
 mod middlewares;
 mod routes;
@@ -72,7 +70,7 @@ pub fn get_api_scope<
 async fn async_main() -> io::Result<()> {
     info!("Запуск сервера...");
 
-    let app_state = new_app_state().await.unwrap();
+    let app_state = new_app_state(None).await.unwrap();
 
     HttpServer::new(move || {
         let (app, api) = App::new()
@@ -111,7 +109,7 @@ fn main() -> io::Result<()> {
         },
     ));
 
-    dotenv().unwrap();
+    let _ = dotenv();
 
     env_logger::init();
 

src/middlewares/authorization.rs

@@ -1,4 +1,3 @@
-use crate::database::models::User;
 use crate::extractors::authorized_user;
 use crate::extractors::base::FromRequestAsync;
 use actix_web::body::{BoxBody, EitherBody};
@@ -7,6 +6,7 @@ use actix_web::{Error, HttpRequest, ResponseError};
 use futures_util::future::LocalBoxFuture;
 use std::future::{Ready, ready};
 use std::rc::Rc;
+use database::entity::User;
 
 /// Middleware guard working with JWT tokens.
 pub struct JWTAuthorization {

src/routes/auth/sign_in.rs

@@ -1,25 +1,28 @@
 use self::schema::*;
-use crate::database::driver;
-use crate::database::driver::users::UserSave;
 use crate::routes::auth::shared::parse_vk_id;
 use crate::routes::auth::sign_in::schema::SignInData::{Default, VkOAuth};
-use crate::routes::schema::ResponseError;
 use crate::routes::schema::user::UserResponse;
-use crate::{AppState, utility};
+use crate::routes::schema::ResponseError;
+use crate::{utility, AppState};
 use actix_web::{post, web};
+use database::query::Query;
 use web::Json;
 
 async fn sign_in_combined(
     data: SignInData,
     app_state: &web::Data<AppState>,
 ) -> Result<UserResponse, ErrorCode> {
+    let db = app_state.get_database();
+
     let user = match &data {
-        Default(data) => driver::users::get_by_username(&app_state, &data.username).await,
+        Default(data) => Query::find_user_by_username(db, &data.username).await,
-        VkOAuth(id) => driver::users::get_by_vk_id(&app_state, *id).await,
+        VkOAuth(id) => Query::find_user_by_vk_id(db, *id).await,
-    };
+    }
+    .ok()
+    .flatten();
 
     match user {
-        Ok(mut user) => {
+        Some(user) => {
             if let Default(data) = data {
                 if user.password.is_none() {
                     return Err(ErrorCode::IncorrectCredentials);
@@ -37,14 +40,11 @@ async fn sign_in_combined(
                 }
             }
 
-            user.access_token = Some(utility::jwt::encode(&user.id));
+            let access_token = utility::jwt::encode(&user.id);
-
+            Ok(UserResponse::from_user_with_token(user, access_token))
-            user.save(&app_state).await.expect("Failed to update user");
-
-            Ok(user.into())
         }
 
-        Err(_) => Err(ErrorCode::IncorrectCredentials),
+        None => Err(ErrorCode::IncorrectCredentials),
     }
 }
 
@@ -139,16 +139,16 @@ mod schema {
 #[cfg(test)]
 mod tests {
     use super::schema::*;
-    use crate::database::driver;
-    use crate::database::models::{User, UserRole};
     use crate::routes::auth::sign_in::sign_in;
     use crate::test_env::tests::{static_app_state, test_app_state, test_env};
-    use crate::utility;
     use actix_test::test_app;
     use actix_web::dev::ServiceResponse;
     use actix_web::http::Method;
     use actix_web::http::StatusCode;
     use actix_web::test;
+    use database::entity::sea_orm_active_enums::UserRole;
+    use database::entity::ActiveUser;
+    use database::sea_orm::{ActiveModelTrait, Set};
     use sha1::{Digest, Sha1};
     use std::fmt::Write;
 
@@ -182,22 +182,24 @@ mod tests {
         test_env();
 
         let app_state = static_app_state().await;
-        driver::users::insert_or_ignore(
+
-            &app_state,
+        let active_user = ActiveUser {
-            &User {
+            id: Set(id.clone()),
-                id: id.clone(),
+            username: Set(username),
-                username,
+            password: Set(Some(
-                password: Some(bcrypt::hash("example".to_string(), bcrypt::DEFAULT_COST).unwrap()),
+                bcrypt::hash("example".to_string(), bcrypt::DEFAULT_COST).unwrap(),
-                vk_id: None,
+            )),
-                telegram_id: None,
+            vk_id: Set(None),
-                access_token: Some(utility::jwt::encode(&id)),
+            telegram_id: Set(None),
-                group: Some("ИС-214/23".to_string()),
+            group: Set(Some("ИС-214/23".to_string())),
-                role: UserRole::Student,
+            role: Set(UserRole::Student),
-                android_version: None,
+            android_version: Set(None),
-            },
+        };
-        )
+
-        .await
+        active_user
-        .unwrap();
+            .save(app_state.get_database())
+            .await
+            .expect("Failed to save user");
     }
 
     #[actix_web::test]

src/routes/auth/sign_up.rs

@@ -1,11 +1,14 @@
 use self::schema::*;
-use crate::AppState;
-use crate::database::driver;
-use crate::database::models::UserRole;
 use crate::routes::auth::shared::parse_vk_id;
-use crate::routes::schema::ResponseError;
 use crate::routes::schema::user::UserResponse;
+use crate::routes::schema::ResponseError;
+use crate::{utility, AppState};
 use actix_web::{post, web};
+use database::entity::sea_orm_active_enums::UserRole;
+use database::entity::ActiveUser;
+use database::query::Query;
+use database::sea_orm::ActiveModelTrait;
+use std::ops::Deref;
 use web::Json;
 
 async fn sign_up_combined(
@@ -28,22 +31,31 @@ async fn sign_up_combined(
         return Err(ErrorCode::InvalidGroupName);
     }
 
-    // If user with specified username already exists.
+    let db = app_state.get_database();
-    if driver::users::contains_by_username(&app_state, &data.username).await {
+
+    // If user with specified username already exists.O
+    if Query::find_user_by_username(db, &data.username)
+        .await
+        .is_ok_and(|user| user.is_some())
+    {
         return Err(ErrorCode::UsernameAlreadyExists);
     }
 
     // If user with specified VKID already exists.
     if let Some(id) = data.vk_id {
-        if driver::users::contains_by_vk_id(&app_state, id).await {
+        if Query::find_user_by_vk_id(db, id)
+            .await
+            .is_ok_and(|user| user.is_some())
+        {
             return Err(ErrorCode::VkAlreadyExists);
         }
     }
 
-    let user = data.into();
+    let active_user: ActiveUser = data.into();
-    driver::users::insert(&app_state, &user).await.unwrap();
+    let user = active_user.insert(db).await.unwrap();
+    let access_token = utility::jwt::encode(&user.id);
 
-    Ok(UserResponse::from(&user)).into()
+    Ok(UserResponse::from_user_with_token(user, access_token))
 }
 
 #[utoipa::path(responses(
@@ -101,10 +113,11 @@ pub async fn sign_up_vk(
 }
 
 mod schema {
-    use crate::database::models::{User, UserRole};
     use crate::routes::schema::user::UserResponse;
-    use crate::utility;
     use actix_macros::ErrResponse;
+    use database::entity::sea_orm_active_enums::UserRole;
+    use database::entity::ActiveUser;
+    use database::sea_orm::Set;
     use derive_more::Display;
     use objectid::ObjectId;
     use serde::{Deserialize, Serialize};
@@ -134,7 +147,7 @@ mod schema {
     }
 
     pub mod vk {
-        use crate::database::models::UserRole;
+        use database::entity::sea_orm_active_enums::UserRole;
         use serde::{Deserialize, Serialize};
 
         #[derive(Serialize, Deserialize, utoipa::ToSchema)]
@@ -215,25 +228,21 @@ mod schema {
         pub version: String,
     }
 
-    impl Into<User> for SignUpData {
+    impl Into<ActiveUser> for SignUpData {
-        fn into(self) -> User {
+        fn into(self) -> ActiveUser {
             assert_ne!(self.password.is_some(), self.vk_id.is_some());
 
-            let id = ObjectId::new().unwrap().to_string();
+            ActiveUser {
-            let access_token = Some(utility::jwt::encode(&id));
+                id: Set(ObjectId::new().unwrap().to_string()),
-
+                username: Set(self.username),
-            User {
+                password: Set(self
-                id,
-                username: self.username,
-                password: self
                     .password
-                    .map(|x| bcrypt::hash(x, bcrypt::DEFAULT_COST).unwrap()),
+                    .map(|x| bcrypt::hash(x, bcrypt::DEFAULT_COST).unwrap())),
-                vk_id: self.vk_id,
+                vk_id: Set(self.vk_id),
-                telegram_id: None,
+                telegram_id: Set(None),
-                access_token,
+                group: Set(Some(self.group)),
-                group: Some(self.group),
+                role: Set(self.role),
-                role: self.role,
+                android_version: Set(Some(self.version)),
-                android_version: Some(self.version),
             }
         }
     }
@@ -241,8 +250,6 @@ mod schema {
 
 #[cfg(test)]
 mod tests {
-    use crate::database::driver;
-    use crate::database::models::UserRole;
     use crate::routes::auth::sign_up::schema::Request;
     use crate::routes::auth::sign_up::sign_up;
     use crate::test_env::tests::{static_app_state, test_app_state, test_env};
@@ -251,6 +258,11 @@ mod tests {
     use actix_web::http::Method;
     use actix_web::http::StatusCode;
     use actix_web::test;
+    use database::entity::sea_orm_active_enums::UserRole;
+    use database::entity::{UserColumn, UserEntity};
+    use database::sea_orm::ColumnTrait;
+    use database::sea_orm::{EntityTrait, QueryFilter};
+    use std::ops::Deref;
 
     struct SignUpPartial<'a> {
         username: &'a str,
@@ -282,7 +294,12 @@ mod tests {
         test_env();
 
         let app_state = static_app_state().await;
-        driver::users::delete_by_username(&app_state, &"test::sign_up_valid".to_string()).await;
+
+        UserEntity::delete_many()
+            .filter(UserColumn::Username.eq("test::sign_up_valid"))
+            .exec(app_state.get_database())
+            .await
+            .expect("Failed to delete user");
 
         // test
 
@@ -303,7 +320,12 @@ mod tests {
         test_env();
 
         let app_state = static_app_state().await;
-        driver::users::delete_by_username(&app_state, &"test::sign_up_multiple".to_string()).await;
+
+        UserEntity::delete_many()
+            .filter(UserColumn::Username.eq("test::sign_up_multiple"))
+            .exec(app_state.get_database())
+            .await
+            .expect("Failed to delete user");
 
         let create = sign_up_client(SignUpPartial {
             username: "test::sign_up_multiple",

src/routes/flow/telegram_auth.rs

@@ -1,13 +1,15 @@
 use self::schema::*;
-use crate::database::driver;
-use crate::database::driver::users::UserSave;
-use crate::database::models::{User, UserRole};
 use crate::routes::schema::ResponseError;
 use crate::utility::telegram::{WebAppInitDataMap, WebAppUser};
-use crate::{AppState, utility};
+use crate::{utility, AppState};
 use actix_web::{post, web};
 use chrono::{DateTime, Duration, Utc};
+use database::entity::sea_orm_active_enums::UserRole;
+use database::entity::ActiveUser;
+use database::query::Query;
+use database::sea_orm::{ActiveModelTrait, Set};
 use objectid::ObjectId;
+use std::ops::Deref;
 use std::sync::Arc;
 use web::Json;
 
@@ -48,39 +50,28 @@ pub async fn telegram_auth(
     let web_app_user =
         serde_json::from_str::<WebAppUser>(init_data.data_map.get("user").unwrap()).unwrap();
 
-    let mut user = {
+    let user =
-        match driver::users::get_by_telegram_id(&app_state, web_app_user.id).await {
+        match Query::find_user_by_telegram_id(app_state.get_database(), web_app_user.id).await {
-            Ok(value) => Ok(value),
+            Ok(Some(value)) => Ok(value),
-            Err(_) => {
+            _ => {
-                let new_user = User {
+                let new_user = ActiveUser {
-                    id: ObjectId::new().unwrap().to_string(),
+                    id: Set(ObjectId::new().unwrap().to_string()),
-                    username: format!("telegram_{}", web_app_user.id), // можно оставить, а можно поменять
+                    username: Set(format!("telegram_{}", web_app_user.id)), // можно оставить, а можно поменять
-                    password: None,                                    // ибо нехуй
+                    password: Set(None),                                    // ибо нехуй
-                    vk_id: None,
+                    vk_id: Set(None),
-                    telegram_id: Some(web_app_user.id),
+                    telegram_id: Set(Some(web_app_user.id)),
-                    access_token: None, // установится ниже
+                    group: Set(None),
-                    group: None,
+                    role: Set(UserRole::Student), // TODO: при реге проверять данные
-                    role: UserRole::Student, // TODO: при реге проверять данные
+                    android_version: Set(None),
-                    android_version: None,
                 };
 
-                driver::users::insert(&app_state, &new_user)
+                new_user.insert(app_state.get_database()).await
-                    .await
-                    .map(|_| new_user)
             }
         }
-        .expect("Failed to get or add user")
+        .expect("Failed to get or add user");
-    };
 
-    user.access_token = Some(utility::jwt::encode(&user.id));
+    let access_token = utility::jwt::encode(&user.id);
-
+    Ok(Response::new(&access_token, user.group.is_some())).into()
-    user.save(&app_state).await.expect("Failed to update user");
-
-    Ok(Response::new(
-        &*user.access_token.unwrap(),
-        user.group.is_some(),
-    ))
-    .into()
 }
 
 mod schema {
@@ -89,9 +80,9 @@ mod schema {
     use crate::utility::telegram::VerifyError;
     use actix_macros::ErrResponse;
     use actix_web::body::EitherBody;
-    use actix_web::cookie::CookieBuilder;
     use actix_web::cookie::time::OffsetDateTime;
-    use actix_web::{HttpRequest, HttpResponse, web};
+    use actix_web::cookie::CookieBuilder;
+    use actix_web::{web, HttpRequest, HttpResponse};
     use derive_more::Display;
     use serde::{Deserialize, Serialize, Serializer};
     use std::ops::Add;
@@ -176,4 +167,4 @@ mod schema {
             }
         }
     }
-}
+}

src/routes/flow/telegram_complete.rs

@@ -1,11 +1,12 @@
 use self::schema::*;
-use crate::AppState;
-use crate::database::driver;
-use crate::database::driver::users::UserSave;
-use crate::database::models::User;
 use crate::extractors::base::AsyncExtractor;
 use crate::routes::schema::ResponseError;
+use crate::AppState;
 use actix_web::{post, web};
+use database::entity::User;
+use database::query::Query;
+use database::sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
+use std::ops::Deref;
 use web::Json;
 
 #[utoipa::path(responses(
@@ -20,7 +21,7 @@ pub async fn telegram_complete(
     app_state: web::Data<AppState>,
     user: AsyncExtractor<User>,
 ) -> ServiceResponse {
-    let mut user = user.into_inner();
+    let user = user.into_inner();
 
     // проверка на перезапись уже имеющихся данных
     if user.group.is_some() {
@@ -29,13 +30,19 @@ pub async fn telegram_complete(
 
     let data = data.into_inner();
 
+    let db = app_state.get_database();
+    let mut active_user = user.clone().into_active_model();
+
     // замена существующего имени, если оно отличается
     if user.username != data.username {
-        if driver::users::contains_by_username(&app_state, &data.username).await {
+        if Query::is_user_exists_by_username(db, &data.username)
+            .await
+            .unwrap()
+        {
             return Err(ErrorCode::UsernameAlreadyExists).into();
         }
 
-        user.username = data.username;
+        active_user.username = Set(data.username);
     }
 
     // проверка на существование группы
@@ -50,9 +57,12 @@ pub async fn telegram_complete(
         return Err(ErrorCode::InvalidGroupName).into();
     }
 
-    user.group = Some(data.group);
+    active_user.group = Set(Some(data.group));
 
-    user.save(&app_state).await.expect("Failed to update user");
+    active_user
+        .update(db)
+        .await
+        .expect("Failed to update user");
 
     Ok(()).into()
 }
@@ -80,11 +90,11 @@ mod schema {
     #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
     #[schema(as = Flow::TelegramFill::ErrorCode)]
     pub enum ErrorCode {
-        #[display("This flow already completed.")]
+        #[display("This flow is already completed.")]
         #[status_code = "actix_web::http::StatusCode::CONFLICT"]
         AlreadyCompleted,
 
-        #[display("Username is already exists.")]
+        #[display("User with that name already exists.")]
         #[status_code = "actix_web::http::StatusCode::BAD_REQUEST"]
         UsernameAlreadyExists,
 

src/routes/schedule/group.rs

@@ -1,10 +1,10 @@
 use self::schema::*;
 use crate::AppState;
-use crate::database::models::User;
 use crate::extractors::base::AsyncExtractor;
 use crate::routes::schedule::schema::ScheduleEntryResponse;
 use crate::routes::schema::ResponseError;
 use actix_web::{get, web};
+use database::entity::User;
 
 #[utoipa::path(responses(
     (status = OK, body = ScheduleEntryResponse),

src/routes/schema.rs

@@ -126,8 +126,9 @@ where
 }
 
 pub mod user {
-    use crate::database::models::{User, UserRole};
     use actix_macros::{OkResponse, ResponderJson};
+    use database::entity::sea_orm_active_enums::UserRole;
+    use database::entity::User;
     use serde::Serialize;
 
     //noinspection SpellCheckingInspection
@@ -165,17 +166,31 @@ pub mod user {
         pub access_token: Option<String>,
     }
 
-    /// Create UserResponse from User ref.
+    impl UserResponse {
-    impl From<&User> for UserResponse {
+        pub fn from_user_with_token(user: User, access_token: String) -> Self {
-        fn from(user: &User) -> Self {
+            Self {
-            UserResponse {
                 id: user.id.clone(),
                 username: user.username.clone(),
                 group: user.group.clone(),
                 role: user.role.clone(),
                 vk_id: user.vk_id.clone(),
                 telegram_id: user.telegram_id.clone(),
-                access_token: user.access_token.clone(),
+                access_token: Some(access_token),
+            }
+        }
+    }
+
+    /// Create UserResponse from User ref.
+    impl From<&User> for UserResponse {
+        fn from(user: &User) -> Self {
+            Self {
+                id: user.id.clone(),
+                username: user.username.clone(),
+                group: user.group.clone(),
+                role: user.role.clone(),
+                vk_id: user.vk_id.clone(),
+                telegram_id: user.telegram_id.clone(),
+                access_token: None,
             }
         }
     }
@@ -183,14 +198,14 @@ pub mod user {
     /// Transform User to UserResponse.
     impl From<User> for UserResponse {
         fn from(user: User) -> Self {
-            UserResponse {
+            Self {
                 id: user.id,
                 username: user.username,
                 group: user.group,
                 role: user.role,
                 vk_id: user.vk_id,
                 telegram_id: user.telegram_id,
-                access_token: user.access_token,
+                access_token: None,
             }
         }
     }

src/routes/users/change_group.rs

@@ -1,9 +1,10 @@
 use self::schema::*;
-use crate::database::driver::users::UserSave;
-use crate::database::models::User;
 use crate::extractors::base::AsyncExtractor;
 use crate::state::AppState;
 use actix_web::{post, web};
+use database::entity::User;
+use database::sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
+use std::ops::Deref;
 
 #[utoipa::path(responses((status = OK)))]
 #[post("/change-group")]
@@ -12,9 +13,13 @@ pub async fn change_group(
     user: AsyncExtractor<User>,
     data: web::Json<Request>,
 ) -> ServiceResponse {
-    let mut user = user.into_inner();
+    let user = user.into_inner();
 
-    if user.group.is_some_and(|group| group == data.group) {
+    if user
+        .group
+        .as_ref()
+        .is_some_and(|group| group.eq(&data.group))
+    {
         return Ok(()).into();
     }
 
@@ -28,10 +33,12 @@ pub async fn change_group(
     {
         return Err(ErrorCode::NotFound).into();
     }
-    
+
-    user.group = Some(data.into_inner().group);
+    let mut active_user = user.clone().into_active_model();
-    user.save(&app_state).await.unwrap();
+    active_user.group = Set(Some(data.into_inner().group));
-    
+
+    active_user.update(app_state.get_database()).await.unwrap();
+
     Ok(()).into()
 }
 

src/routes/users/change_username.rs

@@ -1,10 +1,11 @@
 use self::schema::*;
-use crate::database::driver;
-use crate::database::driver::users::UserSave;
-use crate::database::models::User;
 use crate::extractors::base::AsyncExtractor;
 use crate::state::AppState;
 use actix_web::{post, web};
+use database::entity::User;
+use database::query::Query;
+use database::sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
+use std::ops::Deref;
 
 #[utoipa::path(responses((status = OK)))]
 #[post("/change-username")]
@@ -13,21 +14,24 @@ pub async fn change_username(
     user: AsyncExtractor<User>,
     data: web::Json<Request>,
 ) -> ServiceResponse {
-    let mut user = user.into_inner();
+    let user = user.into_inner();
 
     if user.username == data.username {
         return Ok(()).into();
     }
 
-    if driver::users::get_by_username(&app_state, &data.username)
+    let db = app_state.get_database();
+
+    if Query::is_user_exists_by_username(db, &data.username)
         .await
-        .is_ok()
+        .unwrap()
     {
         return Err(ErrorCode::AlreadyExists).into();
     }
 
-    user.username = data.into_inner().username;
+    let mut active_user = user.into_active_model();
-    user.save(&app_state).await.unwrap();
+    active_user.username = Set(data.into_inner().username);
+    active_user.update(db).await.unwrap();
 
     Ok(()).into()
 }

src/routes/users/me.rs

@@ -1,7 +1,7 @@
-use crate::database::models::User;
 use crate::extractors::base::AsyncExtractor;
 use crate::routes::schema::user::UserResponse;
 use actix_web::get;
+use database::entity::User;
 
 #[utoipa::path(responses((status = OK, body = UserResponse)))]
 #[get("/me")]

src/state/mod.rs

@@ -2,25 +2,24 @@ mod env;
 
 pub use crate::state::env::AppEnv;
 use actix_web::web;
-use diesel::{Connection, PgConnection};
+use database::sea_orm::{Database, DatabaseConnection};
 use providers::base::{ScheduleProvider, ScheduleSnapshot};
 use std::collections::HashMap;
 use std::sync::Arc;
-use tokio::sync::{Mutex, MutexGuard};
 use tokio_util::sync::CancellationToken;
 
 /// Common data provided to endpoints.
 pub struct AppState {
     cancel_token: CancellationToken,
-    database: Mutex<PgConnection>,
+    database: DatabaseConnection,
     providers: HashMap<String, Arc<dyn ScheduleProvider>>,
     env: AppEnv,
 }
 
 impl AppState {
-    pub async fn new() -> Result<Self, Box<dyn std::error::Error>> {
+    pub async fn new(
-        let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
+        database: Option<DatabaseConnection>,
-
+    ) -> Result<Self, Box<dyn std::error::Error>> {
         let env = AppEnv::default();
         let providers: HashMap<String, Arc<dyn ScheduleProvider>> = HashMap::from([(
             "eng_polytechnic".to_string(),
@@ -52,10 +51,14 @@ impl AppState {
 
         let this = Self {
             cancel_token: CancellationToken::new(),
-            database: Mutex::new(
+            database: if let Some(database) = database {
-                PgConnection::establish(&database_url)
+                database
-                    .unwrap_or_else(|_| panic!("Error connecting to {}", database_url)),
+            } else {
-            ),
+                let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
+                Database::connect(&database_url)
+                    .await
+                    .unwrap_or_else(|_| panic!("Error connecting to {}", database_url))
+            },
             env,
             providers,
         };
@@ -80,8 +83,8 @@ impl AppState {
         None
     }
 
-    pub async fn get_database(&'_ self) -> MutexGuard<'_, PgConnection> {
+    pub fn get_database(&'_ self) -> &DatabaseConnection {
-        self.database.lock().await
+        &self.database
     }
 
     pub fn get_env(&self) -> &AppEnv {
@@ -90,6 +93,6 @@ impl AppState {
 }
 
 /// Create a new object web::Data<AppState>.
-pub async fn new_app_state() -> Result<web::Data<AppState>, Box<dyn std::error::Error>> {
+pub async fn new_app_state(database: Option<DatabaseConnection>) -> Result<web::Data<AppState>, Box<dyn std::error::Error>> {
-    Ok(web::Data::new(AppState::new().await?))
+    Ok(web::Data::new(AppState::new(database).await?))
 }

src/test_env.rs

@@ -7,20 +7,31 @@ pub(crate) mod tests {
 
     pub fn test_env() {
         info!("Loading test environment file...");
+
         dotenvy::from_filename(".env.test.local")
             .or_else(|_| dotenvy::from_filename(".env.test"))
             .expect("Failed to load test environment file");
     }
 
     pub async fn test_app_state() -> web::Data<AppState> {
-        let state = new_app_state().await.unwrap();
+        let state = new_app_state(Some(static_app_state().await.get_database().clone()))
+            .await
+            .unwrap();
 
         state.clone()
     }
 
     pub async fn static_app_state() -> web::Data<AppState> {
         static STATE: OnceCell<web::Data<AppState>> = OnceCell::const_new();
-        
+
-        STATE.get_or_init(|| test_app_state()).await.clone()
+        STATE
+            .get_or_init(async || -> web::Data<AppState> {
+                #[cfg(feature = "trace")]
+                console_subscriber::init();
+
+                new_app_state(None).await.unwrap()
+            })
+            .await
+            .clone()
     }
 }