fix: timeline bcs rebase

backend/src/controller/timeline.rs

@@ -1,13 +1,14 @@
 //! `Users` endpoints.
-use crate::config::data::AppDataInner;
-use crate::model::dto::timeline::TimelineParameters;
-use crate::service;
+
 use actix_web::{
     get,
-    web::{Data, Path, Query},
+    web::{Path, Query},
     HttpResponse, Result,
 };
 
+use crate::service;
+use crate::{config::data::SharedPool, model::dto::timeline::TimelineParameters};
+
 /// Get calculated timeline data for a given map from dates start to end.
 /// The timeline contains all additions and removals of `Plantings` aggregated
 /// by years, months, and also on the actual dates. It only contains years, months
@@ -33,12 +34,12 @@ use actix_web::{
 pub async fn get_timeline(
     map_id: Path<i32>,
     parameters: Query<TimelineParameters>,
-    app_data: Data<AppDataInner>,
+    pool: SharedPool,
 ) -> Result<HttpResponse> {
     let params = parameters.into_inner();
     if params.start > params.end {
         return Ok(HttpResponse::UnprocessableEntity().body("Start must be smaller than end"));
     }
-    let dto = service::timeline::calculate(map_id.into_inner(), params, &app_data).await?;
+    let dto = service::timeline::calculate(map_id.into_inner(), params, &pool).await?;
     Ok(HttpResponse::Ok().json(dto))
 }

backend/src/service/timeline.rs

@@ -1,7 +1,5 @@
-use actix_web::web::Data;
-
 use crate::{
-    config::data::AppDataInner,
+    config::data::SharedPool,
     error::ServiceError,
     model::{
         dto::timeline::{TimelineDto, TimelineParameters},
@@ -17,9 +15,9 @@ use crate::{
 pub async fn calculate(
     map_id: i32,
     params: TimelineParameters,
-    app_data: &Data<AppDataInner>,
+    pool: &SharedPool,
 ) -> Result<TimelineDto, ServiceError> {
-    let mut conn = app_data.pool.get().await?;
+    let mut conn = pool.get().await?;
     // Check if the map exists
     Map::find_by_id(map_id, &mut conn).await?;
     let result = timeline::calculate(map_id, params, &mut conn).await?;