From f34a729b4d6e3df672b20cee7cf743ed18275ed8 Mon Sep 17 00:00:00 2001 From: Olivier Barais Date: Wed, 6 Mar 2024 21:51:45 +0100 Subject: [PATCH 1/2] update timestamp also for hybrid comment --- .../fr/istic/service/StudentResponseService.java | 13 +++++++++++++ src/main/java/fr/istic/web/rest/ExtendedAPI.java | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/istic/service/StudentResponseService.java b/src/main/java/fr/istic/service/StudentResponseService.java index 8f39728..7e7bfea 100644 --- a/src/main/java/fr/istic/service/StudentResponseService.java +++ b/src/main/java/fr/istic/service/StudentResponseService.java @@ -1,6 +1,7 @@ package fr.istic.service; import io.quarkus.panache.common.Page; +import io.vertx.core.cli.Option; import fr.istic.domain.StudentResponse; import fr.istic.domain.User; import fr.istic.service.customdto.StudentResponseNote; @@ -145,4 +146,16 @@ public Optional partialeNoteUpdate(StudentResponseNote noted } + @Transactional + public void updateCorrectedBy(long id,User updatedBy) { + Optional sr = StudentResponse.findByIdOptional(id); + if (sr.isPresent()){ + StudentResponse sr1 = sr.get(); + sr1.lastModifiedDate = Instant.now(); + sr1.correctedBy = updatedBy; + StudentResponse.persistOrUpdate(sr1); + } + + } + } diff --git a/src/main/java/fr/istic/web/rest/ExtendedAPI.java b/src/main/java/fr/istic/web/rest/ExtendedAPI.java index c05558b..3232026 100644 --- a/src/main/java/fr/istic/web/rest/ExtendedAPI.java +++ b/src/main/java/fr/istic/web/rest/ExtendedAPI.java @@ -33,6 +33,7 @@ import fr.istic.service.QuestionService; import fr.istic.service.ScanService; import fr.istic.service.SecurityService; +import fr.istic.service.StudentResponseService; import org.apache.commons.io.IOUtils; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -126,6 +127,10 @@ public class ExtendedAPI { private final Logger log = LoggerFactory.getLogger(ExtendedAPI.class); + + @Inject + StudentResponseService studentResponseService; + @Inject CourseGroupService courseGroupService; @@ -669,7 +674,7 @@ public Response sendResultToStudent(MailResultDTO dto, @PathParam("examId") long } else { if (count > 0 && sheet == null){ - mailService.sendEmail("barais@irisa.fr", " FinalResult but no sheet for studentId: " + student.id + ", studentname: " + student.name + ", exam.id: " +ex.id, "[CorrectExam] strange behavior", "olivier.barais@gmail.com"); + // mailService.sendEmail("barais@irisa.fr", " FinalResult but no sheet for studentId: " + student.id + ", studentname: " + student.name + ", exam.id: " +ex.id, "[CorrectExam] strange behavior", "olivier.barais@gmail.com"); } if (dto.isMailabi() && dto.getSheetuuid() == null) { String body = dto.getBodyabi(); @@ -2652,6 +2657,7 @@ public Response updateAnswerHybridCommentWithStepValue(@PathParam("responseId") if (!securityService.canAccess(ctx, responseId, StudentResponse.class)) { return Response.status(403, "Current user cannot access this ressource").build(); } + this.studentResponseService.updateCorrectedBy(responseId,this.securityService.getCurrentLoggedUser(ctx)); Answer2HybridGradedCommentDTO result = this.answer2HybridGradedCommentService .setStepValueWithResponseIdAndHybridCommentId(responseId, hybridCommentId, stepValue); return Response.ok().entity(result).build(); @@ -2669,6 +2675,7 @@ public Response updateAnswerHybridCommentWith(@PathParam("responseId") final lon if (!securityService.canAccess(ctx, responseId, StudentResponse.class)) { return Response.status(403, "Current user cannot access this ressource").build(); } + this.studentResponseService.updateCorrectedBy(responseId,this.securityService.getCurrentLoggedUser(ctx)); Answer2HybridGradedCommentDTO result = this.answer2HybridGradedCommentService .incrementWithResponseIdAndHybridCommentId(responseId, hybridCommentId); return Response.ok().entity(result).build(); From 6cd46644c1373202d90683735b8806864e26cfa4 Mon Sep 17 00:00:00 2001 From: Olivier Barais Date: Wed, 6 Mar 2024 21:53:29 +0100 Subject: [PATCH 2/2] update imports --- src/main/java/fr/istic/service/StudentResponseService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/fr/istic/service/StudentResponseService.java b/src/main/java/fr/istic/service/StudentResponseService.java index 7e7bfea..cb8e677 100644 --- a/src/main/java/fr/istic/service/StudentResponseService.java +++ b/src/main/java/fr/istic/service/StudentResponseService.java @@ -1,7 +1,6 @@ package fr.istic.service; import io.quarkus.panache.common.Page; -import io.vertx.core.cli.Option; import fr.istic.domain.StudentResponse; import fr.istic.domain.User; import fr.istic.service.customdto.StudentResponseNote; @@ -15,7 +14,6 @@ import jakarta.transaction.Transactional; import java.time.Instant; -import java.util.Collections; import java.util.List; import java.util.Optional;