From e8bbc117e19b501f233f864ad417238642e3706f Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Mon, 7 Sep 2020 11:44:21 -0700
Subject: [PATCH] Allow for API user to change the amount of mods responded
 with in search (#61)

* Add more info to search route:

* Run formatter

* Allow for API user to change the amount of mods responded with in search

* Refactor SearchResults

* Fix searchresults usage
---
 src/models/mods.rs |  1 +
 src/search/mod.rs  | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/models/mods.rs b/src/models/mods.rs
index 96dd5bcc..272a18be 100644
--- a/src/models/mods.rs
+++ b/src/models/mods.rs
@@ -130,4 +130,5 @@ pub struct SearchRequest {
     pub version: Option<String>,
     pub offset: Option<String>,
     pub index: Option<String>,
+    pub limit: Option<usize>,
 }
diff --git a/src/search/mod.rs b/src/search/mod.rs
index 28edd3de..10740e4f 100644
--- a/src/search/mod.rs
+++ b/src/search/mod.rs
@@ -8,6 +8,7 @@ use meilisearch_sdk::search::Query;
 use serde::ser::SerializeStruct;
 use serde::{Deserialize, Serialize, Serializer};
 use std::borrow::Cow;
+use std::cmp::min;
 use thiserror::Error;
 
 pub mod indexing;
@@ -86,10 +87,7 @@ pub struct SearchResults {
     pub hits: Vec<ResultSearchMod>,
     pub offset: usize,
     pub limit: usize,
-    pub nb_hits: usize,
-    pub exhaustive_nb_hits: bool,
-    pub processing_time_ms: usize,
-    pub query: String,
+    pub total_hits: usize,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -144,13 +142,16 @@ pub async fn search_for_mod(info: &SearchRequest) -> Result<SearchResults, Searc
 
     let offset = info.offset.as_deref().unwrap_or("0").parse()?;
     let index = info.index.as_deref().unwrap_or("relevance");
+    let limit = info.limit.unwrap_or(10);
     let search_query: &str = info
         .query
         .as_deref()
         .filter(|s| !s.is_empty())
         .unwrap_or("{}{}{}");
 
-    let mut query = Query::new(search_query).with_limit(10).with_offset(offset);
+    let mut query = Query::new(search_query)
+        .with_limit(min(100, limit))
+        .with_offset(offset);
 
     if !filters.is_empty() {
         query = query.with_filters(&filters);
@@ -170,9 +171,6 @@ pub async fn search_for_mod(info: &SearchRequest) -> Result<SearchResults, Searc
         hits: results.hits,
         offset: results.offset,
         limit: results.limit,
-        nb_hits: results.nb_hits,
-        exhaustive_nb_hits: results.exhaustive_nb_hits,
-        processing_time_ms: results.processing_time_ms,
-        query: results.query,
+        total_hits: results.nb_hits,
     })
 }