Added user/visits 'deleted' status, hide it in UI

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)
@@ -327,7 +332,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();
@@ -346,6 +352,14 @@ async fn submit_feedback(
     }
 
     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 +383,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,6 +393,13 @@ 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 {
         Ok(data) => {