add rss feed with common actions

This commit is contained in:
philipp 2023-04-18 12:10:11 +02:00
parent b50d546a5c
commit a3ac83228c
8 changed files with 138 additions and 4 deletions

View File

@ -45,3 +45,9 @@ CREATE TABLE IF NOT EXISTS "user_trip" (
FOREIGN KEY(trip_details_id) REFERENCES trip_details(id), FOREIGN KEY(trip_details_id) REFERENCES trip_details(id),
CONSTRAINT unq UNIQUE (user_id, trip_details_id) -- allow user to participate only once for each trip CONSTRAINT unq UNIQUE (user_id, trip_details_id) -- allow user to participate only once for each trip
); );
CREATE TABLE IF NOT EXISTS "log" (
"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
"msg" text NOT NULL,
"created_at" text NOT NULL DEFAULT CURRENT_TIMESTAMP
);

48
src/model/log.rs Normal file
View File

@ -0,0 +1,48 @@
use rss::{ChannelBuilder, Item};
use serde::{Deserialize, Serialize};
use sqlx::{FromRow, SqlitePool};
#[derive(FromRow, Debug, Serialize, Deserialize)]
pub struct Log {
pub msg: String,
pub created_at: String,
}
impl Log {
pub async fn create(db: &SqlitePool, msg: String) -> bool {
sqlx::query!("INSERT INTO log(msg) VALUES (?)", msg,)
.execute(db)
.await
.is_ok()
}
async fn last(db: &SqlitePool) -> Vec<Log> {
sqlx::query_as!(
Log,
"
SELECT msg, created_at
FROM log
ORDER BY id DESC
LIMIT 1000
"
)
.fetch_all(db)
.await
.unwrap()
}
pub async fn generate_feed(db: &SqlitePool) -> String {
let mut channel = ChannelBuilder::default()
.title("Ruder App Admin Feed")
.description("An RSS feed with activities from app.rudernlinz.at")
.build();
let mut items: Vec<Item> = vec![];
for log in Self::last(db).await {
let mut item = Item::default();
item.set_title(format!("({}) {}", log.created_at, log.msg));
items.append(&mut vec![item]);
}
channel.set_items(items);
channel.to_string()
}
}

View File

@ -7,6 +7,7 @@ use self::{
trip::{Trip, TripWithUser}, trip::{Trip, TripWithUser},
}; };
pub mod log;
pub mod planned_event; pub mod planned_event;
pub mod trip; pub mod trip;
pub mod tripdetails; pub mod tripdetails;

View File

@ -1,11 +1,13 @@
use rocket::Route; use rocket::Route;
pub mod planned_event; pub mod planned_event;
pub mod rss;
pub mod user; pub mod user;
pub fn routes() -> Vec<Route> { pub fn routes() -> Vec<Route> {
let mut ret = Vec::new(); let mut ret = Vec::new();
ret.append(&mut user::routes()); ret.append(&mut user::routes());
ret.append(&mut planned_event::routes()); ret.append(&mut planned_event::routes());
ret.append(&mut rss::routes());
ret ret
} }

17
src/rest/admin/rss.rs Normal file
View File

@ -0,0 +1,17 @@
use crate::rest::Log;
use rocket::{get, routes, Route, State};
use sqlx::SqlitePool;
#[get("/rss?<key>")]
async fn index(db: &State<SqlitePool>, key: Option<&str>) -> String {
match key {
Some(key) if key.eq("G9h/f2MFEr408IaB4Yd67/maVSsnAJNjcaZ2Tzl5Vo=") => {
Log::generate_feed(db).await
}
_ => "Not allowed".to_string(),
}
}
pub fn routes() -> Vec<Route> {
routes![index]
}

View File

@ -11,7 +11,10 @@ use rocket_dyn_templates::{context, tera, Template};
use serde_json::json; use serde_json::json;
use sqlx::SqlitePool; use sqlx::SqlitePool;
use crate::model::user::{LoginError, User}; use crate::model::{
log::Log,
user::{LoginError, User},
};
#[get("/")] #[get("/")]
fn index(flash: Option<FlashMessage<'_>>) -> Template { fn index(flash: Option<FlashMessage<'_>>) -> Template {
@ -96,6 +99,8 @@ async fn updatepw(
let user_json: String = format!("{}", json!(user)); let user_json: String = format!("{}", json!(user));
cookies.add_private(Cookie::new("loggedin_user", user_json)); cookies.add_private(Cookie::new("loggedin_user", user_json));
Log::create(db, format!("User {} set her password.", user.name)).await;
Flash::success( Flash::success(
Redirect::to("/"), Redirect::to("/"),
"Passwort erfolgreich gesetzt. Du bist nun eingeloggt.", "Passwort erfolgreich gesetzt. Du bist nun eingeloggt.",

View File

@ -7,6 +7,7 @@ use rocket::{
use sqlx::SqlitePool; use sqlx::SqlitePool;
use crate::model::{ use crate::model::{
log::Log,
trip::{CoxHelpError, Trip, TripDeleteError, TripUpdateError}, trip::{CoxHelpError, Trip, TripDeleteError, TripUpdateError},
tripdetails::TripDetails, tripdetails::TripDetails,
user::CoxUser, user::CoxUser,
@ -36,6 +37,18 @@ async fn create(db: &State<SqlitePool>, data: Form<AddTripForm>, cox: CoxUser) -
//TODO: fix clone() //TODO: fix clone()
Trip::new_own(db, cox.id, trip_details_id).await; Trip::new_own(db, cox.id, trip_details_id).await;
Log::create(
db,
format!(
"Cox {} created trip on {} @ {} for {} rower",
cox.name,
data.day.clone(),
data.planned_starting_time.clone(),
data.max_people,
),
)
.await;
Flash::success(Redirect::to("/"), "Ausfahrt erfolgreich erstellt.") Flash::success(Redirect::to("/"), "Ausfahrt erfolgreich erstellt.")
} }
@ -66,7 +79,17 @@ async fn update(
#[get("/join/<planned_event_id>")] #[get("/join/<planned_event_id>")]
async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> { async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
match Trip::new_join(db, cox.id, planned_event_id).await { match Trip::new_join(db, cox.id, planned_event_id).await {
Ok(_) => Flash::success(Redirect::to("/"), "Danke für's helfen!"), Ok(_) => {
Log::create(
db,
format!(
"Cox {} helps at planned_event.id={}",
cox.name, planned_event_id,
),
)
.await;
Flash::success(Redirect::to("/"), "Danke für's helfen!")
}
Err(CoxHelpError::AlreadyRegisteredAsCox) => { Err(CoxHelpError::AlreadyRegisteredAsCox) => {
Flash::error(Redirect::to("/"), "Du hilfst bereits aus!") Flash::error(Redirect::to("/"), "Du hilfst bereits aus!")
} }
@ -80,7 +103,10 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
#[get("/remove/trip/<trip_id>")] #[get("/remove/trip/<trip_id>")]
async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flash<Redirect> { async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flash<Redirect> {
match Trip::delete(db, cox.id, trip_id).await { match Trip::delete(db, cox.id, trip_id).await {
Ok(_) => Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!"), Ok(_) => {
Log::create(db, format!("Cox {} deleted trip.id={}", cox.name, trip_id)).await;
Flash::success(Redirect::to("/"), "Erfolgreich gelöscht!")
}
Err(TripDeleteError::SomebodyAlreadyRegistered) => Flash::error( Err(TripDeleteError::SomebodyAlreadyRegistered) => Flash::error(
Redirect::to("/"), Redirect::to("/"),
"Ausfahrt kann nicht gelöscht werden, da bereits jemand registriert ist!", "Ausfahrt kann nicht gelöscht werden, da bereits jemand registriert ist!",
@ -95,6 +121,15 @@ async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flas
async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> { async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
Trip::delete_by_planned_event_id(db, cox.id, planned_event_id).await; Trip::delete_by_planned_event_id(db, cox.id, planned_event_id).await;
Log::create(
db,
format!(
"Cox {} deleted registration for planned_event.id={}",
cox.name, planned_event_id
),
)
.await;
Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!") Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!")
} }

View File

@ -11,6 +11,7 @@ use rocket_dyn_templates::{tera::Context, Template};
use sqlx::SqlitePool; use sqlx::SqlitePool;
use crate::model::{ use crate::model::{
log::Log,
user::User, user::User,
usertrip::{UserTrip, UserTripError}, usertrip::{UserTrip, UserTripError},
Day, Day,
@ -51,7 +52,17 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
#[get("/join/<trip_details_id>")] #[get("/join/<trip_details_id>")]
async fn join(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash<Redirect> { async fn join(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash<Redirect> {
match UserTrip::create(db, user.id, trip_details_id).await { match UserTrip::create(db, user.id, trip_details_id).await {
Ok(_) => Flash::success(Redirect::to("/"), "Erfolgreich angemeldet!"), Ok(_) => {
Log::create(
db,
format!(
"User {} registered for trip_details.id={}",
user.name, trip_details_id
),
)
.await;
Flash::success(Redirect::to("/"), "Erfolgreich angemeldet!")
}
Err(UserTripError::EventAlreadyFull) => { Err(UserTripError::EventAlreadyFull) => {
Flash::error(Redirect::to("/"), "Event bereits ausgebucht!") Flash::error(Redirect::to("/"), "Event bereits ausgebucht!")
} }
@ -68,6 +79,15 @@ async fn join(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash
async fn remove(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash<Redirect> { async fn remove(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash<Redirect> {
UserTrip::delete(db, user.id, trip_details_id).await; UserTrip::delete(db, user.id, trip_details_id).await;
Log::create(
db,
format!(
"User {} unregistered for trip_details.id={}",
user.name, trip_details_id
),
)
.await;
Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!") Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!")
} }