From 97b2f6ffe7fa09a2188163740865322582b00b59 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 13 Oct 2015 15:18:01 -0400 Subject: Made further changes based on feedback --- model/preference.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'model/preference.go') 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 -} -- cgit v1.2.3-1-g7c22