quotes create&getbyid, migration renew, misc

This commit is contained in:
2026-03-07 16:08:29 +01:00
parent ca84b7e4b4
commit 766e9029bf
6 changed files with 247 additions and 32 deletions

View File

@@ -7,12 +7,14 @@ use axum::{
use crate::{
database::DatabaseError,
persons::PersonError,
quotes::QuoteError,
tags::TagError,
users::{UserError, auth::AuthError, sessions::SessionError},
};
mod auth;
mod persons;
mod quotes;
mod sessions;
mod tags;
mod users;
@@ -20,10 +22,10 @@ mod users;
pub fn api_router() -> Router {
Router::new()
.route("/api/live", get(async || "Mnemosyne lives"))
//
// auth
.route("/api/auth/login", post(auth::login))
.route("/api/auth/logout", post(auth::logout))
//
// users
.route("/api/users", get(users::get_all))
.route("/api/users", post(users::create))
.route("/api/users/me", get(users::get_me))
@@ -31,17 +33,17 @@ pub fn api_router() -> Router {
.route("/api/users/@{handle}", get(users::get_by_handle))
.route("/api/users/{id}/setpassw", post(users::change_password))
.route("/api/users/{id}/sethandle", post(users::change_handle))
//
// sessions
.route("/api/sessions/{id}", get(sessions::get_by_id))
.route("/api/sessions/{id}/revoke", post(sessions::revoke_by_id))
//
// tags
.route("/api/tags", get(tags::get_all))
.route("/api/tags", post(tags::create))
.route("/api/tags/{id}", get(tags::get_by_id))
.route("/api/tags/{id}", patch(tags::rename))
.route("/api/tags/{id}", delete(tags::delete))
.route("/api/tags/#{name}", get(tags::get_by_name))
//
// persons & names
.route("/api/persons", get(persons::get_all))
.route("/api/persons", post(persons::create))
.route("/api/persons/{id}", get(persons::get_by_id))
@@ -49,6 +51,9 @@ pub fn api_router() -> Router {
.route("/api/persons/{id}/addname", post(persons::add_name))
.route("/api/names/{id}", get(persons::n_by_id))
.route("/api/names/{id}/setprimary", post(persons::n_setprimary))
// quotes
.route("/api/quotes", post(quotes::create))
.route("/api/quotes/{id}", get(quotes::get_by_id))
}
pub struct CompositeError(Response);
@@ -75,5 +80,6 @@ composite_from!(
SessionError,
TagError,
PersonError,
QuoteError,
DatabaseError
);

66
src/api/quotes.rs Normal file
View File

@@ -0,0 +1,66 @@
use axum::{
Json,
extract::Path,
http::{HeaderMap, StatusCode},
response::{IntoResponse, Response},
};
use chrono::{DateTime, FixedOffset};
use serde::Deserialize;
use uuid::Uuid;
use crate::{
api::CompositeError,
persons::Name,
quotes::Quote,
users::{
User,
auth::{UserAuthRequired, UserAuthenticate},
},
};
pub async fn get_by_id(
Path(id): Path<Uuid>,
headers: HeaderMap,
) -> Result<Response, CompositeError> {
User::authenticate(&headers)?.required()?;
Ok(Json(Quote::get_by_id(id)?).into_response())
}
#[derive(Deserialize)]
pub struct QuoteLineForm {
pub content: String,
pub name_id: Uuid,
}
#[derive(Deserialize)]
pub struct QuoteCreateForm {
pub lines: Vec<QuoteLineForm>,
pub timestamp: DateTime<FixedOffset>,
pub context: Option<String>,
pub location: Option<String>,
pub public: bool,
}
pub async fn create(
headers: HeaderMap,
Json(form): Json<QuoteCreateForm>,
) -> Result<Response, CompositeError> {
let u = User::authenticate(&headers)?.required()?;
let lines = form
.lines
.into_iter()
.map(|l| Ok((l.content, Name::get_by_id(l.name_id)?)))
.collect::<Result<Vec<(String, Name)>, CompositeError>>()?;
let q = Quote::create(
lines,
form.timestamp,
form.context,
form.location,
u.id,
form.public,
)?;
Ok((StatusCode::CREATED, Json(q)).into_response())
}