logs panel to logs system hook up, cleanup

This commit is contained in:
2026-04-03 13:55:43 +02:00
parent 42c54ba6a0
commit 74895c503d
3 changed files with 41 additions and 28 deletions

View File

@@ -1,10 +1,11 @@
use std::fmt::Display;
use serde::{Deserialize, Serialize};
use strum::{AsRefStr, IntoStaticStr};
use strum::IntoStaticStr;
use uuid::Uuid;
use crate::{database, users::User};
use crate::{
database::{self, DatabaseError},
users::User,
};
#[derive(Debug)]
pub struct LogEntry {
@@ -14,21 +15,45 @@ pub struct LogEntry {
}
impl LogEntry {
pub fn new(actor: User, data: LogAction) -> Result<LogEntry, rusqlite::Error> {
pub fn new(actor: User, data: LogAction) -> Result<LogEntry, DatabaseError> {
let log = LogEntry {
id: Uuid::now_v7(),
actor,
data,
};
let conn = database::conn()?;
let actiontype: &'static str = (&log.data).into();
let payload = serde_json::to_string(&log.data).unwrap();
conn.prepare(
"INSERT INTO logs(id, actor, target, actiontype, payload) VALUES (?1,?2,?3,?4,?5)",
)?
.execute((&log.id, &log.actor.id, log.data.get_target_id(), "a", "b"))?;
.execute((
&log.id,
&log.actor.id,
log.data.get_target_id(),
actiontype,
payload,
))?;
Ok(log)
}
pub fn get_all() -> Result<Vec<LogEntry>, DatabaseError> {
Ok(database::conn()?
.prepare("SELECT id, actor, target, actiontype, payload FROM logs ORDER BY id DESC")?
.query_map((), |r| {
let payload: String = r.get(4)?;
Ok(LogEntry {
id: r.get(0)?,
actor: User::get_by_id(r.get(1)?).unwrap(),
data: serde_json::from_str(&payload).unwrap(),
})
})?
.collect::<Result<Vec<LogEntry>, _>>()?)
}
}
// #[derive(Debug, thiserror::Error)]
// pub enum LogError {}
#[derive(Debug, IntoStaticStr, Serialize, Deserialize)]
pub enum LogAction {
Initialize,
@@ -42,10 +67,10 @@ impl LogAction {
pub fn get_target_id(&self) -> Option<Uuid> {
match self {
Self::Initialize | Self::RegenInfradmin => None,
Self::CreateUser { id, .. } => Some(*id),
Self::CreateTag { id, .. } => Some(*id),
Self::CreatePerson { id, .. } => Some(*id),
Self::ChangeUserHandle { id, .. } => Some(*id),
Self::CreateUser { id, .. }
| Self::CreateTag { id, .. }
| Self::CreatePerson { id, .. }
| Self::ChangeUserHandle { id, .. } => Some(*id),
}
}
pub fn get_humanreadable_payload(&self) -> String {