diff --git a/api/v2/Routes/students/masterymapping/index.js b/api/v2/Routes/students/masterymapping/index.js index d3bf51b..2773729 100644 --- a/api/v2/Routes/students/masterymapping/index.js +++ b/api/v2/Routes/students/masterymapping/index.js @@ -9,15 +9,15 @@ const router = Router({ mergeParams: true }); function getTopicsFromUser(gradeData) { const topicsTable = {}; - Object.entries(gradeData).forEach(([assignment, topics]) => { - Object.entries(topics).forEach(([topic, score]) => { + Object.entries(gradeData) + .flatMap(([assignment, topics]) => Object.entries(topics)) + .forEach(([topic, score]) => { if (topic in topicsTable) { topicsTable[topic] += +(score ?? 0); } else { topicsTable[topic] = +(score ?? 0); } }); - }); return topicsTable; } diff --git a/api/v2/Routes/students/progressquerystring/index.js b/api/v2/Routes/students/progressquerystring/index.js index 657fd64..60706a5 100644 --- a/api/v2/Routes/students/progressquerystring/index.js +++ b/api/v2/Routes/students/progressquerystring/index.js @@ -1,3 +1,6 @@ +/** + * @deprecated This file is deprecated. It contains logic to produce a query string for CM, which is no longer used. + */ import { Router } from 'express'; import { getMaxScores, diff --git a/progressReport/app.py b/progressReport/app.py index a94f391..c88f867 100644 --- a/progressReport/app.py +++ b/progressReport/app.py @@ -4,6 +4,7 @@ import os import parser import jsonschema +from deprecated import deprecated """ Dream Team GUI @@ -98,10 +99,12 @@ def validate_mastery_learning_post_request(request_as_json): jsonschema.validate(instance=request_as_json, schema=schema) """ -This method is deprecated. Query parameters are no longer used. +This method is deprecated. """ +@deprecated(reason="Query parameters are no longer used.") @app.route('/', methods=["GET"]) def index(): + print("In index") def assign_node_levels(node, student_levels_count, class_levels_count): nonlocal student_mastery, class_mastery if not node["children"]: @@ -163,7 +166,9 @@ def assign_node_levels(node, student_levels_count, class_levels_count): @app.route('/', methods=["POST"]) def generate_cm_from_post_parameters(): + print("In generate_cm_from_post_parameters") request_as_json = request.get_json() + print("Request", request) validate_mastery_learning_post_request(request_as_json) school_name = request_as_json.get("school", DEFAULT_SCHOOL) course_name = request_as_json.get("class", DEFAULT_CLASS) diff --git a/progressReport/requirements.txt b/progressReport/requirements.txt index efb2ac8..f17fd88 100644 --- a/progressReport/requirements.txt +++ b/progressReport/requirements.txt @@ -2,3 +2,4 @@ Flask gunicorn Werkzeug jsonschema +deprecated