.forgejo/workflows/lint-and-build.yml

@@ -94,6 +94,49 @@ jobs:
         working-directory: ./backend
         run: cargo build --release --verbose
 
+  # ==============================================================================
+  # Job 4: Tests (unit + integration) — depends on format and clippy
+  # ==============================================================================
+  # Integration tests need a live MongoDB. The `services.mongo` block provides
+  # one; it's reachable at `mongo:27017` from the job container. The tests skip
+  # gracefully if Mongo is unreachable, so this job stays green even on runners
+  # that can't provide service containers.
+  test:
+    runs-on: docker
+    container:
+      image: rust:latest
+    needs: [format, clippy]
+    services:
+      mongo:
+        image: mongo:7
+        env:
+          MONGO_INITDB_DATABASE: normogen_test
+        ports:
+          - 27017:27017
+    env:
+      MONGODB_URI: mongodb://mongo:27017
+      APP_ENVIRONMENT: development
+
+    steps:
+      - name: Install Node.js for checkout
+        run: |
+          apt-get update
+          apt-get install -y curl gnupg
+          curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+          apt-get install -y nodejs
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y pkg-config libssl-dev
+
+      - name: Run unit + integration tests
+        working-directory: ./backend
+        run: cargo test --all-targets
+
   # ==============================================================================
   # NOTE: Docker builds are handled separately due to Forgejo runner limitations
   #

backend/Cargo.lock

@@ -2554,6 +2554,10 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
  "tower-layer",
  "tower-service",
  "tracing",

backend/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 axum = "0.7.9"
 tokio = { version = "1.41.1", features = ["full"] }
-tower = "0.4.13"
+tower = { version = "0.4.13", features = ["util"] }
 tower-http = { version = "0.5.2", features = ["cors", "trace"] }
 tower_governor = "0.4.3"
 serde = { version = "1.0.215", features = ["derive"] }

backend/src/app.rs

@@ -0,0 +1,104 @@
+//! Router assembly. Extracted from `main.rs` so integration tests can build the
+//! exact same app (routes, middleware, layers) in process against a test
+//! database instead of a live server.
+
+use axum::{
+    routing::{delete, get, post, put},
+    Router,
+};
+use tower::ServiceBuilder;
+use tower_http::{cors::CorsLayer, trace::TraceLayer};
+
+use crate::config::AppState;
+use crate::handlers;
+use crate::middleware;
+
+/// Compose the full Axum app: all public + protected routes, the JWT auth
+/// layer on protected routes, and the global middleware stack (client-IP
+/// resolution, security headers, rate limit, tracing, CORS).
+///
+/// `main.rs` calls this and wraps it in `into_make_service_with_connect_info`
+/// before serving; tests call it and drive it with `oneshot`/`RouterExt`.
+pub fn build_app(state: AppState) -> Router {
+    // Build public routes (no auth required)
+    let public_routes = Router::new()
+        .route(
+            "/health",
+            get(handlers::health_check).head(handlers::health_check),
+        )
+        .route("/ready", get(handlers::ready_check))
+        .route("/api/auth/register", post(handlers::register))
+        .route("/api/auth/login", post(handlers::login))
+        .route("/api/auth/refresh", post(handlers::refresh))
+        .route("/api/auth/logout", post(handlers::logout))
+        .route(
+            "/api/auth/recover-password",
+            post(handlers::recover_password),
+        );
+
+    // Build protected routes (auth required)
+    let protected_routes = Router::new()
+        // User profile management
+        .route("/api/users/me", get(handlers::get_profile))
+        .route("/api/users/me", put(handlers::update_profile))
+        .route("/api/users/me", delete(handlers::delete_account))
+        .route("/api/users/me/change-password", post(handlers::change_password))
+        // User settings
+        .route("/api/users/me/settings", get(handlers::get_settings))
+        .route("/api/users/me/settings", put(handlers::update_settings))
+        // Share management
+        .route("/api/shares", post(handlers::create_share))
+        .route("/api/shares", get(handlers::list_shares))
+        .route("/api/shares/:id", put(handlers::update_share))
+        .route("/api/shares/:id", delete(handlers::delete_share))
+        // Permission checking
+        .route("/api/permissions/check", post(handlers::check_permission))
+        // Session management (Phase 2.6)
+        .route("/api/sessions", get(handlers::get_sessions))
+        .route("/api/sessions/:id", delete(handlers::revoke_session))
+        .route("/api/sessions/all", delete(handlers::revoke_all_sessions))
+        // Medication management (Phase 2.7)
+        .route("/api/medications", post(handlers::create_medication))
+        .route("/api/medications", get(handlers::list_medications))
+        .route("/api/medications/:id", get(handlers::get_medication))
+        .route("/api/medications/:id", post(handlers::update_medication))
+        .route("/api/medications/:id/delete", post(handlers::delete_medication))
+        .route("/api/medications/:id/log", post(handlers::log_dose))
+        .route("/api/medications/:id/adherence", get(handlers::get_adherence))
+        // Health statistics management (Phase 2.7)
+        .route("/api/health-stats", post(handlers::create_health_stat))
+        .route("/api/health-stats", get(handlers::list_health_stats))
+        .route("/api/health-stats/trends", get(handlers::get_health_trends))
+        .route("/api/health-stats/:id", get(handlers::get_health_stat))
+        .route("/api/health-stats/:id", put(handlers::update_health_stat))
+        .route("/api/health-stats/:id", delete(handlers::delete_health_stat))
+        // Drug interactions (Phase 2.8)
+        .route("/api/interactions/check", post(handlers::check_interactions))
+        .route("/api/interactions/check-new", post(handlers::check_new_medication))
+        .layer(axum::middleware::from_fn_with_state(
+            state.clone(),
+            middleware::jwt_auth_middleware,
+        ));
+
+    public_routes
+        .merge(protected_routes)
+        .with_state(state)
+        .layer(
+            ServiceBuilder::new()
+                // Resolve the client IP once and stash it for handlers/middleware
+                // (audit logging, account-lockout forensics).
+                .layer(axum::middleware::from_fn(
+                    middleware::client_ip_middleware,
+                ))
+                // Security headers (applies to all responses)
+                .layer(axum::middleware::from_fn(
+                    middleware::security_headers_middleware,
+                ))
+                // General rate limiting (currently a stub)
+                .layer(axum::middleware::from_fn(
+                    middleware::general_rate_limit_middleware,
+                ))
+                .layer(TraceLayer::new_for_http())
+                .layer(CorsLayer::permissive()),
+        )
+}

backend/src/handlers/auth.rs

@@ -259,17 +259,21 @@ pub async fn login(
         }
     };
 
-    let user_id = user
+    // A persisted user must have an id; if not, return a clean 500 instead of
-        .id
+    // panicking (the previous ok_or_else(...).unwrap() discarded this response).
-        .ok_or_else(|| {
+    let user_id = match user.id {
-            (
+        Some(id) => id,
+        None => {
+            tracing::error!("Login user record has no id for email: {}", req.email);
+            return (
                 StatusCode::INTERNAL_SERVER_ERROR,
                 Json(serde_json::json!({
                     "error": "invalid user state"
                 })),
             )
-        })
+                .into_response();
-        .unwrap();
+        }
+    };
 
     // Verify password
     match user.verify_password(&req.password) {

backend/src/handlers/health_stats.rs

@@ -38,7 +38,16 @@ pub async fn create_health_stat(
     Extension(claims): Extension<Claims>,
     Json(req): Json<CreateHealthStatRequest>,
 ) -> impl IntoResponse {
-    let repo = state.health_stats_repo.as_ref().unwrap();
+    let repo = match state.health_stats_repo.as_ref() {
+        Some(r) => r,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({ "error": "health stats unavailable" })),
+            )
+                .into_response()
+        }
+    };
 
     // Convert complex value to f64 or store as string
     let value_num = match req.value {
@@ -80,7 +89,16 @@ pub async fn list_health_stats(
     State(state): State<AppState>,
     Extension(claims): Extension<Claims>,
 ) -> impl IntoResponse {
-    let repo = state.health_stats_repo.as_ref().unwrap();
+    let repo = match state.health_stats_repo.as_ref() {
+        Some(r) => r,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({ "error": "health stats unavailable" })),
+            )
+                .into_response()
+        }
+    };
     match repo.find_by_user(&claims.sub).await {
         Ok(stats) => (StatusCode::OK, Json(stats)).into_response(),
         Err(e) => {
@@ -99,7 +117,16 @@ pub async fn get_health_stat(
     Extension(claims): Extension<Claims>,
     Path(id): Path<String>,
 ) -> impl IntoResponse {
-    let repo = state.health_stats_repo.as_ref().unwrap();
+    let repo = match state.health_stats_repo.as_ref() {
+        Some(r) => r,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({ "error": "health stats unavailable" })),
+            )
+                .into_response()
+        }
+    };
     let object_id = match ObjectId::parse_str(&id) {
         Ok(oid) => oid,
         Err(_) => return (StatusCode::BAD_REQUEST, "Invalid ID").into_response(),
@@ -130,7 +157,16 @@ pub async fn update_health_stat(
     Path(id): Path<String>,
     Json(req): Json<UpdateHealthStatRequest>,
 ) -> impl IntoResponse {
-    let repo = state.health_stats_repo.as_ref().unwrap();
+    let repo = match state.health_stats_repo.as_ref() {
+        Some(r) => r,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({ "error": "health stats unavailable" })),
+            )
+                .into_response()
+        }
+    };
     let object_id = match ObjectId::parse_str(&id) {
         Ok(oid) => oid,
         Err(_) => return (StatusCode::BAD_REQUEST, "Invalid ID").into_response(),
@@ -182,7 +218,16 @@ pub async fn delete_health_stat(
     Extension(claims): Extension<Claims>,
     Path(id): Path<String>,
 ) -> impl IntoResponse {
-    let repo = state.health_stats_repo.as_ref().unwrap();
+    let repo = match state.health_stats_repo.as_ref() {
+        Some(r) => r,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({ "error": "health stats unavailable" })),
+            )
+                .into_response()
+        }
+    };
     let object_id = match ObjectId::parse_str(&id) {
         Ok(oid) => oid,
         Err(_) => return (StatusCode::BAD_REQUEST, "Invalid ID").into_response(),
@@ -219,7 +264,16 @@ pub async fn get_health_trends(
     Extension(claims): Extension<Claims>,
     Query(query): Query<HealthTrendsQuery>,
 ) -> impl IntoResponse {
-    let repo = state.health_stats_repo.as_ref().unwrap();
+    let repo = match state.health_stats_repo.as_ref() {
+        Some(r) => r,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({ "error": "health stats unavailable" })),
+            )
+                .into_response()
+        }
+    };
     match repo.find_by_user(&claims.sub).await {
         Ok(stats) => {
             // Filter by stat_type

backend/src/handlers/users.rs

@@ -43,7 +43,16 @@ pub async fn get_profile(
     State(state): State<AppState>,
     Extension(claims): Extension<Claims>,
 ) -> impl IntoResponse {
-    let user_id = ObjectId::parse_str(&claims.sub).unwrap();
+    let user_id = match ObjectId::parse_str(&claims.sub) {
+        Ok(oid) => oid,
+        Err(_) => {
+            return (
+                StatusCode::UNAUTHORIZED,
+                Json(serde_json::json!({ "error": "invalid token" })),
+            )
+                .into_response()
+        }
+    };
 
     match state.db.find_user_by_id(&user_id).await {
         Ok(Some(user)) => {
@@ -86,7 +95,16 @@ pub async fn update_profile(
             .into_response();
     }
 
-    let user_id = ObjectId::parse_str(&claims.sub).unwrap();
+    let user_id = match ObjectId::parse_str(&claims.sub) {
+        Ok(oid) => oid,
+        Err(_) => {
+            return (
+                StatusCode::UNAUTHORIZED,
+                Json(serde_json::json!({ "error": "invalid token" })),
+            )
+                .into_response()
+        }
+    };
 
     let mut user = match state.db.find_user_by_id(&user_id).await {
         Ok(Some(u)) => u,
@@ -137,7 +155,16 @@ pub async fn delete_account(
     State(state): State<AppState>,
     Extension(claims): Extension<Claims>,
 ) -> impl IntoResponse {
-    let user_id = ObjectId::parse_str(&claims.sub).unwrap();
+    let user_id = match ObjectId::parse_str(&claims.sub) {
+        Ok(oid) => oid,
+        Err(_) => {
+            return (
+                StatusCode::UNAUTHORIZED,
+                Json(serde_json::json!({ "error": "invalid token" })),
+            )
+                .into_response()
+        }
+    };
 
     match state.db.delete_user(&user_id).await {
         Ok(_) => (StatusCode::NO_CONTENT, ()).into_response(),
@@ -314,7 +341,16 @@ pub async fn get_settings(
     State(state): State<AppState>,
     Extension(claims): Extension<Claims>,
 ) -> impl IntoResponse {
-    let user_id = ObjectId::parse_str(&claims.sub).unwrap();
+    let user_id = match ObjectId::parse_str(&claims.sub) {
+        Ok(oid) => oid,
+        Err(_) => {
+            return (
+                StatusCode::UNAUTHORIZED,
+                Json(serde_json::json!({ "error": "invalid token" })),
+            )
+                .into_response()
+        }
+    };
 
     match state.db.find_user_by_id(&user_id).await {
         Ok(Some(user)) => {
@@ -351,7 +387,16 @@ pub async fn update_settings(
     Extension(claims): Extension<Claims>,
     Json(req): Json<UpdateSettingsRequest>,
 ) -> impl IntoResponse {
-    let user_id = ObjectId::parse_str(&claims.sub).unwrap();
+    let user_id = match ObjectId::parse_str(&claims.sub) {
+        Ok(oid) => oid,
+        Err(_) => {
+            return (
+                StatusCode::UNAUTHORIZED,
+                Json(serde_json::json!({ "error": "invalid token" })),
+            )
+                .into_response()
+        }
+    };
 
     let mut user = match state.db.find_user_by_id(&user_id).await {
         Ok(Some(u)) => u,

backend/src/lib.rs

@@ -0,0 +1,16 @@
+//! Library facade so the binary entrypoint and integration tests share a single
+//! source of truth for module wiring and router assembly.
+//!
+//! `main.rs` is a thin wrapper that loads config, connects to Mongo, builds the
+//! app via [`app::build_app`], and serves it. Tests build the same app in
+//! process against a throwaway database.
+
+pub mod app;
+pub mod auth;
+pub mod config;
+pub mod db;
+pub mod handlers;
+pub mod middleware;
+pub mod models;
+pub mod security;
+pub mod services;

backend/src/main.rs

@@ -1,20 +1,19 @@
-mod auth;
+//! Binary entrypoint: loads config, connects to MongoDB, wires services into
-mod config;
+//! [`config::AppState`], builds the router via [`app::build_app`], and serves.
-mod db;
+//!
-mod handlers;
+//! All module wiring and route/middleware composition lives in the library
-mod middleware;
+//! (`lib.rs` + `app.rs`) so integration tests can reuse them.
-mod models;
-mod security;
-mod services;
 
-use axum::{
-    routing::{delete, get, post, put},
-    Router,
-};
-use config::Config;
 use std::sync::Arc;
-use tower::ServiceBuilder;
+
-use tower_http::{cors::CorsLayer, trace::TraceLayer};
+use normogen_backend::{
+    app::build_app,
+    auth::{JwtService, TokenVersionCache},
+    config::{self, Config, Environment},
+    db,
+    models::{health_stats::HealthStatisticsRepository, refresh_token::RefreshTokenRepository},
+    security, services,
+};
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
@@ -33,6 +32,11 @@ async fn main() -> anyhow::Result<()> {
 
     // Load configuration
     let config = Config::from_env()?;
+    if config.environment == Environment::Production {
+        eprintln!("Running in PRODUCTION mode");
+    } else {
+        eprintln!("Running in DEVELOPMENT mode");
+    }
     eprintln!("Configuration loaded successfully");
 
     // Connect to MongoDB
@@ -65,7 +69,7 @@ async fn main() -> anyhow::Result<()> {
     }
 
     // Create JWT service
-    let jwt_service = auth::JwtService::new(config.jwt.clone());
+    let jwt_service = JwtService::new(config.jwt.clone());
 
     // Get the underlying MongoDB database for security services
     let database = db.get_database();
@@ -82,12 +86,10 @@ async fn main() -> anyhow::Result<()> {
 
     // Short-TTL cache of token_version, so the JWT middleware can reject stale
     // access tokens without a Mongo lookup per request.
-    let token_version_cache = std::sync::Arc::new(auth::TokenVersionCache::with_default_ttl());
+    let token_version_cache = Arc::new(TokenVersionCache::with_default_ttl());
 
     // Persisted refresh tokens (hashed) for rotation/revocation.
-    let refresh_token_repo = std::sync::Arc::new(
+    let refresh_token_repo = Arc::new(RefreshTokenRepository::new(&database));
-        models::refresh_token::RefreshTokenRepository::new(&database),
-    );
 
     // Initialize security services (Phase 2.6)
     let audit_logger = security::AuditLogger::new(&database);
@@ -103,7 +105,7 @@ async fn main() -> anyhow::Result<()> {
     );
 
     // Initialize health stats repository (Phase 2.7) - using Database pattern
-    let health_stats_repo = models::health_stats::HealthStatisticsRepository::new(&database);
+    let health_stats_repo = HealthStatisticsRepository::new(&database);
 
     // Initialize interaction service (Phase 2.8)
     let interaction_service = Arc::new(services::InteractionService::new());
@@ -125,95 +127,7 @@ async fn main() -> anyhow::Result<()> {
     };
 
     eprintln!("Building router with security middleware...");
-
+    let app = build_app(state);
-    // Build public routes (no auth required)
-    let public_routes = Router::new()
-        .route(
-            "/health",
-            get(handlers::health_check).head(handlers::health_check),
-        )
-        .route("/ready", get(handlers::ready_check))
-        .route("/api/auth/register", post(handlers::register))
-        .route("/api/auth/login", post(handlers::login))
-        .route("/api/auth/refresh", post(handlers::refresh))
-        .route("/api/auth/logout", post(handlers::logout))
-        .route(
-            "/api/auth/recover-password",
-            post(handlers::recover_password),
-        );
-
-    // Build protected routes (auth required)
-    let protected_routes = Router::new()
-        // User profile management
-        .route("/api/users/me", get(handlers::get_profile))
-        .route("/api/users/me", put(handlers::update_profile))
-        .route("/api/users/me", delete(handlers::delete_account))
-        .route("/api/users/me/change-password", post(handlers::change_password))
-
-        // User settings
-        .route("/api/users/me/settings", get(handlers::get_settings))
-        .route("/api/users/me/settings", put(handlers::update_settings))
-
-        // Share management
-        .route("/api/shares", post(handlers::create_share))
-        .route("/api/shares", get(handlers::list_shares))
-        .route("/api/shares/:id", put(handlers::update_share))
-        .route("/api/shares/:id", delete(handlers::delete_share))
-
-        // Permission checking
-        .route("/api/permissions/check", post(handlers::check_permission))
-
-        // Session management (Phase 2.6)
-        .route("/api/sessions", get(handlers::get_sessions))
-        .route("/api/sessions/:id", delete(handlers::revoke_session))
-        .route("/api/sessions/all", delete(handlers::revoke_all_sessions))
-
-        // Medication management (Phase 2.7)
-        .route("/api/medications", post(handlers::create_medication))
-        .route("/api/medications", get(handlers::list_medications))
-        .route("/api/medications/:id", get(handlers::get_medication))
-        .route("/api/medications/:id", post(handlers::update_medication))
-        .route("/api/medications/:id/delete", post(handlers::delete_medication))
-        .route("/api/medications/:id/log", post(handlers::log_dose))
-        .route("/api/medications/:id/adherence", get(handlers::get_adherence))
-
-        // Health statistics management (Phase 2.7)
-        .route("/api/health-stats", post(handlers::create_health_stat))
-        .route("/api/health-stats", get(handlers::list_health_stats))
-        .route("/api/health-stats/trends", get(handlers::get_health_trends))
-        .route("/api/health-stats/:id", get(handlers::get_health_stat))
-        .route("/api/health-stats/:id", put(handlers::update_health_stat))
-        .route("/api/health-stats/:id", delete(handlers::delete_health_stat))
-
-        // Drug interactions (Phase 2.8)
-        .route("/api/interactions/check", post(handlers::check_interactions))
-        .route("/api/interactions/check-new", post(handlers::check_new_medication))
-        .layer(axum::middleware::from_fn_with_state(
-            state.clone(),
-            middleware::jwt_auth_middleware
-        ));
-
-    let app = public_routes
-        .merge(protected_routes)
-        .with_state(state)
-        .layer(
-            ServiceBuilder::new()
-                // Resolve the client IP once and stash it for handlers/middleware
-                // (audit logging, account-lockout forensics).
-                .layer(axum::middleware::from_fn(
-                    middleware::client_ip_middleware,
-                ))
-                // Add security headers first (applies to all responses)
-                .layer(axum::middleware::from_fn(
-                    middleware::security_headers_middleware
-                ))
-                // Add general rate limiting
-                .layer(axum::middleware::from_fn(
-                    middleware::general_rate_limit_middleware
-                ))
-                .layer(TraceLayer::new_for_http())
-                .layer(CorsLayer::permissive()),
-        );
 
     let addr = format!("{}:{}", config.server.host, config.server.port);
     eprintln!("Binding to {}...", addr);

backend/tests/auth_tests.rs

@@ -1,163 +1,309 @@
-use reqwest::Client;
+//! Auth-flow integration tests.
+//!
+//! These build the full app in process (via `common::app_for_test`) against an
+//! isolated MongoDB test database, so they exercise the real router, middleware,
+//! and handlers. They require a live MongoDB; if one isn't reachable the helper
+//! returns `None` and every test skips gracefully (see `skip_if_none`).
+//!
+//! Contracts verified here reflect the *actual* API (post P0):
+//!   POST /api/auth/register {email, username, password}  -> 201 {token, refresh_token, ...}
+//!   POST /api/auth/login    {email, password}            -> 200 {token, refresh_token, ...}
+//!   POST /api/auth/refresh  {refresh_token}              -> 200 {token, refresh_token}
+//!   POST /api/auth/logout   {refresh_token}              -> 204
+
+mod common;
+
 use serde_json::{json, Value};
 
-const BASE_URL: &str = "http://127.0.0.1:8000";
+/// When Mongo is unavailable the helper returns `None`; each test bails out
-
+/// early (counts as a pass) so `cargo test` stays green without Mongo. CI
-#[tokio::test]
+/// provides Mongo and runs them for real.
-async fn test_health_check() {
+macro_rules! require_app {
-    let client = Client::new();
+    ($app:expr) => {
-    let response = client
+        match $app {
-        .get(format!("{}/health", BASE_URL))
+            Some(x) => x,
-        .send()
+            None => {
-        .await
+                eprintln!("[integration] skipped (MongoDB unavailable)");
-        .expect("Failed to send request");
+                return;
-
+            }
-    assert_eq!(response.status(), 200);
+        }
+    };
 }
 
 #[tokio::test]
-async fn test_ready_check() {
+async fn health_and_ready() {
-    let client = Client::new();
+    let (app, db_name) = require_app!(common::app_for_test().await);
-    let response = client
-        .get(format!("{}/ready", BASE_URL))
-        .send()
-        .await
-        .expect("Failed to send request");
 
-    assert_eq!(response.status(), 200);
+    let (status, _) = common::send_json(&app, "GET", "/ready", None, None).await;
+    assert_eq!(status, 200);
+
+    let (status, body) = common::send_json(&app, "GET", "/health", None, None).await;
+    assert_eq!(status, 200);
+    assert_eq!(body["status"], "ok");
+
+    common::drop_test_db(&db_name).await;
 }
 
 #[tokio::test]
-async fn test_register_user() {
+async fn register_returns_token_and_refresh_token() {
-    let client = Client::new();
+    let (app, db_name) = require_app!(common::app_for_test().await);
-    let email = format!("test_{}@example.com", uuid::Uuid::new_v4());
+    let email = unique_email();
 
-    let payload = json!({
+    // Correct contract: { email, username, password } (NOT password_hash).
-        "email": email,
+    let (status, body) = common::send_json(
-        "password_hash": "hashed_password_placeholder",
+        &app,
-        "encrypted_recovery_phrase": "encrypted_phrase_placeholder",
+        "POST",
-        "recovery_phrase_iv": "iv_placeholder",
+        "/api/auth/register",
-        "recovery_phrase_auth_tag": "auth_tag_placeholder"
+        Some(json!({ "email": email, "username": "tester", "password": "supersecret" })),
-    });
+        None,
+    )
+    .await;
+    assert_eq!(status, 201, "register should return 201, body: {body}");
+    assert!(body["token"].is_string(), "missing access token: {body}");
+    assert!(
+        body["refresh_token"].is_string(),
+        "missing refresh token: {body}"
+    );
+    assert_eq!(body["email"], email);
 
-    let response = client
+    common::drop_test_db(&db_name).await;
-        .post(format!("{}/api/auth/register", BASE_URL))
-        .json(&payload)
-        .send()
-        .await
-        .expect("Failed to send request");
-
-    assert_eq!(response.status(), 200);
-
-    let json: Value = response.json().await.expect("Failed to parse JSON");
-    assert_eq!(json["email"], email);
-    assert!(json["user_id"].is_string());
 }
 
 #[tokio::test]
-async fn test_login() {
+async fn login_with_correct_password() {
-    let client = Client::new();
+    let (app, db_name) = require_app!(common::app_for_test().await);
-    let email = format!("test_{}@example.com", uuid::Uuid::new_v4());
+    let email = unique_email();
 
-    // First register a user
+    register(&app, &email, "supersecret").await;
-    let register_payload = json!({
-        "email": email,
-        "password_hash": "hashed_password_placeholder",
-        "encrypted_recovery_phrase": "encrypted_phrase_placeholder",
-        "recovery_phrase_iv": "iv_placeholder",
-        "recovery_phrase_auth_tag": "auth_tag_placeholder"
-    });
 
-    let _reg_response = client
+    // Correct contract: { email, password }.
-        .post(format!("{}/api/auth/register", BASE_URL))
+    let (status, body) = common::send_json(
-        .json(&register_payload)
+        &app,
-        .send()
+        "POST",
-        .await
+        "/api/auth/login",
-        .expect("Failed to send request");
+        Some(json!({ "email": email, "password": "supersecret" })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 200, "login should succeed, body: {body}");
+    assert!(body["token"].is_string());
+    assert!(body["refresh_token"].is_string());
 
-    // Now login
+    common::drop_test_db(&db_name).await;
-    let login_payload = json!({
-        "email": email,
-        "password_hash": "hashed_password_placeholder"
-    });
-
-    let response = client
-        .post(format!("{}/api/auth/login", BASE_URL))
-        .json(&login_payload)
-        .send()
-        .await
-        .expect("Failed to send request");
-
-    assert_eq!(response.status(), 200);
-
-    let json: Value = response.json().await.expect("Failed to parse JSON");
-    assert!(json["access_token"].is_string());
-    assert!(json["refresh_token"].is_string());
-    assert_eq!(json["email"], email);
 }
 
 #[tokio::test]
-async fn test_get_profile_without_auth() {
+async fn login_with_wrong_password_is_rejected() {
-    let client = Client::new();
+    let (app, db_name) = require_app!(common::app_for_test().await);
+    let email = unique_email();
+    register(&app, &email, "supersecret").await;
 
-    let response = client
+    let (status, body) = common::send_json(
-        .get(format!("{}/api/users/me", BASE_URL))
+        &app,
-        .send()
+        "POST",
-        .await
+        "/api/auth/login",
-        .expect("Failed to send request");
+        Some(json!({ "email": email, "password": "wrong-password" })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 401, "wrong password should 401, body: {body}");
 
-    // Should return 401 Unauthorized without auth token
+    common::drop_test_db(&db_name).await;
-    assert_eq!(response.status(), 401);
 }
 
 #[tokio::test]
-async fn test_get_profile_with_auth() {
+async fn protected_route_rejects_missing_token() {
-    let client = Client::new();
+    let (app, db_name) = require_app!(common::app_for_test().await);
-    let email = format!("test_{}@example.com", uuid::Uuid::new_v4());
 
-    // Register and login
+    let (status, _) = common::send_json(&app, "GET", "/api/users/me", None, None).await;
-    let register_payload = json!({
+    assert_eq!(status, 401);
-        "email": email,
-        "password_hash": "hashed_password_placeholder",
-        "encrypted_recovery_phrase": "encrypted_phrase_placeholder",
-        "recovery_phrase_iv": "iv_placeholder",
-        "recovery_phrase_auth_tag": "auth_tag_placeholder"
-    });
 
-    client
+    common::drop_test_db(&db_name).await;
-        .post(format!("{}/api/auth/register", BASE_URL))
+}
-        .json(&register_payload)
+
-        .send()
+#[tokio::test]
-        .await
+async fn protected_route_accepts_valid_token() {
-        .expect("Failed to send request");
+    let (app, db_name) = require_app!(common::app_for_test().await);
-
+    let email = unique_email();
-    let login_payload = json!({
+
-        "email": email,
+    let token = register(&app, &email, "supersecret").await;
-        "password_hash": "hashed_password_placeholder"
+
-    });
+    let (status, body) = common::send_json(&app, "GET", "/api/users/me", None, Some(&token)).await;
-
+    assert_eq!(status, 200, "profile fetch should succeed, body: {body}");
-    let login_response = client
+    assert_eq!(body["email"], email);
-        .post(format!("{}/api/auth/login", BASE_URL))
+
-        .json(&login_payload)
+    common::drop_test_db(&db_name).await;
-        .send()
+}
-        .await
+
-        .expect("Failed to send request");
+#[tokio::test]
-
+async fn refresh_rotates_and_revokes_old_token() {
-    let login_json: Value = login_response.json().await.expect("Failed to parse JSON");
+    let (app, db_name) = require_app!(common::app_for_test().await);
-    let access_token = login_json["access_token"]
+    let email = unique_email();
-        .as_str()
+
-        .expect("No access token");
+    let _token = register(&app, &email, "supersecret").await;
-
+    let (_, body) = common::send_json(
-    // Get profile with auth token
+        &app,
-    let response = client
+        "POST",
-        .get(format!("{}/api/users/me", BASE_URL))
+        "/api/auth/login",
-        .header("Authorization", format!("Bearer {}", access_token))
+        Some(json!({ "email": email, "password": "supersecret" })),
-        .send()
+        None,
-        .await
+    )
-        .expect("Failed to send request");
+    .await;
-
+    let refresh_token = body["refresh_token"].as_str().unwrap().to_string();
-    assert_eq!(response.status(), 200);
+
-
+    // Rotate: exchange the refresh token for a new pair.
-    let json: Value = response.json().await.expect("Failed to parse JSON");
+    let (status, new_body) = common::send_json(
-    assert_eq!(json["email"], email);
+        &app,
+        "POST",
+        "/api/auth/refresh",
+        Some(json!({ "refresh_token": refresh_token })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 200, "refresh should succeed, body: {new_body}");
+    assert!(new_body["token"].is_string());
+    assert!(new_body["refresh_token"].is_string());
+    assert_ne!(
+        new_body["refresh_token"].as_str().unwrap(),
+        refresh_token,
+        "rotation must issue a new refresh token"
+    );
+
+    // The old refresh token must now be revoked (reuse detection).
+    let (status, _) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/refresh",
+        Some(json!({ "refresh_token": refresh_token })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 401, "reused refresh token must be rejected");
+
+    common::drop_test_db(&db_name).await;
+}
+
+#[tokio::test]
+async fn logout_revokes_refresh_token() {
+    let (app, db_name) = require_app!(common::app_for_test().await);
+    let email = unique_email();
+
+    register(&app, &email, "supersecret").await;
+    let (_, body) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/login",
+        Some(json!({ "email": email, "password": "supersecret" })),
+        None,
+    )
+    .await;
+    let refresh_token = body["refresh_token"].as_str().unwrap().to_string();
+
+    // Logout revokes the refresh token.
+    let (status, _) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/logout",
+        Some(json!({ "refresh_token": refresh_token })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 204);
+
+    // The logged-out refresh token can no longer mint new tokens.
+    let (status, _) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/refresh",
+        Some(json!({ "refresh_token": refresh_token })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 401);
+
+    common::drop_test_db(&db_name).await;
+}
+
+#[tokio::test]
+async fn password_change_invalidates_existing_tokens() {
+    let (app, db_name) = require_app!(common::app_for_test().await);
+    let email = unique_email();
+
+    let access_token = register(&app, &email, "supersecret").await;
+    let (_, body) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/login",
+        Some(json!({ "email": email, "password": "supersecret" })),
+        None,
+    )
+    .await;
+    let refresh_token = body["refresh_token"].as_str().unwrap().to_string();
+
+    // Change the password (protected route).
+    let (status, _) = common::send_json(
+        &app,
+        "POST",
+        "/api/users/me/change-password",
+        Some(json!({ "current_password": "supersecret", "new_password": "newsupersecret" })),
+        Some(&access_token),
+    )
+    .await;
+    assert_eq!(status, 204);
+
+    // Old access token rejected within the token_version cache TTL.
+    let (status, _) =
+        common::send_json(&app, "GET", "/api/users/me", None, Some(&access_token)).await;
+    assert_eq!(
+        status, 401,
+        "old access token must be rejected after password change"
+    );
+
+    // Old refresh token revoked.
+    let (status, _) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/refresh",
+        Some(json!({ "refresh_token": refresh_token })),
+        None,
+    )
+    .await;
+    assert_eq!(
+        status, 401,
+        "old refresh token must be rejected after password change"
+    );
+
+    // New password works.
+    let (status, _) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/login",
+        Some(json!({ "email": email, "password": "newsupersecret" })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 200);
+
+    common::drop_test_db(&db_name).await;
+}
+
+// ---- helpers ----
+
+fn unique_email() -> String {
+    format!("test_{}@example.com", uuid::Uuid::new_v4())
+}
+
+/// Register a user and return the access token.
+async fn register(app: &axum::Router, email: &str, password: &str) -> String {
+    let (status, body) = common::send_json(
+        app,
+        "POST",
+        "/api/auth/register",
+        Some(json!({ "email": email, "username": "tester", "password": password })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 201, "register precondition failed, body: {body}");
+    let _: &Value = &body;
+    body["token"].as_str().unwrap().to_string()
 }

backend/tests/common/mod.rs

@@ -0,0 +1,186 @@
+//! Shared integration-test helpers.
+//!
+//! These tests need a live MongoDB. Each test process targets a unique database
+//! (`normogen_test_<random>`), so parallel `cargo test` runs don't collide, and
+//! drops it on completion. When Mongo is unreachable the tests skip gracefully
+//! (printing a note) so `cargo test` stays green on machines without Mongo — the
+//! CI job provides Mongo and runs them for real.
+
+use std::sync::Arc;
+
+use axum::{body::Body, http::Request, Router};
+use mongodb::Client;
+use normogen_backend::{
+    app::build_app,
+    auth::{JwtService, TokenVersionCache},
+    config::{
+        Config, CorsConfig, DatabaseConfig, EncryptionConfig, Environment, JwtConfig, ServerConfig,
+    },
+    db::MongoDb,
+    models::{health_stats::HealthStatisticsRepository, refresh_token::RefreshTokenRepository},
+    security, services,
+};
+use serde_json::Value;
+use tower::util::ServiceExt;
+
+/// Unique test DB name per process. Suffixing with a UUID keeps concurrent test
+/// runs (local + CI) from stomping on each other.
+pub fn test_db_name() -> String {
+    format!("normogen_test_{}", uuid::Uuid::new_v4())
+}
+
+/// The Mongo URI to connect to during tests. Defaults to the local dev instance.
+pub fn mongo_uri() -> String {
+    std::env::var("MONGODB_URI").unwrap_or_else(|_| "mongodb://localhost:27017".to_string())
+}
+
+/// Quick (~1s) reachability check so tests skip fast when Mongo is absent.
+/// Builds a throwaway client with a short server-selection timeout and pings;
+/// we don't use the real client afterwards (that's `MongoDb::new`).
+pub async fn mongo_available() -> bool {
+    let mut opts = match mongodb::options::ClientOptions::parse(&mongo_uri()).await {
+        Ok(o) => o,
+        Err(_) => return false,
+    };
+    opts.server_selection_timeout = Some(std::time::Duration::from_secs(1));
+    opts.connect_timeout = Some(std::time::Duration::from_secs(1));
+    let client = match Client::with_options(opts) {
+        Ok(c) => c,
+        Err(_) => return false,
+    };
+    client
+        .database("admin")
+        .run_command(mongodb::bson::doc! { "ping": 1 }, None)
+        .await
+        .is_ok()
+}
+
+/// A Config suitable for tests: development environment (so insecure-secret
+/// defaults are allowed), short JWT expiries, a test JWT secret.
+pub fn test_config(db_name: &str) -> Config {
+    Config {
+        server: ServerConfig {
+            host: "127.0.0.1".to_string(),
+            port: 0, // not bound in-process; tests use Router::oneshot
+        },
+        database: DatabaseConfig {
+            uri: mongo_uri(),
+            database: db_name.to_string(),
+        },
+        jwt: JwtConfig {
+            secret: "test-secret-not-for-production".to_string(),
+            access_token_expiry_minutes: 15,
+            refresh_token_expiry_days: 7,
+        },
+        encryption: EncryptionConfig {
+            key: "test-encryption-key".to_string(),
+        },
+        cors: CorsConfig {
+            allowed_origins: vec!["http://localhost:3000".to_string()],
+        },
+        environment: Environment::Development,
+    }
+}
+
+/// Build the full app against a fresh, isolated test database.
+///
+/// Returns `(router, db_name)` so callers can drop the database when done. The
+/// router is the exact same one served in production (all routes + middleware),
+/// just driven in-process via `oneshot`.
+pub async fn app_for_test() -> Option<(Router, String)> {
+    let db_name = test_db_name();
+
+    // Fast, bounded connectivity probe: if Mongo isn't reachable, skip the test
+    // in ~1s instead of waiting on `MongoDb::new`'s 10s server-selection
+    // timeout (which would hang `cargo test` on machines without Mongo).
+    if !mongo_available().await {
+        eprintln!(
+            "[integration] skipping: MongoDB unreachable at {}",
+            mongo_uri()
+        );
+        return None;
+    }
+
+    let db = match MongoDb::new(&mongo_uri(), &db_name).await {
+        Ok(db) => db,
+        Err(e) => {
+            eprintln!(
+                "[integration] skipping: MongoDB connect failed at {}: {}",
+                mongo_uri(),
+                e
+            );
+            return None;
+        }
+    };
+
+    let config = test_config(&db_name);
+    let jwt_service = JwtService::new(config.jwt.clone());
+    let database = db.get_database();
+
+    // Best-effort index creation (mirrors main.rs).
+    let _ = normogen_backend::db::DatabaseInitializer::new(database.clone())
+        .initialize()
+        .await;
+
+    let token_version_cache = Arc::new(TokenVersionCache::with_default_ttl());
+    let refresh_token_repo = Arc::new(RefreshTokenRepository::new(&database));
+    let audit_logger = security::AuditLogger::new(&database);
+    let session_manager = security::SessionManager::new(&database);
+    let account_lockout = security::AccountLockout::new(database.collection("users"), 5, 15, 1440);
+    let health_stats_repo = HealthStatisticsRepository::new(&database);
+    let interaction_service = Arc::new(services::InteractionService::new());
+
+    let state = normogen_backend::config::AppState {
+        db,
+        jwt_service,
+        config: config.clone(),
+        audit_logger: Some(audit_logger),
+        session_manager: Some(session_manager),
+        account_lockout: Some(account_lockout),
+        health_stats_repo: Some(health_stats_repo),
+        mongo_client: None,
+        interaction_service: Some(interaction_service),
+        token_version_cache,
+        refresh_token_repo: Some(refresh_token_repo),
+    };
+
+    Some((build_app(state), db_name))
+}
+
+/// Drop a test database (best-effort teardown).
+pub async fn drop_test_db(db_name: &str) {
+    if let Ok(client) = Client::with_uri_str(&mongo_uri()).await {
+        let _ = client.database(db_name).drop(None).await;
+    }
+}
+
+/// Convenience: drive the router with a JSON request and return the status +
+/// parsed JSON body.
+pub async fn send_json(
+    app: &Router,
+    method: &str,
+    uri: &str,
+    body: Option<Value>,
+    auth_token: Option<&str>,
+) -> (u16, Value) {
+    let mut builder = Request::builder().method(method).uri(uri);
+    if let Some(token) = auth_token {
+        builder = builder.header("Authorization", format!("Bearer {}", token));
+    }
+    let request = if let Some(json) = body {
+        builder
+            .header("content-type", "application/json")
+            .body(Body::from(serde_json::to_vec(&json).unwrap()))
+            .unwrap()
+    } else {
+        builder.body(Body::empty()).unwrap()
+    };
+
+    let response = app.clone().oneshot(request).await.unwrap();
+    let status = response.status().as_u16();
+    let bytes = axum::body::to_bytes(response.into_body(), usize::MAX)
+        .await
+        .unwrap_or_default();
+    let json: Value = serde_json::from_slice(&bytes).unwrap_or(Value::Null);
+    (status, json)
+}

backend/tests/medication_tests.rs

@@ -1,61 +1,122 @@
-// Basic medication integration tests
+//! Medication-endpoint integration tests.
-// These tests verify the medication endpoints work correctly
+//!
+//! In-process against an isolated MongoDB test DB (see `common`). When Mongo is
+//! unreachable these skip gracefully. Verifies auth enforcement and an
+//! authenticated create -> list flow with the actual API contract.
 
-// Note: These tests require MongoDB to be running
+mod common;
-// Run with: cargo test --test medication_tests
 
-#[cfg(test)]
+use serde_json::json;
-mod medication_tests {
-    use reqwest::Client;
-    use serde_json::json;
 
-    const BASE_URL: &str = "http://localhost:3000";
+/// Skip when Mongo is unavailable (counts as a pass); CI provides Mongo.
-
+macro_rules! require_app {
-    #[tokio::test]
+    ($app:expr) => {
-    async fn test_create_medication_requires_auth() {
+        match $app {
-        let client = Client::new();
+            Some(x) => x,
-        let response = client
+            None => {
-            .post(format!("{}/api/medications", BASE_URL))
+                eprintln!("[integration] skipped (MongoDB unavailable)");
-            .json(&json!({
+                return;
-                "profile_id": "test-profile",
+            }
-                "name": "Test Medication",
+        }
-                "dosage": "10mg",
+    };
-                "frequency": "daily"
+}
-            }))
+
-            .send()
+#[tokio::test]
-            .await
+async fn create_medication_requires_auth() {
-            .expect("Failed to send request");
+    let (app, db_name) = require_app!(common::app_for_test().await);
-
+
-        // Should return 401 since no auth token provided
+    let (status, _) = common::send_json(
-        assert_eq!(response.status(), 401);
+        &app,
-    }
+        "POST",
-
+        "/api/medications",
-    #[tokio::test]
+        Some(
-    async fn test_list_medications_requires_auth() {
+            json!({ "name": "Test Med", "dosage": "10mg", "frequency": "daily", "route": "oral" }),
-        let client = Client::new();
+        ),
-        let response = client
+        None,
-            .get(format!("{}/api/medications", BASE_URL))
+    )
-            .send()
+    .await;
-            .await
+    assert_eq!(status, 401);
-            .expect("Failed to send request");
+
-
+    common::drop_test_db(&db_name).await;
-        // Should return 401 since no auth token provided
+}
-        assert_eq!(response.status(), 401);
+
-    }
+#[tokio::test]
-
+async fn list_medications_requires_auth() {
-    #[tokio::test]
+    let (app, db_name) = require_app!(common::app_for_test().await);
-    async fn test_get_medication_requires_auth() {
+
-        let client = Client::new();
+    let (status, _) = common::send_json(&app, "GET", "/api/medications", None, None).await;
-        let response = client
+    assert_eq!(status, 401);
-            .get(format!(
+
-                "{}/api/medications/507f1f77bcf86cd799439011",
+    common::drop_test_db(&db_name).await;
-                BASE_URL
+}
-            ))
+
-            .send()
+#[tokio::test]
-            .await
+async fn get_medication_requires_auth() {
-            .expect("Failed to send request");
+    let (app, db_name) = require_app!(common::app_for_test().await);
-
+
-        // Should return 401 since no auth token provided
+    let (status, _) = common::send_json(
-        assert_eq!(response.status(), 401);
+        &app,
-    }
+        "GET",
+        "/api/medications/507f1f77bcf86cd799439011",
+        None,
+        None,
+    )
+    .await;
+    assert_eq!(status, 401);
+
+    common::drop_test_db(&db_name).await;
+}
+
+#[tokio::test]
+async fn authenticated_user_can_create_and_list_medication() {
+    let (app, db_name) = require_app!(common::app_for_test().await);
+    let email = unique_email();
+
+    // Register and grab the access token.
+    let (status, body) = common::send_json(
+        &app,
+        "POST",
+        "/api/auth/register",
+        Some(json!({ "email": email, "username": "tester", "password": "supersecret" })),
+        None,
+    )
+    .await;
+    assert_eq!(status, 201);
+    let token = body["token"].as_str().unwrap().to_string();
+
+    // Create a medication (name/dosage/frequency/route are all required).
+    let (status, body) = common::send_json(
+        &app,
+        "POST",
+        "/api/medications",
+        Some(json!({
+            "name": "Ibuprofen",
+            "dosage": "200mg",
+            "frequency": "as needed",
+            "route": "oral"
+        })),
+        Some(&token),
+    )
+    .await;
+    assert!(
+        status == 200 || status == 201,
+        "create should succeed, body: {body}"
+    );
+
+    // List medications for the user — should include the one we just created.
+    let (status, body) =
+        common::send_json(&app, "GET", "/api/medications", None, Some(&token)).await;
+    assert_eq!(status, 200, "list should succeed, body: {body}");
+    let empty = Vec::new();
+    let arr = body.as_array().unwrap_or(&empty);
+    assert!(
+        !arr.is_empty(),
+        "list should contain the created medication"
+    );
+
+    common::drop_test_db(&db_name).await;
+}
+
+fn unique_email() -> String {
+    format!("test_{}@example.com", uuid::Uuid::new_v4())
 }

scripts/test-ci-locally.sh

@@ -25,10 +25,11 @@ fi
 echo ""
 
 # Test 2: Clippy
+# NOTE: matches CI (non-strict — warnings shown but don't fail the build).
 echo "🔍 Test 2: Clippy Lint"
-echo "Command: cargo clippy --all-targets --all-features -- -D warnings"
+echo "Command: cargo clippy --all-targets --all-features"
-if cargo clippy --all-targets --all-features -- -D warnings; then
+if cargo clippy --all-targets --all-features; then
-    echo "✅ PASS - No clippy warnings"
+    echo "✅ PASS - Clippy clean"
 else
     echo "❌ FAIL - Clippy found issues"
     exit 1
@@ -59,23 +60,42 @@ else
 fi
 echo ""
 
-# Test 5: Docker build (only if Docker is available locally)
+# Test 5: Unit tests (always run; no external dependencies).
+echo "🔍 Test 5: Unit Tests"
+echo "Command: cargo test --lib --bins"
+if cargo test --lib --bins; then
+    echo "✅ PASS - Unit tests pass"
+else
+    echo "❌ FAIL - Unit tests failed"
+    exit 1
+fi
+echo ""
+
+# Test 6: Integration tests (need a live MongoDB; skip gracefully without one).
+echo "🔍 Test 6: Integration Tests"
+echo "Command: cargo test --test auth_tests --test medication_tests"
+echo "  (these skip automatically if MongoDB is not reachable)"
+echo "  To run for real: docker run -d -p 27017:27017 --name mongo-test mongo:7"
+if cargo test --test auth_tests --test medication_tests; then
+    echo "✅ PASS - Integration tests pass (or skipped: no MongoDB)"
+else
+    echo "❌ FAIL - Integration tests failed"
+    exit 1
+fi
+echo ""
+
+# Note: Docker images are built separately (Forgejo CI cannot run DinD due to
+# network isolation). Build locally with: docker build -f docker/Dockerfile .
 if command -v docker &> /dev/null && docker info &> /dev/null; then
-    echo "🔍 Test 5: Docker Build"
+    echo "🔍 Optional: Docker Build"
     echo "Command: docker build -f docker/Dockerfile -t normogen-backend:test ."
     if docker build -f docker/Dockerfile -t normogen-backend:test .; then
         echo "✅ PASS - Docker image built"
         docker images normogen-backend:test
     else
-        echo "❌ FAIL - Docker build failed"
+        echo "⚠️  Docker build failed (non-fatal; CI does not build Docker either)"
-        exit 1
     fi
     echo ""
-else
-    echo "⚠️  SKIP - Docker not available locally"
-    echo "   Note: Docker build will run in Forgejo CI on Solaria"
-    echo "   This is expected and OK!"
-    echo ""
 fi
 
 echo "=========================================="
@@ -87,14 +107,16 @@ echo "  ✅ Code formatting"
 echo "  ✅ Clippy linting"
 echo "  ✅ Build successful"
 echo "  ✅ Binary created"
+echo "  ✅ Unit tests pass"
+echo "  ✅ Integration tests pass (or skipped without MongoDB)"
 echo ""
 echo "Next steps:"
 echo "  1. Commit the changes"
 echo "  2. Push to Forgejo"
 echo "  3. Watch CI run at: http://gitea.solivarez.com.ar/alvaro/normogen/actions"
 echo ""
-echo "The Forgejo CI will also:"
+echo "The Forgejo CI will:"
 echo "  • Verify formatting (same as local)"
 echo "  • Run Clippy (same as local)"
 echo "  • Build the binary (same as local)"
-echo "  • Build Docker image with Buildx (runs on Solaria)"
+echo "  • Run unit + integration tests (with a MongoDB service container)"