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

clean db

Browse Source
This commit is contained in:
philipp
2023-08-05 16:27:51 +02:00
parent 64aefde8bc
commit 94a9d285be
3 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/model/logbook.rs
View File

@ -12,8 +12,8 @@ pub struct Logbook {
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 departure: NaiveDateTime,
pub arrival: Option<NaiveDateTime>,
pub destination: Option<String>,
pub distance_in_km: Option<i64>,
pub comments: Option<String>,
@ -114,7 +114,8 @@ ORDER BY departure DESC
boat_id: row.boat_id,
shipmaster: row.shipmaster,
shipmaster_only_steering: row.shipmaster_only_steering,
departure: row.departure.unwrap(),
departure: NaiveDateTime::parse_from_str(&row.departure.unwrap(), "%Y-%m-%d %H:%M")
.unwrap(),
arrival: row.arrival,
destination: row.destination,
distance_in_km: row.distance_in_km,
@ -125,12 +126,7 @@ ORDER BY departure DESC
let mut ret = Vec::new();
for log in logs {
let date_time_naive =
NaiveDateTime::parse_from_str(&log.departure, "%Y-%m-%d %H:%M").unwrap();
let date_time = Local
.from_local_datetime(&date_time_naive)
.single()
.unwrap();
let date_time = Local.from_local_datetime(&log.departure).single().unwrap();
ret.push(LogbookWithBoatAndRowers {
rowers: Rower::for_log(db, &log).await,
@ -313,12 +309,12 @@ ORDER BY departure DESC
Ok(())
}
// pub async fn delete(&self, db: &SqlitePool) {
// sqlx::query!("DELETE FROM boat WHERE id=?", self.id)
// .execute(db)
// .await
// .unwrap(); //Okay, because we can only create a User of a valid id
// }
pub async fn delete(&self, db: &SqlitePool) {
sqlx::query!("DELETE FROM logbook WHERE id=?", self.id)
.execute(db)
.await
.unwrap(); //Okay, because we can only create a Logbook of a valid id
}
}
#[cfg(test)]