Made further changes based on feedback

2 files changed, 5 insertions, 21 deletions

diff --git a/model/preference.go b/model/preference.go
index 187dbe848..44279f71a 100644
--- a/model/preference.go
+++ b/model/preference.go
@@ -10,8 +10,6 @@ import (
 
 const (
 	PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW = "direct_channel_show"
-	PREFERENCE_CATEGORY_TEST                = "test" // do not use, just for testing uniqueness while there's only one real category
-	PREFERENCE_NAME_TEST                    = "test" // do not use, just for testing while there's no constant name
 )
 
 type Preference struct {
@@ -46,12 +44,11 @@ func (o *Preference) IsValid() *AppError {
 		return NewAppError("Preference.IsValid", "Invalid user id", "user_id="+o.UserId)
 	}
 
-	if len(o.Category) == 0 || len(o.Category) > 32 || !IsPreferenceCategoryValid(o.Category) {
+	if len(o.Category) == 0 || len(o.Category) > 32 {
 		return NewAppError("Preference.IsValid", "Invalid category", "category="+o.Category)
 	}
 
-	// name can either be a valid constant or an id
-	if len(o.Name) == 0 || len(o.Name) > 32 || !(len(o.Name) == 26 || IsPreferenceNameValid(o.Name)) {
+	if len(o.Name) == 0 || len(o.Name) > 32 {
 		return NewAppError("Preference.IsValid", "Invalid name", "name="+o.Name)
 	}
 
@@ -61,11 +58,3 @@ func (o *Preference) IsValid() *AppError {
 
 	return nil
 }
-
-func IsPreferenceCategoryValid(category string) bool {
-	return category == PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW || category == PREFERENCE_CATEGORY_TEST
-}
-
-func IsPreferenceNameValid(name string) bool {
-	return name == PREFERENCE_NAME_TEST
-}
diff --git a/model/preference_test.go b/model/preference_test.go
index 170784c1f..66b7ac50b 100644
--- a/model/preference_test.go
+++ b/model/preference_test.go
@@ -12,7 +12,7 @@ func TestPreferenceIsValid(t *testing.T) {
 	preference := Preference{
 		UserId:   "1234garbage",
 		Category: PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
-		Name:     PREFERENCE_NAME_TEST,
+		Name:     NewId(),
 	}
 
 	if err := preference.IsValid(); err == nil {
@@ -24,7 +24,7 @@ func TestPreferenceIsValid(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	preference.Category = "1234garbage"
+	preference.Category = strings.Repeat("01234567890", 20)
 	if err := preference.IsValid(); err == nil {
 		t.Fatal()
 	}
@@ -34,7 +34,7 @@ func TestPreferenceIsValid(t *testing.T) {
 		t.Fatal()
 	}
 
-	preference.Name = "1234garbage"
+	preference.Name = strings.Repeat("01234567890", 20)
 	if err := preference.IsValid(); err == nil {
 		t.Fatal()
 	}
@@ -44,11 +44,6 @@ func TestPreferenceIsValid(t *testing.T) {
 		t.Fatal()
 	}
 
-	preference.Name = PREFERENCE_NAME_TEST
-	if err := preference.IsValid(); err != nil {
-		t.Fatal()
-	}
-
 	preference.Value = strings.Repeat("01234567890", 20)
 	if err := preference.IsValid(); err == nil {
 		t.Fatal()