From b8401beaae9577f78b24802e111f9590d5c32878 Mon Sep 17 00:00:00 2001
From: Christie Rice <8483753+crice100@users.noreply.github.com>
Date: Mon, 24 Jun 2019 08:56:05 -0400
Subject: [PATCH] REVEM-374 Remove course prices from dashboard (#20856)

---
 common/djangoapps/student/views/dashboard.py      | 11 +----------
 lms/djangoapps/experiments/utils.py               | 12 ------------
 lms/templates/experiments/dashboard_metadata.html |  4 ++--
 themes/edx.org/lms/templates/dashboard.html       |  2 +-
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/common/djangoapps/student/views/dashboard.py b/common/djangoapps/student/views/dashboard.py
index 68cf9ad339..398e3c5e8d 100644
--- a/common/djangoapps/student/views/dashboard.py
+++ b/common/djangoapps/student/views/dashboard.py
@@ -28,7 +28,7 @@ from courseware.access import has_access
 from edxmako.shortcuts import render_to_response, render_to_string
 from entitlements.models import CourseEntitlement
 from lms.djangoapps.commerce.utils import EcommerceService  # pylint: disable=import-error
-from lms.djangoapps.experiments.utils import get_dashboard_course_info, get_experiment_dashboard_metadata_context
+from lms.djangoapps.experiments.utils import get_dashboard_course_info
 from lms.djangoapps.verify_student.services import IDVerificationService
 from openedx.core.djangoapps.catalog.utils import (
     get_programs,
@@ -61,12 +61,7 @@ from xmodule.modulestore.django import modulestore
 
 log = logging.getLogger("edx.student")
 
-# TODO START: Delete waffle flag as part of REVEM-204
 experiments_namespace = WaffleFlagNamespace(name=u'student.experiments')
-DASHBOARD_METADATA_FLAG = WaffleFlag(experiments_namespace,
-                                     u'dashboard_metadata',
-                                     flag_undefined_default=True)
-# TODO END: REVEM-204
 
 
 def get_org_black_and_whitelist_for_site():
@@ -859,10 +854,6 @@ def student_dashboard(request):
         'empty_dashboard_message': empty_dashboard_message,
         'recovery_email_message': recovery_email_message,
         'recovery_email_activation_message': recovery_email_activation_message,
-        # TODO START: Clean up REVEM-205 & REVEM-204.
-        # The below context is for experiments in dashboard_metadata
-        'course_prices': get_experiment_dashboard_metadata_context(course_enrollments) if DASHBOARD_METADATA_FLAG.is_enabled() else None,
-        # TODO END: Clean up REVEM-205 & REVEM-204.
         # TODO START: clean up as part of REVEM-199 (START)
         'course_info': get_dashboard_course_info(user, course_enrollments),
         # TODO START: clean up as part of REVEM-199 (END)
diff --git a/lms/djangoapps/experiments/utils.py b/lms/djangoapps/experiments/utils.py
index 42c0fbae35..8acdf04b02 100644
--- a/lms/djangoapps/experiments/utils.py
+++ b/lms/djangoapps/experiments/utils.py
@@ -389,18 +389,6 @@ def get_program_context(course, user_enrollments, audit_enrollments):
 # TODO: clean up as part of REVEM-199 (START)
 
 
-# TODO START: Clean up REVEM-205
-def get_experiment_dashboard_metadata_context(enrollments):
-    """
-    Given a list of enrollments return a dict of course ids with their prices.
-    Utility function for experimental metadata. See experiments/dashboard_metadata.html.
-    :param enrollments:
-    :return: dict of courses: course price for dashboard metadata
-    """
-    return {str(enrollment.course): enrollment.course_price for enrollment in enrollments}
-# TODO END: Clean up REVEM-205
-
-
 def stable_bucketing_hash_group(group_name, group_count, username):
     """
     Return the bucket that a user should be in for a given stable bucketing assignment.
diff --git a/lms/templates/experiments/dashboard_metadata.html b/lms/templates/experiments/dashboard_metadata.html
index 95a842eda6..ab5f026843 100644
--- a/lms/templates/experiments/dashboard_metadata.html
+++ b/lms/templates/experiments/dashboard_metadata.html
@@ -1,11 +1,11 @@
-<%page args="course_prices" expression_filter="h"/>
+<%page args="course_info" expression_filter="h"/>
 <%!
 from openedx.core.djangolib.js_utils import dump_js_escaped_json
 %>
 
 <!-- TODO START: Clean up REVEM-205.-->
 <%
-dashboard_metadata = { 'course_prices': course_prices, 'course_info': course_info}
+dashboard_metadata = { 'course_info': course_info }
 %>
 
 <script type="application/json" id="dashboard-metadata">
diff --git a/themes/edx.org/lms/templates/dashboard.html b/themes/edx.org/lms/templates/dashboard.html
index 45481d7d1c..021ab1f3cb 100644
--- a/themes/edx.org/lms/templates/dashboard.html
+++ b/themes/edx.org/lms/templates/dashboard.html
@@ -366,4 +366,4 @@ from student.models import CourseEnrollment
 </section>
 
 <%include file="dashboard/_dashboard_entitlement_unenrollment_modal.html"/>
-<%include file="/experiments/dashboard_metadata.html" args='course_prices=course_prices, course_info=course_info'/>
+<%include file="/experiments/dashboard_metadata.html" args='course_info=course_info'/>