Search test + v3 (#731)

* search patch for accurate loader/gv filtering

* backup

* basic search test

* finished test

* incomplete commit; backing up

* Working multipat reroute backup

* working rough draft v3

* most tests passing

* works

* search v2 conversion

* added some tags.rs v2 conversions

* Worked through warnings, unwraps, prints

* refactors

* new search test

* version files changes fixes

* redesign to revs

* removed old caches

* removed games

* fmt clippy

* merge conflicts

* fmt, prepare

* moved v2 routes over to v3

* fixes; tests passing

* project type changes

* moved files over

* fmt, clippy, prepare, etc

* loaders to loader_fields, added tests

* fmt, clippy, prepare

* fixed sorting bug

* reversed back- wrong order for consistency

* fmt; clippy; prepare

---------

Co-authored-by: Jai A <jaiagr+gpg@pm.me>

tests/common/request_data.rs

@@ -1,15 +1,21 @@
 #![allow(dead_code)]
 use serde_json::json;
 
-use super::{
-    actix::MultipartSegment,
-    dummy_data::{DummyImage, DummyJarFile},
+use super::dummy_data::{DummyImage, TestFile};
+use labrinth::{
+    models::projects::ProjectId,
+    util::actix::{MultipartSegment, MultipartSegmentData},
 };
-use crate::common::actix::MultipartSegmentData;
 
 pub struct ProjectCreationRequestData {
     pub slug: String,
-    pub jar: Option<DummyJarFile>,
+    pub jar: Option<TestFile>,
+    pub segment_data: Vec<MultipartSegment>,
+}
+
+pub struct VersionCreationRequestData {
+    pub version: String,
+    pub jar: Option<TestFile>,
     pub segment_data: Vec<MultipartSegment>,
 }
 
@@ -21,29 +27,64 @@ pub struct ImageData {
 
 pub fn get_public_project_creation_data(
     slug: &str,
-    version_jar: Option<DummyJarFile>,
+    version_jar: Option<TestFile>,
 ) -> ProjectCreationRequestData {
-    let initial_versions = if let Some(ref jar) = version_jar {
-        json!([{
-            "file_parts": [jar.filename()],
-            "version_number": "1.2.3",
-            "version_title": "start",
-            "dependencies": [],
-            "game_versions": ["1.20.1"] ,
-            "release_channel": "release",
-            "loaders": ["fabric"],
-            "featured": true
-        }])
+    let json_data = get_public_project_creation_data_json(slug, version_jar.as_ref());
+    let multipart_data = get_public_creation_data_multipart(&json_data, version_jar.as_ref());
+    ProjectCreationRequestData {
+        slug: slug.to_string(),
+        jar: version_jar,
+        segment_data: multipart_data,
+    }
+}
+
+pub fn get_public_version_creation_data(
+    project_id: ProjectId,
+    version_number: &str,
+    version_jar: TestFile,
+) -> VersionCreationRequestData {
+    let mut json_data = get_public_version_creation_data_json(version_number, &version_jar);
+    json_data["project_id"] = json!(project_id);
+    let multipart_data = get_public_creation_data_multipart(&json_data, Some(&version_jar));
+    VersionCreationRequestData {
+        version: version_number.to_string(),
+        jar: Some(version_jar),
+        segment_data: multipart_data,
+    }
+}
+
+pub fn get_public_version_creation_data_json(
+    version_number: &str,
+    version_jar: &TestFile,
+) -> serde_json::Value {
+    json!({
+        "file_parts": [version_jar.filename()],
+        "version_number": version_number,
+        "version_title": "start",
+        "dependencies": [],
+        "game_versions": ["1.20.1"] ,
+        "release_channel": "release",
+        "loaders": ["fabric"],
+        "featured": true
+    })
+}
+
+pub fn get_public_project_creation_data_json(
+    slug: &str,
+    version_jar: Option<&TestFile>,
+) -> serde_json::Value {
+    let initial_versions = if let Some(jar) = version_jar {
+        json!([get_public_version_creation_data_json("1.2.3", jar)])
     } else {
         json!([])
     };
 
     let is_draft = version_jar.is_none();
-
-    let json_data = json!(
+    json!(
         {
             "title": format!("Test Project {slug}"),
             "slug": slug,
+            "project_type": version_jar.as_ref().map(|f| f.project_type()).unwrap_or("mod".to_string()),
             "description": "A dummy project for testing with.",
             "body": "This project is approved, and versions are listed.",
             "client_side": "required",
@@ -51,19 +92,24 @@ pub fn get_public_project_creation_data(
             "initial_versions": initial_versions,
             "is_draft": is_draft,
             "categories": [],
-            "license_id": "MIT"
+            "license_id": "MIT",
         }
-    );
+    )
+}
 
+pub fn get_public_creation_data_multipart(
+    json_data: &serde_json::Value,
+    version_jar: Option<&TestFile>,
+) -> Vec<MultipartSegment> {
     // Basic json
     let json_segment = MultipartSegment {
         name: "data".to_string(),
         filename: None,
         content_type: Some("application/json".to_string()),
-        data: MultipartSegmentData::Text(serde_json::to_string(&json_data).unwrap()),
+        data: MultipartSegmentData::Text(serde_json::to_string(json_data).unwrap()),
     };
 
-    let segment_data = if let Some(ref jar) = version_jar {
+    if let Some(jar) = version_jar {
         // Basic file
         let file_segment = MultipartSegment {
             name: jar.filename(),
@@ -72,15 +118,9 @@ pub fn get_public_project_creation_data(
             data: MultipartSegmentData::Binary(jar.bytes()),
         };
 
-        vec![json_segment.clone(), file_segment]
+        vec![json_segment, file_segment]
     } else {
-        vec![json_segment.clone()]
-    };
-
-    ProjectCreationRequestData {
-        slug: slug.to_string(),
-        jar: version_jar,
-        segment_data,
+        vec![json_segment]
     }
 }