Reupload files bug

tasky/src/handler/assignment.rs

@@ -137,8 +137,7 @@ pub async fn handle_update_multipart(
 /// Creates files and updates the correlated object_ids
 /// Also updates files in file_structure, because the actual_files are referenced from the file structure
 async fn create_files_and_update_ids(
-    #[allow(clippy::ptr_arg)]
-    actual_files: &mut Vec<&mut AssignmentFile>,
+    #[allow(clippy::ptr_arg)] actual_files: &mut Vec<&mut AssignmentFile>,
     mongodb: &Database,
     filename_map: HashMap<String, (bool, &TempFile)>,
     assignment: &Assignment,

tasky/src/response/assignment.rs

@@ -17,7 +17,7 @@ use crate::{
 use super::{group::MinifiedGroupResponse, shared::User, Enrich};
 
 /// An file on an assignment
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct AssignmentFile {
     pub filename: String,
     pub object_id: Option<String>,
@@ -26,7 +26,7 @@ pub struct AssignmentFile {
 }
 
 /// File structure of an assignment / solution
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct AssignmentFileStructure {
     pub files: Option<Vec<AssignmentFile>>,
     pub folders: Option<Vec<AssignmentFileStructure>>,

web/components/assignments/AssignmentCreateOrUpdateCodeTestModal.tsx

@@ -10,6 +10,7 @@ import useApiServiceClient from "@/hooks/useApiServiceClient";
 import { useForm } from "@mantine/form";
 import {Assignment, RunnerConfig} from "@/service/types/tasky";
 import {useTranslation} from "react-i18next";
+import {removeObjectIds} from "@/utils/FileStructure";
 
 interface AssignmentCreateOrUpdateCodeTestModalProps {
   onClose: () => void;
@@ -66,9 +67,11 @@ const AssignmentCreateOrUpdateCodeTestModal = ({
 
   const submit = form.onSubmit(async (values) => {
     try {
-      await api.createOrUpdateCodeTests(groupId, assignment.id, fileStructure, files, {
+      const fileNames = files.map((file) => file.name);
+      const withoutUpdatedFilesObjectIds = removeObjectIds(fileStructure, fileNames);
+      await api.createOrUpdateCodeTests(groupId, assignment.id, withoutUpdatedFilesObjectIds, files, {
         ...values,
-      } as RunnerConfig);
+      } as RunnerConfig, assignment.file_structure !== null);
       refetch();
       onClose();
     } catch (e: any) {

web/components/assignments/CreateOrUpdateAssignmentModal.tsx

@@ -53,7 +53,7 @@ const CreateOrUpdateAssignmentModal = ({
           values.language,
         );
         notifications.show({
-          message: `${t('messages.successfully-created-assignment')} ${res.title}`,
+          message: `${t('assignment:messages.successfully-created-assignment')} ${res.title}`,
           color: "green",
         });
       }

web/utils/FileStructure.ts

@@ -4,6 +4,7 @@ import {
   FileStructureFile,
   FileStructureTree,
 } from "@/components/FileStructure";
+import {FileWithPath} from "@mantine/dropzone";
 
 /**
  * Builds the mantine tree data from structure
@@ -253,3 +254,22 @@ export const extractFilesFromFileStructure = (
   }
   return files;
 };
+
+/**
+ * Removes all object IDs from the files listed in the second parameter.
+ * This is required for the backend to notice new files.
+ *
+ * @param structure The file structure
+ * @param fileNames All new uploaded files
+ */
+export const removeObjectIds = (structure: FileStructureTree, fileNames: string[]): FileStructureTree => {
+
+  structure.folders = (structure.folders ?? []).map((folder) => removeObjectIds(folder, fileNames));
+  structure.files = structure.files.map((file) => {
+    if (fileNames.indexOf(file.filename) > -1) {
+      return {...file, object_id: null};
+    }
+    return file;
+  });
+  return structure;
+}