Dataproducts instead of old lrs (#89)

* Create environment variables for mongo and refactor function to get deadlines

* modify get_student_deadlines to fetch from dataproduct

* Add env variable for dataproduct

* move LRS Mongo settings from common.py to production.py

* Remove functions to pull project data from Zoho

* Change dataproduct name to more accurately reflect that mentor data is also being used

* Remove MongoClient import as it's been moved to production.py

Co-authored-by: Igor <[email protected]>

Author: johannalberts

lms/djangoapps/ci_program/tests.py

@@ -1,8 +1,6 @@
 
 from django.urls import reverse
 from django.test import TestCase, override_settings
-from freezegun import freeze_time
-from .utils import get_student_deadlines_from_zoho_data
 from .models import Program
 from django.contrib.auth.models import User
 from django.core import mail
@@ -14,70 +12,6 @@ class ProjectDeadlinesUnitTest(TestCase):
     def setUp(self):
         self.max_diff = None
 
-    @freeze_time("2020-10-01 13:00")
-    def test_parse(self):
-        self.api_data = {
-            'Interactive_submission_deadline': '2020-10-01',
-            'Interactive_latest_submission': None,
-            'User_Centric_submission_deadline': '2020-09-01',
-            'User_Centric_latest_submission': '{}',
-            'Data_Centric_submission_deadline': '2020-11-01',
-            'Data_Centric_latest_submission': None,
-        }
-        result = get_student_deadlines_from_zoho_data(self.api_data)
-
-        self.assertEqual([
-            {'name': 'Project 1',
-             'submission_deadline': '2020-09-01',
-             'latest_submission': '{}',
-             'overdue': False,
-             'next_project': False},
-
-            {'name': 'Project 2',
-             'submission_deadline': '2020-10-01',
-             'latest_submission': None,
-             'overdue': True,
-             'next_project': False},
-
-            {'name': 'Project 3',
-             'submission_deadline': '2020-11-01',
-             'latest_submission': None,
-             'overdue': False,
-             'next_project': True},
-        ], result)
-
-    @freeze_time("2020-08-01 13:00")
-    def test_next_project(self):
-        self.api_data = {
-            'Interactive_submission_deadline': '2020-10-01',
-            'Interactive_latest_submission': '{}',
-            'User_Centric_submission_deadline': '2020-09-01',
-            'User_Centric_latest_submission': '{}',
-            'Data_Centric_submission_deadline': '2020-11-01',
-            'Data_Centric_latest_submission': None,
-        }
-        result = get_student_deadlines_from_zoho_data(self.api_data)
-
-        self.assertEqual([
-            {'name': 'Project 1',
-             'submission_deadline': '2020-09-01',
-             'latest_submission': '{}',
-             'overdue': False,
-             'next_project': False},
-
-            {'name': 'Project 2',
-             'submission_deadline': '2020-10-01',
-             'latest_submission': '{}',
-             'overdue': False,
-             'next_project': False},
-
-            {'name': 'Project 3',
-             'submission_deadline': '2020-11-01',
-             'latest_submission': None,
-             'overdue': False,
-             'next_project': True},
-        ], result)
-
     def test_program_email_template(self):
         program = Program(program_code_friendly_name='nonexistant')
         program.enrollment_type = 0

lms/djangoapps/ci_program/utils.py

@@ -19,61 +19,4 @@ def is_overdue(data):
     now = datetime.now()
     project_deadline = datetime.strptime(submission_deadline, '%Y-%m-%d')
     project_deadline = project_deadline + timedelta(hours=12)
-    return now > project_deadline and not data['latest_submission']
-
-
-def endswith(key):
-    for field in FIELDS:
-        if key.endswith(field):
-            return key[:-len(field)], key[-len(field):]
-    return None, None
-
-
-def get_student_deadlines(student_email):
-    cache_key = '%s_project_deadlines' % student_email
-    if cache.get(cache_key):
-        return cache.get(cache_key)
-
-    student_record = get_student_record_from_zoho(student_email)
-    if student_record:
-        student_deadlines = get_student_deadlines_from_zoho_data(student_record)
-        cache.set(cache_key, student_deadlines)
-    else:
-        student_deadlines = []
-    return student_deadlines
-
-
-def get_student_deadlines_from_zoho_data(zoho_record):
-    student_data = {}
-    for key, record in zoho_record.items():
-        project_key, record_id = endswith(key)
-        if not project_key:
-            continue
-
-        student_data.setdefault(project_key, {})
-        student_data[project_key][record_id] = record
-
-    # Filter Blank submission deadlines
-    student_data = dict([
-        (key, submission) for (key, submission) in student_data.items() if
-        submission.get('submission_deadline')])
-
-    sorted_student_data = sorted(
-        student_data.values(),
-        key=lambda k: (k.get('submission_deadline') or ''))
-
-    for index, data in enumerate(sorted_student_data, start=1):
-        data['name'] = "Project %s" % index
-        data['overdue'] = is_overdue(data)
-        data['next_project'] = False
-
-    for data in sorted_student_data:
-        if not data.get('submission_deadline'):
-            continue
-
-        project_deadline = datetime.strptime(data['submission_deadline'], '%Y-%m-%d')
-        if project_deadline > datetime.now() and not data['latest_submission']:
-            data['next_project'] = True
-            break
-
-    return sorted_student_data
+    return now > project_deadline and not data['submission']

lms/djangoapps/ci_program/views.py

@@ -6,7 +6,6 @@
 from django.core.cache import cache
 from edxmako.shortcuts import render_to_response
 from ci_program.models import Program
-from ci_program.utils import get_student_deadlines
 from openedx.core.djangoapps.bookmarks.models import Bookmark
 
 

lms/envs/production.py

@@ -1072,3 +1072,9 @@ def should_show_debug_toolbar(request):
 MONGO_DB = MONGO_CLIENT[db]
 
 CELERY_DEFAULT_QUEUE = AUTH_TOKENS.get("CELERY_DEFAULT_QUEUE")
+
+### MONGO DATABASE
+LRS_MONGO_HOST = AUTH_TOKENS.get('LRS_MONGO_HOST', 'mongodb://localhost:27017')
+LRS_MONGO_CLIENT = MongoClient(host=LRS_MONGO_HOST, readPreference='secondaryPreferred')
+LRS_MONGO_DB = LRS_MONGO_CLIENT[AUTH_TOKENS.get('LRS_MONGO_DB', 'dataproduct')]
+LMS_STUDENT_PROJECT_AND_MENTOR_DATA = AUTH_TOKENS.get('LMS_STUDENT_PROJECT_AND_MENTOR_DATA', 'lms_student_project_and_mentor_data')