From b582d2e8e1670b3087fd52347b19f4939b5f3836 Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Tue, 1 Nov 2022 17:47:51 +0100
Subject: [PATCH] refactor: session service

---
 api/src/guards/request/session_auth.rs            |  4 ++--
 api/src/lib.rs                                    |  4 ++--
 core/src/services/mod.rs                          |  2 +-
 .../{candidate_service.rs => session_service.rs}  | 15 ++++++++-------
 4 files changed, 13 insertions(+), 12 deletions(-)
 rename core/src/services/{candidate_service.rs => session_service.rs} (91%)

diff --git a/api/src/guards/request/session_auth.rs b/api/src/guards/request/session_auth.rs
index 273c360..8f0129f 100644
--- a/api/src/guards/request/session_auth.rs
+++ b/api/src/guards/request/session_auth.rs
@@ -1,6 +1,6 @@
 use entity::candidate::Model as Candidate;
 use portfolio_core::sea_orm::prelude::Uuid;
-use portfolio_core::services::candidate_service::CandidateService;
+use portfolio_core::services::session_service::SessionService;
 use rocket::http::Status;
 use rocket::outcome::Outcome;
 use rocket::request::{FromRequest, Request};
@@ -27,7 +27,7 @@ impl<'r> FromRequest<'r> for SessionAuth {
             Err(_) => return Outcome::Failure((Status::BadRequest, None)),
         };
 
-        let session = CandidateService::auth_user_session(conn, uuid).await;
+        let session = SessionService::auth_user_session(conn, uuid).await;
 
         match session {
             Ok(model) => Outcome::Success(SessionAuth(model)),
diff --git a/api/src/lib.rs b/api/src/lib.rs
index 47e615a..8cb3fa2 100644
--- a/api/src/lib.rs
+++ b/api/src/lib.rs
@@ -5,7 +5,7 @@ use std::net::SocketAddr;
 
 use guards::request::session_auth::SessionAuth;
 use portfolio_core::error::ServiceError;
-use portfolio_core::services::candidate_service::CandidateService;
+use portfolio_core::services::session_service::SessionService;
 use requests::{LoginRequest, RegisterRequest};
 use rocket::http::Status;
 use rocket::{Rocket, Build};
@@ -59,7 +59,7 @@ async fn login(conn: Connection<'_, Db>, login_form: Json<LoginRequest>, ip_addr
     let db = conn.into_inner();
     println!("{} {}", login_form.application_id, login_form.password);
 
-    let session_token = CandidateService::new_session(db,
+    let session_token = SessionService::new_session(db,
           login_form.application_id,
           login_form.password.to_string(),
           ip_addr.ip().to_string()
diff --git a/core/src/services/mod.rs b/core/src/services/mod.rs
index 1992ce2..d731fb2 100644
--- a/core/src/services/mod.rs
+++ b/core/src/services/mod.rs
@@ -1 +1 @@
-pub mod candidate_service;
\ No newline at end of file
+pub mod session_service;
\ No newline at end of file
diff --git a/core/src/services/candidate_service.rs b/core/src/services/session_service.rs
similarity index 91%
rename from core/src/services/candidate_service.rs
rename to core/src/services/session_service.rs
index 3058a4a..60f938d 100644
--- a/core/src/services/candidate_service.rs
+++ b/core/src/services/session_service.rs
@@ -5,9 +5,10 @@ use sea_orm::{DatabaseConnection, prelude::Uuid, ModelTrait};
 
 use crate::{crypto::{self}, Query, error::{ServiceError, USER_NOT_FOUND_ERROR, INVALID_CREDENTIALS_ERROR, DB_ERROR, USER_NOT_FOUND_BY_JWT_ID, USER_NOT_FOUND_BY_SESSION_ID, EXPIRED_SESSION_ERROR}, Mutation};
 
-pub struct CandidateService;
+// TODO: generics
+pub struct SessionService;
 
-impl CandidateService {
+impl SessionService {
     /// Delete n old sessions for user
     async fn delete_old_sessions(db: &DatabaseConnection, user_id: i32, keep_n_recent: usize) -> Result<(), ServiceError> {
         let mut sessions = Query::find_sessions_by_user_id(db, user_id).await.unwrap();
@@ -52,7 +53,7 @@ impl CandidateService {
         };
 
         // delete old sessions
-        CandidateService::delete_old_sessions(db, candidate.application, 3).await.ok(); // TODO move to dotenv
+        SessionService::delete_old_sessions(db, candidate.application, 3).await.ok(); // TODO move to dotenv
 
         Ok(session.id.to_string())
     }
@@ -95,7 +96,7 @@ mod tests {
     use entity::candidate;
     use sea_orm::{DbConn, Database, sea_query::TableCreateStatement, DbBackend, Schema, ConnectionTrait, prelude::Uuid};
 
-    use crate::{crypto, Mutation, services::candidate_service::CandidateService};
+    use crate::{crypto, Mutation, services::session_service::SessionService};
 
     #[cfg(test)]
     async fn get_memory_sqlite_connection() -> DbConn {
@@ -132,7 +133,7 @@ mod tests {
         Mutation::create_candidate(&db, 5555555, &"Tajny_kod".to_string(), "".to_string()).await.unwrap();
 
         // correct password
-        let session = CandidateService::new_session(
+        let session = SessionService::new_session(
                 db,
                 5555555,
                 "Tajny_kod".to_string(),
@@ -142,7 +143,7 @@ mod tests {
             // println!("{}", session.err().unwrap().1);
 
         assert!(
-            CandidateService::auth_user_session(db, Uuid::parse_str(&session).unwrap())
+            SessionService::auth_user_session(db, Uuid::parse_str(&session).unwrap())
                 .await
                 .is_ok()
             );
@@ -156,7 +157,7 @@ mod tests {
 
          // incorrect password
          assert!(
-            CandidateService::new_session(db, candidate_form.application, "Spatny_kod".to_string(), "127.0.0.1".to_string()).await.is_err()
+            SessionService::new_session(db, candidate_form.application, "Spatny_kod".to_string(), "127.0.0.1".to_string()).await.is_err()
         );
     }
 }
\ No newline at end of file