Code cleanup

src/data_provider/card_states.rs

@@ -1,20 +1,14 @@
-use std::sync::Arc;
-use crate::data::entities::{CardState, DeckSettings};
+use crate::data::entities::CardState;
 use crate::data::repositories::{DataRepository, DataRepositoryInner, Query};
+use crate::data::Id;
 use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
-use crate::notification::NotificationData::{DbLoadError, DbSaveError};
-use crate::notification::{MaybeError, NotificationData};
 use chrono::NaiveDate;
 use fsrs::MemoryState;
-use log::info;
-use rusqlite::{Connection, Error, Params, Row, params};
-use std::time::Instant;
-use crate::data::Id;
+use rusqlite::{Error, Params, Row};
+use std::sync::Arc;
 
-pub type CardStateRepository =
-    DataRepository<CardState, CardStateDbLayer>;
-pub type CardStateRepositoryInner =
-    DataRepositoryInner<CardState, CardStateDbLayer>;
+pub type CardStateRepository = DataRepository<CardState, CardStateDbLayer>;
+pub type CardStateRepositoryInner = DataRepositoryInner<CardState, CardStateDbLayer>;
 pub type CardStateDbLayer = SqliteDbLayer<CardState, CardStatesQuerySet>;
 #[derive(Clone)]
 pub struct CardStatesQuerySet;
@@ -73,35 +67,6 @@ impl TableAccessQuerySet<CardState> for CardStatesQuerySet {
         )
     }
 }
-pub fn load_stats_of_deck(
-    set: &DeckSettings,
-    connection: &Connection,
-) -> Result<Vec<CardState>, NotificationData> {
-    let mut stmt = connection
-        .prepare("SELECT id, word_id, score, last_opened, fsrs_opened, fsrs_memory, fsrs_open_day FROM states WHERE set_id = ?1")
-        .expect("Failed to prepare state query");
-    let iter = stmt
-        .query_map((set.id,), |row| {
-            Ok(CardState {
-                id: row.get(0)?,
-                word_id: row.get(1)?,
-                deck_id: set.id,
-                score: row.get(2)?,
-                fsrs_opened: NaiveDate::from_epoch_days(row.get::<usize, i32>(4)?)
-                    .expect("Incorrect date encoding"),
-                fsrs_memory: get_memory(row.get(5)?),
-                last_open: row.get(3)?,
-                fsrs_open_day: NaiveDate::from_epoch_days(row.get::<usize, i32>(6)?)
-                    .expect("Incorrect date encoding"),
-            })
-        })
-        .map_err(|_| DbLoadError)?;
-
-    let mut buffer = Vec::with_capacity(512);
-    iter.filter_map(|res| res.ok()).for_each(|i| buffer.push(i));
-
-    Ok(buffer)
-}
 
 fn get_memory(value: i64) -> Option<MemoryState> {
     if value == 0 {
@@ -122,7 +87,10 @@ fn memory_to_i64(value: &Option<MemoryState>) -> i64 {
 }
 
 impl CardStateRepositoryInner {
-    pub fn deck_states(&self, deck_id: Id) -> Query<CardState, CardStateRepositoryInner, CardStateDbLayer> {
-        self.query(Arc::new(move |state| {state.deck_id == deck_id}))
+    pub fn deck_states(
+        &self,
+        deck_id: Id,
+    ) -> Query<CardState, CardStateRepositoryInner, CardStateDbLayer> {
+        self.query(Arc::new(move |state| state.deck_id == deck_id))
     }
-}
+}