162 move the repository module of the mediator coordination crate to a separate crate

Cargo.toml

@@ -14,6 +14,7 @@ members = [
     "crates/plugins/did-endpoint",
     "crates/plugins/mediator-coordination",
     "crates/plugins/oob-messages",
+    "crates/database",
 ]
 
 
@@ -24,6 +25,7 @@ plugin-api = { path = "./crates/plugin-api", version = "0.1.0" }
 did-endpoint = { path = "./crates/plugins/did-endpoint", version = "0.1.0" }
 oob-messages = { path = "./crates/plugins/oob-messages", version = "0.1.0" }
 mediator-coordination = { path = "./crates/plugins/mediator-coordination", version = "0.1.0" }
+database = { path = "./crates/database", version = "0.1.0" }
 
 # Other common dependencies
 serde = "1.0"

crates/database/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "database"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+did-utils.workspace = true
+did-endpoint.workspace = true
+plugin-api.workspace = true
+keystore.workspace = true
+
+chrono.workspace = true
+mongodb.workspace = true
+async-trait.workspace = true
+multibase.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tracing.workspace = true
+thiserror.workspace = true
+json-canon.workspace = true
+didcomm = { workspace = true, features = ["uniffi"] }
+tokio = { workspace = true, features = ["full"] }
+axum = { workspace = true, features = ["macros"] }
+uuid = { workspace = true, features = ["v4"] }
+hyper = { workspace = true, features = ["full"] }
+
+[dev-dependencies]
+dotenv-flow = "0.15.0"
+hyper = "0.14.27"
+json-canon = "0.1.3"
+tokio = { version = "1.27.0", default-features = false, features = ["macros", "rt"] }
+tokio-test = "0.4.2"
+tower = { version = "0.4.13", features = ["util"] }
+
+[features]
+default = ["stateful"]
+stateful = []

crates/plugins/mediator-coordination/src/repository/traits.rs → crates/database/src/lib.rs

@@ -2,10 +2,10 @@ use async_trait::async_trait;
 use mongodb::bson::{oid::ObjectId, Document as BsonDocument};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-
+use mongodb::error::Error as MongoError;
 /// A trait representing an abstract resource.
 /// Any type implementing this trait should also implement `Serialize`.
-pub trait Entity: Sized + Serialize {}
+pub trait Entity: Sized + Serialize {} 
 
 /// Definition of custom errors for repository operations
 #[derive(Debug, Serialize, Deserialize, Error)]
@@ -41,3 +41,9 @@ pub trait Repository<Entity>: Sync + Send {
     /// Deletes a single entity by its identifier.
     async fn delete_one(&self, entity_id: ObjectId) -> Result<(), RepositoryError>;
 }
+
+impl From<MongoError> for RepositoryError {
+    fn from(error: MongoError) -> Self {
+        RepositoryError::Generic(error.to_string())
+    }
+}

crates/plugins/mediator-coordination/Cargo.toml

@@ -8,6 +8,7 @@ did-utils.workspace = true
 did-endpoint.workspace = true
 plugin-api.workspace = true
 keystore.workspace = true
+database.workspace = true
 
 chrono.workspace = true
 mongodb.workspace = true

crates/plugins/mediator-coordination/src/lib.rs

@@ -8,4 +8,4 @@ mod jose;
 mod model;
 mod repository;
 mod util;
-mod web;
+mod web;

crates/plugins/mediator-coordination/src/plugin.rs

@@ -5,7 +5,7 @@ use mongodb::{ options::ClientOptions, Client, Database};
 use std::sync::Arc;
 
 use crate::{
-    repository::stateful::coord::{MongoConnectionRepository, MongoMessagesRepository, MongoSecretsRepository},
+    repository::stateful::{MongoConnectionRepository, MongoMessagesRepository, MongoSecretsRepository},
     util,
     web::{self, AppState, AppStateRepository},
 };

crates/plugins/mediator-coordination/src/repository/mod.rs

@@ -1,12 +1 @@
-pub mod stateful;
-pub mod traits;
-
-use mongodb::error::Error as MongoError;
-
-use traits::RepositoryError;
-
-impl From<MongoError> for RepositoryError {
-    fn from(error: MongoError) -> Self {
-        RepositoryError::Generic(error.to_string())
-    }
-}
+pub(crate) mod stateful;

crates/plugins/mediator-coordination/src/repository/stateful/coord.rs → crates/plugins/mediator-coordination/src/repository/stateful.rs

@@ -1,12 +1,12 @@
 use async_trait::async_trait;
+use database::{Entity, Repository, RepositoryError};
 use mongodb::{
     bson::{self, doc, oid::ObjectId, Bson, Document as BsonDocument},
     Collection, Database,
 };
 
 use crate::{
     model::stateful::entity::{Connection, RoutedMessage, Secrets},
-    repository::traits::{Entity, Repository, RepositoryError},
 };
 
 impl Entity for Connection {}

crates/plugins/mediator-coordination/src/web/coord/handler/stateful.rs

@@ -346,7 +346,7 @@ mod tests {
     use super::*;
 
     use crate::{
-        repository::stateful::coord::tests::MockConnectionRepository, web::handler::tests as global,
+        repository::stateful::tests::MockConnectionRepository, web::handler::tests as global,
     };
 
     #[allow(clippy::needless_update)]

crates/plugins/mediator-coordination/src/web/handler.rs

@@ -87,7 +87,7 @@ pub mod tests {
 
     use crate::{
         didcomm::bridge::LocalSecretsResolver,
-        repository::stateful::coord::tests::{
+        repository::stateful::tests::{ 
             MockConnectionRepository, MockMessagesRepository, MockSecretsRepository,
         },
         util::{self, MockFileSystem},
@@ -104,7 +104,7 @@ pub mod tests {
         let repository = AppStateRepository {
             connection_repository: Arc::new(MockConnectionRepository::from(vec![])),
             secret_repository: Arc::new(MockSecretsRepository::from(vec![])),
-            message_repository: Arc::new(MockMessagesRepository::from(vec![])),
+            message_repository: Arc::new(MockMessagesRepository::from(vec![])), // Merged from origin
         };
 
         let state = Arc::new(AppState::from(
@@ -193,12 +193,13 @@ pub mod tests {
     }
 }
 
+
 #[cfg(test)]
 mod tests2 {
     use super::{tests as global, *};
     use crate::{
         constant::KEYLIST_UPDATE_RESPONSE_2_0,
-        repository::stateful::coord::tests::MockConnectionRepository,
+        repository::stateful::tests::MockConnectionRepository,
         web::{self, AppStateRepository},
     };
 

crates/plugins/mediator-coordination/src/web/mod.rs

@@ -4,14 +4,14 @@
 mod midlw;
 
 use axum::{middleware, routing::post, Router};
+use database::Repository;
 use keystore::KeyStore;
 use did_utils::{didcore::Document, jwk::Jwk};
 use std::sync::Arc;
 
 use crate::{
     didcomm::bridge::{LocalDIDResolver, LocalSecretsResolver},
     model::stateful::entity::{Connection, RoutedMessage, Secrets},
-    repository::traits::Repository,
     util,
 };
 
@@ -48,7 +48,7 @@
 pub struct AppStateRepository {
     pub connection_repository: Arc<dyn Repository<Connection>>,
     pub secret_repository: Arc<dyn Repository<Secrets>>,
     pub message_repository: Arc<dyn Repository<RoutedMessage>>,
 }
 
 impl AppState {