Merge branch 'progress_course_only'

Author: runestonetest

.travis.yml

@@ -47,7 +47,7 @@ script:
 - cd ../../..
 - cp applications/runestone/tests/.coveragerc .
 # Now actually run the tests.
-- pytest applications/runestone/tests
+- pytest -v applications/runestone/tests
 - coveralls
 notifications:
   slack:

controllers/ajax.py

@@ -650,6 +650,7 @@ def updatelastpage():
                         db.user_sub_chapter_progress.sub_chapter_id
                         == lastPageSubchapter
                     )
+                    & (db.user_sub_chapter_progress.course_name == course)
                 ).update(status=completionFlag, end_date=datetime.datetime.utcnow())
                 done = True
             except Exception:
@@ -718,6 +719,7 @@ def getCompletionStatus():
             (db.user_sub_chapter_progress.user_id == auth.user.id)
             & (db.user_sub_chapter_progress.chapter_id == lastPageChapter)
             & (db.user_sub_chapter_progress.sub_chapter_id == lastPageSubchapter)
+            & (db.user_sub_chapter_progress.course_name == auth.user.course_name)
         ).select(db.user_sub_chapter_progress.status)
         rowarray_list = []
         if result:
@@ -738,6 +740,7 @@ def getCompletionStatus():
                 sub_chapter_id=lastPageSubchapter,
                 status=-1,
                 start_date=datetime.datetime.utcnow(),
+                course_name=auth.user.course_name,
             )
             # the chapter might exist without the subchapter
             result = db(
@@ -753,7 +756,10 @@ def getCompletionStatus():
 
 def getAllCompletionStatus():
     if auth.user:
-        result = db((db.user_sub_chapter_progress.user_id == auth.user.id)).select(
+        result = db(
+            (db.user_sub_chapter_progress.user_id == auth.user.id)
+            & (db.user_sub_chapter_progress.course_name == auth.user.course_name)
+        ).select(
             db.user_sub_chapter_progress.chapter_id,
             db.user_sub_chapter_progress.sub_chapter_id,
             db.user_sub_chapter_progress.status,
@@ -989,13 +995,11 @@ def getpollresults():
     response.headers["content-type"] = "application/json"
 
     query = """select act from useinfo
-    join (select sid,  max(id) mid
-        from useinfo where event='poll' and div_id = '{}' and course_id = '{}' group by sid) as T
-        on id = T.mid""".format(
-        div_id, course
-    )
+        join (select sid,  max(id) mid
+        from useinfo where event='poll' and div_id = %s and course_id = %s group by sid) as T
+        on id = T.mid"""
 
-    rows = db.executesql(query)
+    rows = db.executesql(query, (div_id, course))
 
     result_list = []
     for row in rows:
@@ -1720,6 +1724,7 @@ def get_question_source():
         .first()
     )
 
+    # TODO -- Make sure we don't select a duplicate question.
     if prev_selection:
         questionid = prev_selection.selected_id
     else:

controllers/assignments.py

@@ -146,11 +146,12 @@ def get_summary():
         .first()
     )
     res = db.executesql(
-        f"""
+        """
     select chapter, name, min(score), max(score), to_char(avg(score), '00.999') as mean, count(score) from assignment_questions join questions on question_id = questions.id join question_grades on name = div_id
-where assignment_id = {assignment.id} and course_name = '{auth.user.course_name}'
+where assignment_id = %s and course_name = %s
 group by chapter, name
     """,
+        (assignment.id, auth.user.course_name),
         as_dict=True,
     )
 
@@ -673,6 +674,10 @@ def doAssignment():
                         == q.questions.subchapter
                     )
                     & (db.user_sub_chapter_progress.chapter_id == q.questions.chapter)
+                    & (
+                        db.user_sub_chapter_progress.course_name
+                        == auth.user.course_name
+                    )
                 )
                 .select()
                 .first()

controllers/dashboard.py

@@ -838,13 +838,14 @@ def active():
     course = db(db.courses.id == auth.user.course_id).select().first()
 
     res = db.executesql(
-        f"""select useinfo.timestamp, useinfo.sid, div_id
+        """select useinfo.timestamp, useinfo.sid, div_id
                            from useinfo join
                            (select sid, count(*), max(id)
-                            from useinfo where course_id = '{course.course_name}'
+                            from useinfo where course_id = %(cname)s
                                 and event = 'page'
                                 and timestamp > now() - interval '15 minutes' group by sid) as T
-                          on useinfo.id = T.max"""
+                          on useinfo.id = T.max""",
+        dict(cname=course.course_name),
     )
 
     newres = []
@@ -886,11 +887,19 @@ def subchapdetail():
     ).select(db.questions.name, db.questions.question_type)
 
     res = db.executesql(
-        f"""
+        """
 select name, question_type, min(useinfo.timestamp) as first, max(useinfo.timestamp) as last, count(*) as clicks
-    from questions join useinfo on name = div_id and course_id = '{auth.user.course_name}'
-    where chapter='{request.vars.chap}' and subchapter = '{request.vars.sub}' and base_course = '{thecourse.base_course}' and sid='{request.vars.sid}'
+    from questions join useinfo on name = div_id and course_id = %s
+    where chapter = %s and subchapter = %s
+    and base_course = %s and sid = %s
     group by name, question_type""",
+        (
+            auth.user.course_name,
+            request.vars.chap,
+            request.vars.sub,
+            thecourse.base_course,
+            request.vars.sid,
+        ),
         as_dict=True,
     )
     tdoff = datetime.timedelta(

controllers/default.py

@@ -212,16 +212,21 @@ def index():
                 db(
                     (db.user_sub_chapter_progress.user_id == auth.user.id)
                     & (db.user_sub_chapter_progress.chapter_id == chapter_label)
+                    & (db.user_sub_chapter_progress.course_name == course.course_name)
                 ).count()
                 == 0
             ):
                 db.executesql(
                     """
-                    INSERT INTO user_sub_chapter_progress(user_id, chapter_id,sub_chapter_id, status, start_date)
-                    SELECT %s, chapters.chapter_label, sub_chapters.sub_chapter_label, -1, now()
-                    FROM chapters, sub_chapters where sub_chapters.chapter_id = chapters.id and chapters.course_id = '%s';
-                """
-                    % (auth.user.id, course.base_course)
+                    INSERT INTO user_sub_chapter_progress(user_id, chapter_id,sub_chapter_id, status, start_date, course_name)
+                    SELECT %(userid)s, chapters.chapter_label, sub_chapters.sub_chapter_label, -1, now(), %(course_name)s
+                    FROM chapters, sub_chapters where sub_chapters.chapter_id = chapters.id and chapters.course_id = %(base_course)s
+                """,
+                    dict(
+                        userid=auth.user.id,
+                        course_name=course.course_name,
+                        base_course=course.base_course,
+                    ),
                 )
         except Exception as e:
             logger.error(f"Select Course got Error {e}")

controllers/designer.py

@@ -120,8 +120,8 @@ def build():
             """
             INSERT INTO user_courses(user_id, course_id)
             SELECT %s, %s
-            """
-            % (auth.user.id, cid)
+            """,
+            (auth.user.id, cid),
         )
 
         session.flash = "Course Created Successfully"

models/db_ebook_chapters.py

@@ -43,6 +43,7 @@
     Field("start_date", "datetime", default=datetime.datetime.utcnow()),
     Field("end_date", "datetime"),
     Field("status", "integer"),  # -1  - not started. 0 - active. 1 - completed
+    Field("course_name", "string"),
     migrate=table_migrate_prefix + "user_sub_chapter_progress.table",
 )
 
@@ -71,17 +72,17 @@ def make_progress_entries(field_dict, id_of_insert):
         """
        INSERT INTO user_chapter_progress(user_id, chapter_id, status)
            SELECT %s, chapters.chapter_label, -1
-           FROM chapters where chapters.course_id = '%s';
-    """
-        % (id_of_insert, cname)
+           FROM chapters where chapters.course_id = %s;
+    """,
+        (id_of_insert, cname),
     )
     db.executesql(
         """
        INSERT INTO user_sub_chapter_progress(user_id, chapter_id,sub_chapter_id, status)
            SELECT %s, chapters.chapter_label, sub_chapters.sub_chapter_label, -1
-           FROM chapters, sub_chapters where sub_chapters.chapter_id = chapters.id and chapters.course_id = '%s';
-    """
-        % (id_of_insert, cname)
+           FROM chapters, sub_chapters where sub_chapters.chapter_id = chapters.id and chapters.course_id = %s;
+    """,
+        (id_of_insert, cname),
     )
 
 

modules/db_dashboard.py

@@ -183,22 +183,20 @@ def __init__(self, course_name, users):
         # Get summary of logs
         self.logs = current.db.executesql(
             """select sid, event, count(*)
-        from useinfo where course_id = '{}'
+        from useinfo where course_id = %s
         group by sid, event
-        order by sid, event""".format(
-                self.course_id
-            ),
+        order by sid, event""",
+            [self.course_id],
             as_dict=True,
         )
 
         self.recent_logs = current.db.executesql(
             """select sid, event, count(*)
-        from useinfo where course_id = '{}'
+        from useinfo where course_id = %s
         and timestamp > now() - interval '7 days'
         group by sid, event
-        order by sid, event""".format(
-                self.course_id
-            ),
+        order by sid, event""",
+            [self.course_id],
             as_dict=True,
         )
 
@@ -207,9 +205,8 @@ def __init__(self, course_name, users):
         from useinfo where course_id = '{}'
         and timestamp > now() - interval '24 hours'
         group by sid, event
-        order by sid, event""".format(
-                self.course_id
-            ),
+        order by sid, event""",
+            [self.course_id],
             as_dict=True,
         )
 
@@ -488,6 +485,10 @@ def load_chapter_metrics(self, chapter):
             & (  # todo: missing link from course_id to chapter/sub_chapter progress
                 current.db.user_sub_chapter_progress.chapter_id == chapter.chapter_label
             )
+            & (
+                current.db.user_sub_chapter_progress.course_name
+                == self.course.course_name
+            )
         ).select(
             current.db.auth_user.username,
             current.db.user_sub_chapter_progress.chapter_id,
@@ -560,6 +561,10 @@ def load_user_metrics(self, username):
 
         self.db_chapter_progress = current.db(
             (current.db.user_sub_chapter_progress.user_id == self.user.id)
+            & (
+                current.db.user_sub_chapter_progress.course_name
+                == self.course.course_name
+            )
         ).select(
             current.db.user_sub_chapter_progress.chapter_id,
             current.db.user_sub_chapter_progress.sub_chapter_id,

rsmanage/initialize_tables.py

@@ -128,6 +128,7 @@ def try_running(sql_command):
         """CREATE INDEX us_sid_idx ON public.user_state USING btree (user_id)""",  # New
         """CREATE INDEX user_sub_chapter_progress_chapter_id_idx ON user_sub_chapter_progress USING btree (chapter_id);""",
         """CREATE INDEX user_sub_chapter_progress_user_id_idx ON user_sub_chapter_progress USING btree (user_id)""",  # New
+        """CREATE INDEX user_sub_chapter_progress_course_name_idx ON user_sub_chapter_progress USING btree (course_name)""",
         """CREATE UNIQUE INDEX courses_course_name_idx ON courses USING btree (course_name)""",  # New
         """CREATE UNIQUE INDEX q_comp_unique ON competency USING btree (question, competency)""",
         """CREATE UNIQUE INDEX selector_sid_unique ON selected_questions USING btree (selector_id, sid)""",

tests/test_ajax2.py

@@ -533,6 +533,37 @@ def test_GetLastPage(test_client, test_user_1):
     assert "Test chapter 1" in res[0]["lastPageChapter"]
 
 
+def test_LastPageCrossCourse(test_client, test_user_1, runestone_db_tools):
+
+    course_2 = runestone_db_tools.create_course("test_course_2")
+    test_user_1.login()
+    orig_course = test_user_1.course.course_name
+
+    test_user_1.update_profile("Support Runestone", course_name=course_2.course_name)
+    kwargs = dict(
+        course="test_course_2",
+        lastPageUrl="test_chapter_1/subchapter_a.html",
+        lastPageScrollLocation=100,
+        completionFlag="1",
+    )
+    # Call ``getlastpage`` first to insert a new record.
+    test_client.post("ajax/getlastpage", data=kwargs)
+
+    # Then, we can update it with the required info.
+    test_client.post("ajax/updatelastpage", data=kwargs)
+    test_user_1.update_profile(course_name=orig_course)
+
+    kwargs = dict(
+        course=test_user_1.course.course_name,
+        lastPageUrl="test_chapter_1/subchapter_a.html",
+        lastPageScrollLocation=100,
+        completionFlag="1",
+    )
+    # Now, test a query.
+    res = ajaxCall(test_client, "getlastpage", **kwargs)
+    assert res is None
+
+
 def test_GetTop10Answers(test_client, test_user_1, test_user):
     user_ids = []
     for index in range(0, 6):
@@ -813,6 +844,10 @@ def test_updatelastpage(test_client, test_user_1, runestone_db_tools):
         db(
             (db.user_sub_chapter_progress.user_id == test_user_1.user_id)
             & (db.user_sub_chapter_progress.sub_chapter_id == "subchapter_a")
+            & (
+                db.user_sub_chapter_progress.course_name
+                == test_user_1.course.course_name
+            )
         )
         .select()
         .first()