Merge pull request #72 from educ-ai-org/feat/return-score-classworks-…

…student Feat/return score classworks student
educ-ai-org · Jun 11, 2024 · 29b34c3 · 29b34c3
2 parents 031f462 + b544862
commit 29b34c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/api/educai/controllers/ClassroomController.java b/src/main/java/api/educai/controllers/ClassroomController.java
@@ -72,7 +72,8 @@ public ResponseEntity<List<UserDTO>> getClassroomParticipants(@PathVariable Obje
         return status(200).body(classroomService.getClassroomParticipants(id));
     }
 
-    @Operation(summary = "Retorna atividades de uma sala de aula")
+    @Operation(summary = "Retorna atividades de uma sala de aula para professor")
+    @Secured("ROLE_TEACHER")
     @GetMapping("/{id}/classworks")
     public ResponseEntity<List<ClassworkDTO>> getClassworksByClassroom(@PathVariable ObjectId id) {
         List<ClassworkDTO> classworks = classroomService.getClassworks(id);

diff --git a/src/main/java/api/educai/dto/classwork/ClassworkUserDTO.java b/src/main/java/api/educai/dto/classwork/ClassworkUserDTO.java
@@ -24,6 +24,7 @@ public class ClassworkUserDTO {
     @NotNull
     private Integer totalQuestions;
     private boolean hasAnswered;
+    private Double correctPercentage;
 
     public ClassworkUserDTO(Classwork classwork) {
         this.id = String.valueOf(classwork.getId());

diff --git a/src/main/java/api/educai/services/ClassroomService.java b/src/main/java/api/educai/services/ClassroomService.java
@@ -140,8 +140,16 @@ public List<ClassworkUserDTO> getClassworksByUser(ObjectId id, ObjectId userId)
         User user = userService.getUserById(userId);
         return classroom.getClassworks().stream().map(classwork -> {
             ClassworkUserDTO classworkUserDTO = new ClassworkUserDTO(classwork);
-            classworkUserDTO.setHasAnswered(classwork.getAnswers().stream()
-                    .anyMatch(answer -> answer.getUser().equals(user)));
+            Answer answer = classwork.getAnswers().stream()
+                    .filter(a -> a.getUser().equals(user))
+                    .findFirst()
+                    .orElse(null);
+            if (answer != null) {
+                classworkUserDTO.setHasAnswered(true);
+                classworkUserDTO.setCorrectPercentage(answer.getCorrectPercentage());
+            } else {
+                classworkUserDTO.setHasAnswered(false);
+            }
             return classworkUserDTO;
         }).toList();
     }

diff --git a/src/main/java/api/educai/services/ClassworkService.java b/src/main/java/api/educai/services/ClassworkService.java
@@ -85,7 +85,7 @@ public void addAnswer(Answer answer, ObjectId userId, ObjectId classworkId) {
 
         answer.setUser(userService.getUserById(userId));
         answer.setClasswork(classwork);
-        answer.setCorrectPercentage(getAnswerScore(answer) * 10.0);
+        answer.setCorrectPercentage(getAnswerScore(answer));
         answerRepository.save(answer);
 
         classwork.addAnswer(answer);
@@ -117,7 +117,7 @@ public List<AnswerDTO> getAnswers(ObjectId classworkId) {
         return classwork.getAnswers().stream().map(AnswerDTO::new).toList();
     }
 
-    public int getAnswerScore(Answer answer) {
+    public double getAnswerScore(Answer answer) {
 
         List<Question> questions = answer.getClasswork().getQuestions();
         List<QuestionAnswerDTO> answers = answer.getQuestionAnswers();
@@ -133,7 +133,7 @@ public int getAnswerScore(Answer answer) {
         int score = userCorrectAnswers.size() * CLASSWORK_SCORE / questions.size();
         userService.updateScore(score, answer.getUser());
 
-        return score;
+        return (int) ((userCorrectAnswers.size() * 100.0) / questions.size());
 
     }