rename searchsettings -> searchrelevancy (#89)

Author: lakhansamani

main.go

@@ -59,8 +59,8 @@ var (
 	FeatureTemplates string
 	// FeatureFunctions for testing
 	FeatureFunctions string
-	// FeatureSearchSettings for testing
-	FeatureSearchSettings string
+	// FeatureSearchRelevancy for testing
+	FeatureSearchRelevancy string
 )
 
 func init() {
@@ -184,16 +184,16 @@ func main() {
 	if FeatureTemplates != "" && FeatureTemplates == "true" {
 		util.SetFeatureTemplates(true)
 	}
-	if FeatureSearchSettings != "" && FeatureSearchSettings == "true" {
-		util.SetFeatureSearchSettings(true)
+	if FeatureSearchRelevancy != "" && FeatureSearchRelevancy == "true" {
+		util.SetFeatureSearchRelevancy(true)
 	}
 
 	// ES client instantiation
 	// ES v7 and v6 clients
 	util.NewClient()
 	util.SetDefaultIndexTemplate()
 	// map of specific plugins
-	sequencedPlugins := []string{"searchsettings.so", "rules.so", "functions.so", "analytics.so"}
+	sequencedPlugins := []string{"searchrelevancy.so", "rules.so", "functions.so", "analytics.so"}
 	sequencedPluginsByPath := make(map[string]string)
 
 	var elasticSearchPath, reactiveSearchPath string

model/category/category.go

@@ -35,7 +35,7 @@ const (
 	Auth
 	Functions
 	ReactiveSearch
-	SearchSettings
+	SearchRelevancy
 )
 
 // String is an implementation of Stringer interface that returns the string representation of category.Categories.
@@ -57,7 +57,7 @@ func (c Category) String() string {
 		"auth",
 		"functions",
 		"reactivesearch",
-		"searchsettings",
+		"searchrelevancy",
 	}[c]
 }
 
@@ -101,8 +101,8 @@ func (c *Category) UnmarshalJSON(bytes []byte) error {
 		*c = Functions
 	case ReactiveSearch.String():
 		*c = ReactiveSearch
-	case SearchSettings.String():
-		*c = SearchSettings
+	case SearchRelevancy.String():
+		*c = SearchRelevancy
 	default:
 		return fmt.Errorf("invalid category encountered: %v", category)
 	}
@@ -145,8 +145,8 @@ func (c Category) MarshalJSON() ([]byte, error) {
 		category = Functions.String()
 	case ReactiveSearch:
 		category = ReactiveSearch.String()
-	case SearchSettings:
-		category = SearchSettings.String()
+	case SearchRelevancy:
+		category = SearchRelevancy.String()
 	default:
 		return nil, fmt.Errorf("invalid category encountered: %v" + c.String())
 	}

model/permission/defaults.go

@@ -29,7 +29,7 @@ var (
 		category.Auth,
 		category.Functions,
 		category.ReactiveSearch,
-		category.SearchSettings,
+		category.SearchRelevancy,
 	}
 
 	defaultOps = []op.Operation{
@@ -60,7 +60,7 @@ var (
 		AuthLimit:           10,
 		FunctionsLimit:      10,
 		ReactiveSearchLimit: 10,
-		SearchSettingsLimit: 10,
+		SearchRelevancyLimit: 10,
 	}
 
 	defaultAdminLimits = Limits{
@@ -81,6 +81,6 @@ var (
 		AuthLimit:           30,
 		FunctionsLimit:      30,
 		ReactiveSearchLimit: 30,
-		SearchSettingsLimit: 30,
+		SearchRelevancyLimit: 30,
 	}
 )

model/permission/permission.go

@@ -71,7 +71,7 @@ type Limits struct {
 	AuthLimit           int64 `json:"auth_limit"`
 	FunctionsLimit      int64 `json:"functions_limit"`
 	ReactiveSearchLimit int64 `json:"reactivesearch_limit"`
-	SearchSettingsLimit int64 `json:"searchsettings_limit"`
+	SearchRelevancyLimit int64 `json:"searchrelevancy_limit"`
 }
 
 // Options is a function type used to define a permission's properties.
@@ -472,8 +472,8 @@ func (p *Permission) GetLimitFor(c category.Category) (int64, error) {
 		return p.Limits.FunctionsLimit, nil
 	case category.ReactiveSearch:
 		return p.Limits.ReactiveSearchLimit, nil
-	case category.SearchSettings:
-		return p.Limits.SearchSettingsLimit, nil
+	case category.SearchRelevancy:
+		return p.Limits.SearchRelevancyLimit, nil
 	default:
 		return -1, fmt.Errorf(`we do not rate limit "%s" category`, c)
 	}
@@ -594,8 +594,8 @@ func (p *Permission) GetPatch(rolePatched bool) (map[string]interface{}, error)
 			limits["reactivesearch_limit"] = p.Limits.ReactiveSearchLimit
 		}
 
-		if p.Limits.SearchSettingsLimit != 0 {
-			limits["searchsettings_limit"] = p.Limits.SearchSettingsLimit
+		if p.Limits.SearchRelevancyLimit != 0 {
+			limits["searchrelevancy_limit"] = p.Limits.SearchRelevancyLimit
 		}
 
 		patch["limits"] = limits

model/user/defaults.go

@@ -28,7 +28,7 @@ var (
 		category.Suggestions,
 		category.Functions,
 		category.ReactiveSearch,
-		category.SearchSettings,
+		category.SearchRelevancy,
 		category.Auth,
 	}
 

plugins/auth/e2e_test.go

@@ -28,7 +28,7 @@ var adminCategories = []category.Category{
 	category.Auth,
 	category.Functions,
 	category.ReactiveSearch,
-	category.SearchSettings,
+	category.SearchRelevancy,
 }
 
 var adminOps = []op.Operation{
@@ -55,7 +55,7 @@ var defaultAdminLimits = permission.Limits{
 	AuthLimit:           30,
 	FunctionsLimit:      30,
 	ReactiveSearchLimit: 30,
-	SearchSettingsLimit: 30,
+	SearchRelevancyLimit: 30,
 }
 
 var createPermissionResponse = map[string]interface{}{

plugins/permissions/e2e_test.go

@@ -28,7 +28,7 @@ var adminCategories = []category.Category{
 	category.Suggestions,
 	category.Functions,
 	category.ReactiveSearch,
-	category.SearchSettings,
+	category.SearchRelevancy,
 	category.Auth,
 }
 
@@ -56,7 +56,7 @@ var defaultAdminLimits = permission.Limits{
 	AuthLimit:           30,
 	FunctionsLimit:      30,
 	ReactiveSearchLimit: 30,
-	SearchSettingsLimit: 30,
+	SearchRelevancyLimit: 30,
 }
 
 var createPermissionResponse = map[string]interface{}{

util/billing.go

@@ -69,7 +69,7 @@ type ClusterPlan struct {
 	FeatureRules          bool   `json:"feature_rules"`
 	FeatureTemplates      bool   `json:"feature_templates"`
 	FeatureFunctions      bool   `json:"feature_functions"`
-	FeatureSearchSettings bool   `json:"feature_search_settings"`
+	FeatureSearchRelevancy bool   `json:"feature_search_relevancy"`
 	Trial                 bool   `json:"trial"`
 	TrialValidity         int64  `json:"trial_validity"`
 	TierValidity          int64  `json:"tier_validity"`
@@ -120,7 +120,7 @@ type ArcInstanceDetails struct {
 	FeatureRules          bool                   `json:"feature_rules"`
 	FeatureTemplates      bool                   `json:"feature_templates"`
 	FeatureFunctions      bool                   `json:"feature_functions"`
-	FeatureSearchSettings bool                   `json:"feature_search_settings"`
+	FeatureSearchRelevancy bool                   `json:"feature_search_relevancy"`
 }
 
 // SetDefaultTier sets the default tier when billing is disabled
@@ -205,7 +205,7 @@ func getArcInstance(arcID string) (ArcInstance, error) {
 		SetFeatureCustomEvents(arcInstanceByID.FeatureCustomEvents)
 		SetFeatureRules(arcInstanceByID.FeatureRules)
 		SetFeatureFunctions(arcInstanceByID.FeatureFunctions)
-		SetFeatureSearchSettings(arcInstanceByID.FeatureSearchSettings)
+		SetFeatureSearchRelevancy(arcInstanceByID.FeatureSearchRelevancy)
 		SetFeatureTemplates(arcInstanceByID.FeatureTemplates)
 	} else {
 		return arcInstance, errors.New("No valid instance found for the provided ARC_ID")
@@ -255,7 +255,7 @@ func getArcClusterInstance(clusterID string) (ArcInstance, error) {
 		SetFeatureCustomEvents(arcInstanceDetails.FeatureCustomEvents)
 		SetFeatureRules(arcInstanceDetails.FeatureRules)
 		SetFeatureFunctions(arcInstanceDetails.FeatureFunctions)
-		SetFeatureSearchSettings(arcInstanceDetails.FeatureSearchSettings)
+		SetFeatureSearchRelevancy(arcInstanceDetails.FeatureSearchRelevancy)
 		SetFeatureTemplates(arcInstanceDetails.FeatureTemplates)
 	} else {
 		return arcInstance, errors.New("No valid instance found for the provided CLUSTER_ID")
@@ -303,7 +303,7 @@ func getClusterPlan(clusterID string) (ClusterPlan, error) {
 	SetFeatureCustomEvents(response.Plan.FeatureCustomEvents)
 	SetFeatureRules(response.Plan.FeatureRules)
 	SetFeatureFunctions(response.Plan.FeatureFunctions)
-	SetFeatureSearchSettings(response.Plan.FeatureSearchSettings)
+	SetFeatureSearchRelevancy(response.Plan.FeatureSearchRelevancy)
 	SetFeatureTemplates(response.Plan.FeatureTemplates)
 
 	return clusterPlan, nil

util/billing_test.go

@@ -48,9 +48,9 @@ func TestBilling(t *testing.T) {
 			SetFeatureTemplates(true)
 			So(GetFeatureTemplates(), ShouldEqual, true)
 		})
-		Convey("Set FeatureSearchSettings", func() {
-			SetFeatureSearchSettings(true)
-			So(GetFeatureSearchSettings(), ShouldEqual, true)
+		Convey("Set FeatureSearchRelevancy", func() {
+			SetFeatureSearchRelevancy(true)
+			So(GetFeatureSearchRelevancy(), ShouldEqual, true)
 		})
 		Convey("Validate TimeValidity: Positive Value", func() {
 			// Set TimeValidity to a positive value

util/feature.go

@@ -66,14 +66,14 @@ func SetFeatureFunctions(val bool) {
 }
 
 // Feature search settings
-var featureSearchSettings bool
+var featureSearchRelevancy bool
 
-// GetFeatureSearchSettings returns the featureSearchSettings
-func GetFeatureSearchSettings() bool {
-	return featureSearchSettings
+// GetFeatureSearchRelevancy returns the featureSearchRelevancy
+func GetFeatureSearchRelevancy() bool {
+	return featureSearchRelevancy
 }
 
-// SetFeatureSearchSettings sets the featureSearchSettings
-func SetFeatureSearchSettings(val bool) {
-	featureSearchSettings = val
+// SetFeatureSearchRelevancy sets the featureSearchRelevancy
+func SetFeatureSearchRelevancy(val bool) {
+	featureSearchRelevancy = val
 }