Merge branch 'develop' into #4043-NigelPurvis-credits

Author: chpy04

src/backend/src/integrations/slack.ts

@@ -271,6 +271,23 @@ export const getChannelName = async (channelId: string) => {
   }
 };
 
+/**
+ * Checks whether the bot is a member of the given channel
+ * @param channelId the id of the slack channel
+ * @returns true if the bot is a member of the channel, false otherwise
+ */
+export const checkBotInChannel = async (channelId: string): Promise<boolean> => {
+  const client = getSlackClient();
+  if (!client) return false;
+
+  try {
+    const channelRes = await client.conversations.info({ channel: channelId });
+    return channelRes.channel?.is_member ?? false;
+  } catch (error) {
+    return false;
+  }
+};
+
 /**
  * Given a slack user id, prood.uces the name of the channel
  * @param userId the id of the slack user

src/backend/src/services/attendance.services.ts

@@ -10,7 +10,13 @@ import {
   meetingAttendanceTransformer,
   meetingAttendanceWithAttendeesTransformer
 } from '../transformers/attendance.transformer.js';
-import { editMessage, getChannelName, replyToMessageInThread, sendMessage } from '../integrations/slack.js';
+import {
+  checkBotInChannel,
+  editMessage,
+  getChannelName,
+  replyToMessageInThread,
+  sendMessage
+} from '../integrations/slack.js';
 import { userHasPermission } from '../utils/users.utils.js';
 
 export default class AttendanceService {
@@ -215,6 +221,7 @@ export default class AttendanceService {
     }
 
     const channelName = await getChannelName(team.slackId);
-    return { channelName, valid: !!channelName };
+    const botInChannel = channelName ? await checkBotInChannel(team.slackId) : false;
+    return { channelName, valid: !!channelName && botInChannel };
   }
 }

src/backend/tests/unit/attendance.test.ts

@@ -5,14 +5,21 @@ import { AccessDeniedException, HttpException, NotFoundException } from '../../s
 import { batmanAppAdmin, supermanAdmin, greenlanternHead, wonderwomanGuest, member } from '../test-data/users.test-data.js';
 import { createTestOrganization, createTestTeam, createTestTeamType, createTestUser, resetUsers } from '../test-utils.js';
 import prisma from '../../src/prisma/prisma.js';
-import { sendMessage, editMessage, replyToMessageInThread, getChannelName } from '../../src/integrations/slack.js';
+import {
+  sendMessage,
+  editMessage,
+  replyToMessageInThread,
+  getChannelName,
+  checkBotInChannel
+} from '../../src/integrations/slack.js';
 import { Mock } from 'vitest';
 
 vi.mock('../../src/integrations/slack.js', () => ({
   sendMessage: vi.fn(),
   editMessage: vi.fn(),
   replyToMessageInThread: vi.fn(),
-  getChannelName: vi.fn()
+  getChannelName: vi.fn(),
+  checkBotInChannel: vi.fn()
 }));
 
 // Creates a second test org with distinct credentials (since createTestOrganization uses a hardcoded empty email)
@@ -531,11 +538,25 @@ describe('Attendance Tests', () => {
       expect(result.channelName).toBeUndefined();
     });
 
-    it('returns valid: true with channel name if Slack channel is found', async () => {
+    it('returns valid: false if Slack channel is found but bot is not a member', async () => {
       const head = await createTestUser(greenlanternHead, orgId);
       const team = await createTeamInOrg(head.userId, orgId);
 
       (getChannelName as Mock).mockResolvedValue('ner-software');
+      (checkBotInChannel as Mock).mockResolvedValue(false);
+
+      const result = await AttendanceService.checkTeamChannel(team.teamId, organization);
+
+      expect(result.valid).toBe(false);
+      expect(result.channelName).toBe('ner-software');
+    });
+
+    it('returns valid: true with channel name if Slack channel is found and bot is a member', async () => {
+      const head = await createTestUser(greenlanternHead, orgId);
+      const team = await createTeamInOrg(head.userId, orgId);
+
+      (getChannelName as Mock).mockResolvedValue('ner-software');
+      (checkBotInChannel as Mock).mockResolvedValue(true);
 
       const result = await AttendanceService.checkTeamChannel(team.teamId, organization);