MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
c2ab85e0a3
Коммит
319d61123a
@@ -210,27 +210,20 @@ func (s *SqlSupplier) SchemeDelete(ctx context.Context, schemeId string, hints .
|
||||
return result
|
||||
}
|
||||
|
||||
// Check that the scheme isn't being used on any Teams or Channels.
|
||||
// Update any teams or channels using this scheme to the default scheme.
|
||||
if scheme.Scope == model.SCHEME_SCOPE_TEAM {
|
||||
if c, err := s.GetReplica().SelectInt("SELECT COUNT(*) FROM Teams WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
|
||||
result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.team_count.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError)
|
||||
if _, err := s.GetReplica().Exec("UPDATE Teams SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
|
||||
result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.reset_teams.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError)
|
||||
return result
|
||||
} else {
|
||||
if c > 0 {
|
||||
result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.delete.scheme_in_use.app_error", nil, "Id="+schemeId, http.StatusInternalServerError)
|
||||
return result
|
||||
}
|
||||
}
|
||||
} else if scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
|
||||
if c, err := s.GetReplica().SelectInt("SELECT COUNT(*) FROM Channels WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
|
||||
result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.channel_count.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError)
|
||||
if _, err := s.GetReplica().Exec("UPDATE Channels SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
|
||||
result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.reset_channels.app_error", nil, "Id="+schemeId+", "+err.Error(), http.StatusInternalServerError)
|
||||
return result
|
||||
} else {
|
||||
if c > 0 {
|
||||
result.Err = model.NewAppError("SqlSchemeStore.Delete", "store.sql_scheme.delete.scheme_in_use.app_error", nil, "Id="+schemeId, http.StatusInternalServerError)
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
// Blow away the channel caches.
|
||||
s.Channel().ClearCaches()
|
||||
}
|
||||
|
||||
// Delete the roles belonging to the scheme.
|
||||
|
||||
@@ -336,7 +336,12 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
|
||||
t4 = tres4.Data.(*model.Team)
|
||||
|
||||
sres4 := <-ss.Scheme().Delete(d4.Id)
|
||||
assert.NotNil(t, sres4.Err)
|
||||
assert.Nil(t, sres4.Err)
|
||||
|
||||
tres5 := <-ss.Team().Get(t4.Id)
|
||||
assert.Nil(t, tres5.Err)
|
||||
t5 := tres5.Data.(*model.Team)
|
||||
assert.Equal(t, "", *t5.SchemeId)
|
||||
|
||||
// Try deleting a channel scheme that's in use.
|
||||
s5 := &model.Scheme{
|
||||
@@ -360,5 +365,10 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
|
||||
c5 = cres5.Data.(*model.Channel)
|
||||
|
||||
sres5 := <-ss.Scheme().Delete(d5.Id)
|
||||
assert.NotNil(t, sres5.Err)
|
||||
assert.Nil(t, sres5.Err)
|
||||
|
||||
cres6 := <-ss.Channel().Get(c5.Id, true)
|
||||
assert.Nil(t, cres6.Err)
|
||||
c6 := cres6.Data.(*model.Channel)
|
||||
assert.Equal(t, "", *c6.SchemeId)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user