From e31a6a47b02c455880623d65515cadabd578552d Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Tue, 3 Jan 2023 13:35:31 -0500
Subject: [PATCH] Only check if diagnostics are disabled, remove telemetry
 enabled in true up review status response in favor of using front-end
 configs.

---
 api4/license.go                 | 6 +++---
 app/true_up.go                  | 2 --
 model/true_up_review_profile.go | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/api4/license.go b/api4/license.go
index 9fab5cc38c..880447ed58 100644
--- a/api4/license.go
+++ b/api4/license.go
@@ -338,10 +338,10 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	// Do not send true-up review data if the user has already requested one for the quarter.
 	// And only send a true-up review via as a one-time telemetry request if telemetry is disabled.
-	telemetryService := c.App.Srv().GetTelemetryService()
-	if !status.Completed && !telemetryService.TelemetryEnabled() {
+	telemetryEnabled := c.App.Config().LogSettings.EnableDiagnostics
+	if !status.Completed && telemetryEnabled != nil && !*telemetryEnabled {
 		// Send telemetry data
-		telemetryService.SendTelemetry(model.TrueUpReviewTelemetryName, profileMap)
+		c.App.Srv().GetTelemetryService().SendTelemetry(model.TrueUpReviewTelemetryName, profileMap)
 
 		// Update the review status to reflect the completion.
 		status.Completed = true
diff --git a/app/true_up.go b/app/true_up.go
index b782e956ea..3e3c779f31 100644
--- a/app/true_up.go
+++ b/app/true_up.go
@@ -164,7 +164,5 @@ func (a *App) GetOrCreateTrueUpReviewStatus() (*model.TrueUpReviewStatus, *model
 		}
 	}
 
-	telemetryService := a.Srv().GetTelemetryService()
-	status.TelemetryEnabled = telemetryService.TelemetryEnabled()
 	return status, nil
 }
diff --git a/model/true_up_review_profile.go b/model/true_up_review_profile.go
index bb6b6d9dd6..8e4d186b75 100644
--- a/model/true_up_review_profile.go
+++ b/model/true_up_review_profile.go
@@ -33,9 +33,8 @@ func (t *TrueUpReviewPlugins) ToMap() map[string]interface{} {
 }
 
 type TrueUpReviewStatus struct {
-	Completed        bool  `json:"complete"`
-	DueDate          int64 `json:"due_date"`
-	TelemetryEnabled bool  `json:"telemetry_enabled"`
+	Completed bool  `json:"complete"`
+	DueDate   int64 `json:"due_date"`
 }
 
 func (t *TrueUpReviewStatus) ToSlice() []interface{} {