Skip to content

Enable Forum Notifications for Threads #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
etechdevai merged 2 commits into from
Jul 21, 2020
Merged

Enable Forum Notifications for Threads #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d9dd7
Enable Forum Notifications for Threads
etechdevai Jul 21, 2020
5958e39
Update Unit Tests to Handle Comments Notification Change
etechdevai Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lms/djangoapps/discussion/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,7 @@ def _track_notification_sent(message, context):

def _should_send_message(context):
cc_thread_author = cc.User(id=context['thread_author_id'], course_id=context['course_id'])
return (
_is_user_subscribed_to_thread(cc_thread_author, context['thread_id']) and
_is_not_subcomment(context['comment_id']) and
_is_first_comment(context['comment_id'], context['thread_id'])
)
return _is_user_subscribed_to_thread(cc_thread_author, context['thread_id'])


def _is_not_subcomment(comment_id):
Expand Down
23 changes: 11 additions & 12 deletions lms/djangoapps/discussion/tests/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ def _assert_rendered_email(self, message):
self.assertTrue(self.mock_permalink in rendered_email.body_html)
self.assertTrue(message.context['site'].domain in rendered_email.body_html)

def run_should_not_send_email_test(self, thread, comment_dict):
def run_should_send_email_test(self, thread, comment_dict):
"""
assert email is not sent
assert email is sent
"""
self.mock_request.side_effect = make_mock_responder(
subscribed_thread_ids=[self.discussion_id],
Expand All @@ -251,27 +251,26 @@ def run_should_not_send_email_test(self, thread, comment_dict):
comment = cc.Comment.find(id=comment_dict['id']).retrieve()
comment_created.send(sender=None, user=user, post=comment)

actual_result = _should_send_message({
send_message_status = _should_send_message({
'thread_author_id': self.thread_author.id,
'course_id': self.course.id,
'comment_id': comment_dict['id'],
'thread_id': thread['id'],
})
self.assertEqual(actual_result, False)
self.assertFalse(self.mock_ace_send.called)
self.assertEqual(send_message_status, True)

def test_subcomment_should_not_send_email(self):
self.run_should_not_send_email_test(self.thread, self.subcomment)
def test_subcomment_should_send_email(self):
self.run_should_send_email_test(self.thread, self.subcomment)

def test_second_comment_should_not_send_email(self):
self.run_should_not_send_email_test(self.thread, self.comment2)
def test_second_comment_should_send_email(self):
self.run_should_send_email_test(self.thread, self.comment2)

def test_thread_without_children_should_not_send_email(self):
def test_thread_without_children_should_send_email(self):
"""
test that email notification will not be sent for the thread
test that email notification will be sent for the thread
that doesn't have attribute 'children'
"""
self.run_should_not_send_email_test(self.thread2, self.comment)
self.run_should_send_email_test(self.thread2, self.comment)

@ddt.data((
{
Expand Down