migration.sql

@@ -213,9 +213,3 @@ CREATE TABLE IF NOT EXISTS "trailer_reservation" (
 	"created_at" datetime not null default CURRENT_TIMESTAMP
 );
 
-CREATE TABLE IF NOT EXISTS "distance" (
-	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
-	"destination" text NOT NULL,
-	"distance_in_km" integer NOT NULL
-);
-

seeds.sql

@@ -67,5 +67,3 @@ INSERT INTO "boat_damage" (boat_id, desc, user_id_created, created_at, lock_boat
 INSERT INTO "notification" (user_id, message, category) VALUES (1, 'This is a test notification', 'test-cat');
 INSERT INTO "trailer" (name) VALUES('Großer Hänger');
 INSERT INTO "trailer" (name) VALUES('Kleiner Hänger');
-insert into distance(destination, distance_in_km) values('Ottensheim', 25);
-

src/model/distance.rs

@@ -1,33 +0,0 @@
-use serde::Serialize;
-use sqlx::{FromRow, SqlitePool};
-
-#[derive(FromRow, Serialize, Clone, Debug)]
-pub struct Distance {
-    pub id: i64,
-    pub destination: String,
-    pub distance_in_km: i64,
-}
-
-impl Distance {
-    /// Return all default `distance`s, ordered by usage in logbook entries
-    pub async fn all(db: &SqlitePool) -> Vec<Self> {
-        sqlx::query_as!(
-            Self,
-            "SELECT 
-    d.id,
-    d.destination,
-    d.distance_in_km
-FROM 
-    distance d
-LEFT JOIN 
-    logbook l ON d.destination = l.destination AND d.distance_in_km = l.distance_in_km
-GROUP BY 
-    d.id, d.destination, d.distance_in_km
-ORDER BY 
-    COUNT(l.id) DESC, d.destination ASC;"
-        )
-        .fetch_all(db)
-        .await
-        .unwrap()
-    }
-}

src/model/logbook.rs

@@ -496,6 +496,25 @@ ORDER BY departure DESC
         Ok(())
     }
 
+    pub async fn distances(db: &SqlitePool) -> Vec<(String, i64)> {
+        let result = sqlx::query!("SELECT destination, distance_in_km FROM logbook WHERE id IN (SELECT MIN(id) FROM logbook GROUP BY destination) AND destination IS NOT NULL AND distance_in_km IS NOT NULL;")
+        .fetch_all(db)
+        .await
+        .unwrap();
+
+        result
+            .into_iter()
+            .filter_map(|r| {
+                if let (Some(destination), Some(distance_in_km)) = (r.destination, r.distance_in_km)
+                {
+                    Some((destination, distance_in_km))
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
     async fn remove_rowers(&self, db: &mut Transaction<'_, Sqlite>) {
         sqlx::query!("DELETE FROM rower WHERE logbook_id=?", self.id)
             .execute(db.deref_mut())
@@ -1052,6 +1071,21 @@ mod test {
         assert_eq!(res, Err(LogbookCreateError::TooManyRowers(1, 2)));
     }
 
+    #[sqlx::test]
+    fn test_distances() {
+        let pool = testdb!();
+
+        let res = Logbook::distances(&pool).await;
+
+        assert_eq!(
+            res,
+            vec![
+                ("Ottensheim".into(), 25 as i64),
+                ("Ottensheim + Regattastrecke".into(), 29 as i64),
+            ]
+        );
+    }
+
     #[sqlx::test]
     fn test_succ_home() {
         let pool = testdb!();

src/model/mod.rs

@@ -14,7 +14,6 @@ pub mod boat;
 pub mod boatdamage;
 pub mod boathouse;
 pub mod boatreservation;
-pub mod distance;
 pub mod event;
 pub mod family;
 pub mod location;

src/tera/log.rs

@@ -18,7 +18,6 @@ use tera::Context;
 use crate::model::{
     boat::Boat,
     boatreservation::BoatReservation,
-    distance::Distance,
     log::Log,
     logbook::{
         LogToAdd, LogToFinalize, LogToUpdate, Logbook, LogbookAdminUpdateError, LogbookCreateError,
@@ -76,7 +75,7 @@ async fn index(
     });
 
     let logtypes = LogType::all(db).await;
-    let distances = Distance::all(db).await;
+    let distances = Logbook::distances(db).await;
 
     let on_water = Logbook::on_water(db).await;
 
@@ -181,7 +180,7 @@ async fn kiosk(
     });
 
     let logtypes = LogType::all(db).await;
-    let distances = Distance::all(db).await;
+    let distances = Logbook::distances(db).await;
 
     let on_water = Logbook::on_water(db).await;
 

templates/includes/forms/log.html.tera

@@ -53,10 +53,9 @@
                    id="destination"
                    name="destination"
                    value=""
-                   data-relation="distance_in_km" 
+                   data-relation="distance_in_km" />
-		   autocomplete="off" />
             <datalist id="destinations">
-                {% for distance in distances %}<option value="{{ distance.destination  }}" distance="{{ distance.distance_in_km}}" />{% endfor %}
+                {% for distance in distances %}<option value="{{ distance.0 }}" distance="{{ distance.1 }}" />{% endfor %}
             </datalist>
         </div>
         <div class="relative col-span-2">