mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Made structural changes to server-side Preference code based on feedback

Просмотр исходного кода
Этот коммит содержится в:
hmhealey
2015-10-09 13:47:11 -04:00
родитель 8a7aa7f66f
Коммит 5cecf1afcd
9 изменённых файлов: 220 добавлений и 355 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

37
api/preference.go
Просмотреть файл

@@ -5,7 +5,6 @@ package api
import (
l4g "code.google.com/p/log4go"
"encoding/json"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"net/http"
@@ -15,29 +14,27 @@ func InitPreference(r *mux.Router) {
l4g.Debug("Initializing preference api routes")
sr := r.PathPrefix("/preferences").Subrouter()
sr.Handle("/set", ApiAppHandler(setPreferences)).Methods("POST")
sr.Handle("/save", ApiAppHandler(savePreferences)).Methods("POST")
sr.Handle("/{category:[A-Za-z0-9_]+}/{name:[A-Za-z0-9_]+}", ApiAppHandler(getPreferencesByName)).Methods("GET")
}
func setPreferences(c *Context, w http.ResponseWriter, r *http.Request) {
var preferences []*model.Preference
decoder := json.NewDecoder(r.Body)
if err := decoder.Decode(&preferences); err != nil {
c.Err = model.NewAppError("setPreferences", "Unable to decode preferences from request", err.Error())
func savePreferences(c *Context, w http.ResponseWriter, r *http.Request) {
preferences, err := model.PreferencesFromJson(r.Body)
if err != nil {
c.Err = model.NewAppError("savePreferences", "Unable to decode preferences from request", err.Error())
c.Err.StatusCode = http.StatusBadRequest
return
}
for _, preference := range preferences {
if c.Session.UserId != preference.UserId {
c.Err = model.NewAppError("setPreferences", "Unable to set preferences for other user", "session.user_id="+c.Session.UserId+", preference.user_id="+preference.UserId)
c.Err = model.NewAppError("savePreferences", "Unable to set preferences for other user", "session.user_id="+c.Session.UserId+", preference.user_id="+preference.UserId)
c.Err.StatusCode = http.StatusUnauthorized
return
}
}
if result := <-Srv.Store.Preference().SaveOrUpdate(preferences...); result.Err != nil {
if result := <-Srv.Store.Preference().Save(&preferences); result.Err != nil {
c.Err = result.Err
return
}
@@ -54,7 +51,7 @@ func getPreferencesByName(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = result.Err
return
} else {
data := result.Data.([]*model.Preference)
data := result.Data.(model.Preferences)
if len(data) == 0 {
if category == model.PREFERENCE_CATEGORY_DIRECT_CHANNELS && name == model.PREFERENCE_NAME_SHOW {
@@ -63,11 +60,11 @@ func getPreferencesByName(c *Context, w http.ResponseWriter, r *http.Request) {
}
}
w.Write([]byte(model.PreferenceListToJson(data)))
w.Write([]byte(data.ToJson()))
}
}
func addDirectChannels(userId, teamId string) []*model.Preference {
func addDirectChannels(userId, teamId string) model.Preferences {
var profiles map[string]*model.User
if result := <-Srv.Store.User().GetProfiles(teamId); result.Err != nil {
l4g.Error("Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v", userId, teamId, result.Err.Error())
@@ -76,7 +73,7 @@ func addDirectChannels(userId, teamId string) []*model.Preference {
profiles = result.Data.(map[string]*model.User)
}
var preferences []*model.Preference
var preferences model.Preferences
for id := range profiles {
if id == userId {
@@ -93,11 +90,6 @@ func addDirectChannels(userId, teamId string) []*model.Preference {
Value: "true",
}
if result := <-Srv.Store.Preference().Save(preference); result.Err != nil {
l4g.Error("Failed to add direct channel preferences for user user_id=%s, alt_id=%s, team_id=%s, err=%v", userId, profile.Id, teamId, result.Err.Error())
continue
}
preferences = append(preferences, preference)
if len(preferences) >= 10 {
@@ -105,5 +97,10 @@ func addDirectChannels(userId, teamId string) []*model.Preference {
}
}
return preferences
if result := <-Srv.Store.Preference().Save(&preferences); result.Err != nil {
l4g.Error("Failed to add direct channel preferences for user user_id=%s, eam_id=%s, err=%v", userId, teamId, result.Err.Error())
return model.Preferences{}
} else {
return preferences
}
}

48
api/preference_test.go
Просмотреть файл

@@ -22,7 +22,7 @@ func TestSetPreferences(t *testing.T) {
Client.LoginByEmail(team.Name, user1.Email, "pwd")
// save 10 preferences
var preferences []*model.Preference
var preferences model.Preferences
for i := 0; i < 10; i++ {
preference := model.Preference{
UserId: user1.Id,
@@ -33,7 +33,7 @@ func TestSetPreferences(t *testing.T) {
preferences = append(preferences, &preference)
}
if _, err := Client.SetPreferences(preferences); err != nil {
if _, err := Client.SetPreferences(&preferences); err != nil {
t.Fatal(err)
}
@@ -42,7 +42,7 @@ func TestSetPreferences(t *testing.T) {
preference.Value = "1234garbage"
}
if _, err := Client.SetPreferences(preferences); err != nil {
if _, err := Client.SetPreferences(&preferences); err != nil {
t.Fatal(err)
}
@@ -53,7 +53,7 @@ func TestSetPreferences(t *testing.T) {
Client.LoginByEmail(team.Name, user2.Email, "pwd")
if _, err := Client.SetPreferences(preferences); err == nil {
if _, err := Client.SetPreferences(&preferences); err == nil {
t.Fatal("shouldn't have been able to update another user's preferences")
}
}
@@ -72,7 +72,7 @@ func TestGetPreferencesByName(t *testing.T) {
user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
store.Must(Srv.Store.User().VerifyEmail(user2.Id))
preferences1 := []*model.Preference{
preferences1 := model.Preferences{
{
UserId: user1.Id,
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS,
@@ -100,13 +100,13 @@ func TestGetPreferencesByName(t *testing.T) {
}
Client.LoginByEmail(team.Name, user1.Email, "pwd")
Client.Must(Client.SetPreferences(preferences1))
Client.Must(Client.SetPreferences(&preferences1))
Client.LoginByEmail(team.Name, user1.Email, "pwd")
if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOW); err != nil {
t.Fatal(err)
} else if data := result.Data.([]*model.Preference); len(data) != 2 {
} else if data := result.Data.(model.Preferences); len(data) != 2 {
t.Fatal("received the wrong number of preferences")
} else if !((*data[0] == *preferences1[0] && *data[1] == *preferences1[1]) || (*data[0] == *preferences1[1] && *data[1] == *preferences1[0])) {
t.Fatal("received incorrect preferences")
@@ -117,7 +117,7 @@ func TestGetPreferencesByName(t *testing.T) {
// note that user2 will start with a preference to show user1 in the sidebar by default
if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOW); err != nil {
t.Fatal(err)
} else if data := result.Data.([]*model.Preference); len(data) != 1 {
} else if data := result.Data.(model.Preferences); len(data) != 1 {
t.Fatal("received the wrong number of preferences")
}
}
@@ -134,32 +134,34 @@ func TestSetAndGetProperties(t *testing.T) {
Client.LoginByEmail(team.Name, user.Email, "pwd")
p := model.Preference{
UserId: user.Id,
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS,
Name: model.PREFERENCE_NAME_SHOW,
AltId: model.NewId(),
Value: model.NewId(),
preferences := model.Preferences{
{
UserId: user.Id,
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS,
Name: model.PREFERENCE_NAME_SHOW,
AltId: model.NewId(),
Value: model.NewId(),
},
}
Client.Must(Client.SetPreferences([]*model.Preference{&p}))
Client.Must(Client.SetPreferences(&preferences))
if result, err := Client.GetPreferencesByName(p.Category, p.Name); err != nil {
if result, err := Client.GetPreferencesByName(preferences[0].Category, preferences[0].Name); err != nil {
t.Fatal(err)
} else if data := result.Data.([]*model.Preference); len(data) != 1 {
} else if data := result.Data.(model.Preferences); len(data) != 1 {
t.Fatal("received too many preferences")
} else if *data[0] != p {
} else if *data[0] != *preferences[0] {
t.Fatal("preference saved incorrectly")
}
p.Value = model.NewId()
Client.Must(Client.SetPreferences([]*model.Preference{&p}))
preferences[0].Value = model.NewId()
Client.Must(Client.SetPreferences(&preferences))
if result, err := Client.GetPreferencesByName(p.Category, p.Name); err != nil {
if result, err := Client.GetPreferencesByName(preferences[0].Category, preferences[0].Name); err != nil {
t.Fatal(err)
} else if data := result.Data.([]*model.Preference); len(data) != 1 {
} else if data := result.Data.(model.Preferences); len(data) != 1 {
t.Fatal("received too many preferences")
} else if *data[0] != p {
} else if *data[0] != *preferences[0] {
t.Fatal("preference updated incorrectly")
}
}