INTMDB-17: Update search (#223)

* change search index struct * change test * fix search test Co-authored-by: Abner Garcia <abner.garcia@edgelab.mx>
mongodb · Jun 23, 2021 · b374654 · b374654
1 parent 75b0d6e
commit b374654
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/mongodbatlas/search.go b/mongodbatlas/search.go
@@ -242,13 +242,15 @@ func (s *SearchServiceOp) UpdateAllAnalyzers(ctx context.Context, groupID, clust
 
 // SearchIndex index definition.
 type SearchIndex struct {
-	Analyzer       string        `json:"analyzer,omitempty"`
-	CollectionName string        `json:"collectionName"`
-	Database       string        `json:"database"`
-	IndexID        string        `json:"indexID,omitempty"`
-	Mappings       *IndexMapping `json:"mappings,omitempty"`
-	Name           string        `json:"name"`
-	SearchAnalyzer string        `json:"searchAnalyzer,omitempty"`
+	Analyzer       string                 `json:"analyzer,omitempty"`
+	Analyzers      map[string]interface{} `json:"analyzers,omitempty"` // Custom analyzers
+	CollectionName string                 `json:"collectionName"`
+	Database       string                 `json:"database"`
+	IndexID        string                 `json:"indexID,omitempty"`
+	Mappings       *IndexMapping          `json:"mappings,omitempty"`
+	Name           string                 `json:"name"`
+	SearchAnalyzer string                 `json:"searchAnalyzer,omitempty"`
+	Status         string                 `json:"status,omitempty"`
 }
 
 // IndexMapping containing index specifications for the collection fields.
@@ -281,7 +283,8 @@ type IndexField struct {
 // SearchAnalyzer custom analyzer definition.
 type SearchAnalyzer struct {
 	BaseAnalyzer     string   `json:"baseAnalyzer"`
-	MaxTokenLength   *float64 `json:"maxTokenLength,omitempty"`
+	MaxTokenLength   *int     `json:"maxTokenLength,omitempty"`
+	IgnoreCase       *bool    `json:"ignoreCase,omitempty"`
 	Name             string   `json:"name"`
 	StemExclusionSet []string `json:"stemExclusionSet,omitempty"`
 	Stopwords        []string `json:"stopwords,omitempty"`

diff --git a/mongodbatlas/search_test.go b/mongodbatlas/search_test.go
@@ -351,7 +351,7 @@ func TestSearch_ListAnalyzers(t *testing.T) {
 	expected := []*SearchAnalyzer{
 		{
 			BaseAnalyzer:   "lucene.standard",
-			MaxTokenLength: pointy.Float64(32),
+			MaxTokenLength: pointy.Int(32),
 			Name:           "my_new_analyzer",
 		},
 		{
@@ -377,7 +377,8 @@ func TestSearch_UpdateAllAnalyzers(t *testing.T) {
 		  {
 			"baseAnalyzer" : "lucene.standard",
 			"maxTokenLength" : 32,
-			"name" : "my_new_analyzer"
+			"name" : "my_new_analyzer",
+			"ignoreCase": true
 		  },
 		  {
 			"baseAnalyzer" : "lucene.english",
@@ -390,8 +391,9 @@ func TestSearch_UpdateAllAnalyzers(t *testing.T) {
 	request := []*SearchAnalyzer{
 		{
 			BaseAnalyzer:   "lucene.standard",
-			MaxTokenLength: pointy.Float64(32),
+			MaxTokenLength: pointy.Int(32),
 			Name:           "my_new_analyzer",
+			IgnoreCase:     pointy.Bool(true),
 		},
 		{
 			BaseAnalyzer: "lucene.english",
@@ -408,8 +410,9 @@ func TestSearch_UpdateAllAnalyzers(t *testing.T) {
 	expected := []*SearchAnalyzer{
 		{
 			BaseAnalyzer:   "lucene.standard",
-			MaxTokenLength: pointy.Float64(32),
+			MaxTokenLength: pointy.Int(32),
 			Name:           "my_new_analyzer",
+			IgnoreCase:     pointy.Bool(true),
 		},
 		{
 			BaseAnalyzer: "lucene.english",