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

staging #338

Merged
philipp merged 2 commits from staging into main 2024-04-03 18:08:01 +02:00
Conversation 0 Commits 2 Files Changed 4 +5 -1
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0c2b4d703 - Show all commits

1
Cargo.lock generated
View File

@ -2204,6 +2204,7 @@ dependencies = [
"env_logger", "env_logger",
"futures", "futures",
"ics", "ics",
"itertools",
"lettre", "lettre",
"log", "log",
"openssl", "openssl",

1
Cargo.toml
View File

@ -24,6 +24,7 @@ ics = "0.5"
futures = "0.3" futures = "0.3"
lettre = "0.11" lettre = "0.11"
csv = "1.3" csv = "1.3"
itertools = "0.12"
[target.'cfg(not(windows))'.dependencies] [target.'cfg(not(windows))'.dependencies]
openssl = { version = "0.10", features = [ "vendored" ] } openssl = { version = "0.10", features = [ "vendored" ] }

4
src/model/boat.rs
View File

@ -1,5 +1,6 @@
use std::ops::DerefMut; use std::ops::DerefMut;
use itertools::Itertools;
use rocket::serde::{Deserialize, Serialize}; use rocket::serde::{Deserialize, Serialize};
use rocket::FromForm; use rocket::FromForm;
use sqlx::{FromRow, Sqlite, SqlitePool, Transaction}; use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
@ -7,7 +8,7 @@ use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
use super::location::Location; use super::location::Location;
use super::user::User; use super::user::User;
#[derive(FromRow, Debug, Serialize, Deserialize)] #[derive(FromRow, Debug, Serialize, Deserialize, Eq, Hash, PartialEq, Clone)]
pub struct Boat { pub struct Boat {
pub id: i64, pub id: i64,
pub name: String, pub name: String,
@ -279,6 +280,7 @@ ORDER BY amount_seats DESC
.unwrap(); //TODO: fixme .unwrap(); //TODO: fixme
boats.extend(boats_in_ottensheim.into_iter()); boats.extend(boats_in_ottensheim.into_iter());
} }
let boats = boats.into_iter().unique().collect();
Self::boats_to_details(db, boats).await Self::boats_to_details(db, boats).await
} }