Merge pull request #8 from spiralover/dev

feat: bumped rust version to 1.75
spiralover · Dec 29, 2023 · 8da370c · 8da370c
2 parents e65414d + 6fe9ddc
commit 8da370c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 27 deletions.
diff --git a/apps/executor/Dockerfile b/apps/executor/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=rust:1.74-slim-bookworm
+ARG IMAGE=rust:1.75-slim-bookworm
 
 # Build
 FROM ${IMAGE} as planner

diff --git a/apps/user/Dockerfile b/apps/user/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMAGE=rust:1.74-slim-bookworm
+ARG IMAGE=rust:1.75-slim-bookworm
 
 # Build
 FROM ${IMAGE} as planner

diff --git a/core/src/helpers/db_pagination.rs b/core/src/helpers/db_pagination.rs
@@ -83,7 +83,7 @@ impl<T> Paginated<T> {
     {
         let per_page = self.per_page;
         let results = self.load::<(U, i64)>(conn)?;
-        let total = results.get(0).map(|x| x.1).unwrap_or(0);
+        let total = results.first().map(|x| x.1).unwrap_or(0);
         let records = results.into_iter().map(|x| x.0).collect();
         let total_pages = (total as f64 / per_page as f64).ceil() as i64;
 

diff --git a/core/src/http/controllers/setting_controller.rs b/core/src/http/controllers/setting_controller.rs
@@ -1,12 +1,10 @@
-use crate::app_state::AppState;
-use actix_web::web::{block, Data, Json, Path, Query, ServiceConfig};
+use actix_web::web::{block, Json, Path, Query, ServiceConfig};
 use actix_web::{delete, get, post, HttpRequest};
 use uuid::Uuid;
 
 use crate::enums::app_message::AppMessage;
 use crate::helpers::http::QueryParams;
 use crate::helpers::request::RequestHelper;
-use crate::helpers::DBPool;
 use crate::models::personal_access_token::PatCreateForm;
 use crate::repositories::personal_access_token_repository::PersonaAccessTokenRepository;
 use crate::results::http_result::ActixBlockingResultResponder;
@@ -20,41 +18,30 @@ pub fn setting_controller(cfg: &mut ServiceConfig) {
 }
 
 #[get("personal-access-tokens")]
-async fn list_personal_access_token(
-    req: HttpRequest,
-    q: Query<QueryParams>,
-    pool: Data<DBPool>,
-) -> HttpResult {
-    let auth_id = req.auth_id();
-    block(move || PersonaAccessTokenRepository.list(pool.get_ref(), auth_id, q.0))
+async fn list_personal_access_token(req: HttpRequest, q: Query<QueryParams>) -> HttpResult {
+    let ctx = req.context();
+    block(move || PersonaAccessTokenRepository.list(ctx.database(), ctx.auth_id(), q.0))
         .await
         .respond()
 }
 
 #[post("personal-access-tokens")]
-async fn generate_personal_access_token(
-    req: HttpRequest,
-    app: Data<AppState>,
-    form: Json<PatCreateForm>,
-) -> HttpResult {
-    let auth_id = req.auth_id();
-    block(move || PersonalAccessTokenService.create(app.into_inner(), auth_id, form.0))
+async fn generate_personal_access_token(req: HttpRequest, form: Json<PatCreateForm>) -> HttpResult {
+    let ctx = req.context();
+    block(move || PersonalAccessTokenService.create(ctx.app(), ctx.auth_id(), form.0))
         .await
         .respond()
 }
 
 #[delete("personal-access-tokens/{id}")]
-async fn delete_personal_access_token(
-    req: HttpRequest,
-    pool: Data<DBPool>,
-    id: Path<Uuid>,
-) -> HttpResult {
-    let auth_id = req.auth_id();
+async fn delete_personal_access_token(req: HttpRequest, id: Path<Uuid>) -> HttpResult {
+    let ctx = req.context();
     block(move || {
         PersonalAccessTokenService
-            .delete(pool.get_ref(), *id, Some(auth_id))
+            .delete(ctx.database(), *id, Some(ctx.auth_id()))
             .map(|_| AppMessage::SuccessMessage("deleted"))
     })
     .await
     .respond()
 }
+