From d676771aa7163e425a255f317cd7ee1c5c65b9ee Mon Sep 17 00:00:00 2001
From: Sandeep Chauhan <sandeepsajan0@gmail.com>
Date: Tue, 19 Sep 2023 12:43:50 +0530
Subject: [PATCH] Add slack notification for reviewers on review submit by the
role reviewers (#3433)
Fixes #3421
---
hypha/apply/activity/adapters/slack.py | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/hypha/apply/activity/adapters/slack.py b/hypha/apply/activity/adapters/slack.py
index c19b457ad..ee5eb406e 100644
--- a/hypha/apply/activity/adapters/slack.py
+++ b/hypha/apply/activity/adapters/slack.py
@@ -174,16 +174,13 @@ class SlackAdapter(AdapterBase):
recipients = [self.slack_id(source.lead)]
# Notify second reviewer when first reviewer is done.
- if message_type == MESSAGES.NEW_REVIEW and related:
+ if message_type in [MESSAGES.NEW_REVIEW, MESSAGES.REVIEW_OPINION] and related:
submission = source
- if (
- submission.assigned.with_roles().count() == 2
- and related.author.reviewer
- == submission.assigned.with_roles().first().reviewer
- ):
- recipients.append(
- self.slack_id(submission.assigned.with_roles().last().reviewer)
- )
+ role_reviewers = [role_reviewer.reviewer for role_reviewer in submission.assigned.with_roles()]
+ if related.author.reviewer in role_reviewers:
+ for reviewer in role_reviewers:
+ if reviewer != related.author.reviewer:
+ recipients.append(self.slack_id(reviewer))
if message_type == MESSAGES.UPDATE_INVOICE_STATUS:
if related.status in [
--
GitLab