MM-59369: rework chat subscription logic (#709)

* mv monitor to root

* less testutils

* rm unused channel subscription renewal

* rm testutils dependency in msteams client

* rm testutils dependency in sqlstore

* rm testutils

* rework chats subscription logic

* downgrade client errors to warning, let upper layer handle

* Update server/subscriptions.go

server/converters_test.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/mattermost/mattermost-plugin-msteams/server/msteams/clientmodels"
-	"github.com/mattermost/mattermost-plugin-msteams/server/testutils"
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/stretchr/testify/assert"
 )
@@ -92,7 +91,7 @@ func TestHandleMentions(t *testing.T) {
 			Mentions: []clientmodels.Mention{
 				{
 					ID:            0,
-					UserID:        testutils.GetTeamsUserID(),
+					UserID:        model.NewId(),
 					MentionedText: "mockMentionedText",
 				},
 			},

server/helper_test.go

@@ -163,6 +163,7 @@ func (th *testHelper) Reset(t *testing.T) *testHelper {
 	th.p.clientBuilderWithToken = func(redirectURL, tenantID, clientId, clientSecret string, token *oauth2.Token, apiClient *pluginapi.LogService) msteams.Client {
 		return clientMock
 	}
+	th.p.monitor.client = th.p.msteamsAppClient
 
 	var err error
 	th.metricsSnapshot, err = th.p.metricsService.GetRegistry().Gather()

server/metrics/metrics.go

@@ -22,16 +22,16 @@ const (
 	MetricsCloudInstallationLabel = "installationId"
 	MetricsVersionLabel           = "version"
 
-	ActionSourceMSTeams     = "msteams"
-	ActionSourceMattermost  = "mattermost"
-	ActionCreated           = "created"
-	ActionUpdated           = "updated"
-	ActionDeleted           = "deleted"
-	ReactionSetAction       = "set"
-	ReactionUnsetAction     = "unset"
-	SubscriptionRefreshed   = "refreshed"
-	SubscriptionConnected   = "connected"
-	SubscriptionReconnected = "reconnected"
+	ActionSourceMSTeams    = "msteams"
+	ActionSourceMattermost = "mattermost"
+	ActionCreated          = "created"
+	ActionUpdated          = "updated"
+	ActionDeleted          = "deleted"
+	ReactionSetAction      = "set"
+	ReactionUnsetAction    = "unset"
+	SubscriptionRefreshed  = "refreshed"
+	SubscriptionConnected  = "connected"
+	SubscriptionDeleted    = "deleted"
 
 	DiscardedReasonNone                            = ""
 	DiscardedReasonInvalidChangeType               = "invalid_change_type"

server/monitor/monitor.go → server/monitor.go

@@ -1,9 +1,8 @@
-package monitor
+package main
 
 import (
 	"fmt"
 	"runtime/debug"
-	"sync"
 	"time"
 
 	"github.com/mattermost/mattermost-plugin-msteams/server/metrics"
@@ -32,7 +31,7 @@ type Monitor struct {
 }
 
 // New creates a new instance of the Monitor job.
-func New(client msteams.Client, store store.Store, api plugin.API, metrics metrics.Metrics, baseURL string, webhookSecret string, useEvaluationAPI bool) *Monitor {
+func NewMonitor(client msteams.Client, store store.Store, api plugin.API, metrics metrics.Metrics, baseURL string, webhookSecret string, useEvaluationAPI bool) *Monitor {
 	return &Monitor{
 		client:           client,
 		store:            store,
@@ -97,21 +96,11 @@ func (m *Monitor) runMonitoringSystemJob() {
 	done := m.metrics.ObserveWorker(metrics.WorkerMonitor)
 	defer done()
 
-	msteamsSubscriptionsMap, allChatsSubscription, err := m.getMSTeamsSubscriptionsMap()
+	_, allChatsSubscription, err := m.getMSTeamsSubscriptionsMap()
 	if err != nil {
 		m.api.LogError("Unable to fetch subscriptions from MS Teams", "error", err.Error())
 		return
 	}
 
-	var wg sync.WaitGroup
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-		m.checkChannelsSubscriptions(msteamsSubscriptionsMap)
-	}()
-
-	m.checkGlobalChatsSubscription(msteamsSubscriptionsMap, allChatsSubscription)
-
-	wg.Wait()
+	m.checkGlobalChatsSubscription(allChatsSubscription)
 }