From c5c35d46199258974fcbaa9fd790508613874d51 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi <maria.grimaldi@edunext.co>
Date: Mon, 4 Sep 2023 14:58:55 -0400
Subject: [PATCH 01/28] feat: add support to send email to cherry-picked
 students

---
 lms/djangoapps/bulk_email/data.py              |  3 ++-
 .../0008_alter_target_target_type.py           | 18 ++++++++++++++++++
 lms/djangoapps/bulk_email/models.py            | 14 +++++++++++---
 lms/djangoapps/bulk_email/tasks.py             |  2 +-
 lms/djangoapps/instructor/views/api.py         |  2 +-
 lms/djangoapps/instructor_task/api.py          |  2 +-
 6 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 lms/djangoapps/bulk_email/migrations/0008_alter_target_target_type.py

diff --git a/lms/djangoapps/bulk_email/data.py b/lms/djangoapps/bulk_email/data.py
index 1173faa666e..6bc8cdb2742 100644
--- a/lms/djangoapps/bulk_email/data.py
+++ b/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_STUDENTS = "individual-students"
 
-    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_STUDENTS)
 
     @classmethod
     def is_valid_target(cls, target):
diff --git a/lms/djangoapps/bulk_email/migrations/0008_alter_target_target_type.py b/lms/djangoapps/bulk_email/migrations/0008_alter_target_target_type.py
new file mode 100644
index 00000000000..9856d659eae
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index 37d9a6276f4..d560ed339a5 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/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_STUDENTS = 'individual-students'
 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_STUDENTS],
+    ['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_STUDENTS:
+            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}")
 
diff --git a/lms/djangoapps/bulk_email/tasks.py b/lms/djangoapps/bulk_email/tasks.py
index 4d86edcc103..d35cdb2f51f 100644
--- a/lms/djangoapps/bulk_email/tasks.py
+++ b/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
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index eb0d6aa8a5a..7eaefec15c9 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -2701,7 +2701,7 @@ def send_email(request, course_id):
         log.warning(f"Email is not enabled for course {course_id}")
         return HttpResponseForbidden("Email is not enabled for this course.")
 
-    targets = json.loads(request.POST.get("send_to"))
+    targets = json.loads(request.POST.get("send_to")) + ["individual-students"]
     subject = request.POST.get("subject")
     message = request.POST.get("message")
     # optional, this is a date and time in the form of an ISO8601 string
diff --git a/lms/djangoapps/instructor_task/api.py b/lms/djangoapps/instructor_task/api.py
index bbf5bf7b287..9d89a9701ab 100644
--- a/lms/djangoapps/instructor_task/api.py
+++ b/lms/djangoapps/instructor_task/api.py
@@ -324,7 +324,7 @@ def submit_bulk_course_email(request, course_key, email_id, schedule=None):
 
     task_type = InstructorTaskTypes.BULK_COURSE_EMAIL
     task_class = send_bulk_course_email
-    task_input = {'email_id': email_id, 'to_option': targets}
+    task_input = {'email_id': email_id, 'to_option': targets, "emails": ["student@example.com"]}
     task_key_stub = str(email_id)
     # create the key value by using MD5 hash:
     task_key = hashlib.md5(task_key_stub.encode('utf-8')).hexdigest()

From 80fec1dd411641a0f9038b277812ab01e73f8340 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi <maria.grimaldi@edunext.co>
Date: Tue, 12 Sep 2023 09:38:14 -0400
Subject: [PATCH 02/28] refactor!: remove the hardcoded implementations

---
 lms/djangoapps/instructor/views/api.py | 5 +++--
 lms/djangoapps/instructor_task/api.py  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 7eaefec15c9..5e6ab9fb49f 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -2701,7 +2701,8 @@ def send_email(request, course_id):
         log.warning(f"Email is not enabled for course {course_id}")
         return HttpResponseForbidden("Email is not enabled for this course.")
 
-    targets = json.loads(request.POST.get("send_to")) + ["individual-students"]
+    targets = json.loads(request.POST.get("send_to"))
+    emails = json.loads(request.POST.get("emails", []))
     subject = request.POST.get("subject")
     message = request.POST.get("message")
     # optional, this is a date and time in the form of an ISO8601 string
@@ -2744,7 +2745,7 @@ def send_email(request, course_id):
         return HttpResponseBadRequest(repr(err))
 
     # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
-    task_api.submit_bulk_course_email(request, course_id, email.id, schedule_dt)
+    task_api.submit_bulk_course_email(request, course_id, email.id, schedule_dt, emails)
 
     response_payload = {
         'course_id': str(course_id),
diff --git a/lms/djangoapps/instructor_task/api.py b/lms/djangoapps/instructor_task/api.py
index 9d89a9701ab..07b381d33b2 100644
--- a/lms/djangoapps/instructor_task/api.py
+++ b/lms/djangoapps/instructor_task/api.py
@@ -299,7 +299,7 @@ def submit_delete_entrance_exam_state_for_student(request, usage_key, student):
     return submit_task(request, task_type, task_class, usage_key.course_key, task_input, task_key)
 
 
-def submit_bulk_course_email(request, course_key, email_id, schedule=None):
+def submit_bulk_course_email(request, course_key, email_id, schedule=None, emails=[]):
     """
     Request to have bulk email sent as a background task.
 
@@ -324,7 +324,7 @@ def submit_bulk_course_email(request, course_key, email_id, schedule=None):
 
     task_type = InstructorTaskTypes.BULK_COURSE_EMAIL
     task_class = send_bulk_course_email
-    task_input = {'email_id': email_id, 'to_option': targets, "emails": ["student@example.com"]}
+    task_input = {'email_id': email_id, 'to_option': targets, 'emails': emails}
     task_key_stub = str(email_id)
     # create the key value by using MD5 hash:
     task_key = hashlib.md5(task_key_stub.encode('utf-8')).hexdigest()

From 745fbc54142b97e1f98ece173408cc9597ff0958 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi <maria.grimaldi@edunext.co>
Date: Tue, 12 Sep 2023 15:22:53 -0400
Subject: [PATCH 03/28] refactor: costume changes according MFE implementation

---
 lms/djangoapps/bulk_email/data.py              |  4 ++--
 .../0009_alter_target_target_type.py           | 18 ++++++++++++++++++
 lms/djangoapps/bulk_email/models.py            |  6 +++---
 lms/djangoapps/instructor/views/api.py         |  2 +-
 4 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 lms/djangoapps/bulk_email/migrations/0009_alter_target_target_type.py

diff --git a/lms/djangoapps/bulk_email/data.py b/lms/djangoapps/bulk_email/data.py
index 6bc8cdb2742..99f97281f59 100644
--- a/lms/djangoapps/bulk_email/data.py
+++ b/lms/djangoapps/bulk_email/data.py
@@ -20,9 +20,9 @@ class BulkEmailTargetChoices:
     SEND_TO_LEARNERS = "learners"
     SEND_TO_COHORT = "cohort"
     SEND_TO_TRACK = "track"
-    SEND_TO_INDIVIDUAL_STUDENTS = "individual-students"
+    SEND_TO_INDIVIDUAL_LEARNERS = "individual-learners"
 
-    TARGET_CHOICES = (SEND_TO_MYSELF, SEND_TO_STAFF, SEND_TO_LEARNERS, SEND_TO_COHORT, SEND_TO_TRACK, SEND_TO_INDIVIDUAL_STUDENTS)
+    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):
diff --git a/lms/djangoapps/bulk_email/migrations/0009_alter_target_target_type.py b/lms/djangoapps/bulk_email/migrations/0009_alter_target_target_type.py
new file mode 100644
index 00000000000..8036eff320f
--- /dev/null
+++ b/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),
+        ),
+    ]
diff --git a/lms/djangoapps/bulk_email/models.py b/lms/djangoapps/bulk_email/models.py
index d560ed339a5..48e2634932c 100644
--- a/lms/djangoapps/bulk_email/models.py
+++ b/lms/djangoapps/bulk_email/models.py
@@ -55,9 +55,9 @@ class Meta:
 SEND_TO_LEARNERS = 'learners'
 SEND_TO_COHORT = 'cohort'
 SEND_TO_TRACK = 'track'
-SEND_TO_INDIVIDUAL_STUDENTS = 'individual-students'
+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, SEND_TO_INDIVIDUAL_STUDENTS],
+    [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}
@@ -149,7 +149,7 @@ def get_users(self, course_id, user_id=None, emails=None):
                     & enrollment_query
                 )
             )
-        elif self.target_type == SEND_TO_INDIVIDUAL_STUDENTS:
+        elif self.target_type == SEND_TO_INDIVIDUAL_LEARNERS:
             return use_read_replica_if_available(
                 User.objects.filter(
                     models.Q(email__in=emails)
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index 5e6ab9fb49f..36ec9110afe 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -2702,7 +2702,7 @@ def send_email(request, course_id):
         return HttpResponseForbidden("Email is not enabled for this course.")
 
     targets = json.loads(request.POST.get("send_to"))
-    emails = json.loads(request.POST.get("emails", []))
+    emails = json.loads(request.POST.get("individual_learners_emails", []))
     subject = request.POST.get("subject")
     message = request.POST.get("message")
     # optional, this is a date and time in the form of an ISO8601 string

From 8ae2d3fca53bf518bb97d1211257ebd24aeac66f Mon Sep 17 00:00:00 2001
From: Maria Grimaldi <maria.grimaldi@edunext.co>
Date: Tue, 19 Sep 2023 16:12:22 -0400
Subject: [PATCH 04/28] refactor: remove ora from base requirements

---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 27737d29504..4ad2e2dd989 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -778,7 +778,7 @@ openedx-filters==1.2.0
     #   lti-consumer-xblock
 optimizely-sdk==4.1.1
     # via -r requirements/edx/base.in
-ora2==5.0.0
+    # ora2==5.0.0
     # via -r requirements/edx/base.in
 oscrypto==1.3.0
     # via snowflake-connector-python
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 53d53ed50a7..3c1be15a66e 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1037,7 +1037,7 @@ openedx-filters==1.2.0
     #   lti-consumer-xblock
 optimizely-sdk==4.1.1
     # via -r requirements/edx/testing.txt
-ora2==5.0.0
+    # ora2==5.0.0
     # via -r requirements/edx/testing.txt
 oscrypto==1.3.0
     # via

From 1342f3a640de4e5fd21abb05ffbb1436ba50e8e1 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi <maria.grimaldi@edunext.co>
Date: Thu, 7 Sep 2023 10:02:56 -0400
Subject: [PATCH 05/28] feat: add instructor dashboard filter integration
 (#32448)

This PR adds a new filter to modify the instructor dashboard rendering process. For example: modify the section tabs of the instructor context --that specifies which tabs to render, adding a brand new one defined in a different plugin. The use case we're currently testing is to add a new tab to the instructor dashboard, which renders management information about an Xblock.

(cherry picked from commit 750ee003537099d0514b1135053b8c0649be5229)
---
 .../instructor/tests/test_filters.py          | 230 ++++++++++++++++++
 .../instructor/views/instructor_dashboard.py  |  22 +-
 2 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 lms/djangoapps/instructor/tests/test_filters.py

diff --git a/lms/djangoapps/instructor/tests/test_filters.py b/lms/djangoapps/instructor/tests/test_filters.py
new file mode 100644
index 00000000000..19948da1449
--- /dev/null
+++ b/lms/djangoapps/instructor/tests/test_filters.py
@@ -0,0 +1,230 @@
+"""
+Test that various filters are fired for models/views in the instructor app.
+"""
+import re
+from django.http import HttpResponse
+from django.test import override_settings
+from django.urls import reverse
+from openedx_filters import PipelineStep
+from openedx_filters.learning.filters import InstructorDashboardRenderStarted
+from rest_framework import status
+
+from common.djangoapps.student.tests.factories import AdminFactory, CourseAccessRoleFactory
+from openedx.core.djangolib.testing.utils import skip_unless_lms
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+
+
+class TestDashboardRenderPipelineStep(PipelineStep):
+    """
+    Pipeline step for testing the instructor dashboard rendering process.
+
+    This step is used to modify the dashboard data before it's rendered emptying
+    the sections list.
+    """
+
+    def run_filter(self, context, template_name):  # pylint: disable=arguments-differ
+        """Pipeline step that modifies dashboard data."""
+        context["sections"] = []
+        return {
+            "context": context,
+            "template_name": template_name,
+        }
+
+
+class TestRenderInvalidDashboard(PipelineStep):
+    """
+    Pipeline step for testing the instructor dashboard rendering process.
+
+    This step is used to modify the dashboard data before it's rendered by raising
+    an exception which will be caught by the instructor dashboard filter, rendering
+    a different template.
+    """
+
+    def run_filter(self, context, template_name):  # pylint: disable=arguments-differ
+        """Pipeline step that stops the dashboard render process."""
+        raise InstructorDashboardRenderStarted.RenderInvalidDashboard(
+            "You can't render this dashboard.",
+            instructor_template="static_templates/server-error.html"
+        )
+
+
+class TestRedirectDashboardPageStep(PipelineStep):
+    """
+    Pipeline step for testing the instructor dashboard rendering process.
+
+    This step is used to modify the dashboard data before it's rendered by raising
+    an exception which will be caught by the instructor dashboard filter and redirect
+    to a new page.
+    """
+
+    def run_filter(self, context, template_name):  # pylint: disable=arguments-differ
+        """Pipeline step that redirects before the dashboard is rendered."""
+        raise InstructorDashboardRenderStarted.RedirectToPage(
+            "You can't see this site's instructor dashboard, redirecting to the correct location.",
+            redirect_to="https://custom-dashboard.com",
+        )
+
+
+class TestRenderCustomResponse(PipelineStep):
+    """
+    Pipeline step for testing the instructor dashboard rendering process.
+
+    This step is used to modify the dashboard data before it's rendered by raising
+    an exception which will be caught by the instructor dashboard filter, returning
+    a custom response.
+    """
+
+    def run_filter(self, context, template_name):  # pylint: disable=arguments-differ
+        """Pipeline step that changes dashboard view response before the dashboard is rendered."""
+        response = HttpResponse("This is a custom response.")
+        raise InstructorDashboardRenderStarted.RenderCustomResponse(
+            "You can't see this site's dashboard.",
+            response=response,
+        )
+
+
+@skip_unless_lms
+class InstructorDashboardFiltersTest(ModuleStoreTestCase):
+    """
+    Tests for the Open edX Filters associated with the instructor dashboard rendering process.
+
+    This class guarantees that the following filters are triggered during the instructor dashboard rendering:
+    - InstructorDashboardRenderStarted
+    """
+
+    def setUp(self):  # pylint: disable=arguments-differ
+        """
+        Setup the test suite.
+        """
+        super().setUp()
+        self.instructor = AdminFactory.create()
+        self.client.login(username=self.instructor.username, password="test")
+        self.course = CourseFactory.create(
+            org="test1", course="course1", display_name="run1",
+        )
+        self.dashboard_url = reverse("instructor_dashboard", kwargs={"course_id": str(self.course.id)})
+        CourseAccessRoleFactory(
+            course_id=self.course.id,
+            user=self.instructor,
+            role="instructor",
+            org=self.course.id.org
+        )
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.instructor.dashboard.render.started.v1": {
+                "pipeline": [
+                    "lms.djangoapps.instructor.tests.test_filters.TestDashboardRenderPipelineStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_dashboard_render_filter_executed(self):
+        """
+        Test whether the instructor dashboard filter is triggered before the instructor's
+        dashboard rendering process.
+
+        Expected result:
+            - InstructorDashboardRenderStarted is triggered and executes TestDashboardRenderPipelineStep.
+            - The dashboard is rendered using the empty sections list.
+        """
+        response = self.client.get(self.dashboard_url)
+
+        matches = re.findall(
+            rb'<li class="nav-item"><button type="button" class="btn-link .*" data-section=".*">.*',
+            response.content
+        )
+
+        self.assertFalse(matches)
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.instructor.dashboard.render.started.v1": {
+                "pipeline": [
+                    "lms.djangoapps.instructor.tests.test_filters.TestRenderInvalidDashboard",
+                ],
+                "fail_silently": False,
+            },
+        },
+        PLATFORM_NAME="My site",
+    )
+    def test_dashboard_render_invalid(self):
+        """
+        Test rendering an invalid template after catching RenderInvalidDashboard exception.
+
+        Expected result:
+            - InstructorDashboardRenderStarted is triggered and executes TestRenderInvalidDashboard.
+            - The server error template is rendered instead of the usual dashboard.
+        """
+        response = self.client.get(self.dashboard_url)
+
+        self.assertContains(response, "There has been a 500 error on the <em>My site</em> servers")
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.instructor.dashboard.render.started.v1": {
+                "pipeline": [
+                    "lms.djangoapps.instructor.tests.test_filters.TestRedirectDashboardPageStep",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_dashboard_redirect(self):
+        """
+        Test redirecting to a new page after catching RedirectToPage exception.
+
+        Expected result:
+            - InstructorDashboardRenderStarted is triggered and executes TestRedirectDashboardPageStep.
+            - The view response is a redirection.
+            - The redirection url is the custom dashboard specified in the filter.
+        """
+        response = self.client.get(self.dashboard_url)
+
+        self.assertEqual(status.HTTP_302_FOUND, response.status_code)
+        self.assertEqual("https://custom-dashboard.com", response.url)
+
+    @override_settings(
+        OPEN_EDX_FILTERS_CONFIG={
+            "org.openedx.learning.instructor.dashboard.render.started.v1": {
+                "pipeline": [
+                    "lms.djangoapps.instructor.tests.test_filters.TestRenderCustomResponse",
+                ],
+                "fail_silently": False,
+            },
+        },
+    )
+    def test_dashboard_custom_response(self):
+        """
+        Test returning a custom response after catching RenderCustomResponse exception.
+
+        Expected result:
+            - InstructorDashboardRenderStarted is triggered and executes TestRenderCustomResponse.
+            - The view response contains the custom response text.
+        """
+        response = self.client.get(self.dashboard_url)
+
+        self.assertEqual("This is a custom response.", response.content.decode("utf-8"))
+
+    @override_settings(OPEN_EDX_FILTERS_CONFIG={})
+    def test_dashboard_render_without_filter_config(self):
+        """
+        Test whether the student dashboard filter is triggered before the user's
+        dashboard rendering process without any modification in the app flow.
+
+        Expected result:
+            - InstructorDashboardRenderStarted executes a noop (empty pipeline).
+            - The view response is HTTP_200_OK.
+            - There's no modification in the instructor dashboard regarding the sections list.
+        """
+        response = self.client.get(self.dashboard_url)
+
+        matches = re.findall(
+            rb'<li class="nav-item"><button type="button" class="btn-link .*" data-section=".*">.*',
+            response.content
+        )
+
+        self.assertEqual(status.HTTP_200_OK, response.status_code)
+        self.assertTrue(matches)
diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py
index 579b8d035f9..ff724b68ce8 100644
--- a/lms/djangoapps/instructor/views/instructor_dashboard.py
+++ b/lms/djangoapps/instructor/views/instructor_dashboard.py
@@ -12,7 +12,7 @@
 import pytz
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
-from django.http import Http404, HttpResponseServerError
+from django.http import Http404, HttpResponseRedirect, HttpResponseServerError
 from django.urls import reverse
 from django.utils.html import escape
 from django.utils.translation import gettext as _
@@ -27,6 +27,7 @@
 from opaque_keys.edx.keys import CourseKey
 from xblock.field_data import DictFieldData
 from xblock.fields import ScopeIds
+from openedx_filters.learning.filters import InstructorDashboardRenderStarted
 
 from common.djangoapps.course_modes.models import CourseMode, CourseModesArchive
 from common.djangoapps.edxmako.shortcuts import render_to_response
@@ -268,7 +269,24 @@ def instructor_dashboard_2(request, course_id):  # lint-amnesty, pylint: disable
 
     context.update(context_from_plugins)
 
-    return render_to_response('instructor/instructor_dashboard_2/instructor_dashboard_2.html', context)
+    instructor_template = 'instructor/instructor_dashboard_2/instructor_dashboard_2.html'
+
+    try:
+        # .. filter_implemented_name: InstructorDashboardRenderStarted
+        # .. filter_type: org.openedx.learning.instructor.dashboard.render.started.v1
+        context, instructor_template = InstructorDashboardRenderStarted.run_filter(
+            context=context, template_name=instructor_template,
+        )
+    except InstructorDashboardRenderStarted.RenderInvalidDashboard as exc:
+        response = render_to_response(exc.instructor_template, exc.template_context)
+    except InstructorDashboardRenderStarted.RedirectToPage as exc:
+        response = HttpResponseRedirect(exc.redirect_to)
+    except InstructorDashboardRenderStarted.RenderCustomResponse as exc:
+        response = exc.response
+    else:
+        response = render_to_response(instructor_template, context)
+
+    return response
 
 
 ## Section functions starting with _section return a dictionary of section data.

From 77536b62fed7bfd10d9abdacdb5c2f311f358a17 Mon Sep 17 00:00:00 2001
From: Maria Grimaldi <maria.grimaldi@edunext.co>
Date: Thu, 19 Oct 2023 09:33:00 -0400
Subject: [PATCH 06/28] fix: use correct version for openedx-filters

---
 requirements/edx/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 4ad2e2dd989..d1aa7a32468 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -772,7 +772,7 @@ openedx-events==7.0.0
     # via
     #   -r requirements/edx/base.in
     #   edx-event-bus-kafka
-openedx-filters==1.2.0
+openedx-filters==1.4.0
     # via
     #   -r requirements/edx/base.in
     #   lti-consumer-xblock

From 4d57bdcd421117263ef4d633e0a96c317ff342bd Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Mon, 2 Oct 2023 17:14:11 -0500
Subject: [PATCH 07/28] feat: emit signal for thread, response, and comment
 created event

---
 .../django_comment_client/base/views.py       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 54f8e493b52..19f646c3333 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -60,12 +60,21 @@
 from openedx.core.djangoapps.django_comment_common.utils import ThreadContext
 from openedx.core.lib.courses import get_course_by_id
 
+from openedx_events.learning.signals import FORUM_THREAD_CREATED, FORUM_THREAD_RESPONSE_CREATED, FORUM_RESPONSE_COMMENT_CREATED
+from openedx_events.learning.data import DiscussionThreadData, UserData, UserPersonalData
+
 log = logging.getLogger(__name__)
 
 TRACKING_MAX_FORUM_BODY = 2000
 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 +106,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)
 
+    SIGNAL = TRACKING_LOG_TO_EVENT_MAPS.get(event_name, None)
+    if SIGNAL is not None:
+        SIGNAL.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):
     """

From 8aea54c16c26b3b72a33f06845d4d0eac0ea8863 Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Mon, 9 Oct 2023 09:53:30 -0500
Subject: [PATCH 08/28] chore: reformat views file

---
 .../discussion/django_comment_client/base/views.py  | 13 ++++++++-----
 uwsgi.ini                                           |  0
 2 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100755 uwsgi.ini

diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 19f646c3333..0214db8e049 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/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,
@@ -60,9 +66,6 @@
 from openedx.core.djangoapps.django_comment_common.utils import ThreadContext
 from openedx.core.lib.courses import get_course_by_id
 
-from openedx_events.learning.signals import FORUM_THREAD_CREATED, FORUM_THREAD_RESPONSE_CREATED, FORUM_RESPONSE_COMMENT_CREATED
-from openedx_events.learning.data import DiscussionThreadData, UserData, UserPersonalData
-
 log = logging.getLogger(__name__)
 
 TRACKING_MAX_FORUM_BODY = 2000
diff --git a/uwsgi.ini b/uwsgi.ini
new file mode 100755
index 00000000000..e69de29bb2d

From dc3fbdb6a3921922e3da6c7e0a5e9136d91a9cb5 Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Mon, 9 Oct 2023 10:20:49 -0500
Subject: [PATCH 09/28] test: update query count for cs_comment_client

---
 lms/djangoapps/discussion/django_comment_client/base/tests.py | 2 +-
 uwsgi.ini                                                     | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100755 uwsgi.ini

diff --git a/lms/djangoapps/discussion/django_comment_client/base/tests.py b/lms/djangoapps/discussion/django_comment_client/base/tests.py
index bf346405ebf..4585de71b6d 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/tests.py
+++ b/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
diff --git a/uwsgi.ini b/uwsgi.ini
deleted file mode 100755
index e69de29bb2d..00000000000

From 3068812df8f7b685f3a19e001803570d6f394904 Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Thu, 19 Oct 2023 15:24:52 -0500
Subject: [PATCH 10/28] refactor: proper name for event variable

---
 .../discussion/django_comment_client/base/views.py          | 6 +++---
 uwsgi.ini                                                   | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100755 uwsgi.ini

diff --git a/lms/djangoapps/discussion/django_comment_client/base/views.py b/lms/djangoapps/discussion/django_comment_client/base/views.py
index 0214db8e049..5ce552a1b93 100644
--- a/lms/djangoapps/discussion/django_comment_client/base/views.py
+++ b/lms/djangoapps/discussion/django_comment_client/base/views.py
@@ -109,9 +109,9 @@ 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)
 
-    SIGNAL = TRACKING_LOG_TO_EVENT_MAPS.get(event_name, None)
-    if SIGNAL is not None:
-        SIGNAL.send_event(
+    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'),
diff --git a/uwsgi.ini b/uwsgi.ini
new file mode 100755
index 00000000000..e69de29bb2d

From 6147423881e2b176f45985ec05702e38b1aeac3e Mon Sep 17 00:00:00 2001
From: Fernando <fernando.gonzalez@edunext.co>
Date: Mon, 16 Oct 2023 16:26:20 -0400
Subject: [PATCH 11/28] feat: /api/ora_staff_grader/initialize upgraded

---
 lms/djangoapps/ora_staff_grader/serializers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py
index 76ca408f9d4..ecdeb7294e7 100644
--- a/lms/djangoapps/ora_staff_grader/serializers.py
+++ b/lms/djangoapps/ora_staff_grader/serializers.py
@@ -138,6 +138,8 @@ class SubmissionMetadataSerializer(serializers.Serializer):
 
     submissionUUID = serializers.CharField(source="submissionUuid")
     username = serializers.CharField(allow_null=True)
+    email = serializers.CharField(allow_null=True)
+    fullname = serializers.CharField(allow_null=True)
     teamName = serializers.CharField(allow_null=True)
     dateSubmitted = serializers.DateTimeField()
     dateGraded = serializers.DateTimeField(allow_null=True)
@@ -157,6 +159,8 @@ class Meta:
             "gradeStatus",
             "lockStatus",
             "score",
+            "email",
+            "fullname",
         ]
         read_only_fields = fields
 

From 48faf7c8abd67845878c766f016f9dad43f45a15 Mon Sep 17 00:00:00 2001
From: Fernando <fernando.gonzalez@edunext.co>
Date: Wed, 18 Oct 2023 17:47:39 -0400
Subject: [PATCH 12/28] feat: generate_assessment_data handler created

---
 lms/djangoapps/ora_staff_grader/constants.py  |  1 +
 lms/djangoapps/ora_staff_grader/ora_api.py    | 15 ++++++
 .../ora_staff_grader/serializers.py           | 53 +++++++++++++++++++
 lms/djangoapps/ora_staff_grader/urls.py       |  2 +
 lms/djangoapps/ora_staff_grader/views.py      | 46 ++++++++++++++++
 5 files changed, 117 insertions(+)

diff --git a/lms/djangoapps/ora_staff_grader/constants.py b/lms/djangoapps/ora_staff_grader/constants.py
index d1ef62287b6..1ff67d79d26 100644
--- a/lms/djangoapps/ora_staff_grader/constants.py
+++ b/lms/djangoapps/ora_staff_grader/constants.py
@@ -3,6 +3,7 @@
 # Query params
 PARAM_ORA_LOCATION = "oraLocation"
 PARAM_SUBMISSION_ID = "submissionUUID"
+PARAM_ASSESSMENT_TYPE = "assessmentType"
 
 # Error codes
 ERR_UNKNOWN = "ERR_UNKNOWN"
diff --git a/lms/djangoapps/ora_staff_grader/ora_api.py b/lms/djangoapps/ora_staff_grader/ora_api.py
index 852f1a707bc..fdf033b2522 100644
--- a/lms/djangoapps/ora_staff_grader/ora_api.py
+++ b/lms/djangoapps/ora_staff_grader/ora_api.py
@@ -33,6 +33,21 @@ def get_submissions(request, usage_id):
     return json.loads(response.content)
 
 
+def get_assessments_grades(request, usage_id, submission_uuid, assessment_type):
+    """
+    Get a list of assessments from the ORA's 'list_assessments_grades' XBlock.json_handler
+    """
+    handler_name = "list_assessments_grades"
+    body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_type": assessment_type}
+
+    response = call_xblock_json_handler(request, usage_id, handler_name, body)
+
+    if response.status_code != 200:
+        raise XBlockInternalError(context={"handler": handler_name})
+
+    return json.loads(response.content)
+
+
 def get_submission_info(request, usage_id, submission_uuid):
     """
     Get submission content from ORA 'get_submission_info' XBlock.json_handler
diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py
index ecdeb7294e7..fa728ae4e87 100644
--- a/lms/djangoapps/ora_staff_grader/serializers.py
+++ b/lms/djangoapps/ora_staff_grader/serializers.py
@@ -165,6 +165,49 @@ class Meta:
         read_only_fields = fields
 
 
+class AssessmentScoresMetadataSerializer(serializers.Serializer):
+    """
+    Assessment Score metadata for displaying assessment table in ESG
+    """
+    type = serializers.CharField()
+    score = serializers.IntegerField()
+    score_type = serializers.CharField()
+
+    class Meta:
+        fields = [
+            "type",
+            "score",
+            "score_type",
+        ]
+        read_only_fields = fields
+
+
+class AssessmentMetadataSerializer(serializers.Serializer):
+    """
+    Assessment metadata for displaying assessment table in ESG
+    """
+    idAssessment = serializers.CharField()
+    grader_name = serializers.CharField(allow_null=True)
+    grader_username = serializers.CharField(allow_null=True)
+    grader_email = serializers.CharField(allow_null=True)
+    assesmentDate = serializers.DateTimeField()
+    assesmentScores = serializers.ListField(child=AssessmentScoresMetadataSerializer())
+    problemStep = serializers.CharField(allow_null=True)
+    feedback = serializers.CharField(allow_null=True)
+
+    class Meta:
+        fields = [
+            "idAssessment",
+            "grader_name",
+            "grader_username",
+            "grader_email",
+            "assesmentDate",
+            "assesmentScores",
+            "problemStep",
+            "feedback",
+        ]
+        read_only_fields = fields
+
 class InitializeSerializer(serializers.Serializer):
     """
     Serialize info for the initialize call. Packages ORA, course, submission, and rubric data.
@@ -191,6 +234,16 @@ def get_isEnabled(self, obj):
         """
         return obj['isEnabled'] and not obj['oraMetadata'].teams_enabled
 
+class FeedbackSerializer(serializers.Serializer):
+    """
+    Serialize info for the initialize call. Packages ORA, course, submission, and rubric data.
+    """
+
+    assessments = serializers.ListField(child=AssessmentMetadataSerializer())
+
+    class Meta:
+        fields = ["assessments",]
+        read_only_fields = fields
 
 class UploadedFileSerializer(serializers.Serializer):
     """Serializer for a file uploaded as a part of a response"""
diff --git a/lms/djangoapps/ora_staff_grader/urls.py b/lms/djangoapps/ora_staff_grader/urls.py
index f4b0a39b19c..628c56a5442 100644
--- a/lms/djangoapps/ora_staff_grader/urls.py
+++ b/lms/djangoapps/ora_staff_grader/urls.py
@@ -13,6 +13,7 @@
     SubmissionLockView,
     SubmissionStatusFetchView,
     UpdateGradeView,
+    FeedbackListView,
 )
 
 
@@ -22,6 +23,7 @@
 urlpatterns += [
     path("mock/", include("lms.djangoapps.ora_staff_grader.mock.urls")),
     path("initialize", InitializeView.as_view(), name="initialize"),
+    path("feedbacklist", FeedbackListView.as_view(), name="feedbacklist"),
     path("submission/batch/unlock", SubmissionBatchUnlockView.as_view(), name="batch-unlock"),
     path("submission/files", SubmissionFilesFetchView.as_view(), name="fetch-files"),
     path(
diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index c68bb65a306..f006db30a3b 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -24,6 +24,7 @@
 from lms.djangoapps.ora_staff_grader.constants import (
     PARAM_ORA_LOCATION,
     PARAM_SUBMISSION_ID,
+    PARAM_ASSESSMENT_TYPE,
 )
 from lms.djangoapps.ora_staff_grader.errors import (
     BadOraLocationResponse,
@@ -43,11 +44,13 @@
     get_assessment_info,
     get_submission_info,
     get_submissions,
+    get_assessments_grades,
     submit_grade,
 )
 from lms.djangoapps.ora_staff_grader.serializers import (
     FileListSerializer,
     InitializeSerializer,
+    FeedbackSerializer,
     LockStatusSerializer,
     StaffAssessSerializer,
     SubmissionFetchSerializer,
@@ -147,6 +150,49 @@ def get(self, request, ora_location, *args, **kwargs):
             return UnknownErrorResponse()
 
 
+class FeedbackListView(StaffGraderBaseView):
+    """
+    GET course metadata
+
+    Response: {
+        courseMetadata
+        oraMetadata
+        submissions
+        isEnabled
+    }
+
+    Errors:
+    - MissingParamResponse (HTTP 400) for missing params
+    - BadOraLocationResponse (HTTP 400) for bad ORA location
+    - XBlockInternalError (HTTP 500) for an issue with ORA
+    - UnknownError (HTTP 500) for other errors
+    """
+
+    @require_params([PARAM_ORA_LOCATION, PARAM_SUBMISSION_ID, PARAM_ASSESSMENT_TYPE])
+    def get(self, request, ora_location, submission_uuid, assessment_type=None, *args, **kwargs):
+
+        try:
+            init_data = {}
+
+            # Get list of submissions for this ORA
+            init_data["assessments"] = get_assessments_grades(request, ora_location, submission_uuid, assessment_type)
+            #init_data["assessments"] = TEST
+
+            response_data = FeedbackSerializer(init_data).data
+            log.info(response_data)
+            return Response(response_data)
+
+        # Issues with the XBlock handlers
+        except XBlockInternalError as ex:
+            log.error(ex)
+            return InternalErrorResponse(context=ex.context)
+
+        # Blanket exception handling in case something blows up
+        except Exception as ex:
+            log.exception(ex)
+            return UnknownErrorResponse()
+
+
 class SubmissionFetchView(StaffGraderBaseView):
     """
     GET submission contents and assessment info, if any

From 76276662641cc4623311abb825536a0fe57bc435 Mon Sep 17 00:00:00 2001
From: Fernando <fernando.gonzalez@edunext.co>
Date: Fri, 20 Oct 2023 14:34:12 -0400
Subject: [PATCH 13/28] fix: style and functions rename

---
 lms/djangoapps/ora_staff_grader/ora_api.py    |  4 +-
 .../ora_staff_grader/serializers.py           | 50 +++++++++----------
 lms/djangoapps/ora_staff_grader/urls.py       |  4 +-
 lms/djangoapps/ora_staff_grader/views.py      | 13 +++--
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/lms/djangoapps/ora_staff_grader/ora_api.py b/lms/djangoapps/ora_staff_grader/ora_api.py
index fdf033b2522..1e54e9ccc72 100644
--- a/lms/djangoapps/ora_staff_grader/ora_api.py
+++ b/lms/djangoapps/ora_staff_grader/ora_api.py
@@ -33,11 +33,11 @@ def get_submissions(request, usage_id):
     return json.loads(response.content)
 
 
-def get_assessments_grades(request, usage_id, submission_uuid, assessment_type):
+def get_assessments(request, usage_id, submission_uuid, assessment_type):
     """
     Get a list of assessments from the ORA's 'list_assessments_grades' XBlock.json_handler
     """
-    handler_name = "list_assessments_grades"
+    handler_name = "list_assessments"
     body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_type": assessment_type}
 
     response = call_xblock_json_handler(request, usage_id, handler_name, body)
diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py
index fa728ae4e87..40ecfe44c04 100644
--- a/lms/djangoapps/ora_staff_grader/serializers.py
+++ b/lms/djangoapps/ora_staff_grader/serializers.py
@@ -133,7 +133,7 @@ class ScoreSerializer(serializers.Serializer):
 
 class SubmissionMetadataSerializer(serializers.Serializer):
     """
-    Submission metadata for displaying submissions table in ESG
+    Submission metadata for displaying submissions table in Enhanced Staff Grader (ESG)
     """
 
     submissionUUID = serializers.CharField(source="submissionUuid")
@@ -165,45 +165,45 @@ class Meta:
         read_only_fields = fields
 
 
-class AssessmentScoresMetadataSerializer(serializers.Serializer):
+class AssessmentScoresSerializer(serializers.Serializer):
     """
-    Assessment Score metadata for displaying assessment table in ESG
+    Assessment Score for displaying assessment table in Enhanced Staff Grader (ESG)
     """
-    type = serializers.CharField()
-    score = serializers.IntegerField()
+    criterion_name = serializers.CharField()
+    score_earned = serializers.IntegerField()
     score_type = serializers.CharField()
 
     class Meta:
         fields = [
-            "type",
-            "score",
+            "criterion_name",
+            "score_earned",
             "score_type",
         ]
         read_only_fields = fields
 
 
-class AssessmentMetadataSerializer(serializers.Serializer):
+class AssessmentSerializer(serializers.Serializer):
     """
-    Assessment metadata for displaying assessment table in ESG
+    Assessment metadata for displaying assessment table in Enhanced Staff Grader (ESG)
     """
-    idAssessment = serializers.CharField()
-    grader_name = serializers.CharField(allow_null=True)
-    grader_username = serializers.CharField(allow_null=True)
-    grader_email = serializers.CharField(allow_null=True)
-    assesmentDate = serializers.DateTimeField()
-    assesmentScores = serializers.ListField(child=AssessmentScoresMetadataSerializer())
-    problemStep = serializers.CharField(allow_null=True)
+    id_assessment = serializers.CharField()
+    scorer_name = serializers.CharField(allow_null=True)
+    scorer_username = serializers.CharField(allow_null=True)
+    scorer_email = serializers.CharField(allow_null=True)
+    assesment_date = serializers.DateTimeField()
+    assesment_scores = serializers.ListField(child=AssessmentScoresSerializer())
+    problem_step = serializers.CharField(allow_null=True)
     feedback = serializers.CharField(allow_null=True)
 
     class Meta:
         fields = [
-            "idAssessment",
-            "grader_name",
-            "grader_username",
-            "grader_email",
-            "assesmentDate",
-            "assesmentScores",
-            "problemStep",
+            "id_assessment",
+            "scorer_name",
+            "scorer_username",
+            "scorer_email",
+            "assesment_date",
+            "assesment_scores",
+            "problem_step",
             "feedback",
         ]
         read_only_fields = fields
@@ -234,12 +234,12 @@ def get_isEnabled(self, obj):
         """
         return obj['isEnabled'] and not obj['oraMetadata'].teams_enabled
 
-class FeedbackSerializer(serializers.Serializer):
+class AssessmentFeedbackSerializer(serializers.Serializer):
     """
     Serialize info for the initialize call. Packages ORA, course, submission, and rubric data.
     """
 
-    assessments = serializers.ListField(child=AssessmentMetadataSerializer())
+    assessments = serializers.ListField(child=AssessmentSerializer())
 
     class Meta:
         fields = ["assessments",]
diff --git a/lms/djangoapps/ora_staff_grader/urls.py b/lms/djangoapps/ora_staff_grader/urls.py
index 628c56a5442..36e8e7a4e19 100644
--- a/lms/djangoapps/ora_staff_grader/urls.py
+++ b/lms/djangoapps/ora_staff_grader/urls.py
@@ -13,7 +13,7 @@
     SubmissionLockView,
     SubmissionStatusFetchView,
     UpdateGradeView,
-    FeedbackListView,
+    AssessmentFeedbackView,
 )
 
 
@@ -23,7 +23,7 @@
 urlpatterns += [
     path("mock/", include("lms.djangoapps.ora_staff_grader.mock.urls")),
     path("initialize", InitializeView.as_view(), name="initialize"),
-    path("feedbacklist", FeedbackListView.as_view(), name="feedbacklist"),
+    path("assessments/feedback", AssessmentFeedbackView.as_view(), name="assessment-feedback"),
     path("submission/batch/unlock", SubmissionBatchUnlockView.as_view(), name="batch-unlock"),
     path("submission/files", SubmissionFilesFetchView.as_view(), name="fetch-files"),
     path(
diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index f006db30a3b..e826cacd327 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -44,13 +44,13 @@
     get_assessment_info,
     get_submission_info,
     get_submissions,
-    get_assessments_grades,
+    get_assessments,
     submit_grade,
 )
 from lms.djangoapps.ora_staff_grader.serializers import (
     FileListSerializer,
     InitializeSerializer,
-    FeedbackSerializer,
+    AssessmentFeedbackSerializer,
     LockStatusSerializer,
     StaffAssessSerializer,
     SubmissionFetchSerializer,
@@ -150,7 +150,7 @@ def get(self, request, ora_location, *args, **kwargs):
             return UnknownErrorResponse()
 
 
-class FeedbackListView(StaffGraderBaseView):
+class AssessmentFeedbackView(StaffGraderBaseView):
     """
     GET course metadata
 
@@ -172,13 +172,12 @@ class FeedbackListView(StaffGraderBaseView):
     def get(self, request, ora_location, submission_uuid, assessment_type=None, *args, **kwargs):
 
         try:
-            init_data = {}
+            assessments_data = {}
 
             # Get list of submissions for this ORA
-            init_data["assessments"] = get_assessments_grades(request, ora_location, submission_uuid, assessment_type)
-            #init_data["assessments"] = TEST
+            assessments_data["assessments"] = get_assessments(request, ora_location, submission_uuid, assessment_type)
 
-            response_data = FeedbackSerializer(init_data).data
+            response_data = AssessmentFeedbackSerializer(assessments_data).data
             log.info(response_data)
             return Response(response_data)
 

From 79523de589402058c329f60b95ff0bf8184e0543 Mon Sep 17 00:00:00 2001
From: Fernando <fernando.gonzalez@edunext.co>
Date: Mon, 23 Oct 2023 14:07:14 -0400
Subject: [PATCH 14/28] fix: test submission metadata serializers upgraded

---
 .../ora_staff_grader/tests/test_serializers.py         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lms/djangoapps/ora_staff_grader/tests/test_serializers.py b/lms/djangoapps/ora_staff_grader/tests/test_serializers.py
index 13107926f2f..1bd71131e5a 100644
--- a/lms/djangoapps/ora_staff_grader/tests/test_serializers.py
+++ b/lms/djangoapps/ora_staff_grader/tests/test_serializers.py
@@ -239,6 +239,8 @@ class TestSubmissionMetadataSerializer(TestCase):
             "submissionUuid": "a",
             "username": "foo",
             "teamName": "",
+            'email': None,
+            'fullname': None,
             "dateSubmitted": "1969-07-16 13:32:00",
             "dateGraded": "None",
             "gradedBy": "",
@@ -249,6 +251,8 @@ class TestSubmissionMetadataSerializer(TestCase):
         "b": {
             "submissionUuid": "b",
             "username": "",
+            'email': None,
+            'fullname': None,
             "teamName": "bar",
             "dateSubmitted": "1969-07-20 20:17:40",
             "dateGraded": "None",
@@ -260,6 +264,8 @@ class TestSubmissionMetadataSerializer(TestCase):
         "c": {
             "submissionUuid": "c",
             "username": "baz",
+            'email': None,
+            'fullname': None,
             "teamName": "",
             "dateSubmitted": "1969-07-21 21:35:00",
             "dateGraded": "1969-07-24 16:44:00",
@@ -291,6 +297,8 @@ def test_empty_score(self):
         submission = {
             "submissionUuid": "empty-score",
             "username": "WOPR",
+            'email': None,
+            'fullname': None,
             "dateSubmitted": "1983-06-03 00:00:00",
             "dateGraded": None,
             "gradedBy": None,
@@ -302,6 +310,8 @@ def test_empty_score(self):
         expected_output = {
             "submissionUUID": "empty-score",
             "username": "WOPR",
+            'email': None,
+            'fullname': None,
             "teamName": None,
             "dateSubmitted": "1983-06-03 00:00:00",
             "dateGraded": None,

From 7cf7b4742ee9d868c3abb77d6445918a6db26891 Mon Sep 17 00:00:00 2001
From: Fernando <fernando.gonzalez@edunext.co>
Date: Tue, 24 Oct 2023 23:04:54 -0400
Subject: [PATCH 15/28] fix: style and some test and docs improvements

---
 lms/djangoapps/ora_staff_grader/constants.py  |  2 +-
 lms/djangoapps/ora_staff_grader/ora_api.py    |  7 +++---
 .../ora_staff_grader/serializers.py           | 12 +++++-----
 .../tests/test_serializers.py                 | 20 ++++++++---------
 lms/djangoapps/ora_staff_grader/views.py      | 22 +++++++++----------
 5 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/lms/djangoapps/ora_staff_grader/constants.py b/lms/djangoapps/ora_staff_grader/constants.py
index 1ff67d79d26..d57f5254010 100644
--- a/lms/djangoapps/ora_staff_grader/constants.py
+++ b/lms/djangoapps/ora_staff_grader/constants.py
@@ -3,7 +3,7 @@
 # Query params
 PARAM_ORA_LOCATION = "oraLocation"
 PARAM_SUBMISSION_ID = "submissionUUID"
-PARAM_ASSESSMENT_TYPE = "assessmentType"
+PARAM_ASSESSMENT_FILTER = "assessmentFilter"
 
 # Error codes
 ERR_UNKNOWN = "ERR_UNKNOWN"
diff --git a/lms/djangoapps/ora_staff_grader/ora_api.py b/lms/djangoapps/ora_staff_grader/ora_api.py
index 1e54e9ccc72..c97ea4819d4 100644
--- a/lms/djangoapps/ora_staff_grader/ora_api.py
+++ b/lms/djangoapps/ora_staff_grader/ora_api.py
@@ -12,6 +12,7 @@
 These are checked (usually by checking for a {"success":false} response) and raise errors, possibly with extra context.
 """
 import json
+from http import HTTPStatus
 from lms.djangoapps.ora_staff_grader.errors import (
     LockContestedError,
     XBlockInternalError,
@@ -33,12 +34,12 @@ def get_submissions(request, usage_id):
     return json.loads(response.content)
 
 
-def get_assessments(request, usage_id, submission_uuid, assessment_type):
+def get_assessments(request, usage_id, submission_uuid, assessment_filter):
     """
     Get a list of assessments from the ORA's 'list_assessments_grades' XBlock.json_handler
     """
     handler_name = "list_assessments"
-    body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_type": assessment_type}
+    body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_filter": assessment_filter}
 
     response = call_xblock_json_handler(request, usage_id, handler_name, body)
 
@@ -183,5 +184,5 @@ def batch_delete_submission_locks(request, usage_id, submission_uuids):
     response = call_xblock_json_handler(request, usage_id, handler_name, body)
 
     # Errors should raise a blanket exception. Otherwise body is empty, 200 is implicit success
-    if response.status_code != 200:
+    if response.status_code != HTTPStatus.OK:
         raise XBlockInternalError(context={"handler": handler_name})
diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py
index 40ecfe44c04..d4057ff1a8f 100644
--- a/lms/djangoapps/ora_staff_grader/serializers.py
+++ b/lms/djangoapps/ora_staff_grader/serializers.py
@@ -167,7 +167,9 @@ class Meta:
 
 class AssessmentScoresSerializer(serializers.Serializer):
     """
-    Assessment Score for displaying assessment table in Enhanced Staff Grader (ESG)
+    Score information associated with a specific assessment.
+
+    This serializer was intended for displaying assessment information in the Enhanced Staff Grader (ESG).
     """
     criterion_name = serializers.CharField()
     score_earned = serializers.IntegerField()
@@ -184,9 +186,9 @@ class Meta:
 
 class AssessmentSerializer(serializers.Serializer):
     """
-    Assessment metadata for displaying assessment table in Enhanced Staff Grader (ESG)
+    Data for displaying Assessment objects in a table in Enhanced Staff Grader (ESG)
     """
-    id_assessment = serializers.CharField()
+    assessment_id = serializers.CharField()
     scorer_name = serializers.CharField(allow_null=True)
     scorer_username = serializers.CharField(allow_null=True)
     scorer_email = serializers.CharField(allow_null=True)
@@ -197,7 +199,7 @@ class AssessmentSerializer(serializers.Serializer):
 
     class Meta:
         fields = [
-            "id_assessment",
+            "assessment_id",
             "scorer_name",
             "scorer_username",
             "scorer_email",
@@ -236,7 +238,7 @@ def get_isEnabled(self, obj):
 
 class AssessmentFeedbackSerializer(serializers.Serializer):
     """
-    Serialize info for the initialize call. Packages ORA, course, submission, and rubric data.
+    Serialize info for every assessment for a table in Enhanced Staff Grader (ESG)
     """
 
     assessments = serializers.ListField(child=AssessmentSerializer())
diff --git a/lms/djangoapps/ora_staff_grader/tests/test_serializers.py b/lms/djangoapps/ora_staff_grader/tests/test_serializers.py
index 1bd71131e5a..316812a0b02 100644
--- a/lms/djangoapps/ora_staff_grader/tests/test_serializers.py
+++ b/lms/djangoapps/ora_staff_grader/tests/test_serializers.py
@@ -239,8 +239,8 @@ class TestSubmissionMetadataSerializer(TestCase):
             "submissionUuid": "a",
             "username": "foo",
             "teamName": "",
-            'email': None,
-            'fullname': None,
+            'email': "jondoes@example.com",
+            'fullname': "",
             "dateSubmitted": "1969-07-16 13:32:00",
             "dateGraded": "None",
             "gradedBy": "",
@@ -251,8 +251,8 @@ class TestSubmissionMetadataSerializer(TestCase):
         "b": {
             "submissionUuid": "b",
             "username": "",
-            'email': None,
-            'fullname': None,
+            'email': "jondoes@example.com",
+            'fullname': "Jhon Does",
             "teamName": "bar",
             "dateSubmitted": "1969-07-20 20:17:40",
             "dateGraded": "None",
@@ -264,8 +264,8 @@ class TestSubmissionMetadataSerializer(TestCase):
         "c": {
             "submissionUuid": "c",
             "username": "baz",
-            'email': None,
-            'fullname': None,
+            'email': "jondoes@example.com",
+            'fullname': "Jhon Does",
             "teamName": "",
             "dateSubmitted": "1969-07-21 21:35:00",
             "dateGraded": "1969-07-24 16:44:00",
@@ -297,8 +297,8 @@ def test_empty_score(self):
         submission = {
             "submissionUuid": "empty-score",
             "username": "WOPR",
-            'email': None,
-            'fullname': None,
+            'email': "jhondoes@example.com",
+            'fullname': "",
             "dateSubmitted": "1983-06-03 00:00:00",
             "dateGraded": None,
             "gradedBy": None,
@@ -310,8 +310,8 @@ def test_empty_score(self):
         expected_output = {
             "submissionUUID": "empty-score",
             "username": "WOPR",
-            'email': None,
-            'fullname': None,
+            'email': "jhondoes@example.com",
+            'fullname': "",
             "teamName": None,
             "dateSubmitted": "1983-06-03 00:00:00",
             "dateGraded": None,
diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index e826cacd327..6a0355b99a0 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -24,7 +24,7 @@
 from lms.djangoapps.ora_staff_grader.constants import (
     PARAM_ORA_LOCATION,
     PARAM_SUBMISSION_ID,
-    PARAM_ASSESSMENT_TYPE,
+    PARAM_ASSESSMENT_FILTER,
 )
 from lms.djangoapps.ora_staff_grader.errors import (
     BadOraLocationResponse,
@@ -152,13 +152,10 @@ def get(self, request, ora_location, *args, **kwargs):
 
 class AssessmentFeedbackView(StaffGraderBaseView):
     """
-    GET course metadata
+    GET data about Assessments by submission_uuid and ora_location
 
     Response: {
-        courseMetadata
-        oraMetadata
-        submissions
-        isEnabled
+        assessments
     }
 
     Errors:
@@ -168,19 +165,22 @@ class AssessmentFeedbackView(StaffGraderBaseView):
     - UnknownError (HTTP 500) for other errors
     """
 
-    @require_params([PARAM_ORA_LOCATION, PARAM_SUBMISSION_ID, PARAM_ASSESSMENT_TYPE])
-    def get(self, request, ora_location, submission_uuid, assessment_type=None, *args, **kwargs):
+    @require_params([PARAM_ORA_LOCATION, PARAM_SUBMISSION_ID, PARAM_ASSESSMENT_FILTER])
+    def get(self, request, ora_location, submission_uuid, assessment_filter=None, *args, **kwargs):
 
         try:
             assessments_data = {}
 
-            # Get list of submissions for this ORA
-            assessments_data["assessments"] = get_assessments(request, ora_location, submission_uuid, assessment_type)
+            assessments_data["assessments"] = get_assessments(request, ora_location, submission_uuid, assessment_filter)
 
             response_data = AssessmentFeedbackSerializer(assessments_data).data
-            log.info(response_data)
             return Response(response_data)
 
+        # Catch bad ORA location
+        except (InvalidKeyError, ItemNotFoundError):
+            log.error(f"Bad ORA location provided: {ora_location}")
+            return BadOraLocationResponse()
+
         # Issues with the XBlock handlers
         except XBlockInternalError as ex:
             log.error(ex)

From daf345a504ee50e0df427a8e30b81da5bb17f29f Mon Sep 17 00:00:00 2001
From: Fernando <fernando.gonzalez@edunext.co>
Date: Thu, 26 Oct 2023 10:31:39 -0400
Subject: [PATCH 16/28] fix: HTTPStatus conditional

---
 lms/djangoapps/ora_staff_grader/ora_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/ora_staff_grader/ora_api.py b/lms/djangoapps/ora_staff_grader/ora_api.py
index c97ea4819d4..408c097936f 100644
--- a/lms/djangoapps/ora_staff_grader/ora_api.py
+++ b/lms/djangoapps/ora_staff_grader/ora_api.py
@@ -43,7 +43,7 @@ def get_assessments(request, usage_id, submission_uuid, assessment_filter):
 
     response = call_xblock_json_handler(request, usage_id, handler_name, body)
 
-    if response.status_code != 200:
+    if response.status_code != HTTPStatus.OK:
         raise XBlockInternalError(context={"handler": handler_name})
 
     return json.loads(response.content)

From 70bb852b5e9d382fb2e8ff4762fbe7a6ffd64b64 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Wed, 1 Nov 2023 12:09:24 -0500
Subject: [PATCH 17/28] chore: update assessment_filter argument and update
 docstring

---
 lms/djangoapps/ora_staff_grader/views.py | 29 ++++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index 6a0355b99a0..2971d91b9d8 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -155,7 +155,24 @@ class AssessmentFeedbackView(StaffGraderBaseView):
     GET data about Assessments by submission_uuid and ora_location
 
     Response: {
-        assessments
+        assessments (list of dict): [
+            {
+                "assessment_id: (string) assessment id
+                "scorer_name: (string) scorer name
+                "scorer_username: (string) scorer username
+                "scorer_email: (string) scorer email
+                "assessment_date: (string) assessment date
+                "assessment_scores (list of dict) [
+                    {
+                        "criterion_name: (string) criterion name
+                        "score_earned: (int) score earned
+                        "score_type: (string) score type
+                    }
+                ]
+                "problem_step (string) problem step (Self, Peer, or Staff)
+                "feedback: (string) feedback
+            }
+        ]
     }
 
     Errors:
@@ -166,12 +183,14 @@ class AssessmentFeedbackView(StaffGraderBaseView):
     """
 
     @require_params([PARAM_ORA_LOCATION, PARAM_SUBMISSION_ID, PARAM_ASSESSMENT_FILTER])
-    def get(self, request, ora_location, submission_uuid, assessment_filter=None, *args, **kwargs):
+    def get(self, request, ora_location, submission_uuid, assessment_filter, *args, **kwargs):
 
         try:
-            assessments_data = {}
-
-            assessments_data["assessments"] = get_assessments(request, ora_location, submission_uuid, assessment_filter)
+            assessments_data = {
+                "assessments": get_assessments(
+                    request, ora_location, submission_uuid, assessment_filter
+                )
+            }
 
             response_data = AssessmentFeedbackSerializer(assessments_data).data
             return Response(response_data)

From ebc9642cb481a8639f7a8c6f9d666ff291525c16 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Tue, 7 Nov 2023 17:01:19 -0500
Subject: [PATCH 18/28] chore: fix quality errors

---
 lms/djangoapps/ora_staff_grader/serializers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py
index d4057ff1a8f..7528e0509d9 100644
--- a/lms/djangoapps/ora_staff_grader/serializers.py
+++ b/lms/djangoapps/ora_staff_grader/serializers.py
@@ -210,6 +210,7 @@ class Meta:
         ]
         read_only_fields = fields
 
+
 class InitializeSerializer(serializers.Serializer):
     """
     Serialize info for the initialize call. Packages ORA, course, submission, and rubric data.
@@ -236,6 +237,7 @@ def get_isEnabled(self, obj):
         """
         return obj['isEnabled'] and not obj['oraMetadata'].teams_enabled
 
+
 class AssessmentFeedbackSerializer(serializers.Serializer):
     """
     Serialize info for every assessment for a table in Enhanced Staff Grader (ESG)
@@ -244,9 +246,10 @@ class AssessmentFeedbackSerializer(serializers.Serializer):
     assessments = serializers.ListField(child=AssessmentSerializer())
 
     class Meta:
-        fields = ["assessments",]
+        fields = ["assessments", ]
         read_only_fields = fields
 
+
 class UploadedFileSerializer(serializers.Serializer):
     """Serializer for a file uploaded as a part of a response"""
 

From 92caa0bfe745024a5307e2e52b320143bb4125e1 Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Wed, 8 Nov 2023 11:30:53 -0500
Subject: [PATCH 19/28] fix: allow leave open managed teams

(cherry picked from commit daf4a5d9be54bbdff326a753d5be4f10e0578000)
---
 lms/djangoapps/teams/static/teams/js/views/team_profile.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/teams/static/teams/js/views/team_profile.js b/lms/djangoapps/teams/static/teams/js/views/team_profile.js
index 9d981020729..89184cc6134 100644
--- a/lms/djangoapps/teams/static/teams/js/views/team_profile.js
+++ b/lms/djangoapps/teams/static/teams/js/views/team_profile.js
@@ -42,14 +42,14 @@
                     discussionTopicID = this.model.get('discussion_topic_id'),
                     isMember = TeamUtils.isUserMemberOfTeam(memberships, this.context.userInfo.username),
                     isAdminOrStaff = this.context.userInfo.privileged || this.context.userInfo.staff,
-                    isInstructorManagedTopic = TeamUtils.isInstructorManagedTopic(this.topic.attributes.type),
+                    canJoinTeam = TeamUtils.canJoinTeam(this.context.userInfo, this.topic.attributes.type),
                     maxTeamSize = this.topic.getMaxTeamSize(this.context.courseMaxTeamSize);
 
                 // Assignments URL isn't provided if team assignments shouldn't be shown
                 // so we can treat it like a toggle
                 var showAssignments = !!this.context.teamsAssignmentsUrl;
 
-                var showLeaveLink = isMember && (isAdminOrStaff || !isInstructorManagedTopic);
+                var showLeaveLink = isMember && (isAdminOrStaff || canJoinTeam);
 
                 HtmlUtils.setHtml(
                     this.$el,

From e7a8156969aaf2cd60329d50976d2f13b34162f0 Mon Sep 17 00:00:00 2001
From: Cristhian Garcia <crisgarta8@gmail.com>
Date: Tue, 7 Nov 2023 12:50:02 -0500
Subject: [PATCH 20/28] feat: add open_managed team type

(cherry picked from commit a259fc7f2c80327be62fa5c9a675905a508ece44)
---
 cms/djangoapps/models/settings/course_metadata.py         | 2 +-
 .../static/teams/js/views/team_profile_header_actions.js  | 8 ++++++--
 lms/djangoapps/teams/static/teams/js/views/team_utils.js  | 7 +++++++
 lms/djangoapps/teams/views.py                             | 5 ++++-
 openedx/core/lib/teams_config.py                          | 1 +
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py
index c072a4ae552..c817061f3e0 100644
--- a/cms/djangoapps/models/settings/course_metadata.py
+++ b/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:
diff --git a/lms/djangoapps/teams/static/teams/js/views/team_profile_header_actions.js b/lms/djangoapps/teams/static/teams/js/views/team_profile_header_actions.js
index 9451ba20639..75fc8ad92db 100644
--- a/lms/djangoapps/teams/static/teams/js/views/team_profile_header_actions.js
+++ b/lms/djangoapps/teams/static/teams/js/views/team_profile_header_actions.js
@@ -47,6 +47,8 @@
                         } else if (!teamHasSpace) {
                             showJoinButton = false;
                             message = view.teamFullMessage;
+                        } else if (info.canJoinTeam) {
+                            showJoinButton = true;
                         } else if (!info.isAdminOrStaff && info.isInstructorManagedTopic) {
                             showJoinButton = false;
                             message = view.notJoinInstructorManagedTeam;
@@ -100,12 +102,14 @@
                 // this.topic.getMaxTeamSize() will return null for a managed team,
                 // but the size is considered to be arbitarily large.
                 var isInstructorManagedTopic = TeamUtils.isInstructorManagedTopic(this.topic.attributes.type);
-                var teamHasSpace = isInstructorManagedTopic ||
-                        (this.model.get('membership').length < this.topic.getMaxTeamSize(courseMaxTeamSize));
+                var canJoinTeam = TeamUtils.canJoinTeam(this.context.userInfo, this.topic.attributes.type)
+                var teamHasSpace = isInstructorManagedTopic
+                        || (this.model.get('membership').length < this.topic.getMaxTeamSize(courseMaxTeamSize));
 
                 info.memberOfCurrentTeam = TeamUtils.isUserMemberOfTeam(this.model.get('membership'), username);
                 info.isAdminOrStaff = this.context.userInfo.privileged || this.context.userInfo.staff;
                 info.isInstructorManagedTopic = isInstructorManagedTopic;
+                info.canJoinTeam = canJoinTeam;
 
                 if (info.memberOfCurrentTeam) {
                     info.alreadyInTeamset = true;
diff --git a/lms/djangoapps/teams/static/teams/js/views/team_utils.js b/lms/djangoapps/teams/static/teams/js/views/team_utils.js
index 28ed95aff3f..0688162d001 100644
--- a/lms/djangoapps/teams/static/teams/js/views/team_utils.js
+++ b/lms/djangoapps/teams/static/teams/js/views/team_utils.js
@@ -82,6 +82,13 @@
                     return topicType.toLowerCase() !== 'open';
                 },
 
+                canJoinTeam: function(userInfo, topicType) {
+                    if (topicType === undefined) {
+                        return false;
+                    }
+                    return userInfo.privileged || userInfo.staff || topicType.includes("open");
+                },
+
                 /** Shows info/error banner for team membership CSV upload
              * @param: content - string or array for display
              * @param: isError - true sets error styling, false/none uses info styling
diff --git a/lms/djangoapps/teams/views.py b/lms/djangoapps/teams/views.py
index a5370ffa937..dcce3638209 100644
--- a/lms/djangoapps/teams/views.py
+++ b/lms/djangoapps/teams/views.py
@@ -197,7 +197,10 @@ def get(self, request, course_id):
                 "teams": user_teams_data
             },
             "has_open_teamset": bool(teamset_counts_by_type[TeamsetType.open.value]),
-            "has_public_managed_teamset": bool(teamset_counts_by_type[TeamsetType.public_managed.value]),
+            "has_public_managed_teamset": bool(
+                teamset_counts_by_type[TeamsetType.public_managed.value] +
+                teamset_counts_by_type[TeamsetType.open_managed.value]
+            ),
             "has_managed_teamset": bool(
                 teamset_counts_by_type[TeamsetType.public_managed.value] +
                 teamset_counts_by_type[TeamsetType.private_managed.value]
diff --git a/openedx/core/lib/teams_config.py b/openedx/core/lib/teams_config.py
index 636c5073f82..48b0eafefcc 100644
--- a/openedx/core/lib/teams_config.py
+++ b/openedx/core/lib/teams_config.py
@@ -304,6 +304,7 @@ class TeamsetType(Enum):
     open = "open"
     public_managed = "public_managed"
     private_managed = "private_managed"
+    open_managed = "open_managed"
 
     @classmethod
     def get_default(cls):

From e7cc40eb6452013e7e6e925c6705dc605764bd65 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 2 Nov 2023 17:04:52 -0500
Subject: [PATCH 21/28] feat: add grading strategy support

---
 xmodule/capa/capa_problem.py |  2 +-
 xmodule/capa_block.py        | 71 +++++++++++++++++++++++++++++++++---
 2 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/xmodule/capa/capa_problem.py b/xmodule/capa/capa_problem.py
index 7a6592e0958..98603c5105d 100644
--- a/xmodule/capa/capa_problem.py
+++ b/xmodule/capa/capa_problem.py
@@ -341,7 +341,7 @@ def get_max_score(self):
             maxscore += responder.get_max_score()
         return maxscore
 
-    def calculate_score(self, correct_map=None):
+    def calculate_score(self, correct_map=None): # Function that calculates the score
         """
         Compute score for this problem.  The score is the number of points awarded.
         Returns a dictionary {'score': integer, from 0 to get_max_score(),
diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index 425e0d1c586..23fd91be7d3 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -23,7 +23,7 @@
 from pytz import utc
 from web_fragments.fragment import Fragment
 from xblock.core import XBlock
-from xblock.fields import Boolean, Dict, Float, Integer, Scope, String, XMLString
+from xblock.fields import Boolean, Dict, Float, Integer, Scope, String, XMLString, List
 from xblock.scorable import ScorableXBlockMixin, Score
 
 from xmodule.capa import responsetypes
@@ -93,6 +93,15 @@ class SHOWANSWER:
     ATTEMPTED_NO_PAST_DUE = "attempted_no_past_due"
 
 
+class GradingStrategy:
+    """
+    Constants for grading strategy
+    """
+    LAST_ATTEMPT = "last_attempt"
+    HIGHEST_ATTEMPT = "highest_attempt"
+    AVERAGE_ATTEMPT = "average_attempt"
+
+
 class RANDOMIZATION:
     """
     Constants for problem randomization
@@ -217,6 +226,20 @@ class ProblemBlock(
                "If the value is not set, infinite attempts are allowed."),
         values={"min": 0}, scope=Scope.settings
     )
+    grading_strategy = String(
+        display_name=_("Grading Strategy"),
+        help=_(
+            "Define the grading strategy for this problem. By default the last attempt "
+            "made by the student is taken."
+        ),
+        scope=Scope.settings,
+        default=GradingStrategy.LAST_ATTEMPT,
+        values=[
+            {"display_name": _("Last Attempt"), "value": GradingStrategy.LAST_ATTEMPT},
+            {"display_name": _("Highest Attempt"), "value": GradingStrategy.HIGHEST_ATTEMPT},
+            {"display_name": _("Average Attempt"), "value": GradingStrategy.AVERAGE_ATTEMPT},
+        ],
+    )
     due = Date(help=_("Date that this problem is due by"), scope=Scope.settings)
     graceperiod = Timedelta(
         help=_("Amount of time after the due date that submissions will be accepted"),
@@ -304,6 +327,7 @@ class ProblemBlock(
 
     # enforce_type is set to False here because this field is saved as a dict in the database.
     score = ScoreField(help=_("Dictionary with the current student score"), scope=Scope.user_state, enforce_type=False)
+    score_history = List(help=_("List of scores for each attempt"), scope=Scope.user_state, default=[])
     has_saved_answers = Boolean(help=_("Whether or not the answers have been saved since last submit"),
                                 scope=Scope.user_state, default=False)
     done = Boolean(help=_("Whether the student has answered the problem"), scope=Scope.user_state, default=False)
@@ -929,6 +953,7 @@ def get_html(self):
         Return some html with data about the module
         """
         curr_score, total_possible = self.get_display_progress()
+        print(f'\n\nCurrent Score: {curr_score}, Total Posible: {total_possible}\n\n')
 
         return self.runtime.service(self, 'mako').render_template('problem_ajax.html', {
             'element_id': self.location.html_id(),
@@ -1498,6 +1523,7 @@ def update_score(self, data):
 
         No ajax return is needed. Return empty dict.
         """
+        print(f'\n\nIn Update Score\n\n')
         queuekey = data['queuekey']
         score_msg = data['xqueue_body']
         self.lcp.update_score(score_msg, queuekey)
@@ -1707,14 +1733,15 @@ def submit_problem(self, data, override_time=False):
           {'success' : 'correct' | 'incorrect' | AJAX alert msg string,
            'contents' : html}
         """
+        # Get event info
         event_info = {}
         event_info['state'] = self.lcp.get_state()
         event_info['problem_id'] = str(self.location)
 
         self.lcp.has_saved_answers = False
-        answers = self.make_dict_of_responses(data)
-        answers_without_files = convert_files_to_filenames(answers)
-        event_info['answers'] = answers_without_files
+        answers = self.make_dict_of_responses(data) # Converts data to a dictionary of answers
+        answers_without_files = convert_files_to_filenames(answers) # Converts files to file names
+        event_info['answers'] = answers_without_files # Save answers in the event
 
         metric_name = 'xmodule.capa.check_problem.{}'.format  # lint-amnesty, pylint: disable=unused-variable
         # Can override current time
@@ -1725,6 +1752,7 @@ def submit_problem(self, data, override_time=False):
         _ = self.runtime.service(self, "i18n").ugettext
 
         # Too late. Cannot submit
+        # If the number of attempts was exceeded or the closing date was exceeded
         if self.closed():
             log.error(
                 'ProblemClosedError: Problem %s, close date: %s, due:%s, is_past_due: %s, attempts: %s/%s,',
@@ -1775,14 +1803,47 @@ def submit_problem(self, data, override_time=False):
             # self.lcp.context['attempt'] refers to the attempt number (1-based)
             self.lcp.context['attempt'] = self.attempts + 1
             correct_map = self.lcp.grade_answers(answers)
+
+            # print(f'\n\nCurrent Correct Map: {self.lcp.correct_map.get_dict()}\n\n')
+            # print(f'\n\nNew Correct Map: {correct_map.get_dict()}\n\n')
+
             # self.attempts refers to the number of attempts that did not
             # raise an error (0-based)
             self.attempts = self.attempts + 1
             self.lcp.done = True
+
+            # Updates some fields of the xblock:
+            # self.correct_map, self.input_state, self.student_answers, self.has_saved_answers
             self.set_state_from_lcp()
-            self.set_score(self.score_from_lcp(self.lcp))
+
+            print(f'\n\nCurrent Score: {self.score}\n\n')
+            print(f'\n\nNew Score: {self.score_from_lcp(self.lcp)}\n\n')
+
+            # -------------------------------------------------------------
+
+            new_score = self.score_from_lcp(self.lcp)
+
+            self.score_history.append(new_score.raw_earned)
+            print(f'\n\nScore History: {self.score_history}\n\n')
+
+            if self.grading_strategy == GradingStrategy.HIGHEST_ATTEMPT:
+                if new_score.raw_earned > self.score.raw_earned:
+                    self.set_score(new_score)
+            elif self.grading_strategy == GradingStrategy.LAST_ATTEMPT:
+                self.set_score(new_score)
+            elif self.grading_strategy == GradingStrategy.AVERAGE_ATTEMPT:
+                average_score = round(sum(self.score_history) / len(self.score_history), 2)
+                new_score = Score(raw_earned=average_score, raw_possible=self.max_score())
+                self.set_score(new_score)
+
+            # Get the score and save it in the score field
+            # self.set_score(self.score_from_lcp(self.lcp))
+
+            # Updates the last submission date by putting the current time
             self.set_last_submission_time()
 
+            # ------------------------------------------------------------------
+
         except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
             if self.debug:
                 log.warning(

From 0fb43ee1903bbf43d66c38868fdf92a49fa59693 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 9 Nov 2023 09:51:07 -0500
Subject: [PATCH 22/28] refactor: add grading strategy handler class

---
 xmodule/capa_block.py | 85 +++++++++++++++++++++++++++++++------------
 1 file changed, 61 insertions(+), 24 deletions(-)

diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index 23fd91be7d3..fa653f0068d 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -1,6 +1,7 @@
 """
 Implements the Problem XBlock, which is built on top of the CAPA subsystem.
 """
+from __future__ import annotations
 
 import copy
 import datetime
@@ -93,11 +94,12 @@ class SHOWANSWER:
     ATTEMPTED_NO_PAST_DUE = "attempted_no_past_due"
 
 
-class GradingStrategy:
+class GRADING_STRATEGY:
     """
     Constants for grading strategy
     """
     LAST_ATTEMPT = "last_attempt"
+    FIRST_ATTEMPT = "first_attempt"
     HIGHEST_ATTEMPT = "highest_attempt"
     AVERAGE_ATTEMPT = "average_attempt"
 
@@ -233,11 +235,12 @@ class ProblemBlock(
             "made by the student is taken."
         ),
         scope=Scope.settings,
-        default=GradingStrategy.LAST_ATTEMPT,
+        default=GRADING_STRATEGY.LAST_ATTEMPT,
         values=[
-            {"display_name": _("Last Attempt"), "value": GradingStrategy.LAST_ATTEMPT},
-            {"display_name": _("Highest Attempt"), "value": GradingStrategy.HIGHEST_ATTEMPT},
-            {"display_name": _("Average Attempt"), "value": GradingStrategy.AVERAGE_ATTEMPT},
+            {"display_name": _("Last Attempt"), "value": GRADING_STRATEGY.LAST_ATTEMPT},
+            {"display_name": _("First Attempt"), "value": GRADING_STRATEGY.FIRST_ATTEMPT},
+            {"display_name": _("Highest Attempt"), "value": GRADING_STRATEGY.HIGHEST_ATTEMPT},
+            {"display_name": _("Average Attempt"), "value": GRADING_STRATEGY.AVERAGE_ATTEMPT},
         ],
     )
     due = Date(help=_("Date that this problem is due by"), scope=Scope.settings)
@@ -1816,30 +1819,24 @@ def submit_problem(self, data, override_time=False):
             # self.correct_map, self.input_state, self.student_answers, self.has_saved_answers
             self.set_state_from_lcp()
 
-            print(f'\n\nCurrent Score: {self.score}\n\n')
-            print(f'\n\nNew Score: {self.score_from_lcp(self.lcp)}\n\n')
-
             # -------------------------------------------------------------
 
             new_score = self.score_from_lcp(self.lcp)
 
             self.score_history.append(new_score.raw_earned)
-            print(f'\n\nScore History: {self.score_history}\n\n')
-
-            if self.grading_strategy == GradingStrategy.HIGHEST_ATTEMPT:
-                if new_score.raw_earned > self.score.raw_earned:
-                    self.set_score(new_score)
-            elif self.grading_strategy == GradingStrategy.LAST_ATTEMPT:
-                self.set_score(new_score)
-            elif self.grading_strategy == GradingStrategy.AVERAGE_ATTEMPT:
-                average_score = round(sum(self.score_history) / len(self.score_history), 2)
-                new_score = Score(raw_earned=average_score, raw_possible=self.max_score())
-                self.set_score(new_score)
-
-            # Get the score and save it in the score field
-            # self.set_score(self.score_from_lcp(self.lcp))
-
-            # Updates the last submission date by putting the current time
+
+            grading_strategy_handler = GradingStrategyHandler(
+                self.grading_strategy,
+                self.attempts,
+                self.score,
+                self.score_history,
+                self.max_score(),
+            )
+
+            score = grading_strategy_handler.get_score(new_score)
+
+            self.set_score(score)
+
             self.set_last_submission_time()
 
             # ------------------------------------------------------------------
@@ -2310,6 +2307,46 @@ def score_from_lcp(self, lcp):
         return Score(raw_earned=lcp_score['score'], raw_possible=lcp_score['total'])
 
 
+class GradingStrategyHandler:
+    """Grading strategy handler class"""
+
+    def __init__(
+        self, grading_strategy, attempts, current_score, score_history, max_score
+    ):
+        self.grading_strategy = grading_strategy
+        self.attempts = attempts
+        self.current_score = current_score
+        self.score_history = score_history
+        self.max_score = max_score
+        self.mapping_strategy = {
+            GRADING_STRATEGY.LAST_ATTEMPT: self.handle_last_attempt,
+            GRADING_STRATEGY.FIRST_ATTEMPT: self.handle_first_attempt,
+            GRADING_STRATEGY.HIGHEST_ATTEMPT: self.handle_highest_attempt,
+            GRADING_STRATEGY.AVERAGE_ATTEMPT: self.handle_average_attempt,
+        }
+
+    def get_score(self, new_score) -> int | float:
+        """Handle new score based on grading strategy"""
+        return self.mapping_strategy[self.grading_strategy](new_score)
+
+    def handle_last_attempt(self, new_score) -> int:
+        return new_score
+
+    def handle_first_attempt(self, new_score) -> int:
+        if self.attempts == 1:
+            return new_score
+        return self.current_score
+
+    def handle_highest_attempt(self, new_score) -> int:
+        if new_score.raw_earned > self.current_score.raw_earned:
+            return new_score
+        return self.current_score
+
+    def handle_average_attempt(self) -> float:
+        average_score = round(sum(self.score_history) / len(self.score_history), 2)
+        return Score(raw_earned=average_score, raw_possible=self.max_score)
+
+
 class ComplexEncoder(json.JSONEncoder):
     """
     Extend the JSON encoder to correctly handle complex numbers

From ad52a91a13d712d1c1302b629bae24d261982ac9 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 9 Nov 2023 11:57:51 -0500
Subject: [PATCH 23/28] feat: show grading strategy in student view

---
 lms/templates/problem.html | 2 +-
 xmodule/capa_block.py      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/templates/problem.html b/lms/templates/problem.html
index 60d27b4ff5a..09a89e60f6d 100644
--- a/lms/templates/problem.html
+++ b/lms/templates/problem.html
@@ -88,7 +88,7 @@ <h3 class="hd hd-3 problem-header" id="${ short_id }-problem-title" aria-describ
       <div class="submission-feedback ${'cta-enabled' if submit_disabled_cta else ''}" id="submission_feedback_${short_id}">
         ## When attempts are not 0, the CTA above will contain a message about the number of used attempts
         % if attempts_allowed and (not submit_disabled_cta or attempts_used == 0):
-          ${ngettext("You have used {num_used} of {num_total} attempt", "You have used {num_used} of {num_total} attempts", attempts_allowed).format(num_used=attempts_used, num_total=attempts_allowed)}
+          ${ngettext("You have used {num_used} of {num_total} attempt. Grading strategy: {grading_strategy}", "You have used {num_used} of {num_total} attempts. Grading strategy: {grading_strategy}", attempts_allowed).format(num_used=attempts_used, num_total=attempts_allowed, grading_strategy=grading_strategy)}
         % endif
         <span class="sr">${_("Some problems have options such as save, reset, hints, or show answer. These options follow the Submit button.")}</span>
       </div>
diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index fa653f0068d..1760f45bebb 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -1296,6 +1296,7 @@ def get_problem_html(self, encapsulate=True, submit_notification=False):
             'reset_button': self.should_show_reset_button(),
             'save_button': self.should_show_save_button(),
             'answer_available': self.answer_available(),
+            'grading_strategy': self.grading_strategy,
             'attempts_used': self.attempts,
             'attempts_allowed': self.max_attempts,
             'demand_hint_possible': demand_hint_possible,

From 666930f55e749f3f23b4602fdcf78458530e97cc Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 9 Nov 2023 11:59:27 -0500
Subject: [PATCH 24/28] fix: reset score history when reset student attempts

---
 xmodule/capa_block.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index 1760f45bebb..40411350ed0 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -1814,6 +1814,10 @@ def submit_problem(self, data, override_time=False):
             # self.attempts refers to the number of attempts that did not
             # raise an error (0-based)
             self.attempts = self.attempts + 1
+
+            if self.attempts == 1:
+                self.score_history = []
+
             self.lcp.done = True
 
             # Updates some fields of the xblock:

From 0d584dd8fbcacfa91606bb9686dc5c21f75e1618 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 9 Nov 2023 12:01:18 -0500
Subject: [PATCH 25/28] fix: add missing argument in handle_average_attempt and
 fix typing hint

---
 xmodule/capa_block.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index 40411350ed0..cba49c7e2c5 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -2330,24 +2330,24 @@ def __init__(
             GRADING_STRATEGY.AVERAGE_ATTEMPT: self.handle_average_attempt,
         }
 
-    def get_score(self, new_score) -> int | float:
+    def get_score(self, new_score) -> Score:
         """Handle new score based on grading strategy"""
         return self.mapping_strategy[self.grading_strategy](new_score)
 
-    def handle_last_attempt(self, new_score) -> int:
+    def handle_last_attempt(self, new_score) -> Score:
         return new_score
 
-    def handle_first_attempt(self, new_score) -> int:
+    def handle_first_attempt(self, new_score) -> Score:
         if self.attempts == 1:
             return new_score
         return self.current_score
 
-    def handle_highest_attempt(self, new_score) -> int:
+    def handle_highest_attempt(self, new_score) -> Score:
         if new_score.raw_earned > self.current_score.raw_earned:
             return new_score
         return self.current_score
 
-    def handle_average_attempt(self) -> float:
+    def handle_average_attempt(self, _) -> Score:
         average_score = round(sum(self.score_history) / len(self.score_history), 2)
         return Score(raw_earned=average_score, raw_possible=self.max_score)
 

From a1327eb61fdad9bba4d5f35cdaaffdc6bd331e10 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 16 Nov 2023 11:42:30 -0500
Subject: [PATCH 26/28] chore: remove inline comments and print statements

---
 xmodule/capa/capa_problem.py |  2 +-
 xmodule/capa_block.py        | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/xmodule/capa/capa_problem.py b/xmodule/capa/capa_problem.py
index 98603c5105d..7a6592e0958 100644
--- a/xmodule/capa/capa_problem.py
+++ b/xmodule/capa/capa_problem.py
@@ -341,7 +341,7 @@ def get_max_score(self):
             maxscore += responder.get_max_score()
         return maxscore
 
-    def calculate_score(self, correct_map=None): # Function that calculates the score
+    def calculate_score(self, correct_map=None):
         """
         Compute score for this problem.  The score is the number of points awarded.
         Returns a dictionary {'score': integer, from 0 to get_max_score(),
diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index cba49c7e2c5..c91e9571eb9 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -956,7 +956,6 @@ def get_html(self):
         Return some html with data about the module
         """
         curr_score, total_possible = self.get_display_progress()
-        print(f'\n\nCurrent Score: {curr_score}, Total Posible: {total_possible}\n\n')
 
         return self.runtime.service(self, 'mako').render_template('problem_ajax.html', {
             'element_id': self.location.html_id(),
@@ -1527,7 +1526,6 @@ def update_score(self, data):
 
         No ajax return is needed. Return empty dict.
         """
-        print(f'\n\nIn Update Score\n\n')
         queuekey = data['queuekey']
         score_msg = data['xqueue_body']
         self.lcp.update_score(score_msg, queuekey)
@@ -1737,15 +1735,14 @@ def submit_problem(self, data, override_time=False):
           {'success' : 'correct' | 'incorrect' | AJAX alert msg string,
            'contents' : html}
         """
-        # Get event info
         event_info = {}
         event_info['state'] = self.lcp.get_state()
         event_info['problem_id'] = str(self.location)
 
         self.lcp.has_saved_answers = False
-        answers = self.make_dict_of_responses(data) # Converts data to a dictionary of answers
-        answers_without_files = convert_files_to_filenames(answers) # Converts files to file names
-        event_info['answers'] = answers_without_files # Save answers in the event
+        answers = self.make_dict_of_responses(data)
+        answers_without_files = convert_files_to_filenames(answers)
+        event_info['answers'] = answers_without_files
 
         metric_name = 'xmodule.capa.check_problem.{}'.format  # lint-amnesty, pylint: disable=unused-variable
         # Can override current time
@@ -1756,7 +1753,6 @@ def submit_problem(self, data, override_time=False):
         _ = self.runtime.service(self, "i18n").ugettext
 
         # Too late. Cannot submit
-        # If the number of attempts was exceeded or the closing date was exceeded
         if self.closed():
             log.error(
                 'ProblemClosedError: Problem %s, close date: %s, due:%s, is_past_due: %s, attempts: %s/%s,',
@@ -1808,9 +1804,6 @@ def submit_problem(self, data, override_time=False):
             self.lcp.context['attempt'] = self.attempts + 1
             correct_map = self.lcp.grade_answers(answers)
 
-            # print(f'\n\nCurrent Correct Map: {self.lcp.correct_map.get_dict()}\n\n')
-            # print(f'\n\nNew Correct Map: {correct_map.get_dict()}\n\n')
-
             # self.attempts refers to the number of attempts that did not
             # raise an error (0-based)
             self.attempts = self.attempts + 1
@@ -1820,12 +1813,8 @@ def submit_problem(self, data, override_time=False):
 
             self.lcp.done = True
 
-            # Updates some fields of the xblock:
-            # self.correct_map, self.input_state, self.student_answers, self.has_saved_answers
             self.set_state_from_lcp()
 
-            # -------------------------------------------------------------
-
             new_score = self.score_from_lcp(self.lcp)
 
             self.score_history.append(new_score.raw_earned)
@@ -1844,8 +1833,6 @@ def submit_problem(self, data, override_time=False):
 
             self.set_last_submission_time()
 
-            # ------------------------------------------------------------------
-
         except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
             if self.debug:
                 log.warning(

From 441860fd38dd0387c9aae214852a41bbec570e69 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Tue, 14 Nov 2023 17:23:57 -0500
Subject: [PATCH 27/28] chore: remove inline comments and improve docstring of
 serializers

---
 lms/djangoapps/ora_staff_grader/serializers.py | 7 +++++--
 lms/djangoapps/ora_staff_grader/views.py       | 3 ---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/ora_staff_grader/serializers.py b/lms/djangoapps/ora_staff_grader/serializers.py
index 7528e0509d9..71fb12e3c11 100644
--- a/lms/djangoapps/ora_staff_grader/serializers.py
+++ b/lms/djangoapps/ora_staff_grader/serializers.py
@@ -186,7 +186,9 @@ class Meta:
 
 class AssessmentSerializer(serializers.Serializer):
     """
-    Data for displaying Assessment objects in a table in Enhanced Staff Grader (ESG)
+    Data for displaying Assessment objects for the response from the assessment
+    feedback endpoint in Enhanced Staff Grader (ESG)
+    This serializer is included in the AssessmentFeedbackSerializer as a ListField
     """
     assessment_id = serializers.CharField()
     scorer_name = serializers.CharField(allow_null=True)
@@ -240,7 +242,8 @@ def get_isEnabled(self, obj):
 
 class AssessmentFeedbackSerializer(serializers.Serializer):
     """
-    Serialize info for every assessment for a table in Enhanced Staff Grader (ESG)
+    Serialize info for every assessment for the response from the assessment
+    feedback endpoint in Enhanced Staff Grader (ESG)
     """
 
     assessments = serializers.ListField(child=AssessmentSerializer())
diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index 2971d91b9d8..0f74e56d32d 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -195,17 +195,14 @@ def get(self, request, ora_location, submission_uuid, assessment_filter, *args,
             response_data = AssessmentFeedbackSerializer(assessments_data).data
             return Response(response_data)
 
-        # Catch bad ORA location
         except (InvalidKeyError, ItemNotFoundError):
             log.error(f"Bad ORA location provided: {ora_location}")
             return BadOraLocationResponse()
 
-        # Issues with the XBlock handlers
         except XBlockInternalError as ex:
             log.error(ex)
             return InternalErrorResponse(context=ex.context)
 
-        # Blanket exception handling in case something blows up
         except Exception as ex:
             log.exception(ex)
             return UnknownErrorResponse()

From 9bf131fed85506f350ce154b304aa559e159c601 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryanttandrei2015@gmail.com>
Date: Thu, 16 Nov 2023 16:42:40 -0500
Subject: [PATCH 28/28] refactor: rename assessment_filter to assessment_type

---
 lms/djangoapps/ora_staff_grader/constants.py | 2 +-
 lms/djangoapps/ora_staff_grader/ora_api.py   | 4 ++--
 lms/djangoapps/ora_staff_grader/views.py     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lms/djangoapps/ora_staff_grader/constants.py b/lms/djangoapps/ora_staff_grader/constants.py
index d57f5254010..1ff67d79d26 100644
--- a/lms/djangoapps/ora_staff_grader/constants.py
+++ b/lms/djangoapps/ora_staff_grader/constants.py
@@ -3,7 +3,7 @@
 # Query params
 PARAM_ORA_LOCATION = "oraLocation"
 PARAM_SUBMISSION_ID = "submissionUUID"
-PARAM_ASSESSMENT_FILTER = "assessmentFilter"
+PARAM_ASSESSMENT_TYPE = "assessmentType"
 
 # Error codes
 ERR_UNKNOWN = "ERR_UNKNOWN"
diff --git a/lms/djangoapps/ora_staff_grader/ora_api.py b/lms/djangoapps/ora_staff_grader/ora_api.py
index 408c097936f..432b6b817c1 100644
--- a/lms/djangoapps/ora_staff_grader/ora_api.py
+++ b/lms/djangoapps/ora_staff_grader/ora_api.py
@@ -34,12 +34,12 @@ def get_submissions(request, usage_id):
     return json.loads(response.content)
 
 
-def get_assessments(request, usage_id, submission_uuid, assessment_filter):
+def get_assessments(request, usage_id, submission_uuid, assessment_type):
     """
     Get a list of assessments from the ORA's 'list_assessments_grades' XBlock.json_handler
     """
     handler_name = "list_assessments"
-    body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_filter": assessment_filter}
+    body = {"item_id": usage_id, "submission_uuid": submission_uuid, "assessment_type": assessment_type}
 
     response = call_xblock_json_handler(request, usage_id, handler_name, body)
 
diff --git a/lms/djangoapps/ora_staff_grader/views.py b/lms/djangoapps/ora_staff_grader/views.py
index 0f74e56d32d..90d09ed4cbf 100644
--- a/lms/djangoapps/ora_staff_grader/views.py
+++ b/lms/djangoapps/ora_staff_grader/views.py
@@ -24,7 +24,7 @@
 from lms.djangoapps.ora_staff_grader.constants import (
     PARAM_ORA_LOCATION,
     PARAM_SUBMISSION_ID,
-    PARAM_ASSESSMENT_FILTER,
+    PARAM_ASSESSMENT_TYPE,
 )
 from lms.djangoapps.ora_staff_grader.errors import (
     BadOraLocationResponse,
@@ -182,13 +182,13 @@ class AssessmentFeedbackView(StaffGraderBaseView):
     - UnknownError (HTTP 500) for other errors
     """
 
-    @require_params([PARAM_ORA_LOCATION, PARAM_SUBMISSION_ID, PARAM_ASSESSMENT_FILTER])
-    def get(self, request, ora_location, submission_uuid, assessment_filter, *args, **kwargs):
+    @require_params([PARAM_ORA_LOCATION, PARAM_SUBMISSION_ID, PARAM_ASSESSMENT_TYPE])
+    def get(self, request, ora_location, submission_uuid, assessment_type, *args, **kwargs):
 
         try:
             assessments_data = {
                 "assessments": get_assessments(
-                    request, ora_location, submission_uuid, assessment_filter
+                    request, ora_location, submission_uuid, assessment_type
                 )
             }