diff --git a/README.md b/README.md index 73e6ed6..f19f7ff 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Course Exercice : Application to help others - [X] `Rest` Create a Help Request - [X] `Rest` Modify the Help Request status - [X] `Rest` Create a User Feedback -- [ ] `Rest` Gather User Feedbacks +- [X] `Rest` Gather User Feedbacks ## Check `SOAP` Requests diff --git a/backend/database-manager/src/main/java/insa/application/helpapp/rest/FeedbackRepository.java b/backend/database-manager/src/main/java/insa/application/helpapp/rest/FeedbackRepository.java index 124ac2b..640a1e2 100644 --- a/backend/database-manager/src/main/java/insa/application/helpapp/rest/FeedbackRepository.java +++ b/backend/database-manager/src/main/java/insa/application/helpapp/rest/FeedbackRepository.java @@ -2,5 +2,8 @@ package insa.application.helpapp.rest; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface FeedbackRepository extends JpaRepository { + List findByIdRequest(int idRequest); } \ No newline at end of file diff --git a/backend/feedback-service/src/main/java/insa/application/helpapp/rest/FeedbackServiceApplication.java b/backend/feedback-service/src/main/java/insa/application/helpapp/rest/FeedbackServiceApplication.java index ca780e9..b542e92 100644 --- a/backend/feedback-service/src/main/java/insa/application/helpapp/rest/FeedbackServiceApplication.java +++ b/backend/feedback-service/src/main/java/insa/application/helpapp/rest/FeedbackServiceApplication.java @@ -8,10 +8,10 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.beans.factory.annotation.Autowired; import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; @SpringBootApplication @RestController @@ -64,4 +64,14 @@ public class FeedbackServiceApplication { feedback.setMessage(message); return ResponseEntity.ok(feedbackRepository.save(feedback)); } + + @GetMapping("/get_feedback") + public ResponseEntity GetFeedback(@RequestParam int idRequest) + { + List feedbacks = feedbackRepository.findByIdRequest(idRequest); + if(feedbacks.isEmpty()) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("No feedback exists for the following request."); + } + return ResponseEntity.ok(feedbacks); + } } diff --git a/backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java b/backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java index 1bfd8a6..f043533 100644 --- a/backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java +++ b/backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java @@ -11,6 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.beans.factory.annotation.Autowired; import java.time.LocalDateTime; +import java.util.List; import java.util.Optional; @SpringBootApplication @@ -116,4 +117,12 @@ public class RequestServiceApplication { .body("Only Admins can perform this action."); } + @GetMapping("/get_request") + public ResponseEntity getRoles() { + List requests = requestRepository.findAll(); + if(requests.isEmpty()) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("No requests."); + } + return ResponseEntity.ok(requests); + } }