Merge pull request #761 from rage/progress-fix

General API - Progress
rage · Apr 30, 2021 · 9576e75 · 9576e75
2 parents 70295bc + b9ab2cb
commit 9576e75
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/packages/backendv2/src/controllers/general/index.ts b/packages/backendv2/src/controllers/general/index.ts
@@ -1,16 +1,24 @@
 import Router from "koa-router"
 import { CustomContext, CustomState } from "../../types"
-import { checkAccessOrThrow } from "../dashboard/util"
-import { UserQuizState, Quiz } from "../../models/"
+import Quiz from "../../models/quiz"
+import UserCoursePartState from "../../models/user_course_part_state"
 import accessControl from "../../middleware/access_control"
+import knex from "../../../database/knex"
 
 const general = new Router<CustomState, CustomContext>({
   prefix: "/general",
 })
   .get("/course/:courseId/progress", accessControl(), async ctx => {
     const courseId = ctx.params.courseId
     const user = ctx.state.user
-    ctx.body = await UserQuizState.getByUserAndCourse(user.id, courseId)
+    try {
+      ctx.body = await knex.transaction(
+        async trx =>
+          await UserCoursePartState.getProgress(user.id, courseId, trx),
+      )
+    } catch (err) {
+      throw err
+    }
   })
 
   .get("/course/:courseId/quiz-titles", accessControl(), async ctx => {

diff --git a/packages/backendv2/tests/generalApi.test.ts b/packages/backendv2/tests/generalApi.test.ts
@@ -45,7 +45,7 @@ describe("general-api", () => {
           return [
             200,
             {
-              id: 1234,
+              id: 2345,
               administrator: true,
             } as UserInfo,
           ]
@@ -92,12 +92,10 @@ describe("general-api", () => {
         const progress = data[0]
         expect(progress).toBeObject()
         expect(progress).toContainAllKeys([
-          "quizId",
-          "peerReviewsGiven",
-          "peerReviewsReceived",
-          "tries",
-          "status",
-          "pointsAwarded",
+          "group",
+          "progress",
+          "n_points",
+          "max_points",
         ])
       })
       .end(done)