Open release/palm.4/edues

cms/djangoapps/models/settings/course_metadata.py

@@ -363,7 +363,7 @@ def validate_single_topic(cls, topic_settings):
         """
         error_list = []
         valid_teamset_types = [TeamsetType.open.value, TeamsetType.public_managed.value,
-                               TeamsetType.private_managed.value]
+                               TeamsetType.private_managed.value, TeamsetType.open_managed.value]
         valid_keys = {'id', 'name', 'description', 'max_team_size', 'type'}
         teamset_type = topic_settings.get('type', {})
         if teamset_type:

lms/djangoapps/bulk_email/data.py

@@ -20,8 +20,9 @@ class BulkEmailTargetChoices:
     SEND_TO_LEARNERS = "learners"
     SEND_TO_COHORT = "cohort"
     SEND_TO_TRACK = "track"
+    SEND_TO_INDIVIDUAL_LEARNERS = "individual-learners"
 
-    TARGET_CHOICES = (SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS, SEND_TO_COHORT, SEND_TO_TRACK)
+    TARGET_CHOICES = (SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS, SEND_TO_COHORT, SEND_TO_TRACK, SEND_TO_INDIVIDUAL_LEARNERS)
 
     @classmethod
     def is_valid_target(cls, target):

lms/djangoapps/bulk_email/migrations/0008_alter_target_target_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2023-09-04 14:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bulk_email', '0007_disabledcourse'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='target',
+            name='target_type',
+            field=models.CharField(choices=[('myself', 'Myself'), ('staff', 'Staff and instructors'), ('learners', 'All students'), ('cohort', 'Specific cohort'), ('track', 'Specific course mode'), ('individual-students', 'Specific list of students')], max_length=64),
+        ),
+    ]

lms/djangoapps/bulk_email/migrations/0009_alter_target_target_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2023-09-12 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bulk_email', '0008_alter_target_target_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='target',
+            name='target_type',
+            field=models.CharField(choices=[('myself', 'Myself'), ('staff', 'Staff and instructors'), ('learners', 'All students'), ('cohort', 'Specific cohort'), ('track', 'Specific course mode'), ('individual-learners', 'Specific list of students')], max_length=64),
+        ),
+    ]

lms/djangoapps/bulk_email/models.py

@@ -55,9 +55,10 @@ class Meta:
 SEND_TO_LEARNERS = 'learners'
 SEND_TO_COHORT = 'cohort'
 SEND_TO_TRACK = 'track'
+SEND_TO_INDIVIDUAL_LEARNERS = 'individual-learners'
 EMAIL_TARGET_CHOICES = list(zip(
-    [SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS, SEND_TO_COHORT, SEND_TO_TRACK],
-    ['Myself', 'Staff and instructors', 'All students', 'Specific cohort', 'Specific course mode']
+    [SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS, SEND_TO_COHORT, SEND_TO_TRACK, SEND_TO_INDIVIDUAL_LEARNERS],
+    ['Myself', 'Staff and instructors', 'All students', 'Specific cohort', 'Specific course mode', 'Specific list of students']
 ))
 EMAIL_TARGETS = {target[0] for target in EMAIL_TARGET_CHOICES}
 
@@ -106,7 +107,7 @@ def long_display(self):
         else:
             return self.get_target_type_display()
 
-    def get_users(self, course_id, user_id=None):
+    def get_users(self, course_id, user_id=None, emails=None):
         """
         Gets the users for a given target.
 
@@ -148,6 +149,13 @@ def get_users(self, course_id, user_id=None):
                     & enrollment_query
                 )
             )
+        elif self.target_type == SEND_TO_INDIVIDUAL_LEARNERS:
+            return use_read_replica_if_available(
+                User.objects.filter(
+                    models.Q(email__in=emails)
+                    & enrollment_query
+                )
+            )
         else:
             raise ValueError(f"Unrecognized target type {self.target_type}")
 

lms/djangoapps/bulk_email/tasks.py

@@ -192,7 +192,7 @@ def perform_delegate_email_batches(entry_id, course_id, task_input, action_name)
     global_email_context = _get_course_email_context(course)
 
     recipient_qsets = [
-        target.get_users(course_id, user_id)
+        target.get_users(course_id, user_id, task_input.get("emails", []))
         for target in targets
     ]
     # Use union here to combine the qsets instead of the | operator.  This avoids generating an

lms/djangoapps/discussion/django_comment_client/base/tests.py

@@ -406,7 +406,7 @@ def inner(self, default_store, block_count, mongo_calls, sql_queries, *args, **k
         return inner
 
     @ddt.data(
-        (ModuleStoreEnum.Type.split, 3, 8, 42),
+        (ModuleStoreEnum.Type.split, 3, 8, 43),
     )
     @ddt.unpack
     @count_queries

lms/djangoapps/discussion/django_comment_client/base/views.py

@@ -16,12 +16,18 @@
 from django.views.decorators.http import require_GET, require_POST
 from eventtracking import tracker
 from opaque_keys.edx.keys import CourseKey
+from openedx_events.learning.data import DiscussionThreadData, UserData, UserPersonalData
+from openedx_events.learning.signals import (
+    FORUM_RESPONSE_COMMENT_CREATED,
+    FORUM_THREAD_CREATED,
+    FORUM_THREAD_RESPONSE_CREATED
+)
 
 import lms.djangoapps.discussion.django_comment_client.settings as cc_settings
 import openedx.core.djangoapps.django_comment_common.comment_client as cc
 from common.djangoapps.student.roles import GlobalStaff
-from common.djangoapps.util.file import store_uploaded_file
 from common.djangoapps.track import contexts
+from common.djangoapps.util.file import store_uploaded_file
 from lms.djangoapps.courseware.access import has_access
 from lms.djangoapps.courseware.courses import get_course_overview_with_access, get_course_with_access
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
@@ -42,7 +48,7 @@
     get_user_group_ids,
     is_comment_too_deep,
     prepare_content,
-    sanitize_body,
+    sanitize_body
 )
 from openedx.core.djangoapps.django_comment_common.signals import (
     comment_created,
@@ -66,6 +72,12 @@
 TRACKING_MAX_FORUM_TITLE = 1000
 _EVENT_NAME_TEMPLATE = 'edx.forum.{obj_type}.{action_name}'
 
+TRACKING_LOG_TO_EVENT_MAPS = {
+    'edx.forum.thread.created': FORUM_THREAD_CREATED,
+    'edx.forum.response.created': FORUM_THREAD_RESPONSE_CREATED,
+    'edx.forum.comment.created': FORUM_RESPONSE_COMMENT_CREATED,
+}
+
 
 def track_forum_event(request, event_name, course, obj, data, id_map=None):
     """
@@ -97,6 +109,41 @@ def track_forum_event(request, event_name, course, obj, data, id_map=None):
     with tracker.get_tracker().context(event_name, context):
         tracker.emit(event_name, data)
 
+    forum_event = TRACKING_LOG_TO_EVENT_MAPS.get(event_name, None)
+    if forum_event is not None:
+        forum_event.send_event(
+            thread=DiscussionThreadData(
+                anonymous=data.get('anonymous'),
+                anonymous_to_peers=data.get('anonymous_to_peers'),
+                body=data.get('body'),
+                category_id=data.get('category_id'),
+                category_name=data.get('category_name'),
+                commentable_id=data.get('commentable_id'),
+                group_id=data.get('group_id'),
+                id=data.get('id'),
+                team_id=data.get('team_id'),
+                thread_type=data.get('thread_type'),
+                title=data.get('title'),
+                title_truncated=data.get('title_truncated'),
+                truncated=data.get('truncated'),
+                url=data.get('url'),
+                discussion=data.get('discussion'),
+                user_course_roles=data.get('user_course_roles'),
+                user_forums_roles=data.get('user_forums_roles'),
+                user=UserData(
+                    pii=UserPersonalData(
+                        username=user.username,
+                        email=user.email,
+                        name=user.profile.name,
+                    ),
+                    id=user.id,
+                    is_active=user.is_active,
+                ),
+                course_id=str(course.id),
+                options=data.get('options'),
+            )
+        )
+
 
 def track_created_event(request, event_name, course, obj, data):
     """