mirror of
https://github.com/Djeeberjr/fw-anwesenheit.git
synced 2025-07-02 01:04:16 +00:00
added api route for id mappings
also need rocket json feature
This commit is contained in:
parent
907b758626
commit
2f02e283c0
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -1116,6 +1116,7 @@ dependencies = [
|
|||||||
"rocket_codegen",
|
"rocket_codegen",
|
||||||
"rocket_http",
|
"rocket_http",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_json",
|
||||||
"state",
|
"state",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"time",
|
"time",
|
||||||
|
@ -13,7 +13,7 @@ gpio = "0.4.1"
|
|||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.140"
|
||||||
rocket = "0.5.1"
|
rocket = { version = "0.5.1", features = ["json"] }
|
||||||
tokio = { version = "1.44.2", features = ["full"] }
|
tokio = { version = "1.44.2", features = ["full"] }
|
||||||
rust-embed = "8.7.0"
|
rust-embed = "8.7.0"
|
||||||
log = "0.4.27"
|
log = "0.4.27"
|
||||||
|
@ -1,20 +1,32 @@
|
|||||||
use log::{error, info, warn};
|
use log::{debug, error, info, warn};
|
||||||
|
use rocket::data::FromData;
|
||||||
use rocket::http::Status;
|
use rocket::http::Status;
|
||||||
use rocket::{Config, State};
|
use rocket::serde::json::Json;
|
||||||
|
use rocket::{Config, State, post};
|
||||||
use rocket::{get, http::ContentType, response::content::RawHtml, routes};
|
use rocket::{get, http::ContentType, response::content::RawHtml, routes};
|
||||||
use rust_embed::Embed;
|
use rust_embed::Embed;
|
||||||
|
use serde::Deserialize;
|
||||||
use std::borrow::Cow;
|
use std::borrow::Cow;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use std::time::Instant;
|
||||||
use tokio::sync::Mutex;
|
use tokio::sync::Mutex;
|
||||||
|
|
||||||
|
use crate::id_mapping::{IDMapping, Name};
|
||||||
use crate::id_store::IDStore;
|
use crate::id_store::IDStore;
|
||||||
|
use crate::tally_id::TallyID;
|
||||||
|
|
||||||
#[derive(Embed)]
|
#[derive(Embed)]
|
||||||
#[folder = "web/dist"]
|
#[folder = "web/dist"]
|
||||||
struct Asset;
|
struct Asset;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct NewMapping {
|
||||||
|
id: String,
|
||||||
|
name: Name,
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn start_webserver(store: Arc<Mutex<IDStore>>) -> Result<(), rocket::Error> {
|
pub async fn start_webserver(store: Arc<Mutex<IDStore>>) -> Result<(), rocket::Error> {
|
||||||
let port = match env::var("HTTP_PORT") {
|
let port = match env::var("HTTP_PORT") {
|
||||||
Ok(port) => port.parse().unwrap_or_else(|_| {
|
Ok(port) => port.parse().unwrap_or_else(|_| {
|
||||||
@ -31,7 +43,10 @@ pub async fn start_webserver(store: Arc<Mutex<IDStore>>) -> Result<(), rocket::E
|
|||||||
};
|
};
|
||||||
|
|
||||||
rocket::custom(config)
|
rocket::custom(config)
|
||||||
.mount("/", routes![static_files, index, export_csv])
|
.mount(
|
||||||
|
"/",
|
||||||
|
routes![static_files, index, export_csv, get_mapping, add_mapping],
|
||||||
|
)
|
||||||
.manage(store)
|
.manage(store)
|
||||||
.launch()
|
.launch()
|
||||||
.await?;
|
.await?;
|
||||||
@ -63,8 +78,22 @@ async fn export_csv(manager: &State<Arc<Mutex<IDStore>>>) -> Result<String, Stat
|
|||||||
match manager.lock().await.export_csv() {
|
match manager.lock().await.export_csv() {
|
||||||
Ok(csv) => Ok(csv),
|
Ok(csv) => Ok(csv),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
error!("Failed to generate csv: {}", e);
|
error!("Failed to generate csv: {e}");
|
||||||
Err(Status::InternalServerError)
|
Err(Status::InternalServerError)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[get("/api/mapping")]
|
||||||
|
async fn get_mapping(store: &State<Arc<Mutex<IDStore>>>) -> Json<IDMapping> {
|
||||||
|
Json(store.lock().await.mapping.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[post("/api/mapping", format = "json", data = "<new_mapping>")]
|
||||||
|
async fn add_mapping(store: &State<Arc<Mutex<IDStore>>>, new_mapping: Json<NewMapping>) {
|
||||||
|
store
|
||||||
|
.lock()
|
||||||
|
.await
|
||||||
|
.mapping
|
||||||
|
.add_mapping(TallyID(new_mapping.id.clone()), new_mapping.name.clone());
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user