Start ivago calendar endpoint
parent
b42ea850cd
commit
c6d29f329c
|
@ -152,6 +152,19 @@ version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "chrono"
|
||||||
|
version = "0.4.19"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"num-integer",
|
||||||
|
"num-traits",
|
||||||
|
"time 0.1.43",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cipher"
|
name = "cipher"
|
||||||
version = "0.2.5"
|
version = "0.2.5"
|
||||||
|
@ -902,6 +915,25 @@ dependencies = [
|
||||||
"winapi 0.3.9",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-integer"
|
||||||
|
version = "0.1.44"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"num-traits",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-traits"
|
||||||
|
version = "0.2.14"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num_cpus"
|
name = "num_cpus"
|
||||||
version = "1.13.0"
|
version = "1.13.0"
|
||||||
|
@ -1258,6 +1290,7 @@ dependencies = [
|
||||||
name = "rust-api"
|
name = "rust-api"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"rocket",
|
"rocket",
|
||||||
"rocket_contrib",
|
"rocket_contrib",
|
||||||
|
|
|
@ -9,6 +9,7 @@ edition = "2018"
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rocket = "0.4.7"
|
rocket = "0.4.7"
|
||||||
serde = "1.0.124"
|
serde = "1.0.124"
|
||||||
|
chrono = "0.4.19"
|
||||||
|
|
||||||
[dependencies.reqwest]
|
[dependencies.reqwest]
|
||||||
version = "0.11.2"
|
version = "0.11.2"
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
mod search;
|
mod search;
|
||||||
|
mod pickup_times;
|
||||||
pub use search::{Street, search_streets};
|
pub use search::{Street, search_streets};
|
||||||
|
pub use pickup_times::{get_pickup_times, PickupTime};
|
||||||
|
|
||||||
|
|
||||||
///// Return the known pickup times for the given street and/or city
|
///// Return the known pickup times for the given street and/or city
|
||||||
|
|
|
@ -1,19 +1,27 @@
|
||||||
|
use std::error::Error;
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
use super::search::Street;
|
||||||
|
|
||||||
|
|
||||||
const BASE_URL: &str = "https://www.ivago.be/nl/particulier/afval/ophaling";
|
const BASE_URL: &str = "https://www.ivago.be/nl/particulier/afval/ophaling";
|
||||||
|
|
||||||
|
|
||||||
/// Represents a timezoneless date
|
|
||||||
pub struct Date {
|
|
||||||
day: u8,
|
|
||||||
month: u8,
|
|
||||||
year: u32,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// Represents a pickup time instance. All fields are a direct map of the
|
/// Represents a pickup time instance. All fields are a direct map of the
|
||||||
/// original API
|
/// original API
|
||||||
pub struct PickupTime {
|
pub struct PickupTime {
|
||||||
date: Date,
|
date: NaiveDate,
|
||||||
label: String,
|
label: String,
|
||||||
classes: Vec<String>,
|
classes: Vec<String>,
|
||||||
url: String
|
url: String
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
pub fn get_pickup_times(
|
||||||
|
street: Street,
|
||||||
|
number: u64,
|
||||||
|
start_date: NaiveDate,
|
||||||
|
end_date: NaiveDate
|
||||||
|
) -> Result<Vec<PickupTime>, Box<dyn Error>> {
|
||||||
|
Ok(Vec::new())
|
||||||
|
}
|
||||||
|
|
|
@ -2,10 +2,11 @@
|
||||||
mod controller;
|
mod controller;
|
||||||
|
|
||||||
use rocket_contrib::json::Json;
|
use rocket_contrib::json::Json;
|
||||||
|
use chrono::NaiveDate;
|
||||||
|
|
||||||
pub fn routes() -> Vec<rocket::Route> {
|
pub fn routes() -> Vec<rocket::Route> {
|
||||||
routes![
|
routes![
|
||||||
search_streets_json,
|
route_search_streets,
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,12 +14,19 @@ pub fn routes() -> Vec<rocket::Route> {
|
||||||
// TODO make this async
|
// TODO make this async
|
||||||
// TODO change this so it can return errors instead of empty json
|
// TODO change this so it can return errors instead of empty json
|
||||||
#[get("/search?<street>", format="json")]
|
#[get("/search?<street>", format="json")]
|
||||||
pub fn search_streets_json(street: String) -> Json<Vec<controller::Street>> {
|
pub fn route_search_streets(street: String) -> Json<Vec<controller::Street>> {
|
||||||
match controller::search_streets(&street) {
|
match controller::search_streets(&street) {
|
||||||
Ok(streets) => Json(streets),
|
Ok(streets) => Json(streets),
|
||||||
Err(err) => {
|
Err(err) => Json(Vec::new()),
|
||||||
println!("{:?}", err);
|
|
||||||
Json(Vec::new())
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[get("/?<street>&<number>&<start_date>&<end_date>")]
|
||||||
|
pub fn route_get_pickup_times(
|
||||||
|
street: controller::Street,
|
||||||
|
number: u64,
|
||||||
|
start_date: NaiveDate,
|
||||||
|
end_date: NaiveDate
|
||||||
|
) -> Json<Vec<controller::PickupTime>> {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue