Подключение FCM.

src/app_state.rs

@@ -4,6 +4,7 @@ use crate::xls_downloader::basic_impl::BasicXlsDownloader;
 use actix_web::web;
 use chrono::{DateTime, Utc};
 use diesel::{Connection, PgConnection};
+use firebase_messaging_rs::FCMClient;
 use sha1::{Digest, Sha1};
 use std::env;
 use std::hash::Hash;
@@ -55,10 +56,11 @@ pub struct AppState {
     pub schedule: Mutex<Option<Schedule>>,
     pub database: Mutex<PgConnection>,
     pub vk_id: VkId,
+    pub fcm_client: Mutex<FCMClient>,
 }
 
 impl AppState {
-    pub fn new() -> Self {
+    pub async fn new() -> Self {
         let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
 
         Self {
@@ -69,11 +71,12 @@ impl AppState {
                     .unwrap_or_else(|_| panic!("Error connecting to {}", database_url)),
             ),
             vk_id: VkId::new(),
+            fcm_client: Mutex::new(FCMClient::new().await.expect("FCM client must be created")),
         }
     }
 }
 
 /// Создание нового объекта web::Data<AppState>
-pub fn app_state() -> web::Data<AppState> {
-    web::Data::new(AppState::new())
+pub async fn app_state() -> web::Data<AppState> {
+    web::Data::new(AppState::new().await)
 }

src/database/models.rs

@@ -58,6 +58,7 @@ pub struct User {
 
 #[derive(
     Debug,
+    Clone,
     Serialize,
     Identifiable,
     Queryable,

src/main.rs

@@ -70,7 +70,7 @@ async fn main() {
     unsafe { std::env::set_var("RUST_LOG", "debug") };
     env_logger::init();
 
-    let app_state = app_state();
+    let app_state = app_state().await;
 
     HttpServer::new(move || {
         let (app, api) = App::new()

src/routes/auth/sign_in.rs

@@ -150,7 +150,7 @@ mod tests {
     use std::fmt::Write;
 
     async fn sign_in_client(data: Request) -> ServiceResponse {
-        let app = test_app(test_app_state(), sign_in).await;
+        let app = test_app(test_app_state().await, sign_in).await;
 
         let req = test::TestRequest::with_uri("/sign-in")
             .method(Method::POST)
@@ -160,7 +160,7 @@ mod tests {
         test::call_service(&app, req).await
     }
 
-    fn prepare(username: String) {
+    async fn prepare(username: String) {
         let id = {
             let mut sha = Sha1::new();
             sha.update(&username);
@@ -178,7 +178,7 @@ mod tests {
 
         test_env();
 
-        let app_state = static_app_state();
+        let app_state = static_app_state().await;
         driver::users::insert_or_ignore(
             &app_state,
             &User {
@@ -197,7 +197,7 @@ mod tests {
 
     #[actix_web::test]
     async fn sign_in_ok() {
-        prepare("test::sign_in_ok".to_string());
+        prepare("test::sign_in_ok".to_string()).await;
 
         let resp = sign_in_client(Request {
             username: "test::sign_in_ok".to_string(),
@@ -210,7 +210,7 @@ mod tests {
 
     #[actix_web::test]
     async fn sign_in_err() {
-        prepare("test::sign_in_err".to_string());
+        prepare("test::sign_in_err".to_string()).await;
 
         let invalid_username = sign_in_client(Request {
             username: "test::sign_in_err::username".to_string(),

src/routes/auth/sign_up.rs

@@ -258,7 +258,7 @@ mod tests {
     }
 
     async fn sign_up_client(data: SignUpPartial) -> ServiceResponse {
-        let app = test_app(test_app_state(), sign_up).await;
+        let app = test_app(test_app_state().await, sign_up).await;
 
         let req = test::TestRequest::with_uri("/sign-up")
             .method(Method::POST)
@@ -280,7 +280,7 @@ mod tests {
 
         test_env();
 
-        let app_state = static_app_state();
+        let app_state = static_app_state().await;
         driver::users::delete_by_username(&app_state, &"test::sign_up_valid".to_string());
 
         // test
@@ -301,7 +301,7 @@ mod tests {
 
         test_env();
 
-        let app_state = static_app_state();
+        let app_state = static_app_state().await;
         driver::users::delete_by_username(
             &app_state,
             &"test::sign_up_multiple".to_string(),

src/test_env.rs

@@ -1,16 +1,16 @@
 #[cfg(test)]
 pub(crate) mod tests {
-    use crate::app_state::{app_state, AppState, Schedule};
+    use crate::app_state::{AppState, Schedule, app_state};
     use crate::parser::tests::test_result;
-    use actix_web::{web};
-    use std::sync::LazyLock;
+    use actix_web::web;
+    use tokio::sync::OnceCell;
 
     pub fn test_env() {
         dotenvy::from_path(".env.test").expect("Failed to load test environment file");
     }
 
-    pub fn test_app_state() -> web::Data<AppState> {
-        let state = app_state();
+    pub async fn test_app_state() -> web::Data<AppState> {
+        let state = app_state().await;
         let mut schedule_lock = state.schedule.lock().unwrap();
 
         *schedule_lock = Some(Schedule {
@@ -24,9 +24,9 @@ pub(crate) mod tests {
         state.clone()
     }
 
-    pub fn static_app_state() -> web::Data<AppState> {
-        static STATE: LazyLock<web::Data<AppState>> = LazyLock::new(|| test_app_state());
+    pub async fn static_app_state() -> web::Data<AppState> {
+        static STATE: OnceCell<web::Data<AppState>> = OnceCell::const_new();
 
-        STATE.clone()
+        STATE.get_or_init(|| test_app_state()).await.clone()
     }
 }