Search overhaul (#771)

* started work; switching context

* working!

* fmt clippy prepare

* fixes

* fixes

* revs

* merge fixes

* changed comments

* merge issues

src/routes/internal/admin.rs

@@ -139,9 +139,11 @@ pub async fn count_download(
 #[post("/_force_reindex", guard = "admin_key_guard")]
 pub async fn force_reindex(
     pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
     config: web::Data<SearchConfig>,
 ) -> Result<HttpResponse, ApiError> {
     use crate::search::indexing::index_projects;
-    index_projects(pool.as_ref().clone(), &config).await?;
+    let redis = redis.get_ref();
+    index_projects(pool.as_ref().clone(), redis.clone(), &config).await?;
     Ok(HttpResponse::NoContent().finish())
 }

src/routes/v2/admin.rs

@@ -139,9 +139,11 @@ pub async fn count_download(
 #[post("/_force_reindex", guard = "admin_key_guard")]
 pub async fn force_reindex(
     pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
     config: web::Data<SearchConfig>,
 ) -> Result<HttpResponse, ApiError> {
     use crate::search::indexing::index_projects;
-    index_projects(pool.as_ref().clone(), &config).await?;
+    let redis = redis.get_ref();
+    index_projects(pool.as_ref().clone(), redis.clone(), &config).await?;
     Ok(HttpResponse::NoContent().finish())
 }

src/routes/v2_reroute.rs

@@ -243,8 +243,6 @@ pub fn convert_side_type_facets_v3(facets: Vec<Vec<Vec<String>>>) -> Vec<Vec<Vec
 pub fn convert_side_types_v2(
     side_types: &HashMap<String, Value>,
 ) -> (LegacySideType, LegacySideType) {
-    use LegacySideType::{Optional, Required, Unsupported};
-
     let client_and_server = side_types
         .get("client_and_server")
         .and_then(|x| x.as_bool())
@@ -262,6 +260,25 @@ pub fn convert_side_types_v2(
         .and_then(|x| x.as_bool())
         .unwrap_or(false);
 
+    convert_side_types_v2_bools(
+        Some(singleplayer),
+        client_only,
+        server_only,
+        Some(client_and_server),
+    )
+}
+
+// Client side, server side
+pub fn convert_side_types_v2_bools(
+    singleplayer: Option<bool>,
+    client_only: bool,
+    server_only: bool,
+    client_and_server: Option<bool>,
+) -> (LegacySideType, LegacySideType) {
+    use LegacySideType::{Optional, Required, Unsupported};
+
+    let singleplayer = singleplayer.or(client_and_server).unwrap_or(false);
+
     match (singleplayer, client_only, server_only) {
         // Only singleplayer
         (true, false, false) => (Required, Required),

src/routes/v3/projects.rs

@@ -882,11 +882,31 @@ pub async fn edit_project_categories(
     Ok(())
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct ReturnSearchResults {
+    pub hits: Vec<Project>,
+    pub offset: usize,
+    pub limit: usize,
+    pub total_hits: usize,
+}
+
 pub async fn project_search(
     web::Query(info): web::Query<SearchRequest>,
     config: web::Data<SearchConfig>,
 ) -> Result<HttpResponse, SearchError> {
     let results = search_for_project(&info, &config).await?;
+
+    let results = ReturnSearchResults {
+        hits: results
+            .hits
+            .into_iter()
+            .filter_map(Project::from_search)
+            .collect::<Vec<_>>(),
+        offset: results.offset,
+        limit: results.limit,
+        total_hits: results.total_hits,
+    };
+
     Ok(HttpResponse::Ok().json(results))
 }