Fixed media upload

AGENTS.md

@@ -0,0 +1,60 @@
+# AGENTS.md
+
+This file provides guidance to Codex (Codex.ai/code) when working with code in this repository.
+
+## Project Overview
+
+Pet sitting web service for managing clients and bookings. The owner uses the site to:
+- Receive and manage client requests (leads) from the website
+- Schedule calls and visits with clients
+- Upload photos/videos of pets for remote viewing by clients (public media page via unique token)
+- Get Telegram notifications about new requests
+
+## Tech Stack
+
+- **Language:** Rust (edition 2024)
+- **Web framework:** [Cot](https://github.com/cot-rs/cot) - Rust web framework (Django-like), local path `../cot/cot`
+- **Database:** PostgreSQL (via Cot ORM)
+- **Notifications:** Telegram Bot API
+
+## Build & Run
+
+```sh
+cargo build              # build
+cargo run                # run dev server at http://127.0.0.1:8000
+cargo test               # run all tests
+cargo test <name>        # run a single test by name
+cargo clippy             # lint
+cargo fmt --check        # check formatting
+cot migration make       # generate migrations from model changes (requires cot-cli)
+```
+
+Set `WEB_PETTING_DATABASE_URL` (or `DATABASE_URL`) before running the app or migrations. Example:
+
+```sh
+WEB_PETTING_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/web_petting cargo run
+```
+
+## Architecture
+
+Monolithic Cot web app with a single PostgreSQL database.
+
+- `src/main.rs` - project/app setup, router, config
+- `src/models.rs` - all database models (Lead, Client, Visit, Media, User, Setting)
+- `src/migrations.rs` - migration registry
+- `src/migrations/` - migration files
+
+## Database Design Principles
+
+- **Soft-delete everywhere:** records are never physically deleted, only status changes (e.g. `active` -> `archived`, `new` -> `rejected`). This ensures data can always be recovered.
+- **Status fields** are stored as `String` with enum-like values defined in `models.rs`.
+- **Foreign keys** use `cot::db::ForeignKey<T>` with `Restrict` on delete/update.
+
+## Data Model
+
+- **Lead** (`new`/`in_progress`/`converted`/`rejected`) - public form submission; links to Client when converted
+- **Client** (`active`/`archived`) - confirmed client with `media_token` for public media page
+- **Visit** (`scheduled`/`completed`/`cancelled`/`deleted`) - pet sitting session, belongs to Client and User
+- **Media** (`active`/`archived`) - photo/video, belongs to Client, optionally to Visit
+- **User** (`active`/`archived`) - admin accounts (supports multiple admins)
+- **Setting** - global key-value config (telegram_bot_token, telegram_chat_id, etc.)

CLAUDE.md

@@ -13,30 +13,36 @@ Pet sitting web service for managing clients and bookings. The owner uses the si
 ## Tech Stack
 
 - **Language:** Rust (edition 2024)
-- **Web framework:** [Cot](https://github.com/cot-rs/cot) — Rust web framework (Django-like), local path `../cot/cot`
-- **Database:** SQLite (via Cot ORM), file `db.sqlite3`
+- **Web framework:** [Cot](https://github.com/cot-rs/cot) - Rust web framework (Django-like), local path `../cot/cot`
+- **Database:** PostgreSQL (via Cot ORM)
 - **Notifications:** Telegram Bot API
 
 ## Build & Run
 
 ```sh
-cargo build          # build
-cargo run            # run dev server at http://127.0.0.1:8000
-cargo test           # run all tests
-cargo test <name>    # run a single test by name
-cargo clippy         # lint
-cargo fmt --check    # check formatting
-cot migration make   # generate migrations from model changes (requires cot-cli)
+cargo build              # build
+cargo run                # run dev server at http://127.0.0.1:8000
+cargo test               # run all tests
+cargo test <name>        # run a single test by name
+cargo clippy             # lint
+cargo fmt --check        # check formatting
+cot migration make       # generate migrations from model changes (requires cot-cli)
+```
+
+Set `WEB_PETTING_DATABASE_URL` (or `DATABASE_URL`) before running the app or migrations. Example:
+
+```sh
+WEB_PETTING_DATABASE_URL=postgresql://postgres:postgres@localhost:5432/web_petting cargo run
 ```
 
 ## Architecture
 
-Monolithic Cot web app with a single SQLite database.
+Monolithic Cot web app with a single PostgreSQL database.
 
-- `src/main.rs` — project/app setup, router, config
-- `src/models.rs` — all database models (Lead, Client, Visit, Media, User, Setting)
-- `src/migrations.rs` — migration registry (auto-generated by `cot migration make`)
-- `src/migrations/` — migration files (auto-generated)
+- `src/main.rs` - project/app setup, router, config
+- `src/models.rs` - all database models (Lead, Client, Visit, Media, User, Setting)
+- `src/migrations.rs` - migration registry
+- `src/migrations/` - migration files
 
 ## Database Design Principles
 
@@ -46,9 +52,9 @@ Monolithic Cot web app with a single SQLite database.
 
 ## Data Model
 
-- **Lead** (`new`/`in_progress`/`converted`/`rejected`) — public form submission; links to Client when converted
-- **Client** (`active`/`archived`) — confirmed client with `media_token` for public media page
-- **Visit** (`scheduled`/`completed`/`cancelled`) — pet sitting session, belongs to Client
-- **Media** (`active`/`archived`) — photo/video, belongs to Client, optionally to Visit
-- **User** (`active`/`archived`) — admin accounts (supports multiple admins)
-- **Setting** — global key-value config (telegram_bot_token, telegram_chat_id, etc.)
+- **Lead** (`new`/`in_progress`/`converted`/`rejected`) - public form submission; links to Client when converted
+- **Client** (`active`/`archived`) - confirmed client with `media_token` for public media page
+- **Visit** (`scheduled`/`completed`/`cancelled`/`deleted`) - pet sitting session, belongs to Client and User
+- **Media** (`active`/`archived`) - photo/video, belongs to Client, optionally to Visit
+- **User** (`active`/`archived`) - admin accounts (supports multiple admins)
+- **Setting** - global key-value config (telegram_bot_token, telegram_chat_id, etc.)

Cargo.lock

@@ -1617,7 +1617,6 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
 dependencies = [
- "cc",
  "pkg-config",
  "vcpkg",
 ]
@@ -3467,7 +3466,7 @@ dependencies = [
 
 [[package]]
 name = "web-petting"
-version = "0.1.12"
+version = "1.0.0"
 dependencies = [
  "base64",
  "chrono",

Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "web-petting"
-version = "0.1.13"
+version = "1.0.1"
 edition = "2024"
 
 [dependencies]
-cot = { version = "0.6.0", features = ["sqlite"] }
+cot = { version = "0.6.0", default-features = false, features = ["postgres", "json"] }
 chrono = "0.4"
 chrono-tz = "0.10"
 serde = { version = "1", features = ["derive"] }

Dockerfile

@@ -9,6 +9,7 @@ RUN cargo build --release
 FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
 WORKDIR /data
+ENV WEB_PETTING_UPLOAD_DIR=/data/uploads
 COPY --from=builder /app/target/release/web-petting /usr/local/bin/web-petting
 COPY static /app/static
 EXPOSE 3000

src/admin.rs

@@ -6,6 +6,7 @@ use cot::request::extractors::Path;
 use cot::response::{IntoResponse, Redirect, Response};
 use cot::router::{Route, Router};
 use cot::session::Session;
+use image::ImageDecoder;
 use image::ImageFormat;
 use image::ImageReader;
 use image::codecs::jpeg::JpegEncoder;
@@ -19,6 +20,7 @@ use crate::telegram;
 
 const SESSION_USER_ID: &str = "user_id";
 const SESSION_USER_NAME: &str = "user_name";
+const SESSION_OIDC_STATE: &str = "oidc_state";
 const MAX_UPLOADED_IMAGE_DIMENSION: u32 = 1920;
 const UPLOADED_IMAGE_JPEG_QUALITY: u8 = 82;
 
@@ -117,9 +119,16 @@ fn transcode_uploaded_image(data: &[u8], ext: &str) -> cot::Result<Option<Vec<u8
         return Ok(None);
     };
 
-    let image = ImageReader::with_format(Cursor::new(data), format)
-        .decode()
+    let mut decoder = ImageReader::with_format(Cursor::new(data), format)
+        .into_decoder()
         .map_err(|e| cot::Error::internal(e.to_string()))?;
+    let orientation = decoder
+        .orientation()
+        .map_err(|e| cot::Error::internal(e.to_string()))?;
+    let mut image = image::DynamicImage::from_decoder(decoder)
+        .map_err(|e| cot::Error::internal(e.to_string()))?;
+    image.apply_orientation(orientation);
+
     let resized = image.resize(
         MAX_UPLOADED_IMAGE_DIMENSION,
         MAX_UPLOADED_IMAGE_DIMENSION,
@@ -142,14 +151,14 @@ async fn save_uploaded_image(
     data: &[u8],
 ) -> cot::Result<String> {
     if let Some(encoded) = transcode_uploaded_image(data, ext)? {
-        let path = format!("{}/{}.jpg", upload_dir, file_id);
-        tokio::fs::write(&path, &encoded)
+        let path = crate::uploads::join_db_path(upload_dir, &format!("{file_id}.jpg"));
+        crate::uploads::write_db_file(&path, &encoded)
             .await
             .map_err(|e| cot::Error::internal(e.to_string()))?;
         Ok(path)
     } else {
-        let path = format!("{}/{}.{}", upload_dir, file_id, ext);
-        tokio::fs::write(&path, data)
+        let path = crate::uploads::join_db_path(upload_dir, &format!("{file_id}.{ext}"));
+        crate::uploads::write_db_file(&path, data)
             .await
             .map_err(|e| cot::Error::internal(e.to_string()))?;
         Ok(path)
@@ -357,7 +366,7 @@ struct ScheduleEditTemplate<'a> {
     lang: Lang,
     admin_name: &'a str,
     visit: Visit,
-    clients: Vec<Client>,
+    client: Client,
     users: Vec<User>,
     media: Vec<Media>,
 }
@@ -640,7 +649,28 @@ fn decode_jwt_payload(token: &str) -> Option<serde_json::Value> {
     serde_json::from_slice(&bytes).ok()
 }
 
-async fn oidc_start(request: Request, db: Database) -> cot::Result<Response> {
+fn oidc_state_cookie(value: &str, max_age_seconds: u32) -> String {
+    format!(
+        "oidc_state={}; Path=/admin/oidc; HttpOnly; SameSite=Lax; Max-Age={}",
+        value, max_age_seconds,
+    )
+}
+
+fn get_cookie(request: &Request, name: &str) -> Option<String> {
+    let prefix = format!("{name}=");
+    request
+        .headers()
+        .get("cookie")
+        .and_then(|v| v.to_str().ok())
+        .and_then(|cookies| {
+            cookies.split(';').find_map(|part| {
+                let part = part.trim();
+                part.strip_prefix(&prefix).map(|v| v.to_string())
+            })
+        })
+}
+
+async fn oidc_start(request: Request, session: Session, db: Database) -> cot::Result<Response> {
     let lang = detect_lang(&request);
     let issuer_url = oidc_setting(&db, "oidc_issuer_url").await?;
     let client_id = oidc_setting(&db, "oidc_client_id").await?;
@@ -666,6 +696,7 @@ async fn oidc_start(request: Request, db: Database) -> cot::Result<Response> {
     };
 
     let state = rand_token();
+    session.insert(SESSION_OIDC_STATE, state.clone()).await?;
 
     let redirect_uri = format!("{}/admin/oidc/callback", site_domain.trim_end_matches('/'));
 
@@ -677,10 +708,7 @@ async fn oidc_start(request: Request, db: Database) -> cot::Result<Response> {
         urlencoding::encode(&state),
     );
 
-    let state_cookie = format!(
-        "oidc_state={}; Path=/admin/oidc; HttpOnly; Secure; SameSite=Lax; Max-Age=600",
-        state,
-    );
+    let state_cookie = oidc_state_cookie(&state, 600);
 
     Redirect::new(redirect_url)
         .into_response()?
@@ -692,18 +720,18 @@ async fn oidc_callback(request: Request, session: Session, db: Database) -> cot:
     let lang = detect_lang(&request);
     let fail = |code: &str| format!("/admin/login?lang={}&error={}", lang.code(), code);
 
-    // Read saved state from cookie
-    let saved_state = request
-        .headers()
-        .get("cookie")
-        .and_then(|v| v.to_str().ok())
-        .and_then(|cookies| {
-            cookies.split(';').find_map(|part| {
-                let part = part.trim();
-                part.strip_prefix("oidc_state=").map(|v| v.to_string())
-            })
-        })
-        .unwrap_or_default();
+    // Prefer the server-side session; keep the cookie as a compatibility
+    // fallback for flows started before this code was deployed.
+    let saved_state_from_session = session
+        .get::<String>(SESSION_OIDC_STATE)
+        .await
+        .ok()
+        .flatten();
+    let saved_state_from_cookie = get_cookie(&request, "oidc_state");
+    let saved_state = saved_state_from_session
+        .as_deref()
+        .or(saved_state_from_cookie.as_deref())
+        .unwrap_or("");
 
     // Extract code and state from query string
     let query_str = request.uri().query().unwrap_or("");
@@ -719,12 +747,20 @@ async fn oidc_callback(request: Request, session: Session, db: Database) -> cot:
 
     if code.is_empty() || state.is_empty() || state != saved_state {
         tracing::warn!(
-            "OIDC state mismatch: state={state:?}, saved={saved_state:?}, code_empty={}, state_empty={}",
-            code.is_empty(),
-            state.is_empty(),
+            target: "oidc",
+            has_session_state = saved_state_from_session.is_some(),
+            has_cookie_state = saved_state_from_cookie.is_some(),
+            code_empty = code.is_empty(),
+            state_empty = state.is_empty(),
+            "OIDC state mismatch",
         );
-        return Redirect::new(fail("sso")).into_response();
+        let clear_cookie = oidc_state_cookie("", 0);
+        return Redirect::new(fail("sso"))
+            .into_response()?
+            .with_header("set-cookie", clear_cookie)
+            .into_response();
     }
+    let _ = session.remove::<String>(SESSION_OIDC_STATE).await;
 
     let issuer_url = oidc_setting(&db, "oidc_issuer_url").await?;
     let client_id = oidc_setting(&db, "oidc_client_id").await?;
@@ -886,7 +922,7 @@ async fn oidc_callback(request: Request, session: Session, db: Database) -> cot:
     session.insert(SESSION_USER_NAME, session_name).await?;
 
     // Clear the oidc_state cookie
-    let clear_cookie = "oidc_state=; Path=/admin/oidc; HttpOnly; Secure; SameSite=Lax; Max-Age=0";
+    let clear_cookie = oidc_state_cookie("", 0);
     Redirect::new(format!("/admin/?lang={}", lang.code()))
         .into_response()?
         .with_header("set-cookie", clear_cookie)
@@ -907,8 +943,10 @@ async fn admin_index(request: Request, session: Session, db: Database) -> cot::R
     let tz = crate::tz::load_tz(&db).await;
     let today = crate::tz::today_in_tz(tz);
 
-    let all_visits = Visit::objects().all(&db).await?;
-    let clients = Client::objects().all(&db).await?;
+    let mut all_visits = Visit::objects().all(&db).await?;
+    all_visits.retain(|v| v.status != "deleted");
+    let mut clients = Client::objects().all(&db).await?;
+    clients.retain(|c| c.status != "deleted");
 
     let mut today_visits: Vec<TodayVisit> = all_visits
         .iter()
@@ -1010,11 +1048,12 @@ async fn clients_page(request: Request, session: Session, db: Database) -> cot::
         Err(resp) => return Ok(resp),
     };
     let show_all = has_query_flag(&request, "all");
-    let clients = if show_all {
+    let mut clients = if show_all {
         Client::objects().all(&db).await?
     } else {
         query!(Client, $status == "active").all(&db).await?
     };
+    clients.retain(|c| c.status != "deleted");
     let body = ClientsTemplate {
         t: lang.t(),
         lang,
@@ -1428,6 +1467,24 @@ async fn client_activate(
     Redirect::new(format!("/admin/clients?lang={}", lang.code())).into_response()
 }
 
+async fn client_delete(
+    request: Request,
+    session: Session,
+    db: Database,
+    Path(client_id): Path<i64>,
+) -> cot::Result<Response> {
+    let lang = detect_lang(&request);
+    if let Err(resp) = require_auth(&session, lang).await {
+        return Ok(resp);
+    }
+    if let Some(mut client) = query!(Client, $id == client_id).get(&db).await? {
+        client.status = "deleted".to_string();
+        client.updated_at = now_utc();
+        client.save(&db).await?;
+    }
+    Redirect::new(format!("/admin/clients?lang={}", lang.code())).into_response()
+}
+
 async fn user_archive(
     request: Request,
     session: Session,
@@ -1645,12 +1702,18 @@ async fn schedule_events(
 
     let mut events = Vec::new();
     for v in &visits {
+        if v.status == "deleted" {
+            continue;
+        }
         if v.visit_date < start_date || v.visit_date > end_date {
             continue;
         }
         let client_id_val: i64 = v.client_id.primary_key().unwrap();
         let user_id_val: i64 = v.user_id.primary_key().unwrap();
         let client = clients.iter().find(|c| c.id.unwrap() == client_id_val);
+        if client.map(|c| c.status.as_str()) == Some("deleted") {
+            continue;
+        }
         let user = users.iter().find(|u| u.id.unwrap() == user_id_val);
         let client_name = client.map(|c| c.name.as_str()).unwrap_or("?");
         let client_phone = client.and_then(|c| c.phone.as_deref()).unwrap_or("");
@@ -1774,7 +1837,16 @@ async fn schedule_edit_page(
             return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
         }
     };
-    let clients = query!(Client, $status == "active").all(&db).await?;
+    if visit.status == "deleted" {
+        return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+    }
+    let client_id: i64 = visit.client_id.primary_key().unwrap();
+    let client = match query!(Client, $id == client_id).get(&db).await? {
+        Some(c) => c,
+        None => {
+            return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+        }
+    };
     let users = query!(User, $status == "active").all(&db).await?;
     let mut visit_media = Media::objects().all(&db).await?;
     visit_media.retain(|m| {
@@ -1790,7 +1862,7 @@ async fn schedule_edit_page(
         lang,
         admin_name: &admin_name,
         visit,
-        clients,
+        client,
         users,
         media: visit_media,
     }
@@ -1800,7 +1872,6 @@ async fn schedule_edit_page(
 
 #[derive(Deserialize)]
 struct EditVisitForm {
-    client_id: i64,
     user_id: i64,
     visit_date: String,
     time_start: String,
@@ -1821,7 +1892,9 @@ async fn schedule_edit_submit(
         return Ok(resp);
     }
     if let Some(mut visit) = query!(Visit, $id == visit_id).get(&db).await? {
-        visit.client_id = ForeignKey::PrimaryKey(Auto::fixed(form.client_id));
+        if visit.status == "deleted" {
+            return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+        }
         visit.user_id = ForeignKey::PrimaryKey(Auto::fixed(form.user_id));
         if let Ok(d) = chrono::NaiveDate::parse_from_str(&form.visit_date, "%Y-%m-%d") {
             visit.visit_date = d;
@@ -1847,7 +1920,11 @@ async fn visit_delete(
     if let Err(resp) = require_auth(&session, lang).await {
         return Ok(resp);
     }
-    query!(Visit, $id == visit_id).delete(&db).await?;
+    if let Some(mut visit) = query!(Visit, $id == visit_id).get(&db).await? {
+        visit.status = "deleted".to_string();
+        visit.updated_at = now_utc();
+        visit.save(&db).await?;
+    }
     Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response()
 }
 
@@ -1862,6 +1939,9 @@ async fn visit_set_done(
         return Ok(resp);
     }
     if let Some(mut visit) = query!(Visit, $id == visit_id).get(&db).await? {
+        if visit.status == "deleted" {
+            return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+        }
         visit.status = "completed".to_string();
         visit.updated_at = now_utc();
         visit.save(&db).await?;
@@ -1880,6 +1960,9 @@ async fn visit_set_cancel(
         return Ok(resp);
     }
     if let Some(mut visit) = query!(Visit, $id == visit_id).get(&db).await? {
+        if visit.status == "deleted" {
+            return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+        }
         visit.status = "cancelled".to_string();
         visit.updated_at = now_utc();
         visit.save(&db).await?;
@@ -1909,16 +1992,40 @@ async fn media_page(request: Request, session: Session, db: Database) -> cot::Re
         })
         .unwrap_or(0);
 
+    let clients_all = Client::objects().all(&db).await?;
+    let visits_all = Visit::objects().all(&db).await?;
     let mut media_list = Media::objects().all(&db).await?;
-    media_list.retain(|m| m.status == "active");
+    media_list.retain(|m| {
+        if m.status != "active" {
+            return false;
+        }
+        let cid: i64 = m.client_id.primary_key().unwrap();
+        if clients_all
+            .iter()
+            .find(|c| c.id.unwrap() == cid)
+            .map(|c| c.status.as_str())
+            == Some("deleted")
+        {
+            return false;
+        }
+        if let Some(fk) = &m.visit_id {
+            let vid: i64 = fk.primary_key().unwrap();
+            if visits_all
+                .iter()
+                .find(|v| v.id.unwrap() == vid)
+                .map(|v| v.status.as_str())
+                == Some("deleted")
+            {
+                return false;
+            }
+        }
+        true
+    });
     if filter_client_id > 0 {
         media_list.retain(|m| m.client_id.primary_key().unwrap() == filter_client_id);
     }
     media_list.sort_by(|a, b| b.created_at.cmp(&a.created_at));
 
-    let clients_all = Client::objects().all(&db).await?;
-    let visits_all = Visit::objects().all(&db).await?;
-
     let items: Vec<MediaItem> = media_list
         .into_iter()
         .map(|m| {
@@ -1972,6 +2079,9 @@ async fn media_upload_page(
         Some(v) => v,
         None => return Redirect::new(format!("/admin/?lang={}", lang.code())).into_response(),
     };
+    if visit.status == "deleted" {
+        return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+    }
     let cid: i64 = visit.client_id.primary_key().unwrap();
     let client = query!(Client, $id == cid).get(&db).await?;
     let client_name = client.map(|c| c.name).unwrap_or_default();
@@ -2020,6 +2130,9 @@ async fn media_upload_submit(
         Some(v) => v,
         None => return Redirect::new(format!("/admin/?lang={}", lang.code())).into_response(),
     };
+    if visit.status == "deleted" {
+        return Redirect::new(format!("/admin/schedule?lang={}", lang.code())).into_response();
+    }
     let client_id: i64 = visit.client_id.primary_key().unwrap();
 
     let bytes = request.into_body().into_bytes().await?;
@@ -2027,8 +2140,8 @@ async fn media_upload_submit(
         futures::stream::once(async move { Result::<_, std::convert::Infallible>::Ok(bytes) });
     let mut multipart = multer::Multipart::new(stream, boundary);
 
-    let upload_dir = format!("uploads/{}/{}", client_id, visit_id);
-    tokio::fs::create_dir_all(&upload_dir)
+    let upload_dir = crate::uploads::media_dir(client_id, visit_id);
+    crate::uploads::create_logical_dir(&upload_dir)
         .await
         .map_err(|e| cot::Error::internal(e.to_string()))?;
 
@@ -2080,8 +2193,8 @@ async fn media_upload_submit(
             let file_path = if file_type == "photo" {
                 save_uploaded_image(&upload_dir, file_id, &ext, &data).await?
             } else {
-                let path = format!("{}/{}.{}", upload_dir, file_id, ext);
-                tokio::fs::write(&path, &data)
+                let path = crate::uploads::join_db_path(&upload_dir, &format!("{file_id}.{ext}"));
+                crate::uploads::write_db_file(&path, &data)
                     .await
                     .map_err(|e| cot::Error::internal(e.to_string()))?;
                 path
@@ -2138,7 +2251,16 @@ async fn media_delete(
         let file_path = m.file_path.clone();
         m.status = "archived".to_string();
         m.save(&db).await?;
-        let _ = tokio::fs::remove_file(&file_path).await;
+        if let Err(err) = crate::uploads::remove_db_file(&file_path).await {
+            tracing::warn!(
+                target: "uploads",
+                media_id,
+                db_path = %file_path,
+                resolved_path = %crate::uploads::resolved_display_path(&file_path),
+                error = %err,
+                "failed to remove uploaded file"
+            );
+        }
     }
     let redirect_url = referer
         .filter(|r| r.contains("/schedule/") && r.contains("/edit"))
@@ -2163,7 +2285,7 @@ async fn serve_upload(
         None => return Html::new("404").into_response(),
     };
 
-    match tokio::fs::read(&media.file_path).await {
+    match crate::uploads::read_db_file(&media.file_path).await {
         Ok(data) => {
             let content_type = match media.file_path.rsplit('.').next().unwrap_or("") {
                 "jpg" | "jpeg" => "image/jpeg",
@@ -2183,7 +2305,17 @@ async fn serve_upload(
                 .insert("content-type", content_type.parse().unwrap());
             Ok(resp)
         }
-        Err(_) => Html::new("404").into_response(),
+        Err(err) => {
+            tracing::warn!(
+                target: "uploads",
+                media_id,
+                db_path = %media.file_path,
+                resolved_path = %crate::uploads::resolved_display_path(&media.file_path),
+                error = %err,
+                "uploaded file is missing or unreadable"
+            );
+            Html::new("404").into_response()
+        }
     }
 }
 
@@ -2290,12 +2422,12 @@ async fn testimonial_add(
                 if data.is_empty() {
                     continue;
                 }
-                let upload_dir = "uploads/testimonials";
-                tokio::fs::create_dir_all(upload_dir)
+                let upload_dir = crate::uploads::testimonials_dir();
+                crate::uploads::create_logical_dir(&upload_dir)
                     .await
                     .map_err(|e| cot::Error::internal(e.to_string()))?;
                 let file_id = uuid::Uuid::new_v4();
-                let path = save_uploaded_image(upload_dir, file_id, &ext, &data).await?;
+                let path = save_uploaded_image(&upload_dir, file_id, &ext, &data).await?;
                 image_path = Some(path);
             }
             _ => {}
@@ -2438,12 +2570,12 @@ async fn testimonial_edit(
                 if data.is_empty() {
                     continue;
                 }
-                let upload_dir = "uploads/testimonials";
-                tokio::fs::create_dir_all(upload_dir)
+                let upload_dir = crate::uploads::testimonials_dir();
+                crate::uploads::create_logical_dir(&upload_dir)
                     .await
                     .map_err(|e| cot::Error::internal(e.to_string()))?;
                 let file_id = uuid::Uuid::new_v4();
-                let path = save_uploaded_image(upload_dir, file_id, &ext, &data).await?;
+                let path = save_uploaded_image(&upload_dir, file_id, &ext, &data).await?;
                 new_image_path = Some(path);
             }
             _ => {}
@@ -2484,7 +2616,7 @@ async fn serve_testimonial_image(
         Some(p) => p.clone(),
         None => return Html::new("404").into_response(),
     };
-    match tokio::fs::read(&path).await {
+    match crate::uploads::read_db_file(&path).await {
         Ok(data) => {
             let content_type = match path.rsplit('.').next().unwrap_or("") {
                 "jpg" | "jpeg" => "image/jpeg",
@@ -2499,7 +2631,17 @@ async fn serve_testimonial_image(
                 .insert("content-type", content_type.parse().unwrap());
             Ok(resp)
         }
-        Err(_) => Html::new("404").into_response(),
+        Err(err) => {
+            tracing::warn!(
+                target: "uploads",
+                testimonial_id = id,
+                db_path = %path,
+                resolved_path = %crate::uploads::resolved_display_path(&path),
+                error = %err,
+                "testimonial image is missing or unreadable"
+            );
+            Html::new("404").into_response()
+        }
     }
 }
 
@@ -2555,6 +2697,11 @@ pub fn admin_router() -> Router {
             client_activate,
             "admin-client-activate",
         ),
+        Route::with_handler_and_name(
+            "/clients/{client_id}/delete",
+            client_delete,
+            "admin-client-delete",
+        ),
         Route::with_handler_and_name("/schedule", schedule_page, "admin-schedule"),
         Route::with_handler_and_name("/schedule/new", schedule_new_page, "admin-schedule-new"),
         Route::with_handler_and_name("/schedule/events", schedule_events, "admin-schedule-events"),

src/i18n.rs

@@ -103,8 +103,11 @@ pub struct Translations {
     pub clients_media_link: &'static str,
     pub clients_add_title: &'static str,
     pub clients_add_button: &'static str,
+    pub clients_delete: &'static str,
+    pub clients_delete_confirm: &'static str,
     pub client_status_active: &'static str,
     pub client_status_archived: &'static str,
+    pub client_status_deleted: &'static str,
 
     // Users
     pub users_title: &'static str,
@@ -256,6 +259,7 @@ pub struct Translations {
     pub visit_status_scheduled: &'static str,
     pub visit_status_completed: &'static str,
     pub visit_status_cancelled: &'static str,
+    pub visit_status_deleted: &'static str,
     pub schedule_mark_done: &'static str,
     pub schedule_cancel: &'static str,
     pub schedule_edit_title: &'static str,
@@ -336,8 +340,11 @@ static RU: Translations = Translations {
     clients_media_link: "Медиа",
     clients_add_title: "Добавить клиента",
     clients_add_button: "Добавить",
+    clients_delete: "Удалить клиента",
+    clients_delete_confirm: "Точно удалить этого клиента?",
     client_status_active: "Активный",
     client_status_archived: "Архив",
+    client_status_deleted: "Удалён",
 
     users_title: "Администраторы",
     users_login: "Логин",
@@ -453,6 +460,7 @@ static RU: Translations = Translations {
     visit_status_scheduled: "Запланирован",
     visit_status_completed: "Выполнен",
     visit_status_cancelled: "Отменён",
+    visit_status_deleted: "Удалён",
     schedule_mark_done: "Выполнен",
     schedule_cancel: "Отменить",
     schedule_edit_title: "Редактировать визит",
@@ -557,8 +565,11 @@ static EN: Translations = Translations {
     clients_media_link: "Media",
     clients_add_title: "Add Client",
     clients_add_button: "Add",
+    clients_delete: "Delete client",
+    clients_delete_confirm: "Are you sure you want to delete this client?",
     client_status_active: "Active",
     client_status_archived: "Archived",
+    client_status_deleted: "Deleted",
 
     users_title: "Administrators",
     users_login: "Login",
@@ -674,6 +685,7 @@ static EN: Translations = Translations {
     visit_status_scheduled: "Scheduled",
     visit_status_completed: "Completed",
     visit_status_cancelled: "Cancelled",
+    visit_status_deleted: "Deleted",
     schedule_mark_done: "Done",
     schedule_cancel: "Cancel",
     schedule_edit_title: "Edit Visit",
@@ -760,6 +772,7 @@ impl Translations {
             "scheduled" => self.visit_status_scheduled,
             "completed" => self.visit_status_completed,
             "cancelled" => self.visit_status_cancelled,
+            "deleted" => self.visit_status_deleted,
             _ => "?",
         }
     }
@@ -768,6 +781,7 @@ impl Translations {
         match status {
             "active" => self.client_status_active,
             "archived" => self.client_status_archived,
+            "deleted" => self.client_status_deleted,
             _ => "?",
         }
     }

src/main.rs

@@ -6,6 +6,7 @@ mod public;
 mod telegram;
 mod turnstile;
 mod tz;
+mod uploads;
 
 use tracing_subscriber;
 
@@ -51,19 +52,39 @@ impl App for PublicApp {
 
 struct PettingProject;
 
+fn parse_bool_env(name: &str) -> Option<bool> {
+    let value = std::env::var(name).ok()?;
+    match value.trim().to_ascii_lowercase().as_str() {
+        "1" | "true" | "yes" | "on" => Some(true),
+        "0" | "false" | "no" | "off" => Some(false),
+        _ => None,
+    }
+}
+
+fn debug_enabled(config_name: &str) -> bool {
+    parse_bool_env("WEB_PETTING_DEBUG").unwrap_or_else(|| {
+        matches!(
+            config_name,
+            "dev" | "development" | "debug" | "local" | "test"
+        )
+    })
+}
+
+fn database_url() -> String {
+    std::env::var("WEB_PETTING_DATABASE_URL")
+        .or_else(|_| std::env::var("DATABASE_URL"))
+        .unwrap_or_else(|_| "postgresql://postgres:postgres@localhost:5432/web_petting".to_string())
+}
+
 impl Project for PettingProject {
     fn cli_metadata(&self) -> CliMetadata {
         cot::cli::metadata!()
     }
 
-    fn config(&self, _config_name: &str) -> cot::Result<ProjectConfig> {
+    fn config(&self, config_name: &str) -> cot::Result<ProjectConfig> {
         Ok(ProjectConfig::builder()
-            .debug(true)
-            .database(
-                DatabaseConfig::builder()
-                    .url("sqlite://db.sqlite3?mode=rwc")
-                    .build(),
-            )
+            .debug(debug_enabled(config_name))
+            .database(DatabaseConfig::builder().url(database_url()).build())
             .middlewares(
                 MiddlewareConfig::builder()
                     .session(
@@ -103,8 +124,6 @@ impl Project for PettingProject {
 fn main() -> impl Project {
     let filter = tracing_subscriber::EnvFilter::try_from_default_env()
         .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new("info"));
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(filter)
-        .try_init();
+    let _ = tracing_subscriber::fmt().with_env_filter(filter).try_init();
     PettingProject
 }

src/migrations.rs

@@ -1,19 +1,7 @@
 //! List of migrations for the current app.
 //!
-//! Generated by cot CLI 0.6.0 on 2026-04-29 10:36:47+00:00
+//! Squashed for the PostgreSQL migration on 2026-07-11.
 
 pub mod m_0001_initial;
-pub mod m_0002_visit_schedule;
-pub mod m_0003_visit_feedback;
-pub mod m_0004_visit_public_notes;
-pub mod m_0005_testimonials;
-pub mod m_0006_user_telegram;
 /// The list of migrations for current app.
-pub const MIGRATIONS: &[&::cot::db::migrations::SyncDynMigration] = &[
-    &m_0001_initial::Migration,
-    &m_0002_visit_schedule::Migration,
-    &m_0003_visit_feedback::Migration,
-    &m_0004_visit_public_notes::Migration,
-    &m_0005_testimonials::Migration,
-    &m_0006_user_telegram::Migration,
-];
+pub const MIGRATIONS: &[&::cot::db::migrations::SyncDynMigration] = &[&m_0001_initial::Migration];

src/migrations/m_0001_initial.rs

@@ -1,7 +1,8 @@
-//! Generated by cot CLI 0.6.0 on 2026-04-29 10:36:47+00:00
+//! Initial PostgreSQL schema for the current data model.
 
 #[derive(Debug, Copy, Clone)]
 pub(super) struct Migration;
+
 impl ::cot::db::migrations::Migration for Migration {
     const APP_NAME: &'static str = "web-petting";
     const MIGRATION_NAME: &'static str = "m_0001_initial";
@@ -9,479 +10,395 @@ impl ::cot::db::migrations::Migration for Migration {
     const OPERATIONS: &'static [::cot::db::migrations::Operation] = &[
         ::cot::db::migrations::Operation::create_model()
             .table_name(::cot::db::Identifier::new("web_petting__user"))
-            .fields(
-                &[
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("id"),
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .auto()
-                        .primary_key()
-                        .set_null(
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("login"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
-                        .unique(),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("password_hash"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("display_name"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("status"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("created_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("updated_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                ],
-            )
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("login"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
+                .unique(),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("password_hash"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("display_name"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("telegram_chat_id"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("telegram_notifications"),
+                    <Option<bool> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<bool> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("status"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("created_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("updated_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
             .build(),
         ::cot::db::migrations::Operation::create_model()
             .table_name(::cot::db::Identifier::new("web_petting__setting"))
-            .fields(
-                &[
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("id"),
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .auto()
-                        .primary_key()
-                        .set_null(
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("key"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
-                        .unique(),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("value"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("updated_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                ],
-            )
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("key"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
+                .unique(),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("value"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("updated_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
             .build(),
         ::cot::db::migrations::Operation::create_model()
             .table_name(::cot::db::Identifier::new("web_petting__client"))
-            .fields(
-                &[
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("id"),
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .auto()
-                        .primary_key()
-                        .set_null(
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("name"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("phone"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("email"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("address"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("notes"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("media_token"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
-                        .unique(),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("status"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("created_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("updated_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                ],
-            )
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("name"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("phone"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("email"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("address"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("notes"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("media_token"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
+                .unique(),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("color"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("status"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("created_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("updated_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
+            .build(),
+        ::cot::db::migrations::Operation::create_model()
+            .table_name(::cot::db::Identifier::new("web_petting__testimonial"))
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("text"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("author_note"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("image_path"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("status"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("sort_order"),
+                    <i32 as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<i32 as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("created_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
             .build(),
         ::cot::db::migrations::Operation::create_model()
             .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .fields(
-                &[
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("id"),
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .auto()
-                        .primary_key()
-                        .set_null(
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("client_id"),
-                            <cot::db::ForeignKey<
-                                crate::models::Client,
-                            > as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .foreign_key(
-                            <crate::models::Client as ::cot::db::Model>::TABLE_NAME,
-                            <crate::models::Client as ::cot::db::Model>::PRIMARY_KEY_NAME,
-                            ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
-                            ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
-                        )
-                        .set_null(
-                            <cot::db::ForeignKey<
-                                crate::models::Client,
-                            > as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("scheduled_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("duration_minutes"),
-                            <Option<i32> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<Option<i32> as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("notes"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("status"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("created_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("updated_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                ],
-            )
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("client_id"),
+                    <cot::db::ForeignKey<crate::models::Client> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .foreign_key(
+                    <crate::models::Client as ::cot::db::Model>::TABLE_NAME,
+                    <crate::models::Client as ::cot::db::Model>::PRIMARY_KEY_NAME,
+                    ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
+                    ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
+                )
+                .set_null(
+                    <cot::db::ForeignKey<crate::models::Client> as ::cot::db::DatabaseField>::NULLABLE,
+                ),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("user_id"),
+                    <cot::db::ForeignKey<crate::models::User> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .foreign_key(
+                    <crate::models::User as ::cot::db::Model>::TABLE_NAME,
+                    <crate::models::User as ::cot::db::Model>::PRIMARY_KEY_NAME,
+                    ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
+                    ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
+                )
+                .set_null(
+                    <cot::db::ForeignKey<crate::models::User> as ::cot::db::DatabaseField>::NULLABLE,
+                ),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("visit_date"),
+                    <chrono::NaiveDate as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDate as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("time_start"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("time_end"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("notes"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("public_notes"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("client_feedback"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("status"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("created_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("updated_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
             .build(),
         ::cot::db::migrations::Operation::create_model()
             .table_name(::cot::db::Identifier::new("web_petting__media"))
-            .fields(
-                &[
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("id"),
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .auto()
-                        .primary_key()
-                        .set_null(
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("client_id"),
-                            <cot::db::ForeignKey<
-                                crate::models::Client,
-                            > as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .foreign_key(
-                            <crate::models::Client as ::cot::db::Model>::TABLE_NAME,
-                            <crate::models::Client as ::cot::db::Model>::PRIMARY_KEY_NAME,
-                            ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
-                            ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
-                        )
-                        .set_null(
-                            <cot::db::ForeignKey<
-                                crate::models::Client,
-                            > as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("visit_id"),
-                            <Option<
-                                cot::db::ForeignKey<crate::models::Visit>,
-                            > as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .foreign_key(
-                            <crate::models::Visit as ::cot::db::Model>::TABLE_NAME,
-                            <crate::models::Visit as ::cot::db::Model>::PRIMARY_KEY_NAME,
-                            ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
-                            ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
-                        )
-                        .set_null(
-                            <Option<
-                                cot::db::ForeignKey<crate::models::Visit>,
-                            > as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("file_path"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("file_type"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("caption"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("status"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("created_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                ],
-            )
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("client_id"),
+                    <cot::db::ForeignKey<crate::models::Client> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .foreign_key(
+                    <crate::models::Client as ::cot::db::Model>::TABLE_NAME,
+                    <crate::models::Client as ::cot::db::Model>::PRIMARY_KEY_NAME,
+                    ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
+                    ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
+                )
+                .set_null(
+                    <cot::db::ForeignKey<crate::models::Client> as ::cot::db::DatabaseField>::NULLABLE,
+                ),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("visit_id"),
+                    <Option<cot::db::ForeignKey<crate::models::Visit>> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .foreign_key(
+                    <crate::models::Visit as ::cot::db::Model>::TABLE_NAME,
+                    <crate::models::Visit as ::cot::db::Model>::PRIMARY_KEY_NAME,
+                    ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
+                    ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
+                )
+                .set_null(
+                    <Option<cot::db::ForeignKey<crate::models::Visit>> as ::cot::db::DatabaseField>::NULLABLE,
+                ),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("file_path"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("file_type"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("caption"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("status"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("created_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
             .build(),
         ::cot::db::migrations::Operation::create_model()
             .table_name(::cot::db::Identifier::new("web_petting__lead"))
-            .fields(
-                &[
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("id"),
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .auto()
-                        .primary_key()
-                        .set_null(
-                            <cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("name"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("phone"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("email"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("comment"),
-                            <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <Option<String> as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("status"),
-                            <String as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("client_id"),
-                            <Option<
-                                cot::db::ForeignKey<crate::models::Client>,
-                            > as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .foreign_key(
-                            <crate::models::Client as ::cot::db::Model>::TABLE_NAME,
-                            <crate::models::Client as ::cot::db::Model>::PRIMARY_KEY_NAME,
-                            ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
-                            ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
-                        )
-                        .set_null(
-                            <Option<
-                                cot::db::ForeignKey<crate::models::Client>,
-                            > as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("created_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                    ::cot::db::migrations::Field::new(
-                            ::cot::db::Identifier::new("updated_at"),
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                        )
-                        .set_null(
-                            <chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE,
-                        ),
-                ],
-            )
+            .fields(&[
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("id"),
+                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .auto()
+                .primary_key()
+                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("name"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("phone"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("email"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("comment"),
+                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("status"),
+                    <String as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("client_id"),
+                    <Option<cot::db::ForeignKey<crate::models::Client>> as ::cot::db::DatabaseField>::TYPE,
+                )
+                .foreign_key(
+                    <crate::models::Client as ::cot::db::Model>::TABLE_NAME,
+                    <crate::models::Client as ::cot::db::Model>::PRIMARY_KEY_NAME,
+                    ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
+                    ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
+                )
+                .set_null(
+                    <Option<cot::db::ForeignKey<crate::models::Client>> as ::cot::db::DatabaseField>::NULLABLE,
+                ),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("created_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+                ::cot::db::migrations::Field::new(
+                    ::cot::db::Identifier::new("updated_at"),
+                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
+                )
+                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
+            ])
             .build(),
     ];
 }
-
-#[derive(::core::fmt::Debug)]
-#[::cot::db::model(model_type = "migration")]
-struct _Client {
-    #[model(primary_key)]
-    pub id: cot::db::Auto<i64>,
-    pub name: String,
-    pub phone: Option<String>,
-    pub email: Option<String>,
-    pub address: Option<String>,
-    pub notes: Option<String>,
-    /// Unique token for the public media page (client views photos/videos here).
-    #[model(unique)]
-    pub media_token: String,
-    /// active | archived
-    pub status: String,
-    pub created_at: chrono::NaiveDateTime,
-    pub updated_at: chrono::NaiveDateTime,
-}
-#[derive(::core::fmt::Debug)]
-#[::cot::db::model(model_type = "migration")]
-struct _Lead {
-    #[model(primary_key)]
-    pub id: cot::db::Auto<i64>,
-    pub name: String,
-    pub phone: Option<String>,
-    pub email: Option<String>,
-    pub comment: Option<String>,
-    /// new | in_progress | converted | rejected
-    pub status: String,
-    pub client_id: Option<cot::db::ForeignKey<crate::models::Client>>,
-    pub created_at: chrono::NaiveDateTime,
-    pub updated_at: chrono::NaiveDateTime,
-}
-#[derive(::core::fmt::Debug)]
-#[::cot::db::model(model_type = "migration")]
-struct _Media {
-    #[model(primary_key)]
-    pub id: cot::db::Auto<i64>,
-    pub client_id: cot::db::ForeignKey<crate::models::Client>,
-    pub visit_id: Option<cot::db::ForeignKey<crate::models::Visit>>,
-    pub file_path: String,
-    /// photo | video
-    pub file_type: String,
-    pub caption: Option<String>,
-    /// active | archived
-    pub status: String,
-    pub created_at: chrono::NaiveDateTime,
-}
-#[derive(::core::fmt::Debug)]
-#[::cot::db::model(model_type = "migration")]
-struct _Setting {
-    #[model(primary_key)]
-    pub id: cot::db::Auto<i64>,
-    #[model(unique)]
-    pub key: String,
-    pub value: String,
-    pub updated_at: chrono::NaiveDateTime,
-}
-#[derive(::core::fmt::Debug)]
-#[::cot::db::model(model_type = "migration")]
-struct _User {
-    #[model(primary_key)]
-    pub id: cot::db::Auto<i64>,
-    #[model(unique)]
-    pub login: String,
-    pub password_hash: String,
-    pub display_name: Option<String>,
-    /// active | archived
-    pub status: String,
-    pub created_at: chrono::NaiveDateTime,
-    pub updated_at: chrono::NaiveDateTime,
-}
-#[derive(::core::fmt::Debug)]
-#[::cot::db::model(model_type = "migration")]
-struct _Visit {
-    #[model(primary_key)]
-    pub id: cot::db::Auto<i64>,
-    pub client_id: cot::db::ForeignKey<crate::models::Client>,
-    pub scheduled_at: chrono::NaiveDateTime,
-    pub duration_minutes: Option<i32>,
-    pub notes: Option<String>,
-    /// scheduled | completed | cancelled
-    pub status: String,
-    pub created_at: chrono::NaiveDateTime,
-    pub updated_at: chrono::NaiveDateTime,
-}

src/migrations/m_0002_visit_schedule.rs

@@ -1,90 +0,0 @@
-//! Migration: update Visit model for scheduling + add Client.color
-//! Visit: Remove scheduled_at, duration_minutes; Add user_id, visit_date, time_start, time_end
-//! Client: Add color
-
-#[derive(Debug, Copy, Clone)]
-pub(super) struct Migration;
-impl ::cot::db::migrations::Migration for Migration {
-    const APP_NAME: &'static str = "web-petting";
-    const MIGRATION_NAME: &'static str = "m_0002_visit_schedule";
-    const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] =
-        &[::cot::db::migrations::MigrationDependency::migration(
-            "web-petting",
-            "m_0001_initial",
-        )];
-    const OPERATIONS: &'static [::cot::db::migrations::Operation] = &[
-        // Add color to client (nullable for existing rows)
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__client"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("color"),
-                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE)
-            )
-            .build(),
-        // Remove old visit fields
-        ::cot::db::migrations::Operation::remove_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(::cot::db::migrations::Field::new(
-                ::cot::db::Identifier::new("scheduled_at"),
-                <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-            ))
-            .build(),
-        ::cot::db::migrations::Operation::remove_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(::cot::db::migrations::Field::new(
-                ::cot::db::Identifier::new("duration_minutes"),
-                <Option<i32> as ::cot::db::DatabaseField>::TYPE,
-            ).set_null(<Option<i32> as ::cot::db::DatabaseField>::NULLABLE))
-            .build(),
-        // Add new fields
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("user_id"),
-                    <cot::db::ForeignKey<crate::models::User> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .foreign_key(
-                    <crate::models::User as ::cot::db::Model>::TABLE_NAME,
-                    <crate::models::User as ::cot::db::Model>::PRIMARY_KEY_NAME,
-                    ::cot::db::ForeignKeyOnDeletePolicy::Restrict,
-                    ::cot::db::ForeignKeyOnUpdatePolicy::Restrict,
-                )
-                .set_null(<cot::db::ForeignKey<crate::models::User> as ::cot::db::DatabaseField>::NULLABLE)
-            )
-            .build(),
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("visit_date"),
-                    <chrono::NaiveDate as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<chrono::NaiveDate as ::cot::db::DatabaseField>::NULLABLE)
-            )
-            .build(),
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("time_start"),
-                    <String as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
-            )
-            .build(),
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("time_end"),
-                    <String as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE)
-            )
-            .build(),
-    ];
-}

src/migrations/m_0003_visit_feedback.rs

@@ -1,24 +0,0 @@
-//! Migration: add client_feedback to Visit
-
-#[derive(Debug, Copy, Clone)]
-pub(super) struct Migration;
-impl ::cot::db::migrations::Migration for Migration {
-    const APP_NAME: &'static str = "web-petting";
-    const MIGRATION_NAME: &'static str = "m_0003_visit_feedback";
-    const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] =
-        &[::cot::db::migrations::MigrationDependency::migration(
-            "web-petting",
-            "m_0002_visit_schedule",
-        )];
-    const OPERATIONS: &'static [::cot::db::migrations::Operation] =
-        &[::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("client_feedback"),
-                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
-            )
-            .build()];
-}

src/migrations/m_0004_visit_public_notes.rs

@@ -1,24 +0,0 @@
-//! Migration: add public_notes to Visit
-
-#[derive(Debug, Copy, Clone)]
-pub(super) struct Migration;
-impl ::cot::db::migrations::Migration for Migration {
-    const APP_NAME: &'static str = "web-petting";
-    const MIGRATION_NAME: &'static str = "m_0004_visit_public_notes";
-    const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] =
-        &[::cot::db::migrations::MigrationDependency::migration(
-            "web-petting",
-            "m_0003_visit_feedback",
-        )];
-    const OPERATIONS: &'static [::cot::db::migrations::Operation] =
-        &[::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__visit"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("public_notes"),
-                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
-            )
-            .build()];
-}

src/migrations/m_0005_testimonials.rs

@@ -1,56 +0,0 @@
-//! Migration: create Testimonial table
-
-#[derive(Debug, Copy, Clone)]
-pub(super) struct Migration;
-impl ::cot::db::migrations::Migration for Migration {
-    const APP_NAME: &'static str = "web-petting";
-    const MIGRATION_NAME: &'static str = "m_0005_testimonials";
-    const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] =
-        &[::cot::db::migrations::MigrationDependency::migration(
-            "web-petting",
-            "m_0004_visit_public_notes",
-        )];
-    const OPERATIONS: &'static [::cot::db::migrations::Operation] =
-        &[::cot::db::migrations::Operation::create_model()
-            .table_name(::cot::db::Identifier::new("web_petting__testimonial"))
-            .fields(&[
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("id"),
-                    <cot::db::Auto<i64> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .auto()
-                .primary_key()
-                .set_null(<cot::db::Auto<i64> as ::cot::db::DatabaseField>::NULLABLE),
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("text"),
-                    <String as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("author_note"),
-                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("image_path"),
-                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("status"),
-                    <String as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<String as ::cot::db::DatabaseField>::NULLABLE),
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("sort_order"),
-                    <i32 as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<i32 as ::cot::db::DatabaseField>::NULLABLE),
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("created_at"),
-                    <chrono::NaiveDateTime as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<chrono::NaiveDateTime as ::cot::db::DatabaseField>::NULLABLE),
-            ])
-            .build()];
-}

src/migrations/m_0006_user_telegram.rs

@@ -1,35 +0,0 @@
-//! Migration: add telegram_chat_id and telegram_notifications to User
-
-#[derive(Debug, Copy, Clone)]
-pub(super) struct Migration;
-impl ::cot::db::migrations::Migration for Migration {
-    const APP_NAME: &'static str = "web-petting";
-    const MIGRATION_NAME: &'static str = "m_0006_user_telegram";
-    const DEPENDENCIES: &'static [::cot::db::migrations::MigrationDependency] =
-        &[::cot::db::migrations::MigrationDependency::migration(
-            "web-petting",
-            "m_0005_testimonials",
-        )];
-    const OPERATIONS: &'static [::cot::db::migrations::Operation] = &[
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__user"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("telegram_chat_id"),
-                    <Option<String> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<String> as ::cot::db::DatabaseField>::NULLABLE),
-            )
-            .build(),
-        ::cot::db::migrations::Operation::add_field()
-            .table_name(::cot::db::Identifier::new("web_petting__user"))
-            .field(
-                ::cot::db::migrations::Field::new(
-                    ::cot::db::Identifier::new("telegram_notifications"),
-                    <Option<bool> as ::cot::db::DatabaseField>::TYPE,
-                )
-                .set_null(<Option<bool> as ::cot::db::DatabaseField>::NULLABLE),
-            )
-            .build(),
-    ];
-}

src/models.rs

@@ -43,6 +43,7 @@ pub enum VisitStatus {
     Scheduled,
     Completed,
     Cancelled,
+    Deleted,
 }
 
 impl VisitStatus {
@@ -51,6 +52,7 @@ impl VisitStatus {
             Self::Scheduled => "scheduled",
             Self::Completed => "completed",
             Self::Cancelled => "cancelled",
+            Self::Deleted => "deleted",
         }
     }
 }
@@ -146,7 +148,7 @@ pub struct Visit {
     pub public_notes: Option<String>,
     /// Feedback text from client via portal.
     pub client_feedback: Option<String>,
-    /// scheduled | completed | cancelled
+    /// scheduled | completed | cancelled | deleted
     pub status: String,
     pub created_at: chrono::NaiveDateTime,
     pub updated_at: chrono::NaiveDateTime,

src/public.rs

@@ -240,7 +240,8 @@ async fn client_portal(
         .unwrap_or(false);
 
     let client = match query!(Client, $media_token == token).get(&db).await? {
-        Some(c) => c,
+        Some(c) if c.status != "deleted" => c,
+        Some(_) => return Html::new("404").into_response(),
         None => return Html::new("404").into_response(),
     };
 
@@ -249,7 +250,11 @@ async fn client_portal(
     let today = crate::tz::today_in_tz(tz);
 
     let mut visits = Visit::objects().all(&db).await?;
-    visits.retain(|v| v.client_id.primary_key().unwrap() == client_id && v.status != "cancelled");
+    visits.retain(|v| {
+        v.client_id.primary_key().unwrap() == client_id
+            && v.status != "cancelled"
+            && v.status != "deleted"
+    });
     visits.sort_by(|a, b| {
         a.visit_date
             .cmp(&b.visit_date)
@@ -271,6 +276,7 @@ async fn client_portal(
             .iter()
             .filter(|m| {
                 m.status == "active"
+                    && m.client_id.primary_key().unwrap() == client_id
                     && m.visit_id
                         .as_ref()
                         .map(|fk| fk.primary_key().unwrap() == vid)
@@ -327,7 +333,8 @@ async fn submit_feedback(
     // Verify token matches visit's client
     let token_clone = token.clone();
     let client = match query!(Client, $media_token == token).get(&db).await? {
-        Some(c) => c,
+        Some(c) if c.status != "deleted" => c,
+        Some(_) => return Html::new("404").into_response(),
         None => return Html::new("404").into_response(),
     };
     let client_id = client.id.unwrap();
@@ -337,15 +344,15 @@ async fn submit_feedback(
         serde_html_form::from_bytes(&bytes).map_err(|e| cot::Error::internal(e.to_string()))?;
 
     if !crate::turnstile::verify(&db, form.cf_turnstile_response.as_deref()).await? {
-        return Redirect::new(format!(
-            "/client/{}?lang={}",
-            token_clone,
-            lang.code()
-        ))
-        .into_response();
+        return Redirect::new(format!("/client/{}?lang={}", token_clone, lang.code()))
+            .into_response();
     }
 
     if let Some(mut visit) = query!(Visit, $id == visit_id).get(&db).await? {
+        if visit.status == "deleted" {
+            return Redirect::new(format!("/client/{}?lang={}", token_clone, lang.code()))
+                .into_response();
+        }
         if visit.client_id.primary_key().unwrap() == client_id {
             visit.client_feedback = Some(form.feedback);
             visit.updated_at = now_utc();
@@ -369,7 +376,8 @@ async fn portal_media(
 ) -> cot::Result<Response> {
     // Verify token
     let client = match query!(Client, $media_token == token).get(&db).await? {
-        Some(c) => c,
+        Some(c) if c.status != "deleted" => c,
+        Some(_) => return Html::new("404").into_response(),
         None => return Html::new("404").into_response(),
     };
     let client_id = client.id.unwrap();
@@ -378,8 +386,15 @@ async fn portal_media(
         Some(m) if m.client_id.primary_key().unwrap() == client_id && m.status == "active" => m,
         _ => return Html::new("404").into_response(),
     };
+    if let Some(fk) = &media.visit_id {
+        let visit_id: i64 = fk.primary_key().unwrap();
+        match query!(Visit, $id == visit_id).get(&db).await? {
+            Some(v) if v.status != "deleted" => {}
+            _ => return Html::new("404").into_response(),
+        }
+    }
 
-    match tokio::fs::read(&media.file_path).await {
+    match crate::uploads::read_db_file(&media.file_path).await {
         Ok(data) => {
             let content_type = match media.file_path.rsplit('.').next().unwrap_or("") {
                 "jpg" | "jpeg" => "image/jpeg",
@@ -399,7 +414,17 @@ async fn portal_media(
                 .insert("content-type", content_type.parse().unwrap());
             Ok(resp)
         }
-        Err(_) => Html::new("404").into_response(),
+        Err(err) => {
+            tracing::warn!(
+                target: "uploads",
+                media_id,
+                db_path = %media.file_path,
+                resolved_path = %crate::uploads::resolved_display_path(&media.file_path),
+                error = %err,
+                "portal media file is missing or unreadable"
+            );
+            Html::new("404").into_response()
+        }
     }
 }
 
@@ -416,7 +441,7 @@ async fn serve_testimonial_image(
         Some(p) => p.clone(),
         None => return Html::new("404").into_response(),
     };
-    match tokio::fs::read(&path).await {
+    match crate::uploads::read_db_file(&path).await {
         Ok(data) => {
             let content_type = match path.rsplit('.').next().unwrap_or("") {
                 "jpg" | "jpeg" => "image/jpeg",
@@ -433,7 +458,17 @@ async fn serve_testimonial_image(
                 .insert("cache-control", "public, max-age=86400".parse().unwrap());
             Ok(resp)
         }
-        Err(_) => Html::new("404").into_response(),
+        Err(err) => {
+            tracing::warn!(
+                target: "uploads",
+                testimonial_id = id,
+                db_path = %path,
+                resolved_path = %crate::uploads::resolved_display_path(&path),
+                error = %err,
+                "testimonial image is missing or unreadable"
+            );
+            Html::new("404").into_response()
+        }
     }
 }
 
@@ -530,8 +565,10 @@ async fn sitemap_xml(_request: Request, db: Database) -> cot::Result<Response> {
         domain = site_domain
     );
     let mut resp = Response::new(cot::Body::fixed(body.into_bytes()));
-    resp.headers_mut()
-        .insert("content-type", "application/xml; charset=utf-8".parse().unwrap());
+    resp.headers_mut().insert(
+        "content-type",
+        "application/xml; charset=utf-8".parse().unwrap(),
+    );
     Ok(resp)
 }
 

src/uploads.rs

@@ -0,0 +1,58 @@
+use std::path::{Path, PathBuf};
+
+const DEFAULT_UPLOAD_DIR: &str = "uploads";
+const UPLOAD_DIR_ENV: &str = "WEB_PETTING_UPLOAD_DIR";
+
+pub fn media_dir(client_id: i64, visit_id: i64) -> String {
+    format!("{DEFAULT_UPLOAD_DIR}/{client_id}/{visit_id}")
+}
+
+pub fn testimonials_dir() -> String {
+    format!("{DEFAULT_UPLOAD_DIR}/testimonials")
+}
+
+pub fn join_db_path(dir: &str, filename: &str) -> String {
+    format!("{}/{}", dir.trim_end_matches('/'), filename)
+}
+
+pub fn resolve_db_path(db_path: &str) -> PathBuf {
+    let path = PathBuf::from(db_path);
+    if path.is_absolute() {
+        return path;
+    }
+
+    let Some(upload_root) = std::env::var_os(UPLOAD_DIR_ENV) else {
+        return path;
+    };
+
+    let upload_root = PathBuf::from(upload_root);
+    let logical_path = Path::new(db_path);
+    match logical_path.strip_prefix(DEFAULT_UPLOAD_DIR) {
+        Ok(stripped) => upload_root.join(stripped),
+        Err(_) => upload_root.join(logical_path),
+    }
+}
+
+pub fn resolved_display_path(db_path: &str) -> String {
+    resolve_db_path(db_path).display().to_string()
+}
+
+pub async fn create_logical_dir(db_dir: &str) -> std::io::Result<()> {
+    tokio::fs::create_dir_all(resolve_db_path(db_dir)).await
+}
+
+pub async fn write_db_file(db_path: &str, data: &[u8]) -> std::io::Result<()> {
+    let physical_path = resolve_db_path(db_path);
+    if let Some(parent) = physical_path.parent() {
+        tokio::fs::create_dir_all(parent).await?;
+    }
+    tokio::fs::write(physical_path, data).await
+}
+
+pub async fn read_db_file(db_path: &str) -> std::io::Result<Vec<u8>> {
+    tokio::fs::read(resolve_db_path(db_path)).await
+}
+
+pub async fn remove_db_file(db_path: &str) -> std::io::Result<()> {
+    tokio::fs::remove_file(resolve_db_path(db_path)).await
+}

templates/admin/client_form.html

@@ -76,11 +76,16 @@
         <form method="post" action="/admin/clients/{{ client_id }}/archive">
             <button type="submit" class="button is-warning is-outlined is-fullwidth">{{ t.action_archive }}</button>
         </form>
-    {% else %}
+    {% else if client_status == "archived" %}
         <form method="post" action="/admin/clients/{{ client_id }}/activate">
             <button type="submit" class="button is-success is-outlined is-fullwidth">{{ t.action_activate }}</button>
         </form>
     {% endif %}
+    {% if client_status != "deleted" %}
+    <form method="post" action="/admin/clients/{{ client_id }}/delete" onsubmit="return confirm('{{ t.clients_delete_confirm }}');" style="margin-top:0.75rem;">
+        <button type="submit" class="button is-danger is-outlined is-fullwidth">{{ t.clients_delete }}</button>
+    </form>
+    {% endif %}
     {% endif %}
 </div>
 {% endblock %}

templates/admin/media.html

@@ -27,11 +27,11 @@
         {% for item in &items %}
         <div class="media-card">
             {% if item.media.file_type == "photo" %}
-                <a href="/admin/uploads/{{ item.media.id }}" data-lightbox="photo">
-                    <img src="/admin/uploads/{{ item.media.id }}" alt="" loading="lazy">
+                <a href="/admin/uploads/{{ item.media.id.unwrap() }}" data-lightbox="photo">
+                    <img src="/admin/uploads/{{ item.media.id.unwrap() }}" alt="" loading="lazy">
                 </a>
             {% else %}
-                <a href="/admin/uploads/{{ item.media.id }}" data-lightbox="video">
+                <a href="/admin/uploads/{{ item.media.id.unwrap() }}" data-lightbox="video">
                     <div class="video-thumb">🎬</div>
                 </a>
             {% endif %}
@@ -45,7 +45,7 @@
                 {% if let Some(cap) = item.media.caption.as_deref() %}
                     <div style="font-size:0.82rem;color:#666;margin-top:0.2rem;">{{ cap }}</div>
                 {% endif %}
-                <form method="post" action="/admin/media/{{ item.media.id }}/delete" onsubmit="return confirm('{{ t.media_delete_confirm }}');" style="margin-top:0.3rem;">
+                <form method="post" action="/admin/media/{{ item.media.id.unwrap() }}/delete" onsubmit="return confirm('{{ t.media_delete_confirm }}');" style="margin-top:0.3rem;">
                     <button class="button is-small is-danger is-outlined btn-sm">{{ t.media_delete }}</button>
                 </form>
             </div>

templates/admin/schedule_edit.html

@@ -14,15 +14,7 @@
         <div class="field">
             <label class="label">{{ t.schedule_client }}</label>
             <div class="control">
-                <div class="select is-fullwidth">
-                    <select name="client_id" required>
-                        {% for c in &clients %}
-                        <option value="{{ c.id }}" {% if c.id.unwrap() == visit.client_id.primary_key().unwrap() %}selected{% endif %}>
-                            {{ c.name }}{% if let Some(p) = c.phone.as_deref() %} ({{ p }}){% endif %}
-                        </option>
-                        {% endfor %}
-                    </select>
-                </div>
+                <input class="input" type="text" value="{{ client.name }}{% if let Some(p) = client.phone.as_deref() %} ({{ p }}){% endif %}" readonly>
             </div>
         </div>
 
@@ -121,17 +113,20 @@
                 {% for m in &media %}
                 <div class="visit-media-item">
                     {% if m.file_type == "photo" %}
-                        <a href="/admin/uploads/{{ m.id }}" data-lightbox="photo">
-                            <img src="/admin/uploads/{{ m.id }}" alt="" loading="lazy">
+                        <a href="/admin/uploads/{{ m.id.unwrap() }}" data-lightbox="photo">
+                            <img src="/admin/uploads/{{ m.id.unwrap() }}" alt="" loading="lazy">
                         </a>
                     {% else %}
-                        <a href="/admin/uploads/{{ m.id }}" data-lightbox="video">
+                        <a href="/admin/uploads/{{ m.id.unwrap() }}" data-lightbox="video">
                             <div class="video-thumb-sm">🎬</div>
                         </a>
                     {% endif %}
                     {% if let Some(cap) = m.caption.as_deref() %}
                         <div class="media-cap">{{ cap }}</div>
                     {% endif %}
+                    <div class="visit-media-delete">
+                        <button type="submit" form="visit-media-delete-{{ m.id.unwrap() }}" class="button is-small is-danger is-outlined">{{ t.media_delete }}</button>
+                    </div>
                 </div>
                 {% endfor %}
             </div>
@@ -141,6 +136,9 @@
 
         <button type="submit" class="button is-primary is-fullwidth">{{ t.schedule_save }}</button>
     </form>
+    {% for m in &media %}
+    <form id="visit-media-delete-{{ m.id.unwrap() }}" method="post" action="/admin/media/{{ m.id.unwrap() }}/delete" onsubmit="return confirm('{{ t.media_delete_confirm }}');"></form>
+    {% endfor %}
 
     <hr style="margin:1rem 0;">
     <form method="post" action="/admin/schedule/{{ visit.id }}/delete" onsubmit="return confirm('{{ t.schedule_delete_confirm }}');">
@@ -254,6 +252,14 @@
         overflow: hidden;
         text-overflow: ellipsis;
     }
+    .visit-media-delete {
+        padding: 0.25rem 0.4rem 0.4rem;
+    }
+    .visit-media-delete .button {
+        width: 100%;
+        font-size: 0.68rem;
+        min-height: 1.65rem;
+    }
     .upload-modal-bg {
         display: none;
         position: fixed;

templates/client_portal.html

@@ -147,11 +147,11 @@
         <div class="media-row">
             {% for m in &pv.media %}
                 {% if m.file_type == "photo" %}
-                    <a href="/client/{{ client.media_token }}/media/{{ m.id }}" data-lightbox="photo">
-                        <img src="/client/{{ client.media_token }}/media/{{ m.id }}" alt="" loading="lazy">
+                    <a href="/client/{{ client.media_token }}/media/{{ m.id.unwrap() }}" data-lightbox="photo">
+                        <img src="/client/{{ client.media_token }}/media/{{ m.id.unwrap() }}" alt="" loading="lazy">
                     </a>
                 {% else %}
-                    <a href="/client/{{ client.media_token }}/media/{{ m.id }}" data-lightbox="video">
+                    <a href="/client/{{ client.media_token }}/media/{{ m.id.unwrap() }}" data-lightbox="video">
                         <div class="vid-thumb">🎬</div>
                     </a>
                 {% endif %}