cargo clippy

src/model/boathouse.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use rocket::serde::{Deserialize, Serialize};
 use sqlx::{FromRow, SqlitePool};
 
@@ -7,6 +5,93 @@ use crate::tera::board::boathouse::FormBoathouseToAdd;
 
 use super::boat::Boat;
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BoathousePlace {
+    boat: Boat,
+    boathouse_id: i64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BoathouseRack {
+    boats: [Option<BoathousePlace>; 12],
+}
+
+impl BoathouseRack {
+    fn new() -> Self {
+        let boats = [
+            None, None, None, None, None, None, None, None, None, None, None, None,
+        ];
+        Self { boats }
+    }
+
+    async fn add(&mut self, db: &SqlitePool, boathouse: Boathouse) {
+        self.boats[boathouse.level as usize] = Some(BoathousePlace {
+            boat: Boat::find_by_id(db, boathouse.boat_id as i32)
+                .await
+                .unwrap(),
+            boathouse_id: boathouse.id,
+        });
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BoathouseSide {
+    mountain: BoathouseRack,
+    water: BoathouseRack,
+}
+
+impl BoathouseSide {
+    fn new() -> Self {
+        Self {
+            mountain: BoathouseRack::new(),
+            water: BoathouseRack::new(),
+        }
+    }
+
+    async fn add(&mut self, db: &SqlitePool, boathouse: Boathouse) {
+        match boathouse.side.as_str() {
+            "mountain" => self.mountain.add(db, boathouse).await,
+            "water" => self.water.add(db, boathouse).await,
+            _ => panic!("db constraint failed"),
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BoathouseAisles {
+    mountain: BoathouseSide,
+    middle: BoathouseSide,
+    water: BoathouseSide,
+}
+
+impl BoathouseAisles {
+    fn new() -> Self {
+        Self {
+            mountain: BoathouseSide::new(),
+            middle: BoathouseSide::new(),
+            water: BoathouseSide::new(),
+        }
+    }
+
+    async fn add(&mut self, db: &SqlitePool, boathouse: Boathouse) {
+        match boathouse.aisle.as_str() {
+            "water" => self.water.add(db, boathouse).await,
+            "middle" => self.middle.add(db, boathouse).await,
+            "mountain" => self.mountain.add(db, boathouse).await,
+            _ => panic!("db constraint failed"),
+        };
+    }
+
+    pub async fn from(db: &SqlitePool, boathouses: Vec<Boathouse>) -> Self {
+        let mut ret = BoathouseAisles::new();
+
+        for boathouse in boathouses {
+            ret.add(db, boathouse).await;
+        }
+        ret
+    }
+}
+
 #[derive(FromRow, Debug, Serialize, Deserialize)]
 pub struct Boathouse {
     pub id: i64,
@@ -17,54 +102,7 @@ pub struct Boathouse {
 }
 
 impl Boathouse {
-    pub async fn get(db: &SqlitePool) -> HashMap<&str, HashMap<&str, [Option<(i64, Boat)>; 12]>> {
-        let mut ret: HashMap<&str, HashMap<&str, [Option<(i64, Boat)>; 12]>> = HashMap::new();
-
-        let mut mountain = HashMap::new();
-        mountain.insert(
-            "mountain",
-            [
-                None, None, None, None, None, None, None, None, None, None, None, None,
-            ],
-        );
-        mountain.insert(
-            "water",
-            [
-                None, None, None, None, None, None, None, None, None, None, None, None,
-            ],
-        );
-        ret.insert("mountain-aisle", mountain);
-
-        let mut middle = HashMap::new();
-        middle.insert(
-            "mountain",
-            [
-                None, None, None, None, None, None, None, None, None, None, None, None,
-            ],
-        );
-        middle.insert(
-            "water",
-            [
-                None, None, None, None, None, None, None, None, None, None, None, None,
-            ],
-        );
-        ret.insert("middle-aisle", middle);
-
-        let mut water = HashMap::new();
-        water.insert(
-            "mountain",
-            [
-                None, None, None, None, None, None, None, None, None, None, None, None,
-            ],
-        );
-        water.insert(
-            "water",
-            [
-                None, None, None, None, None, None, None, None, None, None, None, None,
-            ],
-        );
-        ret.insert("water-aisle", water);
-
+    pub async fn get(db: &SqlitePool) -> BoathouseAisles {
         let boathouses = sqlx::query_as!(
             Boathouse,
             "SELECT id, boat_id, aisle, side, level FROM boathouse"
@@ -73,21 +111,7 @@ impl Boathouse {
         .await
         .unwrap(); //TODO: fixme
 
-        for boathouse in boathouses {
-            let aisle = ret
-                .get_mut(format!("{}-aisle", boathouse.aisle).as_str())
-                .unwrap();
-            let side = aisle.get_mut(boathouse.side.as_str()).unwrap();
-
-            side[boathouse.level as usize] = Some((
-                boathouse.id,
-                Boat::find_by_id(db, boathouse.boat_id as i32)
-                    .await
-                    .unwrap(),
-            ));
-        }
-
-        ret
+        BoathouseAisles::from(db, boathouses).await
     }
 
     pub async fn create(db: &SqlitePool, data: FormBoathouseToAdd) -> Result<(), String> {