fix: add avatar_url to user object in audit log response (coder#3939)

coadler · web-flow · commit 762063ed8fbc · 2022-09-07T19:22:04.000Z
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -143,6 +143,7 @@ func convertAuditLog(dblog database.GetAuditLogsOffsetRow) codersdk.AuditLog {
 			CreatedAt: dblog.UserCreatedAt.Time,
 			Status:    codersdk.UserStatus(dblog.UserStatus),
 			Roles:     []codersdk.Role{},
+			AvatarURL: dblog.UserAvatarUrl.String,
 		}
 
 		for _, roleName := range dblog.UserRoles {
diff --git a/coderd/audit/request.go b/coderd/audit/request.go
@@ -74,6 +74,7 @@ func InitRequest[T Auditable](w http.ResponseWriter, p *RequestParams) (*Request
 		})
 		if err != nil {
 			p.Log.Error(ctx, "export audit log", slog.Error(err))
+			return
 		}
 	}
 }
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/auditlogs.sql b/coderd/database/queries/auditlogs.sql
@@ -7,7 +7,8 @@ SELECT
     users.email AS user_email,
     users.created_at AS user_created_at,
     users.status AS user_status,
-    users.rbac_roles AS user_roles
+    users.rbac_roles AS user_roles,
+    users.avatar_url AS user_avatar_url
 FROM
 	audit_logs
 LEFT JOIN

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ func convertAuditLog(dblog database.GetAuditLogsOffsetRow) codersdk.AuditLog {`
`143`	`143`	`CreatedAt: dblog.UserCreatedAt.Time,`
`144`	`144`	`Status: codersdk.UserStatus(dblog.UserStatus),`
`145`	`145`	`Roles: []codersdk.Role{},`
	`146`	`+ AvatarURL: dblog.UserAvatarUrl.String,`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`for _, roleName := range dblog.UserRoles {`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ func InitRequest[T Auditable](w http.ResponseWriter, p RequestParams) (Request`
`74`	`74`	`})`
`75`	`75`	`if err != nil {`
`76`	`76`	`p.Log.Error(ctx, "export audit log", slog.Error(err))`
	`77`	`+ return`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`	`}`