MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)
* MM-10183: Adds channel scheme API endpoint. MM-10182: Adds team scheme API endpoint. MM-10182_3: Switch from scheme_id in path to body. * MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'. * MM-10182: Fix merge error.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
d2cc0c5834
Коммит
f4dcb4edf2
@@ -354,6 +354,23 @@ func (a *App) UpdateChannel(channel *model.Channel) (*model.Channel, *model.AppE
|
||||
}
|
||||
}
|
||||
|
||||
func (a *App) UpdateChannelScheme(channel *model.Channel) (*model.Channel, *model.AppError) {
|
||||
var oldChannel *model.Channel
|
||||
var err *model.AppError
|
||||
if oldChannel, err = a.GetChannel(channel.Id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
oldChannel.SchemeId = channel.SchemeId
|
||||
|
||||
newChannel, err := a.UpdateChannel(oldChannel)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return newChannel, nil
|
||||
}
|
||||
|
||||
func (a *App) UpdateChannelPrivacy(oldChannel *model.Channel, user *model.User) (*model.Channel, *model.AppError) {
|
||||
if channel, err := a.UpdateChannel(oldChannel); err != nil {
|
||||
return channel, err
|
||||
|
||||
@@ -381,3 +381,21 @@ func TestAddChannelMemberNoUserRequestor(t *testing.T) {
|
||||
assert.Equal(t, user.Username, post.Props["username"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppUpdateChannelScheme(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
channel := th.BasicChannel
|
||||
mockID := model.NewString("x")
|
||||
channel.SchemeId = mockID
|
||||
|
||||
updatedChannel, err := th.App.UpdateChannelScheme(channel)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if updatedChannel.SchemeId != mockID {
|
||||
t.Fatal("Wrong Channel SchemeId")
|
||||
}
|
||||
}
|
||||
|
||||
18
app/team.go
18
app/team.go
@@ -114,6 +114,24 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) {
|
||||
return oldTeam, nil
|
||||
}
|
||||
|
||||
func (a *App) UpdateTeamScheme(team *model.Team) (*model.Team, *model.AppError) {
|
||||
var oldTeam *model.Team
|
||||
var err *model.AppError
|
||||
if oldTeam, err = a.GetTeam(team.Id); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
oldTeam.SchemeId = team.SchemeId
|
||||
|
||||
if result := <-a.Srv.Store.Team().Update(oldTeam); result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
|
||||
a.sendTeamEvent(oldTeam, model.WEBSOCKET_EVENT_UPDATE_TEAM)
|
||||
|
||||
return oldTeam, nil
|
||||
}
|
||||
|
||||
func (a *App) PatchTeam(teamId string, patch *model.TeamPatch) (*model.Team, *model.AppError) {
|
||||
team, err := a.GetTeam(teamId)
|
||||
if err != nil {
|
||||
|
||||
@@ -559,3 +559,21 @@ func TestJoinUserToTeam(t *testing.T) {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestAppUpdateTeamScheme(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
team := th.BasicTeam
|
||||
mockID := model.NewString("x")
|
||||
team.SchemeId = mockID
|
||||
|
||||
updatedTeam, err := th.App.UpdateTeamScheme(th.BasicTeam)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if updatedTeam.SchemeId != mockID {
|
||||
t.Fatal("Wrong Team SchemeId")
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user