feat: added status to the return value of ConvertUsers and removed logic to ignore non-active users when creating a snapshot

austinrhode · austinrhode · commit 139adf604e9d · 2024-06-20T17:59:11.000Z
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -353,9 +353,6 @@ func (r *remoteReporter) createSnapshot() (*Snapshot, error) {
 		users := database.ConvertUserRows(userRows)
 		var firstUser database.User
 		for _, dbUser := range users {
-			if dbUser.Status != database.UserStatusActive {
-				continue
-			}
 			if firstUser.CreatedAt.IsZero() {
 				firstUser = dbUser
 			}
@@ -655,6 +652,7 @@ func ConvertUser(dbUser database.User) User {
 		EmailHashed: emailHashed,
 		RBACRoles:   dbUser.RBACRoles,
 		CreatedAt:   dbUser.CreatedAt,
+		Status:      dbUser.Status,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -353,9 +353,6 @@ func (r remoteReporter) createSnapshot() (Snapshot, error) {`
`353`	`353`	`users := database.ConvertUserRows(userRows)`
`354`	`354`	`var firstUser database.User`
`355`	`355`	`for _, dbUser := range users {`
`356`		`- if dbUser.Status != database.UserStatusActive {`
`357`		`- continue`
`358`		`- }`
`359`	`356`	`if firstUser.CreatedAt.IsZero() {`
`360`	`357`	`firstUser = dbUser`
`361`	`358`	`}`
`@@ -655,6 +652,7 @@ func ConvertUser(dbUser database.User) User {`
`655`	`652`	`EmailHashed: emailHashed,`
`656`	`653`	`RBACRoles: dbUser.RBACRoles,`
`657`	`654`	`CreatedAt: dbUser.CreatedAt,`
	`655`	`+ Status: dbUser.Status,`
`658`	`656`	`}`
`659`	`657`	`}`
`660`	`658`