Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 52 Pull Requests Actions Packages Projects Wiki Activity

allow adding rowers to logbook

Browse Source
This commit is contained in:
philipp
2023-07-24 13:01:39 +02:00
parent c43feb1834
commit c42cd2cd9c
9 changed files with 273 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
src/model/logbook.rs
View File

@ -1,10 +1,10 @@
use chrono::NaiveDateTime;
use serde::{Deserialize, Serialize};
use serde::Serialize;
use sqlx::{FromRow, SqlitePool};
use super::user::User;
use super::{boat::Boat, rower::Rower, user::User};
#[derive(FromRow, Debug, Serialize, Deserialize)]
#[derive(FromRow, Serialize, Clone)]
pub struct Logbook {
pub id: i64,
pub boat_id: i64,
@ -19,21 +19,13 @@ pub struct Logbook {
pub logtype: Option<i64>,
}
#[derive(Serialize, FromRow)]
pub struct LogbookWithBoatAndUsers {
pub id: i64,
pub boat_id: i64,
pub shipmaster: i64,
#[serde(default = "bool::default")]
pub shipmaster_only_steering: bool,
pub departure: String, //TODO: Switch to chrono::nativedatetime
pub arrival: Option<String>, //TODO: Switch to chrono::nativedatetime
pub destination: Option<String>,
pub distance_in_km: Option<i64>,
pub comments: Option<String>,
pub logtype: Option<i64>,
pub boat: String,
pub shipmaster_name: String,
#[derive(Serialize)]
pub struct LogbookWithBoatAndRowers {
#[serde(flatten)]
pub logbook: Logbook,
pub boat: Boat,
pub shipmaster_user: User,
pub rowers: Vec<User>,
}
pub enum LogbookUpdateError {
@ -43,6 +35,8 @@ pub enum LogbookUpdateError {
pub enum LogbookCreateError {
BoatAlreadyOnWater,
BoatLocked,
BoatNotFound,
TooManyRowers(usize, usize),
}
impl Logbook {
@ -76,43 +70,61 @@ impl Logbook {
// .ok()
// }
//
pub async fn on_water(db: &SqlitePool) -> Vec<LogbookWithBoatAndUsers> {
sqlx::query_as!(
LogbookWithBoatAndUsers,
pub async fn on_water(db: &SqlitePool) -> Vec<LogbookWithBoatAndRowers> {
let logs = sqlx::query_as!(
Logbook,
"
SELECT logbook.id, boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype, boat.name as boat, user.name as shipmaster_name
SELECT id, boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
FROM logbook
INNER JOIN boat ON logbook.boat_id = boat.id
INNER JOIN user ON shipmaster = user.id
WHERE arrival is null
ORDER BY departure DESC
"
)
.fetch_all(db)
.await
.unwrap() //TODO: fixme
.unwrap(); //TODO: fixme
let mut ret = Vec::new();
for log in logs {
ret.push(LogbookWithBoatAndRowers {
rowers: Rower::for_log(db, &log).await,
boat: Boat::find_by_id(db, log.boat_id as i32).await.unwrap(),
shipmaster_user: User::find_by_id(db, log.shipmaster as i32).await.unwrap(),
logbook: log,
})
}
ret
}
pub async fn completed(db: &SqlitePool) -> Vec<LogbookWithBoatAndUsers> {
sqlx::query_as!(
LogbookWithBoatAndUsers,
pub async fn completed(db: &SqlitePool) -> Vec<LogbookWithBoatAndRowers> {
let logs = sqlx::query_as!(
Logbook,
"
SELECT logbook.id, boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype, boat.name as boat, user.name as shipmaster_name
SELECT id, boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
FROM logbook
INNER JOIN boat ON logbook.boat_id = boat.id
INNER JOIN user ON shipmaster = user.id
WHERE arrival is not null
ORDER BY arrival DESC
ORDER BY departure DESC
"
)
.fetch_all(db)
.await
.unwrap() //TODO: fixme
.unwrap(); //TODO: fixme
let mut ret = Vec::new();
for log in logs {
ret.push(LogbookWithBoatAndRowers {
rowers: Rower::for_log(db, &log).await,
boat: Boat::find_by_id(db, log.boat_id as i32).await.unwrap(),
shipmaster_user: User::find_by_id(db, log.shipmaster as i32).await.unwrap(),
logbook: log,
})
}
ret
}
pub async fn create(
db: &SqlitePool,
boat_id: i64,
boat_id: i32,
shipmaster: i64,
shipmaster_only_steering: bool,
departure: NaiveDateTime,
@ -121,15 +133,40 @@ impl Logbook {
distance_in_km: Option<i64>,
comments: Option<String>,
logtype: Option<i64>,
rower: Vec<i64>,
) -> Result<(), LogbookCreateError> {
//Check if boat is not locked
//Check if boat is already on water
let _ = sqlx::query!(
"INSERT INTO logbook(boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype) VALUES (?,?,?,?,?,?,?,?,?)",
let boat = match Boat::find_by_id(db, boat_id).await {
Some(b) => b,
None => {
return Err(LogbookCreateError::BoatNotFound);
}
};
if boat.is_locked(db).await {
return Err(LogbookCreateError::BoatLocked);
}
if boat.on_water(db).await {
return Err(LogbookCreateError::BoatAlreadyOnWater);
}
if rower.len() > boat.amount_seats as usize - 1 {
return Err(LogbookCreateError::TooManyRowers(
boat.amount_seats as usize,
rower.len() + 1,
));
}
let inserted_row = sqlx::query!(
"INSERT INTO logbook(boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype) VALUES (?,?,?,?,?,?,?,?,?) RETURNING id",
boat_id, shipmaster, shipmaster_only_steering, departure, arrival, destination, distance_in_km, comments, logtype
)
.execute(db)
.await;
.fetch_one(db)
.await.unwrap();
for rower in &rower {
Rower::create(db, inserted_row.id, *rower).await;
}
Ok(())
}