logic

mtojek · mtojek · commit 15fec2bfc1c0 · 2024-08-02T12:36:20.000+02:00
diff --git a/coderd/database/migrations/000234_notifications_user_deleted.up.sql b/coderd/database/migrations/000234_notifications_user_deleted.up.sql
@@ -1,6 +1,6 @@
 INSERT INTO notification_templates (id, name, title_template, body_template, "group", actions)
 VALUES ('f44d9314-ad03-4bc8-95d0-5cad491da6b6', 'User account deleted', E'User account "{{.Labels.deleted_account_name}}" deleted',
-        E'Hi {{.UserName}},\n\nUser account **{{.Labels.created_account_name}}** has been deleted.',
+        E'Hi {{.UserName}},\n\nUser account **{{.Labels.deleted_account_name}}** has been deleted.',
         'User Events', '[
         {
             "label": "View accounts",
diff --git a/coderd/notifications/events.go b/coderd/notifications/events.go
@@ -17,4 +17,5 @@ var (
 // Account-related events.
 var (
 	TemplateUserAccountCreated = uuid.MustParse("4e19c0ac-94e1-4532-9515-d1801aa283b2")
+	TemplateUserAccountDeleted = uuid.MustParse("f44d9314-ad03-4bc8-95d0-5cad491da6b6")
 )
diff --git a/coderd/users.go b/coderd/users.go
@@ -560,6 +560,24 @@ func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
 	}
 	user.Deleted = true
 	aReq.New = user
+
+	userAdmins, err := findUserAdmins(ctx, api.Database)
+	if err != nil {
+		api.Logger.Warn(ctx, "unable to fetch user admins", slog.Error(err))
+		rw.WriteHeader(http.StatusNoContent)
+	}
+
+	for _, u := range userAdmins {
+		if _, err := api.NotificationsEnqueuer.Enqueue(ctx, u.ID, notifications.TemplateUserAccountCreated,
+			map[string]string{
+				"deleted_account_name": user.Username,
+			}, "api-users-delete",
+			user.ID,
+		); err != nil {
+			api.Logger.Warn(ctx, "unable to notify about deleted user", slog.F("deleted_user", user.Username), slog.Error(err))
+		}
+	}
+
 	rw.WriteHeader(http.StatusNoContent)
 }
 
@@ -1280,23 +1298,12 @@ func (api *API) CreateUser(ctx context.Context, store database.Store, req Create
 		return user, req.OrganizationID, err
 	}
 
-	// Notify all users with user admin permission including owners
-	// Notice: we can't scrape the user information in parallel as pq
-	// fails with: unexpected describe rows response: 'D'
-	owners, err := store.GetUsers(ctx, database.GetUsersParams{
-		RbacRole: []string{codersdk.RoleOwner},
-	})
+	userAdmins, err := findUserAdmins(ctx, store)
 	if err != nil {
-		return user, req.OrganizationID, xerrors.Errorf("get owners: %w", err)
-	}
-	userAdmins, err := store.GetUsers(ctx, database.GetUsersParams{
-		RbacRole: []string{codersdk.RoleUserAdmin},
-	})
-	if err != nil {
-		return user, req.OrganizationID, xerrors.Errorf("get user admins: %w", err)
+		return user, req.OrganizationID, xerrors.Errorf("find user admins: %w", err)
 	}
 
-	for _, u := range append(owners, userAdmins...) {
+	for _, u := range userAdmins {
 		if _, err := api.NotificationsEnqueuer.Enqueue(ctx, u.ID, notifications.TemplateUserAccountCreated,
 			map[string]string{
 				"created_account_name": user.Username,
@@ -1309,6 +1316,25 @@ func (api *API) CreateUser(ctx context.Context, store database.Store, req Create
 	return user, req.OrganizationID, err
 }
 
+// findUserAdmins fetches all users with user admin permission including owners.
+func findUserAdmins(ctx context.Context, store database.Store) ([]database.GetUsersRow, error) {
+	// Notice: we can't scrape the user information in parallel as pq
+	// fails with: unexpected describe rows response: 'D'
+	owners, err := store.GetUsers(ctx, database.GetUsersParams{
+		RbacRole: []string{codersdk.RoleOwner},
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("get owners: %w", err)
+	}
+	userAdmins, err := store.GetUsers(ctx, database.GetUsersParams{
+		RbacRole: []string{codersdk.RoleUserAdmin},
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("get user admins: %w", err)
+	}
+	return append(owners, userAdmins...), nil
+}
+
 func convertUsers(users []database.User, organizationIDsByUserID map[uuid.UUID][]uuid.UUID) []codersdk.User {
 	converted := make([]codersdk.User, 0, len(users))
 	for _, u := range users {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`INSERT INTO notification_templates (id, name, title_template, body_template, "group", actions)`
`2`	`2`	`VALUES ('f44d9314-ad03-4bc8-95d0-5cad491da6b6', 'User account deleted', E'User account "{{.Labels.deleted_account_name}}" deleted',`
`3`		`- E'Hi {{.UserName}},\n\nUser account {{.Labels.created_account_name}} has been deleted.',`
	`3`	`+ E'Hi {{.UserName}},\n\nUser account {{.Labels.deleted_account_name}} has been deleted.',`
`4`	`4`	`'User Events', '[`
`5`	`5`	`{`
`6`	`6`	`"label": "View accounts",`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,5 @@ var (`
`17`	`17`	`// Account-related events.`
`18`	`18`	`var (`
`19`	`19`	`TemplateUserAccountCreated = uuid.MustParse("4e19c0ac-94e1-4532-9515-d1801aa283b2")`
	`20`	`+ TemplateUserAccountDeleted = uuid.MustParse("f44d9314-ad03-4bc8-95d0-5cad491da6b6")`
`20`	`21`	`)`