From aed8cba5a2b7d25535e1aff70094bd7b1f2f5caf Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Tue, 7 Jun 2022 19:07:58 +0530
Subject: [PATCH] Fix endpoint and destination url issue
---
hypha/apply/activity/messaging.py | 2 +-
hypha/apply/activity/tests/test_messaging.py | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/hypha/apply/activity/messaging.py b/hypha/apply/activity/messaging.py
index 4a08bb273..5d3813510 100644
--- a/hypha/apply/activity/messaging.py
+++ b/hypha/apply/activity/messaging.py
@@ -467,7 +467,7 @@ class SlackAdapter(AdapterBase):
def __init__(self):
super().__init__()
- self.destination = settings.SLACK_ENDPOINT_URL
+ self.destination = settings.SLACK_DESTINATION_URL
self.target_room = settings.SLACK_DESTINATION_ROOM
self.comments_room = settings.SLACK_DESTINATION_ROOM_COMMENTS
self.comments_type = settings.SLACK_TYPE_COMMENTS
diff --git a/hypha/apply/activity/tests/test_messaging.py b/hypha/apply/activity/tests/test_messaging.py
index 07475b3c1..3e8325b94 100644
--- a/hypha/apply/activity/tests/test_messaging.py
+++ b/hypha/apply/activity/tests/test_messaging.py
@@ -335,6 +335,7 @@ class TestSlackAdapter(AdapterMixin, TestCase):
target_room = '#<ROOM ID>'
@override_settings(
+ SLACK_DESTINATION_URL=target_url,
SLACK_ENDPOINT_URL=target_url,
SLACK_DESTINATION_ROOM=None,
SLACK_BACKEND="django_slack.backends.TestBackend",
@@ -347,6 +348,7 @@ class TestSlackAdapter(AdapterMixin, TestCase):
self.assertEqual(messages, error_message)
@override_settings(
+ SLACK_DESTINATION_URL=None,
SLACK_ENDPOINT_URL=None,
SLACK_DESTINATION_ROOM=target_room,
SLACK_BACKEND="django_slack.backends.TestBackend",
@@ -359,6 +361,7 @@ class TestSlackAdapter(AdapterMixin, TestCase):
self.assertEqual(messages, error_message)
@override_settings(
+ SLACK_DESTINATION_URL=target_url,
SLACK_ENDPOINT_URL=target_url,
SLACK_DESTINATION_ROOM=target_room,
SLACK_BACKEND="django_slack.backends.TestBackend",
@@ -376,6 +379,7 @@ class TestSlackAdapter(AdapterMixin, TestCase):
self.assertEqual(message_payload['text'], message)
@override_settings(
+ SLACK_DESTINATION_URL=target_url,
SLACK_ENDPOINT_URL=target_url,
SLACK_DESTINATION_ROOM=target_room,
SLACK_BACKEND="django_slack.backends.TestBackend",
@@ -395,6 +399,7 @@ class TestSlackAdapter(AdapterMixin, TestCase):
self.assertEqual(message_payload['channel'], '#dummy')
@override_settings(
+ SLACK_DESTINATION_URL=target_url,
SLACK_ENDPOINT_URL=target_url,
SLACK_DESTINATION_ROOM=target_room,
SLACK_BACKEND="django_slack.backends.TestBackend",
@@ -426,6 +431,7 @@ class TestSlackAdapter(AdapterMixin, TestCase):
self.assertTrue(submission.lead.slack in recipients[0])
@override_settings(
+ SLACK_DESTINATION_URL=target_url,
SLACK_ENDPOINT_URL=target_url,
SLACK_DESTINATION_ROOM=target_room,
SLACK_BACKEND="django_slack.backends.TestBackend",
--
GitLab