Storage trait API changes

aquadoggo/Cargo.toml

@@ -35,7 +35,7 @@ lipmaa-link = "^0.2.2"
 log = "^0.4.17"
 once_cell = "^1.12.0"
 openssl-probe = "^0.1.5"
-p2panda-rs = { version = "^0.6.0", features = [
+p2panda-rs = { git = "https://github.com/p2panda/p2panda", branch = "storage-trait-changes", features = [
     "storage-provider",
 ] }
 serde = { version = "^1.0.144", features = ["derive"] }
@@ -66,7 +66,7 @@ env_logger = "^0.9.0"
 http = "^0.2.8"
 hyper = "^0.14.19"
 once_cell = "^1.12.0"
-p2panda-rs = { version = "^0.6.0", features = [
+p2panda-rs = { git = "https://github.com/p2panda/p2panda", branch = "storage-trait-changes", features = [
     "test-utils",
     "storage-provider",
 ] }

aquadoggo/migrations/20230114140233_alter-documents.sql

@@ -0,0 +1,3 @@
+-- SPDX-License-Identifier: AGPL-3.0-or-later
+
+ALTER TABLE document_views ADD COLUMN document_id TEXT NOT NULL;

aquadoggo/src/context.rs

@@ -3,15 +3,15 @@
 use std::ops::Deref;
 use std::sync::Arc;
 
-use p2panda_rs::storage_provider::traits::StorageProvider;
+use p2panda_rs::storage_provider::traits::{DocumentStore, EntryStore, LogStore, OperationStore};
 
 use crate::config::Configuration;
-use crate::db::provider::SqlStorage;
+use crate::db::sql_store::SqlStore;
 use crate::schema::SchemaProvider;
 
 /// Inner data shared across all services.
 #[derive(Debug)]
-pub struct Data<S: StorageProvider> {
+pub struct Data<S: EntryStore + OperationStore + LogStore + DocumentStore> {
     /// Node configuration.
     pub config: Configuration,
 
@@ -22,7 +22,7 @@ pub struct Data<S: StorageProvider> {
     pub schema_provider: SchemaProvider,
 }
 
-impl<S: StorageProvider> Data<S> {
+impl<S: EntryStore + OperationStore + LogStore + DocumentStore> Data<S> {
     pub fn new(store: S, config: Configuration, schema_provider: SchemaProvider) -> Self {
         Self {
             config,
@@ -34,22 +34,24 @@ impl<S: StorageProvider> Data<S> {
 
 /// Data shared across all services.
 #[derive(Debug)]
-pub struct Context<S: StorageProvider = SqlStorage>(pub Arc<Data<S>>);
+pub struct Context<S: EntryStore + OperationStore + LogStore + DocumentStore = SqlStore>(
+    pub Arc<Data<S>>,
+);
 
-impl<S: StorageProvider> Context<S> {
+impl<S: EntryStore + OperationStore + LogStore + DocumentStore> Context<S> {
     /// Returns a new instance of `Context`.
     pub fn new(store: S, config: Configuration, schema_provider: SchemaProvider) -> Self {
         Self(Arc::new(Data::new(store, config, schema_provider)))
     }
 }
 
-impl<S: StorageProvider> Clone for Context<S> {
+impl<S: EntryStore + OperationStore + LogStore + DocumentStore> Clone for Context<S> {
     fn clone(&self) -> Self {
         Self(self.0.clone())
     }
 }
 
-impl<S: StorageProvider> Deref for Context<S> {
+impl<S: EntryStore + OperationStore + LogStore + DocumentStore> Deref for Context<S> {
     type Target = Data<S>;
 
     fn deref(&self) -> &Self::Target {

aquadoggo/src/db/errors.rs

@@ -2,11 +2,11 @@
 
 use p2panda_rs::schema::error::{SchemaError, SchemaIdError};
 use p2panda_rs::schema::system::SystemSchemaError;
-use p2panda_rs::storage_provider::error::DocumentStorageError;
+use p2panda_rs::storage_provider::error::{DocumentStorageError, OperationStorageError};
 
 /// `SQLStorage` errors.
 #[derive(thiserror::Error, Debug)]
-pub enum SqlStorageError {
+pub enum SqlStoreError {
     #[error("SQL query failed: {0}")]
     Transaction(String),
 
@@ -37,4 +37,8 @@ pub enum SchemaStoreError {
     /// Error returned from `DocumentStore` methods.
     #[error(transparent)]
     DocumentStorageError(#[from] DocumentStorageError),
+
+    /// Error returned from `OperationStore` methods.
+    #[error(transparent)]
+    OperationStorageError(#[from] OperationStorageError),
 }

aquadoggo/src/db/mod.rs

@@ -7,9 +7,9 @@ use sqlx::migrate::MigrateDatabase;
 
 pub mod errors;
 pub mod models;
-pub mod provider;
+pub mod sql_store;
 pub mod stores;
-pub mod traits;
+pub mod types;
 pub mod utils;
 
 /// Re-export of generic connection pool type.

aquadoggo/src/db/models/document.rs

@@ -20,3 +20,22 @@ pub struct DocumentViewFieldRow {
     /// The actual value contained in this field.
     pub value: String,
 }
+
+/// A struct representing a single row of a document table.
+#[derive(FromRow, Debug, Clone)]
+pub struct DocumentRow {
+    /// The id of this document
+    pub document_id: String,
+
+    /// The id of this documents most recent view.
+    pub document_view_id: String,
+
+    /// The id of the author of this document.
+    pub public_key: String,
+
+    /// The id of this documents schema.
+    pub schema_id: String,
+
+    /// Flag for if this document is deleted.
+    pub is_deleted: bool,
+}

aquadoggo/src/db/models/mod.rs

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-pub mod document;
+mod document;
 mod entry;
 mod log;
 mod operation;
 mod task;
 
 pub use self::log::LogRow;
+pub use document::{DocumentRow, DocumentViewFieldRow};
 pub use entry::EntryRow;
 pub use operation::{OperationFieldsJoinedRow, OperationRow};
 pub use task::TaskRow;

aquadoggo/src/db/sql_store.rs

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use crate::db::Pool;
+
+/// Sql based storage that implements `StorageProvider`.
+#[derive(Clone, Debug)]
+pub struct SqlStore {
+    pub(crate) pool: Pool,
+}
+
+impl SqlStore {
+    /// Create a new `SqlStore` using the provided db `Pool`.
+    pub fn new(pool: Pool) -> Self {
+        Self { pool }
+    }
+}