IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-15188: Migrate the "WebHook.PermanentDeleteOutgoingByUser" to Sync by default (#10709)

Browse Source
This commit is contained in:
Puneeth Reddy
2019-04-26 22:45:02 -07:00
committed by Hanzei
parent 7e590c7efe
commit 214e9d2ae0
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/user.go
View File

@@ -1414,8 +1414,8 @@ func (a *App) PermanentDeleteUser(user *model.User) *model.AppError {
return err
}
if result := <-a.Srv.Store.Webhook().PermanentDeleteOutgoingByUser(user.Id); result.Err != nil {
return result.Err
if err := a.Srv.Store.Webhook().PermanentDeleteOutgoingByUser(user.Id); err != nil {
return err
}
if result := <-a.Srv.Store.Command().PermanentDeleteByUser(user.Id); result.Err != nil {

14
store/sqlstore/webhook_store.go
View File

@@ -288,13 +288,13 @@ func (s SqlWebhookStore) DeleteOutgoing(webhookId string, time int64) *model.App
return nil
}
func (s SqlWebhookStore) PermanentDeleteOutgoingByUser(userId string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
_, err := s.GetMaster().Exec("DELETE FROM OutgoingWebhooks WHERE CreatorId = :UserId", map[string]interface{}{"UserId": userId})
if err != nil {
result.Err = model.NewAppError("SqlWebhookStore.DeleteOutgoingByUser", "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error", nil, "id="+userId+", err="+err.Error(), http.StatusInternalServerError)
}
})
func (s SqlWebhookStore) PermanentDeleteOutgoingByUser(userId string) *model.AppError {
_, err := s.GetMaster().Exec("DELETE FROM OutgoingWebhooks WHERE CreatorId = :UserId", map[string]interface{}{"UserId": userId})
if err != nil {
return model.NewAppError("SqlWebhookStore.DeleteOutgoingByUser", "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error", nil, "id="+userId+", err="+err.Error(), http.StatusInternalServerError)
}
return nil
}
func (s SqlWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) *model.AppError {

2
store/store.go
View File

@@ -394,7 +394,7 @@ type WebhookStore interface {
GetOutgoingByTeam(teamId string, offset, limit int) ([]*model.OutgoingWebhook, *model.AppError)
DeleteOutgoing(webhookId string, time int64) *model.AppError
PermanentDeleteOutgoingByChannel(channelId string) *model.AppError
PermanentDeleteOutgoingByUser(userId string) StoreChannel
PermanentDeleteOutgoingByUser(userId string) *model.AppError
UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, *model.AppError)
AnalyticsIncomingCount(teamId string) (int64, *model.AppError)

8
store/storetest/mocks/WebhookStore.go
View File

@@ -334,15 +334,15 @@ func (_m *WebhookStore) PermanentDeleteOutgoingByChannel(channelId string) *mode
}
// PermanentDeleteOutgoingByUser provides a mock function with given fields: userId
func (_m *WebhookStore) PermanentDeleteOutgoingByUser(userId string) store.StoreChannel {
func (_m *WebhookStore) PermanentDeleteOutgoingByUser(userId string) *model.AppError {
ret := _m.Called(userId)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
r0 = rf(userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

4
store/storetest/webhook_store.go
View File

@@ -477,8 +477,8 @@ func testWebhookStoreDeleteOutgoingByUser(t *testing.T, ss store.Store) {
t.Fatal("invalid returned webhook")
}
if r2 := <-ss.Webhook().PermanentDeleteOutgoingByUser(o1.CreatorId); r2.Err != nil {
t.Fatal(r2.Err)
if err := ss.Webhook().PermanentDeleteOutgoingByUser(o1.CreatorId); err != nil {
t.Fatal(err)
}
if _, err := ss.Webhook().GetOutgoing(o1.Id); err == nil {