Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File upload exercises: Fix an issue with old file submissions not being deleted #7276

Merged
merged 3 commits into from
Oct 3, 2023
Merged

File upload exercises: Fix an issue with old file submissions not being deleted #7276

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e37a6bf
Report error if to-be-deleted file does not exist.
theblobinthesky Sep 27, 2023
292834f
Converting public path to actual path prior to scheduling deletion.
theblobinthesky Sep 27, 2023
9197d31
Use FilePathService service instead of custom method.
theblobinthesky Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@

import javax.persistence.*;

import org.apache.commons.lang3.math.NumberUtils;

import com.fasterxml.jackson.annotation.JsonInclude;

import de.tum.in.www1.artemis.exception.FilePathParsingException;
import de.tum.in.www1.artemis.service.FilePathService;
import de.tum.in.www1.artemis.service.FileService;

Expand Down Expand Up @@ -34,8 +37,25 @@ public String getSubmissionExerciseType() {
@PostRemove
public void onDelete() {
if (filePath != null) {
fileService.schedulePathForDeletion(Path.of(filePath), 0);
Path actualPath = getActualPathForPublicPath(filePath);
fileService.schedulePathForDeletion(actualPath, 0);
}
}

private Path getActualPathForPublicPath(String filePath) {
// Note: This method duplicates functionality from actualPathForPublicPath on FilePathService
krusche marked this conversation as resolved.
Show resolved Hide resolved
// but to avoid this entity depending on the FilePathService service this is separate.

final var splittedPath = filePath.split("/");
final var shouldBeExerciseId = splittedPath.length >= 5 ? splittedPath[4] : null;
if (!NumberUtils.isCreatable(shouldBeExerciseId)) {
throw new FilePathParsingException("Unexpected String in upload file path. Should contain the exercise ID: " + shouldBeExerciseId);
}
final var exerciseId = Long.parseLong(shouldBeExerciseId);

Path submissionDirectory = FileUploadSubmission.buildFilePath(exerciseId, getId());
Path fileName = Path.of(filePath).getFileName();
return submissionDirectory.resolve(fileName);
}

public String getFilePath() {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/de/tum/in/www1/artemis/service/FileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,10 @@ public void schedulePathForDeletion(@Nullable Path path, long delayInMinutes) {
log.info("Delete file {}", path);
Files.delete(path);
}
else {
log.error("Deleting the file {} did not work because it does not exist", path);
}

futures.remove(path);
}
catch (IOException e) {
Expand Down