Migrating more GroupStore methods to sync by default (#11447)
* Migrating more GroupStore methods to sync by default * Fixing tests * Fixing tests * Fixing compilation
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
76ac7d8ef0
Коммит
bcaab359a4
35
app/group.go
35
app/group.go
@@ -34,41 +34,28 @@ func (a *App) DeleteGroup(groupID string) (*model.Group, *model.AppError) {
|
||||
}
|
||||
|
||||
func (a *App) GetGroupMemberUsers(groupID string) ([]*model.User, *model.AppError) {
|
||||
result := <-a.Srv.Store.Group().GetMemberUsers(groupID)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.([]*model.User), nil
|
||||
return a.Srv.Store.Group().GetMemberUsers(groupID)
|
||||
}
|
||||
|
||||
func (a *App) GetGroupMemberUsersPage(groupID string, page int, perPage int) ([]*model.User, int, *model.AppError) {
|
||||
result := <-a.Srv.Store.Group().GetMemberUsersPage(groupID, page, perPage)
|
||||
if result.Err != nil {
|
||||
return nil, 0, result.Err
|
||||
members, err := a.Srv.Store.Group().GetMemberUsersPage(groupID, page, perPage)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
members := result.Data.([]*model.User)
|
||||
result = <-a.Srv.Store.Group().GetMemberCount(groupID)
|
||||
if result.Err != nil {
|
||||
return nil, 0, result.Err
|
||||
|
||||
count, err := a.Srv.Store.Group().GetMemberCount(groupID)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
count := int(result.Data.(int64))
|
||||
return members, count, nil
|
||||
return members, int(count), nil
|
||||
}
|
||||
|
||||
func (a *App) UpsertGroupMember(groupID string, userID string) (*model.GroupMember, *model.AppError) {
|
||||
result := <-a.Srv.Store.Group().UpsertMember(groupID, userID)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.(*model.GroupMember), nil
|
||||
return a.Srv.Store.Group().UpsertMember(groupID, userID)
|
||||
}
|
||||
|
||||
func (a *App) DeleteGroupMember(groupID string, userID string) (*model.GroupMember, *model.AppError) {
|
||||
result := <-a.Srv.Store.Group().DeleteMember(groupID, userID)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
return result.Data.(*model.GroupMember), nil
|
||||
return a.Srv.Store.Group().DeleteMember(groupID, userID)
|
||||
}
|
||||
|
||||
func (a *App) CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) {
|
||||
|
||||
Ссылка в новой задаче
Block a user