Extract some functions to the app module: preparation for integration tests.

backend/src/services/fragments.rs

@@ -7,7 +7,11 @@ use axum::{
 use serde::Deserialize;
 // use tracing::{event, Level};
 
-use crate::{Context, Result, data::db, html_templates::*};
+use crate::{
+    app::{Context, Result},
+    data::db,
+    html_templates::*,
+};
 
 #[derive(Deserialize)]
 pub struct CurrentRecipeId {

backend/src/services/mod.rs

@@ -8,7 +8,14 @@ use axum::{
 };
 use serde::Deserialize;
 
-use crate::{AppState, Context, Result, consts, data::db, html_templates::*, log::Log, ron_utils};
+use crate::{
+    app::{AppState, Context, Result},
+    consts,
+    data::db,
+    html_templates::*,
+    log::Log,
+    ron_utils,
+};
 
 pub mod fragments;
 pub mod recipe;

backend/src/services/recipe.rs

@@ -6,8 +6,8 @@ use axum::{
 };
 
 use crate::{
-    Context, Result,
-    data::{db, model},
+    app::{Context, Result},
+    data::db,
     html_templates::*,
     translation::Sentence,
 };

backend/src/services/ron/calendar.rs

@@ -7,7 +7,8 @@ use axum::{
 use axum_extra::extract::Query;
 
 use crate::{
-    Context, consts,
+    app::Context,
+    consts,
     data::{self, db},
     ron_extractor::ExtractRon,
     ron_utils::{ron_error, ron_response_ok},

backend/src/services/ron/mod.rs

@@ -7,7 +7,9 @@ use axum::{
 use axum_extra::extract::cookie::{Cookie, CookieJar};
 // use tracing::{event, Level};
 
-use crate::{Context, consts, data::db, model, ron_extractor::ExtractRon, ron_utils::ron_error};
+use crate::{
+    app::Context, consts, data::db, data::model, ron_extractor::ExtractRon, ron_utils::ron_error,
+};
 
 pub mod calendar;
 pub mod recipe;

backend/src/services/ron/recipe.rs

@@ -8,7 +8,9 @@ use axum_extra::extract::Query;
 use common::ron_api;
 // use tracing::{event, Level};
 
-use crate::{Context, data::db, model, ron_extractor::ExtractRon, ron_utils::ron_response_ok};
+use crate::{
+    app::Context, data::db, data::model, ron_extractor::ExtractRon, ron_utils::ron_response_ok,
+};
 
 use super::rights::*;
 

backend/src/services/ron/rights.rs

@@ -3,7 +3,7 @@ use axum::{
     response::{ErrorResponse, Result},
 };
 
-use crate::{consts, data::db, model, ron_utils::ron_error};
+use crate::{consts, data::db, data::model, ron_utils::ron_error};
 
 pub async fn check_user_rights_recipe(
     connection: &db::Connection,

backend/src/services/ron/shopping_list.rs

@@ -7,9 +7,10 @@ use axum::{
 use common::ron_api;
 
 use crate::{
-    Context, consts,
+    app::Context,
+    consts,
     data::db,
-    model,
+    data::model,
     ron_extractor::ExtractRon,
     ron_utils::{ron_error, ron_response_ok},
 };

backend/src/services/user.rs

@@ -20,8 +20,14 @@ use strum_macros::Display;
 use tracing::{Level, event};
 
 use crate::{
-    AppState, Context, Result, config::Config, consts, data::db, email, html_templates::*,
-    translation::Sentence, utils,
+    app::{AppState, Context, Result},
+    config::Config,
+    consts,
+    data::db,
+    email,
+    html_templates::*,
+    translation::Sentence,
+    utils,
 };
 
 const VALIDATION_TOKEN_KEY: &str = "validation_token";