refactor: mongodb repository (#33)

kentSarmiento · Dec 25, 2023 · b18e387 · b18e387
1 parent df5555e
commit b18e387
Show file tree

Hide file tree

Showing 15 changed files with 477 additions and 335 deletions.
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: Generate and fix code coverage
         run: |
-          cargo llvm-cov --ignore-filename-regex "main|repository" --lcov --output-path lcov.info
+          cargo llvm-cov --ignore-filename-regex "main|inmemory" --lcov --output-path lcov.info
           ./rust-covfix lcov.info -o lcov.info
         env:
           RUST_TEST_THREADS: 1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/link-for-later/Cargo.toml b/link-for-later/Cargo.toml
@@ -26,5 +26,6 @@ validator = { version = "0.16.1", features = ["derive"] }
 [dev-dependencies]
 mockall = "0.12.0"
 rand = "0.8.5"
+rstest = "0.18.2"
 tracing-test = "0.2.4"
 
diff --git a/link-for-later/src/app.rs b/link-for-later/src/app.rs
@@ -15,12 +15,14 @@ pub fn new(db: Database) -> Router {
     let users_service = Arc::new(service::users::ServiceProvider {}) as DynUsersService;
     let (links_repo, users_repo) = match db {
         Database::MongoDb(db) => (
-            Arc::new(repository::mongodb::LinksDb::new(&db)) as DynLinksRepository,
-            Arc::new(repository::mongodb::UsersDb::new(&db)) as DynUsersRepository,
+            Arc::new(repository::mongodb::LinksRepositoryProvider::new(&db)) as DynLinksRepository,
+            Arc::new(repository::mongodb::UsersRepositoryProvider::new(&db)) as DynUsersRepository,
         ),
         Database::InMemory => (
-            Arc::new(repository::inmemory::LinksDb::default()) as DynLinksRepository,
-            Arc::new(repository::inmemory::UsersDb::default()) as DynUsersRepository,
+            Arc::new(repository::inmemory::LinksRepositoryProvider::default())
+                as DynLinksRepository,
+            Arc::new(repository::inmemory::UsersRepositoryProvider::default())
+                as DynUsersRepository,
         ),
     };
 

diff --git a/link-for-later/src/controller/error.rs b/link-for-later/src/controller/error.rs
@@ -10,7 +10,7 @@ use crate::types::AppError;
 impl IntoResponse for AppError {
     fn into_response(self) -> Response {
         let (status, error_message) = match self {
-            Self::ServerError | Self::DatabaseError => {
+            Self::ServerError | Self::DatabaseError(_) => {
                 (StatusCode::INTERNAL_SERVER_ERROR, self.to_string())
             }
             Self::LinkNotFound => (StatusCode::NOT_FOUND, self.to_string()),

diff --git a/link-for-later/src/repository/inmemory.rs b/link-for-later/src/repository/inmemory.rs
@@ -12,19 +12,19 @@ use crate::types::{
 use super::{Links as LinksRepository, Users as UsersRepository};
 
 #[derive(Default)]
-pub struct LinksDb {}
+pub struct LinksRepositoryProvider {}
 
 static INMEMORY_LINKS_DATA: Lazy<Mutex<Vec<LinkItem>>> = Lazy::new(|| Mutex::new(Vec::new()));
 static INMEMORY_LINKS_DATA_COUNTER: Lazy<Mutex<Vec<usize>>> = Lazy::new(|| Mutex::new(Vec::new()));
 
 #[derive(Default)]
-pub struct UsersDb {}
+pub struct UsersRepositoryProvider {}
 
 static INMEMORY_USERS_DATA: Lazy<Mutex<Vec<UserInfo>>> = Lazy::new(|| Mutex::new(Vec::new()));
 static INMEMORY_USERS_DATA_COUNTER: Lazy<Mutex<Vec<usize>>> = Lazy::new(|| Mutex::new(Vec::new()));
 
 #[async_trait]
-impl LinksRepository for LinksDb {
+impl LinksRepository for LinksRepositoryProvider {
     async fn find(&self, query: &LinkQuery) -> Result<Vec<LinkItem>> {
         let filtered_links: Vec<LinkItem> = INMEMORY_LINKS_DATA
             .lock()
@@ -84,7 +84,7 @@ impl LinksRepository for LinksDb {
 }
 
 #[async_trait]
-impl UsersRepository for UsersDb {
+impl UsersRepository for UsersRepositoryProvider {
     async fn get(&self, query: &UserQuery) -> Result<UserInfo> {
         INMEMORY_USERS_DATA
             .lock()