From a0ac3e86c5643e6a10c196417569e1f674c266ec Mon Sep 17 00:00:00 2001
From: Shubham Agrawal <shubham.agrawal@harness.io>
Date: Tue, 21 May 2024 05:58:50 +0000
Subject: [PATCH] fix: [CODE-1924]: Add support for keyword search recursively
 in space paths (#2048)

---
 app/api/controller/keywordsearch/search.go | 17 ++++++++++-------
 types/search.go                            |  4 ++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/keywordsearch/search.go b/app/api/controller/keywordsearch/search.go
index 4e4b8e1be..0a490698c 100644
--- a/app/api/controller/keywordsearch/search.go
+++ b/app/api/controller/keywordsearch/search.go
@@ -46,7 +46,7 @@ func (c *Controller) Search(
 		return types.SearchResult{}, fmt.Errorf("failed to search repos by path: %w", err)
 	}
 
-	spaceRepoIDToPathMap, err := c.getReposBySpacePaths(ctx, session, in.SpacePaths)
+	spaceRepoIDToPathMap, err := c.getReposBySpacePaths(ctx, session, in.SpacePaths, in.Recursive)
 	if err != nil {
 		return types.SearchResult{}, fmt.Errorf("failed to search repos by space path: %w", err)
 	}
@@ -110,10 +110,11 @@ func (c *Controller) getReposBySpacePaths(
 	ctx context.Context,
 	session *auth.Session,
 	spacePaths []string,
+	recursive bool,
 ) (map[int64]string, error) {
 	repoIDToPathMap := make(map[int64]string)
 	for _, spacePath := range spacePaths {
-		m, err := c.getReposBySpacePath(ctx, session, spacePath)
+		m, err := c.getReposBySpacePath(ctx, session, spacePath, recursive)
 		if err != nil {
 			return nil, fmt.Errorf("failed to search repos by space path: %w", err)
 		}
@@ -129,6 +130,7 @@ func (c *Controller) getReposBySpacePath(
 	ctx context.Context,
 	session *auth.Session,
 	spacePath string,
+	recursive bool,
 ) (map[int64]string, error) {
 	repoIDToPathMap := make(map[int64]string)
 	if spacePath == "" {
@@ -136,11 +138,12 @@ func (c *Controller) getReposBySpacePath(
 	}
 
 	filter := &types.RepoFilter{
-		Page:  1,
-		Size:  int(math.MaxInt),
-		Query: "",
-		Order: enum.OrderAsc,
-		Sort:  enum.RepoAttrNone,
+		Page:      1,
+		Size:      int(math.MaxInt),
+		Query:     "",
+		Order:     enum.OrderAsc,
+		Sort:      enum.RepoAttrNone,
+		Recursive: recursive,
 	}
 	repos, _, err := c.spaceCtrl.ListRepositories(ctx, session, spacePath, filter)
 	if err != nil {
diff --git a/types/search.go b/types/search.go
index f7f8e0e82..e46ff4144 100644
--- a/types/search.go
+++ b/types/search.go
@@ -29,6 +29,10 @@ type (
 
 		// EnableRegex enables regex search on the query
 		EnableRegex bool `json:"enable_regex"`
+
+		// Search all the repos in a space and its subspaces recursively.
+		// Valid only when spacePaths is set.
+		Recursive bool `json:"recursive"`
 	}
 
 	SearchResult struct {