Merge pull request #60 from educ-ai-org/feat/return-answer-status

Feat/return answer status

src/main/java/api/educai/controllers/ClassroomController.java

@@ -1,10 +1,16 @@
 package api.educai.controllers;
 
-import api.educai.dto.*;
+import api.educai.dto.classroom.ClassroomInfoDTO;
+import api.educai.dto.classroom.PatchClassroomTitleAndCourse;
+import api.educai.dto.classroom.UserScoreDTO;
+import api.educai.dto.classwork.ClassworkDTO;
+import api.educai.dto.classwork.ClassworkUserDTO;
+import api.educai.dto.post.PostDTO;
+import api.educai.dto.user.ReportDTO;
+import api.educai.dto.user.UserDTO;
 import api.educai.entities.Classroom;
 import api.educai.entities.Post;
 import api.educai.services.ClassroomService;
-import api.educai.services.PostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
@@ -21,7 +27,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.io.IOException;
 import java.util.List;
 
 import static org.springframework.http.ResponseEntity.*;
@@ -68,12 +73,21 @@ public ResponseEntity<List<UserDTO>> getClassroomParticipants(@PathVariable Obje
     }
 
     @Operation(summary = "Retorna atividades de uma sala de aula")
+    @Secured("ROLE_TEACHER")
     @GetMapping("/{id}/classworks")
     public ResponseEntity<List<ClassworkDTO>> getClassworksByClassroom(@PathVariable ObjectId id) {
         List<ClassworkDTO> classworks = classroomService.getClassworks(id);
         return classworks.isEmpty() ? status(204).build() : status(200).body(classworks);
     }
 
+    @Operation(summary = "Retorna atividades de uma sala de aula com o status de resposta do usuário")
+    @Secured("ROLE_STUDENT")
+    @GetMapping("/{id}/classworks/{userId}")
+    public ResponseEntity<List<ClassworkUserDTO>> getClassworksByClassroom(@PathVariable ObjectId id, @PathVariable ObjectId userId) {
+        List<ClassworkUserDTO> classworks = classroomService.getClassworksByUser(id, userId);
+        return classworks.isEmpty() ? status(204).build() : status(200).body(classworks);
+    }
+
     @Operation(summary = "Retorna posts de uma sala de aula")
     @GetMapping("/{id}/posts")
     public ResponseEntity<List<PostDTO>> getPostsByClassroom(@PathVariable ObjectId id){

src/main/java/api/educai/controllers/ClassworkController.java

@@ -1,7 +1,8 @@
 package api.educai.controllers;
 
-import api.educai.dto.AnswerDTO;
-import api.educai.dto.ClassworkDetailsDTO;
+import api.educai.dto.answer.AnswerDTO;
+import api.educai.dto.classwork.ClassworkDetailsDTO;
+import api.educai.dto.answer.UserAnswerStatusDTO;
 import api.educai.entities.Answer;
 import api.educai.entities.Classwork;
 import api.educai.services.ClassworkService;
@@ -49,6 +50,15 @@ public ResponseEntity<Void> addAnswer(
         return status(201).build();
     }
 
+    @Operation(summary = "Retorna uma lista de usuários e o status da resposta para uma atividade")
+    @Secured("ROLE_TEACHER")
+    @GetMapping("/{id}/answers/status")
+    public ResponseEntity<List<UserAnswerStatusDTO>> getUserAnswerStatus(
+            @PathVariable ObjectId id) {
+        List<UserAnswerStatusDTO> userAnswerStatusList = classworkService.getUserAnswerStatus(id);
+        return status(200).body(userAnswerStatusList);
+    }
+
     @Operation(summary = "Retorna uma atividade via id")
     @GetMapping("/{id}")
     public ResponseEntity<ClassworkDetailsDTO> getClassworkById(@PathVariable ObjectId id) {

src/main/java/api/educai/controllers/DictionaryController.java

@@ -1,6 +1,6 @@
 package api.educai.controllers;
 
-import api.educai.dto.WordDefinitionDTO;
+import api.educai.dto.dictionary.WordDefinitionDTO;
 import api.educai.services.DictionaryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/api/educai/controllers/PostController.java

@@ -1,8 +1,8 @@
 package api.educai.controllers;
 
-import api.educai.dto.NewPostDTO;
-import api.educai.dto.PatchPost;
-import api.educai.dto.PostDTO;
+import api.educai.dto.post.NewPostDTO;
+import api.educai.dto.post.PatchPost;
+import api.educai.dto.post.PostDTO;
 import api.educai.entities.Post;
 import api.educai.services.PostService;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/api/educai/controllers/UserController.java

@@ -1,11 +1,11 @@
 package api.educai.controllers;
 
-import api.educai.dto.UserDTO;
-import api.educai.dto.ClassroomInfoDTO;
-import api.educai.dto.AuthDTO;
-import api.educai.dto.LoginDTO;
-import api.educai.dto.PatchUserEmailAndName;
-import api.educai.dto.TokenDTO;
+import api.educai.dto.user.UserDTO;
+import api.educai.dto.classroom.ClassroomInfoDTO;
+import api.educai.dto.auth.AuthDTO;
+import api.educai.dto.auth.LoginDTO;
+import api.educai.dto.user.PatchUserEmailAndName;
+import api.educai.dto.auth.TokenDTO;
 import api.educai.entities.User;
 import api.educai.services.UserService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -22,7 +22,6 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.List;
 

src/main/java/api/educai/dto/AnswerDTO.java → src/main/java/api/educai/dto/answer/AnswerDTO.java

@@ -1,5 +1,6 @@
-package api.educai.dto;
+package api.educai.dto.answer;
 
+import api.educai.dto.classroom.ClassroomParticipantsDTO;
 import api.educai.entities.Answer;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;

src/main/java/api/educai/dto/OptionDTO.java → src/main/java/api/educai/dto/answer/OptionDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.answer;
 
 import lombok.Getter;
 

src/main/java/api/educai/dto/QuestionAnswerDTO.java → src/main/java/api/educai/dto/answer/QuestionAnswerDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.answer;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/api/educai/dto/QuestionDTO.java → src/main/java/api/educai/dto/answer/QuestionDTO.java

@@ -1,6 +1,5 @@
-package api.educai.dto;
+package api.educai.dto.answer;
 
-import api.educai.entities.Option;
 import lombok.Getter;
 
 import java.util.ArrayList;

src/main/java/api/educai/dto/answer/UserAnswerStatusDTO.java

@@ -0,0 +1,10 @@
+package api.educai.dto.answer;
+
+import api.educai.dto.user.UserDTO;
+import lombok.Data;
+
+@Data
+public class UserAnswerStatusDTO {
+    private UserDTO user;
+    private boolean hasAnswered;
+}

src/main/java/api/educai/dto/AuthDTO.java → src/main/java/api/educai/dto/auth/AuthDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.auth;
 
 public class AuthDTO {
     private String token;

src/main/java/api/educai/dto/InvalidTokenDTO.java → src/main/java/api/educai/dto/auth/InvalidTokenDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.auth;
 
 import java.util.Date;
 

src/main/java/api/educai/dto/LoginDTO.java → src/main/java/api/educai/dto/auth/LoginDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.auth;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Size;

src/main/java/api/educai/dto/TokenDTO.java → src/main/java/api/educai/dto/auth/TokenDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.auth;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/api/educai/dto/AddStudentInClassroomDTO.java → src/main/java/api/educai/dto/classroom/AddStudentInClassroomDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.classroom;
 
 public class AddStudentInClassroomDTO {
     private String student_email;

src/main/java/api/educai/dto/ClassroomInfoDTO.java → src/main/java/api/educai/dto/classroom/ClassroomInfoDTO.java

@@ -1,5 +1,8 @@
-package api.educai.dto;
+package api.educai.dto.classroom;
 
+import api.educai.dto.classwork.ClassworkDTO;
+import api.educai.dto.post.PostDTO;
+import api.educai.dto.user.UserDTO;
 import api.educai.entities.Classroom;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

src/main/java/api/educai/dto/ClassroomParticipantsDTO.java → src/main/java/api/educai/dto/classroom/ClassroomParticipantsDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.classroom;
 
 import api.educai.entities.User;
 import jakarta.validation.constraints.Email;

src/main/java/api/educai/dto/PatchClassroomTitleAndCourse.java → src/main/java/api/educai/dto/classroom/PatchClassroomTitleAndCourse.java

@@ -1,6 +1,5 @@
-package api.educai.dto;
+package api.educai.dto.classroom;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 

src/main/java/api/educai/dto/UserScoreDTO.java → src/main/java/api/educai/dto/classroom/UserScoreDTO.java

@@ -1,7 +1,6 @@
-package api.educai.dto;
+package api.educai.dto.classroom;
 
 import lombok.Getter;
-import org.bson.types.ObjectId;
 
 @Getter
 public class UserScoreDTO {

src/main/java/api/educai/dto/ClassworkDTO.java → src/main/java/api/educai/dto/classwork/ClassworkDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.classwork;
 
 import api.educai.entities.Classwork;
 import jakarta.validation.constraints.NotNull;

src/main/java/api/educai/dto/ClassworkDetailsDTO.java → src/main/java/api/educai/dto/classwork/ClassworkDetailsDTO.java

@@ -1,6 +1,6 @@
-package api.educai.dto;
+package api.educai.dto.classwork;
 
-import api.educai.entities.Question;
+import api.educai.dto.answer.QuestionDTO;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;

src/main/java/api/educai/dto/classwork/ClassworkUserDTO.java

@@ -0,0 +1,37 @@
+package api.educai.dto.classwork;
+
+import api.educai.entities.Classwork;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Data
+@NoArgsConstructor
+public class ClassworkUserDTO {
+
+    private String id;
+    @Size(max = 100)
+    private String title;
+    @NotNull
+    private LocalDate datePosting;
+    @NotNull
+    private LocalDate endDate;
+    @Size(max = 200)
+    private String description;
+    @NotNull
+    private Integer totalQuestions;
+    private boolean hasAnswered;
+
+    public ClassworkUserDTO(Classwork classwork) {
+        this.id = String.valueOf(classwork.getId());
+        this.title = classwork.getTitle();
+        this.datePosting = classwork.getDatePosting();
+        this.endDate = classwork.getEndDate();
+        this.description = classwork.getDescription();
+        this.totalQuestions = classwork.getQuestions().size();
+        this.hasAnswered = false;
+    }
+}

src/main/java/api/educai/dto/GetWordDefinitionDTO.java → src/main/java/api/educai/dto/dictionary/GetWordDefinitionDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.dictionary;
 
 import lombok.Getter;
 

src/main/java/api/educai/dto/MeaningDTO.java → src/main/java/api/educai/dto/dictionary/MeaningDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.dictionary;
 
 import api.educai.utils.ListObject;
 import lombok.Getter;

src/main/java/api/educai/dto/WordDefinitionDTO.java → src/main/java/api/educai/dto/dictionary/WordDefinitionDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.dictionary;
 
 import api.educai.utils.ListObject;
 import lombok.Getter;

src/main/java/api/educai/dto/NewPostDTO.java → src/main/java/api/educai/dto/post/NewPostDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.post;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/api/educai/dto/PatchPost.java → src/main/java/api/educai/dto/post/PatchPost.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.post;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

src/main/java/api/educai/dto/PostDTO.java → src/main/java/api/educai/dto/post/PostDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.post;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;

src/main/java/api/educai/dto/NewStudentEmailDTO.java → src/main/java/api/educai/dto/user/NewStudentEmailDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/api/educai/dto/PatchUserEmailAndName.java → src/main/java/api/educai/dto/user/PatchUserEmailAndName.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/api/educai/dto/ReportDTO.java → src/main/java/api/educai/dto/user/ReportDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/api/educai/dto/StudentClassroomsDTO.java → src/main/java/api/educai/dto/user/StudentClassroomsDTO.java

@@ -1,5 +1,6 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
+import api.educai.dto.classroom.ClassroomInfoDTO;
 import api.educai.entities.Classroom;
 import lombok.Getter;
 

src/main/java/api/educai/dto/TeacherClassroomsDTO.java → src/main/java/api/educai/dto/user/TeacherClassroomsDTO.java

@@ -1,5 +1,6 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
+import api.educai.dto.classroom.ClassroomInfoDTO;
 import api.educai.entities.Classroom;
 import lombok.Getter;
 

src/main/java/api/educai/dto/UserDTO.java → src/main/java/api/educai/dto/user/UserDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
 import api.educai.entities.User;
 import api.educai.enums.Role;

src/main/java/api/educai/dto/UserDetailsDTO.java → src/main/java/api/educai/dto/user/UserDetailsDTO.java

@@ -1,4 +1,4 @@
-package api.educai.dto;
+package api.educai.dto.user;
 
 import api.educai.entities.User;
 import api.educai.enums.Role;

src/main/java/api/educai/entities/Answer.java

@@ -1,6 +1,6 @@
 package api.educai.entities;
 
-import api.educai.dto.QuestionAnswerDTO;
+import api.educai.dto.answer.QuestionAnswerDTO;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.bson.types.ObjectId;

src/main/java/api/educai/entities/TokenBlacklist.java

@@ -1,6 +1,6 @@
 package api.educai.entities;
 
-import api.educai.dto.InvalidTokenDTO;
+import api.educai.dto.auth.InvalidTokenDTO;
 import lombok.Data;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/api/educai/filter/TokenFilter.java

@@ -1,6 +1,6 @@
 package api.educai.filter;
 
-import api.educai.dto.UserDetailsDTO;
+import api.educai.dto.user.UserDetailsDTO;
 import api.educai.enums.Role;
 import api.educai.repositories.UserRespository;
 import api.educai.services.token.Token;

src/main/java/api/educai/repositories/AnswerRepository.java

@@ -4,10 +4,13 @@
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
+import java.util.List;
+
 public interface AnswerRepository extends MongoRepository <Answer, Long> {
 
     Answer findById(ObjectId id);
 
     boolean existsAnswerByUserIdAndClassworkId(ObjectId userId, ObjectId classworkId);
 
+    List<Answer> findAllByClassworkId(ObjectId classworkId);
 }