From e67c20d8bb3169ece657cfc7aaecc7a916a08204 Mon Sep 17 00:00:00 2001
From: David Leek <david@getunleash.io>
Date: Mon, 11 Dec 2023 08:38:49 +0100
Subject: [PATCH] chore: list users and groups under each role in
 projectaccessadded event

---
 src/lib/routes/admin-api/events.test.ts |  8 ++++----
 src/lib/services/project-service.ts     | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/lib/routes/admin-api/events.test.ts b/src/lib/routes/admin-api/events.test.ts
index db37ba932105..b8415edb758d 100644
--- a/src/lib/routes/admin-api/events.test.ts
+++ b/src/lib/routes/admin-api/events.test.ts
@@ -116,11 +116,11 @@ test('should anonymise any PII fields, no matter the depth', async () => {
         new ProjectAccessAddedEvent({
             createdBy: 'some@email.com',
             data: {
-                groups: [
+                roles: [
                     {
-                        name: 'test',
-                        project: 'default',
-                        users: [{ username: testUsername }],
+                        roleId: 1,
+                        groupIds: [1, 2],
+                        users: [1],
                     },
                 ],
             },
diff --git a/src/lib/services/project-service.ts b/src/lib/services/project-service.ts
index 724934712387..1002e248f6d8 100644
--- a/src/lib/services/project-service.ts
+++ b/src/lib/services/project-service.ts
@@ -661,9 +661,11 @@ export default class ProjectService {
                 project: projectId,
                 createdBy,
                 data: {
-                    roleId,
-                    groups: usersAndGroups.groups.map(({ id }) => id),
-                    users: usersAndGroups.users.map(({ id }) => id),
+                    roles: {
+                        roleId,
+                        groupIds: usersAndGroups.groups.map(({ id }) => id),
+                        userIds: usersAndGroups.users.map(({ id }) => id),
+                    },
                 },
             }),
         );
@@ -689,9 +691,13 @@ export default class ProjectService {
                 project: projectId,
                 createdBy,
                 data: {
-                    roles,
-                    groups,
-                    users,
+                    roles: roles.map((roleId) => {
+                        return {
+                            roleId,
+                            groupIds: groups,
+                            userIds: users,
+                        };
+                    }),
                 },
             }),
         );