diff --git a/src/backend/src/controllers/slack.controllers.ts b/src/backend/src/controllers/slack.controllers.ts index def03d6870..d90c60ac35 100644 --- a/src/backend/src/controllers/slack.controllers.ts +++ b/src/backend/src/controllers/slack.controllers.ts @@ -7,9 +7,9 @@ export default class SlackController { try { const organizations = await OrganizationsService.getAllOrganizations(); const nerSlackWorkspaceId = await getWorkspaceId(); - const orgId = organizations.find((org) => org.slackWorkspaceId === nerSlackWorkspaceId)?.organizationId; - if (orgId) { - slackServices.processMessageSent(event, orgId); + const relatedOrganization = organizations.find((org) => org.slackWorkspaceId === nerSlackWorkspaceId); + if (relatedOrganization) { + slackServices.processMessageSent(event, relatedOrganization.organizationId); } } catch (error: unknown) {} } diff --git a/src/backend/src/services/slack.services.ts b/src/backend/src/services/slack.services.ts index 90c50995a9..c94835d49d 100644 --- a/src/backend/src/services/slack.services.ts +++ b/src/backend/src/services/slack.services.ts @@ -4,6 +4,7 @@ import AnnouncementService from './announcement.service'; import { Announcement } from 'shared'; import prisma from '../prisma/prisma'; import { blockToMentionedUsers, blockToString } from '../utils/slack.utils'; +import { NotFoundException } from '../utils/errors.utils'; /** * Represents a slack event for a message in a channel. @@ -159,7 +160,12 @@ export default class slackServices { slackChannelName, organizationId ); - } catch (ignored) {} + } catch (error) { + //if couldn't find the announcement to edit, create a new one below + if (!(error instanceof NotFoundException)) { + throw error; + } + } } return await AnnouncementService.createAnnouncement( messageText,