models/krate: Move URL and name validation out of create_or_update()

`create_or_update()` is only called in four places. Three of them are within test code, where a `create()` fn would be sufficient and where we don't necessarily need the same kind of validation. The fourth place is the publish endpoint, where this validation is definitely needed, but could potentially be combined with other validation code in the future.

Author: Turbo87

src/controllers/krate/publish.rs

@@ -142,6 +142,10 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
             };
 
             let license_file = metadata.license_file.as_deref();
+
+            persist.validate()?;
+            persist.ensure_name_not_reserved(conn)?;
+
             let krate = persist.create_or_update(conn, user.id)?;
 
             let owners = krate.owners(conn)?;

src/models/krate.rs

@@ -105,9 +105,6 @@ impl<'a> NewCrate<'a> {
     pub fn create_or_update(self, conn: &mut PgConnection, uploader: i32) -> AppResult<Crate> {
         use diesel::update;
 
-        self.validate()?;
-        self.ensure_name_not_reserved(conn)?;
-
         conn.transaction(|conn| {
             // To avoid race conditions, we try to insert
             // first so we know whether to add an owner
@@ -124,7 +121,7 @@ impl<'a> NewCrate<'a> {
         })
     }
 
-    fn validate(&self) -> AppResult<()> {
+    pub fn validate(&self) -> AppResult<()> {
         fn validate_url(url: Option<&str>, field: &str) -> AppResult<()> {
             let url = match url {
                 Some(s) => s,
@@ -151,7 +148,7 @@ impl<'a> NewCrate<'a> {
         Ok(())
     }
 
-    fn ensure_name_not_reserved(&self, conn: &mut PgConnection) -> AppResult<()> {
+    pub fn ensure_name_not_reserved(&self, conn: &mut PgConnection) -> AppResult<()> {
         use crate::schema::reserved_crate_names::dsl::*;
         use diesel::dsl::exists;
         use diesel::select;