From 6926ebf30d7fa5834b176b9899bba6493c230587 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 19:53:43 +0200 Subject: [PATCH 01/95] extract plagiarism detection service --- .../plagiarism/PlagiarismDetectionConfig.java | 33 +++++ .../PlagiarismDetectionService.java | 123 ++++++++++++++++ ...portedForPlagiarismDetectionException.java | 10 ++ ...ProgrammingPlagiarismDetectionService.java | 2 +- .../TextPlagiarismDetectionService.java | 2 +- .../web/rest/ModelingExerciseResource.java | 26 ++-- ...ProgrammingExercisePlagiarismResource.java | 67 +++++---- .../web/rest/TextExerciseResource.java | 25 ++-- .../PlagiarismDetectionServiceTest.java | 138 ++++++++++++++++++ 9 files changed, 362 insertions(+), 64 deletions(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java create mode 100644 src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java create mode 100644 src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java create mode 100644 src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java new file mode 100644 index 000000000000..f4bd4a97bf73 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -0,0 +1,33 @@ +package de.tum.in.www1.artemis.domain.plagiarism; + +import de.tum.in.www1.artemis.domain.DomainObject; + +/** + * Stores configuration for manual and continuous plagiarism control. + */ +public class PlagiarismDetectionConfig extends DomainObject { + + private final float similarityThreshold; + + private final int minimumScore; + + private final int minimumSize; + + public PlagiarismDetectionConfig(float similarityThreshold, int minimumScore, int minimumSize) { + this.similarityThreshold = similarityThreshold; + this.minimumScore = minimumScore; + this.minimumSize = minimumSize; + } + + public float getSimilarityThreshold() { + return similarityThreshold; + } + + public int getMinimumScore() { + return minimumScore; + } + + public int getMinimumSize() { + return minimumSize; + } +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java new file mode 100644 index 000000000000..2a85de2228ee --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -0,0 +1,123 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import java.io.File; +import java.io.IOException; +import java.util.Optional; + +import org.jvnet.hk2.annotations.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import de.jplag.exceptions.ExitException; +import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.TextExercise; +import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; + +@Service +@Component +public class PlagiarismDetectionService { + + private static final Logger log = LoggerFactory.getLogger(PlagiarismDetectionService.class); + + private final TextPlagiarismDetectionService textPlagiarismDetectionService; + + private final Optional programmingLanguageFeatureService; + + private final ProgrammingPlagiarismDetectionService programmingPlagiarismDetectionService; + + private final ModelingPlagiarismDetectionService modelingPlagiarismDetectionService; + + private final PlagiarismResultRepository plagiarismResultRepository; + + public PlagiarismDetectionService(TextPlagiarismDetectionService textPlagiarismDetectionService, Optional programmingLanguageFeatureService, + ProgrammingPlagiarismDetectionService programmingPlagiarismDetectionService, ModelingPlagiarismDetectionService modelingPlagiarismDetectionService, + PlagiarismResultRepository plagiarismResultRepository) { + this.textPlagiarismDetectionService = textPlagiarismDetectionService; + this.programmingLanguageFeatureService = programmingLanguageFeatureService; + this.programmingPlagiarismDetectionService = programmingPlagiarismDetectionService; + this.modelingPlagiarismDetectionService = modelingPlagiarismDetectionService; + this.plagiarismResultRepository = plagiarismResultRepository; + } + + /** + * Check plagiarism in given text exercise + * + * @param exercise exercise to check plagiarism + * @return result of plagiarism checks + */ + public TextPlagiarismResult checkTextExercise(TextExercise exercise, PlagiarismDetectionConfig config) throws ExitException { + var plagiarismResult = textPlagiarismDetectionService.checkPlagiarism(exercise, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize()); + log.info("Finished textPlagiarismDetectionService.checkPlagiarism for exercise {} with {} comparisons,", exercise.getId(), plagiarismResult.getComparisons().size()); + + // TODO: limit the amount temporarily because of database issues + plagiarismResult.sortAndLimit(100); + plagiarismResultRepository.savePlagiarismResultAndRemovePrevious(plagiarismResult); + + plagiarismResultRepository.prepareResultForClient(plagiarismResult); + return plagiarismResult; + } + + private void checkProgrammingLanguageSupport(ProgrammingExercise exercise) throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + var language = exercise.getProgrammingLanguage(); + var programmingLanguageFeature = programmingLanguageFeatureService.orElseThrow().getProgrammingLanguageFeatures(language); + if (!programmingLanguageFeature.plagiarismCheckSupported()) { + throw new ProgrammingLanguageNotSupportedForPlagiarismDetectionException(language); + } + } + + /** + * Check plagiarism in given programing exercise + * + * @param exercise exercise to check plagiarism + * @return result of plagiarism checks + */ + public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercise, PlagiarismDetectionConfig config) + throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + checkProgrammingLanguageSupport(exercise); + + var plagiarismResult = programmingPlagiarismDetectionService.checkPlagiarism(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore()); + log.info("Finished programmingExerciseExportService.checkPlagiarism call for {} comparisons", plagiarismResult.getComparisons().size()); + + plagiarismResultRepository.prepareResultForClient(plagiarismResult); + + // make sure that participation is included in the exercise + plagiarismResult.setExercise(exercise); + return plagiarismResult; + } + + /** + * Check plagiarism in given programing exercise and outputs a Jplag report + * + * @param exercise exercise to check plagiarism + * @return Jplag report of plagiarism checks + */ + public File checkProgrammingExerciseWithJplagReport(ProgrammingExercise exercise, PlagiarismDetectionConfig config) + throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + checkProgrammingLanguageSupport(exercise); + return programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore()); + } + + /** + * Check plagiarism in given modeling exercise + * + * @param exercise exercise to check plagiarism + * @return result of plagiarism checks + */ + public ModelingPlagiarismResult checkModelingExercise(ModelingExercise exercise, PlagiarismDetectionConfig config) { + var plagiarismResult = modelingPlagiarismDetectionService.checkPlagiarism(exercise, config.getSimilarityThreshold(), config.getMinimumSize(), config.getMinimumScore()); + log.info("Finished modelingPlagiarismDetectionService.checkPlagiarism call for {} comparisons", plagiarismResult.getComparisons().size()); + + // TODO: limit the amount temporarily because of database issues + plagiarismResult.sortAndLimit(100); + plagiarismResultRepository.savePlagiarismResultAndRemovePrevious(plagiarismResult); + + plagiarismResultRepository.prepareResultForClient(plagiarismResult); + return plagiarismResult; + } +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java new file mode 100644 index 000000000000..756feb454337 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingLanguageNotSupportedForPlagiarismDetectionException.java @@ -0,0 +1,10 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; + +public class ProgrammingLanguageNotSupportedForPlagiarismDetectionException extends Exception { + + ProgrammingLanguageNotSupportedForPlagiarismDetectionException(ProgrammingLanguage language) { + super("Artemis does not support plagiarism checks for the programming language " + language); + } +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 6ecdb4db702e..dc013841915c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -45,7 +45,7 @@ import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; @Service -public class ProgrammingPlagiarismDetectionService { +class ProgrammingPlagiarismDetectionService { @Value("${artemis.repo-download-clone-path}") private Path repoDownloadClonePath; diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java index 8b8e56241f68..f10d60b81c17 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/TextPlagiarismDetectionService.java @@ -31,7 +31,7 @@ import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; @Service -public class TextPlagiarismDetectionService { +class TextPlagiarismDetectionService { private final Logger log = LoggerFactory.getLogger(TextPlagiarismDetectionService.class); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index b6225019b87d..cebd595846ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -20,6 +20,7 @@ import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; @@ -34,7 +35,7 @@ import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.ModelingPlagiarismDetectionService; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; @@ -86,7 +87,7 @@ public class ModelingExerciseResource { private final GradingCriterionRepository gradingCriterionRepository; - private final ModelingPlagiarismDetectionService modelingPlagiarismDetectionService; + private final PlagiarismDetectionService plagiarismDetectionService; private final ChannelService channelService; @@ -99,8 +100,7 @@ public ModelingExerciseResource(ModelingExerciseRepository modelingExerciseRepos ModelingExerciseService modelingExerciseService, ExerciseDeletionService exerciseDeletionService, PlagiarismResultRepository plagiarismResultRepository, ModelingExerciseImportService modelingExerciseImportService, SubmissionExportService modelingSubmissionExportService, ExerciseService exerciseService, GroupNotificationScheduleService groupNotificationScheduleService, GradingCriterionRepository gradingCriterionRepository, - ModelingPlagiarismDetectionService modelingPlagiarismDetectionService, ChannelService channelService, ConversationService conversationService, - ChannelRepository channelRepository) { + PlagiarismDetectionService plagiarismDetectionService, ChannelService channelService, ConversationService conversationService, ChannelRepository channelRepository) { this.modelingExerciseRepository = modelingExerciseRepository; this.courseService = courseService; this.modelingExerciseService = modelingExerciseService; @@ -115,7 +115,7 @@ public ModelingExerciseResource(ModelingExerciseRepository modelingExerciseRepos this.groupNotificationScheduleService = groupNotificationScheduleService; this.exerciseService = exerciseService; this.gradingCriterionRepository = gradingCriterionRepository; - this.modelingPlagiarismDetectionService = modelingPlagiarismDetectionService; + this.plagiarismDetectionService = plagiarismDetectionService; this.channelService = channelService; this.conversationService = conversationService; this.channelRepository = channelRepository; @@ -396,17 +396,11 @@ public ResponseEntity checkPlagiarism(@PathVariable lo var modelingExercise = modelingExerciseRepository.findByIdWithStudentParticipationsSubmissionsResultsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); long start = System.nanoTime(); - log.info("Start modelingPlagiarismDetectionService.checkPlagiarism for exercise {}", exerciseId); - var plagiarismResult = modelingPlagiarismDetectionService.checkPlagiarism(modelingExercise, similarityThreshold / 100, minimumSize, minimumScore); - log.info("Finished modelingPlagiarismDetectionService.checkPlagiarism call for {} comparisons in {}", plagiarismResult.getComparisons().size(), - TimeLogUtil.formatDurationFrom(start)); - // TODO: limit the amount temporarily because of database issues - plagiarismResult.sortAndLimit(100); - log.info("Limited number of comparisons to {} to avoid performance issues when saving to database", plagiarismResult.getComparisons().size()); - start = System.nanoTime(); - plagiarismResultRepository.savePlagiarismResultAndRemovePrevious(plagiarismResult); - log.info("Finished plagiarismResultRepository.savePlagiarismResultAndRemovePrevious call in {}", TimeLogUtil.formatDurationFrom(start)); - plagiarismResultRepository.prepareResultForClient(plagiarismResult); + log.info("Started manual plagiarism checks for modeling exercise: exerciseId={}.", exerciseId); + var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); + var plagiarismResult = plagiarismDetectionService.checkModelingExercise(modelingExercise, config); + log.info("Finished manual plagiarism checks for modeling exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); + return ResponseEntity.ok(plagiarismResult); } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index b170639fbb0d..de1f3c777eb6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -2,7 +2,6 @@ import static de.tum.in.www1.artemis.web.rest.ProgrammingExerciseResourceEndpoints.*; -import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Optional; @@ -18,7 +17,7 @@ import de.jplag.exceptions.ExitException; import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; @@ -27,8 +26,8 @@ import de.tum.in.www1.artemis.service.AuthorizationCheckService; import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; @@ -55,16 +54,16 @@ public class ProgrammingExercisePlagiarismResource { private final Optional programmingLanguageFeatureService; - private final ProgrammingPlagiarismDetectionService programmingPlagiarismDetectionService; + private final PlagiarismDetectionService plagiarismDetectionService; public ProgrammingExercisePlagiarismResource(ProgrammingExerciseRepository programmingExerciseRepository, AuthorizationCheckService authCheckService, PlagiarismResultRepository plagiarismResultRepository, Optional programmingLanguageFeatureService, - ProgrammingPlagiarismDetectionService programmingPlagiarismDetectionService) { + PlagiarismDetectionService plagiarismDetectionService) { this.programmingExerciseRepository = programmingExerciseRepository; this.authCheckService = authCheckService; this.plagiarismResultRepository = plagiarismResultRepository; this.programmingLanguageFeatureService = programmingLanguageFeatureService; - this.programmingPlagiarismDetectionService = programmingPlagiarismDetectionService; + this.plagiarismDetectionService = plagiarismDetectionService; } /** @@ -102,21 +101,20 @@ public ResponseEntity checkPlagiarism(@PathVariable long e throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); - ProgrammingLanguage language = programmingExercise.getProgrammingLanguage(); - ProgrammingLanguageFeature programmingLanguageFeature = programmingLanguageFeatureService.orElseThrow().getProgrammingLanguageFeatures(language); - - if (!programmingLanguageFeature.plagiarismCheckSupported()) { - throw new BadRequestAlertException("Artemis does not support plagiarism checks for the programming language " + programmingExercise.getProgrammingLanguage(), - ENTITY_NAME, "programmingLanguageNotSupported"); - } long start = System.nanoTime(); - log.info("Start programmingPlagiarismDetectionService.checkPlagiarism for exercise {}", exerciseId); - var plagiarismResult = programmingPlagiarismDetectionService.checkPlagiarism(exerciseId, similarityThreshold, minimumScore); - log.info("Finished programmingExerciseExportService.checkPlagiarism call for {} comparisons in {}", plagiarismResult.getComparisons().size(), - TimeLogUtil.formatDurationFrom(start)); - plagiarismResultRepository.prepareResultForClient(plagiarismResult); - return ResponseEntity.ok(plagiarismResult); + log.info("Started manual plagiarism checks for programming exercise: exerciseId={}.", exerciseId); + var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, 0); + try { + var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise, config); + return ResponseEntity.ok(plagiarismResult); + } + catch (ProgrammingLanguageNotSupportedForPlagiarismDetectionException e) { + throw new BadRequestAlertException(e.getMessage(), ENTITY_NAME, "programmingLanguageNotSupported"); + } + finally { + log.info("Finished manual plagiarism checks for programming exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); + } } /** @@ -136,18 +134,25 @@ public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable lon log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); - var programmingLanguageFeature = programmingLanguageFeatureService.orElseThrow().getProgrammingLanguageFeatures(programmingExercise.getProgrammingLanguage()); - if (!programmingLanguageFeature.plagiarismCheckSupported()) { - throw new BadRequestAlertException("Artemis does not support plagiarism checks for the programming language " + programmingExercise.getProgrammingLanguage(), - "Plagiarism Check", "programmingLanguageNotSupported"); - } - File zipFile = programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(exerciseId, similarityThreshold, minimumScore); - if (zipFile == null) { - throw new BadRequestAlertException("Insufficient amount of valid and long enough submissions available for comparison.", "Plagiarism Check", "notEnoughSubmissions"); + long start = System.nanoTime(); + log.info("Started manual plagiarism checks with Jplag report for programming exercise: exerciseId={}.", exerciseId); + var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, 0); + try { + var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise, config); + if (zipFile == null) { + throw new BadRequestAlertException("Insufficient amount of valid and long enough submissions available for comparison.", "Plagiarism Check", + "notEnoughSubmissions"); + } + + var resource = new InputStreamResource(new FileInputStream(zipFile)); + return ResponseEntity.ok().contentLength(zipFile.length()).contentType(MediaType.APPLICATION_OCTET_STREAM).header("filename", zipFile.getName()).body(resource); + } + catch (ProgrammingLanguageNotSupportedForPlagiarismDetectionException e) { + throw new BadRequestAlertException(e.getMessage(), ENTITY_NAME, "programmingLanguageNotSupported"); + } + finally { + log.info("Finished manual plagiarism checks with Jplag report for programming exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); } - - InputStreamResource resource = new InputStreamResource(new FileInputStream(zipFile)); - return ResponseEntity.ok().contentLength(zipFile.length()).contentType(MediaType.APPLICATION_OCTET_STREAM).header("filename", zipFile.getName()).body(resource); } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 95bd8747cf66..bdeff6fd8431 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -16,6 +16,7 @@ import de.tum.in.www1.artemis.domain.*; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; @@ -29,7 +30,7 @@ import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; import de.tum.in.www1.artemis.service.metis.conversation.ConversationService; import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.TextPlagiarismDetectionService; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; @@ -93,7 +94,7 @@ public class TextExerciseResource { private final InstanceMessageSendService instanceMessageSendService; - private final TextPlagiarismDetectionService textPlagiarismDetectionService; + private final PlagiarismDetectionService plagiarismDetectionService; private final CourseRepository courseRepository; @@ -109,7 +110,7 @@ public TextExerciseResource(TextExerciseRepository textExerciseRepository, TextE ParticipationRepository participationRepository, ResultRepository resultRepository, TextExerciseImportService textExerciseImportService, TextSubmissionExportService textSubmissionExportService, ExampleSubmissionRepository exampleSubmissionRepository, ExerciseService exerciseService, GradingCriterionRepository gradingCriterionRepository, TextBlockRepository textBlockRepository, GroupNotificationScheduleService groupNotificationScheduleService, - InstanceMessageSendService instanceMessageSendService, TextPlagiarismDetectionService textPlagiarismDetectionService, CourseRepository courseRepository, + InstanceMessageSendService instanceMessageSendService, PlagiarismDetectionService plagiarismDetectionService, CourseRepository courseRepository, ChannelService channelService, ChannelRepository channelRepository, ConversationService conversationService) { this.feedbackRepository = feedbackRepository; this.exerciseDeletionService = exerciseDeletionService; @@ -130,7 +131,7 @@ public TextExerciseResource(TextExerciseRepository textExerciseRepository, TextE this.exerciseService = exerciseService; this.gradingCriterionRepository = gradingCriterionRepository; this.instanceMessageSendService = instanceMessageSendService; - this.textPlagiarismDetectionService = textPlagiarismDetectionService; + this.plagiarismDetectionService = plagiarismDetectionService; this.courseRepository = courseRepository; this.channelService = channelService; this.conversationService = conversationService; @@ -496,18 +497,12 @@ public ResponseEntity checkPlagiarism(@PathVariable long e @RequestParam int minimumSize) throws ExitException { TextExercise textExercise = textExerciseRepository.findByIdWithStudentParticipationsAndSubmissionsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, textExercise, null); - log.info("Start textPlagiarismDetectionService.checkPlagiarism for exercise {}", exerciseId); + long start = System.nanoTime(); - var plagiarismResult = textPlagiarismDetectionService.checkPlagiarism(textExercise, similarityThreshold, minimumScore, minimumSize); - log.info("Finished textPlagiarismDetectionService.checkPlagiarism for exercise {} with {} comparisons in {}", exerciseId, plagiarismResult.getComparisons().size(), - TimeLogUtil.formatDurationFrom(start)); - // TODO: limit the amount temporarily because of database issues - plagiarismResult.sortAndLimit(100); - log.info("Limited number of comparisons to {} to avoid performance issues when saving to database", plagiarismResult.getComparisons().size()); - start = System.nanoTime(); - plagiarismResultRepository.savePlagiarismResultAndRemovePrevious(plagiarismResult); - log.info("Finished plagiarismResultRepository.savePlagiarismResultAndRemovePrevious call in {}", TimeLogUtil.formatDurationFrom(start)); - plagiarismResultRepository.prepareResultForClient(plagiarismResult); + log.info("Started manual plagiarism checks for text exercise: exerciseId={}.", exerciseId); + var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); + var plagiarismResult = plagiarismDetectionService.checkTextExercise(textExercise, config); + log.info("Finished manual plagiarism checks for text exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); return ResponseEntity.ok(plagiarismResult); } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java new file mode 100644 index 000000000000..95f3f3a0857f --- /dev/null +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java @@ -0,0 +1,138 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import static java.util.Collections.emptyList; +import static java.util.Collections.emptySet; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.io.File; +import java.io.IOException; +import java.util.Optional; + +import org.junit.jupiter.api.Test; + +import de.jplag.exceptions.ExitException; +import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.TextExercise; +import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; +import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; +import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; + +class PlagiarismDetectionServiceTest { + + private final PlagiarismDetectionConfig config = new PlagiarismDetectionConfig(0.5f, 1, 2); + + private final TextPlagiarismDetectionService textPlagiarismDetectionService = mock(); + + private final ProgrammingLanguageFeatureService programmingLanguageFeatureService = mock(); + + private final ProgrammingPlagiarismDetectionService programmingPlagiarismDetectionService = mock(); + + private final ModelingPlagiarismDetectionService modelingPlagiarismDetectionService = mock(); + + private final PlagiarismResultRepository plagiarismResultRepository = mock(); + + private final PlagiarismDetectionService service = new PlagiarismDetectionService(textPlagiarismDetectionService, Optional.of(programmingLanguageFeatureService), + programmingPlagiarismDetectionService, modelingPlagiarismDetectionService, plagiarismResultRepository); + + @Test + void shouldExecuteChecksForTextExercise() throws ExitException { + // given + var textExercise = new TextExercise(); + var textPlagiarismResult = new TextPlagiarismResult(); + textPlagiarismResult.setComparisons(emptySet()); + when(textPlagiarismDetectionService.checkPlagiarism(textExercise, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize())) + .thenReturn(textPlagiarismResult); + + // when + var result = service.checkTextExercise(textExercise, config); + + // then + assertThat(result).isEqualTo(textPlagiarismResult); + } + + @Test + void shouldExecuteChecksForModelingExercise() { + // given + var modelingExercise = new ModelingExercise(); + var modelingPlagiarismResult = new ModelingPlagiarismResult(); + modelingPlagiarismResult.setComparisons(emptySet()); + when(modelingPlagiarismDetectionService.checkPlagiarism(modelingExercise, config.getSimilarityThreshold(), config.getMinimumSize(), config.getMinimumScore())) + .thenReturn(modelingPlagiarismResult); + + // when + var result = service.checkModelingExercise(modelingExercise, config); + + // then + assertThat(result).isEqualTo(modelingPlagiarismResult); + } + + @Test + void shouldExecuteChecksForProgrammingExercise() throws IOException, ExitException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + // given + var programmingExercise = new ProgrammingExercise(); + programmingExercise.setId(1L); + var programmingPlagiarismResult = new TextPlagiarismResult(); + programmingPlagiarismResult.setComparisons(emptySet()); + when(programmingPlagiarismDetectionService.checkPlagiarism(1L, config.getSimilarityThreshold(), config.getMinimumScore())).thenReturn(programmingPlagiarismResult); + + // and + var programmingLanguageFeature = new ProgrammingLanguageFeature(null, false, false, true, false, false, emptyList(), false, false, false); + when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); + + // when + var result = service.checkProgrammingExercise(programmingExercise, config); + + // then + assertThat(result).isEqualTo(programmingPlagiarismResult); + } + + @Test + void shouldThrowExceptionOnUnsupportedProgrammingLanguage() { + // given + var programmingExercise = new ProgrammingExercise(); + var programmingLanguageFeature = new ProgrammingLanguageFeature(null, false, false, false, false, false, emptyList(), false, false, false); + when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); + + // expect + assertThatThrownBy(() -> service.checkProgrammingExercise(programmingExercise, config)).isInstanceOf(ProgrammingLanguageNotSupportedForPlagiarismDetectionException.class); + } + + @Test + void shouldExecuteChecksWithJplagReportForProgrammingExercise() throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + // given + var programmingExercise = new ProgrammingExercise(); + programmingExercise.setId(1L); + var zipFile = new File(""); + when(programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(eq(1L), anyFloat(), anyInt())).thenReturn(zipFile); + + // and + var programmingLanguageFeature = new ProgrammingLanguageFeature(null, false, false, true, false, false, emptyList(), false, false, false); + when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); + + // when + var result = service.checkProgrammingExerciseWithJplagReport(programmingExercise, config); + + // then + assertThat(result).isEqualTo(zipFile); + } + + @Test + void shouldThrowExceptionOnUnsupportedProgrammingLanguageForChecksWithJplagReport() { + // given + var programmingExercise = new ProgrammingExercise(); + var programmingLanguageFeature = new ProgrammingLanguageFeature(null, false, false, false, false, false, emptyList(), false, false, false); + when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); + + // expect + assertThatThrownBy(() -> service.checkProgrammingExerciseWithJplagReport(programmingExercise, config)) + .isInstanceOf(ProgrammingLanguageNotSupportedForPlagiarismDetectionException.class); + } +} From 4051833fb95f9eb21d80873170b12e8381a1d9e7 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 20:26:08 +0200 Subject: [PATCH 02/95] fix similarity for modeling exercises --- .../service/plagiarism/ModelingPlagiarismDetectionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java index 24ddbfbd39bb..026799d8661c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ModelingPlagiarismDetectionService.java @@ -149,7 +149,7 @@ public ModelingPlagiarismResult checkPlagiarism(List modelin final double similarity = model1.similarity(model2); log.debug("Compare result {} with {}: {}", i, j, similarity); - if (similarity < minimumSimilarity) { + if (similarity * 100 < minimumSimilarity) { // ignore comparison results with too small similarity continue; } From fc8c70eb9eba216640bc816afa4d1f0756221444 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 21:28:49 +0200 Subject: [PATCH 03/95] fix code tests --- .../plagiarism/PlagiarismDetectionConfig.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index f4bd4a97bf73..4981528ffe8b 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -7,11 +7,14 @@ */ public class PlagiarismDetectionConfig extends DomainObject { - private final float similarityThreshold; + private float similarityThreshold; - private final int minimumScore; + private int minimumScore; - private final int minimumSize; + private int minimumSize; + + public PlagiarismDetectionConfig() { + } public PlagiarismDetectionConfig(float similarityThreshold, int minimumScore, int minimumSize) { this.similarityThreshold = similarityThreshold; @@ -23,11 +26,23 @@ public float getSimilarityThreshold() { return similarityThreshold; } + public void setSimilarityThreshold(float similarityThreshold) { + this.similarityThreshold = similarityThreshold; + } + public int getMinimumScore() { return minimumScore; } + public void setMinimumScore(int minimumScore) { + this.minimumScore = minimumScore; + } + public int getMinimumSize() { return minimumSize; } + + public void setMinimumSize(int minimumSize) { + this.minimumSize = minimumSize; + } } From 9dfc8916ec21acb4bdf62220306761549f556451 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 21:29:19 +0200 Subject: [PATCH 04/95] extract save logic to a method --- .../PlagiarismDetectionService.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java index 2a85de2228ee..07fb3c6a538a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -14,6 +14,7 @@ import de.tum.in.www1.artemis.domain.TextExercise; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; @@ -55,22 +56,10 @@ public TextPlagiarismResult checkTextExercise(TextExercise exercise, PlagiarismD var plagiarismResult = textPlagiarismDetectionService.checkPlagiarism(exercise, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize()); log.info("Finished textPlagiarismDetectionService.checkPlagiarism for exercise {} with {} comparisons,", exercise.getId(), plagiarismResult.getComparisons().size()); - // TODO: limit the amount temporarily because of database issues - plagiarismResult.sortAndLimit(100); - plagiarismResultRepository.savePlagiarismResultAndRemovePrevious(plagiarismResult); - - plagiarismResultRepository.prepareResultForClient(plagiarismResult); + trimAndSavePlagiarismResult(plagiarismResult); return plagiarismResult; } - private void checkProgrammingLanguageSupport(ProgrammingExercise exercise) throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { - var language = exercise.getProgrammingLanguage(); - var programmingLanguageFeature = programmingLanguageFeatureService.orElseThrow().getProgrammingLanguageFeatures(language); - if (!programmingLanguageFeature.plagiarismCheckSupported()) { - throw new ProgrammingLanguageNotSupportedForPlagiarismDetectionException(language); - } - } - /** * Check plagiarism in given programing exercise * @@ -113,11 +102,23 @@ public ModelingPlagiarismResult checkModelingExercise(ModelingExercise exercise, var plagiarismResult = modelingPlagiarismDetectionService.checkPlagiarism(exercise, config.getSimilarityThreshold(), config.getMinimumSize(), config.getMinimumScore()); log.info("Finished modelingPlagiarismDetectionService.checkPlagiarism call for {} comparisons", plagiarismResult.getComparisons().size()); - // TODO: limit the amount temporarily because of database issues + trimAndSavePlagiarismResult(plagiarismResult); + return plagiarismResult; + } + + private void trimAndSavePlagiarismResult(PlagiarismResult plagiarismResult) { + // Limit the amount temporarily because of database issues plagiarismResult.sortAndLimit(100); plagiarismResultRepository.savePlagiarismResultAndRemovePrevious(plagiarismResult); plagiarismResultRepository.prepareResultForClient(plagiarismResult); - return plagiarismResult; + } + + private void checkProgrammingLanguageSupport(ProgrammingExercise exercise) throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + var language = exercise.getProgrammingLanguage(); + var programmingLanguageFeature = programmingLanguageFeatureService.orElseThrow().getProgrammingLanguageFeatures(language); + if (!programmingLanguageFeature.plagiarismCheckSupported()) { + throw new ProgrammingLanguageNotSupportedForPlagiarismDetectionException(language); + } } } From c83eefbcd8aed2618a994cf08b4755c1ae8829f7 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 21:46:42 +0200 Subject: [PATCH 05/95] remove unused field --- .../artemis/web/rest/ProgrammingExercisePlagiarismResource.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index de1f3c777eb6..7ac08ba89ae9 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -52,8 +52,6 @@ public class ProgrammingExercisePlagiarismResource { private final PlagiarismResultRepository plagiarismResultRepository; - private final Optional programmingLanguageFeatureService; - private final PlagiarismDetectionService plagiarismDetectionService; public ProgrammingExercisePlagiarismResource(ProgrammingExerciseRepository programmingExerciseRepository, AuthorizationCheckService authCheckService, From c23635b9ca93188097f55b87f8fd6e04e46b270c Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 21:52:00 +0200 Subject: [PATCH 06/95] add doc --- .../artemis/service/plagiarism/PlagiarismDetectionService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java index 07fb3c6a538a..0791a4f625df 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -20,6 +20,9 @@ import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +/** + * Service for triggering plagiarism checks. + */ @Service @Component public class PlagiarismDetectionService { From c80f975041c83bdcd37b77f99ca19e95a94d5ecf Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 7 Sep 2023 21:54:44 +0200 Subject: [PATCH 07/95] add missing @param --- .../service/plagiarism/PlagiarismDetectionService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java index 0791a4f625df..f81741ac5855 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -53,6 +53,7 @@ public PlagiarismDetectionService(TextPlagiarismDetectionService textPlagiarismD * Check plagiarism in given text exercise * * @param exercise exercise to check plagiarism + * @param config configuration for plagiarism detection * @return result of plagiarism checks */ public TextPlagiarismResult checkTextExercise(TextExercise exercise, PlagiarismDetectionConfig config) throws ExitException { @@ -67,6 +68,7 @@ public TextPlagiarismResult checkTextExercise(TextExercise exercise, PlagiarismD * Check plagiarism in given programing exercise * * @param exercise exercise to check plagiarism + * @param config configuration for plagiarism detection * @return result of plagiarism checks */ public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercise, PlagiarismDetectionConfig config) @@ -87,6 +89,7 @@ public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercis * Check plagiarism in given programing exercise and outputs a Jplag report * * @param exercise exercise to check plagiarism + * @param config configuration for plagiarism detection * @return Jplag report of plagiarism checks */ public File checkProgrammingExerciseWithJplagReport(ProgrammingExercise exercise, PlagiarismDetectionConfig config) @@ -99,6 +102,7 @@ public File checkProgrammingExerciseWithJplagReport(ProgrammingExercise exercise * Check plagiarism in given modeling exercise * * @param exercise exercise to check plagiarism + * @param config configuration for plagiarism detection * @return result of plagiarism checks */ public ModelingPlagiarismResult checkModelingExercise(ModelingExercise exercise, PlagiarismDetectionConfig config) { From c433abcfeae6e5664fbe79cee4d26d12a9527f5e Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 8 Sep 2023 10:51:10 +0200 Subject: [PATCH 08/95] fix field removal --- .../web/rest/ProgrammingExercisePlagiarismResource.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 7ac08ba89ae9..99a617a0727e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -4,7 +4,6 @@ import java.io.FileInputStream; import java.io.IOException; -import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +27,6 @@ import de.tum.in.www1.artemis.service.feature.FeatureToggle; import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; -import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; @@ -55,12 +53,10 @@ public class ProgrammingExercisePlagiarismResource { private final PlagiarismDetectionService plagiarismDetectionService; public ProgrammingExercisePlagiarismResource(ProgrammingExerciseRepository programmingExerciseRepository, AuthorizationCheckService authCheckService, - PlagiarismResultRepository plagiarismResultRepository, Optional programmingLanguageFeatureService, - PlagiarismDetectionService plagiarismDetectionService) { + PlagiarismResultRepository plagiarismResultRepository, PlagiarismDetectionService plagiarismDetectionService) { this.programmingExerciseRepository = programmingExerciseRepository; this.authCheckService = authCheckService; this.plagiarismResultRepository = plagiarismResultRepository; - this.programmingLanguageFeatureService = programmingLanguageFeatureService; this.plagiarismDetectionService = plagiarismDetectionService; } From ede87eafa139f5efa96ed9ea98a608ab8d85255d Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 10 Sep 2023 10:43:37 +0200 Subject: [PATCH 09/95] add minimum length for programming exercises --- ...ogrammingExerciseGitDiffReportService.java | 26 ++++++++++++++----- .../PlagiarismDetectionService.java | 6 +++-- ...ProgrammingPlagiarismDetectionService.java | 25 +++++++++++++----- ...ProgrammingExercisePlagiarismResource.java | 12 ++++----- .../plagiarism-inspector.component.html | 2 +- .../PlagiarismDetectionServiceTest.java | 6 +++-- 6 files changed, 54 insertions(+), 23 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index f34867ea864c..86bfe48c7f22 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -2,10 +2,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; +import java.nio.file.Path; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -17,8 +15,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.*; import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; @@ -158,6 +155,23 @@ public ProgrammingExerciseGitDiffReport getOrCreateReportOfExercise(ProgrammingE } } + public int calculateNumberOfDiffLinesBetweenRepos(VcsRepositoryUrl urlRepoA, Path localPathRepoA, VcsRepositoryUrl urlRepoB, Path localPathRepoB) { + var repoA = gitService.getExistingCheckedOutRepositoryByLocalPath(localPathRepoA, urlRepoA); + var repoB = gitService.getExistingCheckedOutRepositoryByLocalPath(localPathRepoB, urlRepoB); + + var treeParserRepoA = new FileTreeIterator(repoA); + var treeParserRepoB = new FileTreeIterator(repoB); + + try (var diffOutputStream = new ByteArrayOutputStream(); var git = Git.wrap(repoA)) { + git.diff().setOldTree(treeParserRepoA).setNewTree(treeParserRepoB).setOutputStream(diffOutputStream).call(); + var diff = diffOutputStream.toString(); + return extractDiffEntries(diff).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).sum(); + } + catch (IOException | GitAPIException e) { + return Integer.MAX_VALUE; + } + } + /** * Creates a new ProgrammingExerciseGitDiffReport for an exercise. * It will take the git-diff between the template and solution repositories and return all changes. diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java index f81741ac5855..0e6ebc8b237a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -75,7 +75,8 @@ public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercis throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { checkProgrammingLanguageSupport(exercise); - var plagiarismResult = programmingPlagiarismDetectionService.checkPlagiarism(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore()); + var plagiarismResult = programmingPlagiarismDetectionService.checkPlagiarism(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore(), + config.getMinimumSize()); log.info("Finished programmingExerciseExportService.checkPlagiarism call for {} comparisons", plagiarismResult.getComparisons().size()); plagiarismResultRepository.prepareResultForClient(plagiarismResult); @@ -95,7 +96,8 @@ public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercis public File checkProgrammingExerciseWithJplagReport(ProgrammingExercise exercise, PlagiarismDetectionConfig config) throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { checkProgrammingLanguageSupport(exercise); - return programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore()); + return programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore(), + config.getMinimumSize()); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index dc013841915c..e986d2c7d545 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -39,6 +39,7 @@ import de.tum.in.www1.artemis.service.FileService; import de.tum.in.www1.artemis.service.UrlService; import de.tum.in.www1.artemis.service.connectors.GitService; +import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseGitDiffReportService; import de.tum.in.www1.artemis.service.plagiarism.cache.PlagiarismCacheService; import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseExportService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; @@ -72,10 +73,12 @@ class ProgrammingPlagiarismDetectionService { private final UrlService urlService; + private final ProgrammingExerciseGitDiffReportService programmingExerciseGitDiffReportService; + public ProgrammingPlagiarismDetectionService(ProgrammingExerciseRepository programmingExerciseRepository, FileService fileService, GitService gitService, StudentParticipationRepository studentParticipationRepository, PlagiarismResultRepository plagiarismResultRepository, ProgrammingExerciseExportService programmingExerciseExportService, PlagiarismWebsocketService plagiarismWebsocketService, PlagiarismCacheService plagiarismCacheService, - UrlService urlService) { + UrlService urlService, ProgrammingExerciseGitDiffReportService programmingExerciseGitDiffReportService) { this.programmingExerciseRepository = programmingExerciseRepository; this.fileService = fileService; this.gitService = gitService; @@ -85,6 +88,7 @@ public ProgrammingPlagiarismDetectionService(ProgrammingExerciseRepository progr this.plagiarismWebsocketService = plagiarismWebsocketService; this.plagiarismCacheService = plagiarismCacheService; this.urlService = urlService; + this.programmingExerciseGitDiffReportService = programmingExerciseGitDiffReportService; } /** @@ -97,7 +101,7 @@ public ProgrammingPlagiarismDetectionService(ProgrammingExerciseRepository progr * @throws ExitException is thrown if JPlag exits unexpectedly * @throws IOException is thrown for file handling errors */ - public TextPlagiarismResult checkPlagiarism(long programmingExerciseId, float similarityThreshold, int minimumScore) throws ExitException, IOException { + public TextPlagiarismResult checkPlagiarism(long programmingExerciseId, float similarityThreshold, int minimumScore, int minimumSize) throws ExitException, IOException { long start = System.nanoTime(); String topic = plagiarismWebsocketService.getProgrammingExercisePlagiarismCheckTopic(programmingExerciseId); @@ -112,7 +116,7 @@ public TextPlagiarismResult checkPlagiarism(long programmingExerciseId, float si } plagiarismCacheService.setActivePlagiarismCheck(courseId); - JPlagResult jPlagResult = computeJPlagResult(programmingExercise, similarityThreshold, minimumScore); + JPlagResult jPlagResult = computeJPlagResult(programmingExercise, similarityThreshold, minimumScore, minimumSize); if (jPlagResult == null) { log.info("Insufficient amount of submissions for plagiarism detection. Return empty result."); TextPlagiarismResult textPlagiarismResult = new TextPlagiarismResult(); @@ -148,11 +152,11 @@ public TextPlagiarismResult checkPlagiarism(long programmingExerciseId, float si * @param minimumScore consider only submissions whose score is greater or equal to this value * @return a zip file that can be returned to the client */ - public File checkPlagiarismWithJPlagReport(long programmingExerciseId, float similarityThreshold, int minimumScore) { + public File checkPlagiarismWithJPlagReport(long programmingExerciseId, float similarityThreshold, int minimumScore, int minimumSize) { long start = System.nanoTime(); final var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationElseThrow(programmingExerciseId); - JPlagResult result = computeJPlagResult(programmingExercise, similarityThreshold, minimumScore); + JPlagResult result = computeJPlagResult(programmingExercise, similarityThreshold, minimumScore, minimumSize); log.info("JPlag programming comparison finished with {} comparisons in {}", result.getAllComparisons().size(), TimeLogUtil.formatDurationFrom(start)); return generateJPlagReportZip(result, programmingExercise); @@ -167,7 +171,7 @@ public File checkPlagiarismWithJPlagReport(long programmingExerciseId, float sim * @return the JPlag result or null if there are not enough participations */ @NotNull - private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, float similarityThreshold, int minimumScore) { + private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, float similarityThreshold, int minimumScore, int minimumSize) { long programmingExerciseId = programmingExercise.getId(); final var targetPath = fileService.getTemporaryUniquePath(repoDownloadClonePath, 60); List participations = filterStudentParticipationsForComparison(programmingExercise, minimumScore); @@ -188,9 +192,18 @@ private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, JPlagOptions options = new JPlagOptions(programmingLanguage, Set.of(repoFolder), Set.of()) // JPlag expects a value between 0.0 and 1.0 .withSimilarityThreshold(similarityThreshold / 100.0).withClusteringOptions(new ClusteringOptions().withEnabled(false)); + if (templateRepoName != null) { + var templateFolder = targetPath.resolve(projectKey).resolve(templateRepoName).toFile(); options = options.withBaseCodeSubmissionDirectory(templateFolder); + + repositories = repositories.stream().filter(repository -> { + var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos( + programmingExercise.getTemplateParticipation().getVcsRepositoryUrl(), templateFolder.toPath(), repository.getRemoteRepositoryUrl(), + repository.getLocalPath()); + return diffToTemplate >= minimumSize; + }).toList(); } log.info("Start JPlag programming comparison for programming exercise {}", programmingExerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 99a617a0727e..9a05b4f1460e 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -91,14 +91,14 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping(CHECK_PLAGIARISM) @EnforceAtLeastEditor @FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks }) - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore) - throws ExitException, IOException { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + @RequestParam int minimumSize) throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for programming exercise: exerciseId={}.", exerciseId); - var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, 0); + var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); try { var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise, config); return ResponseEntity.ok(plagiarismResult); @@ -123,15 +123,15 @@ public ResponseEntity checkPlagiarism(@PathVariable long e @GetMapping(value = CHECK_PLAGIARISM_JPLAG_REPORT) @EnforceAtLeastEditor @FeatureToggle(Feature.ProgrammingExercises) - public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore) - throws IOException { + public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + @RequestParam int minimumSize) throws IOException { log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks with Jplag report for programming exercise: exerciseId={}.", exerciseId); - var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, 0); + var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); try { var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise, config); if (zipFile == null) { diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html index b0cddf737e1b..9bd26fc8c330 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html @@ -91,7 +91,7 @@

-
+
diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java index 95f3f3a0857f..80ec97d07145 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java @@ -81,7 +81,8 @@ void shouldExecuteChecksForProgrammingExercise() throws IOException, ExitExcepti programmingExercise.setId(1L); var programmingPlagiarismResult = new TextPlagiarismResult(); programmingPlagiarismResult.setComparisons(emptySet()); - when(programmingPlagiarismDetectionService.checkPlagiarism(1L, config.getSimilarityThreshold(), config.getMinimumScore())).thenReturn(programmingPlagiarismResult); + when(programmingPlagiarismDetectionService.checkPlagiarism(1L, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize())) + .thenReturn(programmingPlagiarismResult); // and var programmingLanguageFeature = new ProgrammingLanguageFeature(null, false, false, true, false, false, emptyList(), false, false, false); @@ -111,7 +112,8 @@ void shouldExecuteChecksWithJplagReportForProgrammingExercise() throws Programmi var programmingExercise = new ProgrammingExercise(); programmingExercise.setId(1L); var zipFile = new File(""); - when(programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(eq(1L), anyFloat(), anyInt())).thenReturn(zipFile); + when(programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(1L, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize())) + .thenReturn(zipFile); // and var programmingLanguageFeature = new ProgrammingLanguageFeature(null, false, false, true, false, false, emptyList(), false, false, false); From 18fa06f41ab751eb8145502c385600e872645573 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 10 Sep 2023 10:56:48 +0200 Subject: [PATCH 10/95] add doc and fix code style --- ...rogrammingExerciseGitDiffReportService.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index 86bfe48c7f22..d2ca34962c25 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -3,7 +3,10 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.file.Path; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -15,7 +18,9 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.*; +import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.VcsRepositoryUrl; import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffEntry; import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseGitDiffReport; import de.tum.in.www1.artemis.domain.participation.SolutionProgrammingExerciseParticipation; @@ -155,6 +160,15 @@ public ProgrammingExerciseGitDiffReport getOrCreateReportOfExercise(ProgrammingE } } + /** + * Calculates git diff between two repositories and returns the cumulative number of diff lines. + * + * @param urlRepoA url of the first repo to compare + * @param localPathRepoA local path to the checked out instance of the first repo to compare + * @param urlRepoB url of the second repo to compare + * @param localPathRepoB local path to the checked out instance of the second repo to compare + * @return cumulative number of lines in the git diff of given repositories + */ public int calculateNumberOfDiffLinesBetweenRepos(VcsRepositoryUrl urlRepoA, Path localPathRepoA, VcsRepositoryUrl urlRepoB, Path localPathRepoB) { var repoA = gitService.getExistingCheckedOutRepositoryByLocalPath(localPathRepoA, urlRepoA); var repoB = gitService.getExistingCheckedOutRepositoryByLocalPath(localPathRepoB, urlRepoB); From 759cd159843312ce93793be4fa0fa7662335d978 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 11 Sep 2023 17:15:16 +0200 Subject: [PATCH 11/95] fix repos filtering --- ...ProgrammingPlagiarismDetectionService.java | 56 +++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index e986d2c7d545..1ad17b5d1bb3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -6,6 +6,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -181,7 +182,7 @@ private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, throw new BadRequestAlertException("Insufficient amount of valid and long enough submissions available for comparison", "Plagiarism Check", "notEnoughSubmissions"); } - List repositories = downloadRepositories(programmingExercise, participations, targetPath.toString()); + List repositories = downloadRepositories(programmingExercise, participations, targetPath.toString(), minimumSize); log.info("Downloading repositories done for programming exercise {}", programmingExerciseId); final var projectKey = programmingExercise.getProjectKey(); @@ -356,12 +357,41 @@ public List filterStudentParticipationsForComp }).toList(); } - private List downloadRepositories(ProgrammingExercise programmingExercise, List participations, String targetPath) { + private Optional cloneTemplateRepository(ProgrammingExercise programmingExercise, String targetPath) { + try { + var templateRepo = gitService.getOrCheckoutRepository(programmingExercise.getTemplateParticipation(), targetPath); + gitService.resetToOriginHead(templateRepo); // start with clean state + return Optional.of(templateRepo); + } + catch (GitException | GitAPIException ex) { + log.error("Clone template repository {} in exercise '{}' did not work as expected: {}", programmingExercise.getTemplateParticipation().getVcsRepositoryUrl(), + programmingExercise.getTitle(), ex.getMessage()); + return Optional.empty(); + } + } + + private boolean shouldAddRepo(ProgrammingExercise programmingExercise, int minimumSize, Repository repo, Optional templateRepo) { + if (templateRepo.isEmpty()) { + return true; + } + + var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos(programmingExercise.getTemplateParticipation().getVcsRepositoryUrl(), + repo.getLocalPath(), templateRepo.get().getRemoteRepositoryUrl(), templateRepo.get().getLocalPath()); + return diffToTemplate >= minimumSize; + } + + private List downloadRepositories(ProgrammingExercise programmingExercise, List participations, String targetPath, + int minimumSize) { // Used for sending progress notifications var topic = plagiarismWebsocketService.getProgrammingExercisePlagiarismCheckTopic(programmingExercise.getId()); int maxRepositories = participations.size() + 1; List downloadedRepositories = new ArrayList<>(); + + plagiarismWebsocketService.notifyInstructorAboutPlagiarismState(topic, PlagiarismCheckState.RUNNING, List.of("Downloading repositories: 0/" + maxRepositories)); + var templateRepo = cloneTemplateRepository(programmingExercise, targetPath); + templateRepo.ifPresent(downloadedRepositories::add); + participations.parallelStream().forEach(participation -> { try { var progressMessage = "Downloading repositories: " + (downloadedRepositories.size() + 1) + "/" + maxRepositories; @@ -369,7 +399,13 @@ private List downloadRepositories(ProgrammingExercise programmingExe Repository repo = gitService.getOrCheckoutRepositoryForJPlag(participation, targetPath); gitService.resetToOriginHead(repo); // start with clean state - downloadedRepositories.add(repo); + + if (shouldAddRepo(programmingExercise, minimumSize, repo, templateRepo)) { + downloadedRepositories.add(repo); + } + else { + deleteTempLocalRepository(repo); + } } catch (GitException | GitAPIException | InvalidPathException ex) { log.error("Clone student repository {} in exercise '{}' did not work as expected: {}", participation.getVcsRepositoryUrl(), programmingExercise.getTitle(), @@ -377,20 +413,6 @@ private List downloadRepositories(ProgrammingExercise programmingExe } }); - // clone the template repo - try { - var progressMessage = "Downloading repositories: " + maxRepositories + "/" + maxRepositories; - plagiarismWebsocketService.notifyInstructorAboutPlagiarismState(topic, PlagiarismCheckState.RUNNING, List.of(progressMessage)); - - Repository templateRepo = gitService.getOrCheckoutRepository(programmingExercise.getTemplateParticipation(), targetPath); - gitService.resetToOriginHead(templateRepo); // start with clean state - downloadedRepositories.add(templateRepo); - } - catch (GitException | GitAPIException ex) { - log.error("Clone template repository {} in exercise '{}' did not work as expected: {}", programmingExercise.getTemplateParticipation().getVcsRepositoryUrl(), - programmingExercise.getTitle(), ex.getMessage()); - } - return downloadedRepositories; } } From 7fa694c48ab0f0d2b0a77017c998c5f0a739268e Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 11 Sep 2023 17:20:26 +0200 Subject: [PATCH 12/95] add missing @param --- .../artemis/web/rest/ProgrammingExercisePlagiarismResource.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 9a05b4f1460e..9fe72ab56e03 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -84,6 +84,7 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) * @param minimumScore consider only submissions whose score is greater or equal to this value + * @param minimumSize consider only submissions whose number of diff to template lines is greate or equal to this value * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). * @throws ExitException is thrown if JPlag exits unexpectedly * @throws IOException is thrown for file handling errors @@ -117,6 +118,7 @@ public ResponseEntity checkPlagiarism(@PathVariable long e * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) * @param minimumScore consider only submissions whose score is greater or equal to this value + * @param minimumSize consider only submissions whose number of diff to template lines is greate or equal to this value * @return The ResponseEntity with status 201 (Created) or with status 400 (Bad Request) if the parameters are invalid * @throws IOException is thrown for file handling errors */ From 43dfddc8477cc0adf3ab059d6831ed44cc6c4c50 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 11 Sep 2023 19:01:01 +0200 Subject: [PATCH 13/95] use abs of diff lines --- .../service/hestia/ProgrammingExerciseGitDiffReportService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index d2ca34962c25..b457eba26ec4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -179,7 +179,7 @@ public int calculateNumberOfDiffLinesBetweenRepos(VcsRepositoryUrl urlRepoA, Pat try (var diffOutputStream = new ByteArrayOutputStream(); var git = Git.wrap(repoA)) { git.diff().setOldTree(treeParserRepoA).setNewTree(treeParserRepoB).setOutputStream(diffOutputStream).call(); var diff = diffOutputStream.toString(); - return extractDiffEntries(diff).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).sum(); + return extractDiffEntries(diff).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).map(Math::abs).sum(); } catch (IOException | GitAPIException e) { return Integer.MAX_VALUE; From 7f6199005ee3f34a93d23db34f8c9b2710e09ddb Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 11 Sep 2023 20:11:35 +0200 Subject: [PATCH 14/95] fox order of git diff --- .../hestia/ProgrammingExerciseGitDiffReportService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index b457eba26ec4..966cc34c382b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -176,8 +176,8 @@ public int calculateNumberOfDiffLinesBetweenRepos(VcsRepositoryUrl urlRepoA, Pat var treeParserRepoA = new FileTreeIterator(repoA); var treeParserRepoB = new FileTreeIterator(repoB); - try (var diffOutputStream = new ByteArrayOutputStream(); var git = Git.wrap(repoA)) { - git.diff().setOldTree(treeParserRepoA).setNewTree(treeParserRepoB).setOutputStream(diffOutputStream).call(); + try (var diffOutputStream = new ByteArrayOutputStream(); var git = Git.wrap(repoB)) { + git.diff().setOldTree(treeParserRepoB).setNewTree(treeParserRepoA).setOutputStream(diffOutputStream).call(); var diff = diffOutputStream.toString(); return extractDiffEntries(diff).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).map(Math::abs).sum(); } From 211c5ece6c3c3d556434b6dcdc642b74701fa03c Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 11 Sep 2023 20:12:35 +0200 Subject: [PATCH 15/95] revert unnecessary changes --- .../ProgrammingPlagiarismDetectionService.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 1ad17b5d1bb3..89270c6854e3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -193,18 +193,9 @@ private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, JPlagOptions options = new JPlagOptions(programmingLanguage, Set.of(repoFolder), Set.of()) // JPlag expects a value between 0.0 and 1.0 .withSimilarityThreshold(similarityThreshold / 100.0).withClusteringOptions(new ClusteringOptions().withEnabled(false)); - if (templateRepoName != null) { - var templateFolder = targetPath.resolve(projectKey).resolve(templateRepoName).toFile(); options = options.withBaseCodeSubmissionDirectory(templateFolder); - - repositories = repositories.stream().filter(repository -> { - var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos( - programmingExercise.getTemplateParticipation().getVcsRepositoryUrl(), templateFolder.toPath(), repository.getRemoteRepositoryUrl(), - repository.getLocalPath()); - return diffToTemplate >= minimumSize; - }).toList(); } log.info("Start JPlag programming comparison for programming exercise {}", programmingExerciseId); From 10f2e4830f807264a06f047afc16264850307050 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 11 Sep 2023 21:55:40 +0200 Subject: [PATCH 16/95] improve minimum size tooltips --- .../plagiarism-inspector.component.ts | 12 +++++------- src/main/webapp/i18n/de/plagiarism.json | 6 +++--- src/main/webapp/i18n/en/plagiarism.json | 6 +++--- .../plagiarism-inspector.component.spec.ts | 8 ++++---- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts index 47505af1cced..e69d8875925d 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts @@ -384,17 +384,15 @@ export class PlagiarismInspectorComponent implements OnInit { * Return the translation identifier of the minimum size tooltip for the current exercise type. */ getMinimumSizeTooltip() { - const tooltip = 'artemisApp.plagiarism.minimumSizeTooltip'; - switch (this.exercise.type) { + case ExerciseType.PROGRAMMING: { + return 'artemisApp.plagiarism.minimumSizeTooltipProgrammingExercise'; + } case ExerciseType.TEXT: { - return tooltip + 'Text'; + return 'artemisApp.plagiarism.minimumSizeTooltipTextExercise'; } case ExerciseType.MODELING: { - return tooltip + 'Modeling'; - } - default: { - return tooltip; + return 'artemisApp.plagiarism.minimumSizeTooltipModelingExercise'; } } } diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 087164669afb..b7e6996a746b 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -34,9 +34,9 @@ "minimumScore": "Minimale Bewertung in %", "minimumScoreTooltip": "Berücksichtige nur Einreichungen mit einer Bewertung, die mindestens diesem Wert entspricht", "minimumSize": "Minimale Größe", - "minimumSizeTooltip": "Berücksichtige nur Einreichungen, deren Größe mindestens diesem Wert entspricht", - "minimumSizeTooltipModeling": "Berücksichtige nur Einreichungen, die mindestens so viele Modeling-Elemente wie der angegebene Wert haben", - "minimumSizeTooltipText": "Berücksichtige nur Einreichungen, die mindestens so viele Zeichen wie der angegebene Wert haben", + "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value", + "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many words as the specified value", + "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", "noInfoAvailable": "Keine Information verfügbar", "caution": "Die Plagiatskontrolle kann für große Kurse sehr lange dauern.", "detect": "Plagiate finden", diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 2203a200344f..3c3c85d4691b 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -34,9 +34,9 @@ "minimumScore": "Minimum Score in %", "minimumScoreTooltip": "Consider only submissions with a score greater than or equal to this value", "minimumSize": "Minimum Size", - "minimumSizeTooltip": "Consider only submissions whose size is greater or equal to this value", - "minimumSizeTooltipModeling": "Consider only submissions that have at least as many modeling elements as the specified value", - "minimumSizeTooltipText": "Consider only submissions that have at least as many words as the specified value", + "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value", + "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many words as the specified value", + "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", "noInfoAvailable": "No information available", "caution": "Plagiarism detection can take a long time for large courses.", "detect": "Detect plagiarism", diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts index 0a6981a1d5d3..63b05fd3d43c 100644 --- a/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts +++ b/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts @@ -146,22 +146,22 @@ describe('Plagiarism Inspector Component', () => { }); }); - it('should get the minimumSize tootip', () => { + it('should get the minimumSize tooltip for programming', () => { comp.exercise = { type: ExerciseType.PROGRAMMING } as Exercise; - expect(comp.getMinimumSizeTooltip()).toBe('artemisApp.plagiarism.minimumSizeTooltip'); + expect(comp.getMinimumSizeTooltip()).toBe('artemisApp.plagiarism.minimumSizeTooltipProgrammingExercise'); }); it('should get the minimumSize tootip for modeling', () => { comp.exercise = { type: ExerciseType.MODELING } as Exercise; - expect(comp.getMinimumSizeTooltip()).toBe('artemisApp.plagiarism.minimumSizeTooltipModeling'); + expect(comp.getMinimumSizeTooltip()).toBe('artemisApp.plagiarism.minimumSizeTooltipModelingExercise'); }); it('should get the minimumSize tootip for text', () => { comp.exercise = { type: ExerciseType.TEXT } as Exercise; - expect(comp.getMinimumSizeTooltip()).toBe('artemisApp.plagiarism.minimumSizeTooltipText'); + expect(comp.getMinimumSizeTooltip()).toBe('artemisApp.plagiarism.minimumSizeTooltipTextExercise'); }); it('should fetch the plagiarism detection results for modeling exercises', () => { From 8c33e94b8ffb37348cc86ecb6a8f4bf3153936bb Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 13 Sep 2023 09:07:17 +0200 Subject: [PATCH 17/95] fix tooltips and add de translation --- src/main/webapp/i18n/de/plagiarism.json | 6 +++--- src/main/webapp/i18n/en/plagiarism.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index b7e6996a746b..cc1737f42183 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -34,9 +34,9 @@ "minimumScore": "Minimale Bewertung in %", "minimumScoreTooltip": "Berücksichtige nur Einreichungen mit einer Bewertung, die mindestens diesem Wert entspricht", "minimumSize": "Minimale Größe", - "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value", - "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many words as the specified value", - "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", + "minimumSizeTooltipTextExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Wörter beinhalten wie der angegebene Wert.", + "minimumSizeTooltipProgrammingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele unterschiedliche Zeilen (im Vergleich zur Vorlage) beinhalten wie der angegebene Wert.", + "minimumSizeTooltipModelingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Modellelemente beinhalten wie der angegebene Wert.", "noInfoAvailable": "Keine Information verfügbar", "caution": "Die Plagiatskontrolle kann für große Kurse sehr lange dauern.", "detect": "Plagiate finden", diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 3c3c85d4691b..8bf6cb2a23f0 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -34,8 +34,8 @@ "minimumScore": "Minimum Score in %", "minimumScoreTooltip": "Consider only submissions with a score greater than or equal to this value", "minimumSize": "Minimum Size", - "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value", - "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many words as the specified value", + "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many words as the specified value.", + "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value.", "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", "noInfoAvailable": "No information available", "caution": "Plagiarism detection can take a long time for large courses.", From d2912b784b6c499add14dc93d05745c3de9c17a0 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 13 Sep 2023 09:11:10 +0200 Subject: [PATCH 18/95] log calculating number of diff lines error --- .../service/hestia/ProgrammingExerciseGitDiffReportService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index 966cc34c382b..7e2982d9693f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -182,6 +182,7 @@ public int calculateNumberOfDiffLinesBetweenRepos(VcsRepositoryUrl urlRepoA, Pat return extractDiffEntries(diff).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).map(Math::abs).sum(); } catch (IOException | GitAPIException e) { + log.error("Error calculating number of diff lines between repositories: urlRepoA={}, urlRepoB={}.", urlRepoA, urlRepoB, e); return Integer.MAX_VALUE; } } From 281740ca4846d46f20491ea1114af861b63458b3 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 13 Sep 2023 09:11:35 +0200 Subject: [PATCH 19/95] use dedicated method --- .../plagiarism/ProgrammingPlagiarismDetectionService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 89270c6854e3..97268f9bafd7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -366,8 +366,8 @@ private boolean shouldAddRepo(ProgrammingExercise programmingExercise, int minim return true; } - var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos(programmingExercise.getTemplateParticipation().getVcsRepositoryUrl(), - repo.getLocalPath(), templateRepo.get().getRemoteRepositoryUrl(), templateRepo.get().getLocalPath()); + var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos(programmingExercise.getVcsTemplateRepositoryUrl(), repo.getLocalPath(), + templateRepo.get().getRemoteRepositoryUrl(), templateRepo.get().getLocalPath()); return diffToTemplate >= minimumSize; } From b1cfb28615207348a0f4b76451a8007db7ef5fdd Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 13 Sep 2023 09:30:48 +0200 Subject: [PATCH 20/95] fix method parameter --- .../plagiarism/ProgrammingPlagiarismDetectionService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java index 97268f9bafd7..d4e86a3a843c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java @@ -361,12 +361,12 @@ private Optional cloneTemplateRepository(ProgrammingExercise program } } - private boolean shouldAddRepo(ProgrammingExercise programmingExercise, int minimumSize, Repository repo, Optional templateRepo) { + private boolean shouldAddRepo(int minimumSize, Repository repo, Optional templateRepo) { if (templateRepo.isEmpty()) { return true; } - var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos(programmingExercise.getVcsTemplateRepositoryUrl(), repo.getLocalPath(), + var diffToTemplate = programmingExerciseGitDiffReportService.calculateNumberOfDiffLinesBetweenRepos(repo.getRemoteRepositoryUrl(), repo.getLocalPath(), templateRepo.get().getRemoteRepositoryUrl(), templateRepo.get().getLocalPath()); return diffToTemplate >= minimumSize; } @@ -391,7 +391,7 @@ private List downloadRepositories(ProgrammingExercise programmingExe Repository repo = gitService.getOrCheckoutRepositoryForJPlag(participation, targetPath); gitService.resetToOriginHead(repo); // start with clean state - if (shouldAddRepo(programmingExercise, minimumSize, repo, templateRepo)) { + if (shouldAddRepo(minimumSize, repo, templateRepo)) { downloadedRepositories.add(repo); } else { From e14508f3c5e06555a4e0b409fb4d3b33ff5f328b Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 18 Sep 2023 15:06:29 +0200 Subject: [PATCH 21/95] use absolute line diff --- ...ogrammingExerciseGitDiffReportService.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java index 7e2982d9693f..8444525dad34 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/hestia/ProgrammingExerciseGitDiffReportService.java @@ -179,7 +179,7 @@ public int calculateNumberOfDiffLinesBetweenRepos(VcsRepositoryUrl urlRepoA, Pat try (var diffOutputStream = new ByteArrayOutputStream(); var git = Git.wrap(repoB)) { git.diff().setOldTree(treeParserRepoB).setNewTree(treeParserRepoA).setOutputStream(diffOutputStream).call(); var diff = diffOutputStream.toString(); - return extractDiffEntries(diff).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).map(Math::abs).sum(); + return extractDiffEntries(diff, true).stream().mapToInt(ProgrammingExerciseGitDiffEntry::getLineCount).sum(); } catch (IOException | GitAPIException e) { log.error("Error calculating number of diff lines between repositories: urlRepoA={}, urlRepoB={}.", urlRepoA, urlRepoB, e); @@ -212,7 +212,7 @@ private ProgrammingExerciseGitDiffReport generateReport(TemplateProgrammingExerc try (ByteArrayOutputStream diffOutputStream = new ByteArrayOutputStream(); Git git = Git.wrap(templateRepo)) { git.diff().setOldTree(oldTreeParser).setNewTree(newTreeParser).setOutputStream(diffOutputStream).call(); var diff = diffOutputStream.toString(); - var programmingExerciseGitDiffEntries = extractDiffEntries(diff); + var programmingExerciseGitDiffEntries = extractDiffEntries(diff, false); var report = new ProgrammingExerciseGitDiffReport(); for (ProgrammingExerciseGitDiffEntry gitDiffEntry : programmingExerciseGitDiffEntries) { gitDiffEntry.setGitDiffReport(report); @@ -228,7 +228,7 @@ private ProgrammingExerciseGitDiffReport generateReport(TemplateProgrammingExerc * @param diff The raw git-diff output * @return The extracted ProgrammingExerciseGitDiffEntries */ - private List extractDiffEntries(String diff) { + private List extractDiffEntries(String diff, boolean useAbsoluteLineCount) { var lines = diff.split("\n"); var parserState = new ParserState(); @@ -245,7 +245,7 @@ private List extractDiffEntries(String diff) { else if (!parserState.deactivateCodeReading) { switch (line.charAt(0)) { case '+' -> handleAddition(parserState); - case '-' -> handleRemoval(parserState); + case '-' -> handleRemoval(parserState, useAbsoluteLineCount); case ' ' -> handleUnchanged(parserState); default -> parserState.deactivateCodeReading = true; } @@ -291,7 +291,7 @@ private void handleUnchanged(ParserState parserState) { parserState.currentPreviousLineCount++; } - private void handleRemoval(ParserState parserState) { + private void handleRemoval(ParserState parserState, boolean useAbsoluteLineCount) { var entry = parserState.currentEntry; if (!parserState.lastLineRemoveOperation && !entry.isEmpty()) { parserState.entries.add(entry); @@ -303,7 +303,16 @@ private void handleRemoval(ParserState parserState) { entry.setPreviousLineCount(0); entry.setPreviousStartLine(parserState.currentPreviousLineCount); } - entry.setPreviousLineCount(entry.getPreviousLineCount() + 1); + if (useAbsoluteLineCount) { + if (parserState.currentEntry.getLineCount() == null) { + parserState.currentEntry.setLineCount(0); + parserState.currentEntry.setStartLine(parserState.currentLineCount); + } + parserState.currentEntry.setLineCount(parserState.currentEntry.getLineCount() + 1); + } + else { + entry.setPreviousLineCount(entry.getPreviousLineCount() + 1); + } parserState.currentEntry = entry; parserState.lastLineRemoveOperation = true; From 64448e7a1d9d6aba75c3b715ec84c5fd1f7290f9 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 18 Sep 2023 15:16:06 +0200 Subject: [PATCH 22/95] remove unnecessary fields --- .../plagiarism/PlagiarismDetectionConfig.java | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 4981528ffe8b..2176fdd835cc 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -1,20 +1,16 @@ package de.tum.in.www1.artemis.domain.plagiarism; -import de.tum.in.www1.artemis.domain.DomainObject; - /** - * Stores configuration for manual and continuous plagiarism control. + * Stores configuration for plagiarism detection. + * This class is not a record as in the future (when cpc will be implemented) it will be extended to a DomainObject and represent a database entry. */ -public class PlagiarismDetectionConfig extends DomainObject { - - private float similarityThreshold; +public class PlagiarismDetectionConfig { - private int minimumScore; + private final float similarityThreshold; - private int minimumSize; + private final int minimumScore; - public PlagiarismDetectionConfig() { - } + private final int minimumSize; public PlagiarismDetectionConfig(float similarityThreshold, int minimumScore, int minimumSize) { this.similarityThreshold = similarityThreshold; @@ -26,23 +22,11 @@ public float getSimilarityThreshold() { return similarityThreshold; } - public void setSimilarityThreshold(float similarityThreshold) { - this.similarityThreshold = similarityThreshold; - } - public int getMinimumScore() { return minimumScore; } - public void setMinimumScore(int minimumScore) { - this.minimumScore = minimumScore; - } - public int getMinimumSize() { return minimumSize; } - - public void setMinimumSize(int minimumSize) { - this.minimumSize = minimumSize; - } } From be6657cb5a748fd91d5cd013a67454112c941a0b Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 24 Sep 2023 18:18:16 +0200 Subject: [PATCH 23/95] introduce cpc control service and move plagiarism checks config to the database --- .../tum/in/www1/artemis/domain/Exercise.java | 15 ++- .../plagiarism/PlagiarismDetectionConfig.java | 92 +++++++++++++++++-- .../repository/ExerciseRepository.java | 24 +++++ .../ContinuousPlagiarismControlService.java | 85 +++++++++++++++++ .../PlagiarismDetectionConfigHelper.java | 32 +++++++ .../PlagiarismDetectionService.java | 28 +++--- .../web/rest/ModelingExerciseResource.java | 12 +-- ...ProgrammingExercisePlagiarismResource.java | 23 ++--- .../web/rest/TextExerciseResource.java | 12 +-- .../PlagiarismDetectionServiceTest.java | 18 ++-- 10 files changed, 272 insertions(+), 69 deletions(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java create mode 100644 src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java index 60441190ccb5..c60a7aa29f19 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java @@ -24,7 +24,7 @@ import de.tum.in.www1.artemis.domain.participation.Participation; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.in.www1.artemis.domain.plagiarism.*; import de.tum.in.www1.artemis.domain.quiz.QuizExercise; import de.tum.in.www1.artemis.domain.view.QuizView; import de.tum.in.www1.artemis.service.ExerciseDateService; @@ -143,6 +143,11 @@ public abstract class Exercise extends BaseExercise implements LearningObject { @JsonIncludeProperties({ "id" }) private Set plagiarismCases = new HashSet<>(); + @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + @JsonIgnoreProperties("exercise") + private PlagiarismDetectionConfig plagiarismDetectionConfig; + // NOTE: Helpers variable names must be different from Getter name, so that Jackson ignores the @Transient annotation, but Hibernate still respects it @Transient private DueDateStat numberOfSubmissionsTransient; @@ -400,6 +405,14 @@ public void setPlagiarismCases(Set plagiarismCases) { this.plagiarismCases = plagiarismCases; } + public PlagiarismDetectionConfig getPlagiarismDetectionConfig() { + return plagiarismDetectionConfig; + } + + public void setPlagiarismDetectionConfig(PlagiarismDetectionConfig plagiarismDetectionConfig) { + this.plagiarismDetectionConfig = plagiarismDetectionConfig; + } + // jhipster-needle-entity-add-getters-setters - JHipster will add getters and setters here, do not remove public Set getCompetencies() { diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 2176fdd835cc..39a4c902bbbd 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -1,21 +1,66 @@ package de.tum.in.www1.artemis.domain.plagiarism; +import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Table; + +import org.hibernate.annotations.*; +import org.hibernate.annotations.Cache; + +import com.fasterxml.jackson.annotation.*; + +import de.tum.in.www1.artemis.domain.*; + /** - * Stores configuration for plagiarism detection. - * This class is not a record as in the future (when cpc will be implemented) it will be extended to a DomainObject and represent a database entry. + * Stores configuration for manual and continuous plagiarism control. */ -public class PlagiarismDetectionConfig { +@Entity +@Table(name = "plagiarism_detection_config") +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class PlagiarismDetectionConfig extends DomainObject { - private final float similarityThreshold; + @OneToOne(mappedBy = "plagiarismDetectionConfig", fetch = FetchType.LAZY) + @JsonIgnoreProperties("plagiarismDetectionConfig") + private Exercise exercise; - private final int minimumScore; + @Column(name = "continuous_plagiarism_control_enabled") + private boolean continuousPlagiarismControlEnabled = false; - private final int minimumSize; + @Column(name = "continuous_plagiarism_control_post_due_date_checks_enabled") + private boolean continuousPlagiarismControlPostDueDateChecksEnabled = false; - public PlagiarismDetectionConfig(float similarityThreshold, int minimumScore, int minimumSize) { - this.similarityThreshold = similarityThreshold; - this.minimumScore = minimumScore; - this.minimumSize = minimumSize; + @Column(name = "similarity_threshold") + private float similarityThreshold; + + @Column(name = "minimum_score") + private int minimumScore; + + @Column(name = "minimum_size") + private int minimumSize; + + public Exercise getExercise() { + return exercise; + } + + public void setExercise(Exercise exercise) { + this.exercise = exercise; + } + + public boolean isContinuousPlagiarismControlEnabled() { + return continuousPlagiarismControlEnabled; + } + + public void setContinuousPlagiarismControlEnabled(boolean continuousPlagiarismControlEnabled) { + this.continuousPlagiarismControlEnabled = continuousPlagiarismControlEnabled; + } + + public boolean isContinuousPlagiarismControlPostDueDateChecksEnabled() { + return continuousPlagiarismControlPostDueDateChecksEnabled; + } + + public void setContinuousPlagiarismControlPostDueDateChecksEnabled(boolean continuousPlagiarismControlPostDueDateChecksEnabled) { + this.continuousPlagiarismControlPostDueDateChecksEnabled = continuousPlagiarismControlPostDueDateChecksEnabled; } public float getSimilarityThreshold() { @@ -29,4 +74,31 @@ public int getMinimumScore() { public int getMinimumSize() { return minimumSize; } + + public void setSimilarityThreshold(float similarityThreshold) { + this.similarityThreshold = similarityThreshold; + } + + public void setMinimumScore(int minimumScore) { + this.minimumScore = minimumScore; + } + + public void setMinimumSize(int minimumSize) { + this.minimumSize = minimumSize; + } + + /** + * Creates PlagiarismChecksConfig with default data + * + * @return PlagiarismChecksConfig with default values + */ + public static PlagiarismDetectionConfig createDefault() { + var config = new PlagiarismDetectionConfig(); + config.setContinuousPlagiarismControlEnabled(false); + config.setContinuousPlagiarismControlPostDueDateChecksEnabled(false); + config.setSimilarityThreshold(0.5f); + config.setMinimumScore(0); + config.setMinimumSize(0); + return config; + } } diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java index 49cda05f7beb..59b8ead81a66 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java @@ -238,6 +238,19 @@ GROUP BY TYPE(e) List countActiveStudentsInExercisesWithReleaseDateBetweenGroupByExerciseType(@Param("minDate") ZonedDateTime minDate, @Param("maxDate") ZonedDateTime maxDate, @Param("activeUserLogins") List activeUserLogins); + @Query(""" + SELECT e FROM Exercise e + LEFT JOIN FETCH e.plagiarismChecksConfig c + LEFT JOIN FETCH e.studentParticipations p + LEFT JOIN FETCH p.submissions s + LEFT JOIN FETCH s.results + WHERE e.course.testCourse = FALSE + AND e.dueDate >= :time + AND c.continuousPlagiarismControlEnabled = TRUE + ORDER BY e.dueDate ASC + """) + Set findAllExercisesWithDueDateOnOrAfterAndContinuousPlagiarismControlEnabledIsTrue(@Param("time") ZonedDateTime time); + @Query(""" SELECT e FROM Exercise e WHERE e.course.testCourse = FALSE @@ -458,6 +471,17 @@ default Set findAllExercisesWithCurrentOrUpcomingDueDate() { return findAllExercisesWithCurrentOrUpcomingDueDate(ZonedDateTime.now().truncatedTo(ChronoUnit.DAYS)); } + /** + * Finds all exercises where the due date is today or in the future and continuos plagiarism control is enabled + * (does not return exercises belonging to test courses). + * + * @return set of exercises + */ + default Set findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue() { + var yesterday = ZonedDateTime.now().truncatedTo(ChronoUnit.DAYS).minusDays(1); + return findAllExercisesWithDueDateOnOrAfterAndContinuousPlagiarismControlEnabledIsTrue(yesterday); + } + /** * Find exercise by exerciseId and load participations in this exercise. * diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java new file mode 100644 index 000000000000..16243e04c196 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -0,0 +1,85 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import static java.lang.String.format; + +import java.time.ZonedDateTime; +import java.util.function.Predicate; + +import org.jvnet.hk2.annotations.Service; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import de.jplag.exceptions.ExitException; +import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.TextExercise; +import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.repository.ExerciseRepository; +import de.tum.in.www1.artemis.service.util.TimeLogUtil; + +/** + * Manages continuous plagiarism control. + */ +@Service +@Component +@Profile("scheduling") +public class ContinuousPlagiarismControlService { + + private static final Logger log = LoggerFactory.getLogger(ContinuousPlagiarismControlService.class); + + private static final Predicate isBeforeDueDateOrAfterWithPostDueDateChecksEnabled = exercise -> exercise.getDueDate() == null + || exercise.getDueDate().isAfter(ZonedDateTime.now()) || exercise.getPlagiarismDetectionConfig().isContinuousPlagiarismControlPostDueDateChecksEnabled(); + + private final ExerciseRepository exerciseRepository; + + private final PlagiarismDetectionService plagiarismDetectionService; + + public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, PlagiarismDetectionService plagiarismDetectionService) { + this.exerciseRepository = exerciseRepository; + this.plagiarismDetectionService = plagiarismDetectionService; + } + + /** + * Daily triggers plagiarism checks as a part of continuous plagiarism control. + */ + @Scheduled(cron = "${artemis.scheduling.continuous-plagiarism-control-trigger-time:0 0 4 * * *}") + public void executeChecks() { + log.info("Starting continuous plagiarism control..."); + + var exercises = exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue(); + exercises.stream().filter(isBeforeDueDateOrAfterWithPostDueDateChecksEnabled).forEach(exercise -> { + log.info("Started continuous plagiarism control for exercise: exerciseId={}, type={}.", exercise.getId(), exercise.getExerciseType()); + final long startTime = System.nanoTime(); + + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(exercise, exerciseRepository); + + try { + executeChecksForExercise(exercise); + } + catch (ExitException e) { + log.error("Cannot check plagiarism due to Jplag error: exerciseId={}, type={}, error={}.", exercise.getId(), exercise.getExerciseType(), e.getMessage(), e); + } + catch (Exception e) { + // Catch all exception to keep cpc going + log.error("Cannot check plagiarism due to unknown error: exerciseId={}, type={}, error={}.", exercise.getId(), exercise.getExerciseType(), e.getMessage(), e); + } + + log.info("Finished continuous plagiarism control for exercise: exerciseId={}, elapsed={}.", exercise.getId(), TimeLogUtil.formatDurationFrom(startTime)); + }); + + log.debug("Continuous plagiarism control done."); + } + + private void executeChecksForExercise(Exercise exercise) throws Exception { + switch (exercise.getExerciseType()) { + case TEXT -> plagiarismDetectionService.checkTextExercise((TextExercise) exercise); + case PROGRAMMING -> plagiarismDetectionService.checkProgrammingExercise((ProgrammingExercise) exercise); + case MODELING -> plagiarismDetectionService.checkModelingExercise((ModelingExercise) exercise); + case FILE_UPLOAD, QUIZ -> throw new IllegalStateException( + format("Cannot check plagiarism for exercise: type=%s, id=%s.", exercise.getExerciseType(), exercise.getId())); + } + } +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java new file mode 100644 index 000000000000..0c2bc01a7815 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -0,0 +1,32 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.data.jpa.repository.JpaRepository; + +import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.in.www1.artemis.domain.plagiarism.*; + +public final class PlagiarismDetectionConfigHelper { + + private static final Logger log = LoggerFactory.getLogger(PlagiarismDetectionConfigHelper.class); + + private PlagiarismDetectionConfigHelper() { + } + + /** + * Ads missing plagiarism checks config + * + * @param type of Exercise + * @param exercise exercise without plagiarism checks config + * @param repository repository used for saving exercises of type T + */ + public static void createAndSaveDefaultIfNull(T exercise, JpaRepository repository) { + if (exercise.getPlagiarismDetectionConfig() == null) { + log.info("Filling missing plagiarisms checks config: exerciseId={}, type={}.", exercise.getId(), exercise.getExerciseType()); + var config = PlagiarismDetectionConfig.createDefault(); + exercise.setPlagiarismDetectionConfig(config); + repository.save(exercise); + } + } +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java index 0e6ebc8b237a..408063d75ef5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionService.java @@ -13,7 +13,6 @@ import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.TextExercise; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; @@ -53,11 +52,11 @@ public PlagiarismDetectionService(TextPlagiarismDetectionService textPlagiarismD * Check plagiarism in given text exercise * * @param exercise exercise to check plagiarism - * @param config configuration for plagiarism detection * @return result of plagiarism checks */ - public TextPlagiarismResult checkTextExercise(TextExercise exercise, PlagiarismDetectionConfig config) throws ExitException { - var plagiarismResult = textPlagiarismDetectionService.checkPlagiarism(exercise, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize()); + public TextPlagiarismResult checkTextExercise(TextExercise exercise) throws ExitException { + var plagiarismResult = textPlagiarismDetectionService.checkPlagiarism(exercise, exercise.getPlagiarismDetectionConfig().getSimilarityThreshold(), + exercise.getPlagiarismDetectionConfig().getMinimumScore(), exercise.getPlagiarismDetectionConfig().getMinimumSize()); log.info("Finished textPlagiarismDetectionService.checkPlagiarism for exercise {} with {} comparisons,", exercise.getId(), plagiarismResult.getComparisons().size()); trimAndSavePlagiarismResult(plagiarismResult); @@ -68,15 +67,14 @@ public TextPlagiarismResult checkTextExercise(TextExercise exercise, PlagiarismD * Check plagiarism in given programing exercise * * @param exercise exercise to check plagiarism - * @param config configuration for plagiarism detection * @return result of plagiarism checks */ - public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercise, PlagiarismDetectionConfig config) + public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercise) throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { checkProgrammingLanguageSupport(exercise); - var plagiarismResult = programmingPlagiarismDetectionService.checkPlagiarism(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore(), - config.getMinimumSize()); + var plagiarismResult = programmingPlagiarismDetectionService.checkPlagiarism(exercise.getId(), exercise.getPlagiarismDetectionConfig().getSimilarityThreshold(), + exercise.getPlagiarismDetectionConfig().getMinimumScore(), exercise.getPlagiarismDetectionConfig().getMinimumSize()); log.info("Finished programmingExerciseExportService.checkPlagiarism call for {} comparisons", plagiarismResult.getComparisons().size()); plagiarismResultRepository.prepareResultForClient(plagiarismResult); @@ -90,25 +88,23 @@ public TextPlagiarismResult checkProgrammingExercise(ProgrammingExercise exercis * Check plagiarism in given programing exercise and outputs a Jplag report * * @param exercise exercise to check plagiarism - * @param config configuration for plagiarism detection * @return Jplag report of plagiarism checks */ - public File checkProgrammingExerciseWithJplagReport(ProgrammingExercise exercise, PlagiarismDetectionConfig config) - throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + public File checkProgrammingExerciseWithJplagReport(ProgrammingExercise exercise) throws ProgrammingLanguageNotSupportedForPlagiarismDetectionException { checkProgrammingLanguageSupport(exercise); - return programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(exercise.getId(), config.getSimilarityThreshold(), config.getMinimumScore(), - config.getMinimumSize()); + return programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(exercise.getId(), exercise.getPlagiarismDetectionConfig().getSimilarityThreshold(), + exercise.getPlagiarismDetectionConfig().getMinimumScore(), exercise.getPlagiarismDetectionConfig().getMinimumSize()); } /** * Check plagiarism in given modeling exercise * * @param exercise exercise to check plagiarism - * @param config configuration for plagiarism detection * @return result of plagiarism checks */ - public ModelingPlagiarismResult checkModelingExercise(ModelingExercise exercise, PlagiarismDetectionConfig config) { - var plagiarismResult = modelingPlagiarismDetectionService.checkPlagiarism(exercise, config.getSimilarityThreshold(), config.getMinimumSize(), config.getMinimumScore()); + public ModelingPlagiarismResult checkModelingExercise(ModelingExercise exercise) { + var plagiarismResult = modelingPlagiarismDetectionService.checkPlagiarism(exercise, exercise.getPlagiarismDetectionConfig().getSimilarityThreshold(), + exercise.getPlagiarismDetectionConfig().getMinimumSize(), exercise.getPlagiarismDetectionConfig().getMinimumScore()); log.info("Finished modelingPlagiarismDetectionService.checkPlagiarism call for {} comparisons", plagiarismResult.getComparisons().size()); trimAndSavePlagiarismResult(plagiarismResult); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 8ee88209dfd8..cf4bfa9787ad 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -20,7 +20,6 @@ import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; @@ -377,23 +376,18 @@ public ResponseEntity getPlagiarismResult(@PathVariabl *

* Start the automated plagiarism detection for the given exercise and return its result. * - * @param exerciseId for which all submission should be checked - * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) - * @param minimumScore consider only submissions whose score is greater or equal to this value - * @param minimumSize consider only submissions whose size is greater or equal to this value + * @param exerciseId for which all submission should be checked * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). */ @GetMapping("modeling-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastInstructor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, - @RequestParam int minimumSize) { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId) { var modelingExercise = modelingExerciseRepository.findByIdWithStudentParticipationsSubmissionsResultsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for modeling exercise: exerciseId={}.", exerciseId); - var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); - var plagiarismResult = plagiarismDetectionService.checkModelingExercise(modelingExercise, config); + var plagiarismResult = plagiarismDetectionService.checkModelingExercise(modelingExercise); log.info("Finished manual plagiarism checks for modeling exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); return ResponseEntity.ok(plagiarismResult); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 9fe72ab56e03..38d7ac93210c 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -16,7 +16,6 @@ import de.jplag.exceptions.ExitException; import de.tum.in.www1.artemis.domain.ProgrammingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository; @@ -81,10 +80,7 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo /** * GET /programming-exercises/{exerciseId}/check-plagiarism : Start the automated plagiarism detection for the given exercise and return its result. * - * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed - * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) - * @param minimumScore consider only submissions whose score is greater or equal to this value - * @param minimumSize consider only submissions whose number of diff to template lines is greate or equal to this value + * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). * @throws ExitException is thrown if JPlag exits unexpectedly * @throws IOException is thrown for file handling errors @@ -92,16 +88,14 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping(CHECK_PLAGIARISM) @EnforceAtLeastEditor @FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks }) - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, - @RequestParam int minimumSize) throws ExitException, IOException { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId) throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for programming exercise: exerciseId={}.", exerciseId); - var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); try { - var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise, config); + var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise); return ResponseEntity.ok(plagiarismResult); } catch (ProgrammingLanguageNotSupportedForPlagiarismDetectionException e) { @@ -115,27 +109,22 @@ public ResponseEntity checkPlagiarism(@PathVariable long e /** * GET /programming-exercises/{exerciseId}/plagiarism-check : Uses JPlag to check for plagiarism and returns the generated output as zip file * - * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed - * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) - * @param minimumScore consider only submissions whose score is greater or equal to this value - * @param minimumSize consider only submissions whose number of diff to template lines is greate or equal to this value + * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed * @return The ResponseEntity with status 201 (Created) or with status 400 (Bad Request) if the parameters are invalid * @throws IOException is thrown for file handling errors */ @GetMapping(value = CHECK_PLAGIARISM_JPLAG_REPORT) @EnforceAtLeastEditor @FeatureToggle(Feature.ProgrammingExercises) - public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, - @RequestParam int minimumSize) throws IOException { + public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId) throws IOException { log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks with Jplag report for programming exercise: exerciseId={}.", exerciseId); - var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); try { - var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise, config); + var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise); if (zipFile == null) { throw new BadRequestAlertException("Insufficient amount of valid and long enough submissions available for comparison.", "Plagiarism Check", "notEnoughSubmissions"); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index ec59a8308d6b..56386b268fb2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -16,7 +16,6 @@ import de.tum.in.www1.artemis.domain.*; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; @@ -483,24 +482,19 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo *

* Start the automated plagiarism detection for the given exercise and return its result. * - * @param exerciseId ID of the exercise for which to detect plagiarism - * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) - * @param minimumScore consider only submissions whose score is greater or equal to this value - * @param minimumSize consider only submissions whose size is greater or equal to this value + * @param exerciseId ID of the exercise for which to detect plagiarism * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). */ @GetMapping("text-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastEditor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, - @RequestParam int minimumSize) throws ExitException { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId) throws ExitException { TextExercise textExercise = textExerciseRepository.findByIdWithStudentParticipationsAndSubmissionsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, textExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for text exercise: exerciseId={}.", exerciseId); - var config = new PlagiarismDetectionConfig(similarityThreshold, minimumScore, minimumSize); - var plagiarismResult = plagiarismDetectionService.checkTextExercise(textExercise, config); + var plagiarismResult = plagiarismDetectionService.checkTextExercise(textExercise); log.info("Finished manual plagiarism checks for text exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); return ResponseEntity.ok(plagiarismResult); } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java index 80ec97d07145..64593ac4574c 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java @@ -27,7 +27,7 @@ class PlagiarismDetectionServiceTest { - private final PlagiarismDetectionConfig config = new PlagiarismDetectionConfig(0.5f, 1, 2); + private final PlagiarismDetectionConfig config = PlagiarismDetectionConfig.createDefault(); private final TextPlagiarismDetectionService textPlagiarismDetectionService = mock(); @@ -46,13 +46,14 @@ class PlagiarismDetectionServiceTest { void shouldExecuteChecksForTextExercise() throws ExitException { // given var textExercise = new TextExercise(); + textExercise.setPlagiarismDetectionConfig(config); var textPlagiarismResult = new TextPlagiarismResult(); textPlagiarismResult.setComparisons(emptySet()); when(textPlagiarismDetectionService.checkPlagiarism(textExercise, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize())) .thenReturn(textPlagiarismResult); // when - var result = service.checkTextExercise(textExercise, config); + var result = service.checkTextExercise(textExercise); // then assertThat(result).isEqualTo(textPlagiarismResult); @@ -62,13 +63,14 @@ void shouldExecuteChecksForTextExercise() throws ExitException { void shouldExecuteChecksForModelingExercise() { // given var modelingExercise = new ModelingExercise(); + modelingExercise.setPlagiarismDetectionConfig(config); var modelingPlagiarismResult = new ModelingPlagiarismResult(); modelingPlagiarismResult.setComparisons(emptySet()); when(modelingPlagiarismDetectionService.checkPlagiarism(modelingExercise, config.getSimilarityThreshold(), config.getMinimumSize(), config.getMinimumScore())) .thenReturn(modelingPlagiarismResult); // when - var result = service.checkModelingExercise(modelingExercise, config); + var result = service.checkModelingExercise(modelingExercise); // then assertThat(result).isEqualTo(modelingPlagiarismResult); @@ -79,6 +81,7 @@ void shouldExecuteChecksForProgrammingExercise() throws IOException, ExitExcepti // given var programmingExercise = new ProgrammingExercise(); programmingExercise.setId(1L); + programmingExercise.setPlagiarismDetectionConfig(config); var programmingPlagiarismResult = new TextPlagiarismResult(); programmingPlagiarismResult.setComparisons(emptySet()); when(programmingPlagiarismDetectionService.checkPlagiarism(1L, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize())) @@ -89,7 +92,7 @@ void shouldExecuteChecksForProgrammingExercise() throws IOException, ExitExcepti when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); // when - var result = service.checkProgrammingExercise(programmingExercise, config); + var result = service.checkProgrammingExercise(programmingExercise); // then assertThat(result).isEqualTo(programmingPlagiarismResult); @@ -103,7 +106,7 @@ void shouldThrowExceptionOnUnsupportedProgrammingLanguage() { when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); // expect - assertThatThrownBy(() -> service.checkProgrammingExercise(programmingExercise, config)).isInstanceOf(ProgrammingLanguageNotSupportedForPlagiarismDetectionException.class); + assertThatThrownBy(() -> service.checkProgrammingExercise(programmingExercise)).isInstanceOf(ProgrammingLanguageNotSupportedForPlagiarismDetectionException.class); } @Test @@ -111,6 +114,7 @@ void shouldExecuteChecksWithJplagReportForProgrammingExercise() throws Programmi // given var programmingExercise = new ProgrammingExercise(); programmingExercise.setId(1L); + programmingExercise.setPlagiarismDetectionConfig(config); var zipFile = new File(""); when(programmingPlagiarismDetectionService.checkPlagiarismWithJPlagReport(1L, config.getSimilarityThreshold(), config.getMinimumScore(), config.getMinimumSize())) .thenReturn(zipFile); @@ -120,7 +124,7 @@ void shouldExecuteChecksWithJplagReportForProgrammingExercise() throws Programmi when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); // when - var result = service.checkProgrammingExerciseWithJplagReport(programmingExercise, config); + var result = service.checkProgrammingExerciseWithJplagReport(programmingExercise); // then assertThat(result).isEqualTo(zipFile); @@ -134,7 +138,7 @@ void shouldThrowExceptionOnUnsupportedProgrammingLanguageForChecksWithJplagRepor when(programmingLanguageFeatureService.getProgrammingLanguageFeatures(any())).thenReturn(programmingLanguageFeature); // expect - assertThatThrownBy(() -> service.checkProgrammingExerciseWithJplagReport(programmingExercise, config)) + assertThatThrownBy(() -> service.checkProgrammingExerciseWithJplagReport(programmingExercise)) .isInstanceOf(ProgrammingLanguageNotSupportedForPlagiarismDetectionException.class); } } From 295bc2918620611855df22a24e3e1ab17fadedc2 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sat, 30 Sep 2023 15:40:48 +0200 Subject: [PATCH 24/95] fix column name --- .../de/tum/in/www1/artemis/repository/ExerciseRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java index 59b8ead81a66..98da0a66906f 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java @@ -240,7 +240,7 @@ List countActiveStudentsInExercisesWithReleaseDateBetw @Query(""" SELECT e FROM Exercise e - LEFT JOIN FETCH e.plagiarismChecksConfig c + LEFT JOIN FETCH e.plagiarismDetectionConfig c LEFT JOIN FETCH e.studentParticipations p LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH s.results From 94f9ce39679038eeac05b5d690dfc9ba04599712 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sat, 30 Sep 2023 16:23:00 +0200 Subject: [PATCH 25/95] add submission.plagiarism_suspected and db migration --- .../in/www1/artemis/domain/Submission.java | 3 +++ .../changelog/20230930160925_changelog.xml | 25 +++++++++++++++++++ .../resources/config/liquibase/master.xml | 1 + 3 files changed, 29 insertions(+) create mode 100644 src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java index 1f2a5873ec6f..e31020a748a6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java @@ -76,6 +76,9 @@ public abstract class Submission extends DomainObject implements Comparable + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 4126937b405d..dab2fec1a052 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -62,6 +62,7 @@ + From 718bce2b6c42b85fc72d27ab229c72415ca499f8 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sat, 30 Sep 2023 16:28:17 +0200 Subject: [PATCH 26/95] add null guards for plagiarism detection config --- .../in/www1/artemis/web/rest/ModelingExerciseResource.java | 3 ++- .../web/rest/ProgrammingExercisePlagiarismResource.java | 5 +++-- .../tum/in/www1/artemis/web/rest/TextExerciseResource.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index cf4bfa9787ad..1f044dbcbe3b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -34,7 +34,7 @@ import de.tum.in.www1.artemis.service.feature.FeatureToggle; import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.in.www1.artemis.service.plagiarism.*; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; @@ -387,6 +387,7 @@ public ResponseEntity checkPlagiarism(@PathVariable lo authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for modeling exercise: exerciseId={}.", exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); var plagiarismResult = plagiarismDetectionService.checkModelingExercise(modelingExercise); log.info("Finished manual plagiarism checks for modeling exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 38d7ac93210c..4e0b8b00fa89 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -24,8 +24,7 @@ import de.tum.in.www1.artemis.service.AuthorizationCheckService; import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; -import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; +import de.tum.in.www1.artemis.service.plagiarism.*; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; @@ -94,6 +93,7 @@ public ResponseEntity checkPlagiarism(@PathVariable long e long start = System.nanoTime(); log.info("Started manual plagiarism checks for programming exercise: exerciseId={}.", exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); try { var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise); return ResponseEntity.ok(plagiarismResult); @@ -123,6 +123,7 @@ public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable lon long start = System.nanoTime(); log.info("Started manual plagiarism checks with Jplag report for programming exercise: exerciseId={}.", exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); try { var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise); if (zipFile == null) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 56386b268fb2..d3f60f613eff 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -29,7 +29,7 @@ import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.in.www1.artemis.service.plagiarism.*; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; @@ -494,6 +494,7 @@ public ResponseEntity checkPlagiarism(@PathVariable long e long start = System.nanoTime(); log.info("Started manual plagiarism checks for text exercise: exerciseId={}.", exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(textExercise, textExerciseRepository); var plagiarismResult = plagiarismDetectionService.checkTextExercise(textExercise); log.info("Finished manual plagiarism checks for text exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); return ResponseEntity.ok(plagiarismResult); From e23d642c95bf07bb9335ad2f133c7d3be3d01d48 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sat, 30 Sep 2023 16:31:54 +0200 Subject: [PATCH 27/95] fix javadoc --- .../artemis/domain/plagiarism/PlagiarismDetectionConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 39a4c902bbbd..0d8d32209cfe 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -88,9 +88,9 @@ public void setMinimumSize(int minimumSize) { } /** - * Creates PlagiarismChecksConfig with default data + * Creates PlagiarismDetectionConfig with default data * - * @return PlagiarismChecksConfig with default values + * @return PlagiarismDetectionConfig with default values */ public static PlagiarismDetectionConfig createDefault() { var config = new PlagiarismDetectionConfig(); From 89e1e275dcff27a3b5928abda8c05fe36cadef68 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 1 Oct 2023 14:24:22 +0200 Subject: [PATCH 28/95] add default cron for cpc --- .../service/plagiarism/ContinuousPlagiarismControlService.java | 2 +- src/main/resources/config/application-artemis.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 16243e04c196..88a0167e308b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -45,7 +45,7 @@ public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, /** * Daily triggers plagiarism checks as a part of continuous plagiarism control. */ - @Scheduled(cron = "${artemis.scheduling.continuous-plagiarism-control-trigger-time:0 0 4 * * *}") + @Scheduled(cron = "${artemis.scheduling.continuous-plagiarism-control-trigger-time:0 0 5 * * *}") public void executeChecks() { log.info("Starting continuous plagiarism control..."); diff --git a/src/main/resources/config/application-artemis.yml b/src/main/resources/config/application-artemis.yml index 500132c83f4a..cd3aab68fc49 100644 --- a/src/main/resources/config/application-artemis.yml +++ b/src/main/resources/config/application-artemis.yml @@ -99,6 +99,7 @@ artemis: scheduling: # these values are cron expressions. To generate one, you can use e.g. https://www.freeformatter.com/cron-expression-generator-quartz.html programming-exercises-cleanup-time: 0 0 3 * * * # every day at 3am data-export-creation-time: 0 0 4 * * * # every day at 4am + continuous-plagiarism-control-trigger-time: 0 0 5 * * * # every day at 5am data-export: days-between-data-exports: 14 From 0d769ce436e560032e75cc7798afe1cd4a299117 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 1 Oct 2023 14:34:37 +0200 Subject: [PATCH 29/95] add plagiarism and cpc config to exercise model --- .../ModelingExerciseRepository.java | 15 ++- .../ProgrammingExerciseRepository.java | 12 +++ .../repository/TextExerciseRepository.java | 4 +- .../web/rest/ModelingExerciseResource.java | 6 +- .../web/rest/ProgrammingExerciseResource.java | 2 + .../web/rest/TextExerciseResource.java | 4 +- .../webapp/app/entities/exercise.model.ts | 16 +++ .../modeling-exercise-update.component.html | 1 + .../manage/modeling-exercise.module.ts | 2 + ...programming-exercise-update.component.html | 3 + .../programming-exercise-update.module.ts | 2 + .../exercise-update-plagiarism.component.html | 101 ++++++++++++++++++ .../exercise-update-plagiarism.component.ts | 40 +++++++ .../exercise-update-plagiarism.module.ts | 10 ++ .../text-exercise-update.component.html | 1 + .../text-exercise/text-exercise.module.ts | 2 + src/main/webapp/i18n/de/plagiarism.json | 13 ++- .../webapp/i18n/de/student-dashboard.json | 1 + src/main/webapp/i18n/en/plagiarism.json | 13 ++- .../webapp/i18n/en/student-dashboard.json | 1 + ...gramming-exercise-update.component.spec.ts | 2 + 21 files changed, 229 insertions(+), 22 deletions(-) create mode 100644 src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html create mode 100644 src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts create mode 100644 src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module.ts diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java index d006015a7aa6..261fca730777 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java @@ -31,8 +31,9 @@ public interface ModelingExerciseRepository extends JpaRepository findByCourseIdWithCategories(@Param("courseId") Long courseId); - @EntityGraph(type = LOAD, attributePaths = { "exampleSubmissions", "teamAssignmentConfig", "categories", "competencies", "exampleSubmissions.submission.results" }) - Optional findWithEagerExampleSubmissionsAndCompetenciesById(@Param("exerciseId") Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "exampleSubmissions", "teamAssignmentConfig", "categories", "competencies", "exampleSubmissions.submission.results", + "plagiarismDetctionConfig" }) + Optional findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(@Param("exerciseId") Long exerciseId); @Query("select modelingExercise from ModelingExercise modelingExercise left join fetch modelingExercise.exampleSubmissions exampleSubmissions left join fetch exampleSubmissions.submission submission left join fetch submission.results results left join fetch results.feedbacks left join fetch results.assessor left join fetch modelingExercise.teamAssignmentConfig where modelingExercise.id = :#{#exerciseId}") Optional findByIdWithExampleSubmissionsAndResults(@Param("exerciseId") Long exerciseId); @@ -71,13 +72,9 @@ default ModelingExercise findByIdElseThrow(long exerciseId) { } @NotNull - default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesByIdElseThrow(long exerciseId) { - return findWithEagerExampleSubmissionsAndCompetenciesById(exerciseId).orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); - } - - @NotNull - default ModelingExercise findByIdWithExampleSubmissionsAndResultsElseThrow(long exerciseId) { - return findByIdWithExampleSubmissionsAndResults(exerciseId).orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); + default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(long exerciseId) { + return findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(exerciseId) + .orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); } @NotNull diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java index da6407b3997d..4c210e63a514 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java @@ -61,6 +61,10 @@ public interface ProgrammingExerciseRepository extends JpaRepository findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories", + "submissionPolicy", "plagiarismDetectionConfig" }) + Optional findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "auxiliaryRepositories" }) Optional findWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesById(Long exerciseId); @@ -549,6 +553,14 @@ default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssi return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId)); } + @NotNull + default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow( + long programmingExerciseId) throws EntityNotFoundException { + Optional programmingExercise = findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigById( + programmingExerciseId); + return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId)); + } + /** * Find a programming exercise by its id, with eagerly loaded template and solution participation, submissions and results * diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java index cbcb19f8c26f..fdf3b37bfc5f 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java @@ -32,8 +32,8 @@ public interface TextExerciseRepository extends JpaRepository findByCourseIdWithCategories(@Param("courseId") Long courseId); - @EntityGraph(type = LOAD, attributePaths = { "teamAssignmentConfig", "categories", "competencies" }) - Optional findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesById(Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "teamAssignmentConfig", "categories", "competencies", "plagiarismDetectionConfig" }) + Optional findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(Long exerciseId); List findByAssessmentTypeAndDueDateIsAfter(AssessmentType assessmentType, ZonedDateTime dueDate); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 1f044dbcbe3b..479a479fd4ea 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -20,6 +20,7 @@ import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.plagiarism.*; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; @@ -254,8 +255,9 @@ public ResponseEntity> getModelingExercisesForCourse(@Pat @EnforceAtLeastTutor public ResponseEntity getModelingExercise(@PathVariable Long exerciseId) { log.debug("REST request to get ModelingExercise : {}", exerciseId); - var modelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesByIdElseThrow(exerciseId); + var modelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.TEACHING_ASSISTANT, modelingExercise, null); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); List gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(exerciseId); modelingExercise.setGradingCriteria(gradingCriteria); @@ -315,7 +317,7 @@ public ResponseEntity importExercise(@PathVariable long source } importedExercise.checkCourseAndExerciseGroupExclusivity("Modeling Exercise"); final var user = userRepository.getUserWithGroupsAndAuthorities(); - final var originalModelingExercise = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsElseThrow(sourceExerciseId); + final var originalModelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(sourceExerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, importedExercise, user); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, originalModelingExercise, user); // validates general settings: points, dates diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java index 99d4d4ed88f7..31fccff71c90 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java @@ -38,6 +38,7 @@ import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; +import de.tum.in.www1.artemis.service.plagiarism.*; import de.tum.in.www1.artemis.service.programming.*; import de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; @@ -371,6 +372,7 @@ public ResponseEntity> getProgrammingExercisesForCours public ResponseEntity getProgrammingExercise(@PathVariable long exerciseId) { log.debug("REST request to get ProgrammingExercise : {}", exerciseId); var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesElseThrow(exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); // Fetch grading criterion into exercise of participation List gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(programmingExercise.getId()); programmingExercise.setGradingCriteria(gradingCriteria); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index d3f60f613eff..e60085c7ea9d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -255,9 +255,11 @@ public ResponseEntity> getTextExercisesForCourse(@PathVariabl @EnforceAtLeastTutor public ResponseEntity getTextExercise(@PathVariable Long exerciseId) { log.debug("REST request to get TextExercise : {}", exerciseId); - var textExercise = textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesById(exerciseId) + var textExercise = textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(exerciseId) .orElseThrow(() -> new EntityNotFoundException("TextExercise", exerciseId)); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(textExercise, textExerciseRepository); + // If the exercise belongs to an exam, only editors, instructors and admins are allowed to access it if (textExercise.isExamExercise()) { authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, textExercise, null); diff --git a/src/main/webapp/app/entities/exercise.model.ts b/src/main/webapp/app/entities/exercise.model.ts index 286e89a58bef..34c2b9fe4d43 100644 --- a/src/main/webapp/app/entities/exercise.model.ts +++ b/src/main/webapp/app/entities/exercise.model.ts @@ -46,6 +46,14 @@ export interface ValidationReason { translateValues: any; } +export interface PlagiarismDetectionConfig { + continuousPlagiarismControlEnabled?: boolean; + continuousPlagiarismControlPostDueDateChecksEnabled?: boolean; + similarityThreshold?: number; + minimumScore?: number; + minimumSize?: number; +} + export const exerciseTypes: ExerciseType[] = [ExerciseType.TEXT, ExerciseType.MODELING, ExerciseType.PROGRAMMING, ExerciseType.FILE_UPLOAD, ExerciseType.QUIZ]; // IMPORTANT NOTICE: The following strings have to be consistent with the ones defined in Exercise.java @@ -89,6 +97,14 @@ export abstract class Exercise implements BaseEntity { public exerciseGroup?: ExerciseGroup; public competencies?: Competency[]; + public plagiarismDetectionConfig?: PlagiarismDetectionConfig = { + continuousPlagiarismControlEnabled: false, + continuousPlagiarismControlPostDueDateChecksEnabled: true, + similarityThreshold: 0.5, + minimumSize: 0, + minimumScore: 0, + }; // default value + // transient objects which might not be set public numberOfSubmissions?: DueDateStat; public totalNumberOfAssessments?: DueDateStat; diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html index 271b7d777216..26d41daabf0f 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html @@ -182,6 +182,7 @@

+
diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.module.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.module.ts index dcd397c4f045..0571629cb4d5 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.module.ts +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.module.ts @@ -24,6 +24,7 @@ import { ArtemisSharedComponentModule } from 'app/shared/components/shared-compo import { ExerciseCategoriesModule } from 'app/shared/exercise-categories/exercise-categories.module'; import { ExerciseTitleChannelNameModule } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.module'; import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.module'; +import { ExerciseUpdatePlagiarismModule } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module'; @NgModule({ imports: [ @@ -49,6 +50,7 @@ import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise- ExerciseCategoriesModule, ExerciseTitleChannelNameModule, ExerciseUpdateNotificationModule, + ExerciseUpdatePlagiarismModule, ], declarations: [ModelingExerciseComponent, ModelingExerciseDetailComponent, ModelingExerciseUpdateComponent], exports: [ModelingExerciseComponent], diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html index c5094f404849..75f62d19685a 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html +++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html @@ -77,6 +77,9 @@

+ + +
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts index 628ad2a67648..2e6c716a8aac 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts +++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts @@ -28,6 +28,7 @@ import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/m import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-problem.component'; import { ExerciseTitleChannelNameModule } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.module'; import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.module'; +import { ExerciseUpdatePlagiarismModule } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module'; @NgModule({ imports: [ @@ -48,6 +49,7 @@ import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise- ArtemisModePickerModule, ExerciseTitleChannelNameModule, ExerciseUpdateNotificationModule, + ExerciseUpdatePlagiarismModule, ], declarations: [ ProgrammingExerciseUpdateComponent, diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html new file mode 100644 index 000000000000..2bf984af8d67 --- /dev/null +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html @@ -0,0 +1,101 @@ +
+
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+
+
+
+ + + BETA +
+
+
+ +
Enable Continuous Plagiarism Control
+
+
+
+
+ +
+ Run additional checks during the night after exercise's due date. +
+
+
+
+
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts new file mode 100644 index 000000000000..0a82d1d11c4c --- /dev/null +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts @@ -0,0 +1,40 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; + +@Component({ + selector: 'jhi-exercise-update-plagiarism', + templateUrl: './exercise-update-plagiarism.component.html', +}) +export class ExerciseUpdatePlagiarismComponent implements OnInit { + @Input() exercise: Exercise; + + faQuestionCircle = faQuestionCircle; + + plagiarismChecksSimilarityThresholdPercentage: number; + + ngOnInit(): void { + this.plagiarismChecksSimilarityThresholdPercentage = this.exercise!.plagiarismDetectionConfig!.similarityThreshold! * 100; + } + + /** + * Return the translation identifier of the minimum size tooltip for the current exercise type. + */ + getMinimumSizeTooltip() { + switch (this.exercise.type) { + case ExerciseType.PROGRAMMING: { + return 'artemisApp.plagiarism.minimumSizeTooltipProgrammingExercise'; + } + case ExerciseType.TEXT: { + return 'artemisApp.plagiarism.minimumSizeTooltipTextExercise'; + } + case ExerciseType.MODELING: { + return 'artemisApp.plagiarism.minimumSizeTooltipModelingExercise'; + } + } + } + + updateSimilarityThreshold() { + this.exercise.plagiarismDetectionConfig!.similarityThreshold = this.plagiarismChecksSimilarityThresholdPercentage / 100; + } +} diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module.ts b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module.ts new file mode 100644 index 000000000000..949f1bb82da2 --- /dev/null +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component'; + +@NgModule({ + declarations: [ExerciseUpdatePlagiarismComponent], + imports: [ArtemisSharedCommonModule], + exports: [ExerciseUpdatePlagiarismComponent], +}) +export class ExerciseUpdatePlagiarismModule {} diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html index 81da40a3f65e..fec47ddac0d4 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html @@ -151,6 +151,7 @@

+
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.module.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.module.ts index e1c1464f3a35..4f616c400d0c 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.module.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.module.ts @@ -26,6 +26,7 @@ import { ExampleSubmissionsModule } from 'app/exercises/shared/example-submissio import { ExerciseCategoriesModule } from 'app/shared/exercise-categories/exercise-categories.module'; import { ExerciseTitleChannelNameModule } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.module'; import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.module'; +import { ExerciseUpdatePlagiarismModule } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module'; const ENTITY_STATES = [...textExerciseRoute]; @@ -52,6 +53,7 @@ const ENTITY_STATES = [...textExerciseRoute]; ExerciseCategoriesModule, ExerciseTitleChannelNameModule, ExerciseUpdateNotificationModule, + ExerciseUpdatePlagiarismModule, ], declarations: [TextExerciseComponent, TextExerciseDetailComponent, TextExerciseUpdateComponent, TextExerciseRowButtonsComponent], exports: [TextExerciseComponent], diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index cc1737f42183..e401cf776140 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -29,16 +29,17 @@ "denied": "{{ amount }} abgelehnt", "open": "{{ amount }} offen", "portionOfAllCases": "{{ percentage }}% aller Fälle", - "similarityThreshold": "Ähnlichkeitsschwelle in %", + "similarityThreshold": "Plagiatskontrolle: Ähnlichkeitsschwelle in %", "similarityThresholdTooltip": "Ignoriere Vergleiche, deren Ähnlichkeit unter dieser Schwelle liegt. Eine Ähnlichkeit von 0% bedeutet, dass es keinerlei Überschneidung zwischen zwei Einreichungen gibt, eine Ähnlichkeit von 50% bedeutet, dass in etwa die Hälfte zweier Einreichungen identisch ist. Eine Ähnlichkeit von 100% bedeutet, dass zwei Einreichungen komplett identisch sind", - "minimumScore": "Minimale Bewertung in %", + "minimumScore": "Plagiatskontrolle: Minimale Bewertung in %", "minimumScoreTooltip": "Berücksichtige nur Einreichungen mit einer Bewertung, die mindestens diesem Wert entspricht", - "minimumSize": "Minimale Größe", + "minimumSize": "Plagiatskontrolle: Minimale Größe", "minimumSizeTooltipTextExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Wörter beinhalten wie der angegebene Wert.", "minimumSizeTooltipProgrammingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele unterschiedliche Zeilen (im Vergleich zur Vorlage) beinhalten wie der angegebene Wert.", "minimumSizeTooltipModelingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Modellelemente beinhalten wie der angegebene Wert.", "noInfoAvailable": "Keine Information verfügbar", - "caution": "Die Plagiatskontrolle kann für große Kurse sehr lange dauern.", + "caution": "Die Plagiatskontrolle kann sehr lange dauern.", + "configurationMoved": "Die Konfiguration wurde auf die Bearbeitungsseite der Übung verschoben.", "detect": "Plagiate finden", "rerun": "Erneut Plagiate finden", "resetFilter": "Filter zurücksetzen", @@ -46,6 +47,10 @@ "fetchingResults": "Plagiate werden geladen...", "replyToAccusation": "Stellung zu dem Vorwurf nehmen", "replyToAccusationDueDateNotification": "Du kannst dich spätestens bis zum {{ dueDate }} zu dem Vorwurf äußern.", + "continuousPlagiarismControl": "Kontinuierliche Plagiatskontrolle", + "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus.", + "continuousPlagiarismControlEnabled": "Aktiviere Kontinuierliche Plagiatskontrolle", + "continuousPlagiarismControlPostDueDateChecksEnabled": "Führe die Überprüfung der Abgaben nach der Einreichungsfrist ein weiteres mal durch.", "cleanUp": { "confirmDialog": { "title": "Plagiatsvergleiche aufräumen", diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index bc34950a6fe6..48a50050c307 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -189,6 +189,7 @@ "points": "Punkte:", "bonus": "Bonus:", "of": " von ", + "plagiarismDetected": "Verdacht auf Plagiat!", "problemStatement": "Problemstellung:", "noResults": "Du hast noch keine Ergebnisse", "instructorActions": { diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 8bf6cb2a23f0..23d905003b9f 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -29,16 +29,17 @@ "denied": "{{ amount }} denied", "open": "{{ amount }} open", "portionOfAllCases": "{{ percentage }}% of all cases", - "similarityThreshold": "Similarity Threshold in %", + "similarityThreshold": "Plagiarism Detection: Similarity Threshold in %", "similarityThresholdTooltip": "Ignore comparisons whose similarity is below this threshold. A similarity of 0% means that there is no overlap between two submissions, a similarity of 50% means that about half of two submissions are identical. A similarity of 100% means that two submissions are completely identical", - "minimumScore": "Minimum Score in %", + "minimumScore": "Plagiarism Detection: Minimum Score in %", "minimumScoreTooltip": "Consider only submissions with a score greater than or equal to this value", - "minimumSize": "Minimum Size", + "minimumSize": "Plagiarism Detection: Minimum Size", "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many words as the specified value.", "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value.", "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", "noInfoAvailable": "No information available", - "caution": "Plagiarism detection can take a long time for large courses.", + "caution": "Plagiarism detection can take a long time.", + "configurationMoved": "Configuration was moved to the exercise update page.", "detect": "Detect plagiarism", "rerun": "Rerun plagiarism detection", "resetFilter": "Reset filter", @@ -46,6 +47,10 @@ "fetchingResults": "Fetching plagiarism results...", "replyToAccusation": "Reply to Accusation", "replyToAccusationDueDateNotification": "You can provide a statement to this accusation until {{ dueDate }} the latest.", + "continuousPlagiarismControl": "Continuous Plagiarism Control", + "continuousPlagiarismControlTooltip": "Continuous Plagiarism Control automatically triggers a plagiarism check each night.", + "continuousPlagiarismControlEnabled": "Enable Continuous Plagiarism Control", + "continuousPlagiarismControlPostDueDateChecksEnabled": "Check the submissions for plagiarism one more time after the due date.", "cleanUp": { "confirmDialog": { "title": "Clean up plagiarism comparisons", diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json index b0212682ffba..993831917e94 100644 --- a/src/main/webapp/i18n/en/student-dashboard.json +++ b/src/main/webapp/i18n/en/student-dashboard.json @@ -191,6 +191,7 @@ "points": "Points:", "bonus": "Bonus:", "of": " of ", + "plagiarismDetected": "Suspicion of plagiarism!", "problemStatement": "Problem statement:", "noResults": "You have no results yet", "instructorActions": { diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts index 2e5de9756348..8f97019adaad 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts @@ -62,6 +62,7 @@ import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/m import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { ExerciseUpdateNotificationComponent } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.component'; +import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component'; describe('ProgrammingExercise Management Update Component', () => { const courseId = 1; @@ -118,6 +119,7 @@ describe('ProgrammingExercise Management Update Component', () => { MockDirective(TranslateDirective), MockComponent(ModePickerComponent), MockComponent(ExerciseUpdateNotificationComponent), + MockComponent(ExerciseUpdatePlagiarismComponent), ], providers: [ { provide: LocalStorageService, useClass: MockSyncStorage }, From a53383ed43052e499154db147fbe37e444d32168 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 1 Oct 2023 20:31:20 +0200 Subject: [PATCH 30/95] improve code style and add missing docs --- .../java/de/tum/in/www1/artemis/domain/Exercise.java | 3 ++- .../domain/plagiarism/PlagiarismDetectionConfig.java | 12 ++++++++---- .../plagiarism/PlagiarismDetectionConfigHelper.java | 7 ++++++- .../artemis/web/rest/ModelingExerciseResource.java | 4 ++-- .../rest/ProgrammingExercisePlagiarismResource.java | 4 +++- .../web/rest/ProgrammingExerciseResource.java | 2 +- .../www1/artemis/web/rest/TextExerciseResource.java | 3 ++- .../plagiarism/PlagiarismCaseIntegrationTest.java | 6 +++++- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java index c60a7aa29f19..758843ca0af3 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java @@ -24,7 +24,8 @@ import de.tum.in.www1.artemis.domain.participation.Participation; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; import de.tum.in.www1.artemis.domain.participation.TutorParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.*; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.quiz.QuizExercise; import de.tum.in.www1.artemis.domain.view.QuizView; import de.tum.in.www1.artemis.service.ExerciseDateService; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 0d8d32209cfe..6169ca44f069 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -1,15 +1,19 @@ package de.tum.in.www1.artemis.domain.plagiarism; -import javax.persistence.*; +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.OneToOne; import javax.persistence.Table; -import org.hibernate.annotations.*; import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.in.www1.artemis.domain.*; +import de.tum.in.www1.artemis.domain.DomainObject; +import de.tum.in.www1.artemis.domain.Exercise; /** * Stores configuration for manual and continuous plagiarism control. diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index 0c2bc01a7815..fd1dec622f4f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -5,8 +5,13 @@ import org.springframework.data.jpa.repository.JpaRepository; import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.plagiarism.*; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +/** + * A config class containing logic for filling missing PlagiarismDetectionConfig for exercises created before deployment of the cpc. + * + * @see ContinuousPlagiarismControlService + */ public final class PlagiarismDetectionConfigHelper { private static final Logger log = LoggerFactory.getLogger(PlagiarismDetectionConfigHelper.class); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 479a479fd4ea..640eb4cc0b20 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -20,7 +20,6 @@ import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.plagiarism.*; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.metis.conversation.ChannelRepository; @@ -35,7 +34,8 @@ import de.tum.in.www1.artemis.service.feature.FeatureToggle; import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.*; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 4e0b8b00fa89..0749f424514d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -24,7 +24,9 @@ import de.tum.in.www1.artemis.service.AuthorizationCheckService; import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.plagiarism.*; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; +import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java index 31fccff71c90..21523fbdb831 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java @@ -38,7 +38,7 @@ import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; -import de.tum.in.www1.artemis.service.plagiarism.*; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; import de.tum.in.www1.artemis.service.programming.*; import de.tum.in.www1.artemis.web.rest.dto.BuildLogStatisticsDTO; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index e60085c7ea9d..0b48dcabf408 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -29,7 +29,8 @@ import de.tum.in.www1.artemis.service.messaging.InstanceMessageSendService; import de.tum.in.www1.artemis.service.metis.conversation.ChannelService; import de.tum.in.www1.artemis.service.notifications.GroupNotificationScheduleService; -import de.tum.in.www1.artemis.service.plagiarism.*; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper; +import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index c73610e57567..4f9303b65a47 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -18,7 +18,11 @@ import de.tum.in.www1.artemis.domain.*; import de.tum.in.www1.artemis.domain.exam.Exam; import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.plagiarism.*; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.in.www1.artemis.exercise.ExerciseUtilService; import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService; From d85d53d6c8f3dc71ba283e638568b58868d91cd9 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 1 Oct 2023 23:19:28 +0200 Subject: [PATCH 31/95] custom parameters for manual plagiarism checks --- .../PlagiarismDetectionConfigHelper.java | 17 +++++++++++++++++ .../web/rest/ModelingExerciseResource.java | 9 +++++++-- .../ProgrammingExercisePlagiarismResource.java | 18 ++++++++++++++---- .../artemis/web/rest/TextExerciseResource.java | 11 ++++++++--- .../exercise-update-plagiarism.component.html | 6 +++--- src/main/webapp/i18n/de/plagiarism.json | 7 +++++-- src/main/webapp/i18n/en/plagiarism.json | 9 ++++++--- 7 files changed, 60 insertions(+), 17 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index fd1dec622f4f..2536b1b218d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -11,6 +11,7 @@ * A config class containing logic for filling missing PlagiarismDetectionConfig for exercises created before deployment of the cpc. * * @see ContinuousPlagiarismControlService + * @see PlagiarismDetectionConfig */ public final class PlagiarismDetectionConfigHelper { @@ -34,4 +35,20 @@ public static void createAndSaveDefaultIfNull(T exercise, J repository.save(exercise); } } + + /** + * Sets given parameters as corresponding values of plagiarism checks config in the given exercise. + * + * @param exercise exercise with existing plagiarism checks config + * @param similarityThreshold similarityThreshold to set for the given exercise + * @param minimumScore similarityThreshold to set for the given exercise + * @param minimumSize similarityThreshold to set for the given exercise + */ + public static void updateWithTemporaryParameters(Exercise exercise, float similarityThreshold, int minimumScore, int minimumSize) { + var config = new PlagiarismDetectionConfig(); + config.setSimilarityThreshold(similarityThreshold); + config.setMinimumScore(minimumScore); + config.setMinimumSize(minimumSize); + exercise.setPlagiarismDetectionConfig(config); + } } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 640eb4cc0b20..f67ddac0061d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -378,18 +378,23 @@ public ResponseEntity getPlagiarismResult(@PathVariabl *

* Start the automated plagiarism detection for the given exercise and return its result. * - * @param exerciseId for which all submission should be checked + * @param exerciseId for which all submission should be checked + * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) + * @param minimumScore consider only submissions whose score is greater or equal to this value + * @param minimumSize consider only submissions whose size is greater or equal to this value * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). */ @GetMapping("modeling-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastInstructor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId) { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + @RequestParam int minimumSize) { var modelingExercise = modelingExerciseRepository.findByIdWithStudentParticipationsSubmissionsResultsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for modeling exercise: exerciseId={}.", exerciseId); PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(modelingExercise, similarityThreshold, minimumScore, minimumSize); var plagiarismResult = plagiarismDetectionService.checkModelingExercise(modelingExercise); log.info("Finished manual plagiarism checks for modeling exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 0749f424514d..186596247102 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -81,7 +81,10 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo /** * GET /programming-exercises/{exerciseId}/check-plagiarism : Start the automated plagiarism detection for the given exercise and return its result. * - * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed + * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed + * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) + * @param minimumScore consider only submissions whose score is greater or equal to this value + * @param minimumSize consider only submissions whose number of diff to template lines is greate or equal to this value * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). * @throws ExitException is thrown if JPlag exits unexpectedly * @throws IOException is thrown for file handling errors @@ -89,13 +92,15 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping(CHECK_PLAGIARISM) @EnforceAtLeastEditor @FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks }) - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId) throws ExitException, IOException { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + @RequestParam int minimumSize) throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for programming exercise: exerciseId={}.", exerciseId); PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(programmingExercise, similarityThreshold, minimumScore, minimumSize); try { var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise); return ResponseEntity.ok(plagiarismResult); @@ -111,14 +116,18 @@ public ResponseEntity checkPlagiarism(@PathVariable long e /** * GET /programming-exercises/{exerciseId}/plagiarism-check : Uses JPlag to check for plagiarism and returns the generated output as zip file * - * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed + * @param exerciseId The ID of the programming exercise for which the plagiarism check should be executed + * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) + * @param minimumScore consider only submissions whose score is greater or equal to this value + * @param minimumSize consider only submissions whose number of diff to template lines is greate or equal to this value * @return The ResponseEntity with status 201 (Created) or with status 400 (Bad Request) if the parameters are invalid * @throws IOException is thrown for file handling errors */ @GetMapping(value = CHECK_PLAGIARISM_JPLAG_REPORT) @EnforceAtLeastEditor @FeatureToggle(Feature.ProgrammingExercises) - public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId) throws IOException { + public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + @RequestParam int minimumSize) throws IOException { log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); @@ -126,6 +135,7 @@ public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable lon long start = System.nanoTime(); log.info("Started manual plagiarism checks with Jplag report for programming exercise: exerciseId={}.", exerciseId); PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(programmingExercise, similarityThreshold, minimumScore, minimumSize); try { var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise); if (zipFile == null) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 0b48dcabf408..79fbee497102 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -485,19 +485,24 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo *

* Start the automated plagiarism detection for the given exercise and return its result. * - * @param exerciseId ID of the exercise for which to detect plagiarism + * @param exerciseId ID of the exercise for which to detect plagiarism + * @param similarityThreshold ignore comparisons whose similarity is below this threshold (in % between 0 and 100) + * @param minimumScore consider only submissions whose score is greater or equal to this value + * @param minimumSize consider only submissions whose size is greater or equal to this value * @return the ResponseEntity with status 200 (OK) and the list of at most 500 pair-wise submissions with a similarity above the given threshold (e.g. 50%). */ @GetMapping("text-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastEditor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId) throws ExitException { + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + @RequestParam int minimumSize) throws ExitException { TextExercise textExercise = textExerciseRepository.findByIdWithStudentParticipationsAndSubmissionsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, textExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for text exercise: exerciseId={}.", exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(textExercise, textExerciseRepository); + // PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(textExercise, textExerciseRepository); + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(textExercise, similarityThreshold, minimumScore, minimumSize); var plagiarismResult = plagiarismDetectionService.checkTextExercise(textExercise); log.info("Finished manual plagiarism checks for text exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); return ResponseEntity.ok(plagiarismResult); diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html index 2bf984af8d67..76150d907137 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html @@ -3,7 +3,7 @@

- +
- +
- +
Date: Sun, 1 Oct 2023 23:22:15 +0200 Subject: [PATCH 32/95] fix for custom parameters for manual plagiarism checks --- .../tum/in/www1/artemis/web/rest/ModelingExerciseResource.java | 1 - .../artemis/web/rest/ProgrammingExercisePlagiarismResource.java | 2 -- .../de/tum/in/www1/artemis/web/rest/TextExerciseResource.java | 1 - 3 files changed, 4 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index f67ddac0061d..cd4b4a75e641 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -393,7 +393,6 @@ public ResponseEntity checkPlagiarism(@PathVariable lo authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); long start = System.nanoTime(); log.info("Started manual plagiarism checks for modeling exercise: exerciseId={}.", exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(modelingExercise, similarityThreshold, minimumScore, minimumSize); var plagiarismResult = plagiarismDetectionService.checkModelingExercise(modelingExercise); log.info("Finished manual plagiarism checks for modeling exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 186596247102..4f4e01ae11c6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -99,7 +99,6 @@ public ResponseEntity checkPlagiarism(@PathVariable long e long start = System.nanoTime(); log.info("Started manual plagiarism checks for programming exercise: exerciseId={}.", exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(programmingExercise, similarityThreshold, minimumScore, minimumSize); try { var plagiarismResult = plagiarismDetectionService.checkProgrammingExercise(programmingExercise); @@ -134,7 +133,6 @@ public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable lon long start = System.nanoTime(); log.info("Started manual plagiarism checks with Jplag report for programming exercise: exerciseId={}.", exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(programmingExercise, similarityThreshold, minimumScore, minimumSize); try { var zipFile = plagiarismDetectionService.checkProgrammingExerciseWithJplagReport(programmingExercise); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 79fbee497102..04c04e55acd8 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -501,7 +501,6 @@ public ResponseEntity checkPlagiarism(@PathVariable long e long start = System.nanoTime(); log.info("Started manual plagiarism checks for text exercise: exerciseId={}.", exerciseId); - // PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(textExercise, textExerciseRepository); PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(textExercise, similarityThreshold, minimumScore, minimumSize); var plagiarismResult = plagiarismDetectionService.checkTextExercise(textExercise); log.info("Finished manual plagiarism checks for text exercise: exerciseId={}, elapsed={}.", exerciseId, TimeLogUtil.formatDurationFrom(start)); From cf748e15f8518e4a7be9c3abc11678bcb64c8548 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 08:52:05 +0200 Subject: [PATCH 33/95] change plagiarism checks default params --- .../artemis/domain/plagiarism/PlagiarismDetectionConfig.java | 4 ++-- src/main/webapp/app/entities/exercise.model.ts | 4 ++-- .../plagiarism-inspector/plagiarism-inspector.component.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 6169ca44f069..92db43ab4391 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -100,9 +100,9 @@ public static PlagiarismDetectionConfig createDefault() { var config = new PlagiarismDetectionConfig(); config.setContinuousPlagiarismControlEnabled(false); config.setContinuousPlagiarismControlPostDueDateChecksEnabled(false); - config.setSimilarityThreshold(0.5f); + config.setSimilarityThreshold(0.9f); config.setMinimumScore(0); - config.setMinimumSize(0); + config.setMinimumSize(50); return config; } } diff --git a/src/main/webapp/app/entities/exercise.model.ts b/src/main/webapp/app/entities/exercise.model.ts index 34c2b9fe4d43..c1a74ae1623c 100644 --- a/src/main/webapp/app/entities/exercise.model.ts +++ b/src/main/webapp/app/entities/exercise.model.ts @@ -100,8 +100,8 @@ export abstract class Exercise implements BaseEntity { public plagiarismDetectionConfig?: PlagiarismDetectionConfig = { continuousPlagiarismControlEnabled: false, continuousPlagiarismControlPostDueDateChecksEnabled: true, - similarityThreshold: 0.5, - minimumSize: 0, + similarityThreshold: 0.9, + minimumSize: 50, minimumScore: 0, }; // default value diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts index e69d8875925d..d2fcfd5a6b58 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.ts @@ -76,7 +76,7 @@ export class PlagiarismInspectorComponent implements OnInit { /** * Minimum similarity (%) of the comparisons to return. */ - similarityThreshold = 50; + similarityThreshold = 90; /** * Ignore submissions with a score less than `minimumScore` in plagiarism detection. @@ -86,7 +86,7 @@ export class PlagiarismInspectorComponent implements OnInit { /** * Ignore submissions with a size less than `minimumSize` in plagiarism detection. */ - minimumSize = 0; + minimumSize = 50; /** * The minimumScore option is only configurable, if this value is true. From 0ed6c46f6e5ba2ebae9071087303ac41fe4d996f Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 09:26:39 +0200 Subject: [PATCH 34/95] update cpc tooltip EN --- src/main/webapp/i18n/de/plagiarism.json | 2 +- src/main/webapp/i18n/en/plagiarism.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 508bf5db9eaa..0dee74a42646 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -51,7 +51,7 @@ "replyToAccusation": "Stellung zu dem Vorwurf nehmen", "replyToAccusationDueDateNotification": "Du kannst dich spätestens bis zum {{ dueDate }} zu dem Vorwurf äußern.", "continuousPlagiarismControl": "Kontinuierliche Plagiatskontrolle", - "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus.", + "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus. Detected are marked as plagiarism and students are gently notified about this fact.", "continuousPlagiarismControlEnabled": "Aktiviere Kontinuierliche Plagiatskontrolle", "continuousPlagiarismControlPostDueDateChecksEnabled": "Führe die Überprüfung der Abgaben nach der Einreichungsfrist ein weiteres mal durch.", "cleanUp": { diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index dc0668e42015..45ef0e9e323e 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -51,7 +51,7 @@ "replyToAccusation": "Reply to Accusation", "replyToAccusationDueDateNotification": "You can provide a statement to this accusation until {{ dueDate }} the latest.", "continuousPlagiarismControl": "Continuous Plagiarism Control", - "continuousPlagiarismControlTooltip": "Continuous Plagiarism Control automatically triggers a plagiarism check each night.", + "continuousPlagiarismControlTooltip": "Continuous Plagiarism Control automatically triggers a plagiarism check each night. Detected are marked as plagiarism and students are gently notified about this fact.", "continuousPlagiarismControlEnabled": "Enable Continuous Plagiarism Control", "continuousPlagiarismControlPostDueDateChecksEnabled": "Check the submissions for plagiarism one more time after the due date.", "cleanUp": { From 9fee04afb5e380e067199cf467f938ba142718d4 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 09:27:21 +0200 Subject: [PATCH 35/95] fix repository method used and remove unused ones --- .../repository/ProgrammingExerciseRepository.java | 11 ----------- .../artemis/web/rest/ProgrammingExerciseResource.java | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java index 4c210e63a514..92b3a205318e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java @@ -57,10 +57,6 @@ public interface ProgrammingExerciseRepository extends JpaRepository findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(Long exerciseId); - @EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories", - "submissionPolicy" }) - Optional findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(Long exerciseId); - @EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories", "submissionPolicy", "plagiarismDetectionConfig" }) Optional findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(Long exerciseId); @@ -546,13 +542,6 @@ default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssi return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId)); } - @NotNull - default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesElseThrow(long programmingExerciseId) - throws EntityNotFoundException { - Optional programmingExercise = findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(programmingExerciseId); - return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId)); - } - @NotNull default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow( long programmingExerciseId) throws EntityNotFoundException { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java index 21523fbdb831..df56000221fb 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java @@ -371,7 +371,8 @@ public ResponseEntity> getProgrammingExercisesForCours @EnforceAtLeastTutor public ResponseEntity getProgrammingExercise(@PathVariable long exerciseId) { log.debug("REST request to get ProgrammingExercise : {}", exerciseId); - var programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesElseThrow(exerciseId); + var programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow(exerciseId); PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); // Fetch grading criterion into exercise of participation List gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(programmingExercise.getId()); From ca48a9a3951ccf69036646cc9deb13d4ad6aa603 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 09:27:39 +0200 Subject: [PATCH 36/95] fix field name --- .../in/www1/artemis/repository/ModelingExerciseRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java index 261fca730777..7b38981f4437 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java @@ -32,7 +32,7 @@ public interface ModelingExerciseRepository extends JpaRepository findByCourseIdWithCategories(@Param("courseId") Long courseId); @EntityGraph(type = LOAD, attributePaths = { "exampleSubmissions", "teamAssignmentConfig", "categories", "competencies", "exampleSubmissions.submission.results", - "plagiarismDetctionConfig" }) + "plagiarismDetectionConfig" }) Optional findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(@Param("exerciseId") Long exerciseId); @Query("select modelingExercise from ModelingExercise modelingExercise left join fetch modelingExercise.exampleSubmissions exampleSubmissions left join fetch exampleSubmissions.submission submission left join fetch submission.results results left join fetch results.feedbacks left join fetch results.assessor left join fetch modelingExercise.teamAssignmentConfig where modelingExercise.id = :#{#exerciseId}") From f175ad33b159dac220c6a544962421386f6576d0 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 09:28:01 +0200 Subject: [PATCH 37/95] improve style of cpc settings --- .../exercise-update-plagiarism.component.html | 124 +++++++++--------- src/main/webapp/i18n/de/plagiarism.json | 3 - src/main/webapp/i18n/en/plagiarism.json | 3 - 3 files changed, 61 insertions(+), 69 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html index 76150d907137..1e2b86b2692f 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html @@ -1,66 +1,3 @@ -
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
-
- - -
- -
-
-
-
@@ -97,5 +34,66 @@
+
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
+
+
+ + +
+ +
+
+
diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 0dee74a42646..aca2e94f5de7 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -30,13 +30,10 @@ "open": "{{ amount }} offen", "portionOfAllCases": "{{ percentage }}% aller Fälle", "similarityThreshold": "Ähnlichkeitsschwelle in %", - "similarityThresholdExerciseUpdate": "Plagiatskontrolle: Ähnlichkeitsschwelle in %", "similarityThresholdTooltip": "Ignoriere Vergleiche, deren Ähnlichkeit unter dieser Schwelle liegt. Eine Ähnlichkeit von 0% bedeutet, dass es keinerlei Überschneidung zwischen zwei Einreichungen gibt, eine Ähnlichkeit von 50% bedeutet, dass in etwa die Hälfte zweier Einreichungen identisch ist. Eine Ähnlichkeit von 100% bedeutet, dass zwei Einreichungen komplett identisch sind", "minimumScore": "Minimale Bewertung in %", - "minimumScoreExerciseUpdate": "Plagiatskontrolle: Minimale Bewertung in %", "minimumScoreTooltip": "Berücksichtige nur Einreichungen mit einer Bewertung, die mindestens diesem Wert entspricht", "minimumSize": "Plagiatskontrolle: Minimale Größe", - "minimumSizeExerciseUpdate": "Plagiatskontrolle: Minimale Größe", "minimumSizeTooltipTextExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Wörter beinhalten wie der angegebene Wert.", "minimumSizeTooltipProgrammingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele unterschiedliche Zeilen (im Vergleich zur Vorlage) beinhalten wie der angegebene Wert.", "minimumSizeTooltipModelingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Modellelemente beinhalten wie der angegebene Wert.", diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 45ef0e9e323e..499d6ab114e2 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -30,13 +30,10 @@ "open": "{{ amount }} open", "portionOfAllCases": "{{ percentage }}% of all cases", "similarityThreshold": "Similarity Threshold in %", - "similarityThresholdExerciseUpdate": "Plagiarism Detection: Similarity Threshold in %", "similarityThresholdTooltip": "Ignore comparisons whose similarity is below this threshold. A similarity of 0% means that there is no overlap between two submissions, a similarity of 50% means that about half of two submissions are identical. A similarity of 100% means that two submissions are completely identical", "minimumScore": "Minimum Score in %", - "minimumScoreExerciseUpdate": "Plagiarism Detection: Minimum Score in %", "minimumScoreTooltip": "Consider only submissions with a score greater than or equal to this value", "minimumSize": "Minimum Size", - "minimumSizeExerciseUpdate": "Plagiarism Detection: Minimum Size", "minimumSizeTooltipTextExercise": "Consider only submissions that have at least as many words as the specified value.", "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value.", "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", From 7e4fb823be0543fbd006ec34ff561377a3842297 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 09:32:00 +0200 Subject: [PATCH 38/95] revert manual plagiarism checks warning --- src/main/webapp/i18n/de/plagiarism.json | 3 +-- src/main/webapp/i18n/en/plagiarism.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index aca2e94f5de7..6196a6ffdc3e 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -38,8 +38,7 @@ "minimumSizeTooltipProgrammingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele unterschiedliche Zeilen (im Vergleich zur Vorlage) beinhalten wie der angegebene Wert.", "minimumSizeTooltipModelingExercise": "Es werden nur diejenigen Abgaben berücksichtigt, die mindestens so viele Modellelemente beinhalten wie der angegebene Wert.", "noInfoAvailable": "Keine Information verfügbar", - "caution": "Die Plagiatskontrolle kann sehr lange dauern.", - "configurationMoved": "Die Konfiguration wurde auf die Bearbeitungsseite der Übung verschoben.", + "caution": "Die Plagiatskontrolle kann für große Kurse sehr lange dauern.", "detect": "Plagiate finden", "rerun": "Erneut Plagiate finden", "resetFilter": "Filter zurücksetzen", diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 499d6ab114e2..2db30fcf58d8 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -38,8 +38,7 @@ "minimumSizeTooltipProgrammingExercise": "Consider only submissions that have at least as many different lines in comparison to the template as the specified value.", "minimumSizeTooltipModelingExercise": "Consider only submissions that have at least as many modeling elements as the specified value.", "noInfoAvailable": "No information available", - "caution": "Plagiarism detection can take a long time.", - "configurationMoved": "Configuration was moved to the exercise update page.", + "caution": "Plagiarism detection can take a long time for large courses.", "detect": "Detect plagiarism", "rerun": "Rerun plagiarism detection", "resetFilter": "Reset filter", From 2df6f7cfad79a0f5d1d7a84ec185edb2d3a9ccca Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 13:52:15 +0200 Subject: [PATCH 39/95] add plagiarism configuration to modeling import --- .../artemis/repository/ModelingExerciseRepository.java | 9 +++++++-- .../in/www1/artemis/service/exam/ExamImportService.java | 2 +- .../www1/artemis/web/rest/ModelingExerciseResource.java | 2 +- .../ModelingExerciseIntegrationTest.java | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java index 7b38981f4437..027946d71896 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java @@ -35,8 +35,8 @@ public interface ModelingExerciseRepository extends JpaRepository findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(@Param("exerciseId") Long exerciseId); - @Query("select modelingExercise from ModelingExercise modelingExercise left join fetch modelingExercise.exampleSubmissions exampleSubmissions left join fetch exampleSubmissions.submission submission left join fetch submission.results results left join fetch results.feedbacks left join fetch results.assessor left join fetch modelingExercise.teamAssignmentConfig where modelingExercise.id = :#{#exerciseId}") - Optional findByIdWithExampleSubmissionsAndResults(@Param("exerciseId") Long exerciseId); + @Query("select modelingExercise from ModelingExercise modelingExercise left join fetch modelingExercise.exampleSubmissions exampleSubmissions left join fetch exampleSubmissions.submission submission left join fetch submission.results results left join fetch results.feedbacks left join fetch results.assessor left join fetch modelingExercise.teamAssignmentConfig left join fetch modelingExercise.plagiarismDetectionConfig where modelingExercise.id = :#{#exerciseId}") + Optional findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(@Param("exerciseId") Long exerciseId); /** * Get all modeling exercises that need to be scheduled: Those must satisfy one of the following requirements: @@ -77,6 +77,11 @@ default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesAndPlagia .orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); } + @NotNull + default ModelingExercise findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigElseThrow(long exerciseId) { + return findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(exerciseId).orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); + } + @NotNull default ModelingExercise findByIdWithStudentParticipationsSubmissionsResultsElseThrow(long exerciseId) { return findWithStudentParticipationsSubmissionsResultsById(exerciseId).orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java index 12121000919e..d771836d33a4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamImportService.java @@ -268,7 +268,7 @@ private void addExercisesToExerciseGroup(ExerciseGroup exerciseGroupToCopy, Exer switch (exerciseToCopy.getExerciseType()) { case MODELING -> { final Optional optionalOriginalModellingExercise = modelingExerciseRepository - .findByIdWithExampleSubmissionsAndResults(exerciseToCopy.getId()); + .findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(exerciseToCopy.getId()); // We do not want to abort the whole exam import process, we only skip the relevant exercise if (optionalOriginalModellingExercise.isEmpty()) { break; diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index cd4b4a75e641..519b9f49313a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -317,7 +317,7 @@ public ResponseEntity importExercise(@PathVariable long source } importedExercise.checkCourseAndExerciseGroupExclusivity("Modeling Exercise"); final var user = userRepository.getUserWithGroupsAndAuthorities(); - final var originalModelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(sourceExerciseId); + final var originalModelingExercise = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfigElseThrow(sourceExerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, importedExercise, user); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, originalModelingExercise, user); // validates general settings: points, dates diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java index f58bd0ab3cc8..e3201a131875 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/modelingexercise/ModelingExerciseIntegrationTest.java @@ -449,7 +449,7 @@ void importModelingExerciseWithExampleSubmissionFromCourseToCourse() throws Exce HttpStatus.CREATED); assertThat(modelingExerciseRepository.findById(importedModelingExercise.getId())).isPresent(); - importedModelingExercise = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResults(modelingExercise.getId()).orElseThrow(); + importedModelingExercise = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(modelingExercise.getId()).orElseThrow(); var importedExampleSubmission = importedModelingExercise.getExampleSubmissions().stream().findFirst().orElseThrow(); assertThat(importedExampleSubmission.getId()).isEqualTo(exampleSubmission.getId()); @@ -1077,7 +1077,8 @@ void testImportModelingExercise_setGradingInstructionForCopiedFeedback() throws assertThat(importedFeedbackGradingInstruction.getCredits()).isEqualTo(gradingInstruction.getCredits()); assertThat(importedFeedbackGradingInstruction.getUsageCount()).isEqualTo(gradingInstruction.getUsageCount()); - var importedModelingExerciseFromDb = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResults(importedModelingExercise.getId()).orElseThrow(); + var importedModelingExerciseFromDb = modelingExerciseRepository.findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(importedModelingExercise.getId()) + .orElseThrow(); var importedFeedbackGradingInstructionFromDb = importedModelingExerciseFromDb.getExampleSubmissions().stream().findFirst().orElseThrow().getSubmission().getLatestResult() .getFeedbacks().get(0).getGradingInstruction(); From 935babd147a160a87174db4bc5757dd1ca567010 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 13:58:49 +0200 Subject: [PATCH 40/95] add ContinuousPlagiarismControlServiceTest --- ...ontinuousPlagiarismControlServiceTest.java | 119 ++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java new file mode 100644 index 000000000000..0ada14ed472a --- /dev/null +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -0,0 +1,119 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.time.ZonedDateTime; +import java.util.Set; + +import org.junit.jupiter.api.Test; + +import de.jplag.exceptions.*; +import de.tum.in.www1.artemis.domain.Exercise; +import de.tum.in.www1.artemis.domain.FileUploadExercise; +import de.tum.in.www1.artemis.domain.ProgrammingExercise; +import de.tum.in.www1.artemis.domain.TextExercise; +import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.in.www1.artemis.domain.quiz.QuizExercise; +import de.tum.in.www1.artemis.repository.ExerciseRepository; + +class ContinuousPlagiarismControlServiceTest { + + private final ExerciseRepository exerciseRepository = mock(); + + private final PlagiarismDetectionService plagiarismChecksService = mock(); + + private final ContinuousPlagiarismControlService service = new ContinuousPlagiarismControlService(exerciseRepository, plagiarismChecksService); + + @Test + void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + // given: exercises with cpc enabled + var textExercise = new TextExercise(); + textExercise.setDueDate(null); + var modelingExercise = new ModelingExercise(); + modelingExercise.setDueDate(ZonedDateTime.now().minusDays(1)); + modelingExercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); + modelingExercise.getPlagiarismDetectionConfig().setContinuousPlagiarismControlPostDueDateChecksEnabled(true); + var programmingExercise = new ProgrammingExercise(); + programmingExercise.setDueDate(ZonedDateTime.now().plusDays(1)); + var exercises = Set.of(textExercise, modelingExercise, programmingExercise); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); + + // and: results of plagiarism checks + var textPlagiarismResult = new TextPlagiarismResult(); + when(plagiarismChecksService.checkTextExercise(textExercise)).thenReturn(textPlagiarismResult); + var modelingPlagiarismResult = new ModelingPlagiarismResult(); + when(plagiarismChecksService.checkModelingExercise(modelingExercise)).thenReturn(modelingPlagiarismResult); + var programmingPlagiarismResult = new TextPlagiarismResult(); + when(plagiarismChecksService.checkProgrammingExercise(programmingExercise)).thenReturn(programmingPlagiarismResult); + + // when + service.executeChecks(); + + // then + verify(plagiarismChecksService).checkTextExercise(textExercise); + verify(plagiarismChecksService).checkModelingExercise(modelingExercise); + verify(plagiarismChecksService).checkProgrammingExercise(programmingExercise); + } + + @Test + void shouldNotExecuteChecksAfterDueDate() { + // given: exercises with cpc enabled + var exercise = new TextExercise(); + exercise.setDueDate(ZonedDateTime.now().minusDays(1)); + exercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); + exercise.getPlagiarismDetectionConfig().setContinuousPlagiarismControlPostDueDateChecksEnabled(false); + + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(Set.of(exercise)); + + // when + service.executeChecks(); + + // then + verifyNoInteractions(plagiarismChecksService); + } + + @Test + void shouldDoNothingForFileUploadAndQuizExercises() { + // given + var exercises = Set.of(new FileUploadExercise(), new QuizExercise()); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); + + // when + service.executeChecks(); + + // then + verifyNoInteractions(plagiarismChecksService); + } + + @Test + void shouldSilentAnyJPlagExceptionsThrown() throws Exception { + // given + var textExercise = new TextExercise(); + Set exercises = Set.of(textExercise); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); + when(plagiarismChecksService.checkTextExercise(textExercise)).thenThrow(new BasecodeException("msg")); + + // then + assertThatNoException().isThrownBy(service::executeChecks); + } + + @Test + void shouldSilentAnyUnknownExceptionsThrown() throws Exception { + // given + var textExercise = new TextExercise(); + Set exercises = Set.of(textExercise); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); + when(plagiarismChecksService.checkTextExercise(textExercise)).thenThrow(new IllegalStateException()); + + // then + assertThatNoException().isThrownBy(service::executeChecks); + } +} From bb8dcd4fc8aa6826d56f7e0e362eccbb92a8815d Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 15:04:38 +0200 Subject: [PATCH 41/95] mark submissions detected by cpc as suspected plagiarism --- .../repository/SubmissionRepository.java | 8 +- .../ContinuousPlagiarismControlService.java | 35 +++++++-- ...ontinuousPlagiarismControlServiceTest.java | 77 +++++++++++++++++-- 3 files changed, 107 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java index df24f34fd90e..b10adf9b4c0c 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/SubmissionRepository.java @@ -6,9 +6,7 @@ import java.util.Optional; import java.util.Set; -import org.springframework.data.jpa.repository.EntityGraph; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; +import org.springframework.data.jpa.repository.*; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -440,4 +438,8 @@ default Submission findOneWithEagerResultAndFeedback(long submissionId) { default Submission findByIdWithResultsElseThrow(long submissionId) { return findWithEagerResultsAndAssessorById(submissionId).orElseThrow(() -> new EntityNotFoundException("Submission", +submissionId)); } + + @Modifying + @Query("UPDATE Submission submission set submission.plagiarismSuspected = :#{#plagiarismSuspected} where submission.id in :#{#submissionIds}") + void updatePlagiarismSuspected(@Param("submissionIds") Set submissionId, @Param("plagiarismSuspected") boolean plagiarismSuspected); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 88a0167e308b..9008c2577dea 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -1,9 +1,13 @@ package de.tum.in.www1.artemis.service.plagiarism; import static java.lang.String.format; +import static java.util.function.Predicate.not; +import static java.util.stream.Collectors.toUnmodifiableSet; import java.time.ZonedDateTime; +import java.util.Optional; import java.util.function.Predicate; +import java.util.stream.Stream; import org.jvnet.hk2.annotations.Service; import org.slf4j.Logger; @@ -13,11 +17,16 @@ import org.springframework.stereotype.Component; import de.jplag.exceptions.ExitException; +import de.tum.in.www1.artemis.domain.DomainObject; import de.tum.in.www1.artemis.domain.Exercise; import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.TextExercise; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.participation.Participation; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; import de.tum.in.www1.artemis.repository.ExerciseRepository; +import de.tum.in.www1.artemis.repository.SubmissionRepository; import de.tum.in.www1.artemis.service.util.TimeLogUtil; /** @@ -37,9 +46,13 @@ public class ContinuousPlagiarismControlService { private final PlagiarismDetectionService plagiarismDetectionService; - public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, PlagiarismDetectionService plagiarismDetectionService) { + private final SubmissionRepository submissionRepository; + + public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, PlagiarismDetectionService plagiarismDetectionService, + SubmissionRepository submissionRepository) { this.exerciseRepository = exerciseRepository; this.plagiarismDetectionService = plagiarismDetectionService; + this.submissionRepository = submissionRepository; } /** @@ -57,7 +70,8 @@ public void executeChecks() { PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(exercise, exerciseRepository); try { - executeChecksForExercise(exercise); + var result = executeChecksForExercise(exercise); + updatePlagiarismSuspectedFlagForAllSubmissions(result, exercise); } catch (ExitException e) { log.error("Cannot check plagiarism due to Jplag error: exerciseId={}, type={}, error={}.", exercise.getId(), exercise.getExerciseType(), e.getMessage(), e); @@ -73,13 +87,24 @@ public void executeChecks() { log.debug("Continuous plagiarism control done."); } - private void executeChecksForExercise(Exercise exercise) throws Exception { - switch (exercise.getExerciseType()) { + private PlagiarismResult executeChecksForExercise(Exercise exercise) throws Exception { + return switch (exercise.getExerciseType()) { case TEXT -> plagiarismDetectionService.checkTextExercise((TextExercise) exercise); case PROGRAMMING -> plagiarismDetectionService.checkProgrammingExercise((ProgrammingExercise) exercise); case MODELING -> plagiarismDetectionService.checkModelingExercise((ModelingExercise) exercise); case FILE_UPLOAD, QUIZ -> throw new IllegalStateException( format("Cannot check plagiarism for exercise: type=%s, id=%s.", exercise.getExerciseType(), exercise.getId())); - } + }; + } + + private void updatePlagiarismSuspectedFlagForAllSubmissions(PlagiarismResult result, Exercise exercise) { + var allSubmissionIds = exercise.getStudentParticipations().stream().map(Participation::findLatestSubmission).filter(Optional::isPresent).map(Optional::get) + .map(DomainObject::getId).collect(toUnmodifiableSet()); + var submissionsIdsWithPlagiarismSuspicion = result.getComparisons().stream().flatMap(comparison -> Stream.of(comparison.getSubmissionA(), comparison.getSubmissionB())) + .map(PlagiarismSubmission::getSubmissionId).collect(toUnmodifiableSet()); + var submissionIdsWithoutPlagiarismSuspicion = allSubmissionIds.stream().filter(not(submissionsIdsWithPlagiarismSuspicion::contains)).collect(toUnmodifiableSet()); + + submissionRepository.updatePlagiarismSuspected(submissionsIdsWithPlagiarismSuspicion, true); + submissionRepository.updatePlagiarismSuspected(submissionIdsWithoutPlagiarismSuspicion, false); } } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java index 0ada14ed472a..224d14a4c6a7 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -1,9 +1,11 @@ package de.tum.in.www1.artemis.service.plagiarism; +import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import java.io.IOException; @@ -17,12 +19,18 @@ import de.tum.in.www1.artemis.domain.FileUploadExercise; import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.TextExercise; +import de.tum.in.www1.artemis.domain.TextSubmission; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.participation.StudentParticipation; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.in.www1.artemis.domain.quiz.QuizExercise; import de.tum.in.www1.artemis.repository.ExerciseRepository; +import de.tum.in.www1.artemis.repository.SubmissionRepository; class ContinuousPlagiarismControlServiceTest { @@ -30,24 +38,55 @@ class ContinuousPlagiarismControlServiceTest { private final PlagiarismDetectionService plagiarismChecksService = mock(); - private final ContinuousPlagiarismControlService service = new ContinuousPlagiarismControlService(exerciseRepository, plagiarismChecksService); + private final SubmissionRepository submissionRepository = mock(); + + private final ContinuousPlagiarismControlService service = new ContinuousPlagiarismControlService(exerciseRepository, plagiarismChecksService, submissionRepository); + + private static StudentParticipation createStudentParticipation(long submissionId) { + var participation = new StudentParticipation(); + var submission = new TextSubmission(); + submission.setId(submissionId); + participation.setSubmissions(singleton(submission)); + return participation; + } + + private static PlagiarismComparison createPlagiarismComparison(long submissionAId, long submissionBId) { + var comparison = new PlagiarismComparison(); + + var plagiarismSubmissionA = new PlagiarismSubmission<>(); + plagiarismSubmissionA.setSubmissionId(submissionAId); + comparison.setSubmissionA(plagiarismSubmissionA); + + var plagiarismSubmissionB = new PlagiarismSubmission<>(); + plagiarismSubmissionB.setSubmissionId(submissionBId); + comparison.setSubmissionB(plagiarismSubmissionB); + + return comparison; + } @Test void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { - // given: exercises with cpc enabled + // given: text exercise with cpc enabled var textExercise = new TextExercise(); textExercise.setDueDate(null); + + // and: modeling exercise with cpc and post due date checks enabled var modelingExercise = new ModelingExercise(); modelingExercise.setDueDate(ZonedDateTime.now().minusDays(1)); modelingExercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); modelingExercise.getPlagiarismDetectionConfig().setContinuousPlagiarismControlPostDueDateChecksEnabled(true); + + // and: programing exercise with cpc enabled var programmingExercise = new ProgrammingExercise(); programmingExercise.setDueDate(ZonedDateTime.now().plusDays(1)); + + // and: all exercises returned by query var exercises = Set.of(textExercise, modelingExercise, programmingExercise); when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); // and: results of plagiarism checks var textPlagiarismResult = new TextPlagiarismResult(); + textPlagiarismResult.setComparisons(Set.of(new PlagiarismComparison<>())); when(plagiarismChecksService.checkTextExercise(textExercise)).thenReturn(textPlagiarismResult); var modelingPlagiarismResult = new ModelingPlagiarismResult(); when(plagiarismChecksService.checkModelingExercise(modelingExercise)).thenReturn(modelingPlagiarismResult); @@ -63,9 +102,37 @@ void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguag verify(plagiarismChecksService).checkProgrammingExercise(programmingExercise); } + @Test + void shouldUpdateFlagsInSubmissions() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + // given: text exercise with cpc enabled + var exercise = new TextExercise(); + exercise.setDueDate(null); + + var participationText1 = createStudentParticipation(1); + var participationText2 = createStudentParticipation(2); + var participationText3 = createStudentParticipation(3); + var participations = Set.of(participationText1, participationText2, participationText3); + exercise.setStudentParticipations(participations); + + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(Set.of(exercise)); + + // and: results of plagiarism checks + var textPlagiarismResult = new TextPlagiarismResult(); + textPlagiarismResult.setComparisons(Set.of(createPlagiarismComparison(1, 2))); + when(plagiarismChecksService.checkTextExercise(exercise)).thenReturn(textPlagiarismResult); + + // when + service.executeChecks(); + + // then + verify(submissionRepository).updatePlagiarismSuspected(Set.of(1L, 2L), true); + verify(submissionRepository).updatePlagiarismSuspected(singleton(3L), false); + verifyNoMoreInteractions(submissionRepository); + } + @Test void shouldNotExecuteChecksAfterDueDate() { - // given: exercises with cpc enabled + // given: exercise with cpc enabled and post due data checks disabled var exercise = new TextExercise(); exercise.setDueDate(ZonedDateTime.now().minusDays(1)); exercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); @@ -77,7 +144,7 @@ void shouldNotExecuteChecksAfterDueDate() { service.executeChecks(); // then - verifyNoInteractions(plagiarismChecksService); + verifyNoInteractions(plagiarismChecksService, submissionRepository); } @Test @@ -90,7 +157,7 @@ void shouldDoNothingForFileUploadAndQuizExercises() { service.executeChecks(); // then - verifyNoInteractions(plagiarismChecksService); + verifyNoInteractions(plagiarismChecksService, submissionRepository); } @Test From 758f9c7ad4b2021beb3e076ff48c87dd74341e88 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 2 Oct 2023 19:53:03 +0200 Subject: [PATCH 42/95] mark submissions detected by cpc as suspected plagiarism (client) --- src/main/webapp/app/entities/submission.model.ts | 1 + .../header-exercise-page-with-details.component.html | 8 ++++++++ .../header-participation-page.component.html | 8 ++++++++ .../header-participation-page.component.ts | 2 ++ .../app/overview/submission-result-status.component.html | 9 ++++++++- .../app/overview/submission-result-status.component.ts | 5 +++++ src/main/webapp/i18n/de/student-dashboard.json | 3 ++- src/main/webapp/i18n/en/student-dashboard.json | 3 ++- 8 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/entities/submission.model.ts b/src/main/webapp/app/entities/submission.model.ts index ced9e0276d88..22f5c784e510 100644 --- a/src/main/webapp/app/entities/submission.model.ts +++ b/src/main/webapp/app/entities/submission.model.ts @@ -29,6 +29,7 @@ export abstract class Submission implements BaseEntity { public exampleSubmission?: boolean; public submissionExerciseType?: SubmissionExerciseType; public durationInMinutes?: number; + public plagiarismSuspected?: boolean; // results is initialized by the value the server returns public results?: Result[]; diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html index 0f26e7530f36..e080001a98b9 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html @@ -29,6 +29,14 @@ class="me-2" > + + {{ 'artemisApp.courseOverview.exerciseDetails.plagiarismSuspected' | artemisTranslate }} + +
{{ 'artemisApp.courseOverview.exerciseDetails.assessmentType' | artemisTranslate }} diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html index 6af7a7ba9bdf..dbb311b7864c 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html @@ -34,6 +34,14 @@
{{ 'artemisApp.courseOverview.exerciseDetails.points' | ar class="ms-1" [includedInOverallScore]="exercise.includedInOverallScore" > + + {{ 'artemisApp.courseOverview.exerciseDetails.plagiarismSuspected' | artemisTranslate }} + + diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts index da7c2b549735..0d59bff142b2 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts @@ -6,6 +6,7 @@ import { ButtonType } from 'app/shared/components/button.component'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { getExerciseDueDate, hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; +import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'jhi-header-participation-page', @@ -26,6 +27,7 @@ export class HeaderParticipationPageComponent implements OnInit, OnChanges { dueDate?: dayjs.Dayjs; getIcon = getIcon; + faQuestionCircle = faQuestionCircle; /** * Sets the status badge and categories of the exercise on init diff --git a/src/main/webapp/app/overview/submission-result-status.component.html b/src/main/webapp/app/overview/submission-result-status.component.html index 65a4ba1e9be8..04faf67afb02 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.html +++ b/src/main/webapp/app/overview/submission-result-status.component.html @@ -49,7 +49,14 @@ {{ 'artemisApp.courseOverview.exerciseList.quizNotStartedShort' | artemisTranslate }}
- + + {{ 'artemisApp.courseOverview.exerciseDetails.plagiarismSuspected' | artemisTranslate }} + + Date: Mon, 2 Oct 2023 20:00:06 +0200 Subject: [PATCH 43/95] code quality --- src/main/java/de/tum/in/www1/artemis/domain/Submission.java | 4 ++++ .../tum/in/www1/artemis/repository/SubmissionRepository.java | 5 ++++- .../plagiarism/ContinuousPlagiarismControlServiceTest.java | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java index e31020a748a6..480d9df43e27 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java @@ -76,6 +76,10 @@ public abstract class Submission extends DomainObject implements Comparable Date: Mon, 2 Oct 2023 21:14:54 +0200 Subject: [PATCH 44/95] add PlagiarismDetectionConfigHelperTest --- .../plagiarism/PlagiarismDetectionConfig.java | 30 ++++++++ .../PlagiarismDetectionConfigHelperTest.java | 68 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 92db43ab4391..5b0380c88fb5 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -1,5 +1,7 @@ package de.tum.in.www1.artemis.domain.plagiarism; +import java.util.*; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -105,4 +107,32 @@ public static PlagiarismDetectionConfig createDefault() { config.setMinimumSize(50); return config; } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + if (!super.equals(o)) + return false; + PlagiarismDetectionConfig that = (PlagiarismDetectionConfig) o; + return continuousPlagiarismControlEnabled == that.continuousPlagiarismControlEnabled + && continuousPlagiarismControlPostDueDateChecksEnabled == that.continuousPlagiarismControlPostDueDateChecksEnabled + && Float.compare(similarityThreshold, that.similarityThreshold) == 0 && minimumScore == that.minimumScore && minimumSize == that.minimumSize + && Objects.equals(exercise, that.exercise); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), exercise, continuousPlagiarismControlEnabled, continuousPlagiarismControlPostDueDateChecksEnabled, similarityThreshold, minimumScore, + minimumSize); + } + + @Override + public String toString() { + return "PlagiarismDetectionConfig{" + "exercise=" + exercise + ", continuousPlagiarismControlEnabled=" + continuousPlagiarismControlEnabled + + ", continuousPlagiarismControlPostDueDateChecksEnabled=" + continuousPlagiarismControlPostDueDateChecksEnabled + ", similarityThreshold=" + similarityThreshold + + ", minimumScore=" + minimumScore + ", minimumSize=" + minimumSize + '}'; + } } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java new file mode 100644 index 000000000000..9961b41dea35 --- /dev/null +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -0,0 +1,68 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; + +import org.junit.jupiter.api.*; + +import de.tum.in.www1.artemis.domain.modeling.*; +import de.tum.in.www1.artemis.domain.plagiarism.*; +import de.tum.in.www1.artemis.repository.*; + +class PlagiarismDetectionConfigHelperTest { + + @Test + void shouldDoNothingIfExerciseHasPlagiarismDetectionConfig() { + // given: exercise with PlagiarismDetectionConfig + var exercise = new ModelingExercise(); + var config = PlagiarismDetectionConfig.createDefault(); + exercise.setPlagiarismDetectionConfig(config); + + // and + var repository = mock(ModelingExerciseRepository.class); + + // when + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(exercise, repository); + + // then + verifyNoMoreInteractions(repository); + assertThat(exercise.getPlagiarismDetectionConfig()).isSameAs(config); + } + + @Test + void shouldAddDefaultConfigIfExerciseDoesNotHavePlagiarismDetectionConfig() { + // given: exercise with PlagiarismDetectionConfig + var exercise = new ModelingExercise(); + + // and + var repository = mock(ModelingExerciseRepository.class); + + // when + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(exercise, repository); + + // then + verify(repository).save(exercise); + assertThat(exercise.getPlagiarismDetectionConfig()).usingRecursiveComparison().isEqualTo(PlagiarismDetectionConfig.createDefault()); + } + + @Test + void shouldReplaceConfigWithGivenValues() { + // given: exercise with PlagiarismDetectionConfig + var exercise = new ModelingExercise(); + var config = PlagiarismDetectionConfig.createDefault(); + exercise.setPlagiarismDetectionConfig(config); + + // when + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(exercise, 99.0f, 98, 97); + + // then + assertThat(exercise.getPlagiarismDetectionConfig()).isNotSameAs(config); + assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getExercise).isNull(); + assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getId).isNull(); + assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getSimilarityThreshold).isEqualTo(99.0f); + assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getMinimumScore).isEqualTo(98); + assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getMinimumSize).isEqualTo(97); + } +} From 6ca49565a824bc626fde6504b7efc6e0c1699724 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 4 Oct 2023 22:13:13 +0200 Subject: [PATCH 45/95] create plagiarism cases for cpc detected submissions --- .../in/www1/artemis/domain/Submission.java | 7 -- .../repository/SubmissionRepository.java | 5 -- .../ContinuousPlagiarismControlService.java | 39 ++++++--- .../webapp/app/entities/submission.model.ts | 1 - ...-exercise-page-with-details.component.html | 8 -- .../header-participation-page.component.html | 8 -- .../submission-result-status.component.html | 8 -- ...ontinuousPlagiarismControlServiceTest.java | 79 +++++++++++-------- 8 files changed, 75 insertions(+), 80 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java index 480d9df43e27..1f2a5873ec6f 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Submission.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/Submission.java @@ -76,13 +76,6 @@ public abstract class Submission extends DomainObject implements Comparable new EntityNotFoundException("Submission", +submissionId)); } - - @Modifying - @Query("UPDATE Submission submission set submission.plagiarismSuspected = :#{#plagiarismSuspected} where submission.id in :#{#submissionIds}") - void updatePlagiarismSuspected(@Param("submissionIds") Set submissionId, @Param("plagiarismSuspected") boolean plagiarismSuspected); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 9008c2577dea..b70aa7e2acbd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -1,11 +1,12 @@ package de.tum.in.www1.artemis.service.plagiarism; import static java.lang.String.format; +import static java.util.Collections.disjoint; import static java.util.function.Predicate.not; import static java.util.stream.Collectors.toUnmodifiableSet; import java.time.ZonedDateTime; -import java.util.Optional; +import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; @@ -23,10 +24,9 @@ import de.tum.in.www1.artemis.domain.TextExercise; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.in.www1.artemis.domain.plagiarism.*; import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.SubmissionRepository; +import de.tum.in.www1.artemis.repository.plagiarism.*; import de.tum.in.www1.artemis.service.util.TimeLogUtil; /** @@ -46,13 +46,16 @@ public class ContinuousPlagiarismControlService { private final PlagiarismDetectionService plagiarismDetectionService; - private final SubmissionRepository submissionRepository; + private final PlagiarismComparisonRepository plagiarismComparisonRepository; + + private final PlagiarismCaseService plagiarismCaseService; public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, PlagiarismDetectionService plagiarismDetectionService, - SubmissionRepository submissionRepository) { + PlagiarismComparisonRepository plagiarismComparisonRepository, PlagiarismCaseService plagiarismCaseService) { this.exerciseRepository = exerciseRepository; this.plagiarismDetectionService = plagiarismDetectionService; - this.submissionRepository = submissionRepository; + this.plagiarismComparisonRepository = plagiarismComparisonRepository; + this.plagiarismCaseService = plagiarismCaseService; } /** @@ -71,7 +74,7 @@ public void executeChecks() { try { var result = executeChecksForExercise(exercise); - updatePlagiarismSuspectedFlagForAllSubmissions(result, exercise); + updatePlagiarismCases(result, exercise); } catch (ExitException e) { log.error("Cannot check plagiarism due to Jplag error: exerciseId={}, type={}, error={}.", exercise.getId(), exercise.getExerciseType(), e.getMessage(), e); @@ -97,14 +100,28 @@ private PlagiarismResult executeChecksForExercise(Exercise exercise) throws E }; } - private void updatePlagiarismSuspectedFlagForAllSubmissions(PlagiarismResult result, Exercise exercise) { + private void updatePlagiarismCases(PlagiarismResult result, Exercise exercise) { var allSubmissionIds = exercise.getStudentParticipations().stream().map(Participation::findLatestSubmission).filter(Optional::isPresent).map(Optional::get) .map(DomainObject::getId).collect(toUnmodifiableSet()); var submissionsIdsWithPlagiarismSuspicion = result.getComparisons().stream().flatMap(comparison -> Stream.of(comparison.getSubmissionA(), comparison.getSubmissionB())) .map(PlagiarismSubmission::getSubmissionId).collect(toUnmodifiableSet()); var submissionIdsWithoutPlagiarismSuspicion = allSubmissionIds.stream().filter(not(submissionsIdsWithPlagiarismSuspicion::contains)).collect(toUnmodifiableSet()); - submissionRepository.updatePlagiarismSuspected(submissionsIdsWithPlagiarismSuspicion, true); - submissionRepository.updatePlagiarismSuspected(submissionIdsWithoutPlagiarismSuspicion, false); + // we need to add current comparisons to plagiarism cases before removing stale ones because we don't want existing plagiarism cases to be deleted + addCurrentComparisonsToPlagiarismCases(result); + removeStaleComparisonsFromPlagiarismCases(submissionIdsWithoutPlagiarismSuspicion, exercise); + } + + private void addCurrentComparisonsToPlagiarismCases(PlagiarismResult result) { + result.getComparisons().forEach(comparison -> { + plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA()); + plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB()); + }); + } + + private void removeStaleComparisonsFromPlagiarismCases(Set submissionIdsWithoutPlagiarismSuspicion, Exercise exercise) { + var existingComparisons = plagiarismComparisonRepository.findAllByPlagiarismResultExerciseId(exercise.getId()); + existingComparisons.stream().filter(comparison -> !disjoint(Set.of(comparison.getSubmissionA().getSubmissionId(), comparison.getSubmissionB().getSubmissionId()), + submissionIdsWithoutPlagiarismSuspicion)).map(PlagiarismComparison::getId).forEach(plagiarismCaseService::removeSubmissionsInPlagiarismCasesForComparison); } } diff --git a/src/main/webapp/app/entities/submission.model.ts b/src/main/webapp/app/entities/submission.model.ts index 22f5c784e510..ced9e0276d88 100644 --- a/src/main/webapp/app/entities/submission.model.ts +++ b/src/main/webapp/app/entities/submission.model.ts @@ -29,7 +29,6 @@ export abstract class Submission implements BaseEntity { public exampleSubmission?: boolean; public submissionExerciseType?: SubmissionExerciseType; public durationInMinutes?: number; - public plagiarismSuspected?: boolean; // results is initialized by the value the server returns public results?: Result[]; diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html index e080001a98b9..0f26e7530f36 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html @@ -29,14 +29,6 @@ class="me-2" > - - {{ 'artemisApp.courseOverview.exerciseDetails.plagiarismSuspected' | artemisTranslate }} - -
{{ 'artemisApp.courseOverview.exerciseDetails.assessmentType' | artemisTranslate }} diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html index dbb311b7864c..6af7a7ba9bdf 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html @@ -34,14 +34,6 @@
{{ 'artemisApp.courseOverview.exerciseDetails.points' | ar class="ms-1" [includedInOverallScore]="exercise.includedInOverallScore" > - - {{ 'artemisApp.courseOverview.exerciseDetails.plagiarismSuspected' | artemisTranslate }} - - diff --git a/src/main/webapp/app/overview/submission-result-status.component.html b/src/main/webapp/app/overview/submission-result-status.component.html index 04faf67afb02..8ecb2ec6d677 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.html +++ b/src/main/webapp/app/overview/submission-result-status.component.html @@ -49,14 +49,6 @@ {{ 'artemisApp.courseOverview.exerciseList.quizNotStartedShort' | artemisTranslate }}
- - {{ 'artemisApp.courseOverview.exerciseDetails.plagiarismSuspected' | artemisTranslate }} - - createPlagiarismComparison(long submissionAId, long submissionBId) { - var comparison = new PlagiarismComparison(); - - var plagiarismSubmissionA = new PlagiarismSubmission<>(); - plagiarismSubmissionA.setSubmissionId(submissionAId); - comparison.setSubmissionA(plagiarismSubmissionA); - - var plagiarismSubmissionB = new PlagiarismSubmission<>(); - plagiarismSubmissionB.setSubmissionId(submissionBId); - comparison.setSubmissionB(plagiarismSubmissionB); - - return comparison; - } + private final ContinuousPlagiarismControlService service = new ContinuousPlagiarismControlService(exerciseRepository, plagiarismChecksService, plagiarismComparisonRepository, + plagiarismCaseService); @Test void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { @@ -104,10 +86,10 @@ void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguag } @Test - void shouldUpdateFlagsInSubmissions() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { + void shouldAddSubmissionsToPlagiarismCase() throws ExitException { // given: text exercise with cpc enabled var exercise = new TextExercise(); - exercise.setDueDate(null); + exercise.setId(99L); var participationText1 = createStudentParticipation(1); var participationText2 = createStudentParticipation(2); @@ -119,16 +101,23 @@ void shouldUpdateFlagsInSubmissions() throws ExitException, IOException, Program // and: results of plagiarism checks var textPlagiarismResult = new TextPlagiarismResult(); - textPlagiarismResult.setComparisons(Set.of(createPlagiarismComparison(1, 2))); + var plagiarismComparison = createPlagiarismComparison(12, 1, 2); + textPlagiarismResult.setComparisons(singleton(plagiarismComparison)); when(plagiarismChecksService.checkTextExercise(exercise)).thenReturn(textPlagiarismResult); + // and: one existing plagiarism comparison + var existingPlagiarismComparison = createPlagiarismComparison(23, 2, 3); + when(plagiarismComparisonRepository.findAllByPlagiarismResultExerciseId(exercise.getId())).thenReturn(singleton(existingPlagiarismComparison)); + // when service.executeChecks(); // then - verify(submissionRepository).updatePlagiarismSuspected(Set.of(1L, 2L), true); - verify(submissionRepository).updatePlagiarismSuspected(singleton(3L), false); - verifyNoMoreInteractions(submissionRepository); + var inOrder = inOrder(plagiarismCaseService); + inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA()); + inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB()); + inOrder.verify(plagiarismCaseService).removeSubmissionsInPlagiarismCasesForComparison(existingPlagiarismComparison.getId()); + verifyNoMoreInteractions(plagiarismCaseService); } @Test @@ -145,7 +134,7 @@ void shouldNotExecuteChecksAfterDueDate() { service.executeChecks(); // then - verifyNoInteractions(plagiarismChecksService, submissionRepository); + verifyNoInteractions(plagiarismChecksService, plagiarismComparisonRepository, plagiarismCaseService); } @Test @@ -158,7 +147,7 @@ void shouldDoNothingForFileUploadAndQuizExercises() { service.executeChecks(); // then - verifyNoInteractions(plagiarismChecksService, submissionRepository); + verifyNoInteractions(plagiarismChecksService, plagiarismComparisonRepository, plagiarismCaseService); } @Test @@ -184,4 +173,30 @@ void shouldSilentAnyUnknownExceptionsThrown() throws Exception { // then assertThatNoException().isThrownBy(service::executeChecks); } + + private static StudentParticipation createStudentParticipation(long submissionId) { + var participation = new StudentParticipation(); + var submission = new TextSubmission(); + submission.setId(submissionId); + participation.setSubmissions(singleton(submission)); + return participation; + } + + @SuppressWarnings("SameParameterValue") + private static PlagiarismComparison createPlagiarismComparison(long comparisonId, long submissionIdA, long submissionIdB) { + var comparison = new PlagiarismComparison(); + comparison.setId(comparisonId); + + var submissionA = new PlagiarismSubmission<>(); + submissionA.setId(100 + submissionIdA); + submissionA.setSubmissionId(submissionIdA); + comparison.setSubmissionA(submissionA); + + var submissionB = new PlagiarismSubmission<>(); + submissionA.setId(100 + submissionIdB); + submissionB.setSubmissionId(submissionIdB); + comparison.setSubmissionB(submissionB); + + return comparison; + } } From 138e7e3f028d07cda780799dd9832812078e267f Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 4 Oct 2023 22:19:56 +0200 Subject: [PATCH 46/95] revert unnecessary changes --- .../exercise-headers/header-participation-page.component.ts | 2 -- .../webapp/app/overview/submission-result-status.component.html | 1 + .../webapp/app/overview/submission-result-status.component.ts | 2 -- src/main/webapp/i18n/de/student-dashboard.json | 2 -- src/main/webapp/i18n/en/student-dashboard.json | 2 -- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts index 0d59bff142b2..da7c2b549735 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.ts @@ -6,7 +6,6 @@ import { ButtonType } from 'app/shared/components/button.component'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { getExerciseDueDate, hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils'; import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; -import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'jhi-header-participation-page', @@ -27,7 +26,6 @@ export class HeaderParticipationPageComponent implements OnInit, OnChanges { dueDate?: dayjs.Dayjs; getIcon = getIcon; - faQuestionCircle = faQuestionCircle; /** * Sets the status badge and categories of the exercise on init diff --git a/src/main/webapp/app/overview/submission-result-status.component.html b/src/main/webapp/app/overview/submission-result-status.component.html index 8ecb2ec6d677..65a4ba1e9be8 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.html +++ b/src/main/webapp/app/overview/submission-result-status.component.html @@ -49,6 +49,7 @@ {{ 'artemisApp.courseOverview.exerciseList.quizNotStartedShort' | artemisTranslate }}
+ Date: Wed, 4 Oct 2023 22:28:10 +0200 Subject: [PATCH 47/95] revert unnecessary changes --- .../webapp/app/overview/submission-result-status.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/webapp/app/overview/submission-result-status.component.ts b/src/main/webapp/app/overview/submission-result-status.component.ts index 4c936070d21a..1d0409d53f8a 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.ts +++ b/src/main/webapp/app/overview/submission-result-status.component.ts @@ -5,7 +5,6 @@ import { InitializationState } from 'app/entities/participation/participation.mo import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { ArtemisQuizService } from 'app/shared/quiz/quiz.service'; import dayjs from 'dayjs/esm'; -import { faQuestionCircle } from '@fortawesome/free-regular-svg-icons'; @Component({ selector: 'jhi-submission-result-status', @@ -40,8 +39,6 @@ export class SubmissionResultStatusComponent implements OnChanges { notSubmitted: boolean; shouldShowResult: boolean; - faQuestionCircle = faQuestionCircle; - ngOnChanges() { // It's enough to look at the normal due date as students with time extension cannot start after the regular due date const afterDueDate = !!this.exercise.dueDate && this.exercise.dueDate.isBefore(dayjs()); From d20d621be2d1c2015f18cc300d0612400461290d Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 21:18:04 +0200 Subject: [PATCH 48/95] allow to create cpc plagiarism cases posts with no author --- .../artemis/service/metis/PostingService.java | 23 +++++++++++-------- .../SingleUserNotificationService.java | 10 ++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java b/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java index 675b23b7ee39..5cd6a52e732d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java @@ -190,7 +190,10 @@ protected void setAuthorRoleOfPostings(List postsInCourse) { // prepares a unique set of userIds that authored the current list of postings Set userIds = new HashSet<>(); postsInCourse.forEach(post -> { - userIds.add(post.getAuthor().getId()); + // needs to handle posts created by SingleUserNotificationService.notifyUserAboutNewPlagiarismCaseBySystem + if (post.getAuthor() != null) { + userIds.add(post.getAuthor().getId()); + } post.getAnswers().forEach(answerPost -> userIds.add(answerPost.getAuthor().getId())); }); @@ -199,14 +202,16 @@ protected void setAuthorRoleOfPostings(List postsInCourse) { Map authors = userRepository.findAllWithGroupsAndAuthoritiesByIdIn(userIds).stream().collect(Collectors.toMap(DomainObject::getId, Function.identity())); // sets respective author role to display user authority icon on posting headers - postsInCourse.forEach(post -> { - post.setAuthor(authors.get(post.getAuthor().getId())); - setAuthorRoleForPosting(post, post.getCoursePostingBelongsTo()); - post.getAnswers().forEach(answerPost -> { - answerPost.setAuthor(authors.get(answerPost.getAuthor().getId())); - setAuthorRoleForPosting(answerPost, answerPost.getCoursePostingBelongsTo()); - }); - }); + postsInCourse.stream() + // needs to handle posts created by SingleUserNotificationService.notifyUserAboutNewPlagiarismCaseBySystem + .filter(post -> post.getAuthor() != null).filter(post -> authors.containsKey(post.getAuthor().getId())).forEach(post -> { + post.setAuthor(authors.get(post.getAuthor().getId())); + setAuthorRoleForPosting(post, post.getCoursePostingBelongsTo()); + post.getAnswers().forEach(answerPost -> { + answerPost.setAuthor(authors.get(answerPost.getAuthor().getId())); + setAuthorRoleForPosting(answerPost, answerPost.getCoursePostingBelongsTo()); + }); + }); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java index cb79cddfb225..0a51c61c8039 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java @@ -233,6 +233,16 @@ public void notifyUserAboutNewPlagiarismCase(PlagiarismCase plagiarismCase, User notifyRecipientWithNotificationType(plagiarismCase, NEW_PLAGIARISM_CASE_STUDENT, student, userRepository.getUser()); } + /** + * Notify student about possible plagiarism case without explicit notification author. + * + * @param plagiarismCase that hold the major information for the plagiarism case + * @param student who should be notified + */ + public void notifyUserAboutNewPlagiarismCaseBySystem(PlagiarismCase plagiarismCase, User student) { + notifyRecipientWithNotificationType(plagiarismCase, NEW_PLAGIARISM_CASE_STUDENT, student, null); + } + /** * Notify student about plagiarism case verdict. * From a134332e1852ae1ab50dc37ba66f323259c49b23 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 21:20:09 +0200 Subject: [PATCH 49/95] properly display cpc plagiarism cases posts with no author --- .../post-header/post-header.component.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.html b/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.html index 78fc89538450..ba624b3fdc63 100644 --- a/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.html +++ b/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.html @@ -1,12 +1,14 @@
- - - - - {{ posting.author!.name }} - + + + + + + {{ posting.author!.name }} + + {{ todayFlag | artemisTranslate }} {{ postingIsOfToday ? (posting.creationDate | artemisDate: 'time') : (posting.creationDate | artemisDate: 'short-date') }} From 43c173b9df161aa3d749a24fd430b2888f2fb701 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 21:27:35 +0200 Subject: [PATCH 50/95] automatically create plagiarism cases by cpc --- .../plagiarism/PlagiarismCaseRepository.java | 8 +++ .../artemis/service/metis/PostService.java | 11 +++ .../SingleUserNotificationService.java | 2 +- .../ContinuousPlagiarismControlService.java | 71 ++++++++++++------- .../plagiarism/PlagiarismCaseService.java | 17 ++++- ...ontinuousPlagiarismControlServiceTest.java | 2 +- 6 files changed, 83 insertions(+), 28 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java index 3621deacd50c..8dfc8833f145 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java @@ -127,6 +127,14 @@ public interface PlagiarismCaseRepository extends JpaRepository findByIdWithPlagiarismSubmissions(@Param("plagiarismCaseId") long plagiarismCaseId); + @Query(""" + SELECT plagiarismCase + FROM PlagiarismCase plagiarismCase + LEFT JOIN FETCH plagiarismCase.plagiarismSubmissions plagiarismSubmissions + WHERE plagiarismCase.exercise.id = :exerciseId + """) + List findAllByExerciseIdWithPlagiarismSubmissions(@Param("exerciseId") long exerciseId); + default PlagiarismCase findByIdWithPlagiarismSubmissionsElseThrow(long plagiarismCaseId) { return findByIdWithPlagiarismSubmissions(plagiarismCaseId).orElseThrow(() -> new EntityNotFoundException("PlagiarismCase", plagiarismCaseId)); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/PostService.java b/src/main/java/de/tum/in/www1/artemis/service/metis/PostService.java index f78123775f87..21d4f54cd977 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/PostService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/metis/PostService.java @@ -115,6 +115,17 @@ public Post createPost(Long courseId, Post post) { return savedPost; } + /** + * Persists the continuous plagiarism control plagiarism case post, + * and sends a notification to affected user groups + * + * @param post post to create + */ + public void createContinuousPlagiarismControlPlagiarismCasePost(Post post) { + var savedPost = postRepository.save(post); + plagiarismCaseService.saveAnonymousPostForPlagiarismCaseAndNotifyStudent(savedPost.getPlagiarismCase().getId(), savedPost); + } + /** * Checks course, user and post validity, * updates non-restricted field of the post, persists the post, diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java index 0a51c61c8039..4a832bed617c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java @@ -239,7 +239,7 @@ public void notifyUserAboutNewPlagiarismCase(PlagiarismCase plagiarismCase, User * @param plagiarismCase that hold the major information for the plagiarism case * @param student who should be notified */ - public void notifyUserAboutNewPlagiarismCaseBySystem(PlagiarismCase plagiarismCase, User student) { + public void notifyUserAboutNewPlagiarismCaseAnonymous(PlagiarismCase plagiarismCase, User student) { notifyRecipientWithNotificationType(plagiarismCase, NEW_PLAGIARISM_CASE_STUDENT, student, null); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index b70aa7e2acbd..cc73aec3f6e6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -1,14 +1,10 @@ package de.tum.in.www1.artemis.service.plagiarism; import static java.lang.String.format; -import static java.util.Collections.disjoint; -import static java.util.function.Predicate.not; -import static java.util.stream.Collectors.toUnmodifiableSet; import java.time.ZonedDateTime; -import java.util.*; +import java.util.Set; import java.util.function.Predicate; -import java.util.stream.Stream; import org.jvnet.hk2.annotations.Service; import org.slf4j.Logger; @@ -18,15 +14,21 @@ import org.springframework.stereotype.Component; import de.jplag.exceptions.ExitException; -import de.tum.in.www1.artemis.domain.DomainObject; import de.tum.in.www1.artemis.domain.Exercise; import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.TextExercise; +import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority; +import de.tum.in.www1.artemis.domain.metis.Post; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; -import de.tum.in.www1.artemis.domain.participation.Participation; -import de.tum.in.www1.artemis.domain.plagiarism.*; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.*; +import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; +import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.in.www1.artemis.service.metis.PostService; import de.tum.in.www1.artemis.service.util.TimeLogUtil; /** @@ -50,12 +52,19 @@ public class ContinuousPlagiarismControlService { private final PlagiarismCaseService plagiarismCaseService; + private final PlagiarismCaseRepository plagiarismCaseRepository; + + private final PostService postService; + public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, PlagiarismDetectionService plagiarismDetectionService, - PlagiarismComparisonRepository plagiarismComparisonRepository, PlagiarismCaseService plagiarismCaseService) { + PlagiarismComparisonRepository plagiarismComparisonRepository, PlagiarismCaseService plagiarismCaseService, PlagiarismCaseRepository plagiarismCaseRepository, + PostService postService) { this.exerciseRepository = exerciseRepository; this.plagiarismDetectionService = plagiarismDetectionService; this.plagiarismComparisonRepository = plagiarismComparisonRepository; this.plagiarismCaseService = plagiarismCaseService; + this.plagiarismCaseRepository = plagiarismCaseRepository; + this.postService = postService; } /** @@ -101,27 +110,39 @@ private PlagiarismResult executeChecksForExercise(Exercise exercise) throws E } private void updatePlagiarismCases(PlagiarismResult result, Exercise exercise) { - var allSubmissionIds = exercise.getStudentParticipations().stream().map(Participation::findLatestSubmission).filter(Optional::isPresent).map(Optional::get) - .map(DomainObject::getId).collect(toUnmodifiableSet()); - var submissionsIdsWithPlagiarismSuspicion = result.getComparisons().stream().flatMap(comparison -> Stream.of(comparison.getSubmissionA(), comparison.getSubmissionB())) - .map(PlagiarismSubmission::getSubmissionId).collect(toUnmodifiableSet()); - var submissionIdsWithoutPlagiarismSuspicion = allSubmissionIds.stream().filter(not(submissionsIdsWithPlagiarismSuspicion::contains)).collect(toUnmodifiableSet()); - - // we need to add current comparisons to plagiarism cases before removing stale ones because we don't want existing plagiarism cases to be deleted addCurrentComparisonsToPlagiarismCases(result); - removeStaleComparisonsFromPlagiarismCases(submissionIdsWithoutPlagiarismSuspicion, exercise); + removeStalePlagiarismCases(exercise.getId()); } - private void addCurrentComparisonsToPlagiarismCases(PlagiarismResult result) { + private void addCurrentComparisonsToPlagiarismCases(PlagiarismResult result) { result.getComparisons().forEach(comparison -> { - plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA()); - plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB()); + comparison.setPlagiarismResult(result); + plagiarismComparisonRepository.updatePlagiarismComparisonStatus(comparison.getId(), PlagiarismStatus.CONFIRMED); + createOrUpdatePlagiarismCases(comparison); }); } - private void removeStaleComparisonsFromPlagiarismCases(Set submissionIdsWithoutPlagiarismSuspicion, Exercise exercise) { - var existingComparisons = plagiarismComparisonRepository.findAllByPlagiarismResultExerciseId(exercise.getId()); - existingComparisons.stream().filter(comparison -> !disjoint(Set.of(comparison.getSubmissionA().getSubmissionId(), comparison.getSubmissionB().getSubmissionId()), - submissionIdsWithoutPlagiarismSuspicion)).map(PlagiarismComparison::getId).forEach(plagiarismCaseService::removeSubmissionsInPlagiarismCasesForComparison); + private void createOrUpdatePlagiarismCases(PlagiarismComparison comparison) { + var plagiarismCases = Set.of(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA()), + plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB())); + + plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost) + .forEach(postService::createContinuousPlagiarismControlPlagiarismCasePost); + } + + private static Post buildCpcPost(PlagiarismCase plagiarismCase) { + var post = new Post(); + post.setTitle("(title placeholder)"); + post.setVisibleForStudents(true); + post.setDisplayPriority(DisplayPriority.NONE); + post.setPlagiarismCase(plagiarismCase); + post.setContent("(content placeholder)"); + post.setCreationDate(ZonedDateTime.now()); + return post; + } + + private void removeStalePlagiarismCases(long exerciseId) { + var cases = plagiarismCaseRepository.findAllByExerciseIdWithPlagiarismSubmissions(exerciseId); + cases.stream().filter(plagiarismCase -> plagiarismCase.getPlagiarismSubmissions().isEmpty()).forEach(plagiarismCaseRepository::delete); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java index fc8f9d0dc31e..1e754ae7893e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java @@ -85,6 +85,19 @@ public void savePostForPlagiarismCaseAndNotifyStudent(long plagiarismCaseId, Pos singleUserNotificationService.notifyUserAboutNewPlagiarismCase(plagiarismCase, plagiarismCase.getStudent()); } + /** + * Save a post for a plagiarism case and notify the student about the plagiarism case. + * + * @param plagiarismCaseId the ID of the plagiarism case for which to save the post + * @param post the post which belongs to the plagiarism case + */ + public void saveAnonymousPostForPlagiarismCaseAndNotifyStudent(long plagiarismCaseId, Post post) { + PlagiarismCase plagiarismCase = plagiarismCaseRepository.findByIdWithPlagiarismSubmissionsElseThrow(plagiarismCaseId); + plagiarismCase.setPost(post); + plagiarismCase = plagiarismCaseRepository.save(plagiarismCase); + singleUserNotificationService.notifyUserAboutNewPlagiarismCaseAnonymous(plagiarismCase, plagiarismCase.getStudent()); + } + /** * Create or add to plagiarism cases for both students involved in a plagiarism comparison if it is determined to be plagiarism. * @@ -110,7 +123,7 @@ public void createOrAddToPlagiarismCasesForComparison(long plagiarismComparisonI * @param plagiarismComparison the plagiarism comparison for which to create the plagiarism case * @param plagiarismSubmission the plagiarism submission of the student for which to create the plagiarism case */ - public void createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagiarismComparison, PlagiarismSubmission plagiarismSubmission) { + public PlagiarismCase createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagiarismComparison, PlagiarismSubmission plagiarismSubmission) { var plagiarismCase = plagiarismCaseRepository.findByStudentLoginAndExerciseIdWithPlagiarismSubmissions(plagiarismSubmission.getStudentLogin(), plagiarismComparison.getPlagiarismResult().getExercise().getId()); if (plagiarismCase.isPresent()) { @@ -119,6 +132,7 @@ public void createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagia // we do not save plagiarism comparison or plagiarism submission directly because due to issues with Cascade_All, it will automatically delete matches and re-add them // we actually use a custom modifying query to avoid all issues with Cascade ALL plagiarismSubmissionRepository.updatePlagiarismCase(plagiarismSubmission.getId(), plagiarismCase.get()); + return plagiarismCase.get(); } else { // create new PlagiarismCase for student @@ -131,6 +145,7 @@ public void createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagia // we do not save plagiarism comparison or plagiarism submission directly because due to issues with Cascade_All, it will automatically delete matches and re-add them // we actually use a custom modifying query to avoid all issues with Cascade ALL plagiarismSubmissionRepository.updatePlagiarismCase(plagiarismSubmission.getId(), savedPlagiarismCase); + return savedPlagiarismCase; } } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java index 01ed27d9cdad..2b38e039ccd9 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -45,7 +45,7 @@ class ContinuousPlagiarismControlServiceTest { private final PlagiarismCaseService plagiarismCaseService = mock(); private final ContinuousPlagiarismControlService service = new ContinuousPlagiarismControlService(exerciseRepository, plagiarismChecksService, plagiarismComparisonRepository, - plagiarismCaseService); + plagiarismCaseService, null, null); @Test void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { From f657707cb95e149cc87962f3afc43e64f57dde38 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 22:26:41 +0200 Subject: [PATCH 51/95] add created by cpc flag to plagiarism case --- .../artemis/domain/plagiarism/PlagiarismCase.java | 11 +++++++++++ .../plagiarism/PlagiarismCaseRepository.java | 9 +++++++++ .../ContinuousPlagiarismControlService.java | 10 +++++----- .../service/plagiarism/PlagiarismCaseService.java | 8 +++++--- .../artemis/web/rest/dto/PlagiarismCaseInfoDTO.java | 2 +- .../web/rest/plagiarism/PlagiarismCaseResource.java | 8 +++++--- .../liquibase/changelog/20230930160925_changelog.xml | 6 ++---- .../ContinuousPlagiarismControlServiceTest.java | 4 ++-- 8 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java index 5c42c1f181f6..f22163a0aa3c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismCase.java @@ -51,6 +51,9 @@ public class PlagiarismCase extends AbstractAuditingEntity { @Column(name = "verdict_point_deduction") private int verdictPointDeduction; + @Column(name = "created_by_continuous_plagiarism_control") + private boolean createdByContinuousPlagiarismControl; + public Exercise getExercise() { return exercise; } @@ -151,6 +154,14 @@ public void setVerdictPointDeduction(int verdictPointDeduction) { this.verdictPointDeduction = verdictPointDeduction; } + public boolean isCreatedByContinuousPlagiarismControl() { + return createdByContinuousPlagiarismControl; + } + + public void setCreatedByContinuousPlagiarismControl(boolean createdByContinuousPlagiarismControl) { + this.createdByContinuousPlagiarismControl = createdByContinuousPlagiarismControl; + } + @Override public String toString() { return "PlagiarismCase{" + "exercise=" + exercise + ", student=" + student + ", post=" + post + ", verdict=" + verdict + ", verdictMessage=" + verdictMessage diff --git a/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java index 8dfc8833f145..6032bcea213a 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java @@ -135,6 +135,15 @@ public interface PlagiarismCaseRepository extends JpaRepository findAllByExerciseIdWithPlagiarismSubmissions(@Param("exerciseId") long exerciseId); + @Query(""" + SELECT plagiarismCase + FROM PlagiarismCase plagiarismCase + LEFT JOIN FETCH plagiarismCase.plagiarismSubmissions plagiarismSubmissions + WHERE plagiarismCase.exercise.id = :exerciseId + AND plagiarismCase.createdByContinuousPlagiarismControl = true + """) + List findAllCreatedByContinuousPlagiarismControlByExerciseIdWithPlagiarismSubmissions(@Param("exerciseId") long exerciseId); + default PlagiarismCase findByIdWithPlagiarismSubmissionsElseThrow(long plagiarismCaseId) { return findByIdWithPlagiarismSubmissions(plagiarismCaseId).orElseThrow(() -> new EntityNotFoundException("PlagiarismCase", plagiarismCaseId)); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index cc73aec3f6e6..522ddb191b29 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -70,7 +70,7 @@ public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, /** * Daily triggers plagiarism checks as a part of continuous plagiarism control. */ - @Scheduled(cron = "${artemis.scheduling.continuous-plagiarism-control-trigger-time:0 0 5 * * *}") + @Scheduled(initialDelay = 30_000, fixedDelay = 60_000) public void executeChecks() { log.info("Starting continuous plagiarism control..."); @@ -123,8 +123,8 @@ private void addCurrentComparisonsToPlag } private void createOrUpdatePlagiarismCases(PlagiarismComparison comparison) { - var plagiarismCases = Set.of(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA()), - plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB())); + var plagiarismCases = Set.of(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA(), true), + plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB(), true)); plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost) .forEach(postService::createContinuousPlagiarismControlPlagiarismCasePost); @@ -142,7 +142,7 @@ private static Post buildCpcPost(PlagiarismCase plagiarismCase) { } private void removeStalePlagiarismCases(long exerciseId) { - var cases = plagiarismCaseRepository.findAllByExerciseIdWithPlagiarismSubmissions(exerciseId); - cases.stream().filter(plagiarismCase -> plagiarismCase.getPlagiarismSubmissions().isEmpty()).forEach(plagiarismCaseRepository::delete); + var currentPlagiarismCases = plagiarismCaseRepository.findAllCreatedByContinuousPlagiarismControlByExerciseIdWithPlagiarismSubmissions(exerciseId); + currentPlagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPlagiarismSubmissions().isEmpty()).forEach(plagiarismCaseRepository::delete); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java index 1e754ae7893e..6e5c332e37e5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java @@ -106,9 +106,9 @@ public void saveAnonymousPostForPlagiarismCaseAndNotifyStudent(long plagiarismCa public void createOrAddToPlagiarismCasesForComparison(long plagiarismComparisonId) { var plagiarismComparison = plagiarismComparisonRepository.findByIdWithSubmissionsStudentsElseThrow(plagiarismComparisonId); // handle student A - createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA()); + createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA(), false); // handle student B - createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB()); + createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB(), false); } /** @@ -123,7 +123,8 @@ public void createOrAddToPlagiarismCasesForComparison(long plagiarismComparisonI * @param plagiarismComparison the plagiarism comparison for which to create the plagiarism case * @param plagiarismSubmission the plagiarism submission of the student for which to create the plagiarism case */ - public PlagiarismCase createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagiarismComparison, PlagiarismSubmission plagiarismSubmission) { + public PlagiarismCase createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagiarismComparison, PlagiarismSubmission plagiarismSubmission, + boolean createdByContinuousPlagiarismControl) { var plagiarismCase = plagiarismCaseRepository.findByStudentLoginAndExerciseIdWithPlagiarismSubmissions(plagiarismSubmission.getStudentLogin(), plagiarismComparison.getPlagiarismResult().getExercise().getId()); if (plagiarismCase.isPresent()) { @@ -140,6 +141,7 @@ public PlagiarismCase createOrAddToPlagiarismCaseForStudent(PlagiarismComparison PlagiarismCase newPlagiarismCase = new PlagiarismCase(); newPlagiarismCase.setExercise(plagiarismComparison.getPlagiarismResult().getExercise()); newPlagiarismCase.setStudent(student); + newPlagiarismCase.setCreatedByContinuousPlagiarismControl(createdByContinuousPlagiarismControl); var savedPlagiarismCase = plagiarismCaseRepository.save(newPlagiarismCase); plagiarismSubmission.setPlagiarismCase(savedPlagiarismCase); // we do not save plagiarism comparison or plagiarism submission directly because due to issues with Cascade_All, it will automatically delete matches and re-add them diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PlagiarismCaseInfoDTO.java b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PlagiarismCaseInfoDTO.java index c924ab4ff1a7..b255d0918749 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PlagiarismCaseInfoDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/PlagiarismCaseInfoDTO.java @@ -8,5 +8,5 @@ * A DTO with a subset of Plagiarism Case fields for displaying relevant info to a student. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PlagiarismCaseInfoDTO(Long id, PlagiarismVerdict verdict) { +public record PlagiarismCaseInfoDTO(Long id, PlagiarismVerdict verdict, boolean createdByContinuousPlagiarismControl) { } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java index 1e5168a7fa21..3f9434125b8d 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/plagiarism/PlagiarismCaseResource.java @@ -189,7 +189,7 @@ public ResponseEntity getPlagiarismCaseForExerciseForStud // Note: we only return the ID and verdict to tell the client there is a confirmed plagiarism case with student notification (post) and to support navigating to the // detail page // all other information might be irrelevant or sensitive and could lead to longer loading times - var plagiarismCaseInfoDTO = new PlagiarismCaseInfoDTO(plagiarismCase.getId(), plagiarismCase.getVerdict()); + var plagiarismCaseInfoDTO = new PlagiarismCaseInfoDTO(plagiarismCase.getId(), plagiarismCase.getVerdict(), plagiarismCase.isCreatedByContinuousPlagiarismControl()); return ResponseEntity.ok(plagiarismCaseInfoDTO); } } @@ -223,8 +223,10 @@ public ResponseEntity> getPlagiarismCasesForExe } Map plagiarismCaseInfoDTOs = plagiarismCasePerExerciseList.stream() // the following line is already checked in the SQL statement, but we want to ensure it 100% - .filter(plagiarismCase -> plagiarismCase.getPost() != null).collect(Collectors.toMap(plagiarismCase -> plagiarismCase.getExercise().getId(), - plagiarismCase -> new PlagiarismCaseInfoDTO(plagiarismCase.getId(), plagiarismCase.getVerdict()), (case1, case2) -> case1)); + .filter(plagiarismCase -> plagiarismCase.getPost() != null) + .collect(Collectors.toMap(plagiarismCase -> plagiarismCase.getExercise().getId(), + plagiarismCase -> new PlagiarismCaseInfoDTO(plagiarismCase.getId(), plagiarismCase.getVerdict(), plagiarismCase.isCreatedByContinuousPlagiarismControl()), + (case1, case2) -> case1)); return ResponseEntity.ok(plagiarismCaseInfoDTOs); } diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index 8a6499807f75..c9bcfdb0996c 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -16,10 +16,8 @@ - - - - + + diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java index 2b38e039ccd9..46ee396ec4dd 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -114,8 +114,8 @@ void shouldAddSubmissionsToPlagiarismCase() throws ExitException { // then var inOrder = inOrder(plagiarismCaseService); - inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA()); - inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB()); + inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA(), true); + inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB(), true); inOrder.verify(plagiarismCaseService).removeSubmissionsInPlagiarismCasesForComparison(existingPlagiarismComparison.getId()); verifyNoMoreInteractions(plagiarismCaseService); } From a204ca917238b1c15933db5c48a6c4d6fd828e06 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 22:30:58 +0200 Subject: [PATCH 52/95] mark cpc plagiarism cases as similarity on client side --- .../exercises/shared/plagiarism/types/PlagiarismCaseInfo.ts | 1 + .../exercise-details/course-exercise-details.component.html | 5 ++++- src/main/webapp/i18n/de/plagiarism.json | 1 + src/main/webapp/i18n/en/plagiarism.json | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCaseInfo.ts b/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCaseInfo.ts index c18c86b1e15d..e4085b3dfc09 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCaseInfo.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCaseInfo.ts @@ -6,4 +6,5 @@ import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/Plagiar export class PlagiarismCaseInfo { public id: number; public verdict?: PlagiarismVerdict; + public createdByContinuousPlagiarismControl?: boolean; } diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html index 32ee470a8974..6168a1d636d1 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html @@ -19,7 +19,10 @@ class="col-auto btn btn-danger btn-sm me-2" [routerLink]="['/courses', courseId, 'plagiarism-cases', plagiarismCaseInfo.id]" > - Plagiarism Case + Plagiarism Case + Significant Similarity
diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 6196a6ffdc3e..422d77a4dd04 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -63,6 +63,7 @@ "pageTitle": "Plagiatsfälle", "plagiarismCases": "Plagiatsfälle", "plagiarismCase": "Plagiatsfall", + "plagiarismCaseSignificantSimilarity": "Significant Similarity", "resolvedPlagiarismCase": "Gelöster Plagiatsfall", "notification": { "title": "Plagiatsfall: {{ exercise }}", diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 2db30fcf58d8..22b3cd99832b 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -63,6 +63,7 @@ "pageTitle": "Plagiarism Cases", "plagiarismCases": "Plagiarism Cases", "plagiarismCase": "Plagiarism Case", + "plagiarismCaseSignificantSimilarity": "Significant Similarity", "resolvedPlagiarismCase": "Resolved Plagiarism Case", "notification": { "title": "Plagiarism Case: {{ exercise }}", From aef8f769422020521e975eadf94196f954c0ac9f Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 22:36:56 +0200 Subject: [PATCH 53/95] fix start imports --- .../domain/plagiarism/PlagiarismDetectionConfig.java | 2 +- .../ContinuousPlagiarismControlServiceTest.java | 2 +- .../plagiarism/PlagiarismDetectionConfigHelperTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 5b0380c88fb5..819e0ffab7c6 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -1,6 +1,6 @@ package de.tum.in.www1.artemis.domain.plagiarism; -import java.util.*; +import java.util.Objects; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java index 46ee396ec4dd..b7f55f28ac28 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -32,7 +32,7 @@ import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.in.www1.artemis.domain.quiz.QuizExercise; import de.tum.in.www1.artemis.repository.ExerciseRepository; -import de.tum.in.www1.artemis.repository.plagiarism.*; +import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; class ContinuousPlagiarismControlServiceTest { diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java index 9961b41dea35..bf63e0a450b1 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -5,11 +5,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Test; -import de.tum.in.www1.artemis.domain.modeling.*; -import de.tum.in.www1.artemis.domain.plagiarism.*; -import de.tum.in.www1.artemis.repository.*; +import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; +import de.tum.in.www1.artemis.repository.ModelingExerciseRepository; class PlagiarismDetectionConfigHelperTest { From 8155c844ca2c23e06a9792771df7f3585f01bd95 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 8 Oct 2023 22:39:55 +0200 Subject: [PATCH 54/95] add missing docs --- .../artemis/service/plagiarism/PlagiarismCaseService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java index 6e5c332e37e5..dcd995ea42b9 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java @@ -120,8 +120,10 @@ public void createOrAddToPlagiarismCasesForComparison(long plagiarismComparisonI *
  • Add the submission of the student to existing plagiarism case otherwise
    • * * - * @param plagiarismComparison the plagiarism comparison for which to create the plagiarism case - * @param plagiarismSubmission the plagiarism submission of the student for which to create the plagiarism case + * @param plagiarismComparison the plagiarism comparison for which to create the plagiarism case + * @param plagiarismSubmission the plagiarism submission of the student for which to create the plagiarism case + * @param createdByContinuousPlagiarismControl true is the plagiarism comparison was created by the continuous plagiarism control + * @return the created or updated plagiarism case */ public PlagiarismCase createOrAddToPlagiarismCaseForStudent(PlagiarismComparison plagiarismComparison, PlagiarismSubmission plagiarismSubmission, boolean createdByContinuousPlagiarismControl) { From f701cd22e919e1d64605f4c669fdfdc0fcf6d57c Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 9 Oct 2023 08:17:29 +0200 Subject: [PATCH 55/95] don't show reply incentive when plagiarism case in created by cpc --- .../plagiarism-case-student-detail-view.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html b/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html index 91afbb76ebfc..fa474ee47197 100644 --- a/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html +++ b/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html @@ -46,7 +46,7 @@

    {{ 'artemisApp.plagiarism.plagiarismCases.conversation' | artemisTranslate }

    -
    +
    { + title = NEW_CPC_PLAGIARISM_CASE_STUDENT_TITLE; + notificationText = NEW_CPC_PLAGIARISM_CASE_STUDENT_TEXT; + placeholderValues = new String[] { affectedExercise.getCourseViaExerciseGroupOrCourseMember().getTitle(), + affectedExercise.getExerciseType().toString().toLowerCase(), affectedExercise.getTitle() }; + } case PLAGIARISM_CASE_VERDICT_STUDENT -> { title = PLAGIARISM_CASE_VERDICT_STUDENT_TITLE; notificationText = PLAGIARISM_CASE_VERDICT_STUDENT_TEXT; diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java index 4a832bed617c..32b8f7f8385e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java @@ -71,8 +71,8 @@ private void notifyRecipientWithNotificationType(Object notificationSubject, Not // Exercise related case EXERCISE_SUBMISSION_ASSESSED, FILE_SUBMISSION_SUCCESSFUL -> createNotification((Exercise) notificationSubject, notificationType, (User) typeSpecificInformation); // Plagiarism related - case NEW_PLAGIARISM_CASE_STUDENT, PLAGIARISM_CASE_VERDICT_STUDENT -> createNotification((PlagiarismCase) notificationSubject, notificationType, - (User) typeSpecificInformation, author); + case NEW_PLAGIARISM_CASE_STUDENT, NEW_CPC_PLAGIARISM_CASE_STUDENT, PLAGIARISM_CASE_VERDICT_STUDENT -> createNotification((PlagiarismCase) notificationSubject, + notificationType, (User) typeSpecificInformation, author); // Tutorial Group related case TUTORIAL_GROUP_REGISTRATION_STUDENT, TUTORIAL_GROUP_DEREGISTRATION_STUDENT, TUTORIAL_GROUP_REGISTRATION_TUTOR, TUTORIAL_GROUP_DEREGISTRATION_TUTOR, TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR, TUTORIAL_GROUP_ASSIGNED, TUTORIAL_GROUP_UNASSIGNED -> createNotification( ((TutorialGroupNotificationSubject) notificationSubject).tutorialGroup, notificationType, ((TutorialGroupNotificationSubject) notificationSubject).users, @@ -234,13 +234,14 @@ public void notifyUserAboutNewPlagiarismCase(PlagiarismCase plagiarismCase, User } /** - * Notify student about possible plagiarism case without explicit notification author. + * Notify student about possible plagiarism case opened by the continuous plagiarism control. + * The notification is created without explicit notification author. * * @param plagiarismCase that hold the major information for the plagiarism case * @param student who should be notified */ - public void notifyUserAboutNewPlagiarismCaseAnonymous(PlagiarismCase plagiarismCase, User student) { - notifyRecipientWithNotificationType(plagiarismCase, NEW_PLAGIARISM_CASE_STUDENT, student, null); + public void notifyUserAboutNewContinuousPlagiarismControlPlagiarismCase(PlagiarismCase plagiarismCase, User student) { + notifyRecipientWithNotificationType(plagiarismCase, NEW_CPC_PLAGIARISM_CASE_STUDENT, student, null); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java index dcd995ea42b9..30153bf6136c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismCaseService.java @@ -95,7 +95,7 @@ public void saveAnonymousPostForPlagiarismCaseAndNotifyStudent(long plagiarismCa PlagiarismCase plagiarismCase = plagiarismCaseRepository.findByIdWithPlagiarismSubmissionsElseThrow(plagiarismCaseId); plagiarismCase.setPost(post); plagiarismCase = plagiarismCaseRepository.save(plagiarismCase); - singleUserNotificationService.notifyUserAboutNewPlagiarismCaseAnonymous(plagiarismCase, plagiarismCase.getStudent()); + singleUserNotificationService.notifyUserAboutNewContinuousPlagiarismControlPlagiarismCase(plagiarismCase, plagiarismCase.getStudent()); } /** diff --git a/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCase.ts b/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCase.ts index 94744b510d34..b9aec6a81ba5 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCase.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/types/PlagiarismCase.ts @@ -18,4 +18,5 @@ export class PlagiarismCase { public verdictMessage?: string; public verdictBy?: User; public verdictPointDeduction?: number; + public createdByContinuousPlagiarismControl?: boolean; } diff --git a/src/main/webapp/i18n/de/notification.json b/src/main/webapp/i18n/de/notification.json index 2c3e928f5a55..b4ca9f772bbb 100644 --- a/src/main/webapp/i18n/de/notification.json +++ b/src/main/webapp/i18n/de/notification.json @@ -99,6 +99,7 @@ "exerciseSubmissionAssessed": "Übungsabgabe bewertet", "fileSubmissionSuccessful": "Dateiabgabe erfolgreich", "newPlagiarismCaseStudent": "Neuer Plagiatsfall", + "newPlagiarismCaseStudentSignificantSimilarity": "New significant similarity", "plagiarismCaseVerdictStudent": "Urteil zu deinem Plagiatsfall", "tutorialGroupRegistrationStudent": "Du wurdest für eine Übungsgruppe registriert", "tutorialGroupDeregistrationStudent": "Du wurdest von einer Übungsgruppe abgemeldet", @@ -124,6 +125,7 @@ "exerciseSubmissionAssessed": "Deine Abgabe für die {{ placeholderValues.1 }} Aufgabe \"{{ placeholderValues.2 }}\" im Kurs \"{{ placeholderValues.0 }}\" wurde bewertet.", "fileSubmissionSuccessful": "Deine Datei für die Aufgabe \"{{ placeholderValues.1 }}\" wurde erfolgreich eingereicht.", "newPlagiarismCaseStudent": "Neuer Plagiatsfall für die {{ placeholderValues.1 }} Aufgabe \"{{ placeholderValues.2 }}\".", + "newPlagiarismCaseStudentSignificantSimilarity": "New significant similarity", "plagiarismCaseVerdictStudent": "Dein Plagiatsfall für die {{ placeholderValues.1 }} Aufgabe \"{{ placeholderValues.2 }}\" hat ein Urteil.", "tutorialGroupRegistrationStudent": "Du wurdest für die Übungsgruppe {{ placeholderValues.1 }} von {{ placeholderValues.2 }} registriert.", "tutorialGroupDeregistrationStudent": "Du wurdest von der Übungsgruppe {{ placeholderValues.1 }} von {{ placeholderValues.2 }} abgemeldet.", diff --git a/src/main/webapp/i18n/en/notification.json b/src/main/webapp/i18n/en/notification.json index c2fe4d465886..9da00d283f98 100644 --- a/src/main/webapp/i18n/en/notification.json +++ b/src/main/webapp/i18n/en/notification.json @@ -99,6 +99,7 @@ "exerciseSubmissionAssessed": "Exercise Submission Assessed", "fileSubmissionSuccessful": "File submission successful", "newPlagiarismCaseStudent": "New plagiarism case", + "newPlagiarismCaseStudentSignificantSimilarity": "New significant similarity", "plagiarismCaseVerdictStudent": "Verdict for your plagiarism case", "tutorialGroupRegistrationStudent": "You have been registered to a tutorial group", "tutorialGroupDeregistrationStudent": "You have been deregistered from a tutorial group", @@ -124,6 +125,7 @@ "exerciseSubmissionAssessed": "Your submission for the {{ placeholderValues.1 }} exercise \"{{ placeholderValues.2 }}\" in the course \"{{ placeholderValues.0 }}\" has been assessed.", "fileSubmissionSuccessful": "Your file for the exercise \"{{ placeholderValues.1 }}\" was successfully submitted.", "newPlagiarismCaseStudent": "New plagiarism case concerning the {{ placeholderValues.1 }} exercise \"{{ placeholderValues.2 }}\".", + "newPlagiarismCaseStudentSignificantSimilarity": "New significant similarity concerning the {{ placeholderValues.1 }} exercise \"{{ placeholderValues.2 }}\".", "plagiarismCaseVerdictStudent": "Your plagiarism case concerning the {{ placeholderValues.1 }} exercise \"{{ placeholderValues.2 }}\" has a verdict.", "tutorialGroupRegistrationStudent": "You have been registered to the tutorial group {{ placeholderValues.1 }} by {{ placeholderValues.2 }}.", "tutorialGroupDeregistrationStudent": "You have been deregistered from the tutorial group {{ placeholderValues.1 }} by {{ placeholderValues.2 }}.", From 0dc8f302b1fd6c6592444f4df4b0b8d910493aac Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 9 Oct 2023 20:02:18 +0200 Subject: [PATCH 57/95] add copy for cpc plagiarism case post and email --- .../service/notifications/MailService.java | 11 +++++--- ...sPlagiarismControlPostContentProvider.java | 25 +++++++++++++++++++ .../ContinuousPlagiarismControlService.java | 3 +-- src/main/resources/i18n/messages.properties | 1 + .../resources/i18n/messages_de.properties | 1 + .../resources/i18n/messages_en.properties | 1 + 6 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java index b0f03b9a457a..b87e50c9f08a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java @@ -316,10 +316,13 @@ private String setPlagiarismContextAndSubject(Context context, NotificationType Course course = exercise.getCourseViaExerciseGroupOrCourseMember(); return messageSource.getMessage("email.plagiarism.title", new Object[] { exercise.getTitle(), course.getTitle() }, context.getLocale()); } - else { - context.setVariable(PLAGIARISM_VERDICT, plagiarismCase.getVerdict()); - return notification.getTitle(); + if (notificationType == NotificationType.NEW_CPC_PLAGIARISM_CASE_STUDENT) { + Exercise exercise = plagiarismCase.getExercise(); + Course course = exercise.getCourseViaExerciseGroupOrCourseMember(); + return messageSource.getMessage("email.plagiarism.cpc.title", new Object[] { exercise.getTitle(), course.getTitle() }, context.getLocale()); } + context.setVariable(PLAGIARISM_VERDICT, plagiarismCase.getVerdict()); + return notification.getTitle(); } private void setContextForTutorialGroupNotifications(Context context, NotificationType notificationType, @@ -369,7 +372,7 @@ private String createContentForNotificationEmailByType(NotificationType notifica case FILE_SUBMISSION_SUCCESSFUL -> templateEngine.process("mail/notification/fileSubmissionSuccessfulEmail", context); case EXERCISE_SUBMISSION_ASSESSED -> templateEngine.process("mail/notification/exerciseSubmissionAssessedEmail", context); case DUPLICATE_TEST_CASE -> templateEngine.process("mail/notification/duplicateTestCasesEmail", context); - case NEW_PLAGIARISM_CASE_STUDENT -> templateEngine.process("mail/notification/plagiarismCaseEmail", context); + case NEW_PLAGIARISM_CASE_STUDENT, NEW_CPC_PLAGIARISM_CASE_STUDENT -> templateEngine.process("mail/notification/plagiarismCaseEmail", context); case PLAGIARISM_CASE_VERDICT_STUDENT -> templateEngine.process("mail/notification/plagiarismVerdictEmail", context); case TUTORIAL_GROUP_REGISTRATION_STUDENT, TUTORIAL_GROUP_DEREGISTRATION_STUDENT, TUTORIAL_GROUP_REGISTRATION_TUTOR, TUTORIAL_GROUP_DEREGISTRATION_TUTOR, TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR, TUTORIAL_GROUP_ASSIGNED, TUTORIAL_GROUP_UNASSIGNED -> templateEngine .process("mail/notification/tutorialGroupBasicEmail", context); diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java new file mode 100644 index 000000000000..fd524d268b3c --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java @@ -0,0 +1,25 @@ +package de.tum.in.www1.artemis.service.plagiarism; + +import java.util.Locale; + +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; + +public class ContinuousPlagiarismControlPostContentProvider { + + private static final String POST_CONTENT_EN = "Dear %s,

    After an automatic review of your most recent submission for the exercise \"%s\" in the course \"%s\", we have detected a significant similarity of your submission to submission of at least one other student. This may be a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon.

    You can fix this warning by submitting a new version of your solution before the exercise due date."; + + private static final String POST_CONTENT_DE = "Dear %s,

    After an automatic review of your most recent submission for the exercise \"%s\" in the course \"%s\", we have detected a significant similarity of your submission to submission of at least one other student. This may be a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon.

    You can fix this warning by submitting a new version of your solution before the exercise due date."; + + private static final String COC_LINK = "https://www.in.tum.de/fileadmin/w00bws/in/2.Fur_Studierende/Pruefungen_und_Formalitaeten/1.Gute_studentische_Praxis/englisch/leitfaden-en_2016Jun22.pdf"; + + private ContinuousPlagiarismControlPostContentProvider() { + } + + static String getPostContent(PlagiarismCase plagiarismCase) { + var locale = Locale.forLanguageTag(plagiarismCase.getStudent().getLangKey()); + var localizedTemplate = locale == Locale.ENGLISH ? POST_CONTENT_EN : POST_CONTENT_DE; + + return String.format(localizedTemplate, plagiarismCase.getStudent().getName(), plagiarismCase.getExercise().getTitle(), + plagiarismCase.getExercise().getCourseViaExerciseGroupOrCourseMember().getTitle(), COC_LINK); + } +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 522ddb191b29..c56b8ab0404f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -132,11 +132,10 @@ private void createOrUpdatePlagiarismCases(PlagiarismComparison comparison) { private static Post buildCpcPost(PlagiarismCase plagiarismCase) { var post = new Post(); - post.setTitle("(title placeholder)"); post.setVisibleForStudents(true); post.setDisplayPriority(DisplayPriority.NONE); post.setPlagiarismCase(plagiarismCase); - post.setContent("(content placeholder)"); + post.setContent(ContinuousPlagiarismControlPostContentProvider.getPostContent(plagiarismCase)); post.setCreationDate(ZonedDateTime.now()); return post; } diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index a764e9f83f2f..e94d28de11ff 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -95,6 +95,7 @@ email.notification.aux.difficulty.hard=Hard # Plagiarism email.plagiarism.title=New Plagiarism Case: Exercise "{0}" in the course "{1}" +email.plagiarism.cpc.title=New Significant Similarity: Exercise "{0}" in the course "{1}" email.notification.title.post.plagiarismVerdict=Verdict reached in plagiarism case for exercise {0} email.notification.aux.plagiarismVerdict.plagiarism=Your case is considered as plagiarism! email.notification.aux.plagiarismVerdict.point.deduction=Due to your plagiarism, we are deducting points from your score in this exercise! diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties index 5c45c7445f11..420d01ecf968 100644 --- a/src/main/resources/i18n/messages_de.properties +++ b/src/main/resources/i18n/messages_de.properties @@ -95,6 +95,7 @@ email.notification.aux.difficulty.hard=Schwer # Plagiarism email.plagiarism.title=Neuer Plagiatsfall: Übung "{0}" im Kurs "{1}" +email.plagiarism.cpc.title=New Significant Similarity: Exercise "{0}" in the course "{1}" email.notification.title.post.plagiarismVerdict=Entscheidung zum Plagiatsfall in der Aufgabe {0} gefallen email.notification.aux.plagiarismVerdict.plagiarism=Der Fall wird als Plagiat angesehen! email.notification.aux.plagiarismVerdict.point.deduction=Wegen des Plagiatsfalls ziehen wir dir Punkte in der Aufgabe ab! diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties index 51fb6fc41ce4..c61598d3d91c 100644 --- a/src/main/resources/i18n/messages_en.properties +++ b/src/main/resources/i18n/messages_en.properties @@ -95,6 +95,7 @@ email.notification.aux.difficulty.hard=Hard # Plagiarism email.plagiarism.title=New Plagiarism Case: Exercise "{0}" in the course "{1}" +email.plagiarism.cpc.title=New Significant Similarity: Exercise "{0}" in the course "{1}" email.notification.title.post.plagiarismVerdict=Verdict reached in plagiarism case for exercise {0} email.notification.aux.plagiarismVerdict.plagiarism=Your case is considered as plagiarism! email.notification.aux.plagiarismVerdict.point.deduction=Due to your plagiarism, we are deducting points from your score in this exercise! From 0b057077abe67fe80e8a9da2fad77bb2c3b732e1 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 9 Oct 2023 22:07:23 +0200 Subject: [PATCH 58/95] fix ContinuousPlagiarismControlService test --- ...ontinuousPlagiarismControlServiceTest.java | 90 ++++++++++++++----- 1 file changed, 70 insertions(+), 20 deletions(-) diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java index b7f55f28ac28..a447629dcde4 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java @@ -1,9 +1,11 @@ package de.tum.in.www1.artemis.service.plagiarism; +import static java.util.Collections.emptySet; import static java.util.Collections.singleton; import static org.assertj.core.api.Assertions.assertThatNoException; -import static org.mockito.Mockito.inOrder; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -11,28 +13,31 @@ import java.io.IOException; import java.time.ZonedDateTime; +import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; import de.jplag.exceptions.BasecodeException; import de.jplag.exceptions.ExitException; +import de.tum.in.www1.artemis.domain.Course; import de.tum.in.www1.artemis.domain.Exercise; import de.tum.in.www1.artemis.domain.FileUploadExercise; import de.tum.in.www1.artemis.domain.ProgrammingExercise; import de.tum.in.www1.artemis.domain.TextExercise; import de.tum.in.www1.artemis.domain.TextSubmission; +import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; import de.tum.in.www1.artemis.domain.participation.StudentParticipation; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; +import de.tum.in.www1.artemis.domain.plagiarism.*; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.in.www1.artemis.domain.quiz.QuizExercise; import de.tum.in.www1.artemis.repository.ExerciseRepository; +import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; +import de.tum.in.www1.artemis.service.metis.PostService; class ContinuousPlagiarismControlServiceTest { @@ -44,8 +49,12 @@ class ContinuousPlagiarismControlServiceTest { private final PlagiarismCaseService plagiarismCaseService = mock(); + private final PlagiarismCaseRepository plagiarismCaseRepository = mock(); + + private final PostService postService = mock(); + private final ContinuousPlagiarismControlService service = new ContinuousPlagiarismControlService(exerciseRepository, plagiarismChecksService, plagiarismComparisonRepository, - plagiarismCaseService, null, null); + plagiarismCaseService, plagiarismCaseRepository, postService); @Test void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguageNotSupportedForPlagiarismDetectionException { @@ -69,7 +78,7 @@ void shouldExecuteChecks() throws ExitException, IOException, ProgrammingLanguag // and: results of plagiarism checks var textPlagiarismResult = new TextPlagiarismResult(); - textPlagiarismResult.setComparisons(Set.of(new PlagiarismComparison<>())); + textPlagiarismResult.setComparisons(singleton(new PlagiarismComparison<>())); when(plagiarismChecksService.checkTextExercise(textExercise)).thenReturn(textPlagiarismResult); var modelingPlagiarismResult = new ModelingPlagiarismResult(); when(plagiarismChecksService.checkModelingExercise(modelingExercise)).thenReturn(modelingPlagiarismResult); @@ -90,6 +99,7 @@ void shouldAddSubmissionsToPlagiarismCase() throws ExitException { // given: text exercise with cpc enabled var exercise = new TextExercise(); exercise.setId(99L); + exercise.setTitle("Exercise 1"); var participationText1 = createStudentParticipation(1); var participationText2 = createStudentParticipation(2); @@ -97,7 +107,7 @@ void shouldAddSubmissionsToPlagiarismCase() throws ExitException { var participations = Set.of(participationText1, participationText2, participationText3); exercise.setStudentParticipations(participations); - when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(Set.of(exercise)); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(singleton(exercise)); // and: results of plagiarism checks var textPlagiarismResult = new TextPlagiarismResult(); @@ -105,19 +115,46 @@ void shouldAddSubmissionsToPlagiarismCase() throws ExitException { textPlagiarismResult.setComparisons(singleton(plagiarismComparison)); when(plagiarismChecksService.checkTextExercise(exercise)).thenReturn(textPlagiarismResult); - // and: one existing plagiarism comparison - var existingPlagiarismComparison = createPlagiarismComparison(23, 2, 3); - when(plagiarismComparisonRepository.findAllByPlagiarismResultExerciseId(exercise.getId())).thenReturn(singleton(existingPlagiarismComparison)); + // and: plagiarism cases created implicitly + var plagiarismCaseA = createPlagiarismCase(exercise); + when(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA(), true)).thenReturn(plagiarismCaseA); + var plagiarismCaseB = createPlagiarismCase(exercise); + when(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB(), true)).thenReturn(plagiarismCaseB); // when service.executeChecks(); // then - var inOrder = inOrder(plagiarismCaseService); - inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA(), true); - inOrder.verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB(), true); - inOrder.verify(plagiarismCaseService).removeSubmissionsInPlagiarismCasesForComparison(existingPlagiarismComparison.getId()); - verifyNoMoreInteractions(plagiarismCaseService); + verify(plagiarismComparisonRepository).updatePlagiarismComparisonStatus(12L, PlagiarismStatus.CONFIRMED); + verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionA(), true); + verify(plagiarismCaseService).createOrAddToPlagiarismCaseForStudent(plagiarismComparison, plagiarismComparison.getSubmissionB(), true); + verify(postService, times(2)).createContinuousPlagiarismControlPlagiarismCasePost(any()); + verifyNoMoreInteractions(plagiarismComparisonRepository, plagiarismCaseService, postService); + } + + @Test + void shouldRemoveStalePlagiarismCase() throws ExitException { + // given: text exercise with cpc enabled + var exercise = new TextExercise(); + exercise.setId(99L); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(singleton(exercise)); + + // and: results of plagiarism checks + var textPlagiarismResult = new TextPlagiarismResult(); + textPlagiarismResult.setComparisons(emptySet()); + when(plagiarismChecksService.checkTextExercise(exercise)).thenReturn(textPlagiarismResult); + + // and: stale plagiarism case + var plagiarismCase = createPlagiarismCase(exercise); + plagiarismCase.setPlagiarismSubmissions(emptySet()); + when(plagiarismCaseRepository.findAllCreatedByContinuousPlagiarismControlByExerciseIdWithPlagiarismSubmissions(99L)).thenReturn(List.of(plagiarismCase)); + + // when + service.executeChecks(); + + // then + verify(plagiarismCaseRepository).delete(plagiarismCase); + verifyNoMoreInteractions(plagiarismComparisonRepository, plagiarismCaseService, postService); } @Test @@ -128,7 +165,7 @@ void shouldNotExecuteChecksAfterDueDate() { exercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); exercise.getPlagiarismDetectionConfig().setContinuousPlagiarismControlPostDueDateChecksEnabled(false); - when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(Set.of(exercise)); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(singleton(exercise)); // when service.executeChecks(); @@ -154,8 +191,7 @@ void shouldDoNothingForFileUploadAndQuizExercises() { void shouldSilentAnyJPlagExceptionsThrown() throws Exception { // given var textExercise = new TextExercise(); - Set exercises = Set.of(textExercise); - when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(singleton(textExercise)); when(plagiarismChecksService.checkTextExercise(textExercise)).thenThrow(new BasecodeException("msg")); // then @@ -166,8 +202,7 @@ void shouldSilentAnyJPlagExceptionsThrown() throws Exception { void shouldSilentAnyUnknownExceptionsThrown() throws Exception { // given var textExercise = new TextExercise(); - Set exercises = Set.of(textExercise); - when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(exercises); + when(exerciseRepository.findAllExercisesWithDueDateOnOrAfterYesterdayAndContinuousPlagiarismControlEnabledIsTrue()).thenReturn(singleton(textExercise)); when(plagiarismChecksService.checkTextExercise(textExercise)).thenThrow(new IllegalStateException()); // then @@ -199,4 +234,19 @@ private static PlagiarismComparison createPlagiarismCompa return comparison; } + + private static PlagiarismCase createPlagiarismCase(Exercise exercise) { + var plagiarismCase = new PlagiarismCase(); + plagiarismCase.setExercise(exercise); + + var student = new User(); + student.setFirstName("Student1"); + student.setLangKey("en"); + plagiarismCase.setStudent(student); + + var course = new Course(); + exercise.setCourse(course); + + return plagiarismCase; + } } From 5c57c85910dd81f759dd9438cc14921096d7825b Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 9 Oct 2023 23:21:11 +0200 Subject: [PATCH 59/95] improve Exercise->PlagiarismDetectionConfig relation and add default value to bool flag --- .../tum/in/www1/artemis/domain/Exercise.java | 4 +-- .../plagiarism/PlagiarismDetectionConfig.java | 27 ++++--------------- .../changelog/20230930160925_changelog.xml | 5 ++-- .../PlagiarismDetectionConfigHelperTest.java | 1 - 4 files changed, 10 insertions(+), 27 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java index 758843ca0af3..daab14a409da 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/Exercise.java @@ -144,8 +144,8 @@ public abstract class Exercise extends BaseExercise implements LearningObject { @JsonIncludeProperties({ "id" }) private Set plagiarismCases = new HashSet<>(); - @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) + @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) + @JoinColumn(name = "plagiarism_detection_config_id") @JsonIgnoreProperties("exercise") private PlagiarismDetectionConfig plagiarismDetectionConfig; diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 819e0ffab7c6..53bb12088ac2 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -4,18 +4,14 @@ import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; import javax.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.in.www1.artemis.domain.DomainObject; -import de.tum.in.www1.artemis.domain.Exercise; /** * Stores configuration for manual and continuous plagiarism control. @@ -26,10 +22,6 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public class PlagiarismDetectionConfig extends DomainObject { - @OneToOne(mappedBy = "plagiarismDetectionConfig", fetch = FetchType.LAZY) - @JsonIgnoreProperties("plagiarismDetectionConfig") - private Exercise exercise; - @Column(name = "continuous_plagiarism_control_enabled") private boolean continuousPlagiarismControlEnabled = false; @@ -45,14 +37,6 @@ public class PlagiarismDetectionConfig extends DomainObject { @Column(name = "minimum_size") private int minimumSize; - public Exercise getExercise() { - return exercise; - } - - public void setExercise(Exercise exercise) { - this.exercise = exercise; - } - public boolean isContinuousPlagiarismControlEnabled() { return continuousPlagiarismControlEnabled; } @@ -119,20 +103,19 @@ public boolean equals(Object o) { PlagiarismDetectionConfig that = (PlagiarismDetectionConfig) o; return continuousPlagiarismControlEnabled == that.continuousPlagiarismControlEnabled && continuousPlagiarismControlPostDueDateChecksEnabled == that.continuousPlagiarismControlPostDueDateChecksEnabled - && Float.compare(similarityThreshold, that.similarityThreshold) == 0 && minimumScore == that.minimumScore && minimumSize == that.minimumSize - && Objects.equals(exercise, that.exercise); + && Float.compare(similarityThreshold, that.similarityThreshold) == 0 && minimumScore == that.minimumScore && minimumSize == that.minimumSize; } @Override public int hashCode() { - return Objects.hash(super.hashCode(), exercise, continuousPlagiarismControlEnabled, continuousPlagiarismControlPostDueDateChecksEnabled, similarityThreshold, minimumScore, + return Objects.hash(super.hashCode(), continuousPlagiarismControlEnabled, continuousPlagiarismControlPostDueDateChecksEnabled, similarityThreshold, minimumScore, minimumSize); } @Override public String toString() { - return "PlagiarismDetectionConfig{" + "exercise=" + exercise + ", continuousPlagiarismControlEnabled=" + continuousPlagiarismControlEnabled - + ", continuousPlagiarismControlPostDueDateChecksEnabled=" + continuousPlagiarismControlPostDueDateChecksEnabled + ", similarityThreshold=" + similarityThreshold - + ", minimumScore=" + minimumScore + ", minimumSize=" + minimumSize + '}'; + return "PlagiarismDetectionConfig{continuousPlagiarismControlEnabled=" + continuousPlagiarismControlEnabled + ", continuousPlagiarismControlPostDueDateChecksEnabled=" + + continuousPlagiarismControlPostDueDateChecksEnabled + ", similarityThreshold=" + similarityThreshold + ", minimumScore=" + minimumScore + ", minimumSize=" + + minimumSize + '}'; } } diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index c9bcfdb0996c..7d6c57eddc56 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -14,10 +14,11 @@ - + + - + diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java index bf63e0a450b1..4d3d8beff0c6 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -59,7 +59,6 @@ void shouldReplaceConfigWithGivenValues() { // then assertThat(exercise.getPlagiarismDetectionConfig()).isNotSameAs(config); - assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getExercise).isNull(); assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getId).isNull(); assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getSimilarityThreshold).isEqualTo(99.0f); assertThat(exercise.getPlagiarismDetectionConfig()).extracting(PlagiarismDetectionConfig::getMinimumScore).isEqualTo(98); From ba41060496d0ec62da2dc77ee6712fe96a7e22ef Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 11 Oct 2023 13:40:58 +0200 Subject: [PATCH 60/95] join plagiarism checks config on demand --- .../ModelingExerciseRepository.java | 8 +++++++ .../ProgrammingExerciseRepository.java | 11 ++++++++++ .../repository/TextExerciseRepository.java | 3 +++ .../web/rest/ModelingExerciseResource.java | 22 ++++++++++++------- .../web/rest/ProgrammingExerciseResource.java | 19 +++++++++++----- .../web/rest/TextExerciseResource.java | 19 +++++++++++----- .../modeling-exercise-resolver.service.ts | 2 +- .../manage/modeling-exercise.service.ts | 4 ++-- ...ming-exercise-management-routing.module.ts | 2 +- .../services/programming-exercise.service.ts | 8 +++++-- .../text-exercise/text-exercise.route.ts | 2 +- .../text-exercise/text-exercise.service.ts | 5 +++-- 12 files changed, 77 insertions(+), 28 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java index 027946d71896..307d18041f65 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java @@ -31,6 +31,9 @@ public interface ModelingExerciseRepository extends JpaRepository findByCourseIdWithCategories(@Param("courseId") Long courseId); + @EntityGraph(type = LOAD, attributePaths = { "exampleSubmissions", "teamAssignmentConfig", "categories", "competencies", "exampleSubmissions.submission.results" }) + Optional findWithEagerExampleSubmissionsAndCompetenciesById(@Param("exerciseId") Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "exampleSubmissions", "teamAssignmentConfig", "categories", "competencies", "exampleSubmissions.submission.results", "plagiarismDetectionConfig" }) Optional findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(@Param("exerciseId") Long exerciseId); @@ -71,6 +74,11 @@ default ModelingExercise findByIdElseThrow(long exerciseId) { return findById(exerciseId).orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); } + @NotNull + default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesByIdElseThrow(long exerciseId) { + return findWithEagerExampleSubmissionsAndCompetenciesById(exerciseId).orElseThrow(() -> new EntityNotFoundException("Modeling Exercise", exerciseId)); + } + @NotNull default ModelingExercise findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(long exerciseId) { return findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(exerciseId) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java index 92b3a205318e..4c210e63a514 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java @@ -57,6 +57,10 @@ public interface ProgrammingExerciseRepository extends JpaRepository findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories", + "submissionPolicy" }) + Optional findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories", "submissionPolicy", "plagiarismDetectionConfig" }) Optional findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(Long exerciseId); @@ -542,6 +546,13 @@ default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssi return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId)); } + @NotNull + default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesElseThrow(long programmingExerciseId) + throws EntityNotFoundException { + Optional programmingExercise = findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(programmingExerciseId); + return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId)); + } + @NotNull default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow( long programmingExerciseId) throws EntityNotFoundException { diff --git a/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java index fdf3b37bfc5f..844e68745902 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/TextExerciseRepository.java @@ -32,6 +32,9 @@ public interface TextExerciseRepository extends JpaRepository findByCourseIdWithCategories(@Param("courseId") Long courseId); + @EntityGraph(type = LOAD, attributePaths = { "teamAssignmentConfig", "categories", "competencies" }) + Optional findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesById(Long exerciseId); + @EntityGraph(type = LOAD, attributePaths = { "teamAssignmentConfig", "categories", "competencies", "plagiarismDetectionConfig" }) Optional findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(Long exerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 519b9f49313a..1290a31801e2 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -14,10 +14,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Exercise; -import de.tum.in.www1.artemis.domain.GradingCriterion; -import de.tum.in.www1.artemis.domain.User; +import de.tum.in.www1.artemis.domain.*; import de.tum.in.www1.artemis.domain.metis.conversation.Channel; import de.tum.in.www1.artemis.domain.modeling.ModelingExercise; import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult; @@ -245,19 +242,28 @@ public ResponseEntity> getModelingExercisesForCourse(@Pat return ResponseEntity.ok().body(exercises); } + private ModelingExercise findModelingExercise(Long exerciseId, boolean includePlagiarismDetectionConfig) { + if (includePlagiarismDetectionConfig) { + var modelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); + return modelingExercise; + } + return modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesByIdElseThrow(exerciseId); + } + /** * GET modeling-exercises/:exerciseId : get the "id" modelingExercise. * - * @param exerciseId the id of the modelingExercise to retrieve + * @param exerciseId the id of the modelingExercise to retrieve + * @param withPlagiarismDetectionConfig boolean flag whether to include the plagiarism detection config of the exercise * @return the ResponseEntity with status 200 (OK) and with body the modelingExercise, or with status 404 (Not Found) */ @GetMapping("modeling-exercises/{exerciseId}") @EnforceAtLeastTutor - public ResponseEntity getModelingExercise(@PathVariable Long exerciseId) { + public ResponseEntity getModelingExercise(@PathVariable Long exerciseId, @RequestParam(defaultValue = "false") boolean withPlagiarismDetectionConfig) { log.debug("REST request to get ModelingExercise : {}", exerciseId); - var modelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(exerciseId); + var modelingExercise = findModelingExercise(exerciseId, withPlagiarismDetectionConfig); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.TEACHING_ASSISTANT, modelingExercise, null); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); List gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(exerciseId); modelingExercise.setGradingCriteria(gradingCriteria); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java index df56000221fb..4053adb03079 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java @@ -361,19 +361,28 @@ public ResponseEntity> getProgrammingExercisesForCours return ResponseEntity.ok().body(exercises); } + private ProgrammingExercise findProgrammingExercise(Long exerciseId, boolean includePlagiarismDetectionConfig) { + if (includePlagiarismDetectionConfig) { + var programmingExercise = programmingExerciseRepository + .findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow(exerciseId); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); + return programmingExercise; + } + return programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesElseThrow(exerciseId); + } + /** * GET /programming-exercises/:exerciseId : get the "exerciseId" programmingExercise. * - * @param exerciseId the id of the programmingExercise to retrieve + * @param exerciseId the id of the programmingExercise to retrieve + * @param withPlagiarismDetectionConfig boolean flag whether to include the plagiarism detection config of the exercise * @return the ResponseEntity with status 200 (OK) and with body the programmingExercise, or with status 404 (Not Found) */ @GetMapping(PROGRAMMING_EXERCISE) @EnforceAtLeastTutor - public ResponseEntity getProgrammingExercise(@PathVariable long exerciseId) { + public ResponseEntity getProgrammingExercise(@PathVariable long exerciseId, @RequestParam(defaultValue = "false") boolean withPlagiarismDetectionConfig) { log.debug("REST request to get ProgrammingExercise : {}", exerciseId); - var programmingExercise = programmingExerciseRepository - .findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow(exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); + var programmingExercise = findProgrammingExercise(exerciseId, withPlagiarismDetectionConfig); // Fetch grading criterion into exercise of participation List gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(programmingExercise.getId()); programmingExercise.setGradingCriteria(gradingCriteria); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 04c04e55acd8..9e420924f93b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -245,21 +245,28 @@ public ResponseEntity> getTextExercisesForCourse(@PathVariabl return ResponseEntity.ok().body(exercises); } + private Optional findTextExercise(Long exerciseId, boolean includePlagiarismDetectionConfig) { + if (includePlagiarismDetectionConfig) { + var textExercise = textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(exerciseId); + textExercise.ifPresent(it -> PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(it, textExerciseRepository)); + return textExercise; + } + return textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesById(exerciseId); + } + /** * GET /text-exercises/:id : get the "id" textExercise. * - * @param exerciseId the id of the textExercise to retrieve + * @param exerciseId the id of the textExercise to retrieve + * @param withPlagiarismDetectionConfig boolean flag whether to include the plagiarism detection config of the exercise * @return the ResponseEntity with status 200 (OK) and with body the textExercise, or with * status 404 (Not Found) */ @GetMapping("text-exercises/{exerciseId}") @EnforceAtLeastTutor - public ResponseEntity getTextExercise(@PathVariable Long exerciseId) { + public ResponseEntity getTextExercise(@PathVariable Long exerciseId, @RequestParam(defaultValue = "false") boolean withPlagiarismDetectionConfig) { log.debug("REST request to get TextExercise : {}", exerciseId); - var textExercise = textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(exerciseId) - .orElseThrow(() -> new EntityNotFoundException("TextExercise", exerciseId)); - - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(textExercise, textExerciseRepository); + var textExercise = findTextExercise(exerciseId, withPlagiarismDetectionConfig).orElseThrow(() -> new EntityNotFoundException("TextExercise", exerciseId)); // If the exercise belongs to an exam, only editors, instructors and admins are allowed to access it if (textExercise.isExamExercise()) { diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-resolver.service.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-resolver.service.ts index 6582b0d434bf..3d589aef3b8a 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-resolver.service.ts +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-resolver.service.ts @@ -20,7 +20,7 @@ export class ModelingExerciseResolver implements Resolve { resolve(route: ActivatedRouteSnapshot) { if (route.params['exerciseId']) { - return this.modelingExerciseService.find(route.params['exerciseId']).pipe( + return this.modelingExerciseService.find(route.params['exerciseId'], true).pipe( filter((res) => !!res.body), map((modelingExercise: HttpResponse) => modelingExercise.body!), ); diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.service.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.service.ts index 430adfeb3b6b..d8f26129c892 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.service.ts +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.service.ts @@ -43,9 +43,9 @@ export class ModelingExerciseService implements ExerciseServicable this.exerciseService.processExerciseEntityResponse(res))); } - find(modelingExerciseId: number): Observable { + find(modelingExerciseId: number, withPlagiarismDetectionConfig: boolean = false): Observable { return this.http - .get(`${this.resourceUrl}/${modelingExerciseId}`, { observe: 'response' }) + .get(`${this.resourceUrl}/${modelingExerciseId}`, { observe: 'response', params: { withPlagiarismDetectionConfig: withPlagiarismDetectionConfig } }) .pipe(map((res: EntityResponseType) => this.exerciseService.processExerciseEntityResponse(res))); } diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts index c874b6bc279e..a32417226794 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts @@ -22,7 +22,7 @@ export class ProgrammingExerciseResolve implements Resolve resolve(route: ActivatedRouteSnapshot) { const exerciseId = route.params['exerciseId'] ? route.params['exerciseId'] : undefined; if (exerciseId) { - return this.service.find(exerciseId).pipe(map((programmingExercise: HttpResponse) => programmingExercise.body!)); + return this.service.find(exerciseId, true).pipe(map((programmingExercise: HttpResponse) => programmingExercise.body!)); } return of(new ProgrammingExercise(undefined, undefined)); } diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts index 5dcfb1776c7c..314a73903117 100644 --- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts @@ -214,10 +214,14 @@ export class ProgrammingExerciseService { /** * Finds the programming exercise for the given exerciseId * @param programmingExerciseId of the programming exercise to retrieve + * @param withPlagiarismDetectionConfig true if plagiarism detection context should be fetched with the exercise */ - find(programmingExerciseId: number): Observable { + find(programmingExerciseId: number, withPlagiarismDetectionConfig: boolean = false): Observable { return this.http - .get(`${this.resourceUrl}/${programmingExerciseId}`, { observe: 'response' }) + .get(`${this.resourceUrl}/${programmingExerciseId}`, { + observe: 'response', + params: { withPlagiarismDetectionConfig: withPlagiarismDetectionConfig }, + }) .pipe(map((res: EntityResponseType) => this.processProgrammingExerciseEntityResponse(res))); } diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts index 51e83bde537b..67c3f64a6dd4 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts @@ -31,7 +31,7 @@ export class TextExerciseResolver implements Resolve { */ resolve(route: ActivatedRouteSnapshot) { if (route.params['exerciseId']) { - return this.textExerciseService.find(route.params['exerciseId']).pipe( + return this.textExerciseService.find(route.params['exerciseId'], true).pipe( filter((res) => !!res.body), map((textExercise: HttpResponse) => textExercise.body!), ); diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts index 0faa12eaddd9..f78eb9c90969 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts @@ -69,10 +69,11 @@ export class TextExerciseService implements ExerciseServicable { /** * Finds the text exercise of the given exerciseId. * @param exerciseId of text exercise of type {number} + * @param withPlagiarismDetectionConfig true if plagiarism detection context should be fetched with the exercise */ - find(exerciseId: number): Observable { + find(exerciseId: number, withPlagiarismDetectionConfig: boolean = false): Observable { return this.http - .get(`${this.resourceUrl}/${exerciseId}`, { observe: 'response' }) + .get(`${this.resourceUrl}/${exerciseId}`, { observe: 'response', params: { withPlagiarismDetectionConfig: withPlagiarismDetectionConfig } }) .pipe(map((res: EntityResponseType) => this.exerciseService.processExerciseEntityResponse(res))); } From 11a895dcf56d78bde83ab9110f15f47b9fa20f70 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 11 Oct 2023 22:47:31 +0200 Subject: [PATCH 61/95] fix cpc cron --- .../service/plagiarism/ContinuousPlagiarismControlService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index c56b8ab0404f..bbe235c5400a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -70,7 +70,7 @@ public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, /** * Daily triggers plagiarism checks as a part of continuous plagiarism control. */ - @Scheduled(initialDelay = 30_000, fixedDelay = 60_000) + @Scheduled(cron = "${artemis.scheduling.continuous-plagiarism-control-trigger-time:0 0 5 * * *}") public void executeChecks() { log.info("Starting continuous plagiarism control..."); From aba940e62da63becc2519934c26f97ffd7a49e6b Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 13:21:07 +0200 Subject: [PATCH 62/95] optimize join --- .../tum/in/www1/artemis/repository/ExerciseRepository.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java index 98da0a66906f..31d51a1bb352 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java @@ -244,10 +244,8 @@ List countActiveStudentsInExercisesWithReleaseDateBetw LEFT JOIN FETCH e.studentParticipations p LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH s.results - WHERE e.course.testCourse = FALSE - AND e.dueDate >= :time - AND c.continuousPlagiarismControlEnabled = TRUE - ORDER BY e.dueDate ASC + WHERE e.dueDate >= :time + AND c.continuousPlagiarismControlEnabled = TRUE """) Set findAllExercisesWithDueDateOnOrAfterAndContinuousPlagiarismControlEnabledIsTrue(@Param("time") ZonedDateTime time); From 907b44babe98472b3315464b3884c411df9f78bc Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 13:25:40 +0200 Subject: [PATCH 63/95] reformat query --- .../repository/ModelingExerciseRepository.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java index 307d18041f65..b77ed7dfa0b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java @@ -38,7 +38,18 @@ public interface ModelingExerciseRepository extends JpaRepository findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(@Param("exerciseId") Long exerciseId); - @Query("select modelingExercise from ModelingExercise modelingExercise left join fetch modelingExercise.exampleSubmissions exampleSubmissions left join fetch exampleSubmissions.submission submission left join fetch submission.results results left join fetch results.feedbacks left join fetch results.assessor left join fetch modelingExercise.teamAssignmentConfig left join fetch modelingExercise.plagiarismDetectionConfig where modelingExercise.id = :#{#exerciseId}") + @Query(""" + SELECT modelingExercise\s + FROM ModelingExercise modelingExercise\s + LEFT JOIN FETCH modelingExercise.exampleSubmissions exampleSubmissions\s + LEFT JOIN FETCH exampleSubmissions.submission submission\s + LEFT JOIN FETCH submission.results results\s + LEFT JOIN FETCH results.feedbacks\s + LEFT JOIN FETCH results.assessor\s + LEFT JOIN FETCH modelingExercise.teamAssignmentConfig\s + LEFT JOIN FETCH modelingExercise.plagiarismDetectionConfig\s + WHERE modelingExercise.id = :#{#exerciseId} + """) Optional findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(@Param("exerciseId") Long exerciseId); /** From b2bf9b8fd986202ae608b10ffd16f0aad8538030 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 13:26:34 +0200 Subject: [PATCH 64/95] add brackets to if --- .../domain/plagiarism/PlagiarismDetectionConfig.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index 53bb12088ac2..e539eb64a064 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -94,12 +94,15 @@ public static PlagiarismDetectionConfig createDefault() { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } PlagiarismDetectionConfig that = (PlagiarismDetectionConfig) o; return continuousPlagiarismControlEnabled == that.continuousPlagiarismControlEnabled && continuousPlagiarismControlPostDueDateChecksEnabled == that.continuousPlagiarismControlPostDueDateChecksEnabled From 4f148b2bceb7be5d9c5c5b770dfc9da3d6f16077 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 13:28:08 +0200 Subject: [PATCH 65/95] remove unused method --- .../repository/plagiarism/PlagiarismCaseRepository.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java index 6032bcea213a..454e8979118b 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/plagiarism/PlagiarismCaseRepository.java @@ -127,14 +127,6 @@ public interface PlagiarismCaseRepository extends JpaRepository findByIdWithPlagiarismSubmissions(@Param("plagiarismCaseId") long plagiarismCaseId); - @Query(""" - SELECT plagiarismCase - FROM PlagiarismCase plagiarismCase - LEFT JOIN FETCH plagiarismCase.plagiarismSubmissions plagiarismSubmissions - WHERE plagiarismCase.exercise.id = :exerciseId - """) - List findAllByExerciseIdWithPlagiarismSubmissions(@Param("exerciseId") long exerciseId); - @Query(""" SELECT plagiarismCase FROM PlagiarismCase plagiarismCase From a2691df2c42d56b4928800cd39de8c6d37eba2eb Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 13:34:01 +0200 Subject: [PATCH 66/95] remove unnecessary filter method --- .../de/tum/in/www1/artemis/service/metis/PostingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java b/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java index 0623f358aeec..fa6af8205d43 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/metis/PostingService.java @@ -211,7 +211,7 @@ protected void setAuthorRoleOfPostings(List postsInCourse) { // sets respective author role to display user authority icon on posting headers postsInCourse.stream() // needs to handle posts created by SingleUserNotificationService.notifyUserAboutNewPlagiarismCaseBySystem - .filter(post -> post.getAuthor() != null).filter(post -> authors.containsKey(post.getAuthor().getId())).forEach(post -> { + .filter(post -> post.getAuthor() != null).forEach(post -> { post.setAuthor(authors.get(post.getAuthor().getId())); setAuthorRoleForPosting(post, post.getCoursePostingBelongsTo()); post.getAnswers().forEach(answerPost -> { From 7a12d9d88eef792ff8acb1b35ed2fa0f1f4f477e Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 14:10:10 +0200 Subject: [PATCH 67/95] revert unnecessary change --- .../artemis/plagiarism/PlagiarismCaseIntegrationTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java index 4f9303b65a47..c73610e57567 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismCaseIntegrationTest.java @@ -18,11 +18,7 @@ import de.tum.in.www1.artemis.domain.*; import de.tum.in.www1.artemis.domain.exam.Exam; import de.tum.in.www1.artemis.domain.metis.Post; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismComparison; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmission; -import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismVerdict; +import de.tum.in.www1.artemis.domain.plagiarism.*; import de.tum.in.www1.artemis.domain.plagiarism.text.TextSubmissionElement; import de.tum.in.www1.artemis.exercise.ExerciseUtilService; import de.tum.in.www1.artemis.exercise.textexercise.TextExerciseUtilService; From 17b2c433b34d468347408585d3c1fe5e1513dfed Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 14:12:45 +0200 Subject: [PATCH 68/95] fix comments --- .../plagiarism/PlagiarismDetectionConfigHelperTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java index 4d3d8beff0c6..965bbf4e7b54 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -33,7 +33,7 @@ void shouldDoNothingIfExerciseHasPlagiarismDetectionConfig() { @Test void shouldAddDefaultConfigIfExerciseDoesNotHavePlagiarismDetectionConfig() { - // given: exercise with PlagiarismDetectionConfig + // given: exercise without PlagiarismDetectionConfig var exercise = new ModelingExercise(); // and @@ -49,7 +49,7 @@ void shouldAddDefaultConfigIfExerciseDoesNotHavePlagiarismDetectionConfig() { @Test void shouldReplaceConfigWithGivenValues() { - // given: exercise with PlagiarismDetectionConfig + // given: exercise without PlagiarismDetectionConfig var exercise = new ModelingExercise(); var config = PlagiarismDetectionConfig.createDefault(); exercise.setPlagiarismDetectionConfig(config); From 73b94083f22e1adbc191de29285bf84c5abb3950 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Sun, 15 Oct 2023 14:26:22 +0200 Subject: [PATCH 69/95] add DE translations --- .../ContinuousPlagiarismControlPostContentProvider.java | 4 ++-- src/main/resources/i18n/messages_de.properties | 2 +- src/main/webapp/i18n/de/notification.json | 4 ++-- src/main/webapp/i18n/de/plagiarism.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java index fd524d268b3c..e0ee08849341 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java @@ -6,9 +6,9 @@ public class ContinuousPlagiarismControlPostContentProvider { - private static final String POST_CONTENT_EN = "Dear %s,

    After an automatic review of your most recent submission for the exercise \"%s\" in the course \"%s\", we have detected a significant similarity of your submission to submission of at least one other student. This may be a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon.

    You can fix this warning by submitting a new version of your solution before the exercise due date."; + private static final String POST_CONTENT_EN = "Dear %s,

    After an automatic review of your most recent submission for the exercise \"%s\" in the course \"%s\", we have detected a significant similarity of your submission to the submission of at least one other student. This may be a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon.

    You can fix this warning by submitting a new version of your solution before the exercise due date."; - private static final String POST_CONTENT_DE = "Dear %s,

    After an automatic review of your most recent submission for the exercise \"%s\" in the course \"%s\", we have detected a significant similarity of your submission to submission of at least one other student. This may be a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon.

    You can fix this warning by submitting a new version of your solution before the exercise due date."; + private static final String POST_CONTENT_DE = "Sehr geehrter %s,

    nach einer automatisierten Auswertung Ihrer letzten Einsendung für die Übung \"%s\" in der Lehrveranstaltung \"%s\" haben wir eine signifikante Übereinstimmung Ihrer Einsendung mit der Einsendung von mindestens einem anderen Studenten festgestellt. Dies ist möglicherweise ein Verstoß gegen die Student Code of Conduct der School of Computation, Information and Technology, der Sie zugestimmt haben. Sie können diese Warnmeldung beheben, indem Sie eine neue Version Ihrer Lösung vor dem Abgabetermin der Übung einreichen"; private static final String COC_LINK = "https://www.in.tum.de/fileadmin/w00bws/in/2.Fur_Studierende/Pruefungen_und_Formalitaeten/1.Gute_studentische_Praxis/englisch/leitfaden-en_2016Jun22.pdf"; diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties index 420d01ecf968..42b8026f01c8 100644 --- a/src/main/resources/i18n/messages_de.properties +++ b/src/main/resources/i18n/messages_de.properties @@ -95,7 +95,7 @@ email.notification.aux.difficulty.hard=Schwer # Plagiarism email.plagiarism.title=Neuer Plagiatsfall: Übung "{0}" im Kurs "{1}" -email.plagiarism.cpc.title=New Significant Similarity: Exercise "{0}" in the course "{1}" +email.plagiarism.cpc.title=Neue signifikante bereinstimmung: Aufgabe "{0}" im Kurs "{1}" email.notification.title.post.plagiarismVerdict=Entscheidung zum Plagiatsfall in der Aufgabe {0} gefallen email.notification.aux.plagiarismVerdict.plagiarism=Der Fall wird als Plagiat angesehen! email.notification.aux.plagiarismVerdict.point.deduction=Wegen des Plagiatsfalls ziehen wir dir Punkte in der Aufgabe ab! diff --git a/src/main/webapp/i18n/de/notification.json b/src/main/webapp/i18n/de/notification.json index b4ca9f772bbb..9a2428946fae 100644 --- a/src/main/webapp/i18n/de/notification.json +++ b/src/main/webapp/i18n/de/notification.json @@ -99,7 +99,7 @@ "exerciseSubmissionAssessed": "Übungsabgabe bewertet", "fileSubmissionSuccessful": "Dateiabgabe erfolgreich", "newPlagiarismCaseStudent": "Neuer Plagiatsfall", - "newPlagiarismCaseStudentSignificantSimilarity": "New significant similarity", + "newPlagiarismCaseStudentSignificantSimilarity": "Neue signifikante Übereinstimmung", "plagiarismCaseVerdictStudent": "Urteil zu deinem Plagiatsfall", "tutorialGroupRegistrationStudent": "Du wurdest für eine Übungsgruppe registriert", "tutorialGroupDeregistrationStudent": "Du wurdest von einer Übungsgruppe abgemeldet", @@ -125,7 +125,7 @@ "exerciseSubmissionAssessed": "Deine Abgabe für die {{ placeholderValues.1 }} Aufgabe \"{{ placeholderValues.2 }}\" im Kurs \"{{ placeholderValues.0 }}\" wurde bewertet.", "fileSubmissionSuccessful": "Deine Datei für die Aufgabe \"{{ placeholderValues.1 }}\" wurde erfolgreich eingereicht.", "newPlagiarismCaseStudent": "Neuer Plagiatsfall für die {{ placeholderValues.1 }} Aufgabe \"{{ placeholderValues.2 }}\".", - "newPlagiarismCaseStudentSignificantSimilarity": "New significant similarity", + "newPlagiarismCaseStudentSignificantSimilarity": "Neue signifikante Übereinstimmung in Bezug auf die Aufgabe {{ placeholderValues.1 }} \"{{ placeholderValues.2 }}.", "plagiarismCaseVerdictStudent": "Dein Plagiatsfall für die {{ placeholderValues.1 }} Aufgabe \"{{ placeholderValues.2 }}\" hat ein Urteil.", "tutorialGroupRegistrationStudent": "Du wurdest für die Übungsgruppe {{ placeholderValues.1 }} von {{ placeholderValues.2 }} registriert.", "tutorialGroupDeregistrationStudent": "Du wurdest von der Übungsgruppe {{ placeholderValues.1 }} von {{ placeholderValues.2 }} abgemeldet.", diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 422d77a4dd04..3b4c023b142c 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -63,7 +63,7 @@ "pageTitle": "Plagiatsfälle", "plagiarismCases": "Plagiatsfälle", "plagiarismCase": "Plagiatsfall", - "plagiarismCaseSignificantSimilarity": "Significant Similarity", + "plagiarismCaseSignificantSimilarity": "Signifikante Übereinstimmung", "resolvedPlagiarismCase": "Gelöster Plagiatsfall", "notification": { "title": "Plagiatsfall: {{ exercise }}", From 1512c522feffa295b32847995e4df0b28dd85713 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 16 Oct 2023 22:55:16 +0200 Subject: [PATCH 70/95] debug --- .../notifications/GeneralInstantNotificationService.java | 6 ++++++ .../in/www1/artemis/service/notifications/MailService.java | 4 +++- .../notifications/SingleUserNotificationService.java | 6 ++++++ .../plagiarism/ContinuousPlagiarismControlService.java | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java index 544917ff0bfb..c28222e6e43e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/GeneralInstantNotificationService.java @@ -7,6 +7,8 @@ import javax.validation.constraints.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -33,6 +35,8 @@ public class GeneralInstantNotificationService implements InstantNotificationSer private final NotificationSettingsService notificationSettingsService; + private static final Logger log = LoggerFactory.getLogger(GeneralInstantNotificationService.class); + /** * Constructor to create a GeneralInstantNotificationService */ @@ -59,7 +63,9 @@ public void sendNotification(Notification notification, User user, Object notifi boolean allowsPush = notificationSettingsService.checkIfNotificationIsAllowedInCommunicationChannelBySettingsForGivenUser(notification, user, PUSH); NotificationType type = NotificationConstants.findCorrespondingNotificationType(notification.getTitle()); + log.info("CPC - 03 - {} {}", allowsEmail, type); if (allowsEmail && notificationSettingsService.checkNotificationTypeForEmailSupport(type)) { + log.info("CPC - 04"); mailService.sendNotification(notification, user, notificationSubject); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java index b87e50c9f08a..d3cdad81b97b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/MailService.java @@ -115,7 +115,8 @@ public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMai */ @Async public void sendEmail(User recipient, String subject, String content, boolean isMultipart, boolean isHtml) { - log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}'", isMultipart, isHtml, recipient, subject); + log.info("CPC - 06"); + log.info("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}'", isMultipart, isHtml, recipient, subject); // Prepare message using a Spring helper MimeMessage mimeMessage = javaMailSender.createMimeMessage(); @@ -279,6 +280,7 @@ public void sendNotification(Notification notification, User user, Object notifi checkAndPrepareExerciseSubmissionAssessedCase(notificationType, context, exercise, user); } if (notificationSubject instanceof PlagiarismCase plagiarismCase) { + log.info("CPC - 05"); subject = setPlagiarismContextAndSubject(context, notificationType, notification, plagiarismCase); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java index 93b84af40b3a..cc22e2734ff0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/SingleUserNotificationService.java @@ -8,6 +8,8 @@ import java.util.*; import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -36,6 +38,8 @@ @Service public class SingleUserNotificationService { + private final Logger log = LoggerFactory.getLogger(SingleUserNotificationService.class); + private final SingleUserNotificationRepository singleUserNotificationRepository; private final UserRepository userRepository; @@ -469,7 +473,9 @@ private void prepareSingleUserInstantNotification(SingleUserNotification notific boolean skipSend = type == CONVERSATION_NEW_REPLY_MESSAGE && Objects.equals(notification.getRecipient().getId(), author.getId()); // checks if this notification type has email support + log.info("CPC - 01 - {} {}", type, skipSend); if (notificationSettingsService.checkNotificationTypeForInstantNotificationSupport(type) && !skipSend) { + log.info("CPC - 02"); notificationService.sendNotification(notification, notification.getRecipient(), notificationSubject); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index bbe235c5400a..c6704d950ef5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -126,6 +126,7 @@ private void createOrUpdatePlagiarismCases(PlagiarismComparison comparison) { var plagiarismCases = Set.of(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA(), true), plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB(), true)); + log.info("CPC - 07 - {}", plagiarismCases.size()); plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost) .forEach(postService::createContinuousPlagiarismControlPlagiarismCasePost); } From ebb4a6b60b4126bb80afa6ff5a746a600b45fa5f Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 16 Oct 2023 23:19:03 +0200 Subject: [PATCH 71/95] 60s cron --- .../service/plagiarism/ContinuousPlagiarismControlService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index c6704d950ef5..12af087f4fc4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -70,7 +70,7 @@ public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, /** * Daily triggers plagiarism checks as a part of continuous plagiarism control. */ - @Scheduled(cron = "${artemis.scheduling.continuous-plagiarism-control-trigger-time:0 0 5 * * *}") + @Scheduled(initialDelay = 30_000, fixedDelay = 60_000) public void executeChecks() { log.info("Starting continuous plagiarism control..."); From a0235365c48fdfcdc369af24a6476f4c83fef945 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 09:04:52 +0200 Subject: [PATCH 72/95] add logs --- .../service/notifications/NotificationSettingsService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java index 81981bd2b20d..f18744d388f3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java @@ -6,6 +6,8 @@ import java.util.*; import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.domain.DomainObject; @@ -179,9 +181,12 @@ public NotificationSettingsService(NotificationSettingRepository notificationSet public boolean checkIfNotificationIsAllowedInCommunicationChannelBySettingsForGivenUser(Notification notification, User user, NotificationSettingsCommunicationChannel communicationChannel) { Set users = filterUsersByNotificationIsAllowedInCommunicationChannelBySettings(notification, Set.of(user), communicationChannel); + log.info("CPC - 09 - {}", users.size()); return !users.isEmpty(); } + private static final Logger log = LoggerFactory.getLogger(NotificationSettingsService.class); + /** * Filters the given user array based on if the notification (i.e. its type based on title) is allowed by the respective notification settings * @@ -198,6 +203,7 @@ public Set filterUsersByNotificationIsAllowedInCommunicationChannelBySetti .findAllNotificationSettingsForRecipientsWithId(users.stream().map(DomainObject::getId).toList()); Set notificationSettings = new HashSet<>(decidedNotificationSettings); + log.info("CPC - 08 - {}, {}", type, decidedNotificationSettings); return users.stream().filter(user -> { // for those notification types that are not explicitly set by the user, we use the default settings Set decidedIds = decidedNotificationSettings.stream().filter(notificationSetting -> notificationSetting.getUser().equals(user)) From 6eaf55dcf2ad4e11f0c7357e6f22686214b78d68 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 21:12:03 +0200 Subject: [PATCH 73/95] enable CPC notification email --- .../notifications/NotificationSettingsService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java index f18744d388f3..e8565cf90e05 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java @@ -155,11 +155,11 @@ public class NotificationSettingsService { // More information on supported notification types can be found here: https://ls1intum.github.io/Artemis/user/notifications/ // Please adapt the above docs if you change the supported notification types private static final Set NOTIFICATION_TYPES_WITH_INSTANT_NOTIFICATION_SUPPORT = Set.of(EXERCISE_RELEASED, EXERCISE_PRACTICE, ATTACHMENT_CHANGE, - NEW_ANNOUNCEMENT_POST, FILE_SUBMISSION_SUCCESSFUL, EXERCISE_SUBMISSION_ASSESSED, DUPLICATE_TEST_CASE, NEW_PLAGIARISM_CASE_STUDENT, PLAGIARISM_CASE_VERDICT_STUDENT, - TUTORIAL_GROUP_REGISTRATION_STUDENT, TUTORIAL_GROUP_REGISTRATION_TUTOR, TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR, TUTORIAL_GROUP_DEREGISTRATION_STUDENT, - TUTORIAL_GROUP_DEREGISTRATION_TUTOR, TUTORIAL_GROUP_DELETED, TUTORIAL_GROUP_UPDATED, TUTORIAL_GROUP_ASSIGNED, TUTORIAL_GROUP_UNASSIGNED, NEW_EXERCISE_POST, - NEW_LECTURE_POST, NEW_REPLY_FOR_LECTURE_POST, NEW_COURSE_POST, NEW_REPLY_FOR_COURSE_POST, NEW_REPLY_FOR_EXERCISE_POST, QUIZ_EXERCISE_STARTED, DATA_EXPORT_CREATED, - DATA_EXPORT_FAILED, CONVERSATION_NEW_MESSAGE, CONVERSATION_NEW_REPLY_MESSAGE); + NEW_ANNOUNCEMENT_POST, FILE_SUBMISSION_SUCCESSFUL, EXERCISE_SUBMISSION_ASSESSED, DUPLICATE_TEST_CASE, NEW_PLAGIARISM_CASE_STUDENT, NEW_CPC_PLAGIARISM_CASE_STUDENT, + PLAGIARISM_CASE_VERDICT_STUDENT, TUTORIAL_GROUP_REGISTRATION_STUDENT, TUTORIAL_GROUP_REGISTRATION_TUTOR, TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR, + TUTORIAL_GROUP_DEREGISTRATION_STUDENT, TUTORIAL_GROUP_DEREGISTRATION_TUTOR, TUTORIAL_GROUP_DELETED, TUTORIAL_GROUP_UPDATED, TUTORIAL_GROUP_ASSIGNED, + TUTORIAL_GROUP_UNASSIGNED, NEW_EXERCISE_POST, NEW_LECTURE_POST, NEW_REPLY_FOR_LECTURE_POST, NEW_COURSE_POST, NEW_REPLY_FOR_COURSE_POST, NEW_REPLY_FOR_EXERCISE_POST, + QUIZ_EXERCISE_STARTED, DATA_EXPORT_CREATED, DATA_EXPORT_FAILED, CONVERSATION_NEW_MESSAGE, CONVERSATION_NEW_REPLY_MESSAGE); // More information on supported notification types can be found here: https://ls1intum.github.io/Artemis/user/notifications/ // Please adapt the above docs if you change the supported notification types From d9c8ac86922208de4c0ec2c03afddb3894329481 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 22:08:35 +0200 Subject: [PATCH 74/95] fix similarity threshold --- .../plagiarism/PlagiarismDetectionConfig.java | 6 +++--- .../PlagiarismDetectionConfigHelper.java | 2 +- .../artemis/web/rest/ModelingExerciseResource.java | 2 +- .../ProgrammingExercisePlagiarismResource.java | 4 ++-- .../artemis/web/rest/TextExerciseResource.java | 2 +- .../changelog/20230930160925_changelog.xml | 2 +- src/main/webapp/app/entities/exercise.model.ts | 2 +- .../exercise-update-plagiarism.component.html | 5 ++--- .../exercise-update-plagiarism.component.ts | 14 ++------------ .../PlagiarismDetectionConfigHelperTest.java | 2 +- 10 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index e539eb64a064..7cc7fa45c2f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -29,7 +29,7 @@ public class PlagiarismDetectionConfig extends DomainObject { private boolean continuousPlagiarismControlPostDueDateChecksEnabled = false; @Column(name = "similarity_threshold") - private float similarityThreshold; + private int similarityThreshold; @Column(name = "minimum_score") private int minimumScore; @@ -65,7 +65,7 @@ public int getMinimumSize() { return minimumSize; } - public void setSimilarityThreshold(float similarityThreshold) { + public void setSimilarityThreshold(int similarityThreshold) { this.similarityThreshold = similarityThreshold; } @@ -86,7 +86,7 @@ public static PlagiarismDetectionConfig createDefault() { var config = new PlagiarismDetectionConfig(); config.setContinuousPlagiarismControlEnabled(false); config.setContinuousPlagiarismControlPostDueDateChecksEnabled(false); - config.setSimilarityThreshold(0.9f); + config.setSimilarityThreshold(90); config.setMinimumScore(0); config.setMinimumSize(50); return config; diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index 2536b1b218d7..123012319bd5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -44,7 +44,7 @@ public static void createAndSaveDefaultIfNull(T exercise, J * @param minimumScore similarityThreshold to set for the given exercise * @param minimumSize similarityThreshold to set for the given exercise */ - public static void updateWithTemporaryParameters(Exercise exercise, float similarityThreshold, int minimumScore, int minimumSize) { + public static void updateWithTemporaryParameters(Exercise exercise, int similarityThreshold, int minimumScore, int minimumSize) { var config = new PlagiarismDetectionConfig(); config.setSimilarityThreshold(similarityThreshold); config.setMinimumScore(minimumScore); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 1290a31801e2..8e156dcb1c7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -393,7 +393,7 @@ public ResponseEntity getPlagiarismResult(@PathVariabl @GetMapping("modeling-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastInstructor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) { var modelingExercise = modelingExerciseRepository.findByIdWithStudentParticipationsSubmissionsResultsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 4f4e01ae11c6..fa406374c777 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -92,7 +92,7 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping(CHECK_PLAGIARISM) @EnforceAtLeastEditor @FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks }) - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); @@ -125,7 +125,7 @@ public ResponseEntity checkPlagiarism(@PathVariable long e @GetMapping(value = CHECK_PLAGIARISM_JPLAG_REPORT) @EnforceAtLeastEditor @FeatureToggle(Feature.ProgrammingExercises) - public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws IOException { log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 9e420924f93b..4266c85fa75a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -501,7 +501,7 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping("text-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastEditor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws ExitException { TextExercise textExercise = textExerciseRepository.findByIdWithStudentParticipationsAndSubmissionsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, textExercise, null); diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index 7d6c57eddc56..dff7aa190e44 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -11,7 +11,7 @@ - + diff --git a/src/main/webapp/app/entities/exercise.model.ts b/src/main/webapp/app/entities/exercise.model.ts index c1a74ae1623c..432631d76a97 100644 --- a/src/main/webapp/app/entities/exercise.model.ts +++ b/src/main/webapp/app/entities/exercise.model.ts @@ -100,7 +100,7 @@ export abstract class Exercise implements BaseEntity { public plagiarismDetectionConfig?: PlagiarismDetectionConfig = { continuousPlagiarismControlEnabled: false, continuousPlagiarismControlPostDueDateChecksEnabled: true, - similarityThreshold: 0.9, + similarityThreshold: 90, minimumSize: 50, minimumScore: 0, }; // default value diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html index 1e2b86b2692f..e89266cfe6c2 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html @@ -50,9 +50,8 @@ step="5" id="plagiarism-similarity-threshold" name="plagiarismChecksSimilarityThresholdPercentage" - #element.plagiarismChecksSimilarityThresholdPercentage="ngModel" - [(ngModel)]="this.plagiarismChecksSimilarityThresholdPercentage" - (ngModelChange)="updateSimilarityThreshold()" + #exercise.plagiarismDetectionConfig!.similarityThreshol="ngModel" + [(ngModel)]="exercise.plagiarismDetectionConfig!.similarityThreshold" />
    diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts index 0a82d1d11c4c..41b6a4576361 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; @@ -6,17 +6,11 @@ import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; selector: 'jhi-exercise-update-plagiarism', templateUrl: './exercise-update-plagiarism.component.html', }) -export class ExerciseUpdatePlagiarismComponent implements OnInit { +export class ExerciseUpdatePlagiarismComponent { @Input() exercise: Exercise; faQuestionCircle = faQuestionCircle; - plagiarismChecksSimilarityThresholdPercentage: number; - - ngOnInit(): void { - this.plagiarismChecksSimilarityThresholdPercentage = this.exercise!.plagiarismDetectionConfig!.similarityThreshold! * 100; - } - /** * Return the translation identifier of the minimum size tooltip for the current exercise type. */ @@ -33,8 +27,4 @@ export class ExerciseUpdatePlagiarismComponent implements OnInit { } } } - - updateSimilarityThreshold() { - this.exercise.plagiarismDetectionConfig!.similarityThreshold = this.plagiarismChecksSimilarityThresholdPercentage / 100; - } } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java index 965bbf4e7b54..d772dea5a69d 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -55,7 +55,7 @@ void shouldReplaceConfigWithGivenValues() { exercise.setPlagiarismDetectionConfig(config); // when - PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(exercise, 99.0f, 98, 97); + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(exercise, 99, 98, 97); // then assertThat(exercise.getPlagiarismDetectionConfig()).isNotSameAs(config); From 6a5aeb9394ff5dbe8aee456a910efef53133e781 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 22:09:49 +0200 Subject: [PATCH 75/95] fix similarity threshold --- .../plagiarism/PlagiarismDetectionConfig.java | 6 +++--- .../PlagiarismDetectionConfigHelper.java | 2 +- .../artemis/web/rest/ModelingExerciseResource.java | 2 +- .../ProgrammingExercisePlagiarismResource.java | 4 ++-- .../artemis/web/rest/TextExerciseResource.java | 2 +- .../changelog/20230930160925_changelog.xml | 2 +- src/main/webapp/app/entities/exercise.model.ts | 2 +- .../exercise-update-plagiarism.component.html | 5 ++--- .../exercise-update-plagiarism.component.ts | 14 ++------------ .../PlagiarismDetectionConfigHelperTest.java | 2 +- 10 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java index e539eb64a064..7cc7fa45c2f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/plagiarism/PlagiarismDetectionConfig.java @@ -29,7 +29,7 @@ public class PlagiarismDetectionConfig extends DomainObject { private boolean continuousPlagiarismControlPostDueDateChecksEnabled = false; @Column(name = "similarity_threshold") - private float similarityThreshold; + private int similarityThreshold; @Column(name = "minimum_score") private int minimumScore; @@ -65,7 +65,7 @@ public int getMinimumSize() { return minimumSize; } - public void setSimilarityThreshold(float similarityThreshold) { + public void setSimilarityThreshold(int similarityThreshold) { this.similarityThreshold = similarityThreshold; } @@ -86,7 +86,7 @@ public static PlagiarismDetectionConfig createDefault() { var config = new PlagiarismDetectionConfig(); config.setContinuousPlagiarismControlEnabled(false); config.setContinuousPlagiarismControlPostDueDateChecksEnabled(false); - config.setSimilarityThreshold(0.9f); + config.setSimilarityThreshold(90); config.setMinimumScore(0); config.setMinimumSize(50); return config; diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index 2536b1b218d7..123012319bd5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -44,7 +44,7 @@ public static void createAndSaveDefaultIfNull(T exercise, J * @param minimumScore similarityThreshold to set for the given exercise * @param minimumSize similarityThreshold to set for the given exercise */ - public static void updateWithTemporaryParameters(Exercise exercise, float similarityThreshold, int minimumScore, int minimumSize) { + public static void updateWithTemporaryParameters(Exercise exercise, int similarityThreshold, int minimumScore, int minimumSize) { var config = new PlagiarismDetectionConfig(); config.setSimilarityThreshold(similarityThreshold); config.setMinimumScore(minimumScore); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 1290a31801e2..8e156dcb1c7b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -393,7 +393,7 @@ public ResponseEntity getPlagiarismResult(@PathVariabl @GetMapping("modeling-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastInstructor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) { var modelingExercise = modelingExerciseRepository.findByIdWithStudentParticipationsSubmissionsResultsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, modelingExercise, null); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java index 4f4e01ae11c6..fa406374c777 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExercisePlagiarismResource.java @@ -92,7 +92,7 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping(CHECK_PLAGIARISM) @EnforceAtLeastEditor @FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks }) - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws ExitException, IOException { ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, programmingExercise, null); @@ -125,7 +125,7 @@ public ResponseEntity checkPlagiarism(@PathVariable long e @GetMapping(value = CHECK_PLAGIARISM_JPLAG_REPORT) @EnforceAtLeastEditor @FeatureToggle(Feature.ProgrammingExercises) - public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarismWithJPlagReport(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws IOException { log.debug("REST request to check plagiarism for ProgrammingExercise with id: {}", exerciseId); ProgrammingExercise programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 9e420924f93b..4266c85fa75a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -501,7 +501,7 @@ public ResponseEntity getPlagiarismResult(@PathVariable lo @GetMapping("text-exercises/{exerciseId}/check-plagiarism") @FeatureToggle(Feature.PlagiarismChecks) @EnforceAtLeastEditor - public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam float similarityThreshold, @RequestParam int minimumScore, + public ResponseEntity checkPlagiarism(@PathVariable long exerciseId, @RequestParam int similarityThreshold, @RequestParam int minimumScore, @RequestParam int minimumSize) throws ExitException { TextExercise textExercise = textExerciseRepository.findByIdWithStudentParticipationsAndSubmissionsElseThrow(exerciseId); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.EDITOR, textExercise, null); diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index 7d6c57eddc56..dff7aa190e44 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -11,7 +11,7 @@ - + diff --git a/src/main/webapp/app/entities/exercise.model.ts b/src/main/webapp/app/entities/exercise.model.ts index c1a74ae1623c..432631d76a97 100644 --- a/src/main/webapp/app/entities/exercise.model.ts +++ b/src/main/webapp/app/entities/exercise.model.ts @@ -100,7 +100,7 @@ export abstract class Exercise implements BaseEntity { public plagiarismDetectionConfig?: PlagiarismDetectionConfig = { continuousPlagiarismControlEnabled: false, continuousPlagiarismControlPostDueDateChecksEnabled: true, - similarityThreshold: 0.9, + similarityThreshold: 90, minimumSize: 50, minimumScore: 0, }; // default value diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html index 1e2b86b2692f..e89266cfe6c2 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html @@ -50,9 +50,8 @@ step="5" id="plagiarism-similarity-threshold" name="plagiarismChecksSimilarityThresholdPercentage" - #element.plagiarismChecksSimilarityThresholdPercentage="ngModel" - [(ngModel)]="this.plagiarismChecksSimilarityThresholdPercentage" - (ngModelChange)="updateSimilarityThreshold()" + #exercise.plagiarismDetectionConfig!.similarityThreshol="ngModel" + [(ngModel)]="exercise.plagiarismDetectionConfig!.similarityThreshold" />
    diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts index 0a82d1d11c4c..41b6a4576361 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input } from '@angular/core'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; @@ -6,17 +6,11 @@ import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; selector: 'jhi-exercise-update-plagiarism', templateUrl: './exercise-update-plagiarism.component.html', }) -export class ExerciseUpdatePlagiarismComponent implements OnInit { +export class ExerciseUpdatePlagiarismComponent { @Input() exercise: Exercise; faQuestionCircle = faQuestionCircle; - plagiarismChecksSimilarityThresholdPercentage: number; - - ngOnInit(): void { - this.plagiarismChecksSimilarityThresholdPercentage = this.exercise!.plagiarismDetectionConfig!.similarityThreshold! * 100; - } - /** * Return the translation identifier of the minimum size tooltip for the current exercise type. */ @@ -33,8 +27,4 @@ export class ExerciseUpdatePlagiarismComponent implements OnInit { } } } - - updateSimilarityThreshold() { - this.exercise.plagiarismDetectionConfig!.similarityThreshold = this.plagiarismChecksSimilarityThresholdPercentage / 100; - } } diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java index 965bbf4e7b54..d772dea5a69d 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java @@ -55,7 +55,7 @@ void shouldReplaceConfigWithGivenValues() { exercise.setPlagiarismDetectionConfig(config); // when - PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(exercise, 99.0f, 98, 97); + PlagiarismDetectionConfigHelper.updateWithTemporaryParameters(exercise, 99, 98, 97); // then assertThat(exercise.getPlagiarismDetectionConfig()).isNotSameAs(config); From 89b4059d15dc5e4b476a92a6e68567ab4bdbff7a Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 22:11:46 +0200 Subject: [PATCH 76/95] enable emails for cpc --- .../notifications/NotificationSettingsService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java b/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java index 0bf34ed302c4..3bf9749a4802 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/notifications/NotificationSettingsService.java @@ -153,11 +153,11 @@ public class NotificationSettingsService { // More information on supported notification types can be found here: https://docs.artemis.cit.tum.de/user/notifications/ // Please adapt the above docs if you change the supported notification types private static final Set NOTIFICATION_TYPES_WITH_INSTANT_NOTIFICATION_SUPPORT = Set.of(EXERCISE_RELEASED, EXERCISE_PRACTICE, ATTACHMENT_CHANGE, - NEW_ANNOUNCEMENT_POST, FILE_SUBMISSION_SUCCESSFUL, EXERCISE_SUBMISSION_ASSESSED, DUPLICATE_TEST_CASE, NEW_PLAGIARISM_CASE_STUDENT, PLAGIARISM_CASE_VERDICT_STUDENT, - TUTORIAL_GROUP_REGISTRATION_STUDENT, TUTORIAL_GROUP_REGISTRATION_TUTOR, TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR, TUTORIAL_GROUP_DEREGISTRATION_STUDENT, - TUTORIAL_GROUP_DEREGISTRATION_TUTOR, TUTORIAL_GROUP_DELETED, TUTORIAL_GROUP_UPDATED, TUTORIAL_GROUP_ASSIGNED, TUTORIAL_GROUP_UNASSIGNED, NEW_EXERCISE_POST, - NEW_LECTURE_POST, NEW_REPLY_FOR_LECTURE_POST, NEW_COURSE_POST, NEW_REPLY_FOR_COURSE_POST, NEW_REPLY_FOR_EXERCISE_POST, QUIZ_EXERCISE_STARTED, DATA_EXPORT_CREATED, - DATA_EXPORT_FAILED, CONVERSATION_NEW_MESSAGE, CONVERSATION_NEW_REPLY_MESSAGE); + NEW_ANNOUNCEMENT_POST, FILE_SUBMISSION_SUCCESSFUL, EXERCISE_SUBMISSION_ASSESSED, DUPLICATE_TEST_CASE, NEW_PLAGIARISM_CASE_STUDENT, NEW_CPC_PLAGIARISM_CASE_STUDENT, + PLAGIARISM_CASE_VERDICT_STUDENT, TUTORIAL_GROUP_REGISTRATION_STUDENT, TUTORIAL_GROUP_REGISTRATION_TUTOR, TUTORIAL_GROUP_MULTIPLE_REGISTRATION_TUTOR, + TUTORIAL_GROUP_DEREGISTRATION_STUDENT, TUTORIAL_GROUP_DEREGISTRATION_TUTOR, TUTORIAL_GROUP_DELETED, TUTORIAL_GROUP_UPDATED, TUTORIAL_GROUP_ASSIGNED, + TUTORIAL_GROUP_UNASSIGNED, NEW_EXERCISE_POST, NEW_LECTURE_POST, NEW_REPLY_FOR_LECTURE_POST, NEW_COURSE_POST, NEW_REPLY_FOR_COURSE_POST, NEW_REPLY_FOR_EXERCISE_POST, + QUIZ_EXERCISE_STARTED, DATA_EXPORT_CREATED, DATA_EXPORT_FAILED, CONVERSATION_NEW_MESSAGE, CONVERSATION_NEW_REPLY_MESSAGE); // More information on supported notification types can be found here: https://docs.artemis.cit.tum.de/user/notifications/ // Please adapt the above docs if you change the supported notification types From e9a7e915a8b151235731fba79b7ed5462337650a Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 22:17:11 +0200 Subject: [PATCH 77/95] add missing messages --- src/main/resources/i18n/messages.properties | 1 + src/main/resources/i18n/messages_de.properties | 1 + src/main/resources/i18n/messages_en.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/resources/i18n/messages.properties b/src/main/resources/i18n/messages.properties index e94d28de11ff..1b148cca8b2b 100644 --- a/src/main/resources/i18n/messages.properties +++ b/src/main/resources/i18n/messages.properties @@ -139,6 +139,7 @@ artemisApp.groupNotification.title.newAnnouncementPost = New announcement artemisApp.singleUserNotification.title.exerciseSubmissionAssessed = Exercise Submission Assessed artemisApp.singleUserNotification.title.fileSubmissionSuccessful = File submission successful artemisApp.singleUserNotification.title.newPlagiarismCaseStudent = New plagiarism case +artemisApp.singleUserNotification.title.newPlagiarismCaseStudentSignificantSimilarity = New Significant Similarity artemisApp.singleUserNotification.title.plagiarismCaseVerdictStudent = Verdict for your plagiarism case artemisApp.singleUserNotification.title.tutorialGroupRegistrationStudent = You have been registered to a tutorial group artemisApp.singleUserNotification.title.tutorialGroupDeregistrationStudent = You have been deregistered from a tutorial group diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties index 42b8026f01c8..f1fa989cf5f7 100644 --- a/src/main/resources/i18n/messages_de.properties +++ b/src/main/resources/i18n/messages_de.properties @@ -138,6 +138,7 @@ artemisApp.groupNotification.title.newAnnouncementPost = Neue Ankündigung artemisApp.singleUserNotification.title.exerciseSubmissionAssessed = Übungsabgabe bewertet artemisApp.singleUserNotification.title.fileSubmissionSuccessful = Dateiabgabe erfolgreich artemisApp.singleUserNotification.title.newPlagiarismCaseStudent = Neuer Plagiatsfall +artemisApp.singleUserNotification.title.newPlagiarismCaseStudentSignificantSimilarity = Neue signifikante bereinstimmung artemisApp.singleUserNotification.title.plagiarismCaseVerdictStudent = Urteil zu deinem Plagiatsfall artemisApp.singleUserNotification.title.tutorialGroupRegistrationStudent = Du wurdest für eine Übungsgruppe registriert artemisApp.singleUserNotification.title.tutorialGroupDeregistrationStudent = Du wurdest von einer Übungsgruppe abgemeldet diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties index c61598d3d91c..8895514a5364 100644 --- a/src/main/resources/i18n/messages_en.properties +++ b/src/main/resources/i18n/messages_en.properties @@ -139,6 +139,7 @@ artemisApp.groupNotification.title.newAnnouncementPost = New announcement artemisApp.singleUserNotification.title.exerciseSubmissionAssessed = Exercise Submission Assessed artemisApp.singleUserNotification.title.fileSubmissionSuccessful = File submission successful artemisApp.singleUserNotification.title.newPlagiarismCaseStudent = New plagiarism case +artemisApp.singleUserNotification.title.newPlagiarismCaseStudentSignificantSimilarity = New Significant Similarity artemisApp.singleUserNotification.title.plagiarismCaseVerdictStudent = Verdict for your plagiarism case artemisApp.singleUserNotification.title.tutorialGroupRegistrationStudent = You have been registered to a tutorial group artemisApp.singleUserNotification.title.tutorialGroupDeregistrationStudent = You have been deregistered from a tutorial group From 72ed6a13f4544db2b8c95d83498f6797d0a3e368 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Tue, 17 Oct 2023 22:17:46 +0200 Subject: [PATCH 78/95] cpc every 90s --- .../service/plagiarism/ContinuousPlagiarismControlService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 12af087f4fc4..fdc39a538024 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -70,7 +70,7 @@ public ContinuousPlagiarismControlService(ExerciseRepository exerciseRepository, /** * Daily triggers plagiarism checks as a part of continuous plagiarism control. */ - @Scheduled(initialDelay = 30_000, fixedDelay = 60_000) + @Scheduled(initialDelay = 30_000, fixedDelay = 90_000) public void executeChecks() { log.info("Starting continuous plagiarism control..."); From b28a81a62e52d73abec144887511048d298ab407 Mon Sep 17 00:00:00 2001 From: Jakub Riegel Date: Wed, 18 Oct 2023 08:25:33 +0200 Subject: [PATCH 79/95] Development: Add student code of conduct and apso as a static assets (#7390) --- docs/dev/setup.rst | 2 ++ ...usPlagiarismControlPostContentProvider.java | 2 +- src/main/resources/public/documents/apso.pdf | Bin 0 -> 328063 bytes .../documents/student-code-of-conduct.pdf | Bin 0 -> 28123 bytes ...sm-case-instructor-detail-view.component.ts | 4 ++-- src/main/webapp/i18n/de/plagiarism.json | 2 +- src/main/webapp/i18n/en/plagiarism.json | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/public/documents/apso.pdf create mode 100644 src/main/resources/public/documents/student-code-of-conduct.pdf diff --git a/docs/dev/setup.rst b/docs/dev/setup.rst index 61ef3cd621f8..d747e690587c 100644 --- a/docs/dev/setup.rst +++ b/docs/dev/setup.rst @@ -568,6 +568,8 @@ instead of the TUM defaults: * The logo next to the “Artemis” heading on the navbar → ``${artemisRunDirectory}/public/images/logo.png`` * The favicon → ``${artemisRunDirectory}/logo/favicon.svg`` * The contact email address in the ``application-{dev,prod}.yml`` configuration file under the key ``info.contact`` +* The Student Code of Conduct -> ``${artemisRunDirectory}/public/documents/student-code-of-conduct.pdf`` +* The General Examination and Study Regulations -> ``${artemisRunDirectory}/public/documents/apso.pdf`` ------------------------------------------------------------------------------------------------------------------------ diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java index e0ee08849341..606444ee02c6 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlPostContentProvider.java @@ -10,7 +10,7 @@ public class ContinuousPlagiarismControlPostContentProvider { private static final String POST_CONTENT_DE = "Sehr geehrter %s,

    nach einer automatisierten Auswertung Ihrer letzten Einsendung für die Übung \"%s\" in der Lehrveranstaltung \"%s\" haben wir eine signifikante Übereinstimmung Ihrer Einsendung mit der Einsendung von mindestens einem anderen Studenten festgestellt. Dies ist möglicherweise ein Verstoß gegen die Student Code of Conduct der School of Computation, Information and Technology, der Sie zugestimmt haben. Sie können diese Warnmeldung beheben, indem Sie eine neue Version Ihrer Lösung vor dem Abgabetermin der Übung einreichen"; - private static final String COC_LINK = "https://www.in.tum.de/fileadmin/w00bws/in/2.Fur_Studierende/Pruefungen_und_Formalitaeten/1.Gute_studentische_Praxis/englisch/leitfaden-en_2016Jun22.pdf"; + private static final String COC_LINK = "/content/documents/student-code-of-conduct.pdf"; private ContinuousPlagiarismControlPostContentProvider() { } diff --git a/src/main/resources/public/documents/apso.pdf b/src/main/resources/public/documents/apso.pdf new file mode 100644 index 0000000000000000000000000000000000000000..459d4902be4a444bfa17727cda1f721eb530df03 GIT binary patch literal 328063 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%0A`dSdbA16o4dXmZ1lAD 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 z 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 G`TqqZYV%kC literal 0 HcmV?d00001 diff --git a/src/main/resources/public/documents/student-code-of-conduct.pdf b/src/main/resources/public/documents/student-code-of-conduct.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1c09d49126c6006b482f4174ff5f2e3f47ab9c65 GIT binary patch literal 28123 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 student }},

    Nach einer sorgfältigen Durchsicht Deiner finalen Abgabe zur Übung \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\" sind wir zu dem Schluss gekommen, dass Du ein Plagiat begangen hast. Dies ist ein Verstoß gegen die     Grundsätze guter studentischer Praxis die School of Computation, Information and Technology, denen Du zugestimmt hast. Die Allgemeine Studien- und Prüfungsordnung regelt in §22.1 die Konsequenzen für solche Fälle. Dies bedeutet, dass die betreffende Prüfung potentiell mit \"5,0 (U)\" bewertet werden kann, was schwerwiegende Folgen für dein weiteres Studium haben kann.

    Du hast eine Woche Zeit (bis {{ dueDate }}), um eine Stellungnahme zu diesem Fall direkt in Artemis abzugeben (nicht per E-Mail).

    Mit freundlichen Grüßen,
    {{ instructor }}", + "body": "Liebe(r) {{ student }},

    Nach einer sorgfältigen Durchsicht Deiner finalen Abgabe zur Übung \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\" sind wir zu dem Schluss gekommen, dass Du ein Plagiat begangen hast. Dies ist ein Verstoß gegen die Grundsätze guter studentischer Praxis die School of Computation, Information and Technology, denen Du zugestimmt hast. Die Allgemeine Studien- und Prüfungsordnung regelt in §22.1 die Konsequenzen für solche Fälle. Dies bedeutet, dass die betreffende Prüfung potentiell mit \"5,0 (U)\" bewertet werden kann, was schwerwiegende Folgen für dein weiteres Studium haben kann.

    Du hast eine Woche Zeit (bis {{ dueDate }}), um eine Stellungnahme zu diesem Fall direkt in Artemis abzugeben (nicht per E-Mail).

    Mit freundlichen Grüßen,
    {{ instructor }}", "inCourse": "im Kurs", "inExam": "in der Prüfung" }, diff --git a/src/main/webapp/i18n/en/plagiarism.json b/src/main/webapp/i18n/en/plagiarism.json index 22b3cd99832b..bec7934044e7 100644 --- a/src/main/webapp/i18n/en/plagiarism.json +++ b/src/main/webapp/i18n/en/plagiarism.json @@ -67,7 +67,7 @@ "resolvedPlagiarismCase": "Resolved Plagiarism Case", "notification": { "title": "Plagiarism Case: {{ exercise }}", - "body": "Dear {{ student }},

    After a meticulous review of your final submission for the exercise \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\", we have concluded that you have committed plagiarism. This is a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon. The Allgemeine Studien- und Prüfungsordnung (General Examination and Study Regulations) regulates consequences for such cases in §22.1. This means that the exam in question can potentially be graded \"5.0 (U)\", which can have serious consequences for your further studies.

    You have one week (until {{ dueDate }}) to provide a statement about this particular case directly in Artemis (not via E-Mail).

    Best regards,
    {{ instructor }}", + "body": "Dear {{ student }},

    After a meticulous review of your final submission for the exercise \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\", we have concluded that you have committed plagiarism. This is a violation of the Student Code of Conduct of the School of Computation, Information and Technology that you have agreed upon. The Allgemeine Studien- und Prüfungsordnung (General Examination and Study Regulations) regulates consequences for such cases in §22.1. This means that the exam in question can potentially be graded \"5.0 (U)\", which can have serious consequences for your further studies.

    You have one week (until {{ dueDate }}) to provide a statement about this particular case directly in Artemis (not via E-Mail).

    Best regards,
    {{ instructor }}", "inCourse": "in the course", "inExam": "in the exam" }, From ebf098382e99b1db4277ea6778e0e2d5f59f7357 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 18 Oct 2023 17:27:32 +0200 Subject: [PATCH 80/95] fix migration id and order --- .../config/liquibase/changelog/20230930160925_changelog.xml | 2 +- src/main/resources/config/liquibase/master.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index dff7aa190e44..8361c4a87ab3 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 1b16311e7b6b..19eacdc95d60 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -63,8 +63,8 @@ - + From 59ef21b9a4a9ef9589cea716f39046446170844a Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 18 Oct 2023 17:27:32 +0200 Subject: [PATCH 81/95] fix migration id and order --- .../config/liquibase/changelog/20230930160925_changelog.xml | 2 +- src/main/resources/config/liquibase/master.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index dff7aa190e44..8361c4a87ab3 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 59db50163720..31d7e8065af5 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -63,9 +63,9 @@ - + From 699ade88a9f7336e876d9fae4dc8b347f2a5825f Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 18 Oct 2023 18:15:29 +0200 Subject: [PATCH 82/95] fix query formatting --- .../repository/ModelingExerciseRepository.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java index b77ed7dfa0b3..be10bbfdbc06 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ModelingExerciseRepository.java @@ -39,15 +39,15 @@ public interface ModelingExerciseRepository extends JpaRepository findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigById(@Param("exerciseId") Long exerciseId); @Query(""" - SELECT modelingExercise\s - FROM ModelingExercise modelingExercise\s - LEFT JOIN FETCH modelingExercise.exampleSubmissions exampleSubmissions\s - LEFT JOIN FETCH exampleSubmissions.submission submission\s - LEFT JOIN FETCH submission.results results\s - LEFT JOIN FETCH results.feedbacks\s - LEFT JOIN FETCH results.assessor\s - LEFT JOIN FETCH modelingExercise.teamAssignmentConfig\s - LEFT JOIN FETCH modelingExercise.plagiarismDetectionConfig\s + SELECT modelingExercise + FROM ModelingExercise modelingExercise + LEFT JOIN FETCH modelingExercise.exampleSubmissions exampleSubmissions + LEFT JOIN FETCH exampleSubmissions.submission submission + LEFT JOIN FETCH submission.results results + LEFT JOIN FETCH results.feedbacks + LEFT JOIN FETCH results.assessor + LEFT JOIN FETCH modelingExercise.teamAssignmentConfig + LEFT JOIN FETCH modelingExercise.plagiarismDetectionConfig WHERE modelingExercise.id = :#{#exerciseId} """) Optional findByIdWithExampleSubmissionsAndResultsAndPlagiarismDetectionConfig(@Param("exerciseId") Long exerciseId); From e3c9f887cee6834e64f02e924f1f910fe9afcdce Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 18 Oct 2023 18:28:10 +0200 Subject: [PATCH 83/95] fix types --- .../tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java | 4 ++-- .../tum/in/www1/artemis/text/TextExerciseIntegrationTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java index 758417e6dd60..b3fc3f3a4d37 100644 --- a/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java +++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismUtilService.java @@ -117,11 +117,11 @@ public Course addOneFinishedModelingExerciseAndSimilarSubmissionsToTheCourse(Str @NotNull public LinkedMultiValueMap getDefaultPlagiarismOptions() { - return getPlagiarismOptions(50D, 0, 0); + return getPlagiarismOptions(50, 0, 0); } @NotNull - public LinkedMultiValueMap getPlagiarismOptions(double similarityThreshold, int minimumScore, int minimumSize) { + public LinkedMultiValueMap getPlagiarismOptions(int similarityThreshold, int minimumScore, int minimumSize) { // Use default options for plagiarism detection var params = new LinkedMultiValueMap(); params.add("similarityThreshold", String.valueOf(similarityThreshold)); diff --git a/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java index f7db1a2b9e44..772497c11a21 100644 --- a/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/text/TextExerciseIntegrationTest.java @@ -1094,7 +1094,7 @@ void testCheckPlagiarismIdenticalShortTexts() throws Exception { textExerciseUtilService.createSubmissionForTextExercise(textExercise, userUtilService.getUserByLogin(TEST_PREFIX + "student2"), shortText); var path = "/api/text-exercises/" + textExercise.getId() + "/check-plagiarism"; - request.get(path, HttpStatus.BAD_REQUEST, TextPlagiarismResult.class, plagiarismUtilService.getPlagiarismOptions(50D, 0, 5)); + request.get(path, HttpStatus.BAD_REQUEST, TextPlagiarismResult.class, plagiarismUtilService.getPlagiarismOptions(50, 0, 5)); } @Test From 05a5f6e3ad94666e58788b28208cf38e560d0cfc Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 18 Oct 2023 18:55:41 +0200 Subject: [PATCH 84/95] update javadoc --- .../de/tum/in/www1/artemis/repository/ExerciseRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java index 31d51a1bb352..3b5829d0b35c 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java @@ -470,7 +470,7 @@ default Set findAllExercisesWithCurrentOrUpcomingDueDate() { } /** - * Finds all exercises where the due date is today or in the future and continuos plagiarism control is enabled + * Finds all exercises where the due date is yesterday, today or in the future and continuous plagiarism control is enabled * (does not return exercises belonging to test courses). * * @return set of exercises From 0d5ff11d2030b0d8118a1d73e20e6b9732d3f019 Mon Sep 17 00:00:00 2001 From: Jakub Riegel Date: Wed, 18 Oct 2023 19:22:59 +0200 Subject: [PATCH 85/95] Update src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java Co-authored-by: Lucas Welscher --- .../in/www1/artemis/repository/ExerciseRepository.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java index 31d51a1bb352..89e652d1ee3e 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExerciseRepository.java @@ -240,10 +240,10 @@ List countActiveStudentsInExercisesWithReleaseDateBetw @Query(""" SELECT e FROM Exercise e - LEFT JOIN FETCH e.plagiarismDetectionConfig c - LEFT JOIN FETCH e.studentParticipations p - LEFT JOIN FETCH p.submissions s - LEFT JOIN FETCH s.results + LEFT JOIN FETCH e.plagiarismDetectionConfig c + LEFT JOIN FETCH e.studentParticipations p + LEFT JOIN FETCH p.submissions s + LEFT JOIN FETCH s.results WHERE e.dueDate >= :time AND c.continuousPlagiarismControlEnabled = TRUE """) From d54fe310a2a1bcb35e97287a4582b479f8054632 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Wed, 18 Oct 2023 20:34:21 +0200 Subject: [PATCH 86/95] update translations --- src/main/webapp/i18n/de/plagiarism.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index 90c164286761..d0c7435c49aa 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -47,7 +47,7 @@ "replyToAccusation": "Stellung zu dem Vorwurf nehmen", "replyToAccusationDueDateNotification": "Du kannst dich spätestens bis zum {{ dueDate }} zu dem Vorwurf äußern.", "continuousPlagiarismControl": "Kontinuierliche Plagiatskontrolle", - "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus. Detected are marked as plagiarism and students are gently notified about this fact.", + "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus. Aufgedeckte Fälle werden als Plagiat gekennzeichnet und die Studierenden werden darüber sanft informiert.", "continuousPlagiarismControlEnabled": "Aktiviere Kontinuierliche Plagiatskontrolle", "continuousPlagiarismControlPostDueDateChecksEnabled": "Führe die Überprüfung der Abgaben nach der Einreichungsfrist ein weiteres mal durch.", "cleanUp": { @@ -67,7 +67,7 @@ "resolvedPlagiarismCase": "Gelöster Plagiatsfall", "notification": { "title": "Plagiatsfall: {{ exercise }}", - "body": "Liebe(r) {{ student }},

    Nach einer sorgfältigen Durchsicht Deiner finalen Abgabe zur Übung \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\" sind wir zu dem Schluss gekommen, dass Du ein Plagiat begangen hast. Dies ist ein Verstoß gegen die Grundsätze guter studentischer Praxis die School of Computation, Information and Technology, denen Du zugestimmt hast. Die Allgemeine Studien- und Prüfungsordnung regelt in §22.1 die Konsequenzen für solche Fälle. Dies bedeutet, dass die betreffende Prüfung potentiell mit \"5,0 (U)\" bewertet werden kann, was schwerwiegende Folgen für dein weiteres Studium haben kann.

    Du hast eine Woche Zeit (bis {{ dueDate }}), um eine Stellungnahme zu diesem Fall direkt in Artemis abzugeben (nicht per E-Mail).

    Mit freundlichen Grüßen,
    {{ instructor }}", + "body": "Liebe(r) {{ student }},

    Nach einer sorgfältigen Durchsicht deiner finalen Abgabe zur Übung \"{{ exercise }}\" {{ inCourseOrExam }} \"{{ courseOrExam }}\" sind wir zu dem Schluss gekommen, dass du ein Plagiat begangen hast. Dies ist ein Verstoß gegen die Grundsätze guter studentischer Praxis die School of Computation, Information and Technology, denen Du zugestimmt hast. Die Allgemeine Studien- und Prüfungsordnung regelt in §22.1 die Konsequenzen für solche Fälle. Dies bedeutet, dass die betreffende Prüfung potentiell mit \"5,0 (U)\" bewertet werden kann, was schwerwiegende Folgen für dein weiteres Studium haben kann.

    Du hast eine Woche Zeit (bis {{ dueDate }}), um eine Stellungnahme zu diesem Fall direkt in Artemis abzugeben (nicht per E-Mail).

    Mit freundlichen Grüßen,
    {{ instructor }}", "inCourse": "im Kurs", "inExam": "in der Prüfung" }, From 03a93efccbd8a0e468a2794e6096a045065b9fe9 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Thu, 19 Oct 2023 22:47:41 +0200 Subject: [PATCH 87/95] silent email exceptions --- .../ContinuousPlagiarismControlService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index fdc39a538024..8897bd18e439 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -25,6 +25,7 @@ import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.in.www1.artemis.exception.ArtemisMailException; import de.tum.in.www1.artemis.repository.ExerciseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; @@ -127,8 +128,15 @@ private void createOrUpdatePlagiarismCases(PlagiarismComparison comparison) { plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB(), true)); log.info("CPC - 07 - {}", plagiarismCases.size()); - plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost) - .forEach(postService::createContinuousPlagiarismControlPlagiarismCasePost); + plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost).forEach(post -> { + try { + postService.createContinuousPlagiarismControlPlagiarismCasePost(post); + } + catch (ArtemisMailException e) { + // silent mail exception + log.error("Cannot send a cpc email: postId={}, plagiarismCaseId={}.", post.getId(), post.getPlagiarismCase().getId()); + } + }); } private static Post buildCpcPost(PlagiarismCase plagiarismCase) { From 053f1357ba1ea0f924026cbfa3c01c8d8baca49d Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 00:16:41 +0200 Subject: [PATCH 88/95] fix merge --- src/main/resources/config/liquibase/master.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 7e33f89ca308..31d7e8065af5 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -64,7 +64,6 @@ - From 118a9e7391e437f79d2d301f796fb5a50f5e0e45 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 00:26:43 +0200 Subject: [PATCH 89/95] Catch mail exceptions to so that notification for the second student will be delivered --- .../ContinuousPlagiarismControlService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index bbe235c5400a..205477c4748f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -25,6 +25,7 @@ import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismResult; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismStatus; import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismSubmissionElement; +import de.tum.in.www1.artemis.exception.ArtemisMailException; import de.tum.in.www1.artemis.repository.ExerciseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository; import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository; @@ -126,8 +127,15 @@ private void createOrUpdatePlagiarismCases(PlagiarismComparison comparison) { var plagiarismCases = Set.of(plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionA(), true), plagiarismCaseService.createOrAddToPlagiarismCaseForStudent(comparison, comparison.getSubmissionB(), true)); - plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost) - .forEach(postService::createContinuousPlagiarismControlPlagiarismCasePost); + plagiarismCases.stream().filter(plagiarismCase -> plagiarismCase.getPost() == null).map(ContinuousPlagiarismControlService::buildCpcPost).forEach(post -> { + try { + postService.createContinuousPlagiarismControlPlagiarismCasePost(post); + } + catch (ArtemisMailException e) { + // Catch mail exceptions to so that notification for the second student will be delivered + log.error("Cannot send a cpc email: postId={}, plagiarismCaseId={}.", post.getId(), post.getPlagiarismCase().getId()); + } + }); } private static Post buildCpcPost(PlagiarismCase plagiarismCase) { From 6a14d5f33c499225f6a1fad6dc3d2213d4ad1309 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 00:59:31 +0200 Subject: [PATCH 90/95] fix migration --- .../changelog/20230930160925_changelog.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index 8361c4a87ab3..7a1773deef93 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -4,17 +4,17 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + - - - - - + + + + + - + From 47ccceb30447b63df4652bc8321f852963a29bd5 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 01:13:45 +0200 Subject: [PATCH 91/95] fix migration --- .../changelog/20230930160925_changelog.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml index 8361c4a87ab3..7a1773deef93 100644 --- a/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml +++ b/src/main/resources/config/liquibase/changelog/20230930160925_changelog.xml @@ -4,17 +4,17 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + - - - - - + + + + + - + From 54c51c2c1b9c746eb3252a749264d3d41a80810c Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 19:13:25 +0200 Subject: [PATCH 92/95] improve text style --- src/main/webapp/i18n/de/plagiarism.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/de/plagiarism.json b/src/main/webapp/i18n/de/plagiarism.json index d0c7435c49aa..6fbf754c75ea 100644 --- a/src/main/webapp/i18n/de/plagiarism.json +++ b/src/main/webapp/i18n/de/plagiarism.json @@ -47,7 +47,7 @@ "replyToAccusation": "Stellung zu dem Vorwurf nehmen", "replyToAccusationDueDateNotification": "Du kannst dich spätestens bis zum {{ dueDate }} zu dem Vorwurf äußern.", "continuousPlagiarismControl": "Kontinuierliche Plagiatskontrolle", - "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus. Aufgedeckte Fälle werden als Plagiat gekennzeichnet und die Studierenden werden darüber sanft informiert.", + "continuousPlagiarismControlTooltip": "Die kontinuierliche Plagiatskontrolle löst jede Nacht automatisch eine Plagiatskontrolle aus. Aufgedeckte Fälle werden als Plagiat gekennzeichnet und die Studierenden werden darüber behutsam informiert.", "continuousPlagiarismControlEnabled": "Aktiviere Kontinuierliche Plagiatskontrolle", "continuousPlagiarismControlPostDueDateChecksEnabled": "Führe die Überprüfung der Abgaben nach der Einreichungsfrist ein weiteres mal durch.", "cleanUp": { From 5acba3900d139007d3fe1497015cd055ed682bf1 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 20:11:40 +0200 Subject: [PATCH 93/95] disable cpc config for exam mode --- .../modeling/manage/modeling-exercise-update.component.html | 2 +- .../manage/update/programming-exercise-update.component.html | 2 +- .../manage/text-exercise/text-exercise-update.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html index 26d41daabf0f..4289ddd61c0c 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html @@ -182,7 +182,7 @@

    - +
    diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html index 75f62d19685a..aa4b603ed44f 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html +++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.html @@ -78,7 +78,7 @@

    +
    diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html index fec47ddac0d4..5db862b3fe46 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html @@ -151,7 +151,7 @@

    - +
    From 4eee599537c35aef8966c5980c949b066e29a9d2 Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Fri, 20 Oct 2023 20:47:36 +0200 Subject: [PATCH 94/95] set plagiarism detection config for new exercises --- .../programming/ProgrammingExerciseImportBasicService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 90dde02b4459..1a996e1b201f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -12,6 +12,7 @@ import de.tum.in.www1.artemis.domain.hestia.CodeHint; import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseSolutionEntry; import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.submissionpolicy.SubmissionPolicy; import de.tum.in.www1.artemis.repository.*; import de.tum.in.www1.artemis.repository.hestia.ExerciseHintRepository; @@ -293,6 +294,9 @@ private void setupExerciseForImport(ProgrammingExercise newExercise) { if (newExercise.isTeamMode()) { newExercise.getTeamAssignmentConfig().setId(null); } + + var config = PlagiarismDetectionConfig.createDefault(); + newExercise.setPlagiarismDetectionConfig(config); } /** From 52e29291ffc34260a97760dcc937e4d6e1a458dd Mon Sep 17 00:00:00 2001 From: jakubriegel Date: Mon, 23 Oct 2023 20:29:25 +0200 Subject: [PATCH 95/95] don't add plagiarism checks config to exam exercises; fix importing programming exercises --- .../ContinuousPlagiarismControlService.java | 2 +- .../PlagiarismDetectionConfigHelper.java | 6 ++-- ...ProgrammingExerciseImportBasicService.java | 11 +++++-- .../web/rest/ModelingExerciseResource.java | 2 +- .../web/rest/ProgrammingExerciseResource.java | 2 +- .../web/rest/TextExerciseResource.java | 2 +- .../ProgrammingExerciseFactory.java | 1 + .../ProgrammingExerciseTestService.java | 3 ++ .../ProgrammingExerciseTestRepository.java | 1 + .../PlagiarismDetectionConfigHelperTest.java | 31 ++++++++++++++++--- 10 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java index 205477c4748f..b4702c2d09a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlService.java @@ -80,7 +80,7 @@ public void executeChecks() { log.info("Started continuous plagiarism control for exercise: exerciseId={}, type={}.", exercise.getId(), exercise.getExerciseType()); final long startTime = System.nanoTime(); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(exercise, exerciseRepository); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNullAndCourseExercise(exercise, exerciseRepository); try { var result = executeChecksForExercise(exercise); diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java index 123012319bd5..cbf46602b079 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java +++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelper.java @@ -21,14 +21,14 @@ private PlagiarismDetectionConfigHelper() { } /** - * Ads missing plagiarism checks config + * Ads missing plagiarism checks config for course exercises. * * @param type of Exercise * @param exercise exercise without plagiarism checks config * @param repository repository used for saving exercises of type T */ - public static void createAndSaveDefaultIfNull(T exercise, JpaRepository repository) { - if (exercise.getPlagiarismDetectionConfig() == null) { + public static void createAndSaveDefaultIfNullAndCourseExercise(T exercise, JpaRepository repository) { + if (exercise.isCourseExercise() && exercise.getPlagiarismDetectionConfig() == null) { log.info("Filling missing plagiarisms checks config: exerciseId={}, type={}.", exercise.getId(), exercise.getExerciseType()); var config = PlagiarismDetectionConfig.createDefault(); exercise.setPlagiarismDetectionConfig(config); diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java index 1a996e1b201f..ac5337fc8b56 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportBasicService.java @@ -295,8 +295,15 @@ private void setupExerciseForImport(ProgrammingExercise newExercise) { newExercise.getTeamAssignmentConfig().setId(null); } - var config = PlagiarismDetectionConfig.createDefault(); - newExercise.setPlagiarismDetectionConfig(config); + if (newExercise.isCourseExercise() && newExercise.getPlagiarismDetectionConfig() != null) { + newExercise.getPlagiarismDetectionConfig().setId(null); + } + else if (newExercise.isCourseExercise() && newExercise.getPlagiarismDetectionConfig() == null) { + newExercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); + } + else { + newExercise.setPlagiarismDetectionConfig(null); + } } /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java index 8e156dcb1c7b..6603c1f17a32 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ModelingExerciseResource.java @@ -245,7 +245,7 @@ public ResponseEntity> getModelingExercisesForCourse(@Pat private ModelingExercise findModelingExercise(Long exerciseId, boolean includePlagiarismDetectionConfig) { if (includePlagiarismDetectionConfig) { var modelingExercise = modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesAndPlagiarismDetectionConfigByIdElseThrow(exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(modelingExercise, modelingExerciseRepository); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNullAndCourseExercise(modelingExercise, modelingExerciseRepository); return modelingExercise; } return modelingExerciseRepository.findWithEagerExampleSubmissionsAndCompetenciesByIdElseThrow(exerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java index 661a55f3596a..b8b620fef53b 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ProgrammingExerciseResource.java @@ -365,7 +365,7 @@ private ProgrammingExercise findProgrammingExercise(Long exerciseId, boolean inc if (includePlagiarismDetectionConfig) { var programmingExercise = programmingExerciseRepository .findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigElseThrow(exerciseId); - PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(programmingExercise, programmingExerciseRepository); + PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNullAndCourseExercise(programmingExercise, programmingExerciseRepository); return programmingExercise; } return programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesElseThrow(exerciseId); diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java index 4266c85fa75a..1600285fa14a 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/TextExerciseResource.java @@ -248,7 +248,7 @@ public ResponseEntity> getTextExercisesForCourse(@PathVariabl private Optional findTextExercise(Long exerciseId, boolean includePlagiarismDetectionConfig) { if (includePlagiarismDetectionConfig) { var textExercise = textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(exerciseId); - textExercise.ifPresent(it -> PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNull(it, textExerciseRepository)); + textExercise.ifPresent(it -> PlagiarismDetectionConfigHelper.createAndSaveDefaultIfNullAndCourseExercise(it, textExerciseRepository)); return textExercise; } return textExerciseRepository.findWithEagerTeamAssignmentConfigAndCategoriesAndCompetenciesById(exerciseId); diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java index e7da40ba0c1e..cd02ef00367e 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseFactory.java @@ -122,6 +122,7 @@ public static ProgrammingExercise generateToBeImportedProgrammingExercise(String toBeImported.setSequentialTestRuns(template.hasSequentialTestRuns()); toBeImported.setBuildAndTestStudentSubmissionsAfterDueDate(template.getBuildAndTestStudentSubmissionsAfterDueDate()); toBeImported.generateAndSetProjectKey(); + toBeImported.setPlagiarismDetectionConfig(template.getPlagiarismDetectionConfig()); return toBeImported; } diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java index c5dbc26b1503..e1ddcd8215e7 100644 --- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java @@ -62,6 +62,7 @@ import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask; import de.tum.in.www1.artemis.domain.participation.Participant; import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation; +import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig; import de.tum.in.www1.artemis.domain.statistics.BuildLogStatisticsEntry; import de.tum.in.www1.artemis.domain.submissionpolicy.LockRepositoryPolicy; import de.tum.in.www1.artemis.exam.ExamFactory; @@ -697,6 +698,8 @@ void importExercise_created(ProgrammingLanguage programmingLanguage, boolean rec boolean staticCodeAnalysisEnabled = programmingLanguage == JAVA || programmingLanguage == SWIFT; // Setup exercises for import ProgrammingExercise sourceExercise = programmingExerciseUtilService.addCourseWithOneProgrammingExerciseAndStaticCodeAnalysisCategories(programmingLanguage); + sourceExercise.setPlagiarismDetectionConfig(PlagiarismDetectionConfig.createDefault()); + sourceExercise = programmingExerciseRepository.save(sourceExercise); sourceExercise.setStaticCodeAnalysisEnabled(staticCodeAnalysisEnabled); programmingExerciseUtilService.addTestCasesToProgrammingExercise(sourceExercise); programmingExerciseUtilService.addHintsToExercise(sourceExercise); diff --git a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java b/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java index 8fbe4a293126..fd1818ad2ca5 100644 --- a/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java +++ b/src/test/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseTestRepository.java @@ -32,6 +32,7 @@ public interface ProgrammingExerciseTestRepository extends JpaRepository