mirror of
https://github.com/n08i40k/schedule-parser-rusted.git
synced 2025-12-06 09:47:50 +03:00
feat!: add telegram auth and async refactor
- Removed "/schedule/update-download-url" endpoint, this mechanism was replaced by Yandex Cloud FaaS. Ура :) - Improved schedule caching mechanism. - Added Telegram WebApp authentication support. - Reworked endpoints responses and errors mechanism. - Refactored application state management. - Make synchronous database operations, middlewares and extractors to asynchronous. - Made user password field optional to support multiple auth methods. - Renamed users table column "version" to "android_version" and made it nullable.
This commit is contained in:
@@ -1,77 +1,82 @@
|
||||
pub mod users {
|
||||
use crate::app_state::AppState;
|
||||
use crate::database::models::User;
|
||||
use crate::database::schema::users::dsl::users;
|
||||
use crate::database::schema::users::dsl::*;
|
||||
use crate::utility::mutex::MutexScope;
|
||||
use crate::state::AppState;
|
||||
use actix_web::web;
|
||||
use diesel::{ExpressionMethods, QueryResult, insert_into};
|
||||
use diesel::{QueryDsl, RunQueryDsl};
|
||||
use diesel::{SaveChangesDsl, SelectableHelper};
|
||||
use std::ops::DerefMut;
|
||||
|
||||
pub fn get(state: &web::Data<AppState>, _id: &String) -> QueryResult<User> {
|
||||
state.database.scope(|conn| {
|
||||
users
|
||||
.filter(id.eq(_id))
|
||||
.select(User::as_select())
|
||||
.first(conn)
|
||||
})
|
||||
pub async fn get(state: &web::Data<AppState>, _id: &String) -> QueryResult<User> {
|
||||
users
|
||||
.filter(id.eq(_id))
|
||||
.select(User::as_select())
|
||||
.first(state.get_database().await.deref_mut())
|
||||
}
|
||||
|
||||
pub fn get_by_username(state: &web::Data<AppState>, _username: &String) -> QueryResult<User> {
|
||||
state.database.scope(|conn| {
|
||||
users
|
||||
.filter(username.eq(_username))
|
||||
.select(User::as_select())
|
||||
.first(conn)
|
||||
})
|
||||
pub async fn get_by_username(
|
||||
state: &web::Data<AppState>,
|
||||
_username: &String,
|
||||
) -> QueryResult<User> {
|
||||
users
|
||||
.filter(username.eq(_username))
|
||||
.select(User::as_select())
|
||||
.first(state.get_database().await.deref_mut())
|
||||
}
|
||||
|
||||
//noinspection RsTraitObligations
|
||||
pub fn get_by_vk_id(state: &web::Data<AppState>, _vk_id: i32) -> QueryResult<User> {
|
||||
state.database.scope(|conn| {
|
||||
users
|
||||
.filter(vk_id.eq(_vk_id))
|
||||
.select(User::as_select())
|
||||
.first(conn)
|
||||
})
|
||||
pub async fn get_by_vk_id(state: &web::Data<AppState>, _vk_id: i32) -> QueryResult<User> {
|
||||
users
|
||||
.filter(vk_id.eq(_vk_id))
|
||||
.select(User::as_select())
|
||||
.first(state.get_database().await.deref_mut())
|
||||
}
|
||||
|
||||
//noinspection RsTraitObligations
|
||||
pub async fn get_by_telegram_id(
|
||||
state: &web::Data<AppState>,
|
||||
_telegram_id: i64,
|
||||
) -> QueryResult<User> {
|
||||
users
|
||||
.filter(telegram_id.eq(_telegram_id))
|
||||
.select(User::as_select())
|
||||
.first(state.get_database().await.deref_mut())
|
||||
}
|
||||
|
||||
//noinspection DuplicatedCode
|
||||
pub fn contains_by_username(state: &web::Data<AppState>, _username: &String) -> bool {
|
||||
pub async fn contains_by_username(state: &web::Data<AppState>, _username: &String) -> bool {
|
||||
// и как это нахуй сократить блять примеров нихуя нет, нихуя не работает
|
||||
// как меня этот раст заебал уже
|
||||
state.database.scope(|conn| {
|
||||
match users
|
||||
.filter(username.eq(_username))
|
||||
.count()
|
||||
.get_result::<i64>(conn)
|
||||
{
|
||||
Ok(count) => count > 0,
|
||||
Err(_) => false,
|
||||
}
|
||||
})
|
||||
|
||||
match users
|
||||
.filter(username.eq(_username))
|
||||
.count()
|
||||
.get_result::<i64>(state.get_database().await.deref_mut())
|
||||
{
|
||||
Ok(count) => count > 0,
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
//noinspection DuplicatedCode
|
||||
//noinspection RsTraitObligations
|
||||
pub fn contains_by_vk_id(state: &web::Data<AppState>, _vk_id: i32) -> bool {
|
||||
state.database.scope(|conn| {
|
||||
match users
|
||||
.filter(vk_id.eq(_vk_id))
|
||||
.count()
|
||||
.get_result::<i64>(conn)
|
||||
{
|
||||
Ok(count) => count > 0,
|
||||
Err(_) => false,
|
||||
}
|
||||
})
|
||||
pub async fn contains_by_vk_id(state: &web::Data<AppState>, _vk_id: i32) -> bool {
|
||||
match users
|
||||
.filter(vk_id.eq(_vk_id))
|
||||
.count()
|
||||
.get_result::<i64>(state.get_database().await.deref_mut())
|
||||
{
|
||||
Ok(count) => count > 0,
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn insert(state: &web::Data<AppState>, user: &User) -> QueryResult<usize> {
|
||||
state
|
||||
.database
|
||||
.scope(|conn| insert_into(users).values(user).execute(conn))
|
||||
pub async fn insert(state: &web::Data<AppState>, user: &User) -> QueryResult<usize> {
|
||||
insert_into(users)
|
||||
.values(user)
|
||||
.execute(state.get_database().await.deref_mut())
|
||||
}
|
||||
|
||||
/// Function declaration [User::save][UserSave::save].
|
||||
@@ -113,51 +118,47 @@ pub mod users {
|
||||
/// }
|
||||
/// }
|
||||
/// ```
|
||||
fn save(&self, state: &web::Data<AppState>) -> QueryResult<User>;
|
||||
async fn save(&self, state: &web::Data<AppState>) -> QueryResult<User>;
|
||||
}
|
||||
|
||||
/// Implementation of [UserSave][UserSave] trait.
|
||||
impl UserSave for User {
|
||||
fn save(&self, state: &web::Data<AppState>) -> QueryResult<User> {
|
||||
state.database.scope(|conn| self.save_changes::<Self>(conn))
|
||||
async fn save(&self, state: &web::Data<AppState>) -> QueryResult<User> {
|
||||
self.save_changes::<Self>(state.get_database().await.deref_mut())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub fn delete_by_username(state: &web::Data<AppState>, _username: &String) -> bool {
|
||||
state.database.scope(|conn| {
|
||||
match diesel::delete(users.filter(username.eq(_username))).execute(conn) {
|
||||
Ok(count) => count > 0,
|
||||
Err(_) => false,
|
||||
}
|
||||
})
|
||||
pub async fn delete_by_username(state: &web::Data<AppState>, _username: &String) -> bool {
|
||||
match diesel::delete(users.filter(username.eq(_username)))
|
||||
.execute(state.get_database().await.deref_mut())
|
||||
{
|
||||
Ok(count) => count > 0,
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub fn insert_or_ignore(state: &web::Data<AppState>, user: &User) -> QueryResult<usize> {
|
||||
state.database.scope(|conn| {
|
||||
insert_into(users)
|
||||
.values(user)
|
||||
.on_conflict_do_nothing()
|
||||
.execute(conn)
|
||||
})
|
||||
pub async fn insert_or_ignore(state: &web::Data<AppState>, user: &User) -> QueryResult<usize> {
|
||||
insert_into(users)
|
||||
.values(user)
|
||||
.on_conflict_do_nothing()
|
||||
.execute(state.get_database().await.deref_mut())
|
||||
}
|
||||
}
|
||||
|
||||
pub mod fcm {
|
||||
use crate::app_state::AppState;
|
||||
use crate::database::models::{FCM, User};
|
||||
use crate::utility::mutex::MutexScope;
|
||||
use crate::state::AppState;
|
||||
use actix_web::web;
|
||||
use diesel::QueryDsl;
|
||||
use diesel::RunQueryDsl;
|
||||
use diesel::{BelongingToDsl, QueryResult, SelectableHelper};
|
||||
use std::ops::DerefMut;
|
||||
|
||||
pub fn from_user(state: &web::Data<AppState>, user: &User) -> QueryResult<FCM> {
|
||||
state.database.scope(|conn| {
|
||||
FCM::belonging_to(&user)
|
||||
.select(FCM::as_select())
|
||||
.get_result(conn)
|
||||
})
|
||||
pub async fn from_user(state: &web::Data<AppState>, user: &User) -> QueryResult<FCM> {
|
||||
FCM::belonging_to(&user)
|
||||
.select(FCM::as_select())
|
||||
.get_result(state.get_database().await.deref_mut())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user