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

[MM-16667] Migrate User.GetByUsername to Sync by default #11453 (#11520)

Просмотр исходного кода 
* Migrate User.GetByUsername to Sync by default #11453

* fix app errors #11453

* fix app errors #11453

* fix cmd error #11453

* fix shadow var #11453

* fix shadow user var #11453

* fix test error

* fix test error #11453
Этот коммит содержится в:
Taufiq Rahman
2019-07-10 14:46:03 +06:00
коммит произвёл Jesús Espino
родитель 678c8f4f84
Коммит 9ce5b28c63
12 изменённых файлов: 132 добавлений и 124 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
store/sqlstore/user_store.go
Просмотреть файл

@@ -1009,24 +1009,20 @@ func (us SqlUserStore) GetAllUsingAuthService(authService string) ([]*model.User
return users, nil
}
func (us SqlUserStore) GetByUsername(username string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
query := us.usersQuery.Where("u.Username = ?", username)
func (us SqlUserStore) GetByUsername(username string) (*model.User, *model.AppError) {
query := us.usersQuery.Where("u.Username = ?", username)
queryString, args, err := query.ToSql()
if err != nil {
result.Err = model.NewAppError("SqlUserStore.GetByUsername", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError)
return
}
queryString, args, err := query.ToSql()
if err != nil {
return nil, model.NewAppError("SqlUserStore.GetByUsername", "store.sql_user.app_error", nil, err.Error(), http.StatusInternalServerError)
}
user := model.User{}
if err := us.GetReplica().SelectOne(&user, queryString, args...); err != nil {
result.Err = model.NewAppError("SqlUserStore.GetByUsername", "store.sql_user.get_by_username.app_error", nil, err.Error()+" -- "+queryString, http.StatusInternalServerError)
return
}
var user *model.User
if err := us.GetReplica().SelectOne(&user, queryString, args...); err != nil {
return nil, model.NewAppError("SqlUserStore.GetByUsername", "store.sql_user.get_by_username.app_error", nil, err.Error()+" -- "+queryString, http.StatusInternalServerError)
}
result.Data = &user
})
return user, nil
}
func (us SqlUserStore) GetForLogin(loginId string, allowSignInWithUsername, allowSignInWithEmail bool) (*model.User, *model.AppError) {

2
store/store.go
Просмотреть файл

@@ -277,7 +277,7 @@ type UserStore interface {
GetByEmail(email string) (*model.User, *model.AppError)
GetByAuth(authData *string, authService string) (*model.User, *model.AppError)
GetAllUsingAuthService(authService string) ([]*model.User, *model.AppError)
GetByUsername(username string) StoreChannel
GetByUsername(username string) (*model.User, *model.AppError)
GetForLogin(loginId string, allowSignInWithUsername, allowSignInWithEmail bool) (*model.User, *model.AppError)
VerifyEmail(userId, email string) (string, *model.AppError)
GetEtagForAllProfiles() string

19
store/storetest/mocks/UserStore.go
Просмотреть файл

@@ -350,19 +350,28 @@ func (_m *UserStore) GetByEmail(email string) (*model.User, *model.AppError) {
}
// GetByUsername provides a mock function with given fields: username
func (_m *UserStore) GetByUsername(username string) store.StoreChannel {
func (_m *UserStore) GetByUsername(username string) (*model.User, *model.AppError) {
ret := _m.Called(username)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
var r0 *model.User
if rf, ok := ret.Get(0).(func(string) *model.User); ok {
r0 = rf(username)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.User)
}
}
return r0
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
r1 = rf(username)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// GetChannelGroupUsers provides a mock function with given fields: channelID

54
store/storetest/user_store.go
Просмотреть файл

@@ -1671,33 +1671,33 @@ func testUserStoreGetByUsername(t *testing.T, ss store.Store) {
defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }()
t.Run("get u1 by username", func(t *testing.T) {
result := <-ss.User().GetByUsername(u1.Username)
require.Nil(t, result.Err)
assert.Equal(t, u1, result.Data.(*model.User))
result, err := ss.User().GetByUsername(u1.Username)
require.Nil(t, err)
assert.Equal(t, u1, result)
})
t.Run("get u2 by username", func(t *testing.T) {
result := <-ss.User().GetByUsername(u2.Username)
require.Nil(t, result.Err)
assert.Equal(t, u2, result.Data.(*model.User))
result, err := ss.User().GetByUsername(u2.Username)
require.Nil(t, err)
assert.Equal(t, u2, result)
})
t.Run("get u3 by username", func(t *testing.T) {
result := <-ss.User().GetByUsername(u3.Username)
require.Nil(t, result.Err)
assert.Equal(t, u3, result.Data.(*model.User))
result, err := ss.User().GetByUsername(u3.Username)
require.Nil(t, err)
assert.Equal(t, u3, result)
})
t.Run("get by empty username", func(t *testing.T) {
result := <-ss.User().GetByUsername("")
require.NotNil(t, result.Err)
require.Equal(t, result.Err.Id, "store.sql_user.get_by_username.app_error")
_, err := ss.User().GetByUsername("")
require.NotNil(t, err)
require.Equal(t, err.Id, "store.sql_user.get_by_username.app_error")
})
t.Run("get by unknown", func(t *testing.T) {
result := <-ss.User().GetByUsername("unknown")
require.NotNil(t, result.Err)
require.Equal(t, result.Err.Id, "store.sql_user.get_by_username.app_error")
_, err := ss.User().GetByUsername("unknown")
require.NotNil(t, err)
require.Equal(t, err.Id, "store.sql_user.get_by_username.app_error")
})
}
@@ -3611,21 +3611,21 @@ func testUserStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) {
require.Nil(t, ss.User().ClearAllCustomRoleAssignments())
r1 := <-ss.User().GetByUsername(u1.Username)
require.Nil(t, r1.Err)
assert.Equal(t, u1.Roles, r1.Data.(*model.User).Roles)
r1, err := ss.User().GetByUsername(u1.Username)
require.Nil(t, err)
assert.Equal(t, u1.Roles, r1.Roles)
r2 := <-ss.User().GetByUsername(u2.Username)
require.Nil(t, r2.Err)
assert.Equal(t, "system_user system_admin", r2.Data.(*model.User).Roles)
r2, err1 := ss.User().GetByUsername(u2.Username)
require.Nil(t, err1)
assert.Equal(t, "system_user system_admin", r2.Roles)
r3 := <-ss.User().GetByUsername(u3.Username)
require.Nil(t, r3.Err)
assert.Equal(t, u3.Roles, r3.Data.(*model.User).Roles)
r3, err2 := ss.User().GetByUsername(u3.Username)
require.Nil(t, err2)
assert.Equal(t, u3.Roles, r3.Roles)
r4 := <-ss.User().GetByUsername(u4.Username)
require.Nil(t, r4.Err)
assert.Equal(t, "", r4.Data.(*model.User).Roles)
r4, err3 := ss.User().GetByUsername(u4.Username)
require.Nil(t, err3)
assert.Equal(t, "", r4.Roles)
}
func testUserStoreGetAllAfter(t *testing.T, ss store.Store) {