ChannelStore migration Part 3 (#15504)

* Migration finished

* Change error var name

* Fix imports

* Fix tests

* Merge with master

* Doing some suggestions

* More suggestions

* Fix i18n

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in>

services/searchengine/bleveengine/indexer/indexing_job.go

@@ -362,14 +362,14 @@ func (worker *BleveIndexerWorker) IndexChannelsBatch(progress IndexingProgress)
 
 	tries := 0
 	for channels == nil {
-		var err *model.AppError
-		channels, err = worker.jobServer.Store.Channel().GetChannelsBatchForIndexing(progress.LastEntityTime, endTime, BATCH_SIZE)
-		if err != nil {
+		var nErr error
+		channels, nErr = worker.jobServer.Store.Channel().GetChannelsBatchForIndexing(progress.LastEntityTime, endTime, BATCH_SIZE)
+		if nErr != nil {
 			if tries >= 10 {
-				return progress, err
+				return progress, model.NewAppError("BleveIndexerWorker.IndexChannelsBatch", "app.channel.get_channels_batch_for_indexing.get.app_error", nil, nErr.Error(), http.StatusInternalServerError)
 			}
 
-			mlog.Warn("Failed to get channels batch for indexing. Retrying.", mlog.Err(err))
+			mlog.Warn("Failed to get channels batch for indexing. Retrying.", mlog.Err(nErr))
 
 			// Wait a bit before trying again.
 			time.Sleep(15 * time.Second)

services/telemetry/telemetry.go

@@ -1083,9 +1083,9 @@ func (ts *TelemetryService) trackGroups() {
 		mlog.Error(nErr.Error())
 	}
 
-	groupSyncedChannelCount, err := ts.dbStore.Channel().GroupSyncedChannelCount()
-	if err != nil {
-		mlog.Error(err.Error())
+	groupSyncedChannelCount, nErr := ts.dbStore.Channel().GroupSyncedChannelCount()
+	if nErr != nil {
+		mlog.Error(nErr.Error())
 	}
 
 	groupMemberCount, err := ts.dbStore.Group().GroupMemberCount()