Improvements to APIView Search (Azure#3685)

Baas-hub · Jul 26, 2022 · 22e82b7 · 22e82b7
1 parent 783e826
commit 22e82b7
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 11 deletions.
diff --git a/src/dotnet/APIView/APIViewWeb/Client/src/reviews.ts b/src/dotnet/APIView/APIViewWeb/Client/src/reviews.ts
@@ -113,7 +113,7 @@
 
   searchBox.on('input', _.debounce(function(e) {
     updateListedReviews();
-  }, 300));
+  }, 600));
 
   searchButton.on('click', function() {
     updateListedReviews();

diff --git a/src/dotnet/APIView/APIViewWeb/Repositories/CosmosReviewRepository.cs b/src/dotnet/APIView/APIViewWeb/Repositories/CosmosReviewRepository.cs
@@ -141,18 +141,65 @@ public async Task<IEnumerable<string>> GetReviewFirstLevelPropertiesAsync(string
             {
                 var searchAsQueryStr = ArrayToQueryString<string>(search);
                 var searchAsSingleString = '"' + String.Join(' ', search) + '"';
-                queryStringBuilder.Append($" AND (r.Author IN {searchAsQueryStr}");
-                queryStringBuilder.Append($" OR STRINGEQUALS(r.Revisions[0].Name, {searchAsSingleString}, true)");
-                queryStringBuilder.Append($" OR CONTAINS(r.Name, {searchAsSingleString}, true)");
-                queryStringBuilder.Append($" OR CONTAINS(r.ServiceName, {searchAsSingleString}, true)");
-                queryStringBuilder.Append($" OR CONTAINS(r.PackageDisplayName, {searchAsSingleString}, true)");
-                queryStringBuilder.Append($" OR (CONTAINS(r.Name, \"{search[0]}\", true)");
-
-                for (int i = 1; i < search.Count; i++)
+
+                var hasExactMatchQuery = search.Any(
+                    s => (
+                    s.StartsWith("package:") || 
+                    s.StartsWith("pr:") || 
+                    s.StartsWith("author:") || 
+                    s.StartsWith("service:") ||
+                    s.StartsWith("name:")
+                ));
+
+                if (hasExactMatchQuery)
+                {
+                    foreach (var item in search)
+                    {
+                        if (item.StartsWith("package:"))
+                        {
+                            var query = '"' + $"{item.Replace("package:", "")}" + '"';
+                            queryStringBuilder.Append($" AND STRINGEQUALS(ARRAY_SLICE(r.Revisions, -1)[0].Files[0].PackageName, {query}, true)");
+                        }
+                        else if (item.StartsWith("author:"))
+                        {
+                            var query = '"' + $"{item.Replace("author:", "")}" + '"';
+                            queryStringBuilder.Append($" AND STRINGEQUALS(r.Author, {query}, true)");
+                        }
+                        else if (item.StartsWith("service:"))
+                        {
+                            var query = '"' + $"{item.Replace("service:", "")}" + '"';
+                            queryStringBuilder.Append($" AND STRINGEQUALS(r.ServiceName, {query}, true)");
+                        }
+                        else if (item.StartsWith("pr:"))
+                        {
+                            var query = '"' + $"{item.Replace("pr:", "")}" + '"';
+                            queryStringBuilder.Append($" AND ENDSWITH(ARRAY_SLICE(r.Revisions, -1)[0].Label, {query}, true)");
+                        }
+                        else if (item.StartsWith("name:"))
+                        {
+                            var query = '"' + $"{item.Replace("name:", "")}" + '"';
+                            queryStringBuilder.Append($" AND CONTAINS(ARRAY_SLICE(r.Revisions, -1)[0].Name, {query}, true)");
+                        }
+                        else
+                        {
+                            var query = '"' + $"{item}" + '"';
+                            queryStringBuilder.Append($" AND CONTAINS(ARRAY_SLICE(r.Revisions, -1)[0].Name, {query}, true)");
+                        }
+                    }
+                }
+                else
                 {
-                    queryStringBuilder.Append($" AND CONTAINS(r.Revisions[0].Name, \"{search[i]}\", true)");
+                    queryStringBuilder.Append($" AND (r.Author IN {searchAsQueryStr}");
+                    foreach (var item in search) 
+                    {
+                        var query = '"' + $"{item}" + '"';
+                        queryStringBuilder.Append($" OR CONTAINS(ARRAY_SLICE(r.Revisions, -1)[0].Name, {query}, true)");
+                        queryStringBuilder.Append($" OR CONTAINS(r.Name, {query}, true)");
+                        queryStringBuilder.Append($" OR CONTAINS(r.ServiceName, {query}, true)");
+                        queryStringBuilder.Append($" OR CONTAINS(r.PackageDisplayName, {query}, true)");
+                    }
+                    queryStringBuilder.Append($")");
                 }
-                queryStringBuilder.Append($"))");
             }
 
             if (languages != null && languages.Count > 0)