fix: directly look up user

Author: harikakondur

apps/slack/lambda/lib/routes/events/service.test.ts

@@ -54,11 +54,19 @@ describe('EventsService', () => {
         getMany: stub().resolves({ items: [{ default: true, code: 'de-DE' }] }),
       },
       user: {
-        getManyForSpace: stub().resolves({
-          items: [
-            { sys: { id: 'publisher' }, firstName: 'Pub', lastName: 'Lisher' },
-            { sys: { id: 'creator' }, firstName: 'Cre', lastName: 'Ator' },
-          ],
+        getForSpace: stub().callsFake(({ userId }) => {
+          const users: Record<
+            string,
+            { sys: { id: string }; firstName: string; lastName: string }
+          > = {
+            publisher: { sys: { id: 'publisher' }, firstName: 'Pub', lastName: 'Lisher' },
+            creator: { sys: { id: 'creator' }, firstName: 'Cre', lastName: 'Ator' },
+          };
+          const user = users[userId];
+          if (!user) {
+            return Promise.reject(new Error('not found'));
+          }
+          return Promise.resolve(user);
         }),
       },
       space: {
@@ -260,6 +268,22 @@ describe('EventsService', () => {
       );
       assert.deepEqual(resolvedEntity, expectedValue);
     });
+    it('falls back to the raw actor ID when the user lookup fails', async () => {
+      const unknownActorEventBody = {
+        ...eventBody,
+        sys: { ...eventBody.sys, createdBy: { sys: { id: 'unknown-user' } } },
+      } as unknown as EventEntity;
+
+      const resolvedEntity = await instance.getResolvedEntity(
+        'space-id',
+        'env-id',
+        'contentful',
+        SlackAppEventKey.CREATED,
+        unknownActorEventBody
+      );
+      assert.equal(resolvedEntity?.actorId, 'unknown-user');
+      assert.equal(resolvedEntity?.actorName, 'unknown-user');
+    });
     it('returns the expected resolved values for DELETE', async () => {
       const expectedValue = {
         actorId: undefined,

apps/slack/lambda/lib/routes/events/service.ts

@@ -41,24 +41,18 @@ export class EventsService {
 
   private getUserName = async (
     cmaClient: PlainClientAPI,
+    spaceId: string,
     userId?: string
   ): Promise<string | undefined> => {
     if (!userId) {
       return undefined;
     }
     try {
-      // Try to get user from space users first
-      const spaceUsers = await cmaClient.user.getManyForSpace({});
-      const user = spaceUsers.items.find((u) => u.sys.id === userId);
-
-      if (user) {
-        return user.firstName && user.lastName
-          ? `${user.firstName} ${user.lastName}`
-          : user.email || userId;
-      }
+      const user = await cmaClient.user.getForSpace({ spaceId, userId });
 
-      // If not found in space users, return the user ID as fallback
-      return userId;
+      return user.firstName && user.lastName
+        ? `${user.firstName} ${user.lastName}`
+        : user.email || userId;
     } catch (e) {
       return userId; // fallback to user ID if we can't get user details
     }
@@ -216,7 +210,7 @@ export class EventsService {
 
     // Fetch additional information
     const [actorName, spaceName] = await Promise.all([
-      this.getUserName(cmaClient, actorId),
+      this.getUserName(cmaClient, spaceId, actorId),
       this.getSpaceName(cmaClient, spaceId),
     ]);