diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-10-13 15:18:01 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-10-13 15:36:58 -0400 |
commit | 97b2f6ffe7fa09a2188163740865322582b00b59 (patch) | |
tree | 69c11911d8c364b8d6bb31c2723a8f046b8b61e3 /model/preference.go | |
parent | 2a39e8dbfab8506b09d0d030f87cac4c079b975a (diff) | |
download | chat-97b2f6ffe7fa09a2188163740865322582b00b59.tar.gz chat-97b2f6ffe7fa09a2188163740865322582b00b59.tar.bz2 chat-97b2f6ffe7fa09a2188163740865322582b00b59.zip |
Made further changes based on feedback
Diffstat (limited to 'model/preference.go')
-rw-r--r-- | model/preference.go | 15 |
1 files changed, 2 insertions, 13 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 -} |