ed4e07d2e6
* Use the count cache By default read from the count cache - if there is no value there, then do a full COUNT. The cache will be filled when the user posts up some more history * clean up server db error handling Co-authored-by: Conrad Ludgate <conrad.ludgate@truelayer.com>
134 lines
3.9 KiB
Rust
134 lines
3.9 KiB
Rust
use axum::extract::Query;
|
|
use axum::{extract::Path, Extension, Json};
|
|
use http::StatusCode;
|
|
use std::collections::HashMap;
|
|
|
|
use crate::database::{Database, Postgres};
|
|
use crate::models::{NewHistory, User};
|
|
use atuin_common::api::*;
|
|
|
|
use crate::calendar::{TimePeriod, TimePeriodInfo};
|
|
|
|
pub async fn count(
|
|
user: User,
|
|
db: Extension<Postgres>,
|
|
) -> Result<Json<CountResponse>, ErrorResponseStatus<'static>> {
|
|
match db.count_history_cached(&user).await {
|
|
// By default read out the cached value
|
|
Ok(count) => Ok(Json(CountResponse { count })),
|
|
|
|
// If that fails, fallback on a full COUNT. Cache is built on a POST
|
|
// only
|
|
Err(_) => match db.count_history(&user).await {
|
|
Ok(count) => Ok(Json(CountResponse { count })),
|
|
Err(_) => Err(ErrorResponse::reply("failed to query history count")
|
|
.with_status(StatusCode::INTERNAL_SERVER_ERROR)),
|
|
},
|
|
}
|
|
}
|
|
|
|
pub async fn list(
|
|
req: Query<SyncHistoryRequest>,
|
|
user: User,
|
|
db: Extension<Postgres>,
|
|
) -> Result<Json<SyncHistoryResponse>, ErrorResponseStatus<'static>> {
|
|
let history = db
|
|
.list_history(
|
|
&user,
|
|
req.sync_ts.naive_utc(),
|
|
req.history_ts.naive_utc(),
|
|
&req.host,
|
|
)
|
|
.await;
|
|
|
|
if let Err(e) = history {
|
|
error!("failed to load history: {}", e);
|
|
return Err(ErrorResponse::reply("failed to load history")
|
|
.with_status(StatusCode::INTERNAL_SERVER_ERROR));
|
|
}
|
|
|
|
let history: Vec<String> = history
|
|
.unwrap()
|
|
.iter()
|
|
.map(|i| i.data.to_string())
|
|
.collect();
|
|
|
|
debug!(
|
|
"loaded {} items of history for user {}",
|
|
history.len(),
|
|
user.id
|
|
);
|
|
|
|
Ok(Json(SyncHistoryResponse { history }))
|
|
}
|
|
|
|
pub async fn add(
|
|
Json(req): Json<Vec<AddHistoryRequest>>,
|
|
user: User,
|
|
db: Extension<Postgres>,
|
|
) -> Result<(), ErrorResponseStatus<'static>> {
|
|
debug!("request to add {} history items", req.len());
|
|
|
|
let history: Vec<NewHistory> = req
|
|
.into_iter()
|
|
.map(|h| NewHistory {
|
|
client_id: h.id,
|
|
user_id: user.id,
|
|
hostname: h.hostname,
|
|
timestamp: h.timestamp.naive_utc(),
|
|
data: h.data,
|
|
})
|
|
.collect();
|
|
|
|
if let Err(e) = db.add_history(&history).await {
|
|
error!("failed to add history: {}", e);
|
|
|
|
return Err(ErrorResponse::reply("failed to add history")
|
|
.with_status(StatusCode::INTERNAL_SERVER_ERROR));
|
|
};
|
|
|
|
Ok(())
|
|
}
|
|
|
|
pub async fn calendar(
|
|
Path(focus): Path<String>,
|
|
Query(params): Query<HashMap<String, u64>>,
|
|
user: User,
|
|
db: Extension<Postgres>,
|
|
) -> Result<Json<HashMap<u64, TimePeriodInfo>>, ErrorResponseStatus<'static>> {
|
|
let focus = focus.as_str();
|
|
|
|
let year = params.get("year").unwrap_or(&0);
|
|
let month = params.get("month").unwrap_or(&1);
|
|
|
|
let focus = match focus {
|
|
"year" => db
|
|
.calendar(&user, TimePeriod::YEAR, *year, *month)
|
|
.await
|
|
.map_err(|_| {
|
|
ErrorResponse::reply("failed to query calendar")
|
|
.with_status(StatusCode::INTERNAL_SERVER_ERROR)
|
|
}),
|
|
|
|
"month" => db
|
|
.calendar(&user, TimePeriod::MONTH, *year, *month)
|
|
.await
|
|
.map_err(|_| {
|
|
ErrorResponse::reply("failed to query calendar")
|
|
.with_status(StatusCode::INTERNAL_SERVER_ERROR)
|
|
}),
|
|
|
|
"day" => db
|
|
.calendar(&user, TimePeriod::DAY, *year, *month)
|
|
.await
|
|
.map_err(|_| {
|
|
ErrorResponse::reply("failed to query calendar")
|
|
.with_status(StatusCode::INTERNAL_SERVER_ERROR)
|
|
}),
|
|
|
|
_ => Err(ErrorResponse::reply("invalid focus: use year/month/day")
|
|
.with_status(StatusCode::BAD_REQUEST)),
|
|
}?;
|
|
|
|
Ok(Json(focus))
|
|
}
|