[GH-19150] Remove strings in all channel types for constants (#19535)

Automatic Merge

services/telemetry/telemetry.go

@@ -277,23 +277,23 @@ func (ts *TelemetryService) trackActivity() {
 		mlog.Info("Could not get team count", mlog.Err(err))
 	}
 
-	if ucc, err := ts.dbStore.Channel().AnalyticsTypeCount("", "O"); err == nil {
+	if ucc, err := ts.dbStore.Channel().AnalyticsTypeCount("", model.ChannelTypeOpen); err == nil {
 		publicChannelCount = ucc
 	}
 
-	if pcc, err := ts.dbStore.Channel().AnalyticsTypeCount("", "P"); err == nil {
+	if pcc, err := ts.dbStore.Channel().AnalyticsTypeCount("", model.ChannelTypePrivate); err == nil {
 		privateChannelCount = pcc
 	}
 
-	if dcc, err := ts.dbStore.Channel().AnalyticsTypeCount("", "D"); err == nil {
+	if dcc, err := ts.dbStore.Channel().AnalyticsTypeCount("", model.ChannelTypeDirect); err == nil {
 		directChannelCount = dcc
 	}
 
-	if duccr, err := ts.dbStore.Channel().AnalyticsDeletedTypeCount("", "O"); err == nil {
+	if duccr, err := ts.dbStore.Channel().AnalyticsDeletedTypeCount("", model.ChannelTypeOpen); err == nil {
 		deletedPublicChannelCount = duccr
 	}
 
-	if dpccr, err := ts.dbStore.Channel().AnalyticsDeletedTypeCount("", "P"); err == nil {
+	if dpccr, err := ts.dbStore.Channel().AnalyticsDeletedTypeCount("", model.ChannelTypePrivate); err == nil {
 		deletedPrivateChannelCount = dpccr
 	}
 

services/telemetry/telemetry_test.go

@@ -107,8 +107,8 @@ func initializeMocks(cfg *model.Config) (*mocks.ServerIface, *storeMocks.Store,
 	channelStore.On("AnalyticsTypeCount", "", model.ChannelTypeOpen).Return(int64(25), nil)
 	channelStore.On("AnalyticsTypeCount", "", model.ChannelTypePrivate).Return(int64(26), nil)
 	channelStore.On("AnalyticsTypeCount", "", model.ChannelTypeDirect).Return(int64(27), nil)
-	channelStore.On("AnalyticsDeletedTypeCount", "", "O").Return(int64(22), nil)
-	channelStore.On("AnalyticsDeletedTypeCount", "", "P").Return(int64(23), nil)
+	channelStore.On("AnalyticsDeletedTypeCount", "", model.ChannelTypeOpen).Return(int64(22), nil)
+	channelStore.On("AnalyticsDeletedTypeCount", "", model.ChannelTypePrivate).Return(int64(23), nil)
 	channelStore.On("GroupSyncedChannelCount").Return(int64(17), nil)
 
 	postStore := storeMocks.PostStore{}