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>

src/routes/maven.rs

@@ -1,4 +1,5 @@
-use crate::database::models::categories::Loader;
+use crate::database::models::legacy_loader_fields::MinecraftGameVersion;
+use crate::database::models::loader_fields::Loader;
 use crate::database::models::project_item::QueryProject;
 use crate::database::models::version_item::{QueryFile, QueryVersion};
 use crate::database::redis::RedisPool;
@@ -22,6 +23,8 @@ pub fn config(cfg: &mut web::ServiceConfig) {
     cfg.service(version_file);
 }
 
+// TODO: These were modified in v3 and should be tested
+
 #[derive(Default, Debug, Clone, YaSerialize)]
 #[yaserde(root = "metadata", rename = "metadata")]
 pub struct Metadata {
@@ -198,8 +201,19 @@ async fn find_version(
             if !loaders.is_empty() {
                 bool &= x.loaders.iter().any(|y| loaders.contains(y));
             }
+
+            // For maven in particular, we will hardcode it to use GameVersions rather than generic loader fields, as this is minecraft-java exclusive
             if !game_versions.is_empty() {
-                bool &= x.game_versions.iter().any(|y| game_versions.contains(y));
+                let version_game_versions = x
+                    .version_fields
+                    .clone()
+                    .into_iter()
+                    .find_map(|v| MinecraftGameVersion::try_from_version_field(&v).ok());
+                if let Some(version_game_versions) = version_game_versions {
+                    bool &= version_game_versions
+                        .iter()
+                        .any(|y| game_versions.contains(&y.version));
+                }
             }
 
             bool
@@ -216,7 +230,6 @@ async fn find_version(
 fn find_file<'a>(
     project_id: &str,
     vcoords: &str,
-    project: &QueryProject,
     version: &'a QueryVersion,
     file: &str,
 ) -> Option<&'a QueryFile> {
@@ -224,21 +237,27 @@ fn find_file<'a>(
         return Some(selected_file);
     }
 
-    let fileext = match project.project_type.as_str() {
-        "mod" => "jar",
-        "modpack" => "mrpack",
-        _ => return None,
-    };
-
-    if file == format!("{}-{}.{}", &project_id, &vcoords, fileext) {
-        version
-            .files
-            .iter()
-            .find(|x| x.primary)
-            .or_else(|| version.files.iter().last())
-    } else {
-        None
+    // Minecraft mods are not going to be both a mod and a modpack, so this minecraft-specific handling is fine
+    // As there can be multiple project types, returns the first allowable match
+    let mut fileexts = vec![];
+    for project_type in version.project_types.iter() {
+        match project_type.as_str() {
+            "mod" => fileexts.push("jar"),
+            "modpack" => fileexts.push("mrpack"),
+            _ => (),
+        }
     }
+
+    for fileext in fileexts {
+        if file == format!("{}-{}.{}", &project_id, &vcoords, fileext) {
+            return version
+                .files
+                .iter()
+                .find(|x| x.primary)
+                .or_else(|| version.files.iter().last());
+        }
+    }
+    None
 }
 
 #[route(
@@ -297,7 +316,7 @@ pub async fn version_file(
         return Ok(HttpResponse::Ok()
             .content_type("text/xml")
             .body(yaserde::ser::to_string(&respdata).map_err(ApiError::Xml)?));
-    } else if let Some(selected_file) = find_file(&project_id, &vnum, &project, &version, &file) {
+    } else if let Some(selected_file) = find_file(&project_id, &vnum, &version, &file) {
         return Ok(HttpResponse::TemporaryRedirect()
             .append_header(("location", &*selected_file.url))
             .body(""));
@@ -342,7 +361,7 @@ pub async fn version_file_sha1(
         return Ok(HttpResponse::NotFound().body(""));
     }
 
-    Ok(find_file(&project_id, &vnum, &project, &version, &file)
+    Ok(find_file(&project_id, &vnum, &version, &file)
         .and_then(|file| file.hashes.get("sha1"))
         .map(|hash_str| HttpResponse::Ok().body(hash_str.clone()))
         .unwrap_or_else(|| HttpResponse::NotFound().body("")))
@@ -384,7 +403,7 @@ pub async fn version_file_sha512(
         return Ok(HttpResponse::NotFound().body(""));
     }
 
-    Ok(find_file(&project_id, &vnum, &project, &version, &file)
+    Ok(find_file(&project_id, &vnum, &version, &file)
         .and_then(|file| file.hashes.get("sha512"))
         .map(|hash_str| HttpResponse::Ok().body(hash_str.clone()))
         .unwrap_or_else(|| HttpResponse::NotFound().body("")))