hannes/packager
1
0
Fork 0
Code Issues 10 Pull Requests Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Hannes Körber
2021-09-07 00:02:53 +02:00
parent fdffe5fcdd
commit 2bebb7b378
12 changed files with 834 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

582
api/src/main.rs
View File

@@ -1,110 +1,11 @@
use serde::ser::{SerializeStruct, Serializer};
use serde::{Serialize, Deserialize};
use std::convert::Infallible;
use warp::http::StatusCode;
use warp::Filter;
use uuid::Uuid;
use serde::Serialize;
#[derive(Debug)]
#[derive(Serialize, Deserialize)]
enum Duration {
None,
Days(i32),
}
#[derive(Debug)]
#[derive(Serialize, Deserialize)]
enum Period {
Daily(i32),
Weekly(i32),
Days(i32),
}
#[derive(Debug)]
#[derive(Serialize, Deserialize)]
enum ItemUsage {
Singleton,
Periodic(Period),
Infinite,
}
#[derive(Debug)]
#[derive(Serialize, Deserialize)]
enum ItemSize {
None,
Pack(i32),
Name(String),
Grams(i32),
}
#[derive(Debug)]
#[derive(Serialize, Deserialize)]
struct PreparationStep {
name: String,
start: Duration,
}
impl PreparationStep {
fn new(name: String, start: Duration) -> PreparationStep {
PreparationStep { name, start }
}
}
#[derive(Debug)]
#[derive(Serialize, Deserialize)]
enum Preparation {
None,
Steps(Vec<PreparationStep>),
}
#[derive(Debug)]
struct PackageItem {
name: String,
size: ItemSize,
count: i32,
usage: ItemUsage,
preparation: Preparation,
}
impl PackageItem {
fn new(
name: String,
size: ItemSize,
count: i32,
usage: ItemUsage,
preparation: Preparation,
) -> PackageItem {
PackageItem {
name,
size,
count,
usage,
preparation,
}
}
fn new_simple(name: String) -> PackageItem {
PackageItem::new(
name,
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
)
}
}
impl Serialize for PackageItem {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
let mut state = serializer.serialize_struct("PackageItem", 5)?;
state.serialize_field("name", &self.name)?;
state.serialize_field("size", &self.size)?;
state.serialize_field("count", &self.count)?;
state.serialize_field("usage", &self.usage)?;
state.serialize_field("preparation", &self.preparation)?;
state.end()
}
}
use packager;
#[derive(Debug)]
enum TripItemStatus {
@@ -115,12 +16,12 @@ enum TripItemStatus {
#[derive(Debug)]
struct TripItem<'a> {
package_item: &'a PackageItem,
package_item: &'a packager::PackageItem,
status: TripItemStatus,
}
impl TripItem<'_> {
fn from_package_item(package_item: &PackageItem) -> TripItem {
fn from_package_item(package_item: &packager::PackageItem) -> TripItem {
TripItem {
package_item,
status: TripItemStatus::Pending,
@@ -132,37 +33,13 @@ impl TripItem<'_> {
}
}
#[derive(Debug)]
struct PackageList {
name: String,
items: Vec<PackageItem>,
}
impl PackageList {
fn new_from_items(name: String, items: Vec<PackageItem>) -> PackageList {
PackageList { name, items }
}
}
impl Serialize for PackageList {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
let mut state = serializer.serialize_struct("PackageList", 2)?;
state.serialize_field("name", &self.name)?;
state.serialize_field("items", &self.items)?;
state.end()
}
}
#[derive(Debug)]
struct TripList<'a> {
items: Vec<TripItem<'a>>,
}
impl<'a> TripList<'a> {
fn from_package_list(list: &'a PackageList) -> TripList<'a> {
fn from_package_list(list: &'a packager::PackageList) -> TripList<'a> {
let mut items = Vec::new();
for item in &list.items {
items.push(TripItem::from_package_item(item));
@@ -180,7 +57,7 @@ struct Trip<'a> {
}
impl<'a> Trip<'a> {
fn from_package_list(name: String, date: String, list: &'a PackageList) -> Trip<'a> {
fn from_package_list(name: String, date: String, list: &'a packager::PackageList) -> Trip<'a> {
Trip {
name,
date,
@@ -189,377 +66,6 @@ impl<'a> Trip<'a> {
}
}
fn get_lists() -> Vec<PackageList> {
let lists = vec![
PackageList::new_from_items(
String::from("EDC"),
vec![
PackageItem::new_simple(String::from("Rucksack")),
PackageItem::new_simple(String::from("Regenhülle für Rucksack")),
PackageItem::new_simple(String::from("Normale Schuhe")),
PackageItem::new_simple(String::from("Taschenmesser")),
PackageItem::new(
String::from("Taschentücher"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Handy"),
ItemSize::None,
1,
ItemUsage::Infinite,
Preparation::Steps(vec![PreparationStep::new(
String::from("Aufladen"),
Duration::Days(1),
)]),
),
PackageItem::new(
String::from("Kopfhörer"),
ItemSize::None,
1,
ItemUsage::Infinite,
Preparation::Steps(vec![PreparationStep::new(
String::from("Aufladen"),
Duration::Days(1),
)]),
),
PackageItem::new(
String::from("Mundschutz"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Weekly(1)),
Preparation::None,
),
PackageItem::new_simple(String::from("Ladekabel")),
],
),
PackageList::new_from_items(
String::from("Geld & Karten"),
vec![
PackageItem::new(
String::from("Bargeld"),
ItemSize::Name(String::from("Euro")),
100,
ItemUsage::Infinite,
Preparation::Steps(vec![PreparationStep::new(
String::from("Abheben"),
Duration::Days(1),
)]),
),
PackageItem::new_simple(String::from("Kreditkarte")),
PackageItem::new_simple(String::from("Pass")),
PackageItem::new_simple(String::from("Krankenversicherungskarte")),
PackageItem::new_simple(String::from("Krankenversicherungskarte (Zusatz)")),
PackageItem::new_simple(String::from("Auslandskrankenversicherungsnachweis")),
PackageItem::new_simple(String::from("Notfalltelefonnummernliste")),
PackageItem::new_simple(String::from("ADAC-Karte")),
PackageItem::new_simple(String::from("Impfausweiß (EU)")),
PackageItem::new_simple(String::from("Führerschein")),
PackageItem::new_simple(String::from("Internationaler Führerschein")),
PackageItem::new_simple(String::from("Tagebuch")),
],
),
PackageList::new_from_items(
String::from("Waschzeug"),
vec![
PackageItem::new_simple(String::from("Waschbeutel")),
PackageItem::new_simple(String::from("Sonnencreme")),
PackageItem::new_simple(String::from("After-Sun")),
PackageItem::new_simple(String::from("Nagelset")),
PackageItem::new_simple(String::from("Rasurbox")),
PackageItem::new_simple(String::from("Rasierer")),
PackageItem::new(
String::from("Ersatzklingen"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new_simple(String::from("Zahnbürste")),
PackageItem::new(
String::from("Zahnputztabletten"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Daily(2)),
Preparation::None,
),
PackageItem::new_simple(String::from("Deo")),
PackageItem::new_simple(String::from("Duschgel / Shampoo")),
],
),
PackageList::new_from_items(
String::from("Apotheke"),
vec![
PackageItem::new(
String::from("Blasenpflaster"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Erste-Hilfe-Set"),
ItemSize::None,
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Paracetamol"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Autan"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Pflaster"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Zeckenkarte"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
],
),
PackageList::new_from_items(
String::from("Badesachen"),
vec![
PackageItem::new_simple(String::from("Badehose")),
PackageItem::new_simple(String::from("Badehandtuch")),
PackageItem::new_simple(String::from("Surfshirt (Lang)")),
PackageItem::new_simple(String::from("Wasserschuhe")),
],
),
PackageList::new_from_items(
String::from("Camping"),
vec![
PackageItem::new_simple(String::from("Schlafsack")),
PackageItem::new_simple(String::from("Zelt")),
PackageItem::new_simple(String::from("Luftmatratze")),
PackageItem::new_simple(String::from("Campingstuhl")),
PackageItem::new_simple(String::from("Panzertape")),
PackageItem::new_simple(String::from("Tarp")),
PackageItem::new_simple(String::from("Hängematte")),
PackageItem::new_simple(String::from("Topf")),
PackageItem::new_simple(String::from("Teller")),
PackageItem::new_simple(String::from("Messer")),
PackageItem::new_simple(String::from("Gabel")),
PackageItem::new_simple(String::from("Löffel")),
PackageItem::new_simple(String::from("Stirnlampe")),
PackageItem::new_simple(String::from("Geschirrtuch")),
PackageItem::new_simple(String::from("Spüllappen")),
PackageItem::new_simple(String::from("Taschenlampe")),
PackageItem::new_simple(String::from("Feuerzeug")),
PackageItem::new_simple(String::from("Tasse")),
PackageItem::new_simple(String::from("Grill")),
PackageItem::new(
String::from("Grillkohle"),
ItemSize::Grams(1500),
1,
ItemUsage::Periodic(Period::Days(2)),
Preparation::None,
),
PackageItem::new_simple(String::from("Campingkocher")),
PackageItem::new(
String::from("Campinggas"),
ItemSize::Pack(1),
1,
ItemUsage::Periodic(Period::Days(3)),
Preparation::None,
),
PackageItem::new_simple(String::from("Kaffeekochaufsatz")),
PackageItem::new(
String::from("Küchenrolle"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Days(5)),
Preparation::None,
),
PackageItem::new(
String::from("Müllsäcke"),
ItemSize::Pack(1),
1,
ItemUsage::Infinite,
Preparation::None,
),
PackageItem::new(
String::from("Teelichter"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Daily(3)),
Preparation::None,
),
PackageItem::new(
String::from("Klopapier"),
ItemSize::Name(String::from("Rolle")),
1,
ItemUsage::Periodic(Period::Weekly(1)),
Preparation::None,
),
],
),
PackageList::new_from_items(
String::from("Essen"),
vec![PackageItem::new(
String::from("Kaffee"),
ItemSize::Grams(100),
1,
ItemUsage::Periodic(Period::Days(3)),
Preparation::None,
)],
),
PackageList::new_from_items(
String::from("Wanderzeug"),
vec![
PackageItem::new_simple(String::from("Wanderschuhe")),
PackageItem::new(
String::from("Trinkblase"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::Steps(vec![PreparationStep::new(
String::from("Auffüllen"),
Duration::None,
)]),
),
],
),
PackageList::new_from_items(
String::from("Klamotten"),
vec![
PackageItem::new(
String::from("Cap"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Regenjacke"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Daunenjacke"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Pullover"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Lange Hose"),
ItemSize::None,
2,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Kurze Hose"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Jogginghose"),
ItemSize::None,
1,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new(
String::from("Socken"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Daily(1)),
Preparation::None,
),
PackageItem::new(
String::from("Unterhose"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Daily(1)),
Preparation::None,
),
PackageItem::new(
String::from("T-Shirt"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Days(2)),
Preparation::None,
),
PackageItem::new_simple(String::from("Schmutzwäschebeutel")),
],
),
PackageList::new_from_items(
String::from("Fahrrad"),
vec![
PackageItem::new_simple(String::from("Fahrrad")),
PackageItem::new_simple(String::from("Fahrradhelm")),
],
),
PackageList::new_from_items(
String::from("Misc"),
vec![
PackageItem::new_simple(String::from("Trinkflasche")),
PackageItem::new_simple(String::from("Dyneemaschnur")),
PackageItem::new_simple(String::from("Ladegerät")),
PackageItem::new(
String::from("Powerbank"),
ItemSize::None,
1,
ItemUsage::Infinite,
Preparation::Steps(vec![PreparationStep::new(
String::from("Aufladen"),
Duration::Days(1),
)]),
),
PackageItem::new(
String::from("Desinfektionsgel"),
ItemSize::None,
1,
ItemUsage::Periodic(Period::Weekly(1)),
Preparation::None,
),
PackageItem::new(
String::from("Karabiner"),
ItemSize::None,
3,
ItemUsage::Singleton,
Preparation::None,
),
PackageItem::new_simple(String::from("Ersatzbrille")),
PackageItem::new_simple(String::from("Sonnenbrille")),
PackageItem::new_simple(String::from("Ohrenstöpsel")),
],
),
];
lists
// for list in &lists {
// println!("Contents of package list {:?}:", list.name);
@@ -589,6 +95,50 @@ fn get_lists() -> Vec<PackageList> {
// for item in &trip.list.items {
// println!("{:?}", item);
// }
#[derive(Serialize)]
struct ErrorMessage {
code: u16,
success: bool,
message: String,
}
#[derive(Debug)]
struct InvalidUuid;
impl warp::reject::Reject for InvalidUuid {}
// See https://github.com/seanmonstar/warp/blob/master/examples/rejections.rs
async fn handle_rejection(err: warp::Rejection) -> Result<impl warp::Reply, Infallible> {
let code;
let message;
if err.is_not_found() {
message = "NOT_FOUND";
code = StatusCode::NOT_FOUND;
} else if let Some(InvalidUuid) = err.find() {
code = StatusCode::BAD_REQUEST;
message = "INVALID_UUID";
} else if let Some(e) = err.find::<warp::filters::body::BodyDeserializeError>() {
message = "BAD_REQUEST";
code = StatusCode::BAD_REQUEST;
} else if let Some(_) = err.find::<warp::reject::MethodNotAllowed>() {
message = "METHOD_NOT_ALLOWED";
code = StatusCode::METHOD_NOT_ALLOWED;
} else {
// We should have expected this... Just log and say its a 500
eprintln!("unhandled rejection: {:?}", err);
message = "UNHANDLED_REJECTION";
code = StatusCode::INTERNAL_SERVER_ERROR;
}
let json = warp::reply::json(&ErrorMessage {
success: false,
code: code.as_u16(),
message: message.into(),
});
Ok(warp::reply::with_status(json, code))
}
#[tokio::main]
@@ -605,10 +155,28 @@ async fn main() {
.and(warp::path::end())
.and(warp::get())
.and(accept_json)
.map(|| warp::reply::json(&get_lists()))
.with(cors);
.map(|| warp::reply::json(&packager::get_lists()))
.with(&cors);
let list = warp::path!("v1" / "lists" / String)
.and(warp::path::end())
.and(warp::get())
.and(accept_json)
.and_then(|id: String| async move {
match Uuid::parse_str(&id) {
Ok(uuid) => {
let list = &packager::get_list(uuid);
match list {
Some(l) => Ok(warp::reply::json(l)),
None => Err(warp::reject::not_found()),
}
}
Err(e) => Err(warp::reject::custom(InvalidUuid)),
}
})
.with(&cors)
.recover(handle_rejection);
let routes = root.or(v1).or(lists);
let routes = root.or(v1).or(lists).or(list);
warp::serve(routes).run(([127, 0, 0, 1], 9000)).await;
}