Merge pull request #9366 from edx/peter-fogg/team-signals

Add signals for user's discussion activity.

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -23,6 +23,7 @@ from django.test import TestCase
 from django.test.utils import override_settings
 
 from openedx.core.lib.tempdir import mkdtemp_clean
+from common.test.utils import XssTestMixin
 from contentstore.tests.utils import parse_json, AjaxEnabledTestClient, CourseTestCase
 from contentstore.views.component import ADVANCED_COMPONENT_TYPES
 
@@ -37,7 +38,6 @@ from xmodule.modulestore.inheritance import own_metadata
 from opaque_keys.edx.keys import UsageKey, CourseKey
 from opaque_keys.edx.locations import AssetLocation, CourseLocator
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, LibraryFactory, check_mongo_calls
-from xmodule.modulestore.tests.utils import XssTestMixin
 from xmodule.modulestore.xml_exporter import export_course_to_xml
 from xmodule.modulestore.xml_importer import import_course_from_xml, perform_xlint
 

common/djangoapps/django_comment_common/signals.py

+# pylint: disable=invalid-name
+"""Signals related to the comments service."""
+
+from django.dispatch import Signal
+
+
+thread_created = Signal(providing_args=['user', 'post'])
+thread_edited = Signal(providing_args=['user', 'post'])
+thread_voted = Signal(providing_args=['user', 'post'])
+thread_deleted = Signal(providing_args=['user', 'post'])
+comment_created = Signal(providing_args=['user', 'post'])
+comment_edited = Signal(providing_args=['user', 'post'])
+comment_voted = Signal(providing_args=['user', 'post'])
+comment_deleted = Signal(providing_args=['user', 'post'])
+comment_endorsed = Signal(providing_args=['user', 'post'])

common/djangoapps/terrain/stubs/comments.py

@@ -52,6 +52,11 @@ class StubCommentsServiceHandler(StubHttpRequestHandler):
         self.send_json_response({'username': self.post_dict.get("username"), 'external_id': self.post_dict.get("external_id")})
 
     def do_DELETE(self):
+        pattern_handlers = {
+            "/api/v1/comments/(?P<comment_id>\\w+)$": self.do_delete_comment
+        }
+        if self.match_pattern(pattern_handlers):
+            return
         self.send_json_response({})
 
     def do_user(self, user_id):
@@ -113,6 +118,13 @@ class StubCommentsServiceHandler(StubHttpRequestHandler):
             comment = self.server.config['comments'][comment_id]
             self.send_json_response(comment)
 
+    def do_delete_comment(self, comment_id):
+        """Handle comment deletion. Returns a JSON representation of the
+        deleted comment."""
+        if comment_id in self.server.config.get('comments', {}):
+            comment = self.server.config['comments'][comment_id]
+            self.send_json_response(comment)
+
     def do_commentable(self, commentable_id):
         self.send_json_response({
             "collection": [

common/lib/xmodule/xmodule/modulestore/tests/utils.py

@@ -2,7 +2,6 @@
 Helper classes and methods for running modulestore tests without Django.
 """
 from importlib import import_module
-from markupsafe import escape
 from opaque_keys.edx.keys import UsageKey
 from unittest import TestCase
 from xblock.fields import XBlockMixin
@@ -175,25 +174,3 @@ class ProceduralCourseTestMixin(object):
 
         with self.store.bulk_operations(self.course.id, emit_signals=emit_signals):
             descend(self.course, ['chapter', 'sequential', 'vertical', 'problem'])
-
-
-class XssTestMixin(object):
-    """
-    Mixin for testing XSS vulnerabilities.
-    """
-
-    def assert_xss(self, response, xss_content):
-        """Assert that `xss_content` is not present in the content of
-        `response`, and that its escaped version is present. Uses the
-        same `markupsafe.escape` function as Mako templates.
-
-        Args:
-          response (Response): The HTTP response
-          xss_content (str): The Javascript code to check for.
-
-        Returns:
-          None
-
-        """
-        self.assertContains(response, escape(xss_content))
-        self.assertNotContains(response, xss_content)

common/test/acceptance/fixtures/discussion.py

@@ -14,7 +14,7 @@ from . import COMMENTS_STUB_URL
 class ContentFactory(factory.Factory):
     FACTORY_FOR = dict
     id = None
-    user_id = "dummy-user-id"
+    user_id = "1234"
     username = "dummy-username"
     course_id = "dummy-course-id"
     commentable_id = "dummy-commentable-id"

common/test/acceptance/tests/discussion/test_discussion.py

@@ -394,8 +394,11 @@ class DiscussionCommentDeletionTest(BaseDiscussionTestCase):
     def setup_view(self):
         view = SingleThreadViewFixture(Thread(id="comment_deletion_test_thread", commentable_id=self.discussion_id))
         view.addResponse(
-            Response(id="response1"),
-            [Comment(id="comment_other_author", user_id="other"), Comment(id="comment_self_author", user_id=self.user_id)])
+            Response(id="response1"), [
+                Comment(id="comment_other_author"),
+                Comment(id="comment_self_author", user_id=self.user_id, thread_id="comment_deletion_test_thread")
+            ]
+        )
         view.push()
 
     def test_comment_deletion_as_student(self):

common/test/utils.py

@@ -3,6 +3,9 @@ General testing utilities.
 """
 import sys
 from contextlib import contextmanager
+from django.dispatch import Signal
+from markupsafe import escape
+from mock import Mock, patch
 
 
 @contextmanager
@@ -24,3 +27,72 @@ def nostderr():
         yield
     finally:
         sys.stderr = savestderr
+
+
+class XssTestMixin(object):
+    """
+    Mixin for testing XSS vulnerabilities.
+    """
+
+    def assert_xss(self, response, xss_content):
+        """Assert that `xss_content` is not present in the content of
+        `response`, and that its escaped version is present. Uses the
+        same `markupsafe.escape` function as Mako templates.
+
+        Args:
+          response (Response): The HTTP response
+          xss_content (str): The Javascript code to check for.
+
+        Returns:
+          None
+
+        """
+        self.assertContains(response, escape(xss_content))
+        self.assertNotContains(response, xss_content)
+
+
+def disable_signal(module, signal):
+    """Replace `signal` inside of `module` with a dummy signal. Can be
+    used as a method or class decorator, as well as a context manager."""
+    return patch.object(module, signal, new=Signal())
+
+
+class MockSignalHandlerMixin(object):
+    """Mixin for testing sending of signals."""
+
+    @contextmanager
+    def assert_signal_sent(self, module, signal, *args, **kwargs):
+        """Assert that a signal was sent with the correct arguments. Since
+        Django calls signal handlers with the signal as an argument,
+        it is added to `kwargs`.
+
+        Uses `mock.patch.object`, which requires the target to be
+        specified as a module along with a variable name inside that
+        module.
+
+        Args:
+          module (module): The module in which to patch the given signal name.
+          signal (str): The name of the signal to patch.
+          *args, **kwargs: The arguments which should have been passed
+            along with the signal. If `exclude_args` is passed as a
+            keyword argument, its value should be a list of keyword
+            arguments passed to the signal whose values should be
+            ignored.
+
+        """
+        with patch.object(module, signal, new=Signal()) as mock_signal:
+            def handler(*args, **kwargs):  # pylint: disable=unused-argument
+                """No-op signal handler."""
+                pass
+            mock_handler = Mock(spec=handler)
+            mock_signal.connect(mock_handler)
+            yield
+            self.assertTrue(mock_handler.called)
+            mock_args, mock_kwargs = mock_handler.call_args  # pylint: disable=unpacking-non-sequence
+            if 'exclude_args' in kwargs:
+                for key in kwargs['exclude_args']:
+                    self.assertIn(key, mock_kwargs)
+                    del mock_kwargs[key]
+                del kwargs['exclude_args']
+            self.assertEqual(mock_args, args)
+            self.assertEqual(mock_kwargs, dict(kwargs, signal=mock_signal))

lms/djangoapps/courseware/tests/test_course_survey.py

@@ -9,9 +9,9 @@ from django.core.urlresolvers import reverse
 
 from survey.models import SurveyForm
 
+from common.test.utils import XssTestMixin
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.utils import XssTestMixin
 from courseware.tests.helpers import LoginEnrollmentTestCase
 
 

lms/djangoapps/discussion_api/api.py

@@ -31,6 +31,16 @@ from django_comment_client.base.views import (
     get_thread_created_event_data,
     track_forum_event,
 )
+from django_comment_common.signals import (
+    thread_created,
+    thread_edited,
+    thread_deleted,
+    thread_voted,
+    comment_created,
+    comment_edited,
+    comment_voted,
+    comment_deleted
+)
 from django_comment_client.utils import get_accessible_discussion_modules, is_commentable_cohorted
 from lms.lib.comment_client.comment import Comment
 from lms.lib.comment_client.thread import Thread
@@ -501,6 +511,8 @@ def _do_extra_actions(api_content, cc_content, request_fields, actions_form, con
                     cc_content.unFlagAbuse(context["cc_requester"], cc_content, removeAll=False)
             else:
                 assert field == "voted"
+                signal = thread_voted if cc_content.type == 'thread' else comment_voted
+                signal.send(sender=None, user=context["request"].user, post=cc_content)
                 if form_value:
                     context["cc_requester"].vote(cc_content, "up")
                 else:
@@ -524,11 +536,12 @@ def create_thread(request, thread_data):
         detail.
     """
     course_id = thread_data.get("course_id")
+    user = request.user
     if not course_id:
         raise ValidationError({"course_id": ["This field is required."]})
     try:
         course_key = CourseKey.from_string(course_id)
-        course = _get_course_or_404(course_key, request.user)
+        course = _get_course_or_404(course_key, user)
     except (Http404, InvalidKeyError):
         raise ValidationError({"course_id": ["Invalid value."]})
 
@@ -539,14 +552,14 @@ def create_thread(request, thread_data):
             is_commentable_cohorted(course_key, thread_data.get("topic_id"))
     ):
         thread_data = thread_data.copy()
-        thread_data["group_id"] = get_cohort_id(request.user, course_key)
+        thread_data["group_id"] = get_cohort_id(user, course_key)
     serializer = ThreadSerializer(data=thread_data, context=context)
     actions_form = ThreadActionsForm(thread_data)
     if not (serializer.is_valid() and actions_form.is_valid()):
         raise ValidationError(dict(serializer.errors.items() + actions_form.errors.items()))
     serializer.save()
-
     cc_thread = serializer.object
+    thread_created.send(sender=None, user=user, post=cc_thread)
     api_thread = serializer.data
     _do_extra_actions(api_thread, cc_thread, thread_data.keys(), actions_form, context)
 
@@ -591,8 +604,8 @@ def create_comment(request, comment_data):
     if not (serializer.is_valid() and actions_form.is_valid()):
         raise ValidationError(dict(serializer.errors.items() + actions_form.errors.items()))
     serializer.save()
-
     cc_comment = serializer.object
+    comment_created.send(sender=None, user=request.user, post=cc_comment)
     api_comment = serializer.data
     _do_extra_actions(api_comment, cc_comment, comment_data.keys(), actions_form, context)
 
@@ -634,6 +647,7 @@ def update_thread(request, thread_id, update_data):
     # Only save thread object if some of the edited fields are in the thread data, not extra actions
     if set(update_data) - set(actions_form.fields):
         serializer.save()
+        thread_edited.send(sender=None, user=request.user, post=cc_thread)
     api_thread = serializer.data
     _do_extra_actions(api_thread, cc_thread, update_data.keys(), actions_form, context)
     return api_thread
@@ -677,6 +691,7 @@ def update_comment(request, comment_id, update_data):
     # Only save comment object if some of the edited fields are in the comment data, not extra actions
     if set(update_data) - set(actions_form.fields):
         serializer.save()
+        comment_edited.send(sender=None, user=request.user, post=cc_comment)
     api_comment = serializer.data
     _do_extra_actions(api_comment, cc_comment, update_data.keys(), actions_form, context)
     return api_comment
@@ -701,6 +716,7 @@ def delete_thread(request, thread_id):
     cc_thread, context = _get_thread_and_context(request, thread_id)
     if can_delete(cc_thread, context):
         cc_thread.delete()
+        thread_deleted.send(sender=None, user=request.user, post=cc_thread)
     else:
         raise PermissionDenied
 
@@ -724,5 +740,6 @@ def delete_comment(request, comment_id):
     cc_comment, context = _get_comment_and_context(request, comment_id)
     if can_delete(cc_comment, context):
         cc_comment.delete()
+        comment_deleted.send(sender=None, user=request.user, post=cc_comment)
     else:
         raise PermissionDenied

lms/djangoapps/discussion_api/tests/test_views.py

@@ -14,6 +14,8 @@ from django.core.urlresolvers import reverse
 
 from rest_framework.test import APIClient
 
+from common.test.utils import disable_signal
+from discussion_api import api
 from discussion_api.tests.utils import (
     CommentsServiceMockMixin,
     make_minimal_cs_comment,
@@ -385,6 +387,7 @@ class ThreadViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
 
 
 @httpretty.activate
+@disable_signal(api, 'thread_created')
 class ThreadViewSetCreateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """Tests for ThreadViewSet create"""
     def setUp(self):
@@ -476,6 +479,7 @@ class ThreadViewSetCreateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
 
 
 @httpretty.activate
+@disable_signal(api, 'thread_edited')
 class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """Tests for ThreadViewSet partial_update"""
     def setUp(self):
@@ -575,6 +579,7 @@ class ThreadViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTest
 
 
 @httpretty.activate
+@disable_signal(api, 'thread_deleted')
 class ThreadViewSetDeleteTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """Tests for ThreadViewSet delete"""
     def setUp(self):
@@ -738,6 +743,7 @@ class CommentViewSetListTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
 
 
 @httpretty.activate
+@disable_signal(api, 'comment_deleted')
 class CommentViewSetDeleteTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """Tests for ThreadViewSet delete"""
 
@@ -778,6 +784,7 @@ class CommentViewSetDeleteTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
 
 
 @httpretty.activate
+@disable_signal(api, 'comment_created')
 class CommentViewSetCreateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """Tests for CommentViewSet create"""
     def setUp(self):
@@ -861,6 +868,7 @@ class CommentViewSetCreateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
         self.assertEqual(response_data, expected_response_data)
 
 
+@disable_signal(api, 'comment_edited')
 class CommentViewSetPartialUpdateTest(DiscussionAPIViewTestMixin, ModuleStoreTestCase):
     """Tests for CommentViewSet partial_update"""
     def setUp(self):

lms/djangoapps/django_comment_client/base/views.py

@@ -18,6 +18,17 @@ from courseware.access import has_access
 from util.file import store_uploaded_file
 from courseware.courses import get_course_with_access, get_course_by_id
 import django_comment_client.settings as cc_settings
+from django_comment_common.signals import (
+    thread_created,
+    thread_edited,
+    thread_voted,
+    thread_deleted,
+    comment_created,
+    comment_edited,
+    comment_voted,
+    comment_deleted,
+    comment_endorsed
+)
 from django_comment_common.utils import ThreadContext
 from django_comment_client.utils import (
     add_courseware_context,
@@ -161,6 +172,7 @@ def create_thread(request, course_id, commentable_id):
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
     course = get_course_with_access(request.user, 'load', course_key)
     post = request.POST
+    user = request.user
 
     if course.allow_anonymous:
         anonymous = post.get('anonymous', 'false').lower() == 'true'
@@ -182,7 +194,7 @@ def create_thread(request, course_id, commentable_id):
         'anonymous_to_peers': anonymous_to_peers,
         'commentable_id': commentable_id,
         'course_id': course_key.to_deprecated_string(),
-        'user_id': request.user.id,
+        'user_id': user.id,
         'thread_type': post["thread_type"],
         'body': post["body"],
         'title': post["title"],
@@ -206,6 +218,8 @@ def create_thread(request, course_id, commentable_id):
 
     thread.save()
 
+    thread_created.send(sender=None, user=user, post=thread)
+
     # patch for backward compatibility to comments service
     if 'pinned' not in thread.attributes:
         thread['pinned'] = False
@@ -213,13 +227,13 @@ def create_thread(request, course_id, commentable_id):
     follow = post.get('auto_subscribe', 'false').lower() == 'true'
 
     if follow:
-        user = cc.User.from_django_user(request.user)
-        user.follow(thread)
+        cc_user = cc.User.from_django_user(user)
+        cc_user.follow(thread)
 
     event_data = get_thread_created_event_data(thread, follow)
     data = thread.to_dict()
 
-    add_courseware_context([data], course, request.user)
+    add_courseware_context([data], course, user)
 
     track_forum_event(request, THREAD_CREATED_EVENT_NAME, course, thread, event_data)
 
@@ -247,19 +261,23 @@ def update_thread(request, course_id, thread_id):
     thread_context = getattr(thread, "context", "course")
     thread.body = request.POST["body"]
     thread.title = request.POST["title"]
+    user = request.user
     # The following checks should avoid issues we've seen during deploys, where end users are hitting an updated server
     # while their browser still has the old client code. This will avoid erasing present values in those cases.
     if "thread_type" in request.POST:
         thread.thread_type = request.POST["thread_type"]
     if "commentable_id" in request.POST:
         commentable_id = request.POST["commentable_id"]
-        course = get_course_with_access(request.user, 'load', course_key)
-        if thread_context == "course" and not discussion_category_id_access(course, request.user, commentable_id):
+        course = get_course_with_access(user, 'load', course_key)
+        if thread_context == "course" and not discussion_category_id_access(course, user, commentable_id):
             return JsonError(_("Topic doesn't exist"))
         else:
             thread.commentable_id = commentable_id
 
     thread.save()
+
+    thread_edited.send(sender=None, user=user, post=thread)
+
     if request.is_ajax():
         return ajax_content_response(request, course_key, thread.to_dict())
     else:
@@ -273,11 +291,12 @@ def _create_comment(request, course_key, thread_id=None, parent_id=None):
     """
     assert isinstance(course_key, CourseKey)
     post = request.POST
+    user = request.user
 
     if 'body' not in post or not post['body'].strip():
         return JsonError(_("Body can't be empty"))
 
-    course = get_course_with_access(request.user, 'load', course_key)
+    course = get_course_with_access(user, 'load', course_key)
     if course.allow_anonymous:
         anonymous = post.get('anonymous', 'false').lower() == 'true'
     else:
@@ -291,7 +310,7 @@ def _create_comment(request, course_key, thread_id=None, parent_id=None):
     comment = cc.Comment(
         anonymous=anonymous,
         anonymous_to_peers=anonymous_to_peers,
-        user_id=request.user.id,
+        user_id=user.id,
         course_id=course_key.to_deprecated_string(),
         thread_id=thread_id,
         parent_id=parent_id,
@@ -299,11 +318,13 @@ def _create_comment(request, course_key, thread_id=None, parent_id=None):
     )
     comment.save()
 
+    comment_created.send(sender=None, user=user, post=comment)
+
     followed = post.get('auto_subscribe', 'false').lower() == 'true'
 
     if followed:
-        user = cc.User.from_django_user(request.user)
-        user.follow(comment.thread)
+        cc_user = cc.User.from_django_user(request.user)
+        cc_user.follow(comment.thread)
 
     event_name = get_comment_created_event_name(comment)
     event_data = get_comment_created_event_data(comment, comment.thread.commentable_id, followed)
@@ -339,7 +360,7 @@ def delete_thread(request, course_id, thread_id):  # pylint: disable=unused-argu
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
     thread = cc.Thread.find(thread_id)
     thread.delete()
-
+    thread_deleted.send(sender=None, user=request.user, post=thread)
     return JsonResponse(prepare_content(thread.to_dict(), course_key))
 
 
@@ -357,6 +378,9 @@ def update_comment(request, course_id, comment_id):
         return JsonError(_("Body can't be empty"))
     comment.body = request.POST["body"]
     comment.save()
+
+    comment_edited.send(sender=None, user=request.user, post=comment)
+
     if request.is_ajax():
         return ajax_content_response(request, course_key, comment.to_dict())
     else:
@@ -373,9 +397,11 @@ def endorse_comment(request, course_id, comment_id):
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
     comment = cc.Comment.find(comment_id)
+    user = request.user
     comment.endorsed = request.POST.get('endorsed', 'false').lower() == 'true'
-    comment.endorsement_user_id = request.user.id
+    comment.endorsement_user_id = user.id
     comment.save()
+    comment_endorsed.send(sender=None, user=user, post=comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 
@@ -422,6 +448,7 @@ def delete_comment(request, course_id, comment_id):
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
     comment = cc.Comment.find(comment_id)
     comment.delete()
+    comment_deleted.send(sender=None, user=request.user, post=comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 
@@ -433,9 +460,11 @@ def vote_for_comment(request, course_id, comment_id, value):
     given a course_id and comment_id,
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    user = cc.User.from_django_user(request.user)
+    user = request.user
+    cc_user = cc.User.from_django_user(user)
     comment = cc.Comment.find(comment_id)
-    user.vote(comment, value)
+    cc_user.vote(comment, value)
+    comment_voted.send(sender=None, user=user, post=comment)
     return JsonResponse(prepare_content(comment.to_dict(), course_key))
 
 
@@ -463,10 +492,11 @@ def vote_for_thread(request, course_id, thread_id, value):
     ajax only
     """
     course_key = SlashSeparatedCourseKey.from_deprecated_string(course_id)
-    user = cc.User.from_django_user(request.user)
+    user = request.user
+    cc_user = cc.User.from_django_user(user)
     thread = cc.Thread.find(thread_id)
-    user.vote(thread, value)
-
+    cc_user.vote(thread, value)
+    thread_voted.send(sender=None, user=user, post=thread)
     return JsonResponse(prepare_content(thread.to_dict(), course_key))
 
 

lms/djangoapps/instructor/tests/views/test_instructor_dashboard.py

@@ -13,9 +13,9 @@ from courseware.tabs import get_course_tab_list
 from courseware.tests.factories import UserFactory
 from courseware.tests.helpers import LoginEnrollmentTestCase
 
+from common.test.utils import XssTestMixin
 from student.tests.factories import AdminFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
-from xmodule.modulestore.tests.utils import XssTestMixin
 from xmodule.modulestore.tests.factories import CourseFactory
 from shoppingcart.models import PaidCourseRegistration, Order, CourseRegCodeItem
 from course_modes.models import CourseMode

lms/djangoapps/shoppingcart/tests/test_views.py

@@ -24,9 +24,9 @@ from datetime import datetime, timedelta
 from mock import patch, Mock
 import ddt
 
+from common.test.utils import XssTestMixin
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory
-from xmodule.modulestore.tests.utils import XssTestMixin
 from student.roles import CourseSalesAdminRole
 from util.date_utils import get_default_time_display
 from util.testing import UrlResetMixin

lms/djangoapps/teams/__init__.py

@@ -5,6 +5,9 @@ Defines common methods shared by Teams classes
 from django.conf import settings
 
 
+TEAM_DISCUSSION_CONTEXT = 'standalone'
+
+
 def is_feature_enabled(course):
     """
     Returns True if the teams feature is enabled.

lms/djangoapps/teams/models.py

 """Django models related to teams functionality."""
 
+from datetime import datetime
 from uuid import uuid4
 import pytz
 from datetime import datetime
 
+from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.auth.models import User
 from django.db import models
+from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy
 from django_countries.fields import CountryField
 
+from django_comment_common.signals import (
+    thread_created,
+    thread_edited,
+    thread_deleted,
+    thread_voted,
+    comment_created,
+    comment_edited,
+    comment_deleted,
+    comment_voted,
+    comment_endorsed
+)
 from xmodule_django.models import CourseKeyField
 from util.model_utils import slugify
 from student.models import LanguageField, CourseEnrollment
 from .errors import AlreadyOnTeamInCourse, NotEnrolledInCourseForTeam
+from teams import TEAM_DISCUSSION_CONTEXT
+
+
+@receiver(thread_voted)
+@receiver(thread_created)
+@receiver(comment_voted)
+@receiver(comment_created)
+def post_create_vote_handler(sender, **kwargs):  # pylint: disable=unused-argument
+    """Update the user's last activity date upon creating or voting for a
+    post."""
+    handle_activity(kwargs['user'], kwargs['post'])
+
+
+@receiver(thread_edited)
+@receiver(thread_deleted)
+@receiver(comment_edited)
+@receiver(comment_deleted)
+def post_edit_delete_handler(sender, **kwargs):  # pylint: disable=unused-argument
+    """Update the user's last activity date upon editing or deleting a
+    post."""
+    post = kwargs['post']
+    handle_activity(kwargs['user'], post, long(post.user_id))
+
+
+@receiver(comment_endorsed)
+def comment_endorsed_handler(sender, **kwargs):  # pylint: disable=unused-argument
+    """Update the user's last activity date upon endorsing a comment."""
+    comment = kwargs['post']
+    handle_activity(kwargs['user'], comment, long(comment.thread.user_id))
+
+
+def handle_activity(user, post, original_author_id=None):
+    """Handle user activity from django_comment_client and discussion_api
+    and update the user's last activity date. Checks if the user who
+    performed the action is the original author, and that the
+    discussion has the team context.
+    """
+    if original_author_id is not None and user.id != original_author_id:
+        return
+    if getattr(post, "context", "course") == TEAM_DISCUSSION_CONTEXT:
+        CourseTeamMembership.update_last_activity(user, post.commentable_id)
 
 
 class CourseTeam(models.Model):
@@ -134,3 +189,22 @@ class CourseTeamMembership(models.Model):
             False if not
         """
         return cls.objects.filter(user=user, team__course_id=course_id).exists()
+
+    @classmethod
+    def update_last_activity(cls, user, discussion_topic_id):
+        """Set the `last_activity_at` for both this user and their team in the
+        given discussion topic. No-op if the user is not a member of
+        the team for this discussion.
+        """
+        try:
+            membership = cls.objects.get(user=user, team__discussion_topic_id=discussion_topic_id)
+        # If a privileged user is active in the discussion of a team
+        # they do not belong to, do not update their last activity
+        # information.
+        except ObjectDoesNotExist:
+            return
+        now = datetime.utcnow().replace(tzinfo=pytz.utc)
+        membership.last_activity_at = now
+        membership.team.last_activity_at = now
+        membership.team.save()
+        membership.save()

lms/djangoapps/teams/static/teams/js/models/team.js

@@ -15,7 +15,8 @@
                 description: '',
                 country: '',
                 language: '',
-                membership: []
+                membership: [],
+                last_activity_at: ''
             },
 
             initialize: function(options) {

lms/djangoapps/teams/static/teams/js/spec/views/edit_team_spec.js

@@ -20,7 +20,8 @@ define([
                 description: "TeamDescription",
                 country: "c",
                 language: "a",
-                membership: []
+                membership: [],
+                last_activity_at: ''
             },
             verifyValidation = function (requests, teamEditView, fieldsData) {
                 _.each(fieldsData, function (fieldData) {

lms/djangoapps/teams/static/teams/js/spec/views/team_card_spec.js

+define(['jquery',
+        'underscore',
+        'teams/js/views/team_card',
+        'teams/js/models/team'],
+    function ($, _, TeamCardView, Team) {
+        describe('TeamCardView', function () {
+            var createTeamCardView, view;
+            createTeamCardView = function () {
+                var model = new Team({
+                    id: 'test-team',
+                    name: 'Test Team',
+                    is_active: true,
+                    course_id: 'test/course/id',
+                    topic_id: 'test-topic',
+                    description: 'A team for testing',
+                    last_activity_at: "2015-08-21T18:53:01.145Z",
+                    country: 'us',
+                    language: 'en'
+                }),
+                    teamCardClass = TeamCardView.extend({
+                        maxTeamSize: '100',
+                        srInfo: {
+                            id: 'test-sr-id',
+                            text: 'Screenreader text'
+                        },
+                        countries: {us: 'United States of America'},
+                        languages: {en: 'English'}
+                    });
+                return new teamCardClass({
+                    model: model
+                });
+            };
+
+            beforeEach(function () {
+                view = createTeamCardView();
+                view.render();
+            });
+
+            it('can render itself', function () {
+                expect(view.$el).toHaveClass('list-card');
+                expect(view.$el.find('.card-title').text()).toContain('Test Team');
+                expect(view.$el.find('.card-description').text()).toContain('A team for testing');
+                expect(view.$el.find('.team-activity abbr').attr('title')).toEqual("2015-08-21T18:53:01.145Z");
+                expect(view.$el.find('.team-activity').text()).toContain('Last Activity');
+                expect(view.$el.find('.card-meta').text()).toContain('0 / 100 Members');
+                expect(view.$el.find('.team-location').text()).toContain('United States of America');
+                expect(view.$el.find('.team-language').text()).toContain('English');
+            });
+
+            it('navigates to the associated team page when its action button is clicked', function () {
+                expect(view.$('.action').attr('href')).toEqual('#teams/test-topic/test-team');
+            });
+        });
+    }
+);

lms/djangoapps/teams/static/teams/js/spec_helpers/team_spec_helpers.js

@@ -33,7 +33,8 @@ define([
                 language: testLanguages[i%4][0],
                 country: testCountries[i%4][0],
                 is_active: true,
-                membership: []
+                membership: [],
+                last_activity_at: ''
             };
         });
     };

lms/djangoapps/teams/static/teams/js/views/team_card.js

@@ -4,11 +4,13 @@
         'backbone',
         'underscore',
         'gettext',
+        'jquery.timeago',
         'js/components/card/views/card',
         'teams/js/views/team_utils',
-        'text!teams/templates/team-country-language.underscore'
-    ], function (Backbone, _, gettext, CardView, TeamUtils, teamCountryLanguageTemplate) {
-        var TeamMembershipView, TeamCountryLanguageView, TeamCardView;
+        'text!teams/templates/team-country-language.underscore',
+        'text!teams/templates/team-activity.underscore'
+    ], function (Backbone, _, gettext, timeago, CardView, TeamUtils, teamCountryLanguageTemplate, teamActivityTemplate) {
+        var TeamMembershipView, TeamCountryLanguageView, TeamActivityView, TeamCardView;
 
         TeamMembershipView = Backbone.View.extend({
             tagName: 'div',
@@ -54,6 +56,28 @@
             }
         });
 
+        TeamActivityView = Backbone.View.extend({
+            tagName: 'div',
+            className: 'team-activity',
+            template: _.template(teamActivityTemplate),
+
+            initialize: function (options) {
+                this.date = options.date;
+            },
+
+            render: function () {
+                this.$el.html(
+                    interpolate(
+                        // Translators: 'date' is a placeholder for a fuzzy, relative timestamp (see: https://github.com/rmm5t/jquery-timeago)
+                        gettext("Last Activity %(date)s"),
+                        {date: this.template({date: this.date})},
+                        true
+                    )
+                );
+                this.$('abbr').timeago();
+            }
+        });
+
         TeamCardView = CardView.extend({
             initialize: function () {
                 CardView.prototype.initialize.apply(this, arguments);
@@ -64,7 +88,8 @@
                         model: this.teamModel(),
                         countries: this.countries,
                         languages: this.languages
-                    })
+                    }),
+                    new TeamActivityView({date: this.teamModel().get('last_activity_at')})
                 ];
             },
 

lms/djangoapps/teams/static/teams/templates/team-activity.underscore

+<abbr title="<%= date %>"></abbr>

lms/djangoapps/teams/tests/test_models.py

 # -*- coding: utf-8 -*-
 """Tests for the teams API at the HTTP request level."""
+from contextlib import contextmanager
+from datetime import datetime
 import ddt
+import itertools
+from mock import Mock
+import pytz
 
+from django_comment_common.signals import (
+    thread_created,
+    thread_edited,
+    thread_deleted,
+    thread_voted,
+    comment_created,
+    comment_edited,
+    comment_deleted,
+    comment_voted,
+    comment_endorsed
+)
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from opaque_keys.edx.keys import CourseKey
 from student.tests.factories import UserFactory
 
 from .factories import CourseTeamFactory, CourseTeamMembershipFactory
-from ..models import CourseTeamMembership
+from ..models import CourseTeam, CourseTeamMembership
+from teams import TEAM_DISCUSSION_CONTEXT
 
 COURSE_KEY1 = CourseKey.from_string('edx/history/1')
 COURSE_KEY2 = CourseKey.from_string('edx/history/2')
@@ -73,3 +90,93 @@ class TeamMembershipTest(SharedModuleStoreTestCase):
             CourseTeamMembership.user_in_team_for_course(user, course_id),
             expected_value
         )
+
+
+@ddt.ddt
+class TeamSignalsTest(SharedModuleStoreTestCase):
+    """Tests for handling of team-related signals."""
+
+    SIGNALS_LIST = (
+        thread_created,
+        thread_edited,
+        thread_deleted,
+        thread_voted,
+        comment_created,
+        comment_edited,
+        comment_deleted,
+        comment_voted,
+        comment_endorsed
+    )
+
+    DISCUSSION_TOPIC_ID = 'test_topic'
+
+    def setUp(self):
+        """Create a user with a team to test signals."""
+        super(TeamSignalsTest, self).setUp()
+        self.user = UserFactory.create(username="user")
+        self.moderator = UserFactory.create(username="moderator")
+        self.team = CourseTeamFactory(discussion_topic_id=self.DISCUSSION_TOPIC_ID)
+        self.team_membership = CourseTeamMembershipFactory(user=self.user, team=self.team)
+
+    def mock_comment(self, context=TEAM_DISCUSSION_CONTEXT, user=None):
+        """Create a mock comment service object with the given context."""
+        if user is None:
+            user = self.user
+        return Mock(
+            user_id=user.id,
+            commentable_id=self.DISCUSSION_TOPIC_ID,
+            context=context,
+            **{'thread.user_id': self.user.id}
+        )
+
+    @contextmanager
+    def assert_last_activity_updated(self, should_update):
+        """If `should_update` is True, assert that the team and team
+        membership have had their `last_activity_at` updated. Otherwise,
+        assert that it was not updated.
+        """
+        team_last_activity = self.team.last_activity_at
+        team_membership_last_activity = self.team_membership.last_activity_at
+        yield
+        # Reload team and team membership from the database in order to pick up changes
+        team = CourseTeam.objects.get(id=self.team.id)  # pylint: disable=maybe-no-member
+        team_membership = CourseTeamMembership.objects.get(id=self.team_membership.id)  # pylint: disable=maybe-no-member
+        if should_update:
+            self.assertGreater(team.last_activity_at, team_last_activity)
+            self.assertGreater(team_membership.last_activity_at, team_membership_last_activity)
+            now = datetime.utcnow().replace(tzinfo=pytz.utc)
+            self.assertGreater(now, team.last_activity_at)
+            self.assertGreater(now, team_membership.last_activity_at)
+        else:
+            self.assertEqual(team.last_activity_at, team_last_activity)
+            self.assertEqual(team_membership.last_activity_at, team_membership_last_activity)
+
+    @ddt.data(
+        *itertools.product(
+            SIGNALS_LIST,
+            (('user', True), ('moderator', False))
+        )
+    )
+    @ddt.unpack
+    def test_signals(self, signal, (user, should_update)):
+        """Test that `last_activity_at` is correctly updated when team-related
+        signals are sent.
+        """
+        with self.assert_last_activity_updated(should_update):
+            user = getattr(self, user)
+            signal.send(sender=None, user=user, post=self.mock_comment())
+
+    @ddt.data(thread_voted, comment_voted)
+    def test_vote_others_post(self, signal):
+        """Test that voting on another user's post correctly fires a
+        signal."""
+        with self.assert_last_activity_updated(True):
+            signal.send(sender=None, user=self.user, post=self.mock_comment(user=self.moderator))
+
+    @ddt.data(*SIGNALS_LIST)
+    def test_signals_course_context(self, signal):
+        """Test that `last_activity_at` is not updated when activity takes
+        place in discussions outside of a team.
+        """
+        with self.assert_last_activity_updated(False):
+            signal.send(sender=None, user=self.user, post=self.mock_comment(context='course'))

lms/djangoapps/verify_student/tests/test_views.py

@@ -33,6 +33,7 @@ from opaque_keys.edx.keys import UsageKey
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
 from courseware.url_helpers import get_redirect_url
+from common.test.utils import XssTestMixin
 from commerce.tests import TEST_PAYMENT_DATA, TEST_API_URL, TEST_API_SIGNING_KEY
 from embargo.test_utils import restrict_course
 from openedx.core.djangoapps.user_api.accounts.api import get_account_settings
@@ -51,7 +52,6 @@ from verify_student.models import (
 )
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
-from xmodule.modulestore.tests.utils import XssTestMixin
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.tests.factories import check_mongo_calls

lms/lib/comment_client/comment.py

@@ -30,6 +30,11 @@ class Comment(models.Model):
     def thread(self):
         return Thread(id=self.thread_id, type='thread')
 
+    @property
+    def context(self):
+        """Return the context of the thread which this comment belongs to."""
+        return self.thread.context
+
     @classmethod
     def url_for_comments(cls, params={}):
         if params.get('parent_id'):

lms/static/js/spec/main.js

@@ -794,6 +794,7 @@
         'lms/include/teams/js/spec/teams_tab_factory_spec.js',
         'lms/include/teams/js/spec/views/edit_team_spec.js',
         'lms/include/teams/js/spec/views/my_teams_spec.js',
+        'lms/include/teams/js/spec/views/team_card_spec.js',
         'lms/include/teams/js/spec/views/team_discussion_spec.js',
         'lms/include/teams/js/spec/views/team_profile_spec.js',
         'lms/include/teams/js/spec/views/teams_spec.js',

lms/static/lms/js/require-config.js

@@ -44,6 +44,7 @@
             "underscore.string": "js/vendor/underscore.string.min",
             "jquery": "js/vendor/jquery.min",
             "jquery.cookie": "js/vendor/jquery.cookie",
+            'jquery.timeago': 'js/vendor/jquery.timeago',
             "jquery.url": "js/vendor/url.min",
             "jquery.ui": "js/vendor/jquery-ui.min",
             "jquery.iframe-transport": "js/vendor/jQuery-File-Upload/js/jquery.iframe-transport",
@@ -94,6 +95,10 @@
                 deps: ["jquery"],
                 exports: "jQuery.fn.cookie"
             },
+            "jquery.timeago": {
+                deps: ["jquery"],
+                exports: "jQuery.timeago"
+            },
             "jquery.url": {
                 deps: ["jquery"],
                 exports: "jQuery.url"