Fix assign activity using code (Doenet#2444)

sciencelabshs · Jul 7, 2024 · c9daa88 · c9daa88
1 parent 54ef8a1
commit c9daa88
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 36 deletions.
diff --git a/client/src/Tools/_framework/Paths/AllAssignmentScores.tsx b/client/src/Tools/_framework/Paths/AllAssignmentScores.tsx
@@ -38,9 +38,7 @@ type studentStructure = {
 };
 
 export async function loader({ params }) {
-  const { data } = await axios.get(
-    `/api/getAllAssignmentScores/${params.folderId}`,
-  );
+  const { data } = await axios.get(`/api/getAllAssignmentScores/${params.folderId ?? ""}`);
 
   let studentData = {};
   data.assignmentScores.forEach(function (assignment: assignmentStructure) {

diff --git a/client/src/Tools/_framework/Paths/AssignmentViewer.jsx b/client/src/Tools/_framework/Paths/AssignmentViewer.jsx
@@ -39,9 +39,10 @@ export async function loader({ params }) {
 
   // TODO: need to select variant for each student (just once)
 
-  if (params.assignmentId) {
+  if (params.activityId) {
+    // TODO: create this route
     let { data } = await axios.get(
-      `/api/getAssignmentData/${params.assignmentId}`,
+      `/api/getAssignmentData/${params.activityId}`,
     );
     assignment = data;
   } else if (params.classCode) {
@@ -61,25 +62,21 @@ export async function loader({ params }) {
     userName = data.name;
   }
 
-  let assignmentId = params.assignmentId;
-
   // TODO: what happens if assignment has no documents?
-  let docId = assignment.assignmentDocuments[0].docId;
-  let docVersionId = assignment.assignmentDocuments[0].docVersionId;
+  const docId = assignment.documents[0].id;
+  const docVersionNum = assignment.documents[0].assignedVersionNum;
 
-  let doenetML = assignment.assignmentDocuments[0].documentVersion.content;
-  let doenetmlVersion =
-    assignment.assignmentDocuments[0].documentVersion.doenetmlVersion
-      .fullVersion;
+  const doenetML = assignment.documents[0].assignedVersion.source;
+  const doenetmlVersion =
+    assignment.documents[0].assignedVersion.doenetmlVersion.fullVersion;
 
   return {
     assignmentFound: true,
     assignment,
     docId,
-    docVersionId,
+    docVersionNum,
     doenetML,
     doenetmlVersion,
-    assignmentId,
     userName,
   };
 }
@@ -91,7 +88,7 @@ export function AssignmentViewer() {
     assignmentFound,
     userName,
     docId,
-    docVersionId,
+    docVersionNum,
     doenetmlVersion,
   } = useLoaderData();
 
@@ -115,9 +112,9 @@ export function AssignmentViewer() {
       if (event.data.subject == "SPLICE.reportScoreAndState") {
         // TODO: generalize to multiple documents. For now, assume just have one.
         await axios.post("/api/saveScoreAndState", {
-          assignmentId: assignment.assignmentId,
-          docId: assignment.assignmentDocuments[0].docId,
-          docVersionId: assignment.assignmentDocuments[0].docVersionId,
+          activityId: assignment.id,
+          docId: assignment.documents[0].id,
+          docVersionNum: assignment.documents[0].assignedVersionNum,
           score: event.data.score,
           state: JSON.stringify(event.data.state),
           onSubmission: event.data.state.onSubmission,
@@ -126,19 +123,19 @@ export function AssignmentViewer() {
         const data = event.data.data;
         if (data.verb === "submitted") {
           recordSubmittedEvent({
-            assignmentId: assignment.assignmentId,
+            activityId: assignment.id,
             docId,
-            docVersionId,
+            docVersionNum,
             data,
           });
         }
       } else if (event.data.subject == "SPLICE.getState") {
         try {
           let { data } = await axios.get("/api/loadState", {
             params: {
-              assignmentId: assignment.assignmentId,
-              docId: assignment.assignmentDocuments[0].docId,
-              docVersionId: assignment.assignmentDocuments[0].docVersionId,
+              activityId: assignment.id,
+              docId: assignment.documents[0].id,
+              docVersionNum: assignment.documents[0].assignedVersionNum,
               userId: event.data.userId,
             },
           });
@@ -328,9 +325,9 @@ export function AssignmentViewer() {
 }
 
 async function recordSubmittedEvent({
-  assignmentId,
+  activityId,
   docId,
-  docVersionId,
+  docVersionNum,
   data,
 }) {
   const object = JSON.parse(data.object);
@@ -349,9 +346,9 @@ async function recordSubmittedEvent({
     const documentCreditAchieved = context.pageCreditAchieved;
 
     await axios.post(`/api/recordSubmittedEvent`, {
-      assignmentId,
+      activityId,
       docId,
-      docVersionId,
+      docVersionNum,
       answerId,
       answerNumber: object.answerNumber,
       result: {

diff --git a/server/src/model.test.ts b/server/src/model.test.ts
@@ -1498,8 +1498,6 @@ test("open and close assignment with code", async () => {
   let assignmentData = await getAssignmentDataFromCode(classCode, true);
   expect(assignmentData.assignmentFound).eq(true);
   expect(assignmentData.assignment!.id).eq(activityId);
-  expect(assignmentData.assignment!.classCode).eq(classCode);
-  expect(assignmentData.assignment!.codeValidUntil).eqls(closeAt.toJSDate());
   expect(assignmentData.assignment!.documents[0].assignedVersion!.source).eq(
     "Some content",
   );
@@ -1528,8 +1526,6 @@ test("open and close assignment with code", async () => {
   assignmentData = await getAssignmentDataFromCode(classCode, true);
   expect(assignmentData.assignmentFound).eq(true);
   expect(assignmentData.assignment!.id).eq(activityId);
-  expect(assignmentData.assignment!.classCode).eq(classCode);
-  expect(assignmentData.assignment!.codeValidUntil).eqls(closeAt.toJSDate());
 
   // Open with past date.
   // Currently, says assignment is not found
@@ -1563,12 +1559,12 @@ test("open and unassign assignment with code", async () => {
     closeAt,
     ownerId,
   );
+  const assignment = await getAssignment(activityId, ownerId);
+  expect(assignment.classCode).eq(classCode);
+  expect(assignment.codeValidUntil).eqls(closeAt.toJSDate());
 
   let assignmentData = await getAssignmentDataFromCode(classCode, true);
-  expect(assignmentData.assignmentFound).eq(true);
   expect(assignmentData.assignment!.id).eq(activityId);
-  expect(assignmentData.assignment!.classCode).eq(classCode);
-  expect(assignmentData.assignment!.codeValidUntil).eqls(closeAt.toJSDate());
 
   // unassign activity
   await unassignActivity(activityId, ownerId);

diff --git a/server/src/model.ts b/server/src/model.ts
@@ -869,7 +869,8 @@ export async function getAssignmentDataFromCode(
         isAssigned: true,
         isFolder: false,
       },
-      include: {
+      select: {
+        id: true,
         documents: {
           select: {
             id: true,