MM-15186: Migrate "WebHook.GetOutgoingByTeam" to Sync by defa (#10707)

app/webhook.go

@@ -33,13 +33,11 @@ func (a *App) handleWebhookEvents(post *model.Post, team *model.Team, channel *m
 		return nil
 	}
 
-	hchan := a.Srv.Store.Webhook().GetOutgoingByTeam(team.Id, -1, -1)
+	hooks, err := a.Srv.Store.Webhook().GetOutgoingByTeam(team.Id, -1, -1)
-	result := <-hchan
+	if err != nil {
-	if result.Err != nil {
+		return err
-		return result.Err
 	}
 
-	hooks := result.Data.([]*model.OutgoingWebhook)
 	if len(hooks) == 0 {
 		return nil
 	}
@@ -417,10 +415,9 @@ func (a *App) CreateOutgoingWebhook(hook *model.OutgoingWebhook) (*model.Outgoin
 		return nil, model.NewAppError("CreateOutgoingWebhook", "api.webhook.create_outgoing.triggers.app_error", nil, "", http.StatusBadRequest)
 	}
 
-	if result := <-a.Srv.Store.Webhook().GetOutgoingByTeam(hook.TeamId, -1, -1); result.Err != nil {
+	if allHooks, err := a.Srv.Store.Webhook().GetOutgoingByTeam(hook.TeamId, -1, -1); err != nil {
-		return nil, result.Err
+		return nil, err
 	} else {
-		allHooks := result.Data.([]*model.OutgoingWebhook)
 
 		for _, existingOutHook := range allHooks {
 			urlIntersect := utils.StringArrayIntersection(existingOutHook.CallbackURLs, hook.CallbackURLs)
@@ -462,13 +459,11 @@ func (a *App) UpdateOutgoingWebhook(oldHook, updatedHook *model.OutgoingWebhook)
 		return nil, model.NewAppError("UpdateOutgoingWebhook", "api.webhook.create_outgoing.triggers.app_error", nil, "", http.StatusInternalServerError)
 	}
 
-	var result store.StoreResult
+	allHooks, err := a.Srv.Store.Webhook().GetOutgoingByTeam(oldHook.TeamId, -1, -1)
-	if result = <-a.Srv.Store.Webhook().GetOutgoingByTeam(oldHook.TeamId, -1, -1); result.Err != nil {
+	if err != nil {
-		return nil, result.Err
+		return nil, err
 	}
 
-	allHooks := result.Data.([]*model.OutgoingWebhook)
-
 	for _, existingOutHook := range allHooks {
 		urlIntersect := utils.StringArrayIntersection(existingOutHook.CallbackURLs, updatedHook.CallbackURLs)
 		triggerIntersect := utils.StringArrayIntersection(existingOutHook.TriggerWords, updatedHook.TriggerWords)
@@ -520,11 +515,7 @@ func (a *App) GetOutgoingWebhooksForTeamPage(teamId string, page, perPage int) (
 		return nil, model.NewAppError("GetOutgoingWebhooksForTeamPage", "api.outgoing_webhook.disabled.app_error", nil, "", http.StatusNotImplemented)
 	}
 
-	if result := <-a.Srv.Store.Webhook().GetOutgoingByTeam(teamId, page*perPage, perPage); result.Err != nil {
+	return a.Srv.Store.Webhook().GetOutgoingByTeam(teamId, page*perPage, perPage)
-		return nil, result.Err
-	} else {
-		return result.Data.([]*model.OutgoingWebhook), nil
-	}
 }
 
 func (a *App) DeleteOutgoingWebhook(hookId string) *model.AppError {

cmd/mattermost/commands/webhook.go

@@ -108,7 +108,12 @@ func listWebhookCmdF(command *cobra.Command, args []string) error {
 			incomingResult <- store.StoreResult{Data: incomingHooks, Err: err}
 			close(incomingResult)
 		}()
-		outgoingResult := app.Srv.Store.Webhook().GetOutgoingByTeam(team.Id, 0, 100000000)
+		outgoingResult := make(chan store.StoreResult, 1)
+		go func() {
+			outgoingHooks, err := app.Srv.Store.Webhook().GetOutgoingByTeam(team.Id, 0, 100000000)
+			outgoingResult <- store.StoreResult{Data: outgoingHooks, Err: err}
+			close(outgoingResult)
+		}()
 
 		if result := <-incomingResult; result.Err == nil {
 			CommandPrettyPrintln(fmt.Sprintf("Incoming webhooks for %s (%s):", team.DisplayName, team.Name))

store/sqlstore/webhook_store.go

@@ -262,23 +262,21 @@ func (s SqlWebhookStore) GetOutgoingByChannel(channelId string, offset, limit in
 	})
 }
 
-func (s SqlWebhookStore) GetOutgoingByTeam(teamId string, offset, limit int) store.StoreChannel {
+func (s SqlWebhookStore) GetOutgoingByTeam(teamId string, offset, limit int) ([]*model.OutgoingWebhook, *model.AppError) {
-	return store.Do(func(result *store.StoreResult) {
+	var webhooks []*model.OutgoingWebhook
-		var webhooks []*model.OutgoingWebhook
 
-		query := ""
+	query := ""
-		if limit < 0 || offset < 0 {
+	if limit < 0 || offset < 0 {
-			query = "SELECT * FROM OutgoingWebhooks WHERE TeamId = :TeamId AND DeleteAt = 0"
+		query = "SELECT * FROM OutgoingWebhooks WHERE TeamId = :TeamId AND DeleteAt = 0"
-		} else {
+	} else {
-			query = "SELECT * FROM OutgoingWebhooks WHERE TeamId = :TeamId AND DeleteAt = 0 LIMIT :Limit OFFSET :Offset"
+		query = "SELECT * FROM OutgoingWebhooks WHERE TeamId = :TeamId AND DeleteAt = 0 LIMIT :Limit OFFSET :Offset"
-		}
+	}
 
-		if _, err := s.GetReplica().Select(&webhooks, query, map[string]interface{}{"TeamId": teamId, "Offset": offset, "Limit": limit}); err != nil {
+	if _, err := s.GetReplica().Select(&webhooks, query, map[string]interface{}{"TeamId": teamId, "Offset": offset, "Limit": limit}); err != nil {
-			result.Err = model.NewAppError("SqlWebhookStore.GetOutgoingByTeam", "store.sql_webhooks.get_outgoing_by_team.app_error", nil, "teamId="+teamId+", err="+err.Error(), http.StatusInternalServerError)
+		return nil, model.NewAppError("SqlWebhookStore.GetOutgoingByTeam", "store.sql_webhooks.get_outgoing_by_team.app_error", nil, "teamId="+teamId+", err="+err.Error(), http.StatusInternalServerError)
-		}
+	}
 
-		result.Data = webhooks
+	return webhooks, nil
-	})
 }
 
 func (s SqlWebhookStore) DeleteOutgoing(webhookId string, time int64) *model.AppError {

store/store.go

@@ -391,7 +391,7 @@ type WebhookStore interface {
 	GetOutgoing(id string) (*model.OutgoingWebhook, *model.AppError)
 	GetOutgoingList(offset, limit int) ([]*model.OutgoingWebhook, *model.AppError)
 	GetOutgoingByChannel(channelId string, offset, limit int) StoreChannel
-	GetOutgoingByTeam(teamId string, offset, limit int) StoreChannel
+	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

store/storetest/mocks/WebhookStore.go

@@ -231,19 +231,28 @@ func (_m *WebhookStore) GetOutgoingByChannel(channelId string, offset int, limit
 }
 
 // GetOutgoingByTeam provides a mock function with given fields: teamId, offset, limit
-func (_m *WebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) store.StoreChannel {
+func (_m *WebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, *model.AppError) {
 	ret := _m.Called(teamId, offset, limit)
 
-	var r0 store.StoreChannel
+	var r0 []*model.OutgoingWebhook
-	if rf, ok := ret.Get(0).(func(string, int, int) store.StoreChannel); ok {
+	if rf, ok := ret.Get(0).(func(string, int, int) []*model.OutgoingWebhook); ok {
 		r0 = rf(teamId, offset, limit)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.StoreChannel)
+			r0 = ret.Get(0).([]*model.OutgoingWebhook)
 		}
 	}
 
-	return r0
+	var r1 *model.AppError
+	if rf, ok := ret.Get(1).(func(string, int, int) *model.AppError); ok {
+		r1 = rf(teamId, offset, limit)
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*model.AppError)
+		}
+	}
+
+	return r0, r1
 }
 
 // GetOutgoingList provides a mock function with given fields: offset, limit

store/storetest/webhook_store.go

@@ -397,18 +397,18 @@ func testWebhookStoreGetOutgoingByTeam(t *testing.T, ss store.Store) {
 
 	o1, _ = ss.Webhook().SaveOutgoing(o1)
 
-	if r1 := <-ss.Webhook().GetOutgoingByTeam(o1.TeamId, 0, 100); r1.Err != nil {
+	if r1, err := ss.Webhook().GetOutgoingByTeam(o1.TeamId, 0, 100); err != nil {
-		t.Fatal(r1.Err)
+		t.Fatal(err)
 	} else {
-		if r1.Data.([]*model.OutgoingWebhook)[0].CreateAt != o1.CreateAt {
+		if r1[0].CreateAt != o1.CreateAt {
 			t.Fatal("invalid returned webhook")
 		}
 	}
 
-	if result := <-ss.Webhook().GetOutgoingByTeam("123", -1, -1); result.Err != nil {
+	if result, err := ss.Webhook().GetOutgoingByTeam("123", -1, -1); err != nil {
-		t.Fatal(result.Err)
+		t.Fatal(err)
 	} else {
-		if len(result.Data.([]*model.OutgoingWebhook)) != 0 {
+		if len(result) != 0 {
 			t.Fatal("no webhooks should have returned")
 		}
 	}