fix: rework error handling for add_category

Fixes #253
torrust · Nov 12, 2023 · c535652 · c535652
1 parent 41c80f3
commit c535652
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 37 deletions.
diff --git a/src/databases/database.rs b/src/databases/database.rs
@@ -81,7 +81,6 @@ pub enum Error {
     UsernameTaken,
     EmailTaken,
     UserNotFound,
-    CategoryAlreadyExists,
     CategoryNotFound,
     TagAlreadyExists,
     TagNotFound,

diff --git a/src/databases/mysql.rs b/src/databases/mysql.rs
@@ -249,17 +249,7 @@ impl Database for Mysql {
             .execute(&self.pool)
             .await
             .map(|v| i64::try_from(v.last_insert_id()).expect("last ID is larger than i64"))
-            .map_err(|e| match e {
-                sqlx::Error::Database(err) => {
-                    log::error!("DB error: {:?}", err);
-                    if err.message().contains("Duplicate entry") && err.message().contains("name") {
-                        database::Error::CategoryAlreadyExists
-                    } else {
-                        database::Error::Error
-                    }
-                }
-                _ => database::Error::Error,
-            })
+            .map_err(|_| database::Error::Error)
     }
 
     async fn get_category_from_id(&self, category_id: i64) -> Result<Category, database::Error> {

diff --git a/src/databases/sqlite.rs b/src/databases/sqlite.rs
@@ -239,17 +239,7 @@ impl Database for Sqlite {
             .execute(&self.pool)
             .await
             .map(|v| v.last_insert_rowid())
-            .map_err(|e| match e {
-                sqlx::Error::Database(err) => {
-                    log::error!("DB error: {:?}", err);
-                    if err.message().contains("UNIQUE") && err.message().contains("name") {
-                        database::Error::CategoryAlreadyExists
-                    } else {
-                        database::Error::Error
-                    }
-                }
-                _ => database::Error::Error,
-            })
+            .map_err(|_| database::Error::Error)
     }
 
     async fn get_category_from_id(&self, category_id: i64) -> Result<Category, database::Error> {

diff --git a/src/errors.rs b/src/errors.rs
@@ -288,7 +288,6 @@ pub fn map_database_error_to_service_error(error: &database::Error) -> ServiceEr
         database::Error::UsernameTaken => ServiceError::UsernameTaken,
         database::Error::EmailTaken => ServiceError::EmailTaken,
         database::Error::UserNotFound => ServiceError::UserNotFound,
-        database::Error::CategoryAlreadyExists => ServiceError::CategoryAlreadyExists,
         database::Error::CategoryNotFound => ServiceError::InvalidCategory,
         database::Error::TagAlreadyExists => ServiceError::TagAlreadyExists,
         database::Error::TagNotFound => ServiceError::InvalidTag,

diff --git a/src/services/category.rs b/src/services/category.rs
@@ -44,10 +44,15 @@ impl Service {
             return Err(ServiceError::CategoryNameEmpty);
         }
 
-        match self.category_repository.add(trimmed_name).await {
-            Ok(id) => Ok(id),
+        // Try to get the category by name to check if it already exists
+        match self.category_repository.get_by_name(trimmed_name).await {
+            // Return ServiceError::CategoryAlreadyExists when the category already exists
+            Ok(_) => Err(ServiceError::CategoryAlreadyExists),
             Err(e) => match e {
-                DatabaseError::CategoryAlreadyExists => Err(ServiceError::CategoryAlreadyExists),
+                DatabaseError::CategoryNotFound => match self.category_repository.add(trimmed_name).await {
+                    Ok(id) => Ok(id),
+                    Err(_) => Err(ServiceError::DatabaseError),
+                },
                 _ => Err(ServiceError::DatabaseError),
             },
         }

diff --git a/src/upgrades/from_v1_0_0_to_v2_0_0/databases/sqlite_v2_0_0.rs b/src/upgrades/from_v1_0_0_to_v2_0_0/databases/sqlite_v2_0_0.rs
@@ -116,16 +116,7 @@ impl SqliteDatabaseV2_0_0 {
             .execute(&self.pool)
             .await
             .map(|v| v.last_insert_rowid())
-            .map_err(|e| match e {
-                sqlx::Error::Database(err) => {
-                    if err.message().contains("UNIQUE") && err.message().contains("name") {
-                        database::Error::CategoryAlreadyExists
-                    } else {
-                        database::Error::Error
-                    }
-                }
-                _ => database::Error::Error,
-            })
+            .map_err(|_| database::Error::Error)
     }
 
     pub async fn insert_category(&self, category: &CategoryRecordV2) -> Result<i64, sqlx::Error> {