editoast: refactor views::infra::routes::get_routes_track_ranges

OpenRailAssociation · Jun 28, 2024 · 1ba6ba3 · 1ba6ba3
1 parent c45d995
commit 1ba6ba3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/editoast/src/views/infra/objects.rs b/editoast/src/views/infra/objects.rs
@@ -130,12 +130,12 @@ mod tests {
         let db_pool = app.db_pool();
         let empty_infra = create_empty_infra(db_pool.get_ok().deref_mut()).await;
 
-        let req = TestRequest::post()
+        let request = TestRequest::post()
             .uri(format!("/infra/{}/objects/TrackSection", empty_infra.id).as_str())
             .set_json(["invalid_id"])
             .to_request();
-        let response = call_service(&app.service, req).await;
-        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
+
+        app.fetch(request).assert_status(StatusCode::BAD_REQUEST);
     }
 
     #[rstest]

diff --git a/editoast/src/views/infra/routes.rs b/editoast/src/views/infra/routes.rs
@@ -142,14 +142,16 @@ async fn get_routes_track_ranges<'a>(
     infra: Path<i64>,
     params: Query<RouteTrackRangesParams>,
     infra_caches: Data<CHashMap<i64, InfraCache>>,
-    db_pool: Data<DbConnectionPool>,
+    db_pool: Data<DbConnectionPoolV2>,
 ) -> Result<Json<Vec<RouteTrackRangesResult>>> {
     let infra_id = infra.into_inner();
-    let conn = &mut db_pool.get().await?;
-    let infra =
-        Infra::retrieve_or_fail(conn, infra_id, || InfraApiError::NotFound { infra_id }).await?;
+    let infra = Infra::retrieve_or_fail(db_pool.get().await?.deref_mut(), infra_id, || {
+        InfraApiError::NotFound { infra_id }
+    })
+    .await?;
 
-    let infra_cache = InfraCache::get_or_load(conn, &infra_caches, &infra).await?;
+    let infra_cache =
+        InfraCache::get_or_load(db_pool.get().await?.deref_mut(), &infra_caches, &infra).await?;
     let graph = Graph::load(&infra_cache);
     let routes_cache = infra_cache.routes();
     let result = params