Merge pull request 'show-waterlevel' (#465 ) from show-waterlevel into staging

Reviewed-on: #465
show waterlevel for the next days
2024-04-30 13:06:08 +02:00 · 2024-04-30 11:59:33 +02:00 · 2024-04-29 22:30:29 +02:00
11 changed files with 369 additions and 4 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -485,6 +485,26 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"

+[[package]]
+name = "crc32fast"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "cron"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07"
+dependencies = [
+ "chrono",
+ "nom",
+ "once_cell",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.12"
@ -774,6 +794,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"

+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "flume"
 version = "0.11.0"
@ -1301,6 +1331,17 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"

+[[package]]
+name = "job_scheduler_ng"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87c252207f323e2996d087759ebdcff8f608cd3eaa9896909a0c2dd3050a3c6a"
+dependencies = [
+ "chrono",
+ "cron",
+ "uuid",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.69"
@ -2227,6 +2268,7 @@ dependencies = [
 "futures",
 "ics",
 "itertools",
+ "job_scheduler_ng",
 "lettre",
 "log",
 "openssl",
@ -2236,6 +2278,7 @@ dependencies = [
 "serde_json",
 "sqlx",
 "tera",
+ "ureq",
 ]

 [[package]]
@ -2284,10 +2327,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
 "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
 "sct",
 ]

+[[package]]
+name = "rustls"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.3",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@ -2297,6 +2354,12 @@ dependencies = [
 "base64 0.21.7",
 ]

+[[package]]
+name = "rustls-pki-types"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@ -2307,6 +2370,17 @@ dependencies = [
 "untrusted",
 ]

+[[package]]
+name = "rustls-webpki"
+version = "0.102.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.15"
@ -2590,7 +2664,7 @@ dependencies = [
 "once_cell",
 "paste",
 "percent-encoding",
- "rustls",
+ "rustls 0.21.10",
 "rustls-pemfile",
 "serde",
 "serde_json",
@ -2603,7 +2677,7 @@ dependencies = [
 "tokio-stream",
 "tracing",
 "url",
- "webpki-roots",
+ "webpki-roots 0.25.4",
 ]

 [[package]]
@ -3232,6 +3306,25 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"

+[[package]]
+name = "ureq"
+version = "2.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
+dependencies = [
+ "base64 0.22.0",
+ "flate2",
+ "log",
+ "once_cell",
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.3",
+ "serde",
+ "serde_json",
+ "url",
+ "webpki-roots 0.26.1",
+]
+
 [[package]]
 name = "url"
 version = "2.5.0"
@ -3255,6 +3348,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"

+[[package]]
+name = "uuid"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@ -3364,6 +3466,15 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"

+[[package]]
+name = "webpki-roots"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -25,6 +25,8 @@ futures = "0.3"
 lettre = "0.11"
 csv = "1.3"
 itertools = "0.12"
+job_scheduler_ng = "2.0"
+ureq = { version = "2.9", features = ["json"] }

 [target.'cfg(not(windows))'.dependencies]
 openssl = { version = "0.10", features = [ "vendored" ] }
--- a/migration.sql
+++ b/migration.sql
@ -175,3 +175,14 @@ CREATE TABLE IF NOT EXISTS "boat_reservation" (
 	"created_at" datetime not null default CURRENT_TIMESTAMP
 );

+CREATE TABLE IF NOT EXISTS "waterlevel" (
+	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"day" DATE NOT NULL,
+	"time" TEXT NOT NULL,
+	"max" INTEGER NOT NULL,
+	"min" INTEGER NOT NULL,
+	"mittel" INTEGER NOT NULL,
+	"tumax" INTEGER NOT NULL,
+	"tumin" INTEGER NOT NULL,
+	"tumittel" INTEGER NOT NULL
+);
--- a/src/lib.rs
+++ b/src/lib.rs
@ -8,6 +8,8 @@ pub mod tera;
 #[cfg(feature = "rest")]
 pub mod rest;

+pub mod scheduled;
+
 #[cfg(test)]
 #[macro_export]
 macro_rules! testdb {
--- a/src/main.rs
+++ b/src/main.rs
@ -4,6 +4,7 @@ use std::str::FromStr;

 #[cfg(feature = "rest")]
 use rot::rest;
+use rot::scheduled;
 #[cfg(feature = "rowing-tera")]
 use rot::tera;

@ -26,6 +27,8 @@ async fn rocket() -> _ {
        .await
        .unwrap();

+    scheduled::schedule(&db).await;
+
    let rocket = rocket::build().manage(db);

    #[cfg(feature = "rowing-tera")]
--- a/src/model/mod.rs
+++ b/src/model/mod.rs
@ -5,6 +5,7 @@ use sqlx::SqlitePool;
 use self::{
    planned_event::{PlannedEvent, PlannedEventWithUserAndTriptype},
    trip::{Trip, TripWithUserAndType},
+    waterlevel::Waterlevel,
 };

 pub mod boat;
@ -27,6 +28,7 @@ pub mod tripdetails;
 pub mod triptype;
 pub mod user;
 pub mod usertrip;
+pub mod waterlevel;

 #[derive(Serialize, Debug)]
 pub struct Day {
@ -34,6 +36,7 @@ pub struct Day {
    planned_events: Vec<PlannedEventWithUserAndTriptype>,
    trips: Vec<TripWithUserAndType>,
    is_pinned: bool,
+    max_waterlevel: Option<i64>,
 }

 impl Day {
@ -44,6 +47,7 @@ impl Day {
                planned_events: PlannedEvent::get_pinned_for_day(db, day).await,
                trips: Trip::get_pinned_for_day(db, day).await,
                is_pinned,
+                max_waterlevel: Waterlevel::max_waterlevel_for_day(db, day).await,
            }
        } else {
            Self {
@ -51,6 +55,7 @@ impl Day {
                planned_events: PlannedEvent::get_for_day(db, day).await,
                trips: Trip::get_for_day(db, day).await,
                is_pinned,
+                max_waterlevel: Waterlevel::max_waterlevel_for_day(db, day).await,
            }
        }
    }
--- a/src/model/waterlevel.rs
+++ b/src/model/waterlevel.rs
@ -0,0 +1,72 @@
+use std::ops::DerefMut;
+
+use chrono::NaiveDate;
+use rocket::serde::{Deserialize, Serialize};
+use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
+
+#[derive(FromRow, Debug, Serialize, Deserialize, Eq, Hash, PartialEq, Clone)]
+pub struct Waterlevel {
+    pub id: i64,
+    pub day: NaiveDate,
+    pub time: String,
+    pub max: i64,
+    pub min: i64,
+    pub mittel: i64,
+    pub tumax: i64,
+    pub tumin: i64,
+    pub tumittel: i64,
+}
+
+impl Waterlevel {
+    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT * FROM waterlevel WHERE id like ?", id)
+            .fetch_one(db)
+            .await
+            .ok()
+    }
+    pub async fn find_by_id_tx(db: &mut Transaction<'_, Sqlite>, id: i32) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT * FROM waterlevel WHERE id like ?", id)
+            .fetch_one(db.deref_mut())
+            .await
+            .ok()
+    }
+
+    pub async fn create(
+        db: &mut Transaction<'_, Sqlite>,
+        day: NaiveDate,
+        time: String,
+        max: i64,
+        min: i64,
+        mittel: i64,
+        tumax: i64,
+        tumin: i64,
+        tumittel: i64,
+    ) -> Result<(), String> {
+        sqlx::query!(
+            "INSERT INTO waterlevel(day, time, max, min, mittel, tumax, tumin, tumittel) VALUES (?,?,?,?,?,?,?,?)",
+            day, time, max, min, mittel, tumax, tumin, tumittel
+        )
+        .execute(db.deref_mut())
+        .await
+        .map_err(|e| e.to_string())?;
+        Ok(())
+    }
+
+    pub async fn max_waterlevel_for_day(db: &SqlitePool, day: NaiveDate) -> Option<i64> {
+        sqlx::query!(
+            "SELECT MAX(mittel) as max FROM waterlevel WHERE day = ?",
+            day
+        )
+        .fetch_one(db)
+        .await
+        .unwrap()
+        .max
+    }
+
+    pub async fn delete_all(db: &mut Transaction<'_, Sqlite>) {
+        sqlx::query!("DELETE FROM waterlevel;")
+            .execute(db.deref_mut())
+            .await
+            .unwrap();
+    }
+}
--- a/src/scheduled/mod.rs
+++ b/src/scheduled/mod.rs
@ -0,0 +1,33 @@
+mod waterlevel;
+
+use std::time::Duration;
+
+use job_scheduler_ng::{Job, JobScheduler};
+use rocket::tokio::{self, task};
+use sqlx::SqlitePool;
+
+pub async fn schedule(db: &SqlitePool) {
+    let db = db.clone();
+
+    waterlevel::update(&db).await.unwrap();
+
+    tokio::task::spawn(async {
+        let mut sched = JobScheduler::new();
+
+        // Every hour
+        sched.add(Job::new("0 0 * * * * *".parse().unwrap(), move || {
+            let db_clone = db.clone();
+            // Use block_in_place to run async code in the synchronous function
+            task::block_in_place(|| {
+                tokio::runtime::Handle::current().block_on(async {
+                    waterlevel::update(&db_clone).await.unwrap();
+                });
+            });
+        }));
+
+        loop {
+            sched.tick();
+            std::thread::sleep(Duration::from_secs(60));
+        }
+    });
+}
--- a/src/scheduled/waterlevel.rs
+++ b/src/scheduled/waterlevel.rs
@ -0,0 +1,112 @@
+use chrono::{DateTime, FixedOffset, NaiveDate, NaiveTime};
+use serde::{Deserialize, Serialize};
+use sqlx::SqlitePool;
+
+use crate::model::waterlevel::Waterlevel;
+
+pub async fn update(db: &SqlitePool) -> Result<(), String> {
+    let mut tx = db.begin().await.unwrap();
+
+    // 1. Delete water levels starting from yesterday
+    Waterlevel::delete_all(&mut tx).await;
+
+    // 2. Fetch
+    let station = fetch()?;
+    for d in station.data {
+        let (Some(max), Some(min), Some(mittel), Some(tumax), Some(tumin), Some(tumittel)) =
+            (d.max, d.min, d.mittel, d.tumax, d.tumin, d.tumittel)
+        else {
+            println!("Ignored invalid values: {d:?}");
+            continue;
+        };
+
+        let Ok(datetime): Result<DateTime<FixedOffset>, _> = d.timestamp.parse() else {
+            return Err("Failed to parse datetime from hydro json".into());
+        };
+        let date: NaiveDate = datetime.naive_utc().date();
+
+        // Extract time component and format as string
+        let time: NaiveTime = datetime.naive_utc().time();
+        let time_str = time.format("%H:%M").to_string();
+
+        Waterlevel::create(
+            &mut tx, date, time_str, max, min, mittel, tumax, tumin, tumittel,
+        )
+        .await?
+    }
+
+    // 3. Save in DB
+    tx.commit().await.unwrap();
+
+    Ok(())
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Station {
+    station_no: String,
+    station_latitude: String,
+    station_longitude: String,
+    parametertype_name: String,
+    ts_shortname: String,
+    ts_name: String,
+    ts_unitname: String,
+    ts_unitsymbol: String,
+    ts_precision: String,
+    rows: String,
+    columns: String,
+    data: Vec<Data>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Data {
+    timestamp: String,
+    max: Option<i64>,
+    min: Option<i64>,
+    mittel: Option<i64>,
+    tumax: Option<i64>,
+    tumin: Option<i64>,
+    tumittel: Option<i64>,
+}
+
+fn fetch() -> Result<Station, String> {
+    let url = "https://hydro.ooe.gv.at/daten/internet/stations/OG/207068/S/forecast.json";
+
+    match ureq::get(url).call() {
+        Ok(response) => {
+            let forecast: Result<Vec<Station>, _> = response.into_json();
+
+            if let Ok(data) = forecast {
+                if data.len() == 1 {
+                    return Ok(data[0].clone());
+                } else {
+                    return Err(format!(
+                        "Expected 1 station (Linz); got {} while fetching from {url}. Maybe the hydro data format changed?",
+                        data.len()
+                    ));
+                }
+            } else {
+                return Err(format!(
+                    "Failed to parse the json received by {url}: {}",
+                    forecast.err().unwrap()
+                ));
+            }
+        }
+        Err(_) => {
+            return Err(format!(
+                "Could not fetch {url}, do you have internet? Maybe their server is down?"
+            ));
+        }
+    }
+}
+
+//#[cfg(test)]
+//mod test {
+//    use crate::testdb;
+//
+//    use super::*;
+//    #[sqlx::test]
+//    fn test_fetch_succ() {
+//        let pool = testdb!();
+//        fetch();
+//    }
+//}
--- a/staging-diff.sql
+++ b/staging-diff.sql
@ -1,3 +1,15 @@
+CREATE TABLE IF NOT EXISTS "waterlevel" (
+	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"day" DATE NOT NULL,
+	"time" TEXT NOT NULL,
+	"max" INTEGER NOT NULL,
+	"min" INTEGER NOT NULL,
+	"mittel" INTEGER NOT NULL,
+	"tumax" INTEGER NOT NULL,
+	"tumin" INTEGER NOT NULL,
+	"tumittel" INTEGER NOT NULL
+);
+
 -- test user
 INSERT INTO user(name) VALUES('Marie');
 INSERT INTO "user_role" (user_id, role_id) VALUES((SELECT id from user where name = 'Marie'),(SELECT id FROM role where name = 'Donau Linz'));
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@ -91,7 +91,9 @@
                <div>
                    <h2 class="font-bold uppercase tracking-wide text-center rounded-t-md  {% if day.is_pinned %} text-white bg-primary-950 {% else %} text-primary-950 dark:text-white bg-gray-200 dark:bg-primary-950 bg-opacity-80 {% endif %} text-lg px-3 py-3 ">
                        {{ day.day| date(format="%d.%m.%Y") }}
-                        <small class="inline-block ml-1 text-xs {% if day.is_pinned %} text-gray-200 {% else %} text-gray-500 dark:text-gray-100 {% endif %}">{{ day.day | date(format="%A", locale="de_AT") }}</small>
+                        <small class="inline-block ml-1 text-xs {% if day.is_pinned %} text-gray-200 {% else %} text-gray-500 dark:text-gray-100 {% endif %}">{{ day.day | date(format="%A", locale="de_AT") }}
+                            {% if day.max_waterlevel %}&bullet; 🌊{{ day.max_waterlevel }}cm{% endif %}
+                        </small>
                    </h2>
                    {% if day.planned_events | length > 0 or  day.trips | length > 0 %}
                        <div class="grid grid-cols-1 gap-3 mb-3">
Author	SHA1	Message	Date
philipp	74b24569dd	Merge pull request 'show-waterlevel' (#465 ) from show-waterlevel into staging All checks were successful CI/CD Pipeline / test (push) Successful in 8m30s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m20s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #465	2024-04-30 13:06:08 +02:00
philipp	3a39315a01	show waterlevel for the next days All checks were successful CI/CD Pipeline / test (push) Successful in 9m49s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details	2024-04-30 11:59:33 +02:00
philipp	3323807e46	Merge pull request 'no boat is selected by default in the logbook -> users don't accidentally 'select' external boat' (#459 ) from no-boat-selected-by-default-in-logbook into main All checks were successful CI/CD Pipeline / test (push) Successful in 8m7s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 6m21s Details Reviewed-on: #459	2024-04-29 22:30:29 +02:00