feat: Table operators are a thin wrapper around DatabaseOperator

Author: angrynode

src/database/content_folder/folder_view.rs

@@ -15,7 +15,7 @@ pub struct FolderView {
 
 impl FolderView {
     /// Loads the top-most folder view, which is not a folder and may not have parents.
-    pub async fn index(operator: &ContentFolderOperator) -> Result<Self, ContentFolderError> {
+    pub async fn index(operator: &ContentFolderOperator<'_>) -> Result<Self, ContentFolderError> {
         let children = operator
             .list()
             .await?
@@ -37,7 +37,7 @@ impl FolderView {
     /// - the requested ID does not exist
     // TODO: optimize with custom query
     pub async fn from_id(
-        operator: &ContentFolderOperator,
+        operator: &ContentFolderOperator<'_>,
         id: i32,
     ) -> Result<Self, ContentFolderError> {
         let list = operator.list().await?;

src/database/content_folder/operator.rs

@@ -2,36 +2,31 @@ use chrono::Utc;
 use sea_orm::*;
 use snafu::prelude::*;
 
+use std::ops::Deref;
 use std::str::FromStr;
 
 use crate::database::operation::OperationLog;
 use crate::database::operation::OperationType;
 use crate::database::operation::Table;
 use crate::database::operator::DatabaseOperator;
 use crate::extractors::normalized_path::NormalizedPathComponent;
-use crate::extractors::user::User;
-use crate::state::AppState;
 
 use super::*;
 
 #[derive(Clone, Debug)]
-pub struct ContentFolderOperator {
-    pub state: AppState,
-    pub user: Option<User>,
+pub struct ContentFolderOperator<'a> {
+    pub db: &'a DatabaseOperator,
 }
 
-impl ContentFolderOperator {
-    pub fn new(state: AppState, user: Option<User>) -> Self {
-        Self { state, user }
-    }
+impl Deref for ContentFolderOperator<'_> {
+    type Target = DatabaseOperator;
 
-    pub fn db(&self) -> DatabaseOperator {
-        DatabaseOperator {
-            state: self.state.clone(),
-            user: self.user.clone(),
-        }
+    fn deref(&self) -> &DatabaseOperator {
+        self.db
     }
+}
 
+impl ContentFolderOperator<'_> {
     /// List content folders
     ///
     /// Should not fail, unless SQLite was corrupted for some reason.

src/database/operator.rs

@@ -13,10 +13,7 @@ impl DatabaseOperator {
         Self { state, user }
     }
 
-    pub fn content_folder(&self) -> ContentFolderOperator {
-        ContentFolderOperator {
-            state: self.state.clone(),
-            user: self.user.clone(),
-        }
+    pub fn content_folder<'a>(&'a self) -> ContentFolderOperator<'a> {
+        ContentFolderOperator { db: self }
     }
 }