More descriptive error for publish version conflict

w4 · Sep 21, 2021 · 058e4ce · 058e4ce
1 parent d27847c
commit 058e4ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/chartered-db/src/crates.rs b/chartered-db/src/crates.rs
@@ -401,21 +401,28 @@ impl CrateWithPermissions {
                     ))
                     .execute(&conn)?;
 
-                insert_into(crate_versions)
+                let res = insert_into(crate_versions)
                     .values((
                         crate_id.eq(self.crate_.id),
                         filesystem_object.eq(file_identifier.to_string()),
                         size.eq(file_size),
                         checksum.eq(file_checksum),
-                        version.eq(given.vers),
+                        version.eq(&given.vers),
                         dependencies.eq(CrateDependencies(given.deps)),
                         features.eq(CrateFeatures(given.features)),
                         links.eq(given.links),
                         user_id.eq(user.id),
                     ))
-                    .execute(&conn)?;
-
-                Ok(())
+                    .execute(&conn);
+
+                use diesel::result::{DatabaseErrorKind, Error as DieselError};
+                match res {
+                    Ok(_) => Ok(()),
+                    Err(DieselError::DatabaseError(DatabaseErrorKind::UniqueViolation, _)) => {
+                        Err(Error::VersionConflict(given.vers.into_owned()))
+                    }
+                    Err(e) => Err(e.into()),
+                }
             })?;
 
             Ok(())

diff --git a/chartered-db/src/lib.rs b/chartered-db/src/lib.rs
@@ -69,6 +69,8 @@ pub enum Error {
     MissingPermission(crate::users::UserCratePermissionValue),
     /// The requested crate does not exist
     MissingCrate,
+    /// Version {0} already exists for this crate
+    VersionConflict(String),
 }
 
 impl Error {
@@ -82,7 +84,7 @@ impl Error {
                 http::StatusCode::NOT_FOUND
             }
             Self::MissingPermission(_) => http::StatusCode::FORBIDDEN,
-            Self::KeyParse(_) => http::StatusCode::BAD_REQUEST,
+            Self::KeyParse(_) | Self::VersionConflict(_) => http::StatusCode::BAD_REQUEST,
             _ => http::StatusCode::INTERNAL_SERVER_ERROR,
         }
     }