From dbc800fef111ee76a3efc4294f097000a27fcbef Mon Sep 17 00:00:00 2001 From: n08i40k Date: Sat, 6 Sep 2025 20:08:46 +0400 Subject: [PATCH] feat(database)!: switch from diesel to sea-orm --- Cargo.lock | 2145 ++++++++++++++++- Cargo.toml | 6 +- database/Cargo.toml | 11 + database/entity/.gitignore | 1 + database/entity/Cargo.toml | 9 + database/entity/src/lib.rs | 6 + database/entity/src/prelude.rs | 3 + database/entity/src/sea_orm_active_enums.rs | 25 + database/entity/src/user.rs | 25 + database/migration/.gitignore | 1 + database/migration/Cargo.toml | 22 + database/migration/src/lib.rs | 16 + .../migration/src/m20250904_024854_init.rs | 70 + database/migration/src/main.rs | 6 + database/src/lib.rs | 10 + database/src/query.rs | 62 + diesel.toml | 9 - migrations/.keep | 0 .../down.sql | 6 - .../up.sql | 36 - .../down.sql | 1 - .../2025-03-21-211822_create_user_role/up.sql | 4 - .../2025-03-21-212111_create_users/down.sql | 1 - .../2025-03-21-212111_create_users/up.sql | 11 - .../2025-03-21-212723_create_fcm/down.sql | 1 - .../2025-03-21-212723_create_fcm/up.sql | 6 - .../down.sql | 2 - .../up.sql | 2 - .../down.sql | 2 - .../up.sql | 1 - .../down.sql | 3 - .../up.sql | 2 - .../down.sql | 2 - .../up.sql | 1 - .../down.sql | 2 - .../up.sql | 1 - src/database/driver.rs | 148 -- src/database/mod.rs | 3 - src/database/models.rs | 87 - src/database/schema.rs | 39 - src/extractors/authorized_user.rs | 19 +- src/main.rs | 4 +- src/middlewares/authorization.rs | 2 +- src/routes/auth/sign_in.rs | 68 +- src/routes/auth/sign_up.rs | 88 +- src/routes/flow/telegram_auth.rs | 61 +- src/routes/flow/telegram_complete.rs | 28 +- src/routes/schedule/group.rs | 2 +- src/routes/schema.rs | 31 +- src/routes/users/change_group.rs | 23 +- src/routes/users/change_username.rs | 20 +- src/routes/users/me.rs | 2 +- src/state/mod.rs | 31 +- src/test_env.rs | 17 +- 54 files changed, 2519 insertions(+), 665 deletions(-) create mode 100644 database/Cargo.toml create mode 100644 database/entity/.gitignore create mode 100644 database/entity/Cargo.toml create mode 100644 database/entity/src/lib.rs create mode 100644 database/entity/src/prelude.rs create mode 100644 database/entity/src/sea_orm_active_enums.rs create mode 100644 database/entity/src/user.rs create mode 100644 database/migration/.gitignore create mode 100644 database/migration/Cargo.toml create mode 100644 database/migration/src/lib.rs create mode 100644 database/migration/src/m20250904_024854_init.rs create mode 100644 database/migration/src/main.rs create mode 100644 database/src/lib.rs create mode 100644 database/src/query.rs delete mode 100644 diesel.toml delete mode 100644 migrations/.keep delete mode 100644 migrations/00000000000000_diesel_initial_setup/down.sql delete mode 100644 migrations/00000000000000_diesel_initial_setup/up.sql delete mode 100644 migrations/2025-03-21-211822_create_user_role/down.sql delete mode 100644 migrations/2025-03-21-211822_create_user_role/up.sql delete mode 100644 migrations/2025-03-21-212111_create_users/down.sql delete mode 100644 migrations/2025-03-21-212111_create_users/up.sql delete mode 100644 migrations/2025-03-21-212723_create_fcm/down.sql delete mode 100644 migrations/2025-03-21-212723_create_fcm/up.sql delete mode 100644 migrations/2025-05-28-185850_add_tg_id_to_users/down.sql delete mode 100644 migrations/2025-05-28-185850_add_tg_id_to_users/up.sql delete mode 100644 migrations/2025-05-28-191056_make_users_password_nullable/down.sql delete mode 100644 migrations/2025-05-28-191056_make_users_password_nullable/up.sql delete mode 100644 migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/down.sql delete mode 100644 migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/up.sql delete mode 100644 migrations/2025-05-29-140941_make_users_group_nullable/down.sql delete mode 100644 migrations/2025-05-29-140941_make_users_group_nullable/up.sql delete mode 100644 migrations/2025-05-29-142329_make_users_access_token_nullable/down.sql delete mode 100644 migrations/2025-05-29-142329_make_users_access_token_nullable/up.sql delete mode 100644 src/database/driver.rs delete mode 100644 src/database/mod.rs delete mode 100644 src/database/models.rs delete mode 100644 src/database/schema.rs diff --git a/Cargo.lock b/Cargo.lock index b1746e3..daddd5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ dependencies = [ "actix-rt", "actix-service", "actix-utils", - "base64", + "base64 0.22.1", "bitflags", "brotli", "bytes", @@ -64,7 +64,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -74,7 +74,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -199,7 +199,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -217,6 +217,17 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.16", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "1.1.3" @@ -226,6 +237,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -241,6 +258,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -306,6 +329,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "anyhow" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100" + [[package]] name = "arbitrary" version = "1.4.1" @@ -315,6 +344,159 @@ dependencies = [ "derive_arbitrary", ] +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "pin-project-lite", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.5.0", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite", + "once_cell", + "tokio", +] + +[[package]] +name = "async-io" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "windows-sys 0.60.2", +] + +[[package]] +name = "async-lock" +version = "3.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" +dependencies = [ + "event-listener 5.4.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-std" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b" +dependencies = [ + "async-attributes", + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + [[package]] name = "async-trait" version = "0.1.89" @@ -323,7 +505,16 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", +] + +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", ] [[package]] @@ -347,6 +538,53 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http 1.3.1", + "http-body", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.3.1", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.75" @@ -359,7 +597,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -375,6 +613,12 @@ dependencies = [ "utoipa", ] +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -393,18 +637,47 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abaf6da45c74385272ddf00e1ac074c7d8a6c1a1dda376902bd6a427522a8b2c" dependencies = [ - "base64", + "base64 0.22.1", "blowfish", "getrandom 0.3.3", "subtle", "zeroize", ] +[[package]] +name = "bigdecimal" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a22f228ab7a1b23027ccc6c350b72868017af7ea8356fbdf19f8d991c690013" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", + "serde", +] + [[package]] name = "bitflags" version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +dependencies = [ + "serde", +] + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] [[package]] name = "block-buffer" @@ -424,6 +697,19 @@ dependencies = [ "hybrid-array", ] +[[package]] +name = "blocking" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" +dependencies = [ + "async-channel 2.5.0", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + [[package]] name = "blowfish" version = "0.9.1" @@ -434,6 +720,29 @@ dependencies = [ "cipher", ] +[[package]] +name = "borsh" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "brotli" version = "8.0.1" @@ -471,6 +780,28 @@ version = "3.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "byteorder" version = "0.3.13" @@ -532,6 +863,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.41" @@ -557,6 +894,46 @@ dependencies = [ "inout", ] +[[package]] +name = "clap" +version = "4.5.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eac00902d9d136acd712710d71823fb8ac8004ca445a89e73a41d45aa712931" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ad9bbf750e73b5884fb8a211a9424a1906c1e156724260fdae972f31d70e1d6" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfd7eae0b0f1a6e63d4b13c9c478de77c2eb546fba158ad50b4203dc24b9f9c" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "clap_lex" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" + [[package]] name = "codepage" version = "0.1.2" @@ -572,6 +949,60 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console-api" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857" +dependencies = [ + "futures-core", + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures-task", + "hdrhistogram", + "humantime", + "hyper-util", + "prost", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "const-oid" version = "0.10.1" @@ -623,6 +1054,21 @@ dependencies = [ "libc", ] +[[package]] +name = "crc" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + [[package]] name = "crc32fast" version = "1.4.2" @@ -632,6 +1078,30 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crypto-common" version = "0.1.6" @@ -675,7 +1145,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -699,7 +1169,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.106", ] [[package]] @@ -710,7 +1180,17 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.106", +] + +[[package]] +name = "database" +version = "0.1.0" +dependencies = [ + "entity", + "migration", + "paste", + "sea-orm", ] [[package]] @@ -735,6 +1215,7 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" dependencies = [ + "const-oid 0.9.6", "pem-rfc7468", "zeroize", ] @@ -757,7 +1238,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -778,56 +1259,10 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn", + "syn 2.0.106", "unicode-xid", ] -[[package]] -name = "diesel" -version = "2.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229850a212cd9b84d4f0290ad9d294afc0ae70fccaa8949dbe8b43ffafa1e20c" -dependencies = [ - "bitflags", - "byteorder 1.5.0", - "diesel_derives", - "itoa", - "pq-sys", -] - -[[package]] -name = "diesel-derive-enum" -version = "2.2.0" -source = "git+https://github.com/Havunen/diesel-derive-enum.git#e0e57dad5508863da9a43dd35953fa92819261d7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_derives" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d4216021b3ea446fd2047f5c8f8fe6e98af34508a254a01e4d6bc1e844f84d" -dependencies = [ - "diesel_table_macro_syntax", - "dsl_auto_type", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_table_macro_syntax" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" -dependencies = [ - "syn", -] - [[package]] name = "digest" version = "0.10.7" @@ -835,7 +1270,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", + "const-oid 0.9.6", "crypto-common 0.1.6", + "subtle", ] [[package]] @@ -845,7 +1282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a4aae35a0fcbe22ff1be50fe96df72002d5a4a6fb4aae9193cf2da0daa36da2" dependencies = [ "block-buffer 0.11.0-rc.5", - "const-oid", + "const-oid 0.10.1", "crypto-common 0.2.0-rc.4", ] @@ -857,7 +1294,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -866,20 +1303,6 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "dsl_auto_type" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139ae9aca7527f85f26dd76483eb38533fd84bd571065da1739656ef71c5ff5b" -dependencies = [ - "darling", - "either", - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "dyn-clone" version = "1.0.20" @@ -892,7 +1315,7 @@ version = "3.0.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e01f644da45b2f83a7c40f6895ccc467ce60d6163c729d9fe4351eaa42c512" dependencies = [ - "signature", + "signature 3.0.0-rc.3", ] [[package]] @@ -903,7 +1326,7 @@ checksum = "5e0db9678ad1873a245383faabce5bf0636b15edc8742f7bf5425f3a82d74c49" dependencies = [ "curve25519-dalek", "ed25519", - "sha2", + "sha2 0.11.0-rc.2", "subtle", "zeroize", ] @@ -913,6 +1336,9 @@ name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] [[package]] name = "encoding_rs" @@ -923,6 +1349,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "entity" +version = "0.1.0" +dependencies = [ + "sea-orm", + "serde", + "utoipa", +] + [[package]] name = "env_filter" version = "0.1.3" @@ -962,6 +1397,44 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener 5.4.1", + "pin-project-lite", +] + [[package]] name = "fast-float2" version = "0.2.3" @@ -1003,6 +1476,17 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1045,6 +1529,26 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.31" @@ -1061,12 +1565,47 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + [[package]] name = "futures-io" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +[[package]] +name = "futures-lite" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.31" @@ -1075,7 +1614,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -1154,6 +1693,24 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "h2" version = "0.3.26" @@ -1197,12 +1754,48 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hashbrown" version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + +[[package]] +name = "hashlink" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +dependencies = [ + "hashbrown 0.15.4", +] + +[[package]] +name = "hdrhistogram" +version = "7.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" +dependencies = [ + "base64 0.21.7", + "byteorder 1.5.0", + "flate2", + "nom", + "num-traits", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heck" @@ -1210,6 +1803,12 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + [[package]] name = "hex" version = "0.4.3" @@ -1222,6 +1821,33 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71" +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "hostname" version = "0.1.5" @@ -1300,6 +1926,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "humantime" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" + [[package]] name = "hybrid-array" version = "0.4.0" @@ -1322,6 +1954,7 @@ dependencies = [ "http 1.3.1", "http-body", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -1345,6 +1978,19 @@ dependencies = [ "tower-service", ] +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.6.0" @@ -1367,7 +2013,7 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "futures-channel", "futures-core", @@ -1552,6 +2198,17 @@ dependencies = [ "serde", ] +[[package]] +name = "inherent" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c38228f24186d9cc68c729accb4d413be9eaed6ad07ff79e0270d9e56f3de13" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "inout" version = "0.1.4" @@ -1594,6 +2251,15 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.15" @@ -1621,7 +2287,7 @@ checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -1650,7 +2316,7 @@ version = "9.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde" dependencies = [ - "base64", + "base64 0.22.1", "js-sys", "pem", "ring", @@ -1659,6 +2325,15 @@ dependencies = [ "simple_asn1", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "language-tags" version = "0.3.2" @@ -1676,6 +2351,9 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] [[package]] name = "libc" @@ -1683,6 +2361,33 @@ version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "libredox" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" +dependencies = [ + "bitflags", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "pkg-config", + "vcpkg", +] + [[package]] name = "libz-rs-sys" version = "0.5.1" @@ -1736,6 +2441,34 @@ name = "log" version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +dependencies = [ + "value-bag", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest 0.10.7", +] [[package]] name = "memchr" @@ -1743,12 +2476,26 @@ version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +[[package]] +name = "migration" +version = "0.1.0" +dependencies = [ + "async-std", + "sea-orm-migration", +] + [[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.8.9" @@ -1787,6 +2534,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -1797,6 +2554,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder 1.5.0", + "lazy_static 1.5.0", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -1812,6 +2586,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -1819,6 +2604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -1881,7 +2667,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -1902,6 +2688,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "ordered-float" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" +dependencies = [ + "num-traits", +] + [[package]] name = "os_info" version = "3.12.0" @@ -1914,6 +2709,36 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ouroboros" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.4" @@ -1934,16 +2759,22 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pem" version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" dependencies = [ - "base64", + "base64 0.22.1", "serde", ] @@ -1962,6 +2793,35 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +[[package]] +name = "pgvector" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc58e2d255979a31caa7cabfa7aac654af0354220719ab7a68520ae7a91e8c0b" +dependencies = [ + "serde", +] + +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -1974,6 +2834,38 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.32" @@ -1986,13 +2878,27 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d77244ce2d584cd84f6a15f86195b8c9b2a0dfbfd817c09e0464244091a58ed" dependencies = [ - "base64", + "base64 0.22.1", "indexmap 2.9.0", "quick-xml", "serde", "time 0.3.41", ] +[[package]] +name = "polling" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "windows-sys 0.60.2", +] + [[package]] name = "portable-atomic" version = "1.11.1" @@ -2033,13 +2939,34 @@ dependencies = [ ] [[package]] -name = "pq-sys" -version = "0.7.2" +name = "proc-macro-crate" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfd6cf44cca8f9624bc19df234fc4112873432f5fda1caff174527846d026fa9" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ - "libc", - "vcpkg", + "toml_edit", +] + +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.106", ] [[package]] @@ -2051,6 +2978,51 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", + "version_check", + "yansi", +] + +[[package]] +name = "prost" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "prost-types" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" +dependencies = [ + "prost", +] + [[package]] name = "provider-engels-polytechnic" version = "0.1.0" @@ -2080,6 +3052,26 @@ dependencies = [ "provider-engels-polytechnic", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -2111,6 +3103,12 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.3.23" @@ -2134,16 +3132,37 @@ dependencies = [ "winapi", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + [[package]] name = "rand" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ - "rand_chacha", + "rand_chacha 0.9.0", "rand_core 0.9.3", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_chacha" version = "0.9.0" @@ -2169,6 +3188,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + [[package]] name = "rand_core" version = "0.9.3" @@ -2189,9 +3217,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ "bitflags", ] @@ -2213,7 +3241,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -2224,8 +3252,17 @@ checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -2236,7 +3273,7 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.5", ] [[package]] @@ -2245,19 +3282,34 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +[[package]] +name = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + [[package]] name = "reqwest" version = "0.12.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ - "base64", + "base64 0.22.1", "bytes", "encoding_rs", "futures-channel", @@ -2284,7 +3336,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-native-tls", - "tower", + "tower 0.5.2", "tower-http", "tower-service", "url", @@ -2307,6 +3359,55 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rkyv" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rsa" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +dependencies = [ + "const-oid 0.9.6", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature 2.2.0", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rust-crypto" version = "0.2.36" @@ -2320,6 +3421,22 @@ dependencies = [ "time 0.1.45", ] +[[package]] +name = "rust_decimal" +version = "1.37.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand 0.8.5", + "rkyv", + "serde", + "serde_json", +] + [[package]] name = "rustc-demangle" version = "0.1.25" @@ -2426,12 +3543,12 @@ dependencies = [ "actix-macros 0.1.0", "actix-test", "actix-web", - "base64", + "base64 0.22.1", "bcrypt", "chrono", + "console-subscriber", + "database", "derive_more", - "diesel", - "diesel-derive-enum", "dotenvy", "ed25519-dalek", "env_logger", @@ -2452,6 +3569,7 @@ dependencies = [ "sha1 0.11.0-rc.2", "tokio", "tokio-util", + "tracing", "utoipa", "utoipa-actix-web", "utoipa-rapidoc", @@ -2488,6 +3606,174 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sea-bae" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f694a6ab48f14bc063cfadff30ab551d3c7e46d8f81836c51989d548f44a2a25" +dependencies = [ + "heck 0.4.1", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "sea-orm" +version = "2.0.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3d28bb41747c3bc4b09897b4b4adc65ada1ebe7ff34da78cd532b6344e0e52" +dependencies = [ + "async-stream", + "async-trait", + "bigdecimal", + "chrono", + "futures-util", + "log", + "ouroboros", + "pgvector", + "rust_decimal", + "sea-orm-macros", + "sea-query", + "sea-query-sqlx", + "serde", + "serde_json", + "sqlx", + "strum", + "thiserror", + "time 0.3.41", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sea-orm-cli" +version = "2.0.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e24295916df37acfc9ba3ef03e70aa303e8339429f4d2a29c81dcacd47fafd08" +dependencies = [ + "chrono", + "clap", + "dotenvy", + "glob", + "regex", + "sea-schema", + "sqlx", + "tracing", + "tracing-subscriber", + "url", +] + +[[package]] +name = "sea-orm-macros" +version = "2.0.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326490a99cf5637b4b5243023800eec0fb5b3474287700f9f281e340bf1c024" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "sea-bae", + "syn 2.0.106", + "unicode-ident", +] + +[[package]] +name = "sea-orm-migration" +version = "2.0.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "789af30f351cdc761329584ef008ed2a3a805fbcffeae054465ce20b3a3ab8c9" +dependencies = [ + "async-trait", + "clap", + "dotenvy", + "sea-orm", + "sea-orm-cli", + "sea-schema", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "sea-query" +version = "1.0.0-rc.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab621a8d8b03a3e513ea075f71aa26830a55c977d7b40f09e825bb91910db823" +dependencies = [ + "bigdecimal", + "chrono", + "inherent", + "ordered-float", + "rust_decimal", + "sea-query-derive", + "serde_json", + "time 0.3.41", + "uuid", +] + +[[package]] +name = "sea-query-derive" +version = "1.0.0-rc.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "217e9422de35f26c16c5f671fce3c075a65e10322068dbc66078428634af6195" +dependencies = [ + "darling", + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.106", + "thiserror", +] + +[[package]] +name = "sea-query-sqlx" +version = "0.8.0-rc.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5eb19495858d8ae3663387a4f5298516c6f0171a7ca5681055450f190236b8" +dependencies = [ + "bigdecimal", + "chrono", + "rust_decimal", + "sea-query", + "serde_json", + "sqlx", + "time 0.3.41", + "uuid", +] + +[[package]] +name = "sea-schema" +version = "0.17.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291a75100408e8d224f7d9f0aad26c526bd723a45dad44e09d42940cd613cad7" +dependencies = [ + "futures", + "sea-query", + "sea-query-sqlx", + "sea-schema-derive", + "sqlx", +] + +[[package]] +name = "sea-schema-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "debdc8729c37fdbf88472f97fd470393089f997a909e535ff67c544d18cfccf0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "security-framework" version = "2.11.1" @@ -2655,7 +3941,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -2678,7 +3964,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -2708,7 +3994,7 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" dependencies = [ - "base64", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", @@ -2731,7 +4017,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -2756,6 +4042,17 @@ dependencies = [ "digest 0.11.0-rc.1", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha2" version = "0.11.0-rc.2" @@ -2767,6 +4064,15 @@ dependencies = [ "digest 0.11.0-rc.1", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static 1.5.0", +] + [[package]] name = "shlex" version = "1.3.0" @@ -2782,6 +4088,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest 0.10.7", + "rand_core 0.6.4", +] + [[package]] name = "signature" version = "3.0.0-rc.3" @@ -2794,6 +4110,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + [[package]] name = "simple_asn1" version = "0.6.3" @@ -2820,6 +4142,9 @@ name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -2841,24 +4166,284 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlx" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" +dependencies = [ + "base64 0.22.1", + "bigdecimal", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener 5.4.1", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown 0.15.4", + "hashlink", + "indexmap 2.9.0", + "log", + "memchr", + "once_cell", + "percent-encoding", + "rust_decimal", + "serde", + "serde_json", + "sha2 0.10.9", + "smallvec", + "thiserror", + "time 0.3.41", + "tokio", + "tokio-stream", + "tracing", + "url", + "uuid", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 2.0.106", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" +dependencies = [ + "dotenvy", + "either", + "heck 0.5.0", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2 0.10.9", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 2.0.106", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" +dependencies = [ + "atoi", + "base64 0.22.1", + "bigdecimal", + "bitflags", + "byteorder 1.5.0", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "rust_decimal", + "serde", + "sha1 0.10.6", + "sha2 0.10.9", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.41", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" +dependencies = [ + "atoi", + "base64 0.22.1", + "bigdecimal", + "bitflags", + "byteorder 1.5.0", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "num-bigint", + "once_cell", + "rand 0.8.5", + "rust_decimal", + "serde", + "serde_json", + "sha2 0.10.9", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.41", + "tracing", + "uuid", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "thiserror", + "time 0.3.41", + "tracing", + "url", + "uuid", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "strum" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" + [[package]] name = "subtle" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.106" @@ -2887,7 +4472,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -2911,6 +4496,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" version = "3.20.0" @@ -2941,7 +4532,16 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", +] + +[[package]] +name = "thread_local" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", ] [[package]] @@ -2996,6 +4596,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.47.1" @@ -3013,6 +4628,7 @@ dependencies = [ "slab", "socket2 0.6.0", "tokio-macros", + "tracing", "windows-sys 0.59.0", ] @@ -3024,7 +4640,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -3047,6 +4663,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.16" @@ -3101,6 +4728,56 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2 0.4.10", + "http 1.3.1", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "prost", + "socket2 0.5.10", + "tokio", + "tokio-stream", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand 0.8.5", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.5.2" @@ -3129,7 +4806,7 @@ dependencies = [ "http-body", "iri-string", "pin-project-lite", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", ] @@ -3166,7 +4843,7 @@ checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -3185,6 +4862,12 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ + "matchers", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "tracing", "tracing-core", ] @@ -3223,12 +4906,33 @@ dependencies = [ "libc", ] +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + [[package]] name = "unicode-ident" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" + [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -3253,7 +4957,7 @@ version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ - "base64", + "base64 0.22.1", "brotli-decompressor 4.0.3", "encoding_rs", "flate2", @@ -3273,7 +4977,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00432f493971db5d8e47a65aeb3b02f8226b9b11f1450ff86bb772776ebadd70" dependencies = [ - "base64", + "base64 0.22.1", "der", "log", "native-tls", @@ -3291,7 +4995,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbe120bb823a0061680e66e9075942fcdba06d46551548c2c259766b9558bc9a" dependencies = [ - "base64", + "base64 0.22.1", "http 1.3.1", "httparse", "log", @@ -3359,7 +5063,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn", + "syn 2.0.106", ] [[package]] @@ -3392,6 +5096,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" +[[package]] +name = "value-bag" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5" + [[package]] name = "vcpkg" version = "0.2.15" @@ -3434,6 +5144,12 @@ dependencies = [ "wit-bindgen-rt", ] +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -3456,7 +5172,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 2.0.106", "wasm-bindgen-shared", ] @@ -3491,7 +5207,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3542,6 +5258,16 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", +] + [[package]] name = "winapi" version = "0.3.9" @@ -3585,7 +5311,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -3596,7 +5322,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -3634,13 +5360,22 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3649,7 +5384,31 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.3", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -3658,64 +5417,171 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.7.11" @@ -3749,6 +5615,21 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yoke" version = "0.8.0" @@ -3769,7 +5650,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", "synstructure", ] @@ -3790,7 +5671,7 @@ checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] @@ -3810,7 +5691,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", "synstructure", ] @@ -3850,7 +5731,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.106", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4a2510f..e2a3290 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,7 @@ derive_more = { version = "2.0.1", features = ["full"] } dotenvy = "0.15.7" # sql -diesel = { version = "2.2.12", features = ["postgres"] } -diesel-derive-enum = { git = "https://github.com/Havunen/diesel-derive-enum.git", features = ["postgres"] } +database = { path = "database" } # logging env_logger = "0.11.8" @@ -73,3 +72,6 @@ ed25519-dalek = "3.0.0-pre.0" [dev-dependencies] providers = { path = "providers", features = ["test"] } actix-test = { path = "actix-test" } + +console-subscriber = "0.4.1" +tracing = "0.1.41" diff --git a/database/Cargo.toml b/database/Cargo.toml new file mode 100644 index 0000000..0f61714 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/database/entity/.gitignore b/database/entity/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/database/entity/.gitignore @@ -0,0 +1 @@ +/target diff --git a/database/entity/Cargo.toml b/database/entity/Cargo.toml new file mode 100644 index 0000000..b7e5397 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/database/entity/src/lib.rs b/database/entity/src/lib.rs new file mode 100644 index 0000000..c7dbd75 --- /dev/null +++ b/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; diff --git a/database/entity/src/prelude.rs b/database/entity/src/prelude.rs new file mode 100644 index 0000000..a25d7bb --- /dev/null +++ b/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; diff --git a/database/entity/src/sea_orm_active_enums.rs b/database/entity/src/sea_orm_active_enums.rs new file mode 100644 index 0000000..c0c9da3 --- /dev/null +++ b/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, +} diff --git a/database/entity/src/user.rs b/database/entity/src/user.rs new file mode 100644 index 0000000..9488eaf --- /dev/null +++ b/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, + pub vk_id: Option, + pub group: Option, + pub role: UserRole, + pub android_version: Option, + #[sea_orm(unique)] + pub telegram_id: Option, +} + +#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] +pub enum Relation {} + +impl ActiveModelBehavior for ActiveModel {} diff --git a/database/migration/.gitignore b/database/migration/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/database/migration/.gitignore @@ -0,0 +1 @@ +/target diff --git a/database/migration/Cargo.toml b/database/migration/Cargo.toml new file mode 100644 index 0000000..122a5bd --- /dev/null +++ b/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 +] diff --git a/database/migration/src/lib.rs b/database/migration/src/lib.rs new file mode 100644 index 0000000..1751f7c --- /dev/null +++ b/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> { + vec![ + Box::new(m20250904_024854_init::Migration), + ] + } +} diff --git a/database/migration/src/m20250904_024854_init.rs b/database/migration/src/m20250904_024854_init.rs new file mode 100644 index 0000000..8a643e6 --- /dev/null +++ b/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, +} diff --git a/database/migration/src/main.rs b/database/migration/src/main.rs new file mode 100644 index 0000000..c6b6e48 --- /dev/null +++ b/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; +} diff --git a/database/src/lib.rs b/database/src/lib.rs new file mode 100644 index 0000000..2a61bae --- /dev/null +++ b/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}; +} diff --git a/database/src/query.rs b/database/src/query.rs new file mode 100644 index 0000000..746bf48 --- /dev/null +++ b/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 []( + db: &::sea_orm::DbConn, + $by: ref_type!($by_type) + ) -> Result { + ::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 []( + db: &::sea_orm::DbConn, + $by: ref_type!($by_type) + ) -> Result, ::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); +} diff --git a/diesel.toml b/diesel.toml deleted file mode 100644 index 803c125..0000000 --- a/diesel.toml +++ /dev/null @@ -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" diff --git a/migrations/.keep b/migrations/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/migrations/00000000000000_diesel_initial_setup/down.sql b/migrations/00000000000000_diesel_initial_setup/down.sql deleted file mode 100644 index 2379ff6..0000000 --- a/migrations/00000000000000_diesel_initial_setup/down.sql +++ /dev/null @@ -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(); diff --git a/migrations/00000000000000_diesel_initial_setup/up.sql b/migrations/00000000000000_diesel_initial_setup/up.sql deleted file mode 100644 index 0e346e9..0000000 --- a/migrations/00000000000000_diesel_initial_setup/up.sql +++ /dev/null @@ -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; diff --git a/migrations/2025-03-21-211822_create_user_role/down.sql b/migrations/2025-03-21-211822_create_user_role/down.sql deleted file mode 100644 index 8df4f0f..0000000 --- a/migrations/2025-03-21-211822_create_user_role/down.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TYPE user_role; \ No newline at end of file diff --git a/migrations/2025-03-21-211822_create_user_role/up.sql b/migrations/2025-03-21-211822_create_user_role/up.sql deleted file mode 100644 index 889ca7a..0000000 --- a/migrations/2025-03-21-211822_create_user_role/up.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE TYPE user_role AS ENUM ( - 'STUDENT', - 'TEACHER', - 'ADMIN'); \ No newline at end of file diff --git a/migrations/2025-03-21-212111_create_users/down.sql b/migrations/2025-03-21-212111_create_users/down.sql deleted file mode 100644 index 441087a..0000000 --- a/migrations/2025-03-21-212111_create_users/down.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE users; \ No newline at end of file diff --git a/migrations/2025-03-21-212111_create_users/up.sql b/migrations/2025-03-21-212111_create_users/up.sql deleted file mode 100644 index ed2045e..0000000 --- a/migrations/2025-03-21-212111_create_users/up.sql +++ /dev/null @@ -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 -); \ No newline at end of file diff --git a/migrations/2025-03-21-212723_create_fcm/down.sql b/migrations/2025-03-21-212723_create_fcm/down.sql deleted file mode 100644 index 82e5923..0000000 --- a/migrations/2025-03-21-212723_create_fcm/down.sql +++ /dev/null @@ -1 +0,0 @@ -DROP TABLE fcm; \ No newline at end of file diff --git a/migrations/2025-03-21-212723_create_fcm/up.sql b/migrations/2025-03-21-212723_create_fcm/up.sql deleted file mode 100644 index 2611912..0000000 --- a/migrations/2025-03-21-212723_create_fcm/up.sql +++ /dev/null @@ -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 ) -); \ No newline at end of file diff --git a/migrations/2025-05-28-185850_add_tg_id_to_users/down.sql b/migrations/2025-05-28-185850_add_tg_id_to_users/down.sql deleted file mode 100644 index 8253709..0000000 --- a/migrations/2025-05-28-185850_add_tg_id_to_users/down.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE users DROP CONSTRAINT users_telegram_id_key; -ALTER TABLE users DROP COLUMN telegram_id; \ No newline at end of file diff --git a/migrations/2025-05-28-185850_add_tg_id_to_users/up.sql b/migrations/2025-05-28-185850_add_tg_id_to_users/up.sql deleted file mode 100644 index 75ea0de..0000000 --- a/migrations/2025-05-28-185850_add_tg_id_to_users/up.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE users ADD telegram_id int8 NULL; -ALTER TABLE users ADD CONSTRAINT users_telegram_id_key UNIQUE (telegram_id); \ No newline at end of file diff --git a/migrations/2025-05-28-191056_make_users_password_nullable/down.sql b/migrations/2025-05-28-191056_make_users_password_nullable/down.sql deleted file mode 100644 index 8d3bb89..0000000 --- a/migrations/2025-05-28-191056_make_users_password_nullable/down.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE users SET "password" = '' WHERE "password" IS NULL; -ALTER TABLE users ALTER COLUMN "password" SET NOT NULL; \ No newline at end of file diff --git a/migrations/2025-05-28-191056_make_users_password_nullable/up.sql b/migrations/2025-05-28-191056_make_users_password_nullable/up.sql deleted file mode 100644 index 7239579..0000000 --- a/migrations/2025-05-28-191056_make_users_password_nullable/up.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE users ALTER COLUMN "password" DROP NOT NULL; diff --git a/migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/down.sql b/migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/down.sql deleted file mode 100644 index 0945853..0000000 --- a/migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/down.sql +++ /dev/null @@ -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"; \ No newline at end of file diff --git a/migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/up.sql b/migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/up.sql deleted file mode 100644 index ce0c331..0000000 --- a/migrations/2025-05-28-200403_rename_users_app_version_and_make_it_nullable/up.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE users RENAME COLUMN "version" TO android_version; -ALTER TABLE users ALTER COLUMN android_version DROP NOT NULL; \ No newline at end of file diff --git a/migrations/2025-05-29-140941_make_users_group_nullable/down.sql b/migrations/2025-05-29-140941_make_users_group_nullable/down.sql deleted file mode 100644 index 47d6ea3..0000000 --- a/migrations/2025-05-29-140941_make_users_group_nullable/down.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE users SET "group" = '' WHERE "group" IS NULL; -ALTER TABLE users ALTER COLUMN "group" SET NOT NULL; \ No newline at end of file diff --git a/migrations/2025-05-29-140941_make_users_group_nullable/up.sql b/migrations/2025-05-29-140941_make_users_group_nullable/up.sql deleted file mode 100644 index 21f7836..0000000 --- a/migrations/2025-05-29-140941_make_users_group_nullable/up.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE users ALTER COLUMN "group" DROP NOT NULL; diff --git a/migrations/2025-05-29-142329_make_users_access_token_nullable/down.sql b/migrations/2025-05-29-142329_make_users_access_token_nullable/down.sql deleted file mode 100644 index 5695b0d..0000000 --- a/migrations/2025-05-29-142329_make_users_access_token_nullable/down.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE users SET "access_token" = '' WHERE "access_token" IS NULL; -ALTER TABLE users ALTER COLUMN "access_token" SET NOT NULL; \ No newline at end of file diff --git a/migrations/2025-05-29-142329_make_users_access_token_nullable/up.sql b/migrations/2025-05-29-142329_make_users_access_token_nullable/up.sql deleted file mode 100644 index 8b8f11d..0000000 --- a/migrations/2025-05-29-142329_make_users_access_token_nullable/up.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE users ALTER COLUMN "access_token" DROP NOT NULL; diff --git a/src/database/driver.rs b/src/database/driver.rs deleted file mode 100644 index 0c15458..0000000 --- a/src/database/driver.rs +++ /dev/null @@ -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, _id: &String) -> QueryResult { - 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, - _username: &String, - ) -> QueryResult { - 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, _vk_id: i32) -> QueryResult { - 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, - _telegram_id: i64, - ) -> QueryResult { - 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, _username: &String) -> bool { - // и как это нахуй сократить блять примеров нихуя нет, нихуя не работает - // как меня этот раст заебал уже - - match users - .filter(username.eq(_username)) - .count() - .get_result::(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, _vk_id: i32) -> bool { - match users - .filter(vk_id.eq(_vk_id)) - .count() - .get_result::(state.get_database().await.deref_mut()) - { - Ok(count) => count > 0, - Err(_) => false, - } - } - - pub async fn insert(state: &web::Data, user: &User) -> QueryResult { - 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` - /// - /// # Examples - /// - /// ``` - /// use crate::database::driver::users; - /// - /// #[derive(Deserialize)] - /// struct Params { - /// pub username: String, - /// } - /// - /// #[patch("/")] - /// async fn patch_user( - /// app_state: web::Data, - /// user: SyncExtractor, - /// web::Query(params): web::Query, - /// ) -> web::Json { - /// 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) -> QueryResult; - } - - /// Implementation of [UserSave][UserSave] trait. - impl UserSave for User { - async fn save(&self, state: &web::Data) -> QueryResult { - self.save_changes::(state.get_database().await.deref_mut()) - } - } - - #[cfg(test)] - pub async fn delete_by_username(state: &web::Data, _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, user: &User) -> QueryResult { - insert_into(users) - .values(user) - .on_conflict_do_nothing() - .execute(state.get_database().await.deref_mut()) - } -} diff --git a/src/database/mod.rs b/src/database/mod.rs deleted file mode 100644 index 8eaeed3..0000000 --- a/src/database/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod driver; -pub mod models; -pub mod schema; diff --git a/src/database/models.rs b/src/database/models.rs deleted file mode 100644 index 1155735..0000000 --- a/src/database/models.rs +++ /dev/null @@ -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, - - /// ID of the linked VK account. - pub vk_id: Option, - - /// JWT access token. - pub access_token: Option, - - /// Group. - pub group: Option, - - /// Role. - pub role: UserRole, - - /// Version of the installed Polytechnic+ application. - pub android_version: Option, - - /// ID of the linked Telegram account. - pub telegram_id: Option, -} - -#[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>, -} diff --git a/src/database/schema.rs b/src/database/schema.rs deleted file mode 100644 index b4dba01..0000000 --- a/src/database/schema.rs +++ /dev/null @@ -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>, - } -} - -diesel::table! { - use diesel::sql_types::*; - use super::sql_types::UserRole; - - users (id) { - id -> Text, - username -> Text, - password -> Nullable, - vk_id -> Nullable, - access_token -> Nullable, - group -> Nullable, - role -> UserRole, - android_version -> Nullable, - telegram_id -> Nullable, - } -} - -diesel::joinable!(fcm -> users (user_id)); - -diesel::allow_tables_to_appear_in_same_query!( - fcm, - users, -); diff --git a/src/extractors/authorized_user.rs b/src/extractors/authorized_user.rs index 9179cc4..7552641 100644 --- a/src/extractors/authorized_user.rs +++ b/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::>().unwrap(); + let db = req + .app_data::>() + .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)) + } + }) } } diff --git a/src/main.rs b/src/main.rs index be87c86..e0d8017 100644 --- a/src/main.rs +++ b/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() diff --git a/src/middlewares/authorization.rs b/src/middlewares/authorization.rs index e8d700c..f293639 100644 --- a/src/middlewares/authorization.rs +++ b/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 { diff --git a/src/routes/auth/sign_in.rs b/src/routes/auth/sign_in.rs index 6260b57..de74171 100644 --- a/src/routes/auth/sign_in.rs +++ b/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, ) -> Result { + let db = app_state.get_database(); + let user = match &data { - Default(data) => driver::users::get_by_username(&app_state, &data.username).await, - VkOAuth(id) => driver::users::get_by_vk_id(&app_state, *id).await, - }; + Default(data) => Query::find_user_by_username(db, &data.username).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)); - - user.save(&app_state).await.expect("Failed to update user"); - - Ok(user.into()) + let access_token = utility::jwt::encode(&user.id); + Ok(UserResponse::from_user_with_token(user, access_token)) } - 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, - &User { - id: id.clone(), - username, - password: Some(bcrypt::hash("example".to_string(), bcrypt::DEFAULT_COST).unwrap()), - vk_id: None, - telegram_id: None, - access_token: Some(utility::jwt::encode(&id)), - group: Some("ИС-214/23".to_string()), - role: UserRole::Student, - android_version: None, - }, - ) - .await - .unwrap(); + + let active_user = ActiveUser { + id: Set(id.clone()), + username: Set(username), + password: Set(Some( + bcrypt::hash("example".to_string(), bcrypt::DEFAULT_COST).unwrap(), + )), + vk_id: Set(None), + telegram_id: Set(None), + group: Set(Some("ИС-214/23".to_string())), + role: Set(UserRole::Student), + android_version: Set(None), + }; + + active_user + .save(app_state.get_database()) + .await + .expect("Failed to save user"); } #[actix_web::test] diff --git a/src/routes/auth/sign_up.rs b/src/routes/auth/sign_up.rs index 67226c4..66730b5 100644 --- a/src/routes/auth/sign_up.rs +++ b/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. - if driver::users::contains_by_username(&app_state, &data.username).await { + let db = app_state.get_database(); + + // 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(); - driver::users::insert(&app_state, &user).await.unwrap(); + let active_user: ActiveUser = data.into(); + 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 for SignUpData { - fn into(self) -> User { + impl Into for SignUpData { + fn into(self) -> ActiveUser { assert_ne!(self.password.is_some(), self.vk_id.is_some()); - let id = ObjectId::new().unwrap().to_string(); - let access_token = Some(utility::jwt::encode(&id)); - - User { - id, - username: self.username, - password: self + ActiveUser { + id: Set(ObjectId::new().unwrap().to_string()), + username: Set(self.username), + password: Set(self .password - .map(|x| bcrypt::hash(x, bcrypt::DEFAULT_COST).unwrap()), - vk_id: self.vk_id, - telegram_id: None, - access_token, - group: Some(self.group), - role: self.role, - android_version: Some(self.version), + .map(|x| bcrypt::hash(x, bcrypt::DEFAULT_COST).unwrap())), + vk_id: Set(self.vk_id), + telegram_id: Set(None), + group: Set(Some(self.group)), + role: Set(self.role), + android_version: Set(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", diff --git a/src/routes/flow/telegram_auth.rs b/src/routes/flow/telegram_auth.rs index da7f4ee..e132445 100644 --- a/src/routes/flow/telegram_auth.rs +++ b/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::(init_data.data_map.get("user").unwrap()).unwrap(); - let mut user = { - match driver::users::get_by_telegram_id(&app_state, web_app_user.id).await { - Ok(value) => Ok(value), - Err(_) => { - let new_user = User { - id: ObjectId::new().unwrap().to_string(), - username: format!("telegram_{}", web_app_user.id), // можно оставить, а можно поменять - password: None, // ибо нехуй - vk_id: None, - telegram_id: Some(web_app_user.id), - access_token: None, // установится ниже - group: None, - role: UserRole::Student, // TODO: при реге проверять данные - android_version: None, + let user = + match Query::find_user_by_telegram_id(app_state.get_database(), web_app_user.id).await { + Ok(Some(value)) => Ok(value), + _ => { + let new_user = ActiveUser { + id: Set(ObjectId::new().unwrap().to_string()), + username: Set(format!("telegram_{}", web_app_user.id)), // можно оставить, а можно поменять + password: Set(None), // ибо нехуй + vk_id: Set(None), + telegram_id: Set(Some(web_app_user.id)), + group: Set(None), + role: Set(UserRole::Student), // TODO: при реге проверять данные + android_version: Set(None), }; - driver::users::insert(&app_state, &new_user) - .await - .map(|_| new_user) + new_user.insert(app_state.get_database()).await } } - .expect("Failed to get or add user") - }; + .expect("Failed to get or add user"); - user.access_token = Some(utility::jwt::encode(&user.id)); - - user.save(&app_state).await.expect("Failed to update user"); - - Ok(Response::new( - &*user.access_token.unwrap(), - user.group.is_some(), - )) - .into() + let access_token = utility::jwt::encode(&user.id); + Ok(Response::new(&access_token, 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 { } } } -} \ No newline at end of file +} diff --git a/src/routes/flow/telegram_complete.rs b/src/routes/flow/telegram_complete.rs index c71489e..64c6f6f 100644 --- a/src/routes/flow/telegram_complete.rs +++ b/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, user: AsyncExtractor, ) -> 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() } diff --git a/src/routes/schedule/group.rs b/src/routes/schedule/group.rs index 943197e..e2d0f90 100644 --- a/src/routes/schedule/group.rs +++ b/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), diff --git a/src/routes/schema.rs b/src/routes/schema.rs index 9998cfb..b9b6e79 100644 --- a/src/routes/schema.rs +++ b/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, } - /// Create UserResponse from User ref. - impl From<&User> for UserResponse { - fn from(user: &User) -> Self { - UserResponse { + impl UserResponse { + pub fn from_user_with_token(user: User, access_token: String) -> 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: 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 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, } } } diff --git a/src/routes/users/change_group.rs b/src/routes/users/change_group.rs index 28b11f7..0913f19 100644 --- a/src/routes/users/change_group.rs +++ b/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, data: web::Json, ) -> 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); - user.save(&app_state).await.unwrap(); - + + let mut active_user = user.clone().into_active_model(); + active_user.group = Set(Some(data.into_inner().group)); + + active_user.update(app_state.get_database()).await.unwrap(); + Ok(()).into() } diff --git a/src/routes/users/change_username.rs b/src/routes/users/change_username.rs index c35c21b..4c942d5 100644 --- a/src/routes/users/change_username.rs +++ b/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, data: web::Json, ) -> 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; - user.save(&app_state).await.unwrap(); + let mut active_user = user.into_active_model(); + active_user.username = Set(data.into_inner().username); + active_user.update(db).await.unwrap(); Ok(()).into() } diff --git a/src/routes/users/me.rs b/src/routes/users/me.rs index 261c837..6f11112 100644 --- a/src/routes/users/me.rs +++ b/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")] diff --git a/src/state/mod.rs b/src/state/mod.rs index cc67033..d29883e 100644 --- a/src/state/mod.rs +++ b/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, + database: DatabaseConnection, providers: HashMap>, env: AppEnv, } impl AppState { - pub async fn new() -> Result> { - let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set"); - + pub async fn new( + database: Option, + ) -> Result> { let env = AppEnv::default(); let providers: HashMap> = HashMap::from([( "eng_polytechnic".to_string(), @@ -52,10 +51,14 @@ impl AppState { let this = Self { cancel_token: CancellationToken::new(), - database: Mutex::new( - PgConnection::establish(&database_url) - .unwrap_or_else(|_| panic!("Error connecting to {}", database_url)), - ), + database: if let Some(database) = database { + database + } 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> { - self.database.lock().await + pub fn get_database(&'_ self) -> &DatabaseConnection { + &self.database } pub fn get_env(&self) -> &AppEnv { @@ -90,6 +93,6 @@ impl AppState { } /// Create a new object web::Data. -pub async fn new_app_state() -> Result, Box> { - Ok(web::Data::new(AppState::new().await?)) +pub async fn new_app_state(database: Option) -> Result, Box> { + Ok(web::Data::new(AppState::new(database).await?)) } diff --git a/src/test_env.rs b/src/test_env.rs index 3867d82..82ebbd9 100644 --- a/src/test_env.rs +++ b/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 { - 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 { static STATE: OnceCell> = OnceCell::const_new(); - - STATE.get_or_init(|| test_app_state()).await.clone() + + STATE + .get_or_init(async || -> web::Data { + #[cfg(all(test, tokio_unstable))] + console_subscriber::init(); + + new_app_state(None).await.unwrap() + }) + .await + .clone() } }