Tests v2 recreate (#760)

* added common project information; setup for v2 test change * all tests now use with_test_environment * progress, failing * finished re-adding tests * prepare * cargo sqlx prepare -- --tests * fmt; clippy; prepare * sqlx prepare * adds version_create fix and corresponding test * merge fixes; rev * fmt, clippy, prepare * test cargo sqlx prepare
modrinth · Nov 25, 2023 · 945935f · 945935f
1 parent 9886ff1
commit 945935f
Show file tree

Hide file tree

Showing 51 changed files with 7,604 additions and 6,662 deletions.
diff --git a/.sqlx/query-2efd0efe9ce16b2da01d9bcc1603e3a7ad0f9a1e5a457770608bc41dbb83f2dd.json b/.sqlx/query-2efd0efe9ce16b2da01d9bcc1603e3a7ad0f9a1e5a457770608bc41dbb83f2dd.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -109,7 +109,7 @@ derive-new = "0.5.9"
 
 [dev-dependencies]
 actix-http = "3.4.0"
-
+json-patch = "*"
 [profile.dev]
 opt-level = 0                # Minimal optimization, speeds up compilation
 lto = false                  # Disables Link Time Optimization

diff --git a/src/models/v2/projects.rs b/src/models/v2/projects.rs
@@ -233,10 +233,12 @@ pub struct LegacyVersion {
     /// and are now part of the dynamic fields system
     /// A list of game versions this project supports
     pub game_versions: Vec<String>,
-    /// A list of loaders this project supports
+
+    /// A list of loaders this project supports (has a newtype struct)
     pub loaders: Vec<Loader>,
 
-    // TODO: remove this once we have v3 testing, as this is a v3 field and tests for it should be isolated to v3
+    // TODO: should we remove this? as this is a v3 field and tests for it should be isolated to v3
+    // it allows us to keep tests that use this struct in common
     pub ordering: Option<i32>,
 
     pub id: VersionId,

diff --git a/src/routes/v2/version_creation.rs b/src/routes/v2/version_creation.rs
@@ -105,7 +105,7 @@ pub async fn version_create(
             for file_part in &legacy_create.file_parts {
                 if let Some(ext) = file_part.split('.').last() {
                     match ext {
-                        "mrpack" => {
+                        "mrpack" | "mrpack-primary" => {
                             project_type = Some("modpack");
                             break;
                         }

diff --git a/src/routes/v3/project_creation.rs b/src/routes/v3/project_creation.rs
@@ -894,7 +894,6 @@ async fn create_initial_version(
         &mut loader_field_enum_values,
     )?;
 
-    println!("Made it past here");
     let dependencies = version_data
         .dependencies
         .iter()