feat: Common logging interface via TableOperator trait

Author: angrynode

src/database/content_folder/operator.rs

@@ -1,14 +1,11 @@
-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::database::operator::{DatabaseOperator, TableOperator};
 use crate::extractors::normalized_path::NormalizedPathComponent;
 
 use super::*;
@@ -26,6 +23,12 @@ impl Deref for ContentFolderOperator<'_> {
     }
 }
 
+impl TableOperator for ContentFolderOperator<'_> {
+    fn table(&self) -> Table {
+        Table::ContentFolder
+    }
+}
+
 impl ContentFolderOperator<'_> {
     /// List content folders
     ///
@@ -101,24 +104,13 @@ impl ContentFolderOperator<'_> {
                 .context(IOSnafu)?;
         }
 
-        let operation_log = OperationLog {
-            user: self.user.clone(),
-            date: Utc::now(),
-            operation: ContentFolderOperation::Create {
-                id: model.id,
-                name: model.name.to_string(),
-                parent: parent.as_ref().map(|x| (x.id, x.name.to_string())),
-            }
-            .into(),
-            operation_type: OperationType::Create,
-            table: Table::ContentFolder,
-        };
-
-        self.state
-            .logger
-            .write(operation_log)
-            .await
-            .context(LoggerSnafu)?;
+        self.log_create(ContentFolderOperation::Create {
+            id: model.id,
+            name: model.name.to_string(),
+            parent: parent.as_ref().map(|x| (x.id, x.name.to_string())),
+        })
+        .await
+        .context(LoggerSnafu)?;
 
         Ok(model)
     }

src/database/operator.rs

@@ -1,6 +1,37 @@
+use chrono::Utc;
+
+use std::ops::Deref;
+
 use crate::database::content_folder::ContentFolderOperator;
+use crate::database::operation::{Operation, OperationLog, OperationType, Table};
 use crate::extractors::user::User;
 use crate::state::AppState;
+use crate::state::logger::LoggerError;
+
+pub trait TableOperator: Deref<Target = DatabaseOperator> {
+    fn table(&self) -> Table;
+
+    fn log_create(
+        &self,
+        operation: impl Into<Operation>,
+    ) -> impl std::future::Future<Output = Result<(), LoggerError>> {
+        self.log(self.table(), OperationType::Create, operation.into())
+    }
+
+    fn log_update(
+        &self,
+        operation: impl Into<Operation>,
+    ) -> impl std::future::Future<Output = Result<(), LoggerError>> {
+        self.log(self.table(), OperationType::Update, operation.into())
+    }
+
+    fn log_delete(
+        &self,
+        operation: impl Into<Operation>,
+    ) -> impl std::future::Future<Output = Result<(), LoggerError>> {
+        self.log(self.table(), OperationType::Delete, operation.into())
+    }
+}
 
 #[derive(Clone, Debug)]
 pub struct DatabaseOperator {
@@ -13,6 +44,23 @@ impl DatabaseOperator {
         Self { state, user }
     }
 
+    pub async fn log(
+        &self,
+        table: Table,
+        operation_type: OperationType,
+        operation: Operation,
+    ) -> Result<(), LoggerError> {
+        let operation = OperationLog {
+            user: self.user.clone(),
+            date: Utc::now(),
+            operation,
+            operation_type,
+            table,
+        };
+
+        self.state.logger.write(operation).await
+    }
+
     pub fn content_folder<'a>(&'a self) -> ContentFolderOperator<'a> {
         ContentFolderOperator { db: self }
     }