Update search queries (#854)

* Update search queries

* Bump accepted payload limit

* fixes

* push test changes

* fmt clippy prepare

---------

Co-authored-by: Wyatt Verchere <wverchere@gmail.com>

tests/common/api_v3/project.rs

@@ -10,7 +10,7 @@ use bytes::Bytes;
 use chrono::{DateTime, Utc};
 use labrinth::{
     models::{organizations::Organization, projects::Project},
-    routes::v3::projects::ReturnSearchResults,
+    search::SearchResults,
     util::actix::AppendsMultipart,
 };
 use rust_decimal::Decimal;
@@ -511,7 +511,7 @@ impl ApiV3 {
         query: Option<&str>,
         facets: Option<serde_json::Value>,
         pat: Option<&str>,
-    ) -> ReturnSearchResults {
+    ) -> SearchResults {
         let query_field = if let Some(query) = query {
             format!("&query={}", urlencoding::encode(query))
         } else {

tests/project.rs

@@ -6,11 +6,10 @@ use common::dummy_data::DUMMY_CATEGORIES;
 
 use common::environment::{with_test_environment, with_test_environment_all, TestEnvironment};
 use common::permissions::{PermissionsTest, PermissionsTestContext};
-use common::search::setup_search_projects;
 use futures::StreamExt;
 use labrinth::database::models::project_item::{PROJECTS_NAMESPACE, PROJECTS_SLUGS_NAMESPACE};
 use labrinth::models::ids::base62_impl::parse_base62;
-use labrinth::models::projects::{Project, ProjectId};
+use labrinth::models::projects::ProjectId;
 use labrinth::models::teams::ProjectPermissions;
 use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
 use serde_json::json;
@@ -1199,41 +1198,42 @@ async fn project_permissions_consistency_test() {
     .await;
 }
 
-#[actix_rt::test]
-async fn align_search_projects() {
-    // Test setup and dummy data
-    with_test_environment(Some(10), |test_env: TestEnvironment<ApiV3>| async move {
-        setup_search_projects(&test_env).await;
+// TODO: Re-add this if we want to match v3 Projects structure to v3 Search Result structure, otherwise, delete
+// #[actix_rt::test]
+// async fn align_search_projects() {
+//     // Test setup and dummy data
+//     with_test_environment(Some(10), |test_env: TestEnvironment<ApiV3>| async move {
+//         setup_search_projects(&test_env).await;
 
-        let api = &test_env.api;
-        let test_name = test_env.db.database_name.clone();
+//         let api = &test_env.api;
+//         let test_name = test_env.db.database_name.clone();
 
-        let projects = api
-            .search_deserialized(
-                Some(&format!("\"&{test_name}\"")),
-                Some(json!([["categories:fabric"]])),
-                USER_USER_PAT,
-            )
-            .await;
+//         let projects = api
+//             .search_deserialized(
+//                 Some(&format!("\"&{test_name}\"")),
+//                 Some(json!([["categories:fabric"]])),
+//                 USER_USER_PAT,
+//             )
+//             .await;
 
-        for project in projects.hits {
-            let project_model = api
-                .get_project(&project.id.to_string(), USER_USER_PAT)
-                .await;
-            assert_status!(&project_model, StatusCode::OK);
-            let mut project_model: Project = test::read_body_json(project_model).await;
+//         for project in projects.hits {
+//             let project_model = api
+//                 .get_project(&project.id.to_string(), USER_USER_PAT)
+//                 .await;
+//             assert_status!(&project_model, StatusCode::OK);
+//             let mut project_model: Project = test::read_body_json(project_model).await;
 
-            // Body/description is huge- don't store it in search, so it's StatusCode::OK if they differ here
-            // (Search should return "")
-            project_model.description = "".into();
+//             // Body/description is huge- don't store it in search, so it's StatusCode::OK if they differ here
+//             // (Search should return "")
+//             project_model.description = "".into();
 
-            let project_model = serde_json::to_value(project_model).unwrap();
-            let searched_project_serialized = serde_json::to_value(project).unwrap();
-            assert_eq!(project_model, searched_project_serialized);
-        }
-    })
-    .await
-}
+//             let project_model = serde_json::to_value(project_model).unwrap();
+//             let searched_project_serialized = serde_json::to_value(project).unwrap();
+//             assert_eq!(project_model, searched_project_serialized);
+//         }
+//     })
+//     .await
+// }
 
 #[actix_rt::test]
 async fn projects_various_visibility() {

tests/search.rs

@@ -8,6 +8,7 @@ use common::environment::with_test_environment;
 use common::environment::TestEnvironment;
 use common::search::setup_search_projects;
 use futures::stream::StreamExt;
+use labrinth::models::ids::base62_impl::parse_base62;
 use serde_json::json;
 
 use crate::common::api_common::Api;
@@ -103,7 +104,7 @@ async fn search_projects() {
                     let mut found_project_ids: Vec<u64> = projects
                         .hits
                         .into_iter()
-                        .map(|p| id_conversion[&p.id.0])
+                        .map(|p| id_conversion[&parse_base62(&p.project_id).unwrap()])
                         .collect();
                     let num_hits = projects.total_hits;
                     expected_project_ids.sort();

tests/v2/search.rs

@@ -328,6 +328,7 @@ async fn search_projects() {
                         .collect();
                     expected_project_ids.sort();
                     found_project_ids.sort();
+                    println!("Facets: {:?}", facets);
                     assert_eq!(found_project_ids, expected_project_ids);
                 }
             })