src/data/entities.rs

@@ -203,6 +203,11 @@ impl CardState {
     }
 }
 
+pub struct CustomField{
+    pub id: Id,
+    pub name: String,
+}
+
 #[derive(Copy)]
 pub struct EntityHandle<E> {
     pub(crate) id: Id,

src/data_provider/card_states.rs

@@ -1,5 +1,5 @@
 use crate::data::entities::{CardState, DeckSettings};
-use crate::data_provider::TableAccessQuerySet;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
 use crate::notification::NotificationData::{DbLoadError, DbSaveError};
 use crate::notification::{MaybeError, NotificationData};
 use chrono::NaiveDate;
@@ -7,7 +7,9 @@ use fsrs::MemoryState;
 use log::info;
 use rusqlite::{Connection, Error, Params, Row, params};
 use std::time::Instant;
+use crate::data::repositories::DataRepository;
 
+type CardStateRepository = DataRepository<CardState, SqliteDbLayer<CardState, CardStatesQuerySet>>;
 pub struct CardStatesQuerySet;
 impl TableAccessQuerySet<CardState> for CardStatesQuerySet {
     fn load() -> &'static str {

src/data_provider/custom_fields.rs

@@ -1,7 +1,10 @@
-use crate::data::entities::WordGroup;
+use crate::data::entities::{CustomField, WordGroup};
-use crate::data_provider::TableAccessQuerySet;
+use crate::data::repositories::DataRepository;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
 use rusqlite::{Error, Params, Row};
 
+type CustomFieldRepository = DataRepository<CustomField, SqliteDbLayer<CustomField, CustomFieldsQuerySet>>;
+
 pub struct CustomFieldsQuerySet;
 impl TableAccessQuerySet<WordGroup> for CustomFieldsQuerySet {
     fn load() -> &'static str {

src/data_provider/decks.rs

@@ -1,10 +1,14 @@
 use crate::core::srs::OrderMode;
 use crate::data::entities::{CardState, DeckSettings};
-use crate::data_provider::TableAccessQuerySet;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
 use crate::notification::NotificationData::{DbLoadError, DbSaveError};
 use crate::notification::{MaybeError, NotificationData};
 use chrono::NaiveDate;
 use rusqlite::{Connection, Error, Params, Row};
+use crate::data::repositories::DataRepository;
+use crate::data_provider::card_states::CardStatesQuerySet;
+
+type DeckRepository = DataRepository<DeckSettings, SqliteDbLayer<DeckSettings, DeckQuerySet>>;
 
 pub struct DeckQuerySet;
 impl TableAccessQuerySet<DeckSettings> for DeckQuerySet {

src/data_provider/word_groups.rs

@@ -1,6 +1,10 @@
-use crate::data::entities::WordGroup;
+use crate::data::entities::{DeckSettings, WordGroup};
-use crate::data_provider::TableAccessQuerySet;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
 use rusqlite::{Error, Params, Row};
+use crate::data::repositories::DataRepository;
+use crate::data_provider::decks::DeckQuerySet;
+
+type WordGroupRepository = DataRepository<WordGroup, SqliteDbLayer<WordGroup, WordGroupQuerySet>>;
 
 pub struct WordGroupQuerySet;
 impl TableAccessQuerySet<WordGroup> for WordGroupQuerySet {

src/data_provider/words.rs

@@ -1,10 +1,13 @@
 use crate::data::entities::{WordData, WordGroup};
-use crate::data_provider::TableAccessQuerySet;
+use crate::data_provider::{SqliteDbLayer, TableAccessQuerySet};
 use crate::notification::NotificationData::{DbLoadError, DbSaveError};
 use crate::notification::{MaybeError, NotificationData};
 use litemap::LiteMap;
 use rusqlite::{Connection, Error, Params, Row, params};
 use std::collections::HashMap;
+use crate::data::repositories::DataRepository;
+
+type DeckRepository = DataRepository<WordData, SqliteDbLayer<WordData, WordQuerySet>>;
 
 pub struct WordQuerySet;
 impl TableAccessQuerySet<WordData> for WordQuerySet {