From b798dd8106644de98974fbb6cda3bf34a56098fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20V=C3=A9lez?= <pablovv2012@gmail.com>
Date: Mon, 23 Sep 2024 15:15:50 +0200
Subject: [PATCH] MM-59950 - add deletedAt column to users export (#28137)

---
 .../jobs/export_users_to_csv/export_users_to_csv.go         | 1 +
 server/public/model/report.go                               | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/server/channels/jobs/export_users_to_csv/export_users_to_csv.go b/server/channels/jobs/export_users_to_csv/export_users_to_csv.go
index f5dd4dc088..90e1ff9704 100644
--- a/server/channels/jobs/export_users_to_csv/export_users_to_csv.go
+++ b/server/channels/jobs/export_users_to_csv/export_users_to_csv.go
@@ -42,6 +42,7 @@ func MakeWorker(jobServer *jobs.JobServer, store store.Store, app ExportUsersToC
 			"LastPostDate",
 			"DaysActive",
 			"TotalPosts",
+			"DeletedAt",
 		},
 		getData(app),
 	)
diff --git a/server/public/model/report.go b/server/public/model/report.go
index 022f58207f..387f390ee7 100644
--- a/server/public/model/report.go
+++ b/server/public/model/report.go
@@ -105,6 +105,11 @@ func (u *UserReport) ToReport() []string {
 		lastLogin = time.UnixMilli(u.LastLogin).String()
 	}
 
+	deleteAt := ""
+	if u.DeleteAt > 0 {
+		deleteAt = time.UnixMilli(u.DeleteAt).String()
+	}
+
 	return []string{
 		u.Id,
 		u.Username,
@@ -117,6 +122,7 @@ func (u *UserReport) ToReport() []string {
 		lastPostDate,
 		daysActive,
 		totalPosts,
+		deleteAt,
 	}
 }